8 files changed, 139 insertions, 25 deletions
diff --git a/print/pnm2ppa/files/asciippafilter.SH b/print/pnm2ppa/files/asciippafilter.SH
index 3b40c90e8c71..56ac28287d7b 100644
--- a/print/pnm2ppa/files/asciippafilter.SH
+++ b/print/pnm2ppa/files/asciippafilter.SH
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-CHANGETHIS/bin/enscript -B -q -p - | \
-CHANGETHIS/bin/gs -sDEVICE=pbm -q -dNOPAUSE -r600 -sOutputFile=- - | \
-CHANGETHIS/bin/pbm2ppa - -
+%%LOCALBASE%%/bin/enscript -B -q -p - | \
+%%LOCALBASE%%/bin/gs -sDEVICE=ppmraw -q -dNOPAUSE -r600 -sOutputFile=- - | \
+%%PREFIX%%/bin/pnm2ppa -i - -o -
diff --git a/print/pnm2ppa/files/patch-aa b/print/pnm2ppa/files/patch-aa
index 0b90a5ca90ef..dd6530f163c3 100644
--- a/print/pnm2ppa/files/patch-aa
+++ b/print/pnm2ppa/files/patch-aa
@@ -1,9 +1,25 @@
---- Makefile.orig	Tue Sep 22 22:47:02 1998
-+++ Makefile	Tue Sep 22 22:47:23 1998
-@@ -1,5 +1,5 @@
- CC=gcc
--CFLAGS=-Wall -O2
-+CFLAGS=-Wall -O2 -DPPA_CONF=\"${PREFIX}/etc/pbm2ppa.conf\"
- LDFLAGS=
- 
- default:
+--- Makefile.orig	Fri Nov  3 03:33:08 2000
++++ Makefile	Tue Jan 30 21:25:55 2001
+@@ -2,16 +2,16 @@
+ # Makefile for pnm2ppa
+ #
+ 
+-INSTALLDIR=/usr/local/bin
+-CONFDIR=/etc
+-MANDIR=/usr/local/man/man1
++INSTALLDIR=${PREFIX}/bin
++CONFDIR=${PREFIX}/etc
++MANDIR=${PREFIX}/man/man1
+ 
+-CC=gcc
++CC?=gcc
+ INSTALL=install
+ 
+ # production build
+-CFLAGS=-Wall -pedantic -O2 -g -DNDEBUG 
+-LDFLAGS=-lm
++CFLAGS+=-DCONFDIR=\"$(CONFDIR)\" -DNDEBUG -I${LOCALBASE}/include
++LDFLAGS=-lm -L${LOCALBASE}/lib -lgnugetopt
+ 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
+ 
diff --git a/print/pnm2ppa/files/patch-ab b/print/pnm2ppa/files/patch-ab
index 46fba083a417..3693fc350c8d 100644
--- a/print/pnm2ppa/files/patch-ab
+++ b/print/pnm2ppa/files/patch-ab
@@ -1,11 +1,11 @@
---- pbm2ppa.c.orig	Mon Apr  6 23:20:07 1998
-+++ pbm2ppa.c	Tue Sep 22 22:37:45 1998
-@@ -268,7 +268,7 @@
-   exit(1);
- }
- 
--char* defaultcfgfile="/etc/pbm2ppa.conf";
-+char* defaultcfgfile=PPA_CONF;
- int main (int argc, char *argv[])
- {
-   int argn;
+--- 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-ac b/print/pnm2ppa/files/patch-ac
new file mode 100644
index 000000000000..0d4d7097ebee
--- /dev/null
+++ b/print/pnm2ppa/files/patch-ac
@@ -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 --git a/print/pnm2ppa/files/patch-ad b/print/pnm2ppa/files/patch-ad
new file mode 100644
index 000000000000..8674ed091187
--- /dev/null
+++ b/print/pnm2ppa/files/patch-ad
@@ -0,0 +1,29 @@
+--- pnm2ppa.conf.orig	Sun Oct 29 00:02:57 2000
++++ pnm2ppa.conf	Tue Jan 30 22:07:29 2001
+@@ -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.
+ #
+@@ -26,7 +26,7 @@
+ # in addition to the syslog. (Note: on BeOS,  syslog messages are
+ # diverted to stderr; use "silent 1" to suppress them.)
+ # Note: the "silent 1" keyword is only accepted from the system 
+-# configuration  file (/etc/pnm2ppa.conf), and not from configuration files 
++# configuration  file (%%PREFIX%%/etc/pnm2ppa.conf), and not from configuration files 
+ # specified  with the pnm2ppa option "-f".
+ 
+ #silent 1
+@@ -105,7 +105,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 --git a/print/pnm2ppa/files/patch-ae b/print/pnm2ppa/files/patch-ae
new file mode 100644
index 000000000000..339801657a11
--- /dev/null
+++ b/print/pnm2ppa/files/patch-ae
@@ -0,0 +1,13 @@
+--- 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-af b/print/pnm2ppa/files/patch-af
new file mode 100644
index 000000000000..2a7ad69beae1
--- /dev/null
+++ b/print/pnm2ppa/files/patch-af
@@ -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 " CONFDIR "/pnm2ppa.conf\n",
+   
+   /* 26 */ "couldn't open config file \n",
+ 
diff --git a/print/pnm2ppa/files/ppafilter.SH b/print/pnm2ppa/files/ppafilter.SH
index 0b27e4c44c17..5809fb04d80f 100644
--- a/print/pnm2ppa/files/ppafilter.SH
+++ b/print/pnm2ppa/files/ppafilter.SH
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-CHANGETHIS/bin/gs -sDEVICE=pbm -q -dNOPAUSE -r600 -sOutputFile=- - | \
-CHANGETHIS/bin/pbm2ppa - -
+%%LOCALBASE%%/bin/gs -sDEVICE=ppmraw -q -dNOPAUSE -r600 -sOutputFile=- - | \
+%%PREFIX%%/bin/pnm2ppa -i - -o -