# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1234280263 -3600
# Node ID 2d810185f0ce2841826d720e1e5e6e1bec8ccb29
# Parent  2a2e3384a8ce55c101f7d57f15c8b9d30d6d53e2
cups: up to 13.9, fix web interface and dependencies

diff -r 2a2e3384a8ce -r 2d810185f0ce cups-dev/receipt
--- a/cups-dev/receipt	Tue Feb 10 12:14:40 2009 +0000
+++ b/cups-dev/receipt	Tue Feb 10 16:37:43 2009 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt."
 
 PACKAGE="cups-dev"
-VERSION="1.3.7"
+VERSION="1.3.9"
 CATEGORY="system-tools"
 SHORT_DESC="Common UNIX Printing System dev files."
 MAINTAINER="erjo@slitaz.org"
diff -r 2a2e3384a8ce -r 2d810185f0ce cups/receipt
--- a/cups/receipt	Tue Feb 10 12:14:40 2009 +0000
+++ b/cups/receipt	Tue Feb 10 16:37:43 2009 +0100
@@ -1,12 +1,12 @@
 # SliTaz package receipt.
 
 PACKAGE="cups"
-VERSION="1.3.7"
+VERSION="1.3.9"
 CATEGORY="system-tools"
 SHORT_DESC="Common UNIX Printing System."
 MAINTAINER="erjo@slitaz.org"
-DEPENDS="openssl slitaz-base-files gnutls cyrus-sasl"
-BUILD_DEPENDS="openssl-dev"
+DEPENDS="openssl slitaz-base-files gnutls ghostscript dbus"
+BUILD_DEPENDS="openssl-dev gnutls-dev ghostscript dbus-dev"
 TARBALL="$PACKAGE-$VERSION-source.tar.bz2"
 WEB_SITE="http://www.cups.org/"
 WGET_URL="http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/cups/$VERSION/$TARBALL"
@@ -20,7 +20,10 @@
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--mandir=/usr/share/man \
-		--enable-static \
+		--disable-ldap \
+		--with-cups-user=nobody \
+		--with-cups-group=nogroup \
+		--with-languages="de es fr" \
 		$CONFIGURE_ARGS &&
 	make &&
 	make BUILDROOT=$PWD/_pkg install
@@ -32,12 +35,16 @@
 	mkdir -p $fs/etc $fs/usr/lib $fs/usr/share
 	
 	cp -a $_pkg/etc/cups $fs/etc
+	cp -a $_pkg/etc/dbus* $fs/etc
 	cp -a $_pkg/usr/bin $fs/usr
 	cp -a $_pkg/usr/sbin $fs/usr
 	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
 	cp -a $_pkg/usr/lib/cups $fs/usr/lib
 	cp -a $_pkg/usr/share/cups $fs/usr/share
 	cp -a $_pkg/var $fs
+	
+	# We need the doc for CSS, images and help in the web interface.
+	cp -a $_pkg/usr/share/doc $fs/usr/share
 
 	# Daemon script
 	cp -a stuff/etc $fs
diff -r 2a2e3384a8ce -r 2d810185f0ce cups/stuff/etc/init.d/cupsd
--- a/cups/stuff/etc/init.d/cupsd	Tue Feb 10 12:14:40 2009 +0000
+++ b/cups/stuff/etc/init.d/cupsd	Tue Feb 10 16:37:43 2009 +0100
@@ -18,13 +18,12 @@
 	stop)
 		echo -n "Stopping $DESC: $NAME... "
 		killall -q cupsd
+		rm -f $PIDFILE
 		status
 		;;
-	start)
-		if ps | grep $DAEMON; then
-			echo "$NAME is already running... "
-			exit 0
-		fi
+	start|restart)
+		killall -q cupsd
+		rm -f $PIDFILE
 		echo -n "Starting $DESC: $NAME... "
 		$DAEMON $OPTIONS
 		status