Attachment #91466 for bug #128813

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




#

PORTNAME=	foo2zjs
PORTVERSION=	20081008
PORTREVISION=	2
CATEGORIES=	print
MASTER_SITES=	http://foo2zjs.rkkda.com/ \
		${MASTER_SITE_LOCAL:S,$,acm/${PORTNAME}/,}

		foomatic-rip:${PORTSDIR}/print/foomatic-filters \
		espgs:${PORTSDIR}/print/cups-pstoraster

USE_GHOSTSCRIPT=yes
USE_GMAKE=	yes
SUB_FILES=	pkg-message

MAN1=		foo2hp.1 foo2oak-wrapper.1 foo2zjs-wrapper.1 oakdecode.1 foo2hp2600-wrapper.1 foo2oak.1 foo2zjs.1 zjsdecode.1
PORTDOCS=	ChangeLog README manual.pdf
EXTRAFILES=	msexpand getweb

post-patch:


post-install:
	@cd ${WRKSRC} && \
	${INSTALL_MAN} ${MAN1} ${PREFIX}/man/man1/ && \
	${INSTALL_SCRIPT} ${EXTRAFILES} ${PREFIX}/bin/

.if !defined(NOPORTDOCS)
	@${MKDIR} ${DOCSDIR}
	@${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
.endfor
.endif

	@${CAT} ${PKGMESSAGE}

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (foo2zjs.tar.gz) = b0d65c5a93708eb778fee68fd52a320c	1	MD5 (foo2zjs.tar.gz) = 78c0f2192f063b27692b5364e162f977
2	SHA256 (foo2zjs.tar.gz) = 6a45579dbada5c71b9ad2ad6e9c63784a469c3d3e675b25fb5b7006060fa5240	2	SHA256 (foo2zjs.tar.gz) = 216c4f5809a89a6a13609be74815cfaacc2c3b370e0572a78bb73242d179d6d3
3	SIZE (foo2zjs.tar.gz) = 935615	3	SIZE (foo2zjs.tar.gz) = 1556390

Lines 1-59 Link Here

(-)pkg-plist (-41 / +53 lines)
1	bin/arm2hpdl	1	bin/arm2hpdl
		2	bin/foo2hiperc
		3	bin/foo2hiperc-wrapper
2	bin/foo2hp	4	bin/foo2hp
3	bin/foo2hp2600-wrapper	5	bin/foo2hp2600-wrapper
4	bin/foo2lava	6	bin/foo2lava
5	bin/foo2lava-wrapper	7	bin/foo2lava-wrapper
		8	bin/foo2oak
6	bin/foo2oak-wrapper	9	bin/foo2oak-wrapper
		10	bin/foo2qpdl
		11	bin/foo2qpdl-wrapper
		12	bin/foo2slx
		13	bin/foo2slx-wrapper
7	bin/foo2xqx	14	bin/foo2xqx
8	bin/foo2xqx-wrapper	15	bin/foo2xqx-wrapper
9	bin/foo2zjs	16	bin/foo2zjs
10	bin/foo2zjs-icc2ps	17	bin/foo2zjs-icc2ps
		18	bin/foo2zjs-pstops
11	bin/foo2zjs-wrapper	19	bin/foo2zjs-wrapper
12	bin/getweb	20	bin/getweb
		21	bin/gipddecode
		22	bin/hipercdecode
13	bin/lavadecode	23	bin/lavadecode
14	bin/msexpand	24	bin/msexpand
		25	bin/oakdecode
		26	bin/opldecode
		27	bin/qpdldecode
		28	bin/slxdecode
15	bin/xqxdecode	29	bin/xqxdecode
16	bin/zjsdecode	30	bin/zjsdecode
17	share/cups/model/Generic-OAKT_Printer.ppd.gz	31	share/foo2qpdl/crd/CLP-300-1200x1200cms2
18	share/cups/model/Generic-ZjStream_Printer.ppd.gz	32	share/foo2qpdl/crd/CLP-300-1200x600cms2
19	share/cups/model/KonicaMinolta-magicolor_2490_MF.ppd.gz	33	share/foo2qpdl/crd/CLP-300-600x600cms2
20	share/cups/model/KonicaMinolta-magicolor_2530_DL.ppd.gz	34	share/foo2qpdl/crd/CLP-300cms
21	share/cups/model/HP-Color_LaserJet_1500.ppd.gz	35	share/foo2qpdl/crd/CLP-600-1200x1200cms2
22	share/cups/model/HP-Color_LaserJet_1600.ppd.gz	36	share/foo2qpdl/crd/CLP-600-1200x600cms2
23	share/cups/model/HP-Color_LaserJet_2600n.ppd.gz	37	share/foo2qpdl/crd/CLP-600-600x600cms2
24	share/cups/model/HP-LaserJet_M1005_MFP.ppd.gz	38	share/foo2qpdl/crd/CLP-600cms
25	share/cups/model/HP-LaserJet_1000.ppd.gz	39	share/foo2qpdl/crd/black-text.ps
26	share/cups/model/HP-LaserJet_1005.ppd.gz	40	share/foo2zjs/crd/2300w-1200@150-l250-kx,ucr100,0-per.crd
27	share/cups/model/HP-LaserJet_1018.ppd.gz	41	share/foo2zjs/crd/2300w-1200@150-l250-kx,ucr100,50-per.crd
28	share/cups/model/HP-LaserJet_1020.ppd.gz	42	share/foo2zjs/crd/2300w-1200@150-l250-kx,ucr100,75-per.crd
29	share/cups/model/HP-LaserJet_1022.ppd.gz	43	share/foo2zjs/crd/2300w-1200@150-l250-kx,ucr125,75-per.crd
30	share/cups/model/Minolta-Color_PageWorks_Pro_L.ppd.gz	44	share/foo2zjs/crd/kh.crd
31	share/cups/model/Minolta-magicolor_2200_DL.ppd.gz	45	share/foo2zjs/crd/kx.crd
32	share/cups/model/Minolta-magicolor_2300_DL.ppd.gz	46	share/foo2zjs/crd/prolog.ps
33	share/cups/model/Minolta-magicolor_2430_DL.ppd.gz	47	share/foo2zjs/crd/screen1200.ps
34	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog	48	share/foo2zjs/crd/screen2400.ps
35	%%PORTDOCS%%%%DOCSDIR%%/README	49	share/foo2zjs/gamma-lookup.ps
36	%%PORTDOCS%%%%DOCSDIR%%/manual.pdf	50	share/foo2zjs/gamma.ps
37	%%DATADIR%%/crd/2300w-1200@150-l250-kx,ucr100,0-per.crd	51	share/foo2zjs/hplj1020_icon.gif
38	%%DATADIR%%/crd/2300w-1200@150-l250-kx,ucr100,50-per.crd	52	share/foo2zjs/hplj10xx_gui.tcl
39	%%DATADIR%%/crd/2300w-1200@150-l250-kx,ucr100,75-per.crd	53	@dirrmtry share/foo2zjs/icm
40	%%DATADIR%%/crd/2300w-1200@150-l250-kx,ucr125,75-per.crd	54	@dirrmtry share/foo2zjs/firmware
41	%%DATADIR%%/crd/kh.crd	55	@dirrm share/foo2zjs/crd
42	%%DATADIR%%/crd/kx.crd	56	@dirrm share/foo2zjs
43	%%DATADIR%%/crd/prolog.ps	57	@dirrmtry share/foo2xqx/firmware
44	%%DATADIR%%/crd/screen1200.ps
45	%%DATADIR%%/crd/screen2400.ps
46	%%DATADIR%%/gamma-lookup.ps
47	%%DATADIR%%/gamma.ps
48	%%PORTDOCS%%@dirrm %%DOCSDIR%%
49	@dirrmtry %%DATADIR%%/icm
50	@dirrmtry %%DATADIR%%/firmware
51	@dirrmtry %%DATADIR%%/crd
52	@unexec rmdir %D/%%DATADIR%% 2>/dev/null \|\| echo "Note: %D/%%DATADIR%%: icm and firmware directories not empty, remove it manually"
53	@dirrmtry share/foo2oak/icm
54	@unexec rmdir %D/share/foo2oak 2>/dev/null \|\| echo "Note: %D/share/foo2oak: icm directory not empty, remove it manually"
55	@dirrmtry share/foo2hp/icm
56	@unexec rmdir %D/share/foo2hp 2>/dev/null \|\| echo "Note: %D/share/foo2hp: icm directory not empty, remove it manually"
57	@dirrmtry share/foo2xqx	58	@dirrmtry share/foo2xqx
		59	@dirrmtry share/foo2slx/icm
		60	@dirrmtry share/foo2slx
		61	@dirrmtry share/foo2qpdl/icm
		62	@dirrm share/foo2qpdl/crd
		63	@dirrm share/foo2qpdl
		64	@dirrmtry share/foo2oak/icm
		65	@dirrmtry share/foo2oak
58	@dirrmtry share/foo2lava/icm	66	@dirrmtry share/foo2lava/icm
59	@unexec rmdir %D/share/foo2lava 2>/dev/null \|\| echo "Note: %D/share/foo2lava: icm directory not empty, remove it manually"	67	@dirrmtry share/foo2lava
		68	@dirrmtry share/foo2hp/icm
		69	@dirrmtry share/foo2hp
		70	@dirrmtry share/foo2hiperc/icm
		71	@dirrmtry share/foo2hiperc




--- Makefile	2008-09-23 23:56:20.000000000 +1000
+++ Makefile.new	2008-10-30 21:27:10.000000000 +1000
@@ -16,9 +16,7 @@
 VERSION=0.0
 
 # Installation prefix...
-PREFIX=/usr/local
-PREFIX=/usr
-PREFIX=$(DESTDIR)/usr
+PREFIX?=
 
 # Pathnames for this package...
 BIN=$(PREFIX)/bin
@@ -35,7 +33,7 @@
 INSTALL=install
 
 # Pathnames for referenced packages...
-FOODB=$(DESTDIR)/usr/share/foomatic/db/source
+FOODB=$(PREFIX)/share/foomatic/db/source
 
 # User ID's
 LPuid=-olp
@@ -251,7 +249,7 @@
 endif
 
 # Compiler flags
-CFLAGS +=	-O2 -Wall
+CFLAGS?=
 #CFLAGS +=	-g
 
 #
@@ -502,9 +500,8 @@
@@ -291,7 +290,7 @@
 # Installation rules
 #
 install: all install-test install-prog install-icc2ps install-extra \
-	    install-crd install-foo install-ppd \
-	    install-gui install-desktop \
-	    install-man install-doc
+	    install-crd install-ppd \
+	    install-gui install-desktop
 	#
 	# If you use CUPS, then restart the spooler:
 	#	make cups
@@ -718,8 +715,8 @@
 	#
 	# Install current database files
 	#
+	mkdir -p $(FOODB)
 	@if [ -d $(FOODB) ]; then \
 	    for dir in driver printer opt; do \
+		install -d $(FOODB)/$$dir/; \
 		echo install -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \
 		install -c -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \
 	    done \
@@ -435,12 +436,13 @@
 	    fi; \
 	done
 
-MODEL=$(DESTDIR)/usr/share/cups/model
-LOCALMODEL=$(DESTDIR)/usr/local/share/cups/model
+MODEL=$(PREFIX)/share/cups/model
+LOCALMODEL=$(PREFIX)/share/cups/model
 PPD=$(DESTDIR)/usr/share/ppd
 VARPPD=/var/lp/ppd
 install-ppd:
 	#
 	# Install PPD files for CUPS
 	#
+	mkdir -p $(MODEL)
 	if [ -d /usr/share/ppd/ ]; then \
 	    find /usr/share/ppd/ -name '*foo2zjs*' | xargs rm -f; \
 	    find /usr/share/ppd/ -name '*foo2hp*' | xargs rm -f; \




--- foo2hp2600-wrapper.in.orig	2008-11-01 13:11:53.000000000 +1000
+++ foo2hp2600-wrapper.in	2008-11-01 13:15:34.000000000 +1000
@@ -32,13 +32,6 @@
 PREFIX=/usr
 SHARE=$PREFIX/share/foo2hp
 PATH=$PATH:/sw/bin:/opt/local/bin
 
-#
-#	Log the command line, for debugging and problem reports
-#
-if [ -x /usr/bin/logger ]; then
-    logger -t "$BASENAME" -p lpr.info -- "$BASENAME $@" </dev/null
-fi
-
 usage() {
 	cat <<EOF
 Usage:
@@ -327,9 +320,11 @@
 #
 # N.B. := operator used here, when :- would be better, because "ash"
 # doesn't have :-
-if gs8 -v >/dev/null 2>&1; then
-        GSBIN=${GSBIN:-gs8}
-else
-        GSBIN=${GSBIN:-gs}
-fi
+GSBIN=${GSBIN:-gs}
 
 CMDLINE="$*"
 DEBUG=0
@@ -211,24 +200,8 @@
 GSDEV=-sDEVICE=pbmraw
 DefaultRGB=sRGB
 # What mode to use if the user wants us to pick the "best" mode
-case `$GSBIN --version` in
-7*)
-	DEFAULTCOLORMODE=10
-	;;
-8.1*)
-	# Buggy 8.14/8.15 in Ubuntu
-	DEFAULTCOLORMODE=10
-	if is32 $GSBIN; then
-	    GAMMAFILE=km2430_2.icm
-	else
-	    GAMMAFILE=hpclj2600n-0.icm
-	fi
-	QUALITY=1
-	;;
-*)
-	DEFAULTCOLORMODE=10
-	;;
-esac
+
+DEFAULTCOLORMODE=10
 
 while getopts "24o:b:cC:d:g:l:u:L:m:n:p:q:r:s:tABS:D:G:I:PX:Vh?" opt
 do
