Attachment #116128 for bug #158040

View | Details | Raw Unified | Return to bug 158040
Collapse All | Expand All

Lines 6-13 Link Here

(-)Makefile (-2 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= foo2zjs	8	PORTNAME= foo2zjs
9	PORTVERSION= 20090530	9	PORTVERSION= 20110609
10	PORTREVISION= 4
11	CATEGORIES= print	10	CATEGORIES= print
12	MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \	11	MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \
13	${MASTER_SITE_LOCAL:S,$,acm/${PORTNAME}/,}	12	${MASTER_SITE_LOCAL:S,$,acm/${PORTNAME}/,}

Lines 1-3 Link Here

(-)distinfo (-3 / +2 lines)
1	MD5 (foo2zjs-20090530.tar.gz) = 44f5450902e20edf53a6e98271950e7d	1	SHA256 (foo2zjs-20110609.tar.gz) = b83526005656ee156997f6407a3c02e22b086103945e38d7ce63d9e9d8899c28
2	SHA256 (foo2zjs-20090530.tar.gz) = 887f0ae60a4e450d96775fc75c013220a6b0b92edb559e1acd11055fe56ff787	2	SIZE (foo2zjs-20110609.tar.gz) = 1631342
3	SIZE (foo2zjs-20090530.tar.gz) = 1565746

Lines 14-19 Link Here

(-)pkg-plist (+49 lines)
14	bin/foo2slx	14	bin/foo2slx
15	bin/slxdecode	15	bin/slxdecode
16	bin/foo2hiperc	16	bin/foo2hiperc
		17	bin/hbpldecode
17	bin/hipercdecode	18	bin/hipercdecode
18	bin/gipddecode	19	bin/gipddecode
19	bin/printer-profile	20	bin/printer-profile
Lines 63-68 Link Here
63	share/cups/model/HP-LaserJet_1018.ppd.gz	64	share/cups/model/HP-LaserJet_1018.ppd.gz
64	share/cups/model/HP-LaserJet_1020.ppd.gz	65	share/cups/model/HP-LaserJet_1020.ppd.gz
65	share/cups/model/HP-LaserJet_1022.ppd.gz	66	share/cups/model/HP-LaserJet_1022.ppd.gz
		67	share/cups/model/HP-LaserJet_1022n.ppd.gz
		68	share/cups/model/HP-LaserJet_1022nw.ppd.gz
66	share/cups/model/HP-LaserJet_M1005_MFP.ppd.gz	69	share/cups/model/HP-LaserJet_M1005_MFP.ppd.gz
67	share/cups/model/HP-LaserJet_M1120_MFP.ppd.gz	70	share/cups/model/HP-LaserJet_M1120_MFP.ppd.gz
68	share/cups/model/HP-LaserJet_M1319_MFP.ppd.gz	71	share/cups/model/HP-LaserJet_M1319_MFP.ppd.gz
Lines 71-78 Link Here
71	share/cups/model/HP-LaserJet_P1007.ppd.gz	74	share/cups/model/HP-LaserJet_P1007.ppd.gz
72	share/cups/model/HP-LaserJet_P1008.ppd.gz	75	share/cups/model/HP-LaserJet_P1008.ppd.gz
73	share/cups/model/HP-LaserJet_P1505.ppd.gz	76	share/cups/model/HP-LaserJet_P1505.ppd.gz
		77	share/cups/model/HP-LaserJet_P1505n.ppd.gz
74	share/cups/model/HP-LaserJet_P2014.ppd.gz	78	share/cups/model/HP-LaserJet_P2014.ppd.gz
		79	share/cups/model/HP-LaserJet_P2014n.ppd.gz
75	share/cups/model/HP-LaserJet_P2035.ppd.gz	80	share/cups/model/HP-LaserJet_P2035.ppd.gz
		81	share/cups/model/HP-LaserJet_P2035n.ppd.gz
		82	share/cups/model/HP-LaserJet_Pro_CP1025nw.ppd.gz
		83	share/cups/model/HP-LaserJet_Pro_P1102.ppd.gz
		84	share/cups/model/HP-LaserJet_Pro_P1102w.ppd.gz
		85	share/cups/model/HP-LaserJet_Pro_P1566.ppd.gz
		86	share/cups/model/HP-LaserJet_Pro_P1606dn.ppd.gz
76	share/cups/model/KONICA_MINOLTA-magicolor_1600W.ppd.gz	87	share/cups/model/KONICA_MINOLTA-magicolor_1600W.ppd.gz
77	share/cups/model/KONICA_MINOLTA-magicolor_1680MF.ppd.gz	88	share/cups/model/KONICA_MINOLTA-magicolor_1680MF.ppd.gz
78	share/cups/model/KONICA_MINOLTA-magicolor_1690MF.ppd.gz	89	share/cups/model/KONICA_MINOLTA-magicolor_1690MF.ppd.gz
Lines 80-91 Link Here
80	share/cups/model/Lexmark-C500.ppd.gz	91	share/cups/model/Lexmark-C500.ppd.gz
81	share/cups/model/KONICA_MINOLTA-magicolor_2490_MF.ppd.gz	92	share/cups/model/KONICA_MINOLTA-magicolor_2490_MF.ppd.gz
82	share/cups/model/KONICA_MINOLTA-magicolor_2530_DL.ppd.gz	93	share/cups/model/KONICA_MINOLTA-magicolor_2530_DL.ppd.gz
		94	share/cups/model/KONICA_MINOLTA-magicolor_4690MF.ppd.gz
83	share/cups/model/Kyocera-KM-1635.ppd.gz	95	share/cups/model/Kyocera-KM-1635.ppd.gz
84	share/cups/model/Kyocera-KM-2035.ppd.gz	96	share/cups/model/Kyocera-KM-2035.ppd.gz
85	share/cups/model/Minolta-Color_PageWorks_Pro_L.ppd.gz	97	share/cups/model/Minolta-Color_PageWorks_Pro_L.ppd.gz
86	share/cups/model/Minolta-magicolor_2200_DL.ppd.gz	98	share/cups/model/Minolta-magicolor_2200_DL.ppd.gz
87	share/cups/model/Minolta-magicolor_2300_DL.ppd.gz	99	share/cups/model/Minolta-magicolor_2300_DL.ppd.gz
88	share/cups/model/Minolta-magicolor_2430_DL.ppd.gz	100	share/cups/model/Minolta-magicolor_2430_DL.ppd.gz
		101	share/cups/model/Oki-C110.ppd.gz
		102	share/cups/model/Oki-C310dn.ppd.gz
		103
89	share/cups/model/Oki-C3100.ppd.gz	104	share/cups/model/Oki-C3100.ppd.gz
90	share/cups/model/Oki-C3200.ppd.gz	105	share/cups/model/Oki-C3200.ppd.gz
91	share/cups/model/Oki-C3300.ppd.gz	106	share/cups/model/Oki-C3300.ppd.gz
Lines 95-117 Link Here
95	share/cups/model/Oki-C5200.ppd.gz	110	share/cups/model/Oki-C5200.ppd.gz
96	share/cups/model/Oki-C5500.ppd.gz	111	share/cups/model/Oki-C5500.ppd.gz
97	share/cups/model/Oki-C5600.ppd.gz	112	share/cups/model/Oki-C5600.ppd.gz
		113	share/cups/model/Oki-C5650.ppd.gz
98	share/cups/model/Oki-C5800.ppd.gz	114	share/cups/model/Oki-C5800.ppd.gz
		115	share/cups/model/Olivetti-d-Color_P160W.ppd.gz
99	share/cups/model/Samsung-CLP-300.ppd.gz	116	share/cups/model/Samsung-CLP-300.ppd.gz
100	share/cups/model/Samsung-CLP-310.ppd.gz	117	share/cups/model/Samsung-CLP-310.ppd.gz
101	share/cups/model/Samsung-CLP-315.ppd.gz	118	share/cups/model/Samsung-CLP-315.ppd.gz
		119	share/cups/model/Samsung-CLP-325.ppd.gz
102	share/cups/model/Samsung-CLP-600.ppd.gz	120	share/cups/model/Samsung-CLP-600.ppd.gz
103	share/cups/model/Samsung-CLP-610.ppd.gz	121	share/cups/model/Samsung-CLP-610.ppd.gz
		122	share/cups/model/Samsung-CLP-620.ppd.gz
104	share/cups/model/Samsung-CLX-2160.ppd.gz	123	share/cups/model/Samsung-CLX-2160.ppd.gz
105	share/cups/model/Samsung-CLX-3160.ppd.gz	124	share/cups/model/Samsung-CLX-3160.ppd.gz
106	share/cups/model/Samsung-CLX-3175.ppd.gz	125	share/cups/model/Samsung-CLX-3175.ppd.gz
107	share/cups/model/Xerox-Phaser_6110.ppd.gz	126	share/cups/model/Xerox-Phaser_6110.ppd.gz
108	share/cups/model/Xerox-Phaser_6115MFP.ppd.gz	127	share/cups/model/Xerox-Phaser_6115MFP.ppd.gz
		128	share/cups/model/Xerox-Phaser_6121MFP.ppd.gz
		129	foomatic/db/source/printer/HP-LaserJet_1022n.xml
		130	foomatic/db/source/printer/HP-LaserJet_1022nw.xml
109	foomatic/db/source/printer/HP-LaserJet_M1319_MFP.xml	131	foomatic/db/source/printer/HP-LaserJet_M1319_MFP.xml
		132	foomatic/db/source/printer/HP-LaserJet_P1505n.xml
		133	foomatic/db/source/printer/HP-LaserJet_P2014n.xml
110	foomatic/db/source/printer/HP-LaserJet_P2035.xml	134	foomatic/db/source/printer/HP-LaserJet_P2035.xml
		135	foomatic/db/source/printer/HP-LaserJet_P2035n.xml
		136	foomatic/db/source/printer/HP-LaserJet_Pro_CP1025nw.xml
		137	foomatic/db/source/printer/HP-LaserJet_Pro_P1102.xml
		138	foomatic/db/source/printer/HP-LaserJet_Pro_P1102w.xml
		139	foomatic/db/source/printer/HP-LaserJet_Pro_P1566.xml
		140	foomatic/db/source/printer/HP-LaserJet_Pro_P1606dn.xml
111	foomatic/db/source/printer/KONICA_MINOLTA-magicolor_1600W.xml	141	foomatic/db/source/printer/KONICA_MINOLTA-magicolor_1600W.xml
112	foomatic/db/source/printer/KONICA_MINOLTA-magicolor_1680MF.xml	142	foomatic/db/source/printer/KONICA_MINOLTA-magicolor_1680MF.xml
113	foomatic/db/source/printer/KONICA_MINOLTA-magicolor_1690MF.xml	143	foomatic/db/source/printer/KONICA_MINOLTA-magicolor_1690MF.xml
		144	foomatic/db/source/printer/KONICA_MINOLTA-magicolor_4690MF.xml
		145	foomatic/db/source/printer/Oki-C110.xml
		146	foomatic/db/source/printer/Oki-C310dn.xml
		147	foomatic/db/source/printer/Oki-C5650.xml
		148	foomatic/db/source/printer/Olivetti-d-Color_P160W.xml
114	foomatic/db/source/printer/Samsung-CLP-310.xml	149	foomatic/db/source/printer/Samsung-CLP-310.xml
		150	foomatic/db/source/printer/Samsung-CLP-325.xml
		151	foomatic/db/source/printer/Samsung-CLP-620.xml
		152	foomatic/db/source/printer/Xerox-Phaser_6121MFP.xml
115	foomatic/db/source/opt/foo2hiperc-ColorMode.xml	153	foomatic/db/source/opt/foo2hiperc-ColorMode.xml
116	foomatic/db/source/opt/foo2hiperc-Compression.xml	154	foomatic/db/source/opt/foo2hiperc-Compression.xml
117	foomatic/db/source/opt/foo2hiperc-Duplex.xml	155	foomatic/db/source/opt/foo2hiperc-Duplex.xml
Lines 120-125 Link Here
120	foomatic/db/source/opt/foo2hiperc-MediaType.xml	158	foomatic/db/source/opt/foo2hiperc-MediaType.xml
121	foomatic/db/source/opt/foo2hiperc-PageSize.xml	159	foomatic/db/source/opt/foo2hiperc-PageSize.xml
122	foomatic/db/source/opt/foo2hiperc-Resolution.xml	160	foomatic/db/source/opt/foo2hiperc-Resolution.xml
		161	foomatic/db/source/opt/foo2hp-AlignCMYK.xml
123	foomatic/db/source/opt/foo2hp-BitsPerPlane.xml	162	foomatic/db/source/opt/foo2hp-BitsPerPlane.xml
124	foomatic/db/source/opt/foo2hp-ColorMode.xml	163	foomatic/db/source/opt/foo2hp-ColorMode.xml
125	foomatic/db/source/opt/foo2hp-Duplex.xml	164	foomatic/db/source/opt/foo2hp-Duplex.xml
Lines 140-145 Link Here
140	foomatic/db/source/opt/foo2oak-ICM.xml	179	foomatic/db/source/opt/foo2oak-ICM.xml
141	foomatic/db/source/opt/foo2oak-InputSlot.xml	180	foomatic/db/source/opt/foo2oak-InputSlot.xml
142	foomatic/db/source/opt/foo2oak-MediaType.xml	181	foomatic/db/source/opt/foo2oak-MediaType.xml
		182	foomatic/db/source/opt/foo2oak-z1-Duplex.xml
143	foomatic/db/source/opt/foo2oak-z1-InputSlot.xml	183	foomatic/db/source/opt/foo2oak-z1-InputSlot.xml
144	foomatic/db/source/opt/foo2oak-z1-MediaType.xml	184	foomatic/db/source/opt/foo2oak-z1-MediaType.xml
145	foomatic/db/source/opt/foo2oak-z1-PageSize.xml	185	foomatic/db/source/opt/foo2oak-z1-PageSize.xml
Lines 157-163 Link Here
157	foomatic/db/source/opt/foo2slx-MediaType.xml	197	foomatic/db/source/opt/foo2slx-MediaType.xml
158	foomatic/db/source/opt/foo2slx-PageSize.xml	198	foomatic/db/source/opt/foo2slx-PageSize.xml
159	foomatic/db/source/opt/foo2slx-Resolution.xml	199	foomatic/db/source/opt/foo2slx-Resolution.xml
		200	foomatic/db/source/opt/foo2xqx-Density.xml
160	foomatic/db/source/opt/foo2xqx-Duplex.xml	201	foomatic/db/source/opt/foo2xqx-Duplex.xml
		202	foomatic/db/source/opt/foo2xxx-Halftone.xml
161	foomatic/db/source/opt/foo2xqx-InputSlot.xml	203	foomatic/db/source/opt/foo2xqx-InputSlot.xml
162	foomatic/db/source/opt/foo2xqx-MediaType.xml	204	foomatic/db/source/opt/foo2xqx-MediaType.xml
163	foomatic/db/source/opt/foo2xqx-Resolution.xml	205	foomatic/db/source/opt/foo2xqx-Resolution.xml
Lines 174-179 Link Here
174	foomatic/db/source/opt/foo2zjs-PageSize.xml	216	foomatic/db/source/opt/foo2zjs-PageSize.xml
175	foomatic/db/source/opt/foo2zjs-PrinterType.xml	217	foomatic/db/source/opt/foo2zjs-PrinterType.xml
176	foomatic/db/source/opt/foo2zjs-Resolution.xml	218	foomatic/db/source/opt/foo2zjs-Resolution.xml
		219	foomatic/db/source/opt/foo2zjs-z1-MediaType.xml
		220	foomatic/db/source/opt/foo2zjs-z1-PageSize.xml
		221	foomatic/db/source/opt/foo2zjs-z12-Density.xml
		222	foomatic/db/source/opt/foo2zjs-z2-MediaType.xml
		223	foomatic/db/source/opt/foo2zjs-z2-PageSize.xml
		224	foomatic/db/source/opt/foo2zjs-z3-MediaType.xml
		225	foomatic/db/source/opt/foo2zjs-z3-PageSize.xml
177	%%PORTDOCS%%@dirrm %%DOCSDIR%%	226	%%PORTDOCS%%@dirrm %%DOCSDIR%%
178	@dirrmtry foomatic/db/source/printer	227	@dirrmtry foomatic/db/source/printer
179	@dirrmtry foomatic/db/source/opt	228	@dirrmtry foomatic/db/source/opt




--- Makefile.orig	2011-06-09 18:07:08.000000000 +0400
+++ Makefile	2011-06-19 21:14:01.911619475 +0400
@@ -17,9 +17,7 @@ SYSNAME := $(shell uname -n)
 VERSION=0.0
 
 # Installation prefix...

 
 # Pathnames for this package...
 BIN=$(PREFIX)/bin
@@ -31,13 +29,14 @@ SHARELAVA=$(PREFIX)/share/foo2lava
 SHAREQPDL=$(PREFIX)/share/foo2qpdl
 SHARESLX=$(PREFIX)/share/foo2slx
 SHAREHC=$(PREFIX)/share/foo2hiperc

-INSTALL=install
+INSTALL?=install
+INSTALL_MAN?=install
 ROOT=root
 
 # Pathnames for referenced packages...
-FOODB=$(DESTDIR)/usr/share/foomatic/db/source

 
 # User ID's
 LPuid=-oroot
@@ -282,7 +281,7 @@ endif
 endif
 
 # Compiler flags
 #CFLAGS +=	-O2 -Wall -Wno-unused-but-set-variable
-CFLAGS +=	-O2 -Wall 
+CFLAGS ?=	-O2 -Wall 
 #CFLAGS +=	-g
 
 #
@@ -556,10 +555,9 @@ command2foo2lava-pjl.o: command2foo2lava
 #
 # Installation rules
 #
-install: all install-test install-prog install-icc2ps install-osx-hotplug \
-	    install-extra install-crd install-foo install-ppd \
-	    install-gui install-desktop install-filter \
-	    install-man install-doc
+install: all install-prog install-icc2ps \
+	    install-crd install-foo install-ppd
+
 	#
 	# If you use CUPS, then restart the spooler:
 	#	make cups
@@ -595,7 +593,7 @@ install-test:
 	#
     
 

 
 install-prog:
 	#
@@ -625,20 +623,13 @@ install-foo:
 	#
 	# Remove obsolete foomatic database files from previous versions
 	#

-	rm -f $(FOODB)/opt/foo2zjs-NupOrient.xml
-	rm -f $(FOODB)/opt/foo2*-Quality.xml
-	rm -f $(FOODB)/printer/KonicaMinolta*.xml
 	#
 	# Install current database files
 	#
+	mkdir -p $(FOODB)
 	@if [ -d $(FOODB) ]; then \
-	    for dir in driver printer opt; do \
+	    for dir in printer opt; do \
 		echo install -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \
+		mkdir -p $(FOODB)/$$dir/; \
 		echo install -d $(FOODB)/$$dir/; \
 		$(INSTALL) -d $(FOODB)/$$dir/; \
 		echo install -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \
@@ -655,15 +646,6 @@ install-foo:
 	    echo "*** ... wherever foomatic is stashed on your machine."; \
 	    echo "***"; \
 	fi

 
 install-icc2ps:
 	#
@@ -783,9 +765,9 @@ install-extra:
 	    fi; \
 	done
 

 VARPPD=/var/lp/ppd
 install-ppd:
 	#
@@ -819,6 +801,7 @@ install-ppd:
 		gzip < $$ppd > $(PPD)/foo2zjs/$$ppd.gz; \
 	    done; \
 	fi
 	#
 	export PATH=$$PATH:`pwd`:; \
+	mkdir -p $(MODEL)
 	if [ -d $(MODEL) ]; then \
 	    rm -f $(MODEL)/KonicaMinolta*; \
 	    cd PPD; \
@@ -835,9 +818,9 @@ install-ppd:
 	    done; \
 	fi
 

 
 install-desktop:
 	#
@@ -1344,38 +1327,38 @@ install-man: man
 	#
 	# Install manual pages
 	#

-	$(INSTALL) -c -m 644 foo2hiperc.1 $(MANDIR)/man1/
-	$(INSTALL) -c -m 644 foo2hiperc-wrapper.1 $(MANDIR)/man1/
-	$(INSTALL) -c -m 644 hipercdecode.1 $(MANDIR)/man1/
-	$(INSTALL) -c -m 644 gipddecode.1 $(MANDIR)/man1/
-	$(INSTALL) -c -m 644 hbpldecode.1 $(MANDIR)/man1/
-	$(INSTALL) -c -m 644 foo2zjs-pstops.1 $(MANDIR)/man1/
-	$(INSTALL) -c -m 644 arm2hpdl.1 $(MANDIR)/man1/
-	$(INSTALL) -c -m 644 usb_printerid.1 $(MANDIR)/man1/
-	$(INSTALL) -c -m 644 printer-profile.1 $(MANDIR)/man1/
+	$(INSTALL_MAN) -d -m 755 $(MANDIR)
+	$(INSTALL_MAN) -d -m 755 $(MANDIR)/man1/
+	$(INSTALL_MAN) -c -m 644 foo2zjs.1 $(MANDIR)/man1/
+	$(INSTALL_MAN) -c -m 644 foo2zjs-wrapper.1 $(MANDIR)/man1/
+	$(INSTALL_MAN) -c -m 644 zjsdecode.1 $(MANDIR)/man1/

+	$(INSTALL_MAN) -c -m 644 foo2hiperc.1 $(MANDIR)/man1/
+	$(INSTALL_MAN) -c -m 644 foo2hiperc-wrapper.1 $(MANDIR)/man1/
+	$(INSTALL_MAN) -c -m 644 hipercdecode.1 $(MANDIR)/man1/
+	$(INSTALL_MAN) -c -m 644 gipddecode.1 $(MANDIR)/man1/
+	$(INSTALL_MAN) -c -m 644 hbpldecode.1 $(MANDIR)/man1/
+	$(INSTALL_MAN) -c -m 644 foo2zjs-pstops.1 $(MANDIR)/man1/
+	$(INSTALL_MAN) -c -m 644 arm2hpdl.1 $(MANDIR)/man1/
+	$(INSTALL_MAN) -c -m 644 usb_printerid.1 $(MANDIR)/man1/
+	$(INSTALL_MAN) -c -m 644 printer-profile.1 $(MANDIR)/man1/
 	cd icc2ps; $(MAKE) install-man
 ifeq ($(UNAME),Darwin)
 	cd osx-hotplug; $(MAKE) install-man




--- foo2hiperc-wrapper.in.orig	2011-01-31 15:23:43.000000000 +0300
+++ foo2hiperc-wrapper.in	2011-06-19 21:16:59.468615644 +0400
@@ -46,10 +46,6 @@ PATH=$PATH:.
 #
 #	Log the command line, for debugging and problem reports
 #

 usage() {
 	cat <<EOF
 Usage:
@@ -154,8 +150,8 @@ nup() {
 #
 # N.B. := operator used here, when :- would be better, because "ash"
 # doesn't have :-
-if eval gs.foo -v >/dev/null 2>&1; then
-        GSBIN=${GSBIN:-gs.foo}
+if eval gs -v >/dev/null 2>&1; then
+        GSBIN=${GSBIN:-gs}
 else
         GSBIN=${GSBIN:-gs}
 fi
@@ -676,18 +672,6 @@ $PREFILTER \
 	    $BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD $COMPRESSED -D$DEBUG
 
 #




--- foo2hp2600-wrapper.in.orig	2011-01-20 04:01:09.000000000 +0300
+++ foo2hp2600-wrapper.in	2011-06-19 21:21:05.231903101 +0400
@@ -34,13 +34,6 @@ PREFIX=/usr
 SHARE=$PREFIX/share/foo2hp
 PATH=$PATH:/sw/bin:/opt/local/bin
 

 usage() {
 	cat <<EOF
 Usage:
@@ -186,8 +179,8 @@ nup() {
 #
 # N.B. := operator used here, when :- would be better, because "ash"
 # doesn't have :-
-if eval gs.foo -v >/dev/null 2>&1; then
-        GSBIN=${GSBIN:-gs.foo}
+if eval gs -v >/dev/null 2>&1; then
+        GSBIN=${GSBIN:-gs}
 else
         GSBIN=${GSBIN:-gs}
 fi
@@ -359,7 +352,7 @@ case "$BPP" in
 	    GSDEV="-sDEVICE=cups -dcupsColorSpace=6 -dcupsBitsPerColor=2"
 	    GSDEV="$GSDEV -dcupsColorOrder=2"
 	fi

 	    GSBIN=gs
 	fi
 
@@ -793,18 +786,6 @@ $PREFILTER \
 	    $BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD -D$DEBUG
 
 #

-    logger -t "$BASENAME" -p lpr.info -- \
-	"foo2hp -r$RES -g$DIM -p$PAPER -m$MEDIA \
--n$COPIES -d$DUPLEX -s$SOURCE $COLOR -b$BPP $CLIP_UL $CLIP_LR $CLIP_LOG \
-$SAVETONER -O$OFF_C,$OFF_M,$OFF_Y,$OFF_K $BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD"
-fi
-
-#




--- foo2lava-wrapper.in.orig	2011-01-15 02:21:39.000000000 +0300
+++ foo2lava-wrapper.in	2011-06-19 21:22:09.019758180 +0400
@@ -42,13 +42,6 @@ PREFIX=/usr
 SHARE=$PREFIX/share/foo2lava
 PATH=$PATH:/sw/bin:/opt/local/bin
 

 usage() {
 	cat <<EOF
 Usage:
@@ -155,8 +148,8 @@ nup() {
 #
 # N.B. := operator used here, when :- would be better, because "ash"
 # doesn't have :-
-if eval gs.foo -v >/dev/null 2>&1; then
-        GSBIN=${GSBIN:-gs.foo}
+if eval gs -v >/dev/null 2>&1; then
+        GSBIN=${GSBIN:-gs}
 else
         GSBIN=${GSBIN:-gs}
 fi
@@ -733,18 +726,6 @@ $PREFILTER \
 	    $BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD -D$DEBUG
 
 #




--- foo2oak-wrapper.in.orig	2011-01-15 02:21:39.000000000 +0300
+++ foo2oak-wrapper.in	2011-06-19 21:24:46.175611255 +0400
@@ -35,13 +35,6 @@ PREFIX=/usr
 SHARE=$PREFIX/share/foo2oak
 PATH=$PATH:/sw/bin:/opt/local/bin
 

 usage() {
 	cat <<EOF
 Usage:
@@ -144,8 +137,8 @@ nup() {
 #
 # N.B. := operator used here, when :- would be better, because "ash"
 # doesn't have :-
-if eval gs.foo -v >/dev/null 2>&1; then
-        GSBIN=${GSBIN:-gs.foo}
+if eval gs -v >/dev/null 2>&1; then
+        GSBIN=${GSBIN:-gs}
 else
         GSBIN=${GSBIN:-gs}
 fi
@@ -701,19 +694,6 @@ $PREFILTER \
 	    $BC $AIB $COLOR2MONO -D$DEBUG
 
 #

-	"$GSBIN $PAPERSIZE -g$DIM -r$RES $GSDEV $GSOPTS $GAMMAFILE"
-    logger -t "$BASENAME" -p lpr.info -- \
-	"foo2oak -r$RES -g$DIM -p$PAPER -m$MEDIA \
--n$COPIES -d$DUPLEX -s$SOURCE -z$MODEL -M$MIRROR $COLOR -b$BPP \
-$CLIP_UL $CLIP_LR $CLIP_LOG \
-$BC $AIB $COLOR2MONO"
-fi




--- foo2qpdl-wrapper.in.orig	2011-04-15 23:07:00.000000000 +0400
+++ foo2qpdl-wrapper.in	2011-06-19 21:26:03.964850095 +0400
@@ -43,13 +43,6 @@ PREFIX=/usr
 SHARE=$PREFIX/share/foo2qpdl
 PATH=$PATH:/sw/bin:/opt/local/bin
 

 usage() {
 	cat <<EOF
 Usage:
@@ -161,8 +154,8 @@ nup() {
 #
 # N.B. := operator used here, when :- would be better, because "ash"
 # doesn't have :-
-if eval gs.foo -v >/dev/null 2>&1; then
-        GSBIN=${GSBIN:-gs.foo}
+if eval gs -v >/dev/null 2>&1; then
+        GSBIN=${GSBIN:-gs}
 else
         GSBIN=${GSBIN:-gs}
 fi
@@ -708,18 +701,6 @@ $PREFILTER \
 	    $BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD -D$DEBUG
 
 #




--- foo2slx-wrapper.in.orig	2011-01-15 02:21:39.000000000 +0300
+++ foo2slx-wrapper.in	2011-06-19 21:27:13.562618920 +0400
@@ -32,13 +32,6 @@ PREFIX=/usr
 SHARE=$PREFIX/share/foo2slx
 PATH=$PATH:/sw/bin:/opt/local/bin
 

 usage() {
 	cat <<EOF
 Usage:
@@ -133,8 +126,8 @@ nup() {
 #
 # N.B. := operator used here, when :- would be better, because "ash"
 # doesn't have :-
-if eval gs.foo -v >/dev/null 2>&1; then
-        GSBIN=${GSBIN:-gs.foo}
+if eval gs -v >/dev/null 2>&1; then
+        GSBIN=${GSBIN:-gs}
 else
         GSBIN=${GSBIN:-gs}
 fi
@@ -702,18 +695,6 @@ $PREFILTER \
 	    $BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD -D$DEBUG
 
 #




--- foo2xqx-wrapper.in.orig	2011-01-15 02:21:39.000000000 +0300
+++ foo2xqx-wrapper.in	2011-06-19 21:28:35.844620886 +0400
@@ -41,13 +41,6 @@ PREFIX=/usr
 SHARE=$PREFIX/share/foo2xqx
 PATH=$PATH:/sw/bin:/opt/local/bin
 

 usage() {
 	cat <<EOF
 Usage:
@@ -150,8 +143,8 @@ nup() {
 #
 # N.B. := operator used here, when :- would be better, because "ash"
 # doesn't have :-
-if eval gs.foo -v >/dev/null 2>&1; then
-        GSBIN=${GSBIN:-gs.foo}
+if eval gs -v >/dev/null 2>&1; then
+        GSBIN=${GSBIN:-gs}
 else
         GSBIN=${GSBIN:-gs}
 fi
@@ -666,18 +659,6 @@ $PREFILTER \
 	    $BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD -D$DEBUG
 
 #

-    logger -t "$BASENAME" -p lpr.info -- \
-	"foo2xqx -r$RES -g$DIM -p$PAPER -m$MEDIA \
--n$COPIES -d$DUPLEX -s$SOURCE $COLOR $CLIP_UL $CLIP_LR $CLIP_LOG \
-$SAVETONER -T$DENSITY $BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD"
-fi
-
-#




--- foo2zjs-wrapper.in.orig	2011-01-15 02:21:39.000000000 +0300
+++ foo2zjs-wrapper.in	2011-06-19 21:29:39.781636207 +0400
@@ -53,13 +53,6 @@ PREFIX=/usr
 SHARE=$PREFIX/share/foo2zjs
 PATH=$PATH:/sw/bin:/opt/local/bin
 

 usage() {
 	cat <<EOF
 Usage:
@@ -187,8 +180,8 @@ nup() {
 #
 # N.B. := operator used here, when :- would be better, because "ash"
 # doesn't have :-
-if eval gs.foo -v >/dev/null 2>&1; then
-        GSBIN=${GSBIN:-gs.foo}
+if eval gs -v >/dev/null 2>&1; then
+        GSBIN=${GSBIN:-gs}
 else
         GSBIN=${GSBIN:-gs}
 fi
@@ -900,18 +893,6 @@ $PREFILTER \
 	    $BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD -D$DEBUG
 
 #

-    logger -t "$BASENAME" -p lpr.info -- \
-	"foo2zjs -r$RES -g$DIM -p$PAPER -m$MEDIA \
--n$COPIES -d$DUPLEX -s$SOURCE -z$MODEL $COLOR $CLIP_UL $CLIP_LR $CLIP_LOG \
-$SAVETONER -T$DENSITY $BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD"
-fi
-
-#




--- getweb.in.orig	2011-05-17 13:44:16.000000000 +0400
+++ getweb.in	2011-06-19 21:29:51.249616941 +0400
@@ -11,7 +11,7 @@
 
 VERSION='$Id: getweb.in,v 1.103 2011/05/17 09:44:16 rick Exp $'
 
-WGETOPTS="--passive-ftp -q"
+FETCHOPTS="-p -m -o"
 
 usage() {
 cat <<EOF
@@ -119,7 +119,7 @@ getexe() {
     exefile="$2"
     shift; shift
     

 	error "Couldn't download $url/$exefile"
     unzip -oj $exefile "$@"
     rm $exefile
@@ -133,7 +133,7 @@ gettgz() {
     file="$2"
     what="$3"
     

 	error "Couldn't download $url/$file"
     gunzip <$file | tar xvf - $what
     rm $file
@@ -236,7 +236,7 @@ getone() {
 	;;
     2200dl|2200)
 	getexe \
-	    ftp://ftp.minolta-qms.com/pub/crc/out_going/win2000 m22dlicc.exe \
+	    http://printer.konicaminolta.net/drivers/win2000 m22dlicc.exe \
 	    "*.icm"
 	copyright "(c) Copyright Minolta-QMS 1999"
 	;;
     2300dl|2300)
 	getexe \
-	    ftp://ftp.minolta-qms.com/pub/crc/out_going/other m23dlicc.exe \
+	    http://printer.konicaminolta.net/drivers/other m23dlicc.exe \
 	    "*.icm"
 	gettgz \
 	    http://foo2zjs.rkkda.com/icm km2430.tar.gz \
@@ -212,7 +212,7 @@
 	BASE="$BASE/openmind/technic/swfw/mswprtdl.nsf/logdwl"
 	FILE="MC2300DL_v255.zip"
 	URL="$BASE?openagent&4CE486C20839C75AC1256D9E001EBD1F/\$File/$FILE"

 	echo "*** Now use a windows box to unzip and install $FILE ***"
 	;;
     cpwl|pageworks)
@@ -252,7 +252,7 @@ getone() {
 	    do
 		base=`basename $i .IC_`
 		mv $base.IC_ $base.ic_

+		msexpand $base.ic_
 		rm -f $base.ic_
 	    done
 	fi
@@ -383,7 +383,7 @@ getone() {
 	    URL="$URL?driver=$driver&printer=$printer"
 	    URL="$URL&.submit=Generate+PPD+file"
 	    URL="$URL&show=1&.cgifields=shortgui&.cgifields=show"

 		error "Couldn't dowload $URL"
 	done
 	;;
@@ -420,7 +420,7 @@ getone() {
     update)
 	url=${URLZJS}
 	file=foo2zjs.tar.gz

Return to bug 158040

Lines 1-6 Link Here

(-)files/patch-Makefile (-29 / +36 lines)
1	--- Makefile 2009-04-21 19:53:37.000000000 -0500	1	--- Makefile.orig 2011-06-09 18:07:08.000000000 +0400
2	+++ Makefile 2009-05-30 04:31:51.000000000 -0500	2	+++ Makefile 2011-06-19 21:14:01.911619475 +0400
3	@@ -16,9 +16,7 @@	3	@@ -17,9 +17,7 @@ SYSNAME := $(shell uname -n)
4	VERSION=0.0	4	VERSION=0.0
5		5
6	# Installation prefix...	6	# Installation prefix...
Lines 11-17 Link Here
11		11
12	# Pathnames for this package...	12	# Pathnames for this package...
13	BIN=$(PREFIX)/bin	13	BIN=$(PREFIX)/bin
14	@@ -30,12 +28,13 @@	14	@@ -31,13 +29,14 @@ SHARELAVA=$(PREFIX)/share/foo2lava
15	SHAREQPDL=$(PREFIX)/share/foo2qpdl	15	SHAREQPDL=$(PREFIX)/share/foo2qpdl
16	SHARESLX=$(PREFIX)/share/foo2slx	16	SHARESLX=$(PREFIX)/share/foo2slx
17	SHAREHC=$(PREFIX)/share/foo2hiperc	17	SHAREHC=$(PREFIX)/share/foo2hiperc
Lines 21-26 Link Here
21	-INSTALL=install	21	-INSTALL=install
22	+INSTALL?=install	22	+INSTALL?=install
23	+INSTALL_MAN?=install	23	+INSTALL_MAN?=install
		24	ROOT=root
24		25
25	# Pathnames for referenced packages...	26	# Pathnames for referenced packages...
26	-FOODB=$(DESTDIR)/usr/share/foomatic/db/source	27	-FOODB=$(DESTDIR)/usr/share/foomatic/db/source
Lines 28-56 Link Here
28		29
29	# User ID's	30	# User ID's
30	LPuid=-oroot	31	LPuid=-oroot
31	@@ -255,7 +254,7 @@	32	@@ -282,7 +281,7 @@ endif
32	endif
33		33
34	# Compiler flags	34	# Compiler flags
35	-CFLAGS += -O2 -Wall	35	#CFLAGS += -O2 -Wall -Wno-unused-but-set-variable
36	+CFLAGS ?= -O2 -Wall	36	-CFLAGS += -O2 -Wall
		37	+CFLAGS ?= -O2 -Wall
37	#CFLAGS += -g	38	#CFLAGS += -g
38		39
39	#	40	#
40	@@ -505,10 +504,8 @@	41	@@ -556,10 +555,9 @@ command2foo2lava-pjl.o: command2foo2lava
41	#	42	#
42	# Installation rules	43	# Installation rules
43	#	44	#
44	-install: all install-test install-prog install-icc2ps install-extra \	45	-install: all install-test install-prog install-icc2ps install-osx-hotplug \
45	- install-crd install-foo install-ppd \	46	- install-extra install-crd install-foo install-ppd \
46	- install-gui install-desktop \	47	- install-gui install-desktop install-filter \
47	- install-man install-doc	48	- install-man install-doc
48	+install: all install-prog install-icc2ps \	49	+install: all install-prog install-icc2ps \
49	+ install-crd install-foo install-ppd	50	+ install-crd install-foo install-ppd
		51	+
50	#	52	#
51	# If you use CUPS, then restart the spooler:	53	# If you use CUPS, then restart the spooler:
52	# make cups	54	# make cups
53	@@ -544,7 +541,7 @@	55	@@ -595,7 +593,7 @@ install-test:
54	#	56	#
55		57
56		58
Lines 59-65 Link Here
59		61
60	install-prog:	62	install-prog:
61	#	63	#
62	@@ -574,21 +571,13 @@	64	@@ -625,20 +623,13 @@ install-foo:
63	#	65	#
64	# Remove obsolete foomatic database files from previous versions	66	# Remove obsolete foomatic database files from previous versions
65	#	67	#
Lines 72-90 Link Here
72	- rm -f $(FOODB)/opt/foo2zjs-NupOrient.xml	74	- rm -f $(FOODB)/opt/foo2zjs-NupOrient.xml
73	- rm -f $(FOODB)/opt/foo2*-Quality.xml	75	- rm -f $(FOODB)/opt/foo2*-Quality.xml
74	- rm -f $(FOODB)/printer/KonicaMinolta*.xml	76	- rm -f $(FOODB)/printer/KonicaMinolta*.xml
75	- #	77	#
76	# Install current database files	78	# Install current database files
77	#	79	#
78	+ mkdir -p $(FOODB)	80	+ mkdir -p $(FOODB)
79	@if [ -d $(FOODB) ]; then \	81	@if [ -d $(FOODB) ]; then \
80	- for dir in driver printer opt; do \	82	- for dir in driver printer opt; do \
81	+ for dir in printer opt; do \	83	+ for dir in printer opt; do \
82	echo install -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \
83	+ mkdir -p $(FOODB)/$$dir/; \	84	+ mkdir -p $(FOODB)/$$dir/; \
84	$(INSTALL) -c -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \	85	echo install -d $(FOODB)/$$dir/; \
85	done \	86	$(INSTALL) -d $(FOODB)/$$dir/; \
86	else \	87	echo install -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \
87	@@ -602,15 +591,6 @@	88	@@ -655,15 +646,6 @@ install-foo:
88	echo "*** ... wherever foomatic is stashed on your machine."; \	89	echo "*** ... wherever foomatic is stashed on your machine."; \
89	echo "***"; \	90	echo "***"; \
90	fi	91	fi
Lines 100-106 Link Here
100		101
101	install-icc2ps:	102	install-icc2ps:
102	#	103	#
103	@@ -722,9 +702,9 @@	104	@@ -783,9 +765,9 @@ install-extra:
104	fi; \	105	fi; \
105	done	106	done
106		107
Lines 113-127 Link Here
113	VARPPD=/var/lp/ppd	114	VARPPD=/var/lp/ppd
114	install-ppd:	115	install-ppd:
115	#	116	#
116	@@ -753,6 +733,7 @@	117	@@ -819,6 +801,7 @@ install-ppd:
117	gzip < $$ppd > $(PPD)/foo2zjs/$$ppd.gz; \
118	done; \
119	fi	118	fi
		119	#
		120	export PATH=$$PATH:`pwd`:; \
120	+ mkdir -p $(MODEL)	121	+ mkdir -p $(MODEL)
121	if [ -d $(MODEL) ]; then \	122	if [ -d $(MODEL) ]; then \
122	rm -f $(MODEL)/KonicaMinolta*; \	123	rm -f $(MODEL)/KonicaMinolta*; \
123	cd PPD; \	124	cd PPD; \
124	@@ -767,9 +748,9 @@	125	@@ -835,9 +818,9 @@ install-ppd:
125	done; \	126	done; \
126	fi	127	fi
127		128
Lines 134-140 Link Here
134		135
135	install-desktop:	136	install-desktop:
136	#	137	#
137	@@ -1185,36 +1166,34 @@	138	@@ -1344,38 +1327,38 @@ install-man: man
138	#	139	#
139	# Install manual pages	140	# Install manual pages
140	#	141	#
Lines 164-173 Link Here
164	- $(INSTALL) -c -m 644 foo2hiperc.1 $(MANDIR)/man1/	165	- $(INSTALL) -c -m 644 foo2hiperc.1 $(MANDIR)/man1/
165	- $(INSTALL) -c -m 644 foo2hiperc-wrapper.1 $(MANDIR)/man1/	166	- $(INSTALL) -c -m 644 foo2hiperc-wrapper.1 $(MANDIR)/man1/
166	- $(INSTALL) -c -m 644 hipercdecode.1 $(MANDIR)/man1/	167	- $(INSTALL) -c -m 644 hipercdecode.1 $(MANDIR)/man1/
		168	- $(INSTALL) -c -m 644 gipddecode.1 $(MANDIR)/man1/
		169	- $(INSTALL) -c -m 644 hbpldecode.1 $(MANDIR)/man1/
167	- $(INSTALL) -c -m 644 foo2zjs-pstops.1 $(MANDIR)/man1/	170	- $(INSTALL) -c -m 644 foo2zjs-pstops.1 $(MANDIR)/man1/
168	- $(INSTALL) -c -m 644 arm2hpdl.1 $(MANDIR)/man1/	171	- $(INSTALL) -c -m 644 arm2hpdl.1 $(MANDIR)/man1/
169	- $(INSTALL) -c -m 644 usb_printerid.1 $(MANDIR)/man1/	172	- $(INSTALL) -c -m 644 usb_printerid.1 $(MANDIR)/man1/
170	- $(INSTALL) -c -m 644 printer-profile.1 $(MANDIR)/man1/	173	- $(INSTALL) -c -m 644 printer-profile.1 $(MANDIR)/man1/
		174	+ $(INSTALL_MAN) -d -m 755 $(MANDIR)
		175	+ $(INSTALL_MAN) -d -m 755 $(MANDIR)/man1/
171	+ $(INSTALL_MAN) -c -m 644 foo2zjs.1 $(MANDIR)/man1/	176	+ $(INSTALL_MAN) -c -m 644 foo2zjs.1 $(MANDIR)/man1/
172	+ $(INSTALL_MAN) -c -m 644 foo2zjs-wrapper.1 $(MANDIR)/man1/	177	+ $(INSTALL_MAN) -c -m 644 foo2zjs-wrapper.1 $(MANDIR)/man1/
173	+ $(INSTALL_MAN) -c -m 644 zjsdecode.1 $(MANDIR)/man1/	178	+ $(INSTALL_MAN) -c -m 644 zjsdecode.1 $(MANDIR)/man1/
Lines 192-201 Link Here
192	+ $(INSTALL_MAN) -c -m 644 foo2hiperc.1 $(MANDIR)/man1/	197	+ $(INSTALL_MAN) -c -m 644 foo2hiperc.1 $(MANDIR)/man1/
193	+ $(INSTALL_MAN) -c -m 644 foo2hiperc-wrapper.1 $(MANDIR)/man1/	198	+ $(INSTALL_MAN) -c -m 644 foo2hiperc-wrapper.1 $(MANDIR)/man1/
194	+ $(INSTALL_MAN) -c -m 644 hipercdecode.1 $(MANDIR)/man1/	199	+ $(INSTALL_MAN) -c -m 644 hipercdecode.1 $(MANDIR)/man1/
		200	+ $(INSTALL_MAN) -c -m 644 gipddecode.1 $(MANDIR)/man1/
		201	+ $(INSTALL_MAN) -c -m 644 hbpldecode.1 $(MANDIR)/man1/
195	+ $(INSTALL_MAN) -c -m 644 foo2zjs-pstops.1 $(MANDIR)/man1/	202	+ $(INSTALL_MAN) -c -m 644 foo2zjs-pstops.1 $(MANDIR)/man1/
196	+ $(INSTALL_MAN) -c -m 644 arm2hpdl.1 $(MANDIR)/man1/	203	+ $(INSTALL_MAN) -c -m 644 arm2hpdl.1 $(MANDIR)/man1/
197	+ $(INSTALL_MAN) -c -m 644 usb_printerid.1 $(MANDIR)/man1/	204	+ $(INSTALL_MAN) -c -m 644 usb_printerid.1 $(MANDIR)/man1/
198	+ $(INSTALL_MAN) -c -m 644 printer-profile.1 $(MANDIR)/man1/	205	+ $(INSTALL_MAN) -c -m 644 printer-profile.1 $(MANDIR)/man1/
199		206	cd icc2ps; $(MAKE) install-man
200	doc: README INSTALL manual.pdf	207	ifeq ($(UNAME),Darwin)
201		208	cd osx-hotplug; $(MAKE) install-man

Lines 1-6 Link Here

(-)files/patch-foo2hiperc-wrapper.in (-7 / +7 lines)
1	--- foo2hiperc-wrapper.in 2009-05-30 04:40:00.000000000 -0500	1	--- foo2hiperc-wrapper.in.orig 2011-01-31 15:23:43.000000000 +0300
2	+++ foo2hiperc-wrapper.in 2009-05-30 04:57:27.000000000 -0500	2	+++ foo2hiperc-wrapper.in 2011-06-19 21:16:59.468615644 +0400
3	@@ -44,10 +44,6 @@	3	@@ -46,10 +46,6 @@ PATH=$PATH:.
4	#	4	#
5	# Log the command line, for debugging and problem reports	5	# Log the command line, for debugging and problem reports
6	#	6	#
Lines 11-28 Link Here
11	usage() {	11	usage() {
12	cat <<EOF	12	cat <<EOF
13	Usage:	13	Usage:
14	@@ -151,8 +147,8 @@	14	@@ -154,8 +150,8 @@ nup() {
15	#	15	#
16	# N.B. := operator used here, when :- would be better, because "ash"	16	# N.B. := operator used here, when :- would be better, because "ash"
17	# doesn't have :-	17	# doesn't have :-
18	-if gs.foo -v >/dev/null 2>&1; then	18	-if eval gs.foo -v >/dev/null 2>&1; then
19	- GSBIN=${GSBIN:-gs.foo}	19	- GSBIN=${GSBIN:-gs.foo}
20	+if gs -v >/dev/null 2>&1; then	20	+if eval gs -v >/dev/null 2>&1; then
21	+ GSBIN=${GSBIN:-gs}	21	+ GSBIN=${GSBIN:-gs}
22	else	22	else
23	GSBIN=${GSBIN:-gs}	23	GSBIN=${GSBIN:-gs}
24	fi	24	fi
25	@@ -645,18 +641,6 @@	25	@@ -676,18 +672,6 @@ $PREFILTER \
26	$BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD $COMPRESSED -D$DEBUG	26	$BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD $COMPRESSED -D$DEBUG
27		27
28	#	28	#

Lines 1-6 Link Here

(-)files/patch-foo2hp2600-wrapper.in (-9 / +9 lines)
1	--- foo2hp2600-wrapper.in 2009-05-30 04:57:56.000000000 -0500	1	--- foo2hp2600-wrapper.in.orig 2011-01-20 04:01:09.000000000 +0300
2	+++ foo2hp2600-wrapper.in 2009-05-30 04:59:38.000000000 -0500	2	+++ foo2hp2600-wrapper.in 2011-06-19 21:21:05.231903101 +0400
3	@@ -34,13 +34,6 @@	3	@@ -34,13 +34,6 @@ PREFIX=/usr
4	SHARE=$PREFIX/share/foo2hp	4	SHARE=$PREFIX/share/foo2hp
5	PATH=$PATH:/sw/bin:/opt/local/bin	5	PATH=$PATH:/sw/bin:/opt/local/bin
6		6
Lines 14-31 Link Here
14	usage() {	14	usage() {
15	cat <<EOF	15	cat <<EOF
16	Usage:	16	Usage:
17	@@ -185,8 +178,8 @@	17	@@ -186,8 +179,8 @@ nup() {
18	#	18	#
19	# N.B. := operator used here, when :- would be better, because "ash"	19	# N.B. := operator used here, when :- would be better, because "ash"
20	# doesn't have :-	20	# doesn't have :-
21	-if gs.foo -v >/dev/null 2>&1; then	21	-if eval gs.foo -v >/dev/null 2>&1; then
22	- GSBIN=${GSBIN:-gs.foo}	22	- GSBIN=${GSBIN:-gs.foo}
23	+if gs -v >/dev/null 2>&1; then	23	+if eval gs -v >/dev/null 2>&1; then
24	+ GSBIN=${GSBIN:-gs}	24	+ GSBIN=${GSBIN:-gs}
25	else	25	else
26	GSBIN=${GSBIN:-gs}	26	GSBIN=${GSBIN:-gs}
27	fi	27	fi
28	@@ -343,7 +336,7 @@	28	@@ -359,7 +352,7 @@ case "$BPP" in
29	GSDEV="-sDEVICE=cups -dcupsColorSpace=6 -dcupsBitsPerColor=2"	29	GSDEV="-sDEVICE=cups -dcupsColorSpace=6 -dcupsBitsPerColor=2"
30	GSDEV="$GSDEV -dcupsColorOrder=2"	30	GSDEV="$GSDEV -dcupsColorOrder=2"
31	fi	31	fi
Lines 34-40 Link Here
34	GSBIN=gs	34	GSBIN=gs
35	fi	35	fi
36		36
37	@@ -749,18 +742,6 @@	37	@@ -793,18 +786,6 @@ $PREFILTER \
38	$BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD -D$DEBUG	38	$BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD -D$DEBUG
39		39
40	#	40	#
Lines 46-52 Link Here
46	- logger -t "$BASENAME" -p lpr.info -- \	46	- logger -t "$BASENAME" -p lpr.info -- \
47	- "foo2hp -r$RES -g$DIM -p$PAPER -m$MEDIA \	47	- "foo2hp -r$RES -g$DIM -p$PAPER -m$MEDIA \
48	--n$COPIES -d$DUPLEX -s$SOURCE $COLOR -b$BPP $CLIP_UL $CLIP_LR $CLIP_LOG \	48	--n$COPIES -d$DUPLEX -s$SOURCE $COLOR -b$BPP $CLIP_UL $CLIP_LR $CLIP_LOG \
49	-$SAVETONER $BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD"	49	-$SAVETONER -O$OFF_C,$OFF_M,$OFF_Y,$OFF_K $BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD"
50	-fi	50	-fi
51	-	51	-
52	-#	52	-#

Lines 1-6 Link Here

(-)files/patch-foo2lava-wrapper.in (-7 / +7 lines)
1	--- foo2lava-wrapper.in 2009-05-30 05:00:03.000000000 -0500	1	--- foo2lava-wrapper.in.orig 2011-01-15 02:21:39.000000000 +0300
2	+++ foo2lava-wrapper.in 2009-05-30 05:00:53.000000000 -0500	2	+++ foo2lava-wrapper.in 2011-06-19 21:22:09.019758180 +0400
3	@@ -41,13 +41,6 @@	3	@@ -42,13 +42,6 @@ PREFIX=/usr
4	SHARE=$PREFIX/share/foo2lava	4	SHARE=$PREFIX/share/foo2lava
5	PATH=$PATH:/sw/bin:/opt/local/bin	5	PATH=$PATH:/sw/bin:/opt/local/bin
6		6
Lines 14-31 Link Here
14	usage() {	14	usage() {
15	cat <<EOF	15	cat <<EOF
16	Usage:	16	Usage:
17	@@ -154,8 +147,8 @@	17	@@ -155,8 +148,8 @@ nup() {
18	#	18	#
19	# N.B. := operator used here, when :- would be better, because "ash"	19	# N.B. := operator used here, when :- would be better, because "ash"
20	# doesn't have :-	20	# doesn't have :-
21	-if gs.foo -v >/dev/null 2>&1; then	21	-if eval gs.foo -v >/dev/null 2>&1; then
22	- GSBIN=${GSBIN:-gs.foo}	22	- GSBIN=${GSBIN:-gs.foo}
23	+if gs -v >/dev/null 2>&1; then	23	+if eval gs -v >/dev/null 2>&1; then
24	+ GSBIN=${GSBIN:-gs}	24	+ GSBIN=${GSBIN:-gs}
25	else	25	else
26	GSBIN=${GSBIN:-gs}	26	GSBIN=${GSBIN:-gs}
27	fi	27	fi
28	@@ -700,18 +693,6 @@	28	@@ -733,18 +726,6 @@ $PREFILTER \
29	$BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD -D$DEBUG	29	$BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD -D$DEBUG
30		30
31	#	31	#

Lines 1-6 Link Here

(-)files/patch-foo2oak-wrapper.in (-8 / +8 lines)
1	--- foo2oak-wrapper.in 2009-05-30 05:01:17.000000000 -0500	1	--- foo2oak-wrapper.in.orig 2011-01-15 02:21:39.000000000 +0300
2	+++ foo2oak-wrapper.in 2009-05-30 05:02:12.000000000 -0500	2	+++ foo2oak-wrapper.in 2011-06-19 21:24:46.175611255 +0400
3	@@ -34,13 +34,6 @@	3	@@ -35,13 +35,6 @@ PREFIX=/usr
4	SHARE=$PREFIX/share/foo2oak	4	SHARE=$PREFIX/share/foo2oak
5	PATH=$PATH:/sw/bin:/opt/local/bin	5	PATH=$PATH:/sw/bin:/opt/local/bin
6		6
Lines 14-31 Link Here
14	usage() {	14	usage() {
15	cat <<EOF	15	cat <<EOF
16	Usage:	16	Usage:
17	@@ -141,8 +134,8 @@	17	@@ -144,8 +137,8 @@ nup() {
18	#	18	#
19	# N.B. := operator used here, when :- would be better, because "ash"	19	# N.B. := operator used here, when :- would be better, because "ash"
20	# doesn't have :-	20	# doesn't have :-
21	-if gs.foo -v >/dev/null 2>&1; then	21	-if eval gs.foo -v >/dev/null 2>&1; then
22	- GSBIN=${GSBIN:-gs.foo}	22	- GSBIN=${GSBIN:-gs.foo}
23	+if gs -v >/dev/null 2>&1; then	23	+if eval gs -v >/dev/null 2>&1; then
24	+ GSBIN=${GSBIN:-gs}	24	+ GSBIN=${GSBIN:-gs}
25	else	25	else
26	GSBIN=${GSBIN:-gs}	26	GSBIN=${GSBIN:-gs}
27	fi	27	fi
28	@@ -668,19 +661,6 @@	28	@@ -701,19 +694,6 @@ $PREFILTER \
29	$BC $AIB $COLOR2MONO -D$DEBUG	29	$BC $AIB $COLOR2MONO -D$DEBUG
30		30
31	#	31	#
Lines 36-42 Link Here
36	- "$GSBIN $PAPERSIZE -g$DIM -r$RES $GSDEV $GSOPTS $GAMMAFILE"	36	- "$GSBIN $PAPERSIZE -g$DIM -r$RES $GSDEV $GSOPTS $GAMMAFILE"
37	- logger -t "$BASENAME" -p lpr.info -- \	37	- logger -t "$BASENAME" -p lpr.info -- \
38	- "foo2oak -r$RES -g$DIM -p$PAPER -m$MEDIA \	38	- "foo2oak -r$RES -g$DIM -p$PAPER -m$MEDIA \
39	--n$COPIES -d$DUPLEX -s$SOURCE -M$MIRROR $COLOR -b$BPP \	39	--n$COPIES -d$DUPLEX -s$SOURCE -z$MODEL -M$MIRROR $COLOR -b$BPP \
40	-$CLIP_UL $CLIP_LR $CLIP_LOG \	40	-$CLIP_UL $CLIP_LR $CLIP_LOG \
41	-$BC $AIB $COLOR2MONO"	41	-$BC $AIB $COLOR2MONO"
42	-fi	42	-fi

Lines 1-6 Link Here

(-)files/patch-foo2qpdl-wrapper.in (-7 / +7 lines)
1	--- foo2qpdl-wrapper.in 2009-05-30 05:02:42.000000000 -0500	1	--- foo2qpdl-wrapper.in.orig 2011-04-15 23:07:00.000000000 +0400
2	+++ foo2qpdl-wrapper.in 2009-05-30 05:03:26.000000000 -0500	2	+++ foo2qpdl-wrapper.in 2011-06-19 21:26:03.964850095 +0400
3	@@ -40,13 +40,6 @@	3	@@ -43,13 +43,6 @@ PREFIX=/usr
4	SHARE=$PREFIX/share/foo2qpdl	4	SHARE=$PREFIX/share/foo2qpdl
5	PATH=$PATH:/sw/bin:/opt/local/bin	5	PATH=$PATH:/sw/bin:/opt/local/bin
6		6
Lines 14-31 Link Here
14	usage() {	14	usage() {
15	cat <<EOF	15	cat <<EOF
16	Usage:	16	Usage:
17	@@ -157,8 +150,8 @@	17	@@ -161,8 +154,8 @@ nup() {
18	#	18	#
19	# N.B. := operator used here, when :- would be better, because "ash"	19	# N.B. := operator used here, when :- would be better, because "ash"
20	# doesn't have :-	20	# doesn't have :-
21	-if gs.foo -v >/dev/null 2>&1; then	21	-if eval gs.foo -v >/dev/null 2>&1; then
22	- GSBIN=${GSBIN:-gs.foo}	22	- GSBIN=${GSBIN:-gs.foo}
23	+if gs -v >/dev/null 2>&1; then	23	+if eval gs -v >/dev/null 2>&1; then
24	+ GSBIN=${GSBIN:-gs}	24	+ GSBIN=${GSBIN:-gs}
25	else	25	else
26	GSBIN=${GSBIN:-gs}	26	GSBIN=${GSBIN:-gs}
27	fi	27	fi
28	@@ -671,18 +664,6 @@	28	@@ -708,18 +701,6 @@ $PREFILTER \
29	$BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD -D$DEBUG	29	$BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD -D$DEBUG
30		30
31	#	31	#

Lines 1-6 Link Here

(-)files/patch-foo2slx-wrapper.in (-7 / +7 lines)
1	--- foo2slx-wrapper.in 2009-05-30 05:03:55.000000000 -0500	1	--- foo2slx-wrapper.in.orig 2011-01-15 02:21:39.000000000 +0300
2	+++ foo2slx-wrapper.in 2009-05-30 05:04:31.000000000 -0500	2	+++ foo2slx-wrapper.in 2011-06-19 21:27:13.562618920 +0400
3	@@ -32,13 +32,6 @@	3	@@ -32,13 +32,6 @@ PREFIX=/usr
4	SHARE=$PREFIX/share/foo2slx	4	SHARE=$PREFIX/share/foo2slx
5	PATH=$PATH:/sw/bin:/opt/local/bin	5	PATH=$PATH:/sw/bin:/opt/local/bin
6		6
Lines 14-31 Link Here
14	usage() {	14	usage() {
15	cat <<EOF	15	cat <<EOF
16	Usage:	16	Usage:
17	@@ -133,8 +126,8 @@	17	@@ -133,8 +126,8 @@ nup() {
18	#	18	#
19	# N.B. := operator used here, when :- would be better, because "ash"	19	# N.B. := operator used here, when :- would be better, because "ash"
20	# doesn't have :-	20	# doesn't have :-
21	-if gs.foo -v >/dev/null 2>&1; then	21	-if eval gs.foo -v >/dev/null 2>&1; then
22	- GSBIN=${GSBIN:-gs.foo}	22	- GSBIN=${GSBIN:-gs.foo}
23	+if gs -v >/dev/null 2>&1; then	23	+if eval gs -v >/dev/null 2>&1; then
24	+ GSBIN=${GSBIN:-gs}	24	+ GSBIN=${GSBIN:-gs}
25	else	25	else
26	GSBIN=${GSBIN:-gs}	26	GSBIN=${GSBIN:-gs}
27	fi	27	fi
28	@@ -672,18 +665,6 @@	28	@@ -702,18 +695,6 @@ $PREFILTER \
29	$BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD -D$DEBUG	29	$BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD -D$DEBUG
30		30
31	#	31	#

Lines 1-6 Link Here

(-)files/patch-foo2xqx-wrapper.in (-8 / +8 lines)
1	--- foo2xqx-wrapper.in 2009-05-30 05:04:57.000000000 -0500	1	--- foo2xqx-wrapper.in.orig 2011-01-15 02:21:39.000000000 +0300
2	+++ foo2xqx-wrapper.in 2009-05-30 05:05:34.000000000 -0500	2	+++ foo2xqx-wrapper.in 2011-06-19 21:28:35.844620886 +0400
3	@@ -32,13 +32,6 @@	3	@@ -41,13 +41,6 @@ PREFIX=/usr
4	SHARE=$PREFIX/share/foo2xqx	4	SHARE=$PREFIX/share/foo2xqx
5	PATH=$PATH:/sw/bin:/opt/local/bin	5	PATH=$PATH:/sw/bin:/opt/local/bin
6		6
Lines 14-31 Link Here
14	usage() {	14	usage() {
15	cat <<EOF	15	cat <<EOF
16	Usage:	16	Usage:
17	@@ -139,8 +132,8 @@	17	@@ -150,8 +143,8 @@ nup() {
18	#	18	#
19	# N.B. := operator used here, when :- would be better, because "ash"	19	# N.B. := operator used here, when :- would be better, because "ash"
20	# doesn't have :-	20	# doesn't have :-
21	-if gs.foo -v >/dev/null 2>&1; then	21	-if eval gs.foo -v >/dev/null 2>&1; then
22	- GSBIN=${GSBIN:-gs.foo}	22	- GSBIN=${GSBIN:-gs.foo}
23	+if gs -v >/dev/null 2>&1; then	23	+if eval gs -v >/dev/null 2>&1; then
24	+ GSBIN=${GSBIN:-gs}	24	+ GSBIN=${GSBIN:-gs}
25	else	25	else
26	GSBIN=${GSBIN:-gs}	26	GSBIN=${GSBIN:-gs}
27	fi	27	fi
28	@@ -614,18 +607,6 @@	28	@@ -666,18 +659,6 @@ $PREFILTER \
29	$BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD -D$DEBUG	29	$BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD -D$DEBUG
30		30
31	#	31	#
Lines 37-43 Link Here
37	- logger -t "$BASENAME" -p lpr.info -- \	37	- logger -t "$BASENAME" -p lpr.info -- \
38	- "foo2xqx -r$RES -g$DIM -p$PAPER -m$MEDIA \	38	- "foo2xqx -r$RES -g$DIM -p$PAPER -m$MEDIA \
39	--n$COPIES -d$DUPLEX -s$SOURCE $COLOR $CLIP_UL $CLIP_LR $CLIP_LOG \	39	--n$COPIES -d$DUPLEX -s$SOURCE $COLOR $CLIP_UL $CLIP_LR $CLIP_LOG \
40	-$SAVETONER $BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD"	40	-$SAVETONER -T$DENSITY $BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD"
41	-fi	41	-fi
42	-	42	-
43	-#	43	-#

Lines 1-6 Link Here

(-)files/patch-foo2zjs-wrapper.in (-8 / +8 lines)
1	--- foo2zjs-wrapper.in 2009-05-30 05:05:50.000000000 -0500	1	--- foo2zjs-wrapper.in.orig 2011-01-15 02:21:39.000000000 +0300
2	+++ foo2zjs-wrapper.in 2009-05-30 05:06:36.000000000 -0500	2	+++ foo2zjs-wrapper.in 2011-06-19 21:29:39.781636207 +0400
3	@@ -42,13 +42,6 @@	3	@@ -53,13 +53,6 @@ PREFIX=/usr
4	SHARE=$PREFIX/share/foo2zjs	4	SHARE=$PREFIX/share/foo2zjs
5	PATH=$PATH:/sw/bin:/opt/local/bin	5	PATH=$PATH:/sw/bin:/opt/local/bin
6		6
Lines 14-31 Link Here
14	usage() {	14	usage() {
15	cat <<EOF	15	cat <<EOF
16	Usage:	16	Usage:
17	@@ -153,8 +146,8 @@	17	@@ -187,8 +180,8 @@ nup() {
18	#	18	#
19	# N.B. := operator used here, when :- would be better, because "ash"	19	# N.B. := operator used here, when :- would be better, because "ash"
20	# doesn't have :-	20	# doesn't have :-
21	-if gs.foo -v >/dev/null 2>&1; then	21	-if eval gs.foo -v >/dev/null 2>&1; then
22	- GSBIN=${GSBIN:-gs.foo}	22	- GSBIN=${GSBIN:-gs.foo}
23	+if gs -v >/dev/null 2>&1; then	23	+if eval gs -v >/dev/null 2>&1; then
24	+ GSBIN=${GSBIN:-gs}	24	+ GSBIN=${GSBIN:-gs}
25	else	25	else
26	GSBIN=${GSBIN:-gs}	26	GSBIN=${GSBIN:-gs}
27	fi	27	fi
28	@@ -707,18 +700,6 @@	28	@@ -900,18 +893,6 @@ $PREFILTER \
29	$BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD -D$DEBUG	29	$BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD -D$DEBUG
30		30
31	#	31	#
Lines 37-43 Link Here
37	- logger -t "$BASENAME" -p lpr.info -- \	37	- logger -t "$BASENAME" -p lpr.info -- \
38	- "foo2zjs -r$RES -g$DIM -p$PAPER -m$MEDIA \	38	- "foo2zjs -r$RES -g$DIM -p$PAPER -m$MEDIA \
39	--n$COPIES -d$DUPLEX -s$SOURCE -z$MODEL $COLOR $CLIP_UL $CLIP_LR $CLIP_LOG \	39	--n$COPIES -d$DUPLEX -s$SOURCE -z$MODEL $COLOR $CLIP_UL $CLIP_LR $CLIP_LOG \
40	-$SAVETONER $BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD"	40	-$SAVETONER -T$DENSITY $BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD"
41	-fi	41	-fi
42	-	42	-
43	-#	43	-#

Lines 1-15 Link Here

(-)files/patch-getweb.in (-26 / +10 lines)
1	--- getweb.in 2009-05-04 09:10:55.000000000 -0500	1	--- getweb.in.orig 2011-05-17 13:44:16.000000000 +0400
2	+++ getweb.in 2009-06-23 12:24:38.000000000 -0500	2	+++ getweb.in 2011-06-19 21:29:51.249616941 +0400
3	@@ -11,7 +11,7 @@	3	@@ -11,7 +11,7 @@
4		4
5	VERSION='$Id: getweb.in,v 1.85 2009/05/04 14:10:55 rick Exp $'	5	VERSION='$Id: getweb.in,v 1.103 2011/05/17 09:44:16 rick Exp $'
6		6
7	-WGETOPTS="--passive-ftp -q"	7	-WGETOPTS="--passive-ftp -q"
8	+FETCHOPTS="-p -m -o"	8	+FETCHOPTS="-p -m -o"
9		9
10	usage() {	10	usage() {
11	cat <<EOF	11	cat <<EOF
12	@@ -111,7 +111,7 @@	12	@@ -119,7 +119,7 @@ getexe() {
13	exefile="$2"	13	exefile="$2"
14	shift; shift	14	shift; shift
15		15
Lines 18-24 Link Here
18	error "Couldn't download $url/$exefile"	18	error "Couldn't download $url/$exefile"
19	unzip -oj $exefile "$@"	19	unzip -oj $exefile "$@"
20	rm $exefile	20	rm $exefile
21	@@ -125,7 +125,7 @@	21	@@ -133,7 +133,7 @@ gettgz() {
22	file="$2"	22	file="$2"
23	what="$3"	23	what="$3"
24		24
Lines 27-49 Link Here
27	error "Couldn't download $url/$file"	27	error "Couldn't download $url/$file"
28	gunzip <$file \| tar xvf - $what	28	gunzip <$file \| tar xvf - $what
29	rm $file	29	rm $file
30	@@ -193,13 +193,13 @@	30	@@ -236,7 +236,7 @@ getone() {
31	;;
32	2200dl\|2200)
33	getexe \
34	- ftp://ftp.minolta-qms.com/pub/crc/out_going/win2000 m22dlicc.exe \
35	+ http://printer.konicaminolta.net/drivers/win2000 m22dlicc.exe \
36	"*.icm"
37	copyright "(c) Copyright Minolta-QMS 1999"
38	;;
39	2300dl\|2300)
40	getexe \
41	- ftp://ftp.minolta-qms.com/pub/crc/out_going/other m23dlicc.exe \
42	+ http://printer.konicaminolta.net/drivers/other m23dlicc.exe \
43	"*.icm"
44	gettgz \
45	http://foo2zjs.rkkda.com/icm km2430.tar.gz \
46	@@ -212,7 +212,7 @@
47	BASE="$BASE/openmind/technic/swfw/mswprtdl.nsf/logdwl"	31	BASE="$BASE/openmind/technic/swfw/mswprtdl.nsf/logdwl"
48	FILE="MC2300DL_v255.zip"	32	FILE="MC2300DL_v255.zip"
49	URL="$BASE?openagent&4CE486C20839C75AC1256D9E001EBD1F/\$File/$FILE"	33	URL="$BASE?openagent&4CE486C20839C75AC1256D9E001EBD1F/\$File/$FILE"
Lines 52-58 Link Here
52	echo "* Now use a windows box to unzip and install $FILE *"	36	echo "* Now use a windows box to unzip and install $FILE *"
53	;;	37	;;
54	cpwl\|pageworks)	38	cpwl\|pageworks)
55	@@ -224,7 +224,7 @@	39	@@ -252,7 +252,7 @@ getone() {
56	do	40	do
57	base=`basename $i .IC_`	41	base=`basename $i .IC_`
58	mv $base.IC_ $base.ic_	42	mv $base.IC_ $base.ic_
Lines 60-67 Link Here
60	+ msexpand $base.ic_	44	+ msexpand $base.ic_
61	rm -f $base.ic_	45	rm -f $base.ic_
62	done	46	done
63	copyright "(c) Copyright Minolta-QMS 1998"	47	fi
64	@@ -332,7 +332,7 @@	48	@@ -383,7 +383,7 @@ getone() {
65	URL="$URL?driver=$driver&printer=$printer"	49	URL="$URL?driver=$driver&printer=$printer"
66	URL="$URL&.submit=Generate+PPD+file"	50	URL="$URL&.submit=Generate+PPD+file"
67	URL="$URL&show=1&.cgifields=shortgui&.cgifields=show"	51	URL="$URL&show=1&.cgifields=shortgui&.cgifields=show"
Lines 70-76 Link Here
70	error "Couldn't dowload $URL"	54	error "Couldn't dowload $URL"
71	done	55	done
72	;;	56	;;
73	@@ -368,7 +368,7 @@	57	@@ -420,7 +420,7 @@ getone() {
74	update)	58	update)
75	url=${URLZJS}	59	url=${URLZJS}
76	file=foo2zjs.tar.gz	60	file=foo2zjs.tar.gz