| 1 |
ssuominen 09/07/18 18:24:17 |
| 2 |
|
| 3 |
Modified: pnm2ppa-1.12-gentoo.diff |
| 4 |
Log: |
| 5 |
Respect environment flags wrt #248171. |
| 6 |
(Portage version: 2.2_rc33/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 net-print/pnm2ppa/files/pnm2ppa-1.12-gentoo.diff |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/pnm2ppa/files/pnm2ppa-1.12-gentoo.diff?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/pnm2ppa/files/pnm2ppa-1.12-gentoo.diff?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/pnm2ppa/files/pnm2ppa-1.12-gentoo.diff?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: pnm2ppa-1.12-gentoo.diff |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/net-print/pnm2ppa/files/pnm2ppa-1.12-gentoo.diff,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- pnm2ppa-1.12-gentoo.diff 13 Dec 2002 01:44:18 -0000 1.1 |
| 22 |
+++ pnm2ppa-1.12-gentoo.diff 18 Jul 2009 18:24:17 -0000 1.2 |
| 23 |
@@ -1,26 +1,6 @@ |
| 24 |
-diff -ur pnm2ppa-1.12/Makefile pnm2ppa-1.12.new/Makefile |
| 25 |
---- Makefile 2002-11-15 18:29:29.000000000 -0500 |
| 26 |
-+++ Makefile 2002-12-11 17:39:27.000000000 -0500 |
| 27 |
-@@ -5,13 +5,13 @@ |
| 28 |
- # paths to locations where the pnm2ppa binary, the configuration file, |
| 29 |
- # and the man page should be installed. On some systems (like Solaris) |
| 30 |
- # the install command requires the syntax BINDIR="-f /usr/local/bin". |
| 31 |
--BINDIR="/usr/local/bin" |
| 32 |
-+BINDIR="/usr/bin" |
| 33 |
- CONFDIR="/etc" |
| 34 |
--MANDIR="/usr/local/man/man1" |
| 35 |
-+MANDIR="/usr/share/man/man1" |
| 36 |
- |
| 37 |
- #compiler and linker options: |
| 38 |
- CC=gcc |
| 39 |
--CFLAGS=-Wall -pedantic -O2 |
| 40 |
-+CFLAGS=-Wall -pedantic -O3 |
| 41 |
- LDFLAGS=-lm |
| 42 |
- |
| 43 |
- INSTALL=install |
| 44 |
-diff -ur pnm2ppa-1.12/lpd/ascii.if pnm2ppa-1.12.new/lpd/ascii.if |
| 45 |
---- lpd/ascii.if 2000-10-28 10:58:07.000000000 -0400 |
| 46 |
-+++ lpd/ascii.if 2002-12-11 17:39:55.000000000 -0500 |
| 47 |
+diff -ur pnm2ppa-1.12.orig/lpd/ascii.if pnm2ppa-1.12/lpd/ascii.if |
| 48 |
+--- pnm2ppa-1.12.orig/lpd/ascii.if 2000-10-28 17:58:07.000000000 +0300 |
| 49 |
++++ pnm2ppa-1.12/lpd/ascii.if 2009-07-18 21:12:42.000000000 +0300 |
| 50 |
@@ -1,6 +1,6 @@ |
| 51 |
#! /bin/sh |
| 52 |
# for printing black and white text (ascii) files. |
| 53 |
@@ -29,9 +9,9 @@ |
| 54 |
#FILTER="/usr/local/bin/bweco.if" |
| 55 |
#------enscript command line-------------------------- |
| 56 |
enscript -2rj -p- | $FILTER |
| 57 |
-diff -ur pnm2ppa-1.12/lpd/bw.if pnm2ppa-1.12.new/lpd/bw.if |
| 58 |
---- lpd/bw.if 2000-10-28 10:58:07.000000000 -0400 |
| 59 |
-+++ lpd/bw.if 2002-12-11 17:40:14.000000000 -0500 |
| 60 |
+diff -ur pnm2ppa-1.12.orig/lpd/bweco.if pnm2ppa-1.12/lpd/bweco.if |
| 61 |
+--- pnm2ppa-1.12.orig/lpd/bweco.if 2000-10-28 17:58:07.000000000 +0300 |
| 62 |
++++ pnm2ppa-1.12/lpd/bweco.if 2009-07-18 21:12:42.000000000 +0300 |
| 63 |
@@ -6,7 +6,7 @@ |
| 64 |
#PAPER=a4 |
| 65 |
#PAPER=a3 |
| 66 |
@@ -40,10 +20,10 @@ |
| 67 |
+PNM2PPA="/usr/bin/pnm2ppa" |
| 68 |
#------------------dont change below this line---------------------- |
| 69 |
gs -sDEVICE=pbmraw -sPAPERSIZE=$PAPER -q -dNOPAUSE -r600 -sOutputFile=- - | \ |
| 70 |
- $PNM2PPA --bw $PPAOPTS -i - -o - |
| 71 |
-diff -ur pnm2ppa-1.12/lpd/bweco.if pnm2ppa-1.12.new/lpd/bweco.if |
| 72 |
---- lpd/bweco.if 2000-10-28 10:58:07.000000000 -0400 |
| 73 |
-+++ lpd/bweco.if 2002-12-11 17:40:23.000000000 -0500 |
| 74 |
+ $PNM2PPA --bw --eco $PPAOPTS -i - -o - |
| 75 |
+diff -ur pnm2ppa-1.12.orig/lpd/bw.if pnm2ppa-1.12/lpd/bw.if |
| 76 |
+--- pnm2ppa-1.12.orig/lpd/bw.if 2000-10-28 17:58:07.000000000 +0300 |
| 77 |
++++ pnm2ppa-1.12/lpd/bw.if 2009-07-18 21:12:42.000000000 +0300 |
| 78 |
@@ -6,7 +6,7 @@ |
| 79 |
#PAPER=a4 |
| 80 |
#PAPER=a3 |
| 81 |
@@ -52,34 +32,34 @@ |
| 82 |
+PNM2PPA="/usr/bin/pnm2ppa" |
| 83 |
#------------------dont change below this line---------------------- |
| 84 |
gs -sDEVICE=pbmraw -sPAPERSIZE=$PAPER -q -dNOPAUSE -r600 -sOutputFile=- - | \ |
| 85 |
- $PNM2PPA --bw --eco $PPAOPTS -i - -o - |
| 86 |
-diff -ur pnm2ppa-1.12/lpd/color.if pnm2ppa-1.12.new/lpd/color.if |
| 87 |
---- lpd/color.if 2000-10-28 10:58:07.000000000 -0400 |
| 88 |
-+++ lpd/color.if 2002-12-11 17:40:31.000000000 -0500 |
| 89 |
+ $PNM2PPA --bw $PPAOPTS -i - -o - |
| 90 |
+diff -ur pnm2ppa-1.12.orig/lpd/coloreco.if pnm2ppa-1.12/lpd/coloreco.if |
| 91 |
+--- pnm2ppa-1.12.orig/lpd/coloreco.if 2000-10-28 17:58:07.000000000 +0300 |
| 92 |
++++ pnm2ppa-1.12/lpd/coloreco.if 2009-07-18 21:12:42.000000000 +0300 |
| 93 |
@@ -6,7 +6,7 @@ |
| 94 |
#PAPER=a4 |
| 95 |
#PAPER=a3 |
| 96 |
- #PPAOPTS="-p" |
| 97 |
+ #PPAOPTS="--fd" |
| 98 |
-PNM2PPA="/usr/local/bin/pnm2ppa" |
| 99 |
+PNM2PPA="/usr/bin/pnm2ppa" |
| 100 |
#------------------dont change below this line---------------------- |
| 101 |
gs -sDEVICE=ppmraw -sPAPERSIZE=$PAPER -q -dNOPAUSE -r600 -sOutputFile=- - | \ |
| 102 |
- $PNM2PPA $PPAOPTS -i - -o - |
| 103 |
-diff -ur pnm2ppa-1.12/lpd/coloreco.if pnm2ppa-1.12.new/lpd/coloreco.if |
| 104 |
---- lpd/coloreco.if 2000-10-28 10:58:07.000000000 -0400 |
| 105 |
-+++ lpd/coloreco.if 2002-12-11 17:40:45.000000000 -0500 |
| 106 |
+ $PNM2PPA --eco $PPAOPTS -i - -o - |
| 107 |
+diff -ur pnm2ppa-1.12.orig/lpd/color.if pnm2ppa-1.12/lpd/color.if |
| 108 |
+--- pnm2ppa-1.12.orig/lpd/color.if 2000-10-28 17:58:07.000000000 +0300 |
| 109 |
++++ pnm2ppa-1.12/lpd/color.if 2009-07-18 21:12:42.000000000 +0300 |
| 110 |
@@ -6,7 +6,7 @@ |
| 111 |
#PAPER=a4 |
| 112 |
#PAPER=a3 |
| 113 |
- #PPAOPTS="--fd" |
| 114 |
+ #PPAOPTS="-p" |
| 115 |
-PNM2PPA="/usr/local/bin/pnm2ppa" |
| 116 |
+PNM2PPA="/usr/bin/pnm2ppa" |
| 117 |
#------------------dont change below this line---------------------- |
| 118 |
gs -sDEVICE=ppmraw -sPAPERSIZE=$PAPER -q -dNOPAUSE -r600 -sOutputFile=- - | \ |
| 119 |
- $PNM2PPA --eco $PPAOPTS -i - -o - |
| 120 |
-diff -ur pnm2ppa-1.12/lpd/printcap pnm2ppa-1.12.new/lpd/printcap |
| 121 |
---- lpd/printcap 2000-10-27 14:12:23.000000000 -0400 |
| 122 |
-+++ lpd/printcap 2002-12-11 17:41:35.000000000 -0500 |
| 123 |
+ $PNM2PPA $PPAOPTS -i - -o - |
| 124 |
+diff -ur pnm2ppa-1.12.orig/lpd/printcap pnm2ppa-1.12/lpd/printcap |
| 125 |
+--- pnm2ppa-1.12.orig/lpd/printcap 2000-10-27 21:12:23.000000000 +0300 |
| 126 |
++++ pnm2ppa-1.12/lpd/printcap 2009-07-18 21:12:42.000000000 +0300 |
| 127 |
@@ -6,7 +6,7 @@ |
| 128 |
:sd=/var/spool/lpd/coloreco:\ |
| 129 |
:lf=/var/spool/lpd/coloreco/log:\ |
| 130 |
@@ -125,3 +105,76 @@ |
| 131 |
:la:mx#0:\ |
| 132 |
:sh:sf: |
| 133 |
|
| 134 |
+diff -ur pnm2ppa-1.12.orig/Makefile pnm2ppa-1.12/Makefile |
| 135 |
+--- pnm2ppa-1.12.orig/Makefile 2002-11-16 01:29:29.000000000 +0200 |
| 136 |
++++ pnm2ppa-1.12/Makefile 2009-07-18 21:22:20.000000000 +0300 |
| 137 |
+@@ -5,14 +5,14 @@ |
| 138 |
+ # paths to locations where the pnm2ppa binary, the configuration file, |
| 139 |
+ # and the man page should be installed. On some systems (like Solaris) |
| 140 |
+ # the install command requires the syntax BINDIR="-f /usr/local/bin". |
| 141 |
+-BINDIR="/usr/local/bin" |
| 142 |
++BINDIR="/usr/bin" |
| 143 |
+ CONFDIR="/etc" |
| 144 |
+-MANDIR="/usr/local/man/man1" |
| 145 |
++MANDIR="/usr/share/man/man1" |
| 146 |
+ |
| 147 |
+ #compiler and linker options: |
| 148 |
+-CC=gcc |
| 149 |
+-CFLAGS=-Wall -pedantic -O2 |
| 150 |
+-LDFLAGS=-lm |
| 151 |
++CC?=gcc |
| 152 |
++CFLAGS+=-Wall -pedantic |
| 153 |
++LIBS=-lm |
| 154 |
+ |
| 155 |
+ INSTALL=install |
| 156 |
+ # Install under Linux and other versions with the -b (backup) option |
| 157 |
+@@ -81,10 +81,10 @@ |
| 158 |
+ default: all |
| 159 |
+ |
| 160 |
+ profile: |
| 161 |
+- make "CFLAGS=-Wall -pedantic -O2 -g -pg -DNDEBUG" |
| 162 |
++ make "CFLAGS=-Wall -pedantic -g -pg -DNDEBUG" |
| 163 |
+ |
| 164 |
+ debug: |
| 165 |
+- make "CFLAGS=-Wall -pedantic -g -O2 -DDEBUG=1 -DLANG_EN" "LDFLAGS=-lm -lefence" "OBJS=$(DOBJS)" |
| 166 |
++ make "CFLAGS=-Wall -pedantic -g -DDEBUG=1 -DLANG_EN" "LIBS=-lm" "OBJS=$(DOBJS)" |
| 167 |
+ |
| 168 |
+ # the following have been left in for those with good memories |
| 169 |
+ |
| 170 |
+@@ -125,10 +125,10 @@ |
| 171 |
+ rm -f $(CONFDIR)/pnm2ppa.conf |
| 172 |
+ |
| 173 |
+ pnm2ppa: $(OBJS) |
| 174 |
+- $(CC) $(LDFLAGS) $(CFLAGS) -o pnm2ppa $(OBJS) |
| 175 |
++ $(CC) $(LDFLAGS) $(CFLAGS) $(OBJS) $(LIBS) -o pnm2ppa |
| 176 |
+ |
| 177 |
+ calibrate_ppa: calibrate_ppa.o pnmtools.o gamma.o |
| 178 |
+- $(CC) $(LDFLAGS) $(CFLAGS) -o calibrate_ppa calibrate_ppa.o pnmtools.o gamma.o |
| 179 |
++ $(CC) $(LDFLAGS) $(CFLAGS) calibrate_ppa.o pnmtools.o gamma.o $(LIBS) -o calibrate_ppa |
| 180 |
+ |
| 181 |
+ calibrate_ppa.o: calibrate_ppa.c global.h image.h defaults.h pnmtools.h |
| 182 |
+ $(CC) $(CFLAGS) -c calibrate_ppa.c |
| 183 |
+diff -ur pnm2ppa-1.12.orig/ppa_protocol/Makefile pnm2ppa-1.12/ppa_protocol/Makefile |
| 184 |
+--- pnm2ppa-1.12.orig/ppa_protocol/Makefile 2000-10-21 05:17:46.000000000 +0300 |
| 185 |
++++ pnm2ppa-1.12/ppa_protocol/Makefile 2009-07-18 21:18:27.000000000 +0300 |
| 186 |
+@@ -2,9 +2,9 @@ |
| 187 |
+ # Makefile for parse_vlink |
| 188 |
+ # |
| 189 |
+ |
| 190 |
+-CC=gcc |
| 191 |
++CC?=gcc |
| 192 |
+ |
| 193 |
+-CFLAGS=-Wall -pedantic -O2 -g |
| 194 |
++CFLAGS+=-Wall -pedantic |
| 195 |
+ |
| 196 |
+ default: all |
| 197 |
+ |
| 198 |
+diff -ur pnm2ppa-1.12.orig/ppa_protocol/parse_vlink.c pnm2ppa-1.12/ppa_protocol/parse_vlink.c |
| 199 |
+--- pnm2ppa-1.12.orig/ppa_protocol/parse_vlink.c 2000-10-21 05:17:46.000000000 +0300 |
| 200 |
++++ pnm2ppa-1.12/ppa_protocol/parse_vlink.c 2009-07-18 21:19:30.000000000 +0300 |
| 201 |
+@@ -1,4 +1,5 @@ |
| 202 |
+ #include <stdio.h> |
| 203 |
++#include <string.h> |
| 204 |
+ |
| 205 |
+ void parse_scp (FILE *fptr, int length, unsigned long *pos) |
| 206 |
+ { |
Archives