@@ -302,9 +275,11 @@
 	    # error "2-bpp monochrome is not yet supported"
 	    GSDEV="-sDEVICE=cups -dcupsColorSpace=3 -dcupsBitsPerColor=2"
 	    GSDEV="$GSDEV -dcupsColorOrder=2"
+		GSBIN="$PREFIX/bin/espgs"
 	else
 	    GSDEV="-sDEVICE=cups -dcupsColorSpace=6 -dcupsBitsPerColor=2"
 	    GSDEV="$GSDEV -dcupsColorOrder=2"
+		GSBIN="$PREFIX/bin/espgs"
 	fi
 	if [ $GSBIN = "gs.foo" ]; then
 	    GSBIN=gs
@@ -718,18 +713,6 @@
 	    $COLOR -b$BPP $CLIP_UL $CLIP_LR $CLIP_LOG $SAVETONER \
 	    -J "$LPJOB" -U "$USER" \
 	    $BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD -D$DEBUG
 
 #
-#	Log the command line, for debugging and problem reports
-#
-if [ -x /usr/bin/logger ]; then
-    logger -t "$BASENAME" -p lpr.info -- \
-	"$GSBIN $PAPERSIZE -g$DIM -r$RES $GSDEV $GSOPTS $GAMMAFILE"
-    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 $BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD"
-fi
-
-#
 #	Remove cruft
 #
 if [ $DEBUG -eq 0 ]; then




