- Update to 1.13

PR:		148569
Submitted by:	Ports Fury

11 files changed, 43 insertions, 73 deletions

diff --git a/print/pnm2ppa/Makefile b/print/pnm2ppa/Makefile
index 66c1da4f2d70..8c621c7f5a5d 100644
--- a/print/pnm2ppa/Makefile
+++ b/print/pnm2ppa/Makefile
@@ -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 <bsd.port.pre.mk>
+
+.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 @@ do-install:
 	${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 <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/print/pnm2ppa/distinfo b/print/pnm2ppa/distinfo
index 82f1e683184a..1a5b9b0799d9 100644
--- a/print/pnm2ppa/distinfo
+++ b/print/pnm2ppa/distinfo
@@ -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 --git a/print/pnm2ppa/files/patch-aa b/print/pnm2ppa/files/patch-aa
deleted file mode 100644
index 8813af595200..000000000000
--- a/print/pnm2ppa/files/patch-aa
+++ /dev/null
@@ -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 --git a/print/pnm2ppa/files/patch-ab b/print/pnm2ppa/files/patch-ab
deleted file mode 100644
index 3693fc350c8d..000000000000
--- a/print/pnm2ppa/files/patch-ab
+++ /dev/null
@@ -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 --git a/print/pnm2ppa/files/patch-ae b/print/pnm2ppa/files/patch-ae
deleted file mode 100644
index 339801657a11..000000000000
--- a/print/pnm2ppa/files/patch-ae
+++ /dev/null
@@ -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 --git a/print/pnm2ppa/files/patch-ac b/print/pnm2ppa/files/patch-docs__en__pnm2ppa.1
index 0d4d7097ebee..0d4d7097ebee 100644
--- a/print/pnm2ppa/files/patch-ac
+++ b/print/pnm2ppa/files/patch-docs__en__pnm2ppa.1
diff --git a/print/pnm2ppa/files/patch-ad b/print/pnm2ppa/files/patch-pnm2ppa.conf
index 6539862efdf9..6539862efdf9 100644
--- a/print/pnm2ppa/files/patch-ad
+++ b/print/pnm2ppa/files/patch-pnm2ppa.conf
diff --git a/print/pnm2ppa/files/patch-af b/print/pnm2ppa/files/patch-text-en.h
index 2a7ad69beae1..be35fe31b918 100644
--- a/print/pnm2ppa/files/patch-af
+++ b/print/pnm2ppa/files/patch-text-en.h
@@ -5,7 +5,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",
++  /* 25 */ "Please configure your printer in " SYSCONFDIR "/pnm2ppa.conf\n",
    
    /* 26 */ "couldn't open config file \n",
  
diff --git a/print/pnm2ppa/pkg-install b/print/pnm2ppa/pkg-install
new file mode 100644
index 000000000000..4d8fc3f743ba
--- /dev/null
+++ b/print/pnm2ppa/pkg-install
@@ -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 --git a/print/pnm2ppa/pkg-message b/print/pnm2ppa/pkg-message
index aa1680cf304a..744c5cc990eb 100644
--- a/print/pnm2ppa/pkg-message
+++ b/print/pnm2ppa/pkg-message
@@ -15,7 +15,3 @@ or Postscript files, add the following lines to your"
 	        :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 --git a/print/pnm2ppa/pkg-plist b/print/pnm2ppa/pkg-plist
deleted file mode 100644
index 11e64a1d0a6a..000000000000
--- a/print/pnm2ppa/pkg-plist
+++ /dev/null
@@ -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