5 files changed, 76 insertions, 16 deletions

diff --git a/print/ifhp/Makefile b/print/ifhp/Makefile
index d5527ad2769d..c62ad72257ff 100644
--- a/print/ifhp/Makefile
+++ b/print/ifhp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ifhp
-PORTVERSION=	3.5.7
+PORTVERSION=	3.5.20
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.lprng.com/pub/%SUBDIR%/ \
 		ftp://ftp.cise.ufl.edu/pub/mirrors/%SUBDIR%/ \
@@ -21,10 +21,15 @@ COMMENT=	IFHP - A highly configurable print filter for LPRng
 
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
+USE_GHOSTSCRIPT=	yes
 
-CONFIGURE_ARGS= \
-	--with-ldopts="-L${LOCALBASE}/lib" \
-	--with-ccopts="-I${LOCALBASE}/include"
+MAN8=		ifhp.8 textps.8
+
+SUB_FILES=	pkg-message
+SUB_LIST=	DOCSDIR=${DOCSDIR}
+
+CONFIGURE_ENV=	LDFLAGS="${LDFLAGS} -L{LOCALBASE}/lib" \
+		CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
 .if defined(PREFIX)
 CONFIGURE_ARGS+=	--prefix="${PREFIX}"
 .endif
@@ -32,7 +37,32 @@ CONFIGURE_ARGS+=	--prefix="${PREFIX}"
 CONFIGURE_ARGS+=	--sysconfdir="${SYSCONFDIR}"
 .endif
 
-MAN8=	ifhp.8 textps.8
+OPTIONS=	FOOMATIC	"Enable foomatic support"	on \
+		SNMP		"Enable SNMP support"		on
+
+.if !defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=	--enable-nls --with-libiconv-prefix=${LOCALBASE} \
+			--with-libintl-prefix=${LOCALBASE}
+USE_GETTEXT=		yes
+PLIST_SUB+=		NLS=""
+.else
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=		NLS="@comment "
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITHOUT_FOOMATIC)
+CONFIGURE_ARGS+=	--disable-foomatic
+.else
+BUILD_DEPENDS+=		foomatic-rip:${PORTSDIR}/print/foomatic-filters
+.endif
+
+.if defined(WITHOUT_SNMP)
+CONFIGURE_ARGS+=	--disable-snmp
+.else
+BUILD_DEPENDS+=		${SITE_PERL}/Net/SNMP.pm:${PORTSDIR}/net-mgmt/p5-Net-SNMP
+.endif
 
 pre-everything::
 	@${ECHO_MSG} "If you want to replace the default printing system with LPRng, use:"