--- foo2zjs-wrapper.in.orig	2008-11-01 13:17:31.000000000 +1000
+++ foo2zjs-wrapper.in	2008-11-01 13:19:22.000000000 +1000
@@ -41,13 +41,6 @@
 PREFIX=/usr
 SHARE=$PREFIX/share/foo2zjs
 PATH=$PATH:/sw/bin:/opt/local/bin
 
-#
-#	Log the command line, for debugging and problem reports
-#
-if [ -x /usr/bin/logger ]; then
-    logger -t "$BASENAME" -p lpr.info -- "$BASENAME $@" </dev/null
-fi
-
 usage() {
 	cat <<EOF
 Usage:
@@ -699,18 +692,6 @@
 #
 # N.B. := operator used here, when :- would be better, because "ash"
 # doesn't have :-
-if gs8 -v >/dev/null 2>&1; then
-        GSBIN=${GSBIN:-gs8}
-else
-        GSBIN=${GSBIN:-gs}
-fi
+GSBIN=${GSBIN:-gs}
 
 CMDLINE="$*"
 DEBUG=0
@@ -154,13 +143,9 @@
 COLORMODE=0
 MODEL=0
 # What mode to use if the user wants us to pick the "best" mode
-case `$GSBIN --version` in
-7*)	DEFAULTCOLORMODE=10
-	DEFAULTCOLORMODE=2
-	;;
-*)	DEFAULTCOLORMODE=2
-	;;
-esac
+
+DEFAULTCOLORMODE=10
+DEFAULTCOLORMODE=2
 QUALITY=1
 MEDIA=1
 COPIES=1
