3 files changed, 30 insertions, 21 deletions

diff --git a/print/foomatic-db-engine/Makefile b/print/foomatic-db-engine/Makefile
index 6c902cf41854..d970fc82c2fb 100644
--- a/print/foomatic-db-engine/Makefile
+++ b/print/foomatic-db-engine/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	engine
-PORTVERSION=	4.0.7
+PORTVERSION=	4.0.9
 PORTEPOCH=	2
 CATEGORIES=	print
 MASTER_SITES=	http://www.openprinting.org/download/foomatic/ \
@@ -12,37 +12,32 @@ PKGNAMEPREFIX=	foomatic-db-
 DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	foomatic
 
-MAINTAINER=	acm@FreeBSD.org
+MAINTAINER=	bsam@FreeBSD.org
 COMMENT=	Foomatic database engine
 
-BUILD_DEPENDS=	curl:${PORTSDIR}/ftp/curl
-RUN_DEPENDS=	curl:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
 
-PROJECTHOST=	bsdistfiles
 USE_GNOME=	libxml2
-USES=		perl5
-USE_GMAKE=	yes
+USES=		gmake perl5
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	PERL=${PERL} LIBDIR=${PREFIX}/share/foomatic/
+CONFIGURE_ENV=	PERL=${PERL} LIBDIR=${PREFIX}/share/foomatic/ \
+		LIB_CUPS=${LOCALBASE}/libexec/cups \
+		CUPS_FILTERS=${LOCALBASE}/libexec/cups/filters \
+		CUPS_BACKENDS=${LOCALBASE}/libexec/cups/backends
 
-MAN1=		foomatic-printjob.1 foomatic-ppdfile.1 foomatic-perl-data.1 \
-		foomatic-configure.1 foomatic-compiledb.1 foomatic-combo-xml.1 \
-		foomatic-ppd-options.1
-MAN8=		foomatic-preferred-driver.8 \
-		foomatic-kitload.8 foomatic-getpjloptions.8 \
-		foomatic-addpjloptions.8
-
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e \
 		"s,sysconfdir=/etc,sysconfdir=\'${PREFIX}/etc\',g ; \
 		 s,/usr/local/etc:,${PREFIX}/etc:,g" ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e \
 		"s,/usr/local/bin:,${PREFIX}/bin:,g" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e \
+		"/ln -sf foo/ s,foomatic-ppdfile,$$\(BINDIR\)/foomatic-ppdfile," \
+		-e "/if \[ -d/ s,LIB_CUPS,PREFIX," ${WRKSRC}/Makefile.in
 
 post-install:
 .for file in foomatic-combo-xml foomatic-perl-data
-	@${STRIP_CMD} ${PREFIX}/bin/${file}
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${file}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/print/foomatic-db-engine/distinfo b/print/foomatic-db-engine/distinfo
index 3c6032051975..208de0eed2aa 100644
--- a/print/foomatic-db-engine/distinfo
+++ b/print/foomatic-db-engine/distinfo
@@ -1,2 +1,2 @@
-SHA256 (foomatic/foomatic-db-engine-4.0.7.tar.gz) = fc0712f23d9d70fa02295ac5ac3aad0f8e2b7bd15020d44b83c40f295ab6fe9c
-SIZE (foomatic/foomatic-db-engine-4.0.7.tar.gz) = 354069
+SHA256 (foomatic/foomatic-db-engine-4.0.9.tar.gz) = 7c9ef1c8e934de1b0e37104570d6b1ff8ea349f3ed6d965397b7c94449122f44
+SIZE (foomatic/foomatic-db-engine-4.0.9.tar.gz) = 360242
diff --git a/print/foomatic-db-engine/pkg-plist b/print/foomatic-db-engine/pkg-plist
index f3ae2234e895..ed2d6ad2d001 100644
--- a/print/foomatic-db-engine/pkg-plist
+++ b/print/foomatic-db-engine/pkg-plist
@@ -4,8 +4,8 @@ bin/foomatic-configure
 bin/foomatic-datafile
 bin/foomatic-perl-data
 bin/foomatic-ppd-options
-bin/foomatic-ppdfile
 bin/foomatic-ppd-to-xml
+bin/foomatic-ppdfile
 bin/foomatic-printjob
 bin/foomatic-searchprinter
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Foomatic/.packlist
@@ -13,8 +13,21 @@ bin/foomatic-searchprinter
 %%SITE_PERL%%/Foomatic/Defaults.pm
 %%SITE_PERL%%/Foomatic/PPD.pm
 %%SITE_PERL%%/Foomatic/UIElem.pm
+libexec/cups/driver/foomatic
+man/man1/foomatic-combo-xml.1.gz
+man/man1/foomatic-compiledb.1.gz
+man/man1/foomatic-configure.1.gz
+man/man1/foomatic-perl-data.1.gz
+man/man1/foomatic-ppd-options.1.gz
+man/man1/foomatic-ppdfile.1.gz
+man/man1/foomatic-printjob.1.gz
+man/man8/foomatic-addpjloptions.8.gz
+man/man8/foomatic-getpjloptions.8.gz
+man/man8/foomatic-kitload.8.gz
+man/man8/foomatic-preferred-driver.8.gz
 sbin/foomatic-addpjloptions
 sbin/foomatic-cleanupdrivers
+sbin/foomatic-extract-text
 sbin/foomatic-fix-xml
 sbin/foomatic-getpjloptions
 sbin/foomatic-kitload
@@ -22,12 +35,13 @@ sbin/foomatic-nonumericalids
 sbin/foomatic-preferred-driver
 sbin/foomatic-printermap-to-gutenprint-xml
 sbin/foomatic-replaceoldprinterids
-sbin/foomatic-extract-text
 share/foomatic/templates/pjl_enum_choice.xml
 share/foomatic/templates/pjl_enum_option.xml
 share/foomatic/templates/pjl_num_option.xml
 @dirrm share/foomatic/templates
 @dirrmtry share/foomatic
+@dirrmtry libexec/cups/driver
+@dirrmtry libexec/cups
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Foomatic
 @dirrm %%SITE_PERL%%/Foomatic
 @dirrmtry etc/foomatic