Update to 1.12: changes unknown, there is only a list of cvs commits in the

package, and it is not complete.
Patches by Soren Jacobsen in PR pkg/21667 with several changes by me.

8 files changed, 94 insertions, 54 deletions

diff --git a/print/pnm2ppa/MESSAGE b/print/pnm2ppa/MESSAGE
new file mode 100644
index 00000000000..6df622fa712
--- /dev/null
+++ b/print/pnm2ppa/MESSAGE
@@ -0,0 +1,7 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2003/09/17 18:40:45 jmmv Exp $
+
+You *must* edit the default ${PKG_SYSCONFDIR}/pnm2ppa.conf configuration
+file to get this package working.
+
+===========================================================================
diff --git a/print/pnm2ppa/Makefile b/print/pnm2ppa/Makefile
index 545d39ce23c..b02fc6947fd 100644
--- a/print/pnm2ppa/Makefile
+++ b/print/pnm2ppa/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/07/21 17:16:27 martti Exp $
+# $NetBSD: Makefile,v 1.8 2003/09/17 18:40:45 jmmv Exp $
 #
 
-DISTNAME=	pnm2ppa-1.04
-PKGREVISION=	1
+DISTNAME=	pnm2ppa-1.12
 CATEGORIES=	print converters graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pnm2ppa/}
 
@@ -10,8 +9,9 @@ MAINTAINER=	kei@NetBSD.org
 HOMEPAGE=	http://pnm2ppa.sourceforge.net/
 COMMENT=	Filter to convert PNM file to PPA used by some HP DJ printer
 
+USE_BUILDLINK2=	yes
 USE_PKGINSTALL=	yes
-CONF_FILES+=	${PREFIX}/share/examples/pnm2ppa/pnm2ppa.conf.default	\
+CONF_FILES=	${PREFIX}/share/examples/pnm2ppa/pnm2ppa.conf \
 		${PKG_SYSCONFDIR}/pnm2ppa.conf
 
 post-build:
diff --git a/print/pnm2ppa/PLIST b/print/pnm2ppa/PLIST
index f9469d48424..0e656cd9686 100644
--- a/print/pnm2ppa/PLIST
+++ b/print/pnm2ppa/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2003/01/19 08:45:38 salo Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/09/17 18:40:46 jmmv Exp $
 bin/calibrate_ppa
 bin/pnm2ppa
 man/man1/pnm2ppa.1
 share/doc/pnm2ppa/CALIBRATION.txt
 share/doc/pnm2ppa/COLOR.txt
-share/examples/pnm2ppa/pnm2ppa.conf.default
+share/examples/pnm2ppa/pnm2ppa.conf
 @dirrm share/examples/pnm2ppa
 @dirrm share/doc/pnm2ppa
diff --git a/print/pnm2ppa/distinfo b/print/pnm2ppa/distinfo
index b0bfe331771..3a05cff9a8f 100644
--- a/print/pnm2ppa/distinfo
+++ b/print/pnm2ppa/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.3 2003/01/19 08:45:38 salo Exp $
+$NetBSD: distinfo,v 1.4 2003/09/17 18:40:46 jmmv Exp $
 
-SHA1 (pnm2ppa-1.04.tar.gz) = a3cd26788779bc80fa6c8265f3b2aacaaa5acd92
-Size (pnm2ppa-1.04.tar.gz) = 163851 bytes
-SHA1 (patch-aa) = c9b392694659d4c9a2674725d28a9caa81ca208a
+SHA1 (pnm2ppa-1.12.tar.gz) = a4a8915cb9e3d01dd55bd5958b00a9d19b1d747d
+Size (pnm2ppa-1.12.tar.gz) = 191113 bytes
+SHA1 (patch-aa) = d31f9f5a79649568062549264458965d78abe597
+SHA1 (patch-ab) = 2e343bcaaca3e37dd0d393688bbc8cc37b70b4dc
+SHA1 (patch-ac) = 24d15229f9d81839c4b9e145ff554b12748c2153
+SHA1 (patch-ad) = e6bfdcedd053a683c2c91f6a23c1270bc6f6aecb
diff --git a/print/pnm2ppa/patches/patch-aa b/print/pnm2ppa/patches/patch-aa
index 59d0a0a4a72..0fc3d82ad3f 100644
--- a/print/pnm2ppa/patches/patch-aa
+++ b/print/pnm2ppa/patches/patch-aa
@@ -1,59 +1,49 @@
-$NetBSD: patch-aa,v 1.2 2003/01/19 08:45:39 salo Exp $
+$NetBSD: patch-aa,v 1.3 2003/09/17 18:40:48 jmmv Exp $
 
