diff --git a/print/foomatic-db-engine/Makefile b/print/foomatic-db-engine/Makefile index d603ffac097..3c6bff83da5 100644 --- a/print/foomatic-db-engine/Makefile +++ b/print/foomatic-db-engine/Makefile @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile,v 1.25 2013/03/11 11:37:53 espie Exp $ +# $OpenBSD: Makefile,v 1.26 2013/03/23 08:33:58 ajacoutot Exp $ COMMENT= Foomatic PPD generator -DISTNAME= foomatic-db-engine-4.0.8 -REVISION= 5 +DISTNAME= foomatic-db-engine-4.0.9 CATEGORIES= print HOMEPAGE= http://www.linux-foundation.org/en/OpenPrinting/Database/Foomatic @@ -76,9 +75,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libxml2" pre-configure: ${SUBST_CMD} ${WRKSRC}/foomatic-combo-xml.c \ ${WRKSRC}/Makefile.in ${WRKSRC}/configure - perl -pi -e 's,!!SYSCONFDIR!!,${SYSCONFDIR},g;' \ - -e 's,!!LOCALBASE!!,${LOCALBASE},g' \ - ${WRKSRC}/configure # make CUPS generate Foomatic PPDs on demand post-install: diff --git a/print/foomatic-db-engine/distinfo b/print/foomatic-db-engine/distinfo index fe10e0a82e8..b34a8227366 100644 --- a/print/foomatic-db-engine/distinfo +++ b/print/foomatic-db-engine/distinfo @@ -1,5 +1,2 @@ -MD5 (foomatic-db-engine-4.0.8.tar.gz) = UoPNUSWpbcCzXYljJlErGg== -RMD160 (foomatic-db-engine-4.0.8.tar.gz) = VlI4Nbpd4OW9s3t4Upd1M06WrXY= -SHA1 (foomatic-db-engine-4.0.8.tar.gz) = 5H9e6bklYHf3C17PJIHfvOQW2Xo= -SHA256 (foomatic-db-engine-4.0.8.tar.gz) = 8MSJKuVWbqLvqui9WDUv0yAB0RLy+d//Y/feA7RnM+E= -SIZE (foomatic-db-engine-4.0.8.tar.gz) = 354578 +SHA256 (foomatic-db-engine-4.0.9.tar.gz) = fJ7xyOk03hsONxBFcNax/46jSfPtbZZTl7fJREkSL0Q= +SIZE (foomatic-db-engine-4.0.9.tar.gz) = 360242 diff --git a/print/foomatic-db-engine/patches/patch-configure b/print/foomatic-db-engine/patches/patch-configure index 95839cbad53..c518e85b825 100644 --- a/print/foomatic-db-engine/patches/patch-configure +++ b/print/foomatic-db-engine/patches/patch-configure @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure,v 1.6 2011/08/25 10:40:29 ajacoutot Exp $ ---- configure.orig Mon Jul 25 11:51:22 2011 -+++ configure Thu Aug 25 12:24:42 2011 -@@ -4038,15 +4038,15 @@ LIBS="$save_LIBS" +$OpenBSD: patch-configure,v 1.7 2013/03/23 08:33:58 ajacoutot Exp $ +--- configure.orig Mon Mar 11 18:57:50 2013 ++++ configure Sat Mar 23 09:07:47 2013 +@@ -3705,15 +3705,15 @@ LIBS="$save_LIBS" # Checks for programs/directories which are used by Foomtic @@ -16,17 +16,17 @@ $OpenBSD: patch-configure,v 1.6 2011/08/25 10:40:29 ajacoutot Exp $ -MTINKPIPESSEARCHPATH=/var:/var/run:/usr/var/:/usr/var/run:/usr/local/var:/usr/local/var/run:/dev +SPOOLSEARCHPATH=/var/spool +LOGSEARCHPATH=/var/log -+SYSCONFSEARCHPATH=!!SYSCONFDIR!! -+SBINSEARCHPATH=/usr/sbin:/sbin:!!LOCALBASE!!/sbin:/etc/sbin -+BINSEARCHPATH=/usr/bin:/bin:!!LOCALBASE!!/bin -+DATASEARCHPATH=/usr/share:!!LOCALBASE!!/share:/usr/lib:!!LOCALBASE!!/lib -+LIBSEARCHPATH=/usr/lib:/lib:!!LOCALBASE!!/lib:!!LOCALBASE!!/libexec ++SYSCONFSEARCHPATH=${SYSCONFDIR} ++SBINSEARCHPATH=/usr/sbin:/sbin:${LOCALBASE}/sbin:/etc/sbin ++BINSEARCHPATH=/usr/bin:/bin:${LOCALBASE}/bin ++DATASEARCHPATH=/usr/share:${LOCALBASE}/share:/usr/lib:${LOCALBASE}/lib ++LIBSEARCHPATH=/usr/lib:/lib:${LOCALBASE}/lib:${LOCALBASE}/libexec +PTALPIPESSEARCHPATH=/var/run +MTINKPIPESSEARCHPATH=/var/run # There is a bug in some versions of autoconf that causes # bad expansion of paths in the AC_PATH_* macros. This is very annoying -@@ -4516,8 +4516,7 @@ else +@@ -4175,8 +4175,7 @@ else PREFIX=$prefix fi echo -n Checking where Perl will find its libraries... @@ -36,7 +36,7 @@ $OpenBSD: patch-configure,v 1.6 2011/08/25 10:40:29 ajacoutot Exp $ if test -n "$PERLPREFIX"; then echo " $PERLPREFIX" else -@@ -4535,7 +4534,7 @@ fi +@@ -4194,7 +4193,7 @@ fi # Check for bourne shell @@ -45,7 +45,7 @@ $OpenBSD: patch-configure,v 1.6 2011/08/25 10:40:29 ajacoutot Exp $ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -@@ -5993,8 +5992,8 @@ fi +@@ -5652,8 +5651,8 @@ fi done test -n "$CUPS_LPINFO" || CUPS_LPINFO="/usr/sbin/lpinfo" @@ -55,7 +55,7 @@ $OpenBSD: patch-configure,v 1.6 2011/08/25 10:40:29 ajacoutot Exp $ for ac_dir in pdq do # Extract the first word of "$ac_dir", so it can be a program name with args. -@@ -6129,9 +6128,11 @@ fi +@@ -5788,9 +5787,11 @@ fi test -n "$PDQ_PRINT" && break done test -n "$PDQ_PRINT" || PDQ_PRINT="/usr/bin/pdq" @@ -67,7 +67,7 @@ $OpenBSD: patch-configure,v 1.6 2011/08/25 10:40:29 ajacoutot Exp $ for ac_prog in ppr/bin/pprd do # Extract the first word of "$ac_prog", so it can be a program name with args. -@@ -6444,7 +6445,7 @@ fi +@@ -6103,7 +6104,7 @@ fi test -n "$PPR_PPOP" && break done test -n "$PPR_PPOP" || PPR_PPOP="/usr/bin/ppop"