@@ -600,18 +585,6 @@
 	    -z$MODEL $COLOR $CLIP_UL $CLIP_LR $CLIP_LOG $SAVETONER \
 	    -J "$LPJOB" -U "$USER" \
 	    $BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD -D$DEBUG
 
 #
-#	Log the command line, for debugging and problem reports
-#
-if [ -x /usr/bin/logger ]; then
-    logger -t "$BASENAME" -p lpr.info -- \
-	"$GSBIN $PAPERSIZE -g$DIM -r$RES $GSDEV $GSOPTS $GAMMAFILE"
-    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 $BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD"
-fi
-
-#
 #	Remove cruft
 #
 if [ $DEBUG -eq 0 ]; then




--- getweb.in.orig	2008-08-20 10:00:10.000000000 +1000
+++ getweb.in	2008-10-30 21:47:30.000000000 +1000
@@ -105,7 +105,7 @@
     exefile="$2"
     shift; shift
     
-    wget $WGETOPTS -O $exefile "$url/$exefile" ||
+    fetch -m -o $exefile "$url/$exefile" ||
 	error "Couldn't download $url/$exefile"
     unzip -oj $exefile "$@"
     rm $exefile
@@ -119,7 +119,7 @@
     file="$2"
     what="$3"
     

 	error "Couldn't download $url/$file"
     gunzip <$file | tar xvf - $what
     rm $file
@@ -218,7 +218,7 @@
 	    do
 		base=`basename $i .IC_`
 		mv $base.IC_ $base.ic_
-		./msexpand $base.ic_
+		msexpand $base.ic_
 		rm -f $base.ic_
 	    done
 	    copyright "(c) Copyright Minolta-QMS 1998"

Return to bug 128813

Lines 6-13 Link Here

