From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jul 13 18:10:14 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3B0E5106567C for ; Tue, 13 Jul 2010 18:10:14 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 185018FC1E for ; Tue, 13 Jul 2010 18:10:14 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o6DIADDi084880 for ; Tue, 13 Jul 2010 18:10:13 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o6DIADsq084873; Tue, 13 Jul 2010 18:10:13 GMT (envelope-from gnats) Resent-Date: Tue, 13 Jul 2010 18:10:13 GMT Resent-Message-Id: <201007131810.o6DIADsq084873@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 665781065670 for ; Tue, 13 Jul 2010 18:05:42 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from msa104lp.auone-net.jp (msa104lp.auone-net.jp [222.3.140.167]) by mx1.freebsd.org (Postfix) with ESMTP id DA2858FC1D for ; Tue, 13 Jul 2010 18:05:41 +0000 (UTC) Received: from localhost.localdomain (ZT037007.ppp.dion.ne.jp [59.128.37.7]) by msa104lp.auone-net.jp (au one net msa) with ESMTP id CAF0A2BC031 for ; Wed, 14 Jul 2010 03:05:34 +0900 (JST) Message-Id: <20100714030146.16f0f027.tkato432@yahoo.com> Date: Wed, 14 Jul 2010 03:01:46 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/148569: Update port: print/pnm2ppa to 1.13 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Jul 2010 18:10:14 -0000 >Number: 148569 >Category: ports >Synopsis: Update port: print/pnm2ppa to 1.13 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Jul 13 18:10:13 UTC 2010 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 7.3-RELEASE i386 >Organization: >Environment: >Description: - Update to version 1.13 New file: files/patch-docs__en__pnm2ppa.1 files/patch-pnm2ppa.conf files/patch-text-en.h pkg-install Remove file: files/patch-aa files/patch-ab files/patch-ac files/patch-ad files/patch-ae files/patch-af pkg-plist >How-To-Repeat: >Fix: diff -urN /usr/ports/print/pnm2ppa/Makefile print/pnm2ppa/Makefile --- /usr/ports/print/pnm2ppa/Makefile 2010-03-28 17:44:42.000000000 +0900 +++ print/pnm2ppa/Makefile 2010-05-30 17:50:31.000000000 +0900 @@ -6,25 +6,36 @@ # PORTNAME= pnm2ppa -PORTVERSION= 1.12 -PORTREVISION= 3 +PORTVERSION= 1.13 CATEGORIES= print MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Convert PNM images to PPA for some HP printers -USE_GHOSTSCRIPT_RUN= yes - -RUN_DEPENDS= enscript:${PORTSDIR}/print/enscript-letter +OPTIONS= A4SIZE "Set A4 (not Letter) as a default paper size" off +USE_GHOSTSCRIPT_RUN= yes USE_GMAKE= yes -MAKE_ENV= LDFLAGS="${LDFLAGS}" -CFLAGS+= ${CPPFLAGS} +GNU_CONFIGURE= yes MAN1= pnm2ppa.1 +PLIST_FILES= bin/asciippafilter bin/calibrate_ppa bin/pnm2ppa bin/ppafilter \ + etc/pnm2ppa.conf.sample + +PKGDEINSTALL= ${PKGINSTALL} + +.include + +.if defined(A4) || defined(WITH_A4SIZE) +RUN_DEPENDS= enscript:${PORTSDIR}/print/enscript-a4 +.else +RUN_DEPENDS= enscript:${PORTSDIR}/print/enscript-letter +.endif post-patch: + @${REINPLACE_CMD} -e 's|-Wformat-security -g|-Wformat-security| ; \ + s|-O2 -DNDEBUG|-DNDEBUG|' ${WRKSRC}/configure @${SED} -e "s:%%PREFIX%%:${PREFIX}:g" \ ${WRKSRC}/pnm2ppa.conf > ${WRKSRC}/pnm2ppa.conf.sample @${SED} -e "s:%%PREFIX%%:${PREFIX}:g" \ @@ -43,9 +54,8 @@ ${INSTALL_SCRIPT} ${WRKSRC}/ppafilter ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/pnm2ppa.1 ${MANPREFIX}/man/man1 ${INSTALL_DATA} ${WRKSRC}/pnm2ppa.conf.sample ${PREFIX}/etc -.if !exists(${PREFIX}/etc/pnm2ppa.conf) - ${CP} ${PREFIX}/etc/pnm2ppa.conf.sample ${PREFIX}/etc/pnm2ppa.conf -.endif + @${SETENV} PKG_PREFIX="${PREFIX}" \ + ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${CAT} ${PKGMESSAGE} -.include +.include diff -urN /usr/ports/print/pnm2ppa/distinfo print/pnm2ppa/distinfo --- /usr/ports/print/pnm2ppa/distinfo 2005-11-26 19:30:39.000000000 +0900 +++ print/pnm2ppa/distinfo 2010-05-30 00:36:59.000000000 +0900 @@ -1,3 +1,3 @@ -MD5 (pnm2ppa-1.12.tar.gz) = effd8c42bbe7c970e70fa7d9d991275b -SHA256 (pnm2ppa-1.12.tar.gz) = d76c1dc4456d5f2eb217e0a32e8d71e6adac189e5f1753e84d8eb910404700b6 -SIZE (pnm2ppa-1.12.tar.gz) = 191113 +MD5 (pnm2ppa-1.13.tar.gz) = 5354e54ade6de7a35370e5b47030274c +SHA256 (pnm2ppa-1.13.tar.gz) = 1c50ea2c97b232f5bee6ac3fab408d64b6f1380f1e289ac278778a7e368e7379 +SIZE (pnm2ppa-1.13.tar.gz) = 291190 diff -urN /usr/ports/print/pnm2ppa/files/patch-aa print/pnm2ppa/files/patch-aa --- /usr/ports/print/pnm2ppa/files/patch-aa 2003-02-04 20:51:32.000000000 +0900 +++ print/pnm2ppa/files/patch-aa 1970-01-01 09:00:00.000000000 +0900 @@ -1,23 +0,0 @@ ---- Makefile.orig Sun Oct 6 10:27:36 2002 -+++ Makefile Mon Nov 18 21:08:50 2002 -@@ -5,14 +5,14 @@ - # paths to locations where the pnm2ppa binary, the configuration file, - # and the man page should be installed. On some systems (like Solaris) - # the install command requires the syntax BINDIR="-f /usr/local/bin". --BINDIR="/usr/local/bin" --CONFDIR="/etc" --MANDIR="/usr/local/man/man1" -+BINDIR="${PREFIX}/bin" -+CONFDIR="${PREFIX}/etc" -+MANDIR="${PREFIX}/man/man1" - - #compiler and linker options: --CC=gcc --CFLAGS=-Wall -pedantic -O2 --LDFLAGS=-lm -+CC?=gcc -+CFLAGS+=-DCONFDIR=\"$(CONFDIR)\" -+LDFLAGS+=-lm - - INSTALL=install - # Install under Linux and other versions with the -b (backup) option diff -urN /usr/ports/print/pnm2ppa/files/patch-ab print/pnm2ppa/files/patch-ab --- /usr/ports/print/pnm2ppa/files/patch-ab 2001-03-04 06:19:13.000000000 +0900 +++ print/pnm2ppa/files/patch-ab 1970-01-01 09:00:00.000000000 +0900 @@ -1,11 +0,0 @@ ---- pnm2ppa.c.orig Sun Nov 12 04:53:03 2000 -+++ pnm2ppa.c Tue Jan 30 21:27:52 2001 -@@ -279,7 +279,7 @@ - printf - (" The order in which parameters are specified is important:\n"); - printf -- (" the file /etc/pnm2ppa.conf, if it exists, is processed as a configuration\n"); -+ (" the file " CONFDIR "/pnm2ppa.conf, if it exists, is processed as a configuration\n"); - printf - (" file before any command-line parameters are processed.\n"); - printf diff -urN /usr/ports/print/pnm2ppa/files/patch-ac print/pnm2ppa/files/patch-ac --- /usr/ports/print/pnm2ppa/files/patch-ac 2001-03-04 06:19:13.000000000 +0900 +++ print/pnm2ppa/files/patch-ac 1970-01-01 09:00:00.000000000 +0900 @@ -1,45 +0,0 @@ ---- docs/en/pnm2ppa.1.orig Mon Nov 6 10:16:38 2000 -+++ docs/en/pnm2ppa.1 Tue Jan 30 22:02:49 2001 -@@ -51,13 +51,13 @@ - .\"{{{ -f configFile - .IP "\fB\-f \fIconfigFile\fR\fP" - Re-reads configuration from \fIconfigFile\fR (after --initially reading it from /etc/pnm2ppa.conf). -+initially reading it from %%PREFIX%%/etc/pnm2ppa.conf). - .\"}}} - - .\"{{{ -F GammaFile - .IP "\fB\-F \fIGammaFile\fR\fP" - Overrides reading the color-correction table (Gamma curve) from the default --file /etc/pnm2ppa.gamma, and uses \fIGammaFile\fR instead. -+file %%PREFIX%%/etc/pnm2ppa.gamma, and uses \fIGammaFile\fR instead. - .\"}}} - - .\"{{{ --fd -@@ -161,7 +161,7 @@ - - - .SH NOTES --The default configuration file \fI/etc/pnm2ppa.conf\fR is read in first. Command line arguments then modify the resulting definitions. -+The default configuration file \fI%%PREFIX%%/etc/pnm2ppa.conf\fR is read in first. Command line arguments then modify the resulting definitions. - .PP - The \fB-v\fP option resets all definitions (margins, offsets, etc.) back to - the inbuilt defaults for that printer and should be used before subsequent -@@ -171,13 +171,13 @@ - - .SH FILES - --.\"{{{ /etc/pnm2ppa.conf --.IP "\fB\fI/etc/pnm2ppa.conf\fR\fP" -+.\"{{{ %%PREFIX%%/etc/pnm2ppa.conf -+.IP "\fB\fI%%PREFIX%%/etc/pnm2ppa.conf\fR\fP" - Default configuration file. - .\"}}} - --.\"{{{ /etc/pnm2ppa.gamma --.IP "\fB\fI/etc/pnm2ppa.gamma\fR\fP" -+.\"{{{ %%PREFIX%%/etc/pnm2ppa.gamma -+.IP "\fB\fI%%PREFIX%%/etc/pnm2ppa.gamma\fR\fP" - Default Gamma (color-correction) file. - .\"}}} - diff -urN /usr/ports/print/pnm2ppa/files/patch-ad print/pnm2ppa/files/patch-ad --- /usr/ports/print/pnm2ppa/files/patch-ad 2002-11-19 22:32:01.000000000 +0900 +++ print/pnm2ppa/files/patch-ad 1970-01-01 09:00:00.000000000 +0900 @@ -1,29 +0,0 @@ ---- pnm2ppa.conf.orig Sun Nov 10 06:47:47 2002 -+++ pnm2ppa.conf Mon Nov 18 21:10:36 2002 -@@ -1,7 +1,7 @@ - # Sample configuration file - # - # This file will be automatically read upon startup if it is placed in --# /etc/pnm2ppa.conf -+# %%PREFIX%%/etc/pnm2ppa.conf - # - # uncomment entries by removing "#" to activate them. - # -@@ -44,7 +44,7 @@ - log_info 1 # <= COMMENT THIS OUT TO GET THE NEW DEFAULT BEHAVIOR! - - # Note: the "silent 1" and "log_info" keywords are only accepted from the --# system configuration file (/etc/pnm2ppa.conf), and not from configuration -+# system configuration file (%%PREFIX%%/etc/pnm2ppa.conf), and not from configuration - # files specified by users with the pnm2ppa option "-f". - - #---------set the margins of the printed page------------------- -@@ -123,7 +123,7 @@ - #------------Color correct curve Gamma parameters------------------------- - # Gamma color correction values for Red, Green and Blue: - # (Note: a more effective method of color correction is to use --# a calibration file /etc/pnm2ppa.gamma, in which case these -+# a calibration file %%PREFIX%%/etc/pnm2ppa.gamma, in which case these - # Gamma values will not be used. See COLOR.html or COLOR.txt) - # The pnm2ppa option --noGamma suppresses color correction. - diff -urN /usr/ports/print/pnm2ppa/files/patch-ae print/pnm2ppa/files/patch-ae --- /usr/ports/print/pnm2ppa/files/patch-ae 2001-03-04 06:19:13.000000000 +0900 +++ print/pnm2ppa/files/patch-ae 1970-01-01 09:00:00.000000000 +0900 @@ -1,13 +0,0 @@ ---- pnm2ppa.h.orig Mon Oct 23 11:40:36 2000 -+++ pnm2ppa.h Tue Jan 30 21:28:49 2001 -@@ -20,8 +20,8 @@ - - #ifdef __PNM2PPA_C__ - --static char *defaultcfgfile = "/etc/pnm2ppa.conf"; --static char *defaultgammafile = "/etc/pnm2ppa.gamma"; -+static char *defaultcfgfile = CONFDIR "/pnm2ppa.conf"; -+static char *defaultgammafile = CONFDIR "/pnm2ppa.gamma"; - - static ppaPrinter_t printer; - diff -urN /usr/ports/print/pnm2ppa/files/patch-af print/pnm2ppa/files/patch-af --- /usr/ports/print/pnm2ppa/files/patch-af 2001-03-04 06:19:13.000000000 +0900 +++ print/pnm2ppa/files/patch-af 1970-01-01 09:00:00.000000000 +0900 @@ -1,11 +0,0 @@ ---- text-en.h.orig Sat Oct 14 17:35:25 2000 -+++ text-en.h Tue Jan 30 21:42:43 2001 -@@ -73,7 +73,7 @@ - - /* 24 */ "Verbose logging to console\n", - -- /* 25 */ "Please configure your printer in /etc/pnm2ppa.conf\n", -+ /* 25 */ "Please configure your printer in " CONFDIR "/pnm2ppa.conf\n", - - /* 26 */ "couldn't open config file \n", - diff -urN /usr/ports/print/pnm2ppa/files/patch-docs__en__pnm2ppa.1 print/pnm2ppa/files/patch-docs__en__pnm2ppa.1 --- /usr/ports/print/pnm2ppa/files/patch-docs__en__pnm2ppa.1 1970-01-01 09:00:00.000000000 +0900 +++ print/pnm2ppa/files/patch-docs__en__pnm2ppa.1 2001-03-04 06:19:13.000000000 +0900 @@ -0,0 +1,45 @@ +--- docs/en/pnm2ppa.1.orig Mon Nov 6 10:16:38 2000 ++++ docs/en/pnm2ppa.1 Tue Jan 30 22:02:49 2001 +@@ -51,13 +51,13 @@ + .\"{{{ -f configFile + .IP "\fB\-f \fIconfigFile\fR\fP" + Re-reads configuration from \fIconfigFile\fR (after +-initially reading it from /etc/pnm2ppa.conf). ++initially reading it from %%PREFIX%%/etc/pnm2ppa.conf). + .\"}}} + + .\"{{{ -F GammaFile + .IP "\fB\-F \fIGammaFile\fR\fP" + Overrides reading the color-correction table (Gamma curve) from the default +-file /etc/pnm2ppa.gamma, and uses \fIGammaFile\fR instead. ++file %%PREFIX%%/etc/pnm2ppa.gamma, and uses \fIGammaFile\fR instead. + .\"}}} + + .\"{{{ --fd +@@ -161,7 +161,7 @@ + + + .SH NOTES +-The default configuration file \fI/etc/pnm2ppa.conf\fR is read in first. Command line arguments then modify the resulting definitions. ++The default configuration file \fI%%PREFIX%%/etc/pnm2ppa.conf\fR is read in first. Command line arguments then modify the resulting definitions. + .PP + The \fB-v\fP option resets all definitions (margins, offsets, etc.) back to + the inbuilt defaults for that printer and should be used before subsequent +@@ -171,13 +171,13 @@ + + .SH FILES + +-.\"{{{ /etc/pnm2ppa.conf +-.IP "\fB\fI/etc/pnm2ppa.conf\fR\fP" ++.\"{{{ %%PREFIX%%/etc/pnm2ppa.conf ++.IP "\fB\fI%%PREFIX%%/etc/pnm2ppa.conf\fR\fP" + Default configuration file. + .\"}}} + +-.\"{{{ /etc/pnm2ppa.gamma +-.IP "\fB\fI/etc/pnm2ppa.gamma\fR\fP" ++.\"{{{ %%PREFIX%%/etc/pnm2ppa.gamma ++.IP "\fB\fI%%PREFIX%%/etc/pnm2ppa.gamma\fR\fP" + Default Gamma (color-correction) file. + .\"}}} + diff -urN /usr/ports/print/pnm2ppa/files/patch-pnm2ppa.conf print/pnm2ppa/files/patch-pnm2ppa.conf --- /usr/ports/print/pnm2ppa/files/patch-pnm2ppa.conf 1970-01-01 09:00:00.000000000 +0900 +++ print/pnm2ppa/files/patch-pnm2ppa.conf 2002-11-19 22:32:01.000000000 +0900 @@ -0,0 +1,29 @@ +--- pnm2ppa.conf.orig Sun Nov 10 06:47:47 2002 ++++ pnm2ppa.conf Mon Nov 18 21:10:36 2002 +@@ -1,7 +1,7 @@ + # Sample configuration file + # + # This file will be automatically read upon startup if it is placed in +-# /etc/pnm2ppa.conf ++# %%PREFIX%%/etc/pnm2ppa.conf + # + # uncomment entries by removing "#" to activate them. + # +@@ -44,7 +44,7 @@ + log_info 1 # <= COMMENT THIS OUT TO GET THE NEW DEFAULT BEHAVIOR! + + # Note: the "silent 1" and "log_info" keywords are only accepted from the +-# system configuration file (/etc/pnm2ppa.conf), and not from configuration ++# system configuration file (%%PREFIX%%/etc/pnm2ppa.conf), and not from configuration + # files specified by users with the pnm2ppa option "-f". + + #---------set the margins of the printed page------------------- +@@ -123,7 +123,7 @@ + #------------Color correct curve Gamma parameters------------------------- + # Gamma color correction values for Red, Green and Blue: + # (Note: a more effective method of color correction is to use +-# a calibration file /etc/pnm2ppa.gamma, in which case these ++# a calibration file %%PREFIX%%/etc/pnm2ppa.gamma, in which case these + # Gamma values will not be used. See COLOR.html or COLOR.txt) + # The pnm2ppa option --noGamma suppresses color correction. + diff -urN /usr/ports/print/pnm2ppa/files/patch-text-en.h print/pnm2ppa/files/patch-text-en.h --- /usr/ports/print/pnm2ppa/files/patch-text-en.h 1970-01-01 09:00:00.000000000 +0900 +++ print/pnm2ppa/files/patch-text-en.h 2010-05-30 00:44:43.000000000 +0900 @@ -0,0 +1,11 @@ +--- text-en.h.orig Sat Oct 14 17:35:25 2000 ++++ text-en.h Tue Jan 30 21:42:43 2001 +@@ -73,7 +73,7 @@ + + /* 24 */ "Verbose logging to console\n", + +- /* 25 */ "Please configure your printer in /etc/pnm2ppa.conf\n", ++ /* 25 */ "Please configure your printer in " SYSCONFDIR "/pnm2ppa.conf\n", + + /* 26 */ "couldn't open config file \n", + diff -urN /usr/ports/print/pnm2ppa/pkg-install print/pnm2ppa/pkg-install --- /usr/ports/print/pnm2ppa/pkg-install 1970-01-01 09:00:00.000000000 +0900 +++ print/pnm2ppa/pkg-install 2010-06-09 23:01:58.000000000 +0900 @@ -0,0 +1,18 @@ +#!/bin/sh +# $FreeBSD$ + +sysconfdir=${PKG_PREFIX}/etc +conffile=pnm2ppa.conf + +case $2 in +POST-INSTALL) + if test ! -f ${sysconfdir}/${conffile}; then + cp ${sysconfdir}/${conffile}.sample ${sysconfdir}/${conffile}; + fi +;; +DEINSTALL) + if cmp -s ${sysconfdir}/${conffile} ${sysconfdir}/${conffile}.sample; then + rm -f ${sysconfdir}/${conffile} + fi +;; +esac diff -urN /usr/ports/print/pnm2ppa/pkg-message print/pnm2ppa/pkg-message --- /usr/ports/print/pnm2ppa/pkg-message 2001-03-04 06:19:12.000000000 +0900 +++ print/pnm2ppa/pkg-message 2010-05-30 17:18:41.000000000 +0900 @@ -15,7 +15,3 @@ :if=/usr/local/bin/ppafilter:\\" :mx#0:\\" :sh:" - -Please be sure that you install the proper flavor of" -enscript, either A4 or Letter, by setting the PAPERSIZE" -environment variable." diff -urN /usr/ports/print/pnm2ppa/pkg-plist print/pnm2ppa/pkg-plist --- /usr/ports/print/pnm2ppa/pkg-plist 2001-03-04 06:19:12.000000000 +0900 +++ print/pnm2ppa/pkg-plist 1970-01-01 09:00:00.000000000 +0900 @@ -1,7 +0,0 @@ -bin/asciippafilter -bin/calibrate_ppa -bin/pnm2ppa -bin/ppafilter -@unexec if cmp -s %D/etc/pnm2ppa.conf %D/etc/pnm2ppa.conf.sample; then rm -f %D/etc/pnm2ppa.conf; fi -etc/pnm2ppa.conf.sample -@exec test -f %B/pnm2ppa.conf || cp %B/%f %B/pnm2ppa.conf >Release-Note: >Audit-Trail: >Unformatted: