[gentoo-commits] repo/gentoo:master commit in: net-print/pnm2ppa/files/

[David Seifert]

commit:     792be3151594406fc8dc411f3ef86486e0024f02
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Jan 23 18:03:49 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Jan 26 22:36:25 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=792be315

net-print/pnm2ppa: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/3608

 net-print/pnm2ppa/files/pnm2ppa-1.12-gentoo.diff | 180 -----------------------
 1 file changed, 180 deletions(-)

diff --git a/net-print/pnm2ppa/files/pnm2ppa-1.12-gentoo.diff b/net-print/pnm2ppa/files/pnm2ppa-1.12-gentoo.diff
deleted file mode 100644
index 0e35168..00000000
--- a/net-print/pnm2ppa/files/pnm2ppa-1.12-gentoo.diff
+++ /dev/null
@@ -1,180 +0,0 @@
-diff -ur pnm2ppa-1.12.orig/lpd/ascii.if pnm2ppa-1.12/lpd/ascii.if
---- pnm2ppa-1.12.orig/lpd/ascii.if	2000-10-28 17:58:07.000000000 +0300
-+++ pnm2ppa-1.12/lpd/ascii.if	2009-07-18 21:12:42.000000000 +0300
-@@ -1,6 +1,6 @@
- #! /bin/sh
- # for printing black and white text (ascii) files.
--FILTER="/usr/local/bin/bw.if"
-+FILTER="/usr/bin/bw.if"
- #FILTER="/usr/local/bin/bweco.if"
- #------enscript command line--------------------------
- enscript -2rj -p- | $FILTER
-diff -ur pnm2ppa-1.12.orig/lpd/bweco.if pnm2ppa-1.12/lpd/bweco.if
---- pnm2ppa-1.12.orig/lpd/bweco.if	2000-10-28 17:58:07.000000000 +0300
-+++ pnm2ppa-1.12/lpd/bweco.if	2009-07-18 21:12:42.000000000 +0300
-@@ -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 -ur pnm2ppa-1.12.orig/lpd/bw.if pnm2ppa-1.12/lpd/bw.if
---- pnm2ppa-1.12.orig/lpd/bw.if	2000-10-28 17:58:07.000000000 +0300
-+++ pnm2ppa-1.12/lpd/bw.if	2009-07-18 21:12:42.000000000 +0300
-@@ -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 -ur pnm2ppa-1.12.orig/lpd/coloreco.if pnm2ppa-1.12/lpd/coloreco.if
---- pnm2ppa-1.12.orig/lpd/coloreco.if	2000-10-28 17:58:07.000000000 +0300
-+++ pnm2ppa-1.12/lpd/coloreco.if	2009-07-18 21:12:42.000000000 +0300
-@@ -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 -ur pnm2ppa-1.12.orig/lpd/color.if pnm2ppa-1.12/lpd/color.if
---- pnm2ppa-1.12.orig/lpd/color.if	2000-10-28 17:58:07.000000000 +0300
-+++ pnm2ppa-1.12/lpd/color.if	2009-07-18 21:12:42.000000000 +0300
-@@ -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 -ur pnm2ppa-1.12.orig/lpd/printcap pnm2ppa-1.12/lpd/printcap
---- pnm2ppa-1.12.orig/lpd/printcap	2000-10-27 21:12:23.000000000 +0300
-+++ pnm2ppa-1.12/lpd/printcap	2009-07-18 21:12:42.000000000 +0300
-@@ -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 -ur pnm2ppa-1.12.orig/Makefile pnm2ppa-1.12/Makefile
---- pnm2ppa-1.12.orig/Makefile	2002-11-16 01:29:29.000000000 +0200
-+++ pnm2ppa-1.12/Makefile	2009-07-18 21:22:20.000000000 +0300
-@@ -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"
-+BINDIR="/usr/bin"
- CONFDIR="/etc"
--MANDIR="/usr/local/man/man1"
-+MANDIR="/usr/share/man/man1"
- 
- #compiler and linker options:
--CC=gcc
--CFLAGS=-Wall -pedantic -O2  
--LDFLAGS=-lm
-+CC?=gcc
-+CFLAGS+=-Wall -pedantic
-+LIBS=-lm
- 
- INSTALL=install
- # Install under Linux and other versions with the -b (backup) option
-@@ -81,10 +81,10 @@
- default: all
- 
- profile:
--	make "CFLAGS=-Wall -pedantic -O2 -g -pg -DNDEBUG"
-+	make "CFLAGS=-Wall -pedantic -g -pg -DNDEBUG"
- 
- debug:
--	make "CFLAGS=-Wall -pedantic -g -O2 -DDEBUG=1 -DLANG_EN" "LDFLAGS=-lm -lefence" "OBJS=$(DOBJS)"
-+	make "CFLAGS=-Wall -pedantic -g -DDEBUG=1 -DLANG_EN" "LIBS=-lm" "OBJS=$(DOBJS)"
- 
- # the following have been left in for those with good memories
- 
-@@ -125,10 +125,10 @@
- 	rm -f $(CONFDIR)/pnm2ppa.conf
- 
- pnm2ppa: $(OBJS) 
--	$(CC) $(LDFLAGS) $(CFLAGS) -o pnm2ppa $(OBJS)
-+	$(CC) $(LDFLAGS) $(CFLAGS) $(OBJS) $(LIBS) -o pnm2ppa
- 
- calibrate_ppa: calibrate_ppa.o pnmtools.o gamma.o
--	$(CC) $(LDFLAGS) $(CFLAGS) -o calibrate_ppa calibrate_ppa.o pnmtools.o gamma.o 
-+	$(CC) $(LDFLAGS) $(CFLAGS) calibrate_ppa.o pnmtools.o gamma.o $(LIBS) -o calibrate_ppa
- 
- calibrate_ppa.o: calibrate_ppa.c global.h image.h defaults.h pnmtools.h
- 	$(CC) $(CFLAGS) -c calibrate_ppa.c
-diff -ur pnm2ppa-1.12.orig/ppa_protocol/Makefile pnm2ppa-1.12/ppa_protocol/Makefile
---- pnm2ppa-1.12.orig/ppa_protocol/Makefile	2000-10-21 05:17:46.000000000 +0300
-+++ pnm2ppa-1.12/ppa_protocol/Makefile	2009-07-18 21:18:27.000000000 +0300
-@@ -2,9 +2,9 @@
- # Makefile for parse_vlink
- #
- 
--CC=gcc
-+CC?=gcc
- 
--CFLAGS=-Wall -pedantic -O2 -g 
-+CFLAGS+=-Wall -pedantic
- 
- default: all
- 
-diff -ur pnm2ppa-1.12.orig/ppa_protocol/parse_vlink.c pnm2ppa-1.12/ppa_protocol/parse_vlink.c
---- pnm2ppa-1.12.orig/ppa_protocol/parse_vlink.c	2000-10-21 05:17:46.000000000 +0300
-+++ pnm2ppa-1.12/ppa_protocol/parse_vlink.c	2009-07-18 21:19:30.000000000 +0300
-@@ -1,4 +1,5 @@
- #include <stdio.h>
-+#include <string.h>
- 
- void parse_scp (FILE *fptr, int length, unsigned long *pos)
- {