diff options
-rw-r--r-- | net-print/pnm2ppa/ChangeLog | 11 | ||||
-rw-r--r-- | net-print/pnm2ppa/files/digest-pnm2ppa-1.0.91-r1 | 2 | ||||
-rw-r--r-- | net-print/pnm2ppa/files/pnm2ppa-1.0.91-gentoo.diff | 211 | ||||
-rw-r--r-- | net-print/pnm2ppa/files/pnm2ppa-1.0.91-r1-gentoo.diff | 266 | ||||
-rw-r--r-- | net-print/pnm2ppa/pnm2ppa-1.0.91-r1.ebuild | 197 |
5 files changed, 476 insertions, 211 deletions
diff --git a/net-print/pnm2ppa/ChangeLog b/net-print/pnm2ppa/ChangeLog index 461f0644c058..88e6635a92fe 100644 --- a/net-print/pnm2ppa/ChangeLog +++ b/net-print/pnm2ppa/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for net-print/pnm2ppa # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/net-print/pnm2ppa/ChangeLog,v 1.1 2002/02/01 21:53:36 gbevin Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/pnm2ppa/ChangeLog,v 1.2 2002/04/11 13:04:43 seemant Exp $ + +*pnm2ppa-1.0.91-r1 (11 Apr 2002) + + 11 Apr 2002; Seemant Kulleen <seemant@gentoo.org> pnm2ppa-1.0.91-r1.ebuild + files/digest-pnm2ppa-1.0.91-r1 files/pnm2ppa-1.0.91.-r1-gentoo.diff + + Updated ebuild to make it compile a little more cleanly with optional + dependencies. Additionally, got rid of sandbox violation errors. + *pnm2ppa-1.0.91 (1 Feb 2002) diff --git a/net-print/pnm2ppa/files/digest-pnm2ppa-1.0.91-r1 b/net-print/pnm2ppa/files/digest-pnm2ppa-1.0.91-r1 new file mode 100644 index 000000000000..90b75899d8fb --- /dev/null +++ b/net-print/pnm2ppa/files/digest-pnm2ppa-1.0.91-r1 @@ -0,0 +1,2 @@ +MD5 df9010964688456f99467210ea5cbc7f pnm2ppa-1.0.91.tgz 370824 +MD5 00366b61ee4a1ed0c91a4192e94358a2 howto.tgz 36007 diff --git a/net-print/pnm2ppa/files/pnm2ppa-1.0.91-gentoo.diff b/net-print/pnm2ppa/files/pnm2ppa-1.0.91-gentoo.diff index f47f35151cf8..77c0346e0a27 100644 --- a/net-print/pnm2ppa/files/pnm2ppa-1.0.91-gentoo.diff +++ b/net-print/pnm2ppa/files/pnm2ppa-1.0.91-gentoo.diff @@ -1,106 +1,3 @@ -diff -ur pnm2ppa.orig/Makefile pnm2ppa/Makefile ---- pnm2ppa.orig/Makefile Thu Nov 2 20:33:08 2000 -+++ pnm2ppa/Makefile Mon Jul 23 20:16:02 2001 -@@ -2,15 +2,15 @@ - # Makefile for pnm2ppa - # - --INSTALLDIR=/usr/local/bin --CONFDIR=/etc --MANDIR=/usr/local/man/man1 -+INSTALLDIR=${DESTDIR}/usr/bin -+CONFDIR=${DESTDIR}/etc -+MANDIR=${DESTDIR}/usr/man/man1 - - CC=gcc - INSTALL=install - - # production build --CFLAGS=-Wall -pedantic -O2 -g -DNDEBUG -+NEWCFLAGS=-Wall -pedantic -O2 -g -DNDEBUG ${CFLAGS} - LDFLAGS=-lm - 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 -@@ -61,7 +61,7 @@ - # - # Do not edit below this line! No user servicable parts below! - --CFLAGS+=-DLANG_$(LANG) -+NEWCFLAGS+=-DLANG_$(LANG) - - default: all - -@@ -108,55 +108,55 @@ - rm -f $(CONFDIR)/pnm2ppa.conf - - pnm2ppa: $(OBJS) -- $(CC) $(LDFLAGS) $(CFLAGS) -o pnm2ppa $(OBJS) -+ $(CC) $(LDFLAGS) $(NEWCFLAGS) -o pnm2ppa $(OBJS) - - calibrate_ppa: calibrate_ppa.o pnmtools.o gamma.o -- $(CC) $(LDFLAGS) $(CFLAGS) -o calibrate_ppa calibrate_ppa.o pnmtools.o gamma.o -+ $(CC) $(LDFLAGS) $(NEWCFLAGS) -o calibrate_ppa calibrate_ppa.o pnmtools.o gamma.o - - calibrate_ppa.o: calibrate_ppa.c global.h image.h defaults.h pnmtools.h -- $(CC) $(CFLAGS) -c calibrate_ppa.c -+ $(CC) $(NEWCFLAGS) -c calibrate_ppa.c - - pnmtools.o: pnmtools.c pnmtools.h -- $(CC) $(CFLAGS) -c pnmtools.c -+ $(CC) $(NEWCFLAGS) -c pnmtools.c - - cutswath.o: cutswath.c debug.h ppa.h image.h global.h syslog.h -- $(CC) $(CFLAGS) -c cutswath.c -+ $(CC) $(NEWCFLAGS) -c cutswath.c - - image.o: image.c image.h palette.h debug.h fscoeff.h global.h gamma.h syslog.h -- $(CC) $(CFLAGS) -c image.c -+ $(CC) $(NEWCFLAGS) -c image.c - - gamma.o: gamma.c image.h global.h gamma.h -- $(CC) $(CFLAGS) -c gamma.c -+ $(CC) $(NEWCFLAGS) -c gamma.c - - dither.o: dither.c dither.h image.h palette.h debug.h fscoeff.h global.h hash_ink.h -- $(CC) $(CFLAGS) -c dither.c -+ $(CC) $(NEWCFLAGS) -c dither.c - - pnm2ppa.o: pnm2ppa.c pnm2ppa.h image.h ppa.h debug.h global.h gamma.h syslog.h -- $(CC) $(CFLAGS) -c pnm2ppa.c -+ $(CC) $(NEWCFLAGS) -c pnm2ppa.c - - ppa.o: ppa.c ppa.h debug.h global.h syslog.h -- $(CC) $(CFLAGS) -c ppa.c -+ $(CC) $(NEWCFLAGS) -c ppa.c - - debug.o: debug.c debug.h global.h -- $(CC) $(CFLAGS) -c debug.c -+ $(CC) $(NEWCFLAGS) -c debug.c - - syslog.o: syslog.c syslog.h global.h -- $(CC) $(CFLAGS) -c syslog.c -+ $(CC) $(NEWCFLAGS) -c syslog.c - - make_hash_ink: make_hash_ink.c palette.h hash_ink.h -- $(CC) $(CFLAGS) -o make_hash_ink make_hash_ink.c -+ $(CC) $(NEWCFLAGS) -o make_hash_ink make_hash_ink.c - - hash_ink.c: make_hash_ink - ./make_hash_ink 4 3 > hash_ink.c - ./make_hash_ink 1 5 >> hash_ink.c - - hash_ink.o: hash_ink.c hash_ink.c -- $(CC) $(CFLAGS) -c hash_ink.c -+ $(CC) $(NEWCFLAGS) -c hash_ink.c - - # a default rule, in case new .c files pop in - - .c.o: $*.c ppa.h image.h enh-curve.h palette.h debug.h global.h -- $(CC) $(CFLAGS) -c $*.c -+ $(CC) $(NEWCFLAGS) -c $*.c - - distrib: clean - cd .. && tar cf - pnm2ppa/ | gzip -9 > pnm2ppa.tar.gz diff -ur pnm2ppa.orig/docs/en/INSTALL pnm2ppa/docs/en/INSTALL --- pnm2ppa.orig/docs/en/INSTALL Wed Jul 4 20:13:12 2001 +++ pnm2ppa/docs/en/INSTALL Mon Jul 23 20:33:21 2001 @@ -217,7 +114,7 @@ diff -ur pnm2ppa.orig/lpd/lpdsetup pnm2ppa/lpd/lpdsetup @@ -1,5 +1,5 @@ #!/bin/sh -INSTALLDIR="/usr/local/bin" -+INSTALLDIR="${DESTDIR}/usr/bin" ++INSTALLDIR="/usr/bin" SPOOLDIR="/var/spool/lpd" PAPER=letter for paper in letter legal a3 a4 ; do @@ -269,87 +166,6 @@ diff -ur pnm2ppa.orig/lpd/printcap pnm2ppa/lpd/printcap :la:mx#0:\ :sh:sf: -diff -ur pnm2ppa.orig/ppaSet-beta1/Makefile pnm2ppa/ppaSet-beta1/Makefile ---- pnm2ppa.orig/ppaSet-beta1/Makefile Wed Jul 4 20:13:12 2001 -+++ pnm2ppa/ppaSet-beta1/Makefile Mon Jul 23 20:16:02 2001 -@@ -3,16 +3,16 @@ - ################## - - # All files will be copied here --BASEDIR=/usr/local/ppaSet -+BASEDIR=/usr/share/pnm2ppa/ppaSet - # Simlink will be made here, so binaries are in the default PATH --BINDIR=/usr/local/bin -+BINDIR=/usr/bin - # Used in the code - LPR=/usr/bin/lpr - # Can be any other that acepts -e option - XTERM=/usr/bin/X11/xterm - # We need to know where pnm2ppa and calibrate_ppa are installed --PNM2PPA=/usr/local/bin/pnm2ppa --CALIBRATE_PPA=/usr/local/bin/calibrate_ppa -+PNM2PPA=/usr/bin/pnm2ppa -+CALIBRATE_PPA=/usr/bin/calibrate_ppa - - ######### gPpaSet only ######## - # A pager: more, less,... even lynx -@@ -36,7 +36,7 @@ - - all: gPpaSet nPpaSet getHome - --CC=gcc -g -+CC=gcc -g ${CFLAGS} - LD=gcc - #TEST=$(BASEDIR)/t.ps - TEST=$(BASEDIR)/test -@@ -45,38 +45,38 @@ - CLEAN=$(BASEDIR)/cleanHeads - - LDFLAGS= --CFLAGS=-DBASEDIR=\"$(BASEDIR)\" -DLPR=\"$(LPR)\" -DTEST=\"$(TEST)\" -DCALIBRATION=\"$(CALIBRATION)\" -DGAMMAREF=\"$(GAMMAREF)\" -DCLEAN=\"$(CLEAN)\" -DXTERM=\"$(XTERM)\" -DPAGER=\"$(PAGER)\" -DDIALOGPROGRAM=\"$(DIALOGPROGRAM)\" -+NEWCFLAGS=-DBASEDIR=\"$(BASEDIR)\" -DLPR=\"$(LPR)\" -DTEST=\"$(TEST)\" -DCALIBRATION=\"$(CALIBRATION)\" -DGAMMAREF=\"$(GAMMAREF)\" -DCLEAN=\"$(CLEAN)\" -DXTERM=\"$(XTERM)\" -DPAGER=\"$(PAGER)\" -DDIALOGPROGRAM=\"$(DIALOGPROGRAM)\" - - gPpaSet: gPpaSet.o getHome.o ppaSetBase.o - $(LD) $(LDFLAGS) -o gPpaSet gPpaSet.o ppaSetBase.o getHome.o `gtk-config --libs` - - gPpaSet.o: gPpaSet.c getHome.h ppaSetBase.h -- $(CC) $(CFLAGS) -c -o gPpaSet.o gPpaSet.c `gtk-config --cflags` -+ $(CC) $(NEWCFLAGS) -c -o gPpaSet.o gPpaSet.c `gtk-config --cflags` - - nPpaSet: nPpaSet.o getHome.o ppaSetBase.o -- CC="$(CC)" CFLAGS="$(CFLAGS) -DNPPASET" make -C dialog all -+ CC="$(CC)" CFLAGS="$(NEWCFLAGS) -DNPPASET" make -C dialog all - $(LD) -o nPpaSet nPpaSet.o ppaSetBase.o getHome.o $(DIALOG)/*.o $(LDFLAGS) -lpanel -lcurses -lm - - nPpaSet.o: nPpaSet.c getHome.h ppaSetBase.h -- $(CC) $(CFLAGS) -c -o nPpaSet.o nPpaSet.c -DNPPASET -+ $(CC) $(NEWCFLAGS) -c -o nPpaSet.o nPpaSet.c -DNPPASET - - ppaSetBase.o: ppaSetBase.c ppaSetBase.h getHome.h defaults.h -- $(CC) $(CFLAGS) -c -o ppaSetBase.o ppaSetBase.c -+ $(CC) $(NEWCFLAGS) -c -o ppaSetBase.o ppaSetBase.c - - getHome: getHomeMain.c getHome.o - $(LD) $(LDFLAGS) -o getHome getHomeMain.c getHome.o - - getHome.o: getHome.c -- $(CC) $(CFLAGS) -c -o getHome.o getHome.c -+ $(CC) $(NEWCFLAGS) -c -o getHome.o getHome.c - - install: getHome gPpaSet nPpaSet ppa.if -- ./install $(BASEDIR) $(BINDIR) $(CALIBRATE_PPA) $(PNM2PPA) -+ ./install ${DESTDIR}/$(BASEDIR) ${DESTDIR}/$(BINDIR) ${DESTDIR}/$(CALIBRATE_PPA) ${DESTDIR}/$(PNM2PPA) - - install-g: getHome gPpaSet ppa.if -- ./install $(BASEDIR) $(BINDIR) $(CALIBRATE_PPA) $(PNM2PPA) -+ ./install ${DESTDIR}/$(BASEDIR) ${DESTDIR}/$(BINDIR) ${DESTDIR}/$(CALIBRATE_PPA) ${DESTDIR}/$(PNM2PPA) - - install-n: getHome nPpaSet ppa.if -- ./install $(BASEDIR) $(BINDIR) $(CALIBRATE_PPA) $(PNM2PPA) -+ ./install ${DESTDIR}/$(BASEDIR) ${DESTDIR}/$(BINDIR) ${DESTDIR}/$(CALIBRATE_PPA) ${DESTDIR}/$(PNM2PPA) - - clean: - rm -f *.o diff -ur pnm2ppa.orig/ppaSet-beta1/install pnm2ppa/ppaSet-beta1/install --- pnm2ppa.orig/ppaSet-beta1/install Wed Jul 4 20:13:12 2001 +++ pnm2ppa/ppaSet-beta1/install Mon Jul 23 20:32:57 2001 @@ -424,28 +240,3 @@ diff -ur pnm2ppa.orig/ppaSet-beta1/printcap.only pnm2ppa/ppaSet-beta1/printcap.o - :if=/usr/local/bin/ppa.if:\ + :if=/usr/bin/ppa.if:\ :la:mx#0: -diff -ur pnm2ppa.orig/ppa_protocol/Makefile pnm2ppa/ppa_protocol/Makefile ---- pnm2ppa.orig/ppa_protocol/Makefile Sat Oct 21 04:17:46 2000 -+++ pnm2ppa/ppa_protocol/Makefile Mon Jul 23 20:16:02 2001 -@@ -4,7 +4,7 @@ - - CC=gcc - --CFLAGS=-Wall -pedantic -O2 -g -+NEWCFLAGS=-Wall -pedantic -O2 -g ${CFLAGS} - - default: all - -@@ -14,10 +14,10 @@ - rm -f *.o *~ parse_vlink - - parse_vlink: parse_vlink.o -- $(CC) $(LDFLAGS) $(CFLAGS) -o parse_vlink parse_vlink.o -+ $(CC) $(LDFLAGS) $(NEWCFLAGS) -o parse_vlink parse_vlink.o - - parse_vlink.o: parse_vlink.c -- $(CC) $(CFLAGS) -c parse_vlink.c -+ $(CC) $(NEWCFLAGS) -c parse_vlink.c - - - diff --git a/net-print/pnm2ppa/files/pnm2ppa-1.0.91-r1-gentoo.diff b/net-print/pnm2ppa/files/pnm2ppa-1.0.91-r1-gentoo.diff new file mode 100644 index 000000000000..6a3075d0d968 --- /dev/null +++ b/net-print/pnm2ppa/files/pnm2ppa-1.0.91-r1-gentoo.diff @@ -0,0 +1,266 @@ +diff -urN pnm2ppa.orig/docs/en/INSTALL pnm2ppa/docs/en/INSTALL +--- pnm2ppa.orig/docs/en/INSTALL Wed Jul 4 10:13:12 2001 ++++ pnm2ppa/docs/en/INSTALL Thu Apr 11 06:19:13 2002 +@@ -39,8 +39,8 @@ + + make install + +-to install the binaries (by default, in /usr/local/bin/) , +-the manpage (in /usr/local/man/man1), and the sample ++to install the binaries (by default, in /usr/bin/) , ++the manpage (in /usr/share/man/man1), and the sample + configuration file (/etc/pnm2ppa.conf). You may change these locations + by editing the Makefile. + +@@ -70,7 +70,7 @@ + not really needed.) + + +-If this script is placed in /usr/local/bin/ppaprint , ++If this script is placed in /usr/bin/ppaprint , + + ppaprint file.ps + +diff -urN pnm2ppa.orig/docs/en/INSTALL.SUSE pnm2ppa/docs/en/INSTALL.SUSE +--- pnm2ppa.orig/docs/en/INSTALL.SUSE Fri Oct 27 12:29:12 2000 ++++ pnm2ppa/docs/en/INSTALL.SUSE Thu Apr 11 06:19:13 2002 +@@ -5,8 +5,8 @@ + + + Follow the standard installation instructions in INSTALL and CALIBRATION. +-The driver pnm2ppa is installed to /usr/local/bin. The manual page +-pnm2ppa.1 is installed in /usr/local/man/man1. ++The driver pnm2ppa is installed to /usr/bin. The manual page ++pnm2ppa.1 is installed in /usr/share/man/man1. + + 2. To integrate pnm2ppa into the BSD print spooler of the Linux system we + create printer spoolers in /etc/printcap, to print +diff -urN pnm2ppa.orig/lpd/README.lpd pnm2ppa/lpd/README.lpd +--- pnm2ppa.orig/lpd/README.lpd Sat Oct 28 07:58:07 2000 ++++ pnm2ppa/lpd/README.lpd Thu Apr 11 06:19:13 2002 +@@ -22,7 +22,7 @@ + ./lpdsetup a4 + ./lpdsetup a3 + +-This installs the filters in /usr/local/bin and creates the corresponding ++This installs the filters in /usr/bin and creates the corresponding + spool directories /var/spool/lpd/color, etc, You must be root to do this. + + You may wish to edit the options specified in the filter files +diff -urN pnm2ppa.orig/lpd/ascii.if pnm2ppa/lpd/ascii.if +--- pnm2ppa.orig/lpd/ascii.if Sat Oct 28 07:58:07 2000 ++++ pnm2ppa/lpd/ascii.if Thu Apr 11 06:19:13 2002 +@@ -1,7 +1,7 @@ + #! /bin/sh + # for printing black and white text (ascii) files. +-FILTER="/usr/local/bin/bw.if" +-#FILTER="/usr/local/bin/bweco.if" ++FILTER="/usr/bin/bw.if" ++#FILTER="/usr/bin/bweco.if" + #------enscript command line-------------------------- + enscript -2rj -p- | $FILTER + +diff -urN pnm2ppa.orig/lpd/bw.if pnm2ppa/lpd/bw.if +--- pnm2ppa.orig/lpd/bw.if Sat Oct 28 07:58:07 2000 ++++ pnm2ppa/lpd/bw.if Thu Apr 11 06:19:13 2002 +@@ -6,7 +6,7 @@ + #PAPER=a4 + #PAPER=a3 + #PPAOPTS="-B 2" +-PNM2PPA="/usr/local/bin/pnm2ppa" ++PNM2PPA="/usr/bin/pnm2ppa" + #------------------dont change below this line---------------------- + gs -sDEVICE=pbmraw -sPAPERSIZE=$PAPER -q -dNOPAUSE -r600 -sOutputFile=- - | \ + $PNM2PPA --bw $PPAOPTS -i - -o - +diff -urN pnm2ppa.orig/lpd/bweco.if pnm2ppa/lpd/bweco.if +--- pnm2ppa.orig/lpd/bweco.if Sat Oct 28 07:58:07 2000 ++++ pnm2ppa/lpd/bweco.if Thu Apr 11 06:19:13 2002 +@@ -6,7 +6,7 @@ + #PAPER=a4 + #PAPER=a3 + #PPAOPTS="-B 2" +-PNM2PPA="/usr/local/bin/pnm2ppa" ++PNM2PPA="/usr/bin/pnm2ppa" + #------------------dont change below this line---------------------- + gs -sDEVICE=pbmraw -sPAPERSIZE=$PAPER -q -dNOPAUSE -r600 -sOutputFile=- - | \ + $PNM2PPA --bw --eco $PPAOPTS -i - -o - +diff -urN pnm2ppa.orig/lpd/color.if pnm2ppa/lpd/color.if +--- pnm2ppa.orig/lpd/color.if Sat Oct 28 07:58:07 2000 ++++ pnm2ppa/lpd/color.if Thu Apr 11 06:19:13 2002 +@@ -6,7 +6,7 @@ + #PAPER=a4 + #PAPER=a3 + #PPAOPTS="-p" +-PNM2PPA="/usr/local/bin/pnm2ppa" ++PNM2PPA="/usr/bin/pnm2ppa" + #------------------dont change below this line---------------------- + gs -sDEVICE=ppmraw -sPAPERSIZE=$PAPER -q -dNOPAUSE -r600 -sOutputFile=- - | \ + $PNM2PPA $PPAOPTS -i - -o - +diff -urN pnm2ppa.orig/lpd/coloreco.if pnm2ppa/lpd/coloreco.if +--- pnm2ppa.orig/lpd/coloreco.if Sat Oct 28 07:58:07 2000 ++++ pnm2ppa/lpd/coloreco.if Thu Apr 11 06:19:13 2002 +@@ -6,7 +6,7 @@ + #PAPER=a4 + #PAPER=a3 + #PPAOPTS="--fd" +-PNM2PPA="/usr/local/bin/pnm2ppa" ++PNM2PPA="/usr/bin/pnm2ppa" + #------------------dont change below this line---------------------- + gs -sDEVICE=ppmraw -sPAPERSIZE=$PAPER -q -dNOPAUSE -r600 -sOutputFile=- - | \ + $PNM2PPA --eco $PPAOPTS -i - -o - +diff -urN pnm2ppa.orig/lpd/lpdsetup pnm2ppa/lpd/lpdsetup +--- pnm2ppa.orig/lpd/lpdsetup Fri Oct 27 12:29:12 2000 ++++ pnm2ppa/lpd/lpdsetup Thu Apr 11 06:19:13 2002 +@@ -1,5 +1,5 @@ + #!/bin/sh +-INSTALLDIR="/usr/local/bin" ++INSTALLDIR="/usr/bin" + SPOOLDIR="/var/spool/lpd" + PAPER=letter + for paper in letter legal a3 a4 ; do +diff -urN pnm2ppa.orig/lpd/printcap pnm2ppa/lpd/printcap +--- pnm2ppa.orig/lpd/printcap Fri Oct 27 11:12:23 2000 ++++ pnm2ppa/lpd/printcap Thu Apr 11 06:19:13 2002 +@@ -6,7 +6,7 @@ + :sd=/var/spool/lpd/coloreco:\ + :lf=/var/spool/lpd/coloreco/log:\ + :af=/var/spool/lpd/coloreco/acct:\ +- :if=/usr/local/bin/coloreco.if:\ ++ :if=/usr/bin/coloreco.if:\ + :la:mx#0:\ + :sh:sf: + +@@ -16,7 +16,7 @@ + :sd=/var/spool/lpd/color:\ + :lf=/var/spool/lpd/color/log:\ + :af=/var/spool/lpd/color/acct:\ +- :if=/usr/local/bin/color.if:\ ++ :if=/usr/bin/color.if:\ + :la:mx#0:\ + :sh:sf: + +@@ -26,7 +26,7 @@ + :sd=/var/spool/lpd/bw:\ + :lf=/var/spool/lpd/bw/log:\ + :af=/var/spool/lpd/bw/acct:\ +- :if=/usr/local/bin/bw.if:\ ++ :if=/usr/bin/bw.if:\ + :la:mx#0:\ + :sh:sf: + +@@ -36,7 +36,7 @@ + :sd=/var/spool/lpd/bweco:\ + :lf=/var/spool/lpd/bweco/log:\ + :af=/var/spool/lpd/bweco/acct:\ +- :if=/usr/local/bin/bweco.if:\ ++ :if=/usr/bin/bweco.if:\ + :la:mx#0:\ + :sh:sf: + +@@ -46,7 +46,7 @@ + :sd=/var/spool/lpd/ascii:\ + :lf=/var/spool/lpd/ascii/log:\ + :af=/var/spool/lpd/ascii/acct:\ +- :if=/usr/local/bin/ascii.if:\ ++ :if=/usr/bin/ascii.if:\ + :la:mx#0:\ + :sh:sf: + +diff -urN pnm2ppa.orig/pnm2ppa.conf pnm2ppa/pnm2ppa.conf +--- pnm2ppa.orig/pnm2ppa.conf Sat Oct 28 08:02:57 2000 ++++ pnm2ppa/pnm2ppa.conf Thu Apr 11 06:19:13 2002 +@@ -12,7 +12,6 @@ + # will be used. The printer version can also be set with the command line + # option e.g., "-v 720". + +-version ERROR # PNM2PPA WIIL *NOT* WORK UNTIUL THIS ENTRY IS REMOVED!!!! + #version 720 # 710, 712, 722 also acceptable + #version 820 + #version 1000 +diff -urN pnm2ppa.orig/ppaSet-beta1/install pnm2ppa/ppaSet-beta1/install +--- pnm2ppa.orig/ppaSet-beta1/install Wed Jul 4 10:13:12 2001 ++++ pnm2ppa/ppaSet-beta1/install Thu Apr 11 06:20:08 2002 +@@ -3,7 +3,7 @@ + if [ "$4" = "" ] + then + echo "usage: install <basedir> <bindir> <calibrate_ppa> <pnm2ppa>" +- echo "example: install /usr/local/ppaSet/ /usr/local/bin /usr/local/bin/calibrate_ppa /usr/local/bin/pnm2ppa" ++ echo "example: install /usr/ppaSet/ /usr/bin /usr/bin/calibrate_ppa /usr/bin/pnm2ppa" + exit 1 + fi + +@@ -92,15 +92,15 @@ + then + if [ "$WHAT" = "2" ] + then +- cp -v /etc/printcap /etc/printcap.old +- cat $BASEDIR/printcap.add >> /etc/printcap ++ cp -v ${D}/etc/printcap ${D}/etc/printcap.old ++ cat $BASEDIR/printcap.add >> ${D}/etc/printcap + else +- cp -v /etc/printcap /etc/printcap.old +- cp -v $BASEDIR/printcap.only /etc/printcap ++ cp -v ${D}/etc/printcap ${D}/etc/printcap.old ++ cp -v $BASEDIR/printcap.only ${D}/etc/printcap + fi +- install --verbose -d /var/spool/lpd/ppa +- touch /var/spool/lpd/ppa/log +- touch /var/spool/lpd/ppa/acct ++ install --verbose -d ${D}/var/spool/lpd/ppa ++ touch ${D}/var/spool/lpd/ppa/log ++ touch ${D}/var/spool/lpd/ppa/acct + fi + + #echo " " +diff -urN pnm2ppa.orig/ppaSet-beta1/ppaSetBase.h pnm2ppa/ppaSet-beta1/ppaSetBase.h +--- pnm2ppa.orig/ppaSet-beta1/ppaSetBase.h Wed Jul 4 10:13:12 2001 ++++ pnm2ppa/ppaSet-beta1/ppaSetBase.h Thu Apr 11 06:19:13 2002 +@@ -3,22 +3,22 @@ + + // The default paths, if not given + #ifndef BASEDIR +-#define BASEDIR "/usr/local/ppaSet" ++#define BASEDIR "/usr/ppaSet" + #endif + #ifndef TEST +-#define TEST "/usr/local/ppaSet/test" ++#define TEST "/usr/ppaSet/test" + #endif + #ifndef CALIBRATION +-#define CALIBRATION "/usr/local/ppaSet/calibration" ++#define CALIBRATION "/usr/ppaSet/calibration" + #endif + #ifndef GAMMAREF +-#define GAMMAREF "/usr/local/ppaSet/gammaRef" ++#define GAMMAREF "/usr/ppaSet/gammaRef" + #endif + #ifndef NOGAMMA +-#define NOGAMMA "/usr/local/ppaSet/noGamma" ++#define NOGAMMA "/usr/ppaSet/noGamma" + #endif + #ifndef CLEAN +-#define CLEAN "/usr/local/ppaSet/cleanHeads" ++#define CLEAN "/usr/ppaSet/cleanHeads" + #endif + #ifndef LPR + #define LPR "/usr/bin/lpr" +diff -urN pnm2ppa.orig/ppaSet-beta1/printcap.add pnm2ppa/ppaSet-beta1/printcap.add +--- pnm2ppa.orig/ppaSet-beta1/printcap.add Wed Jul 4 10:13:12 2001 ++++ pnm2ppa/ppaSet-beta1/printcap.add Thu Apr 11 06:19:13 2002 +@@ -5,5 +5,5 @@ + :sd=/var/spool/lpd/ppa:\ + :lf=/var/spool/lpd/ppa/log:\ + :af=/var/spool/lpd/ppa/acct:\ +- :if=/usr/local/bin/ppa.if:\ ++ :if=/usr/bin/ppa.if:\ + :la:mx#0: +diff -urN pnm2ppa.orig/ppaSet-beta1/printcap.only pnm2ppa/ppaSet-beta1/printcap.only +--- pnm2ppa.orig/ppaSet-beta1/printcap.only Wed Jul 4 10:13:12 2001 ++++ pnm2ppa/ppaSet-beta1/printcap.only Thu Apr 11 06:19:13 2002 +@@ -5,5 +5,5 @@ + :sd=/var/spool/lpd/ppa:\ + :lf=/var/spool/lpd/ppa/log:\ + :af=/var/spool/lpd/ppa/acct:\ +- :if=/usr/local/bin/ppa.if:\ ++ :if=/usr/bin/ppa.if:\ + :la:mx#0: diff --git a/net-print/pnm2ppa/pnm2ppa-1.0.91-r1.ebuild b/net-print/pnm2ppa/pnm2ppa-1.0.91-r1.ebuild new file mode 100644 index 000000000000..60cbb8c1795f --- /dev/null +++ b/net-print/pnm2ppa/pnm2ppa-1.0.91-r1.ebuild @@ -0,0 +1,197 @@ +# Copyright 1999-2002 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License, v2 or later +# Author Dan Armak <danarmak@gentoo.org> +# $Header: /var/cvsroot/gentoo-x86/net-print/pnm2ppa/pnm2ppa-1.0.91-r1.ebuild,v 1.1 2002/04/11 13:04:44 seemant Exp $ +# Note: this also d/ls the hp-ppa-howto and installs it under /usr/share/doc/${P} + +# pnm2ppa is a print filter for HP's line of Winprinters which use a proprietary +# protocol called ppa (Print Performance Architecture). Like Winmodems, Winprinters +# don't have a microprocessor; your main CPU does all the hard work. +# Winprinters: Hp Deskjet 710, 712, 720, 722, 820, 1000 series. +# pnm2ppa can work on its own or via lpr or pdq. + +# The ebuild in general seems a bit flaky, anyone who has a ppa printer +# please check it out and tell me if it worked. + +# Description of accompanying patch: install into /usr instead of /usr/local +# and use env. var. CFLAGS. Took a lot of changes though. + +S=${WORKDIR}/${PN} +SRC_URI="http://prdownloads.sourceforge.net/${PN}/${P}.tgz + http://prdownloads.sourceforge.net/${PN}/howto.tgz" + +HOMEPAGE="http://pnm2ppa.sourceforge.net" +DESCRIPTION="Print driver for Hp Deskjet 710, 712, 720, 722, 820, 1000 series" + +# note: this doesn't depend on virtual/lpr, because it can work on its own, +# just without queueing etc. since it's not just a driver but a standalone +# executable. +DEPEND="sys-libs/glibc + sys-devel/ld.so + sys-libs/ncurses + gtk? ( x11-libs/gtk+ )" + +RDEPEND="${DEPEND} + app-text/enscript + dev-util/dialog" + +src_unpack() { + + cd ${WORKDIR} + unpack ${P}.tgz + cd ${S} + unpack howto.tgz + + cd ${WORKDIR} + patch -p0 < ${FILESDIR}/${PF}-gentoo.diff + +} + +src_compile() { + + export CFLAGS="-DNDEBUG ${CFLAGS}" + + emake \ + CFLAGS="${CFLAGS}" || die + + + cd ${S}/ppa_protocol + emake \ + CFLAGS="${CFLAGS}" || die + + cd ${S}/ppaSet-beta1 + # This requires gtk, ncurses etc. on which we don't want to depend + # so we simply fail if they aren't installed + echo "The following may fail, don't pay attention to any error" + sleep 1s + + use gtk && \ + make \ + BASEDIR=/usr/share/pnm2ppa/ppaSet \ + BINDIR=/usr/bin \ + PNM2PPA=/usr/bin/pnm2ppa \ + CALIBRATE_PPA=/usr/bin/calibrate_ppa \ + CFLAGS="${CFLAGS}" gPpaSet + + make \ + BASEDIR=/usr/share/pnm2ppa/ppaSet \ + BINDIR=/usr/bin \ + PNM2PPA=/usr/bin/pnm2ppa \ + CALIBRATE_PPA=/usr/bin/calibrate_ppa \ + CFLAGS="${CFLAGS}" nPpaSet + + make \ + BASEDIR=/usr/share/pnm2ppa/ppaSet \ + BINDIR=/usr/bin \ + PNM2PPA=/usr/bin/pnm2ppa \ + CALIBRATE_PPA=/usr/bin/calibrate_ppa \ + CFLAGS="${CFLAGS}" +} + +src_install () { + + dodir /usr/bin + dodir /etc + dodir /usr/share/man/man1 + + make \ + INSTALLDIR=${D}/usr/bin \ + CONFDIR=${D}/etc \ + MANDIR=${D}/usr/share/man/man1 \ + install || die + + exeinto /usr/bin + doexe utils/Linux/detect_ppa utils/Linux/test_ppa + + insinto /usr/share/pnm2ppa/lpd + doins ${S}/lpd/* + exeinto /usr/share/pnm2ppa/lpd + doexe ${S}/lpd/lpdsetup + + insinto /usr/share/pnm2ppa/pdq + doins ${S}/pdq/* + + # Interfaces for configuration of integration with lpd + # These are not installed because we do not assume that + # lpd, ncurses, gtk, but the sources are provided. Thus, + # if the headers were found they would have been built. + cd ${S}/ppaSet-beta1 +# dodir /usr/share/pnm2ppa/ppaSet-beta1 + exeinto /usr/share/pnm2ppa/ppaSet-beta1 + doexe calibration cleanHeads gammaRef install noGamma ppa.if test + +# dodir /usr/share/pnm2ppa/sample_scripts + exeinto /usr/share/pnm2ppa/sample_scripts + doexe ${S}/sample_scripts/* + + cd ${S}/pdq + exeinto /etc/pdq/drivers/ghostscript + doexe gs-pnm2ppa + exeinto /etc/pdq/interfaces + doexe dummy + + cd ${S}/ppaSet-beta1 + use gtk && \ + yes "" | make \ + BASEDIR=${D}/usr/ppaSet \ + BINDIR=${D}/usr/bin \ + PNM2PPA=${D}/usr/bin/pnm2ppa \ + CALIBRATE_PPA=${D}/usr/bin/calibrate_ppa \ + install-g + + yes "" | make \ + BASEDIR=${D}/usr/ppaSet \ + BINDIR=${D}/usr/bin \ + PNM2PPA=${D}/usr/bin/pnm2ppa \ + CALIBRATE_PPA=${D}/usr/bin/calibrate_ppa \ + install-n + + yes "" | make \ + BASEDIR=${D}/usr/ppaSet \ + BINDIR=${D}/usr/bin \ + PNM2PPA=${D}/usr/bin/pnm2ppa \ + CALIBRATE_PPA=${D}/usr/bin/calibrate_ppa \ + install + + rm ${D}/etc/printcap.* + + cd ${S}/docs/en + dodoc CALIBRATION*txt COLOR*txt PPA*txt RELEASE* + dodoc CREDITS INSTALL LICENSE README TODO + + cd sgml + insinto /usr/share/doc/${P} + doins *.sgml + + cd ${S} + dohtml -r . + + #clean up + rm -f ${D}/usr/bin/gPpaSet + rm -f ${D}/usr/bin/nPpaSet + + dosym /usr/ppaSet/gPpaSet /usr/bin/gPpaSet + dosym /usr/ppaSet/nPpaSet /usr/bin/nPpaSet + +} + +pkg_postinst() { + + einfo " + Now, you *must* edit /etc/pnm2ppa.conf and choose (at least) + your printer model and papersize. + + Run calibrate_ppa to calibrate color offsets. + + Read the docs in /usr/share/pnm2ppa/ to configure the printer, + configure lpr substitutes, cups, pdq, networking etc. + + Note that lpr and pdq drivers *have* been installed, but if your + config file management has /etc blocked (the default), they have + been installed under different filenames. Read the appropriate + Gentoo documentation for more info. + + Note: lpr has been configured for default papersize letter + " + +} |