Update to foomatic-db-4.0.20091207

Now depends on foomatic-db-engine.

print/foomatic-db/Makefile

@@ -1,36 +1,40 @@
-# $OpenBSD: Makefile,v 1.5 2008/12/20 21:15:56 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.6 2009/12/10 10:58:25 ajacoutot Exp $
+
+PKG_ARCH=		*
 
 COMMENT=		Foomatic PPD data
 
-V=			20070708
-DISTNAME=		foomatic-db-3.0-${V}
-PKGNAME=		foomatic-db-3.0.${V}p0
+V=			20091207
+DISTNAME=		foomatic-db-4.0-${V}
+PKGNAME=		foomatic-db-4.0.${V}
 CATEGORIES=		print
 
 HOMEPAGE=		http://www.linux-foundation.org/en/OpenPrinting/Database/Foomatic
 
 MAINTAINER=		Antoine Jacoutot <ajacoutot@openbsd.org>
 
-# GPL
+# GPLv2 - MIT
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 # tarballs are only available for a 24 hour period
-#MASTER_SITES=		http://www.linuxprinting.org/download/foomatic/
-MASTER_SITES=		http://jakemsr.trancell.org/distfiles/ \
-			http://openbsd.dead-parrot.de/distfiles/ \
-			http://www.bsdfrog.org/OpenBSD/distfiles/
+#MASTER_SITES=		http://www.openprinting.org/download/foomatic/
+MASTER_SITES=		http://www.bsdfrog.org/OpenBSD/distfiles/
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS=		--disable-ppds-to-cups
 
-PKG_ARCH=		*
+RUN_DEPENDS=		::print/foomatic-db-engine
 
 WRKDIST=		${WRKDIR}/foomatic-db-${V}
 
 NO_BUILD=		Yes
 NO_REGRESS=		Yes
 
+pre-configure:
+	perl -pi -e 's,!!LOCALBASE!!,${LOCALBASE},g' \
+		${WRKSRC}/configure
+
 .include <bsd.port.mk>

print/foomatic-db/distinfo

@@ -1,5 +1,5 @@
-MD5 (foomatic-db-3.0-20070708.tar.gz) = sTysT2uHiQNtmhNtd3KYng==
-RMD160 (foomatic-db-3.0-20070708.tar.gz) = zPhtbUTNJvpYN/Ou+LakP7B3lMc=
-SHA1 (foomatic-db-3.0-20070708.tar.gz) = 2NrloulTndj4ieOnNxe5l78NweE=
-SHA256 (foomatic-db-3.0-20070708.tar.gz) = bGNQuzzr++Cb8ISx0Y+p+KOdC2lJipEzuFiXEH+q4vY=
-SIZE (foomatic-db-3.0-20070708.tar.gz) = 16088588
+MD5 (foomatic-db-4.0-20091207.tar.gz) = ipD/h/wTkdmCZ1lWQB17HA==
+RMD160 (foomatic-db-4.0-20091207.tar.gz) = onvXQlERTx4+CacHNLU7PcfFAVU=
+SHA1 (foomatic-db-4.0-20091207.tar.gz) = gMeVdhwhno3wM6z07K8+nTikf/Y=
+SHA256 (foomatic-db-4.0-20091207.tar.gz) = qQoDVffqHJbcO8Ziklor0c5beXaYrUwsIMygr/EPYpw=
+SIZE (foomatic-db-4.0-20091207.tar.gz) = 24463077

print/foomatic-db/patches/patch-configure

@@ -0,0 +1,42 @@
+$OpenBSD: patch-configure,v 1.1 2009/12/10 10:58:25 ajacoutot Exp $
+--- configure.orig	Mon Dec  7 09:22:31 2009
++++ configure	Tue Dec  8 11:51:40 2009
+@@ -1791,9 +1791,9 @@ echo "${ECHO_T}no" >&6; }
+ fi
+ 
+ 
+-SBINSEARCHPATH=/usr/sbin:/sbin:/usr/local/sbin:/etc/sbin
+-BINSEARCHPATH=/usr/bin:/bin:/usr/local/bin
+-DATASEARCHPATH=/usr/share:/usr/local/share:/usr/lib:/usr/local/lib:/opt
++SBINSEARCHPATH=/usr/sbin:/sbin:!!LOCALBASE!!/sbin
++BINSEARCHPATH=/usr/bin:/bin:!!LOCALBASE!!/bin
++DATASEARCHPATH=/usr/share:!!LOCALBASE!!/share:/usr/lib:!!LOCALBASE!!/lib
+ BSB=$BINSEARCHPATH:$SBINSEARCHPATH
+ for ac_dir in cups/model
+ do
+@@ -1962,7 +1962,7 @@ DRIVERXMLS="";
+ while test -n "$drivers"; do
+ 	if echo $drivers |grep "," >/dev/null; then
+ 		THIS="`echo $drivers |sed -e 's/,.*//'`"
+-		drivers="`echo $drivers |sed -e \"s/$THIS,//\"`"
++		drivers="`echo $drivers |sed -e "s/$THIS,//"`"
+ 	else
+ 		THIS=$drivers
+ 		drivers=""
+@@ -1970,14 +1970,14 @@ while test -n "$drivers"; do
+ 	case "$THIS" in
+ 	ALL)
+ 		# ALL = PRINTERS + FILES...
+-		DRIVERXMLS=`cd db/source/driver/; ls -1 *.xml`
++		DRIVERXMLS=`cd db/source/driver/; for i in *.xml ; do echo -n "$i " ; done`
+ 		;;
+ 	NOOBSOLETES)
+ 		OBSOLETEXMLS=`cd db/source/driver/; grep -li '< *obsolete.*/ *>' *.xml`
+ 		while test -n "$OBSOLETEXMLS"; do
+ 		    if echo $OBSOLETEXMLS |grep " " >/dev/null; then
+ 		        REMOVE="`echo $OBSOLETEXMLS |sed -e 's/ .*//'`"
+-		        OBSOLETEXMLS="`echo $OBSOLETEXMLS |sed -e \"s/$REMOVE //\"`"
++		        OBSOLETEXMLS="`echo $OBSOLETEXMLS |sed -e "s/$REMOVE //"`"
+ 		    else
+ 		        REMOVE=$OBSOLETEXMLS
+ 		        OBSOLETEXMLS=""

print/foomatic-db/pkg/MESSAGE

@@ -1,8 +0,0 @@
-If you are using or plan to use CUPS, you can make the PPD files
-available to CUPS by creating a symbolic link as in the following
-command:
-
-# ln -sf ${PREFIX}/share/foomatic/db/source/PPD \
-	${LOCALBASE}/share/cups/model/foomatic-db-ppds
-
-cupsd will need to be restarted to register the new PPDs.