Update to foomatic-filters-4.0.3.

(rewritten from perl to c)
2009-12-10 10:57:21 +00:00 · 2009-12-10 10:57:21 +00:00 · 9f0b30e126
commit 9f0b30e126
parent 1ca27be86e
5 changed files with 82 additions and 19 deletions
--- a/print/foomatic-filters/Makefile
+++ b/print/foomatic-filters/Makefile
@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.9 2009/08/03 13:02:55 giovanni Exp $
+# $OpenBSD: Makefile,v 1.10 2009/12/10 10:57:21 ajacoutot Exp $

 COMMENT=		Foomatic PPD print filters

-DISTNAME=		foomatic-filters-3.0.2
-PKGNAME=		${DISTNAME}p4
+DISTNAME=		foomatic-filters-4.0.3
 CATEGORIES=		print

 HOMEPAGE=		http://www.linuxfoundation.org/en/OpenPrinting/Database/Foomatic
@ -16,14 +15,25 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-MASTER_SITES=		http://www.linuxprinting.org/download/foomatic/oldstuff/
+WANTLIB += c m pthread

-RUN_DEPENDS=		::print/ghostscript/gnu \
-			::print/a2ps
+MASTER_SITES=		http://www.linuxprinting.org/download/foomatic/ \
+			http://www.openprinting.org/download/foomatic/ \
+			http://www.linuxprinting.org/download/foomatic/oldstuff/ \
+			http://www.openprinting.org/download/foomatic/oldstuff/
+
+BUILD_DEPENDS=		${RUN_DEPENDS}
+RUN_DEPENDS=		::print/a2ps
+
+LIB_DEPENDS=		gs.>=11::print/ghostscript/gnu

 CONFIGURE_STYLE=	gnu
-CONFIGURE_ENV=		CUPS="${LOCALBASE}/libexec/cups" \
+CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
+			LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \
+			CUPS="${LOCALBASE}/libexec/cups" \
 			CUPS_FILTERS="${LOCALBASE}/libexec/cups/filter" \
+			CUPS_BACKENDS=${LOCALBASE}/libexec/cups/backend \
+			PRINTCAP="/etc/printcap" \
 			TEXTTOPS="${LOCALBASE}/libexec/cups/filter/texttops" \
 			PPR="${LOCALBASE}/lib/ppr" \
 			PPR_INTERFACES="${LOCALBASE}/lib/ppr/interfaces" \
@ -34,8 +44,10 @@ CONFIGURE_ENV=		CUPS="${LOCALBASE}/libexec/cups" \

 FAKE_FLAGS=		ETCDIR="${PREFIX}/share/examples/foomatic"

-PKG_ARCH=		*
-
-NO_REGRESS=		Yes
+pre-configure:
+	perl -pi -e 's,!!SYSCONFDIR!!,${SYSCONFDIR},g;' \
+		-e 's,!!LOCALBASE!!,${LOCALBASE},g' \
+		${WRKSRC}/configure
+	${SUBST_CMD} ${WRKSRC}/foomaticrip.c

 .include <bsd.port.mk>