@@ -52,10 +82,9 @@ post-install:
 .if !defined(NOPORTDOCS)
 	@${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m 0555 ${DOCSDIR}
 .for ext in html pdf ppt ps txt gif jpg png
-	@for i in `${LS} ${WRKSRC}/HOWTO |${GREP} "\.${ext}$$"`; \
-		do ${INSTALL_DATA} ${WRKSRC}/HOWTO/$$i ${DOCSDIR}; done
+	@for i in `${LS} ${WRKSRC}/DOCS |${GREP} "\.${ext}$$"`; \
+		do ${INSTALL_DATA} ${WRKSRC}/DOCS/$$i ${DOCSDIR}; done
 .endfor
 .endif
-	@${SED} -e "s!DOCSDIR!${DOCSDIR}/!" ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/print/ifhp/distinfo b/print/ifhp/distinfo
index cc6fa8482345..c1e7e2d8ac08 100644
--- a/print/ifhp/distinfo
+++ b/print/ifhp/distinfo
@@ -1,3 +1,3 @@
-MD5 (ifhp-3.5.7.tgz) = e2d36aeddc410dc57e22663265e33946
-SHA256 (ifhp-3.5.7.tgz) = 70982d749a0891c1cb826601a1e9cc8067c0ab594fcf94cd5a884df20c737472
-SIZE (ifhp-3.5.7.tgz) = 894236
+MD5 (ifhp-3.5.20.tgz) = 25b151b3adb953b571e6b0a7cc9937f3
+SHA256 (ifhp-3.5.20.tgz) = c14dc351f3b53448087702e3c7d68e7741d00cd4544635f6b3ce699ff751b56b
+SIZE (ifhp-3.5.20.tgz) = 1356478
diff --git a/print/ifhp/pkg-message b/print/ifhp/files/pkg-message.in
index 021815e246cd..4fe99381cd6d 100644
--- a/print/ifhp/pkg-message
+++ b/print/ifhp/files/pkg-message.in
@@ -1,7 +1,7 @@
 The ifhp configuration file is ifhp.conf
 
 For further information, have a look at:
-  DOCSDIR
+  %%DOCSDIR%%
 also:
   WWW: http://www.lprng.com/
 
diff --git a/print/ifhp/pkg-install b/print/ifhp/pkg-install
index f6acac22c9ac..7db10142ade4 100644
--- a/print/ifhp/pkg-install
+++ b/print/ifhp/pkg-install
@@ -3,7 +3,7 @@ PREFIX=/usr/local
 SYSCONFDIR=/usr/local/etc
 IFHP_CONF=/usr/local/etc/ifhp.conf
 MANDIR=/usr/local/man
-VERSION=3.5.7
+VERSION=3.5.20
 #
 # -- START --
 # $Id: postinstall.freebsd.sh,v 1.9 2001/12/12 01:54:49 papowell Exp papowell $
diff --git a/print/ifhp/pkg-plist b/print/ifhp/pkg-plist
index 12c13b6d7a2e..40f497c06d8c 100644
--- a/print/ifhp/pkg-plist
+++ b/print/ifhp/pkg-plist
@@ -1,12 +1,43 @@
+@unexec if cmp -s %D/etc/ifhp.conf.sample %D/etc/ifhp.conf; then rm -f %D/etc/ifhp.conf; fi
+bin/extract_pjl
+bin/snmp_printer_status
 etc/ifhp.conf.sample
+libexec/filters/UTILS/400095.ppd
+libexec/filters/UTILS/HP2500CJ.PPD
+libexec/filters/UTILS/Watermarks
+libexec/filters/UTILS/accounting.sh
+libexec/filters/UTILS/accounting.sh.in
+libexec/filters/UTILS/ellipse.ps
+libexec/filters/UTILS/extract_pjl
+libexec/filters/UTILS/fixupdate
+libexec/filters/UTILS/fixupdate.in
+libexec/filters/UTILS/install-sh
+libexec/filters/UTILS/mkinstalldirs
+libexec/filters/UTILS/one.pcl
+libexec/filters/UTILS/one.pdf
+libexec/filters/UTILS/one.pjl
+libexec/filters/UTILS/one.ps
+libexec/filters/UTILS/phaser5400_snmp_mib_query
+libexec/filters/UTILS/sendhp.sh
+libexec/filters/UTILS/sendhp.sh.in
+libexec/filters/UTILS/stopstr.c
+libexec/filters/UTILS/supported
+libexec/filters/UTILS/supported.in
+libexec/filters/UTILS/test1
+libexec/filters/UTILS/use_snmp_for_status
+libexec/filters/extract_pjl
 libexec/filters/ifhp
+libexec/filters/snmp_printer_status
+libexec/filters/snmp_printer_status.conf
 libexec/filters/textps
 libexec/filters/wrapper
-%%PORTDOCS%%%%DOCSDIR%%/IFHP-HOWTO.html
-%%PORTDOCS%%%%DOCSDIR%%/IFHP-HOWTO.pdf
+%%NLS%%share/locale/fr/LC_MESSAGES/ifhp.mo
+%%PORTDOCS%%%%DOCSDIR%%/IFHP-Reference.html
+%%PORTDOCS%%%%DOCSDIR%%/IFHP-Reference.pdf
 %%PORTDOCS%%%%DOCSDIR%%/LPRng.jpg
 %%PORTDOCS%%%%DOCSDIR%%/LPRngT-L.jpg
 %%PORTDOCS%%%%DOCSDIR%%/LPRngT-S.jpg
 %%PORTDOCS%%%%DOCSDIR%%/ifhp-S.jpg
+@dirrm libexec/filters/UTILS
 @dirrm libexec/filters
 %%PORTDOCS%%@dirrm %%DOCSDIR%%