---- Makefile.orig	Thu Nov  2 19:33:08 2000
-+++ Makefile	Sun Jan 19 09:01:19 2003
-@@ -2,16 +2,17 @@
- # Makefile for pnm2ppa
- #
- 
--INSTALLDIR=/usr/local/bin
--CONFDIR=/etc
--MANDIR=/usr/local/man/man1
-+INSTALLDIR=${PREFIX}/bin
-+CONFDIR=${PKG_SYSCONFDIR}
-+MANDIR=${PREFIX}/man/man1
- 
+--- Makefile.orig	2002-11-16 00:29:29.000000000 +0100
++++ Makefile
+@@ -5,14 +5,13 @@
+ # 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="${PKG_SYSCONFDIR}"
++MANDIR="${PREFIX}/man/man1"
+ 
+ #compiler and linker options:
 -CC=gcc
--INSTALL=install
-+#CC=gcc
-+#INSTALL=install
- 
- # production build
-+CPPFLAGS=-I${PREFIX}/include
- CFLAGS=-Wall -pedantic -O2 -g -DNDEBUG 
+-CFLAGS=-Wall -pedantic -O2  
 -LDFLAGS=-lm
-+LDFLAGS=-lm #-L${PREFIX}/lib -R${PREFIX}/lib
- OBJS = pnm2ppa.o syslog.o ppa.o image.o dither.o cutswath.o hash_ink.o gamma.o
- SRC =  pnm2ppa.c syslog.c ppa.c image.c dither.c cutswath.c hash_ink.c gamma.c
++CFLAGS+= $(CPPFLAGS) -DPKG_SYSCONFDIR=\"${PKG_SYSCONFDIR}\"
++LDFLAGS+=-lm
  
-@@ -89,23 +90,21 @@
+ INSTALL=install
+ # Install under Linux and other versions with the -b (backup) option
+@@ -104,19 +103,15 @@ clean:
  
  
- install: pnm2ppa calibrate_ppa 
--	$(INSTALL) -m 755 pnm2ppa $(INSTALLDIR)
+ install: pnm2ppa calibrate_ppa
+-	$(INSTALLD) $(BINDIR)
+-	$(INSTALLD) $(CONFDIR)
 -	$(INSTALLD) $(MANDIR)
+-	$(INSTALL) -m 755 pnm2ppa  $(BINDIR)
 -	$(INSTALL) -m 644 docs/en/pnm2ppa.1 $(MANDIR)
-+	${BSD_INSTALL_PROGRAM} -m 755 pnm2ppa $(INSTALLDIR)
-+	${BSD_INSTALL_MAN} -m 644 docs/en/pnm2ppa.1 $(MANDIR)
++	$(BSD_INSTALL_PROGRAM) -m 755 pnm2ppa  $(BINDIR)
++	$(BSD_INSTALL_MAN) -m 644 docs/en/pnm2ppa.1 $(MANDIR)
  # development only - allows root to edit