--- a/print/foomatic-filters/distinfo
+++ b/print/foomatic-filters/distinfo
@ -1,5 +1,5 @@
-MD5 (foomatic-filters-3.0.2.tar.gz) = 8PTJD6CuNG9TvxmhZeBxpg==
-RMD160 (foomatic-filters-3.0.2.tar.gz) = YSUp6kYvfxUA8w/+1K7BBbQQk2w=
-SHA1 (foomatic-filters-3.0.2.tar.gz) = bZSZSfQyISYyxwSQQnK8MvKHtXc=
-SHA256 (foomatic-filters-3.0.2.tar.gz) = Fh3ICVfNvLDEPcTx2wiWjj7mRbZO/5NCKUsz/pVDZ5I=
-SIZE (foomatic-filters-3.0.2.tar.gz) = 125875
+MD5 (foomatic-filters-4.0.3.tar.gz) = 8vt8SMxrGvb3bdBSnW29mA==
+RMD160 (foomatic-filters-4.0.3.tar.gz) = bU8JhH0cl37xXMcQJjZLmgSvH40=
+SHA1 (foomatic-filters-4.0.3.tar.gz) = hwuQTJOQpmMuVApFhHnDQpCo+WA=
+SHA256 (foomatic-filters-4.0.3.tar.gz) = HvZ8DcejOoCk+2tbaBakqDCUYrKQaOCpumSVOcGG9EM=
+SIZE (foomatic-filters-4.0.3.tar.gz) = 239548
--- a/print/foomatic-filters/patches/patch-configure
+++ b/print/foomatic-filters/patches/patch-configure
@ -0,0 +1,32 @@
+$OpenBSD: patch-configure,v 1.1 2009/12/10 10:57:21 ajacoutot Exp $
+--- configure.orig	Wed Aug 19 20:08:45 2009
+++ configure	Mon Dec  7 18:03:22 2009
+@@ -6804,8 +6804,8 @@ done
+ 
+ 
+ 
+-ETCSEARCHPATH=${prefix}/etc:/usr/etc:/usr/local/etc
+-LIBSEARCHPATH=${prefix}/lib:${prefix}/lib64:/usr/lib:/usr/lib64:/usr/local/lib:${prefix}/libexec:/usr/libexec:/usr/local/libexec
+ETCSEARCHPATH=!!SYSCONFDIR!!
+LIBSEARCHPATH=!!LOCALBASE!!/lib:/usr/lib:!!LOCALBASE!!/libexec:/usr/libexec
+ 
+ uname=`uname`
+ uversion=`uname -r | sed -e '1,$s/[^0-9]//g'`
+@@ -7346,7 +7346,7 @@ if test "${ac_cv_lib_gs_gsapi_new_instance+set}" = set
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lgs  $LIBS"
+LIBS="-lgs -pthread $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -7406,7 +7406,7 @@ if test $ac_cv_lib_gs_gsapi_new_instance = yes; then
+ #define HAVE_LIBGS 1
+ _ACEOF
+ 
+-  LIBS="-lgs $LIBS"
+  LIBS="-lgs -pthread $LIBS"
+ 
+ fi
+ 
--- a/print/foomatic-filters/patches/patch-foomaticrip_c
+++ b/print/foomatic-filters/patches/patch-foomaticrip_c
@ -0,0 +1,17 @@
+$OpenBSD: patch-foomaticrip_c,v 1.1 2009/12/10 10:57:21 ajacoutot Exp $
+--- foomaticrip.c.orig	Wed Aug 19 20:08:41 2009
+++ foomaticrip.c	Thu Dec 10 11:21:04 2009
+@@ -151,11 +151,11 @@ char echopath[PATH_MAX] = "echo";
+ 
+ /* CUPS raster drivers are searched here */
+ char cupsfilterpath[PATH_MAX] = "/usr/local/lib/cups/filter:"
+-                                "/usr/local/libexec/cups/filter:"
+                                "${LOCALBASE}/libexec/cups/filter:"
+                                 "/opt/cups/filter:"
+                                 "/usr/lib/cups/filter";
+ 
+-char modern_shell[64] = "/bin/bash";
+char modern_shell[64] = "/bin/sh";
+ 
+ void config_set_option(const char *key, const char *value)
+ {
--- a/print/foomatic-filters/pkg/PLIST
+++ b/print/foomatic-filters/pkg/PLIST
@ -1,15 +1,17 @@
-@comment $OpenBSD: PLIST,v 1.3 2008/11/19 05:30:13 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.4 2009/12/10 10:57:21 ajacoutot Exp $
@conflict hpijs-<1.5p1
@conflict cups-<=1.2.7p13
-bin/foomatic-gswrapper
-bin/foomatic-rip
+@bin bin/foomatic-rip
@comment lib/ppr/
@comment lib/ppr/interfaces/
@comment lib/ppr/interfaces/foomatic-rip
@comment lib/ppr/lib/
@comment lib/ppr/lib/foomatic-rip
+libexec/cups/
+libexec/cups/backend/
+libexec/cups/backend/beh
+libexec/cups/filter/
 libexec/cups/filter/foomatic-rip
-@man man/man1/foomatic-gswrapper.1
@man man/man1/foomatic-rip.1
 share/examples/foomatic/
@sample ${SYSCONFDIR}/foomatic/