(-)Makefile (-10 / +7 lines)
6	#	6	#
7		7
8	PORTNAME= foo2zjs	8	PORTNAME= foo2zjs
9	PORTVERSION= 20070120	9	PORTVERSION= 20081008
10	PORTREVISION= 2
11	CATEGORIES= print	10	CATEGORIES= print
12	MASTER_SITES= http://foo2zjs.rkkda.com/ \	11	MASTER_SITES= http://foo2zjs.rkkda.com/ \
13	${MASTER_SITE_LOCAL:S,$,acm/${PORTNAME}/,}	12	${MASTER_SITE_LOCAL:S,$,acm/${PORTNAME}/,}
Lines 21-31 Link Here
21	foomatic-rip:${PORTSDIR}/print/foomatic-filters \	20	foomatic-rip:${PORTSDIR}/print/foomatic-filters \
22	espgs:${PORTSDIR}/print/cups-pstoraster	21	espgs:${PORTSDIR}/print/cups-pstoraster
23		22
24	USE_GHOSTSCRIPT= yes	23	USE_GHOSTSCRIPT=yes
25	USE_GMAKE= yes	24	USE_GMAKE= yes
26	SUB_FILES= pkg-message	25	SUB_FILES= pkg-message
27		26
28	MAN1= foo2hp.1 foo2oak-wrapper.1 foo2zjs-wrapper.1 oakdecode.1 foo2hp2600-wrapper.1 foo2oak.1 foo2zjs.1 zjsdecode.1	27	MAN1= foo2hp.1 foo2oak-wrapper.1 foo2zjs-wrapper.1 oakdecode.1 foo2hp2600-wrapper.1 foo2oak.1 foo2zjs.1 zjsdecode.1
		28	PORTDOCS= ChangeLog README manual.pdf