--	$(INSTALL) -m 644 pnm2ppa.conf $(CONFDIR)
-+	${BSD_INSTALL_DATA_DIR} $(PREFIX)/share/examples/pnm2ppa
-+	${BSD_INSTALL_DATA} -m 644 pnm2ppa.conf $(PREFIX)/share/examples/pnm2ppa/pnm2ppa.conf.default
+-	$(INSTALL) -m 644 pnm2ppa.conf  $(CONFDIR)
++	$(BSD_INSTALL_DATA_DIR) $(PREFIX)/share/examples/pnm2ppa
++	$(BSD_INSTALL_DATA) -m 644 pnm2ppa.conf  $(PREFIX)/share/examples/pnm2ppa
  # calibration tool
--	$(INSTALL) -m 755 calibrate_ppa $(INSTALLDIR) 
-+	${BSD_INSTALL_PROGRAM} -m 755 calibrate_ppa $(INSTALLDIR)
+-	$(INSTALL) -m 755 calibrate_ppa $(BINDIR) 
++	$(BSD_INSTALL_PROGRAM) -m 755 calibrate_ppa $(BINDIR) 
  # final production - much tighter
--#	$(INSTALL) -m 444 pnm2ppa.conf $(CONFDIR)
+ #	$(INSTALL) -m 444 pnm2ppa.conf $(CONFDIR)
 -	@@echo 
 -	@@echo Now, edit /etc/pnm2ppa.conf to choose your printer
-+#	${BSD_INSTALL_DATA} -m 444 pnm2ppa.conf $(CONFDIR)/pnm2ppa.conf.default
  
  uninstall: 
- 	rm -f $(INSTALLDIR)/pnm2ppa
- 	rm -f $(INSTALLDIR)/calibrate_ppa
- 	rm -f $(MANDIR)/pnm2ppa.1
--	rm -f $(CONFDIR)/pnm2ppa.conf
-+	rm -f $(CONFDIR)/pnm2ppa.conf.default
- 
- pnm2ppa: $(OBJS) 
- 	$(CC) $(LDFLAGS) $(CFLAGS) -o pnm2ppa $(OBJS)
+ 	rm -f $(BINDIR)/pnm2ppa
diff --git a/print/pnm2ppa/patches/patch-ab b/print/pnm2ppa/patches/patch-ab
new file mode 100644
index 00000000000..5eda7fa4e68
--- /dev/null
+++ b/print/pnm2ppa/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2003/09/17 18:40:49 jmmv Exp $
+
+--- pnm2ppa.h.orig	Sat Jun 22 22:17:57 2002
++++ pnm2ppa.h	Sun May 11 09:39:33 2003
+@@ -20,8 +20,8 @@
+ 
+ #ifdef __PNM2PPA_C__
+ 
+-static char *defaultcfgfile = "/etc/pnm2ppa.conf";
+-static char *defaultgammafile = "/etc/pnm2ppa.gamma";
++static char *defaultcfgfile = PKG_SYSCONFDIR"/pnm2ppa.conf";
++static char *defaultgammafile = PKG_SYSCONFDIR"/pnm2ppa.gamma";
+ 
+ static ppaPrinter_t printer;
+ 
diff --git a/print/pnm2ppa/patches/patch-ac b/print/pnm2ppa/patches/patch-ac
new file mode 100644
index 00000000000..a55de70e391
--- /dev/null
+++ b/print/pnm2ppa/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2003/09/17 18:40:49 jmmv Exp $
+
+--- pnm2ppa.c.orig	Sun May 11 09:40:56 2003
++++ pnm2ppa.c	Sun May 11 09:41:26 2003
+@@ -286,7 +286,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 "PKG_SYSCONFDIR"/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/patches/patch-ad b/print/pnm2ppa/patches/patch-ad
new file mode 100644
index 00000000000..30b0540d24c
--- /dev/null
+++ b/print/pnm2ppa/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.1 2003/09/17 18:40:50 jmmv Exp $
+
+--- text-en.h.orig	Sun May 11 09:41:59 2003
++++ text-en.h	Sun May 11 09:42:14 2003
+@@ -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"PKG_SYSCONFDIR"/pnm2ppa.conf\n",
+   
+   /* 26 */ "couldn't open config file \n",