Date: Sat, 3 Jun 2006 17:22:35 +0100 From: Shaun Amott <shaun@inerd.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/98450: [PATCH] print/ifhp: Update 3.5.7 -> 3.5.20 Message-ID: <1149351755.34473@charon.picobyte.net> Resent-Message-ID: <200606031630.k53GUIjj043174@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 98450 >Category: ports >Synopsis: [PATCH] print/ifhp: Update 3.5.7 -> 3.5.20 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Jun 03 16:30:18 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Shaun Amott >Release: FreeBSD 6.1-STABLE i386 >Organization: >Environment: >Description: - Update ifhp to 3.5.20 - pkg-message -> files/pkg-message.in - Add some OPTIONS - Add optional NLS support Tinderbox tested on : 6.x (sparc64) Manually tested on : 7.x (i386) >How-To-Repeat: >Fix: --- ifhp.diff begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/print/ifhp/Makefile,v retrieving revision 1.10 diff -u -r1.10 Makefile --- Makefile 5 Apr 2006 05:56:31 -0000 1.10 +++ Makefile 3 Jun 2006 16:18:31 -0000 @@ -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 @@ 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+= --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 @@ .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> Index: distinfo =================================================================== RCS file: /home/ncvs/ports/print/ifhp/distinfo,v retrieving revision 1.5 diff -u -r1.5 distinfo --- distinfo 24 Jan 2006 01:00:45 -0000 1.5 +++ distinfo 3 Jun 2006 16:18:31 -0000 @@ -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 Index: pkg-install =================================================================== RCS file: /home/ncvs/ports/print/ifhp/pkg-install,v retrieving revision 1.1 diff -u -r1.1 pkg-install --- pkg-install 13 Apr 2002 23:44:08 -0000 1.1 +++ pkg-install 3 Jun 2006 16:18:31 -0000 @@ -3,7 +3,7 @@ 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 $ Index: pkg-message =================================================================== RCS file: pkg-message diff -N pkg-message --- pkg-message 13 Apr 2002 23:44:08 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -The ifhp configuration file is ifhp.conf - -For further information, have a look at: - DOCSDIR -also: - WWW: http://www.lprng.com/ - -Commercial support is available from Astart Technologies: - -Patrick Powell Astart Technologies, -papowell@astart.com 9475 Chesapeake Drive, Suite D, -Network and System San Diego, CA 92123 - Consulting 858-874-6543 FAX 858-279-8424 -URL: http://www.astart.com Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/print/ifhp/pkg-plist,v retrieving revision 1.6 diff -u -r1.6 pkg-plist --- pkg-plist 10 Jul 2003 13:23:03 -0000 1.6 +++ pkg-plist 3 Jun 2006 16:18:31 -0000 @@ -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%% Index: files/pkg-message.in =================================================================== RCS file: files/pkg-message.in diff -N files/pkg-message.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/pkg-message.in 3 Jun 2006 16:18:31 -0000 @@ -0,0 +1,14 @@ +The ifhp configuration file is ifhp.conf + +For further information, have a look at: + %%DOCSDIR%% +also: + WWW: http://www.lprng.com/ + +Commercial support is available from Astart Technologies: + +Patrick Powell Astart Technologies, +papowell@astart.com 9475 Chesapeake Drive, Suite D, +Network and System San Diego, CA 92123 + Consulting 858-874-6543 FAX 858-279-8424 +URL: http://www.astart.com --- ifhp.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1149351755.34473>