29	EXTRAFILES= msexpand getweb	29	EXTRAFILES= msexpand getweb
30		30
31	post-patch:	31	post-patch:
Lines 33-46 Link Here
33		33
34	post-install:	34	post-install:
35	@cd ${WRKSRC} && \	35	@cd ${WRKSRC} && \
36	${INSTALL_MAN} ${MAN1} ${PREFIX}/man/man1/ && \	36	${INSTALL_MAN} ${MAN1} ${PREFIX}/man/man1/ && \
37	${INSTALL_SCRIPT} ${EXTRAFILES} ${PREFIX}/bin/	37	${INSTALL_SCRIPT} ${EXTRAFILES} ${PREFIX}/bin/
38
39	.if !defined(NOPORTDOCS)	38	.if !defined(NOPORTDOCS)
40	@${MKDIR} ${DOCSDIR}	39	@${MKDIR} ${DOCSDIR}
41	.for FILE in ChangeLog README manual.pdf	40	@${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
42	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
43	.endfor
44	.endif	41	.endif
45		42
46	@${CAT} ${PKGMESSAGE}	43	@${CAT} ${PKGMESSAGE}

Lines 1-66 Link Here

(-)files/patch-Makefile (-32 / +20 lines)
1	--- Makefile Fri Sep 29 23:28:51 2006	1	--- Makefile 2008-09-23 23:56:20.000000000 +1000
2	+++ Makefile Sun Oct 8 17:29:53 2006	2	+++ Makefile.new 2008-10-30 21:27:10.000000000 +1000
3	@@ -6,8 +6,7 @@	3	@@ -16,9 +16,7 @@
4	VERSION=0.0	4	VERSION=0.0
5		5
6	# Installation prefix...	6	# Installation prefix...
7	-PREFIX=/usr/local	7	-PREFIX=/usr/local
8	-PREFIX=/usr	8	-PREFIX=/usr
		9	-PREFIX=$(DESTDIR)/usr
9	+PREFIX?=	10	+PREFIX?=
10		11
11	# Pathnames for this package...	12	# Pathnames for this package...
12	BIN=$(PREFIX)/bin	13	BIN=$(PREFIX)/bin
13	@@ -18,7 +17,7 @@	14	@@ -35,7 +33,7 @@
14	DOCDIR=$(PREFIX)/share/doc/foo2zjs/	15	INSTALL=install
15		16
16	# Pathnames for referenced packages...	17	# Pathnames for referenced packages...
17	-FOODB=/usr/share/foomatic/db/source	18	-FOODB=$(DESTDIR)/usr/share/foomatic/db/source
18	+FOODB=$(PREFIX)/share/foomatic/db/source	19	+FOODB=$(PREFIX)/share/foomatic/db/source
19		20
20	# User ID's	21	# User ID's
21	LPuid=-olp	22	LPuid=-olp
22	@@ -154,7 +153,7 @@	23	@@ -251,7 +249,7 @@
23	endif	24	endif
24		25
25	# Compiler flags	26	# Compiler flags
26	-CFLAGS += -O2 -Wall	27	-CFLAGS += -O2 -Wall
27	+CFLAGS?=	28	+CFLAGS?=
		29	#CFLAGS += -g
28		30
29	#	31	#
30	# Rules to create test documents	32	@@ -502,9 +500,8 @@
31	@@ -291,7 +290,7 @@
32	# Installation rules	33	# Installation rules
33	#	34	#
34	install: all install-test install-prog install-icc2ps install-extra \	35	install: all install-test install-prog install-icc2ps install-extra \
35	- install-crd install-foo install-ppd install-man install-doc	36	- install-crd install-foo install-ppd \
36	+ install-crd install-ppd	37	- install-gui install-desktop \
		38	- install-man install-doc
		39	+ install-crd install-ppd \
		40	+ install-gui install-desktop
37	#	41	#
38	# If you use CUPS, then restart the spooler:	42	# If you use CUPS, then restart the spooler:
39	# make cups	43	# make cups
40	@@ -349,8 +348,10 @@	44	@@ -718,8 +715,8 @@
41	#
42	# Install current database files
43	#
44	+ mkdir -p $(FOODB)
45	@if [ -d $(FOODB) ]; then \
46	for dir in driver printer opt; do \
47	+ install -d $(FOODB)/$$dir/; \
48	echo install -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \
49	install -c -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \
50	done \
51	@@ -435,12 +436,13 @@
52	fi; \	45	fi; \
53	done	46	done
54		47
55	-MODEL=/usr/share/cups/model	48	-MODEL=$(DESTDIR)/usr/share/cups/model
56	-LOCALMODEL=/usr/local/share/cups/model	49	-LOCALMODEL=$(DESTDIR)/usr/local/share/cups/model
57	+MODEL=$(PREFIX)/share/cups/model	50	+MODEL=$(PREFIX)/share/cups/model
58	+LOCALMODEL=$(PREFIX)/share/cups/model	51	+LOCALMODEL=$(PREFIX)/share/cups/model
		52	PPD=$(DESTDIR)/usr/share/ppd
		53	VARPPD=/var/lp/ppd
59	install-ppd:	54	install-ppd:
60	#
61	# Install PPD files for CUPS
62	#
63	+ mkdir -p $(MODEL)
64	if [ -d /usr/share/ppd/ ]; then \
65	find /usr/share/ppd/ -name 'foo2zjs' \| xargs rm -f; \
66	find /usr/share/ppd/ -name 'foo2hp' \| xargs rm -f; \

Lines 1-87 Link Here

(-)files/patch-foo2hp2600-wrapper.in (-58 / +18 lines)
1	--- foo2hp2600-wrapper.in Wed Oct 4 08:30:16 2006	1	--- foo2hp2600-wrapper.in.orig 2008-11-01 13:11:53.000000000 +1000
2	+++ foo2hp2600-wrapper.in Fri Oct 13 12:33:20 2006	2	+++ foo2hp2600-wrapper.in 2008-11-01 13:15:34.000000000 +1000
3	@@ -31,13 +31,6 @@	3	@@ -32,13 +32,6 @@
4	PREFIX=/usr
5	SHARE=$PREFIX/share/foo2hp	4	SHARE=$PREFIX/share/foo2hp
		5	PATH=$PATH:/sw/bin:/opt/local/bin
6		6
7	-#	7	-#
8	-# Log the command line, for debugging and problem reports	8	-# Log the command line, for debugging and problem reports
9	-#	9	-#
10	-if [ -x /usr/bin/logger ]; then	10	-if [ -x /usr/bin/logger ]; then
11	- logger -t "$BASENAME" -p lpr.info -- "foo2hp2600-wrapper $@" </dev/null	11	- logger -t "$BASENAME" -p lpr.info -- "$BASENAME $@" </dev/null
12	-fi	12	-fi
13	-	13	-
14	usage() {	14	usage() {
15	cat <<EOF	15	cat <<EOF
16	Usage:	16	Usage:
17	@@ -174,11 +167,7 @@	17	@@ -327,9 +320,11 @@
18	#
19	# N.B. := operator used here, when :- would be better, because "ash"
20	# doesn't have :-
21	-if gs8 -v >/dev/null 2>&1; then
22	- GSBIN=${GSBIN:-gs8}
23	-else
24	- GSBIN=${GSBIN:-gs}
25	-fi
26	+GSBIN=${GSBIN:-gs}
27
28	CMDLINE="$*"
29	DEBUG=0
30	@@ -211,24 +200,8 @@
31	GSDEV=-sDEVICE=pbmraw
32	DefaultRGB=sRGB
33	# What mode to use if the user wants us to pick the "best" mode
34	-case `$GSBIN --version` in
35	-7*)
36	- DEFAULTCOLORMODE=10
37	- ;;
38	-8.1*)
39	- # Buggy 8.14/8.15 in Ubuntu
40	- DEFAULTCOLORMODE=10
41	- if is32 $GSBIN; then
42	- GAMMAFILE=km2430_2.icm
43	- else
44	- GAMMAFILE=hpclj2600n-0.icm
45	- fi
46	- QUALITY=1
47	- ;;
48	-*)
49	- DEFAULTCOLORMODE=10
50	- ;;
51	-esac
52	+
53	+DEFAULTCOLORMODE=10
54
55	while getopts "24o:b:cC:d:g:l:u:L:m:n:p:q:r:s:tABS:D:G:I:PX:Vh?" opt
56	do
57	@@ -302,9 +275,11 @@
58	# error "2-bpp monochrome is not yet supported"	18	# error "2-bpp monochrome is not yet supported"
59	GSDEV="-sDEVICE=cups -dcupsColorSpace=3 -dcupsBitsPerColor=2"	19	GSDEV="-sDEVICE=cups -dcupsColorSpace=3 -dcupsBitsPerColor=2"
60	GSDEV="$GSDEV -dcupsColorOrder=2"	20	GSDEV="$GSDEV -dcupsColorOrder=2"
61	+ GSBIN="$PREFIX/bin/espgs"	21	+ GSBIN="$PREFIX/bin/espgs"
62	else	22	else
63	GSDEV="-sDEVICE=cups -dcupsColorSpace=6 -dcupsBitsPerColor=2"	23	GSDEV="-sDEVICE=cups -dcupsColorSpace=6 -dcupsBitsPerColor=2"
64	GSDEV="$GSDEV -dcupsColorOrder=2"	24	GSDEV="$GSDEV -dcupsColorOrder=2"
65	+ GSBIN="$PREFIX/bin/espgs"	25	+ GSBIN="$PREFIX/bin/espgs"
66	fi	26	fi
67		27	if [ $GSBIN = "gs.foo" ]; then
68	case "$GAMMAFILE" in	28	GSBIN=gs
69	@@ -651,18 +626,6 @@	29	@@ -718,18 +713,6 @@
70	$COLOR -b$BPP $CLIP_UL $CLIP_LR $CLIP_LOG $SAVETONER \
71	-J "$LPJOB" -U "$USER" \
72	$BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD -D$DEBUG	30	$BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD -D$DEBUG
73	-	31
74	-#	32	#
75	-# Log the command line, for debugging and problem reports	33	-# Log the command line, for debugging and problem reports
76	-#	34	-#
77	-if [ -x /usr/bin/logger ]; then	35	-if [ -x /usr/bin/logger ]; then
78	- logger -t "$BASENAME" -p lpr.info -- \	36	- logger -t "$BASENAME" -p lpr.info -- \
79	- "$GSBIN $PAPERSIZE -g$DIM -r$RES $GSDEV $GSOPT $GAMAFILE"	37	- "$GSBIN $PAPERSIZE -g$DIM -r$RES $GSDEV $GSOPTS $GAMMAFILE"
80	- logger -t "$BASENAME" -p lpr.info -- \	38	- logger -t "$BASENAME" -p lpr.info -- \
81	- "foo2hp -r$RES -g$DIM -p$PAPER -m$MEDIA \	39	- "foo2hp -r$RES -g$DIM -p$PAPER -m$MEDIA \
82	--n$COPIES -d$DUPLEX -s$SOURCE $COLOR -b$BPP $CLIP_UL $CLIP_LR $CLIP_LOG \	40	--n$COPIES -d$DUPLEX -s$SOURCE $COLOR -b$BPP $CLIP_UL $CLIP_LR $CLIP_LOG \
83	-$SAVETONER $BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD"	41	-$SAVETONER $BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD"
84	-fi	42	-fi
85		43	-
86	#	44	-#
87	# Remove cruft	45	# Remove cruft
		46	#
		47	if [ $DEBUG -eq 0 ]; then

Lines 1-65 Link Here

(-)files/patch-foo2zjs-wrapper.in (-43 / +13 lines)
1	--- foo2zjs-wrapper.in Mon May 1 23:33:58 2006	1	--- foo2zjs-wrapper.in.orig 2008-11-01 13:17:31.000000000 +1000
2	+++ foo2zjs-wrapper.in Fri Oct 13 12:34:22 2006	2	+++ foo2zjs-wrapper.in 2008-11-01 13:19:22.000000000 +1000
3	@@ -40,13 +40,6 @@	3	@@ -41,13 +41,6 @@
4	PREFIX=/usr
5	SHARE=$PREFIX/share/foo2zjs	4	SHARE=$PREFIX/share/foo2zjs
		5	PATH=$PATH:/sw/bin:/opt/local/bin
6		6
7	-#	7	-#
8	-# Log the command line, for debugging and problem reports	8	-# Log the command line, for debugging and problem reports
9	-#	9	-#
10	-if [ -x /usr/bin/logger ]; then	10	-if [ -x /usr/bin/logger ]; then
11	- logger -t "$BASENAME" -p lpr.info -- "foo2zjs-wrapper $@" </dev/null	11	- logger -t "$BASENAME" -p lpr.info -- "$BASENAME $@" </dev/null
12	-fi	12	-fi
13	-	13	-
14	usage() {	14	usage() {
15	cat <<EOF	15	cat <<EOF
16	Usage:	16	Usage:
17	@@ -141,11 +134,7 @@	17	@@ -699,18 +692,6 @@
18	#
19	# N.B. := operator used here, when :- would be better, because "ash"
20	# doesn't have :-
21	-if gs8 -v >/dev/null 2>&1; then
22	- GSBIN=${GSBIN:-gs8}
23	-else
24	- GSBIN=${GSBIN:-gs}
25	-fi
26	+GSBIN=${GSBIN:-gs}
27
28	CMDLINE="$*"
29	DEBUG=0
30	@@ -154,13 +143,9 @@
31	COLORMODE=0
32	MODEL=0
33	# What mode to use if the user wants us to pick the "best" mode
34	-case `$GSBIN --version` in
35	-7*) DEFAULTCOLORMODE=10
36	- DEFAULTCOLORMODE=2
37	- ;;
38	-*) DEFAULTCOLORMODE=2
39	- ;;
40	-esac
41	+
42	+DEFAULTCOLORMODE=10
43	+DEFAULTCOLORMODE=2
44	QUALITY=1
45	MEDIA=1
46	COPIES=1
47	@@ -600,18 +585,6 @@
48	-z$MODEL $COLOR $CLIP_UL $CLIP_LR $CLIP_LOG $SAVETONER \
49	-J "$LPJOB" -U "$USER" \
50	$BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD -D$DEBUG	18	$BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD -D$DEBUG
51	-	19
52	-#	20	#
53	-# Log the command line, for debugging and problem reports	21	-# Log the command line, for debugging and problem reports
54	-#	22	-#
55	-if [ -x /usr/bin/logger ]; then	23	-if [ -x /usr/bin/logger ]; then
56	- logger -t "$BASENAME" -p lpr.info -- \	24	- logger -t "$BASENAME" -p lpr.info -- \
57	- "$GSBIN $PAPERSIZE -g$DIM -r$RES $GSDEV $GSOPT $GAMAFILE"	25	- "$GSBIN $PAPERSIZE -g$DIM -r$RES $GSDEV $GSOPTS $GAMMAFILE"
58	- logger -t "$BASENAME" -p lpr.info -- \	26	- logger -t "$BASENAME" -p lpr.info -- \
59	- "foo2zjs -r$RES -g$DIM -p$PAPER -m$MEDIA \	27	- "foo2zjs -r$RES -g$DIM -p$PAPER -m$MEDIA \
60	--n$COPIES -d$DUPLEX -s$SOURCE -z$MODEL $COLOR $CLIP_UL $CLIP_LR $CLIP_LOG \	28	--n$COPIES -d$DUPLEX -s$SOURCE -z$MODEL $COLOR $CLIP_UL $CLIP_LR $CLIP_LOG \
61	-$SAVETONER $BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD"	29	-$SAVETONER $BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD"
62	-fi	30	-fi
63		31	-
64	#	32	-#
65	# Remove cruft	33	# Remove cruft
		34	#
		35	if [ $DEBUG -eq 0 ]; then

Lines 1-15 Link Here

(-)files/patch-getweb.in (-15 / +15 lines)
1	--- getweb.in Thu May 11 17:02:59 2006	1	--- getweb.in.orig 2008-08-20 10:00:10.000000000 +1000
2	+++ getweb.in Sun Jun 4 15:41:29 2006	2	+++ getweb.in 2008-10-30 21:47:30.000000000 +1000
3	@@ -48,7 +48,7 @@	3	@@ -105,7 +105,7 @@
4	exefile="$2"	4	exefile="$2"
5	what="$3"	5	shift; shift
6		6
7	- wget $WGETOPTS -O $exefile "$url/$exefile" \|\|	7	- wget $WGETOPTS -O $exefile "$url/$exefile" \|\|
8	+ fetch -m -o $exefile "$url/$exefile" \|\|	8	+ fetch -m -o $exefile "$url/$exefile" \|\|
9	error "Couldn't download $url/$exefile"	9	error "Couldn't download $url/$exefile"
10	unzip -o $exefile "$what"	10	unzip -oj $exefile "$@"
11	rm $exefile	11	rm $exefile
12	@@ -62,7 +62,7 @@	12	@@ -119,7 +119,7 @@
13	file="$2"	13	file="$2"
14	what="$3"	14	what="$3"
15		15
Lines 18-29 Link Here
18	error "Couldn't download $url/$file"	18	error "Couldn't download $url/$file"
19	gunzip <$file \| tar xvf - $what	19	gunzip <$file \| tar xvf - $what
20	rm $file	20	rm $file
21	@@ -130,7 +130,7 @@	21	@@ -218,7 +218,7 @@
22	do	22	do
23	base=`basename $i .IC_`	23	base=`basename $i .IC_`
24	mv $base.IC_ $base.ic_	24	mv $base.IC_ $base.ic_
25	- ./msexpand $base.ic_	25	- ./msexpand $base.ic_
26	+ msexpand $base.ic_	26	+ msexpand $base.ic_
27	rm -f $base.ic_	27	rm -f $base.ic_
28	done	28	done
29	;;	29	copyright "(c) Copyright Minolta-QMS 1998"