- Update to 20110609
PR: 158040 Submitted by: bsam
This commit is contained in:
parent
074ebb3811
commit
2437526fd1
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=276229
@ -6,8 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= foo2zjs
|
||||
PORTVERSION= 20090530
|
||||
PORTREVISION= 4
|
||||
PORTVERSION= 20110609
|
||||
CATEGORIES= print
|
||||
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \
|
||||
${MASTER_SITE_LOCAL:S,$,acm/${PORTNAME}/,}
|
||||
|
@ -1,3 +1,2 @@
|
||||
MD5 (foo2zjs-20090530.tar.gz) = 44f5450902e20edf53a6e98271950e7d
|
||||
SHA256 (foo2zjs-20090530.tar.gz) = 887f0ae60a4e450d96775fc75c013220a6b0b92edb559e1acd11055fe56ff787
|
||||
SIZE (foo2zjs-20090530.tar.gz) = 1565746
|
||||
SHA256 (foo2zjs-20110609.tar.gz) = a84d01add17344a39b078941a13d85ca2ea437eb832da6796ba94ed9810f6e35
|
||||
SIZE (foo2zjs-20110609.tar.gz) = 1631341
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- Makefile 2009-04-21 19:53:37.000000000 -0500
|
||||
+++ Makefile 2009-05-30 04:31:51.000000000 -0500
|
||||
@@ -16,9 +16,7 @@
|
||||
--- 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...
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
# Pathnames for this package...
|
||||
BIN=$(PREFIX)/bin
|
||||
@@ -30,12 +28,13 @@
|
||||
@@ -31,13 +29,14 @@ SHARELAVA=$(PREFIX)/share/foo2lava
|
||||
SHAREQPDL=$(PREFIX)/share/foo2qpdl
|
||||
SHARESLX=$(PREFIX)/share/foo2slx
|
||||
SHAREHC=$(PREFIX)/share/foo2hiperc
|
||||
@ -21,6 +21,7 @@
|
||||
-INSTALL=install
|
||||
+INSTALL?=install
|
||||
+INSTALL_MAN?=install
|
||||
ROOT=root
|
||||
|
||||
# Pathnames for referenced packages...
|
||||
-FOODB=$(DESTDIR)/usr/share/foomatic/db/source
|
||||
@ -28,29 +29,30 @@
|
||||
|
||||
# User ID's
|
||||
LPuid=-oroot
|
||||
@@ -255,7 +254,7 @@
|
||||
endif
|
||||
@@ -282,7 +281,7 @@ endif
|
||||
|
||||
# Compiler flags
|
||||
-CFLAGS += -O2 -Wall
|
||||
+CFLAGS ?= -O2 -Wall
|
||||
#CFLAGS += -O2 -Wall -Wno-unused-but-set-variable
|
||||
-CFLAGS += -O2 -Wall
|
||||
+CFLAGS ?= -O2 -Wall
|
||||
#CFLAGS += -g
|
||||
|
||||
#
|
||||
@@ -505,10 +504,8 @@
|
||||
@@ -556,10 +555,9 @@ command2foo2lava-pjl.o: command2foo2lava
|
||||
#
|
||||
# Installation rules
|
||||
#
|
||||
-install: all install-test install-prog install-icc2ps install-extra \
|
||||
- install-crd install-foo install-ppd \
|
||||
- install-gui install-desktop \
|
||||
-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
|
||||
@@ -544,7 +541,7 @@
|
||||
@@ -595,7 +593,7 @@ install-test:
|
||||
#
|
||||
|
||||
|
||||
@ -59,7 +61,7 @@
|
||||
|
||||
install-prog:
|
||||
#
|
||||
@@ -574,21 +571,13 @@
|
||||
@@ -625,20 +623,13 @@ install-foo:
|
||||
#
|
||||
# Remove obsolete foomatic database files from previous versions
|
||||
#
|
||||
@ -72,19 +74,18 @@
|
||||
- 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/; \
|
||||
$(INSTALL) -c -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \
|
||||
done \
|
||||
else \
|
||||
@@ -602,15 +591,6 @@
|
||||
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
|
||||
@ -100,7 +101,7 @@
|
||||
|
||||
install-icc2ps:
|
||||
#
|
||||
@@ -722,9 +702,9 @@
|
||||
@@ -783,9 +765,9 @@ install-extra:
|
||||
fi; \
|
||||
done
|
||||
|
||||
@ -113,15 +114,15 @@
|
||||
VARPPD=/var/lp/ppd
|
||||
install-ppd:
|
||||
#
|
||||
@@ -753,6 +733,7 @@
|
||||
gzip < $$ppd > $(PPD)/foo2zjs/$$ppd.gz; \
|
||||
done; \
|
||||
@@ -819,6 +801,7 @@ install-ppd:
|
||||
fi
|
||||
#
|
||||
export PATH=$$PATH:`pwd`:; \
|
||||
+ mkdir -p $(MODEL)
|
||||
if [ -d $(MODEL) ]; then \
|
||||
rm -f $(MODEL)/KonicaMinolta*; \
|
||||
cd PPD; \
|
||||
@@ -767,9 +748,9 @@
|
||||
@@ -835,9 +818,9 @@ install-ppd:
|
||||
done; \
|
||||
fi
|
||||
|
||||
@ -134,7 +135,7 @@
|
||||
|
||||
install-desktop:
|
||||
#
|
||||
@@ -1185,36 +1166,34 @@
|
||||
@@ -1344,38 +1327,38 @@ install-man: man
|
||||
#
|
||||
# Install manual pages
|
||||
#
|
||||
@ -164,10 +165,14 @@
|
||||
- $(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/
|
||||
@ -192,10 +197,12 @@
|
||||
+ $(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/
|
||||
|
||||
doc: README INSTALL manual.pdf
|
||||
|
||||
cd icc2ps; $(MAKE) install-man
|
||||
ifeq ($(UNAME),Darwin)
|
||||
cd osx-hotplug; $(MAKE) install-man
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- foo2hiperc-wrapper.in 2009-05-30 04:40:00.000000000 -0500
|
||||
+++ foo2hiperc-wrapper.in 2009-05-30 04:57:27.000000000 -0500
|
||||
@@ -44,10 +44,6 @@
|
||||
--- 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
|
||||
#
|
||||
@ -11,18 +11,18 @@
|
||||
usage() {
|
||||
cat <<EOF
|
||||
Usage:
|
||||
@@ -151,8 +147,8 @@
|
||||
@@ -154,8 +150,8 @@ nup() {
|
||||
#
|
||||
# N.B. := operator used here, when :- would be better, because "ash"
|
||||
# doesn't have :-
|
||||
-if gs.foo -v >/dev/null 2>&1; then
|
||||
-if eval gs.foo -v >/dev/null 2>&1; then
|
||||
- GSBIN=${GSBIN:-gs.foo}
|
||||
+if gs -v >/dev/null 2>&1; then
|
||||
+if eval gs -v >/dev/null 2>&1; then
|
||||
+ GSBIN=${GSBIN:-gs}
|
||||
else
|
||||
GSBIN=${GSBIN:-gs}
|
||||
fi
|
||||
@@ -645,18 +641,6 @@
|
||||
@@ -676,18 +672,6 @@ $PREFILTER \
|
||||
$BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD $COMPRESSED -D$DEBUG
|
||||
|
||||
#
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- foo2hp2600-wrapper.in 2009-05-30 04:57:56.000000000 -0500
|
||||
+++ foo2hp2600-wrapper.in 2009-05-30 04:59:38.000000000 -0500
|
||||
@@ -34,13 +34,6 @@
|
||||
--- 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
|
||||
|
||||
@ -14,18 +14,18 @@
|
||||
usage() {
|
||||
cat <<EOF
|
||||
Usage:
|
||||
@@ -185,8 +178,8 @@
|
||||
@@ -186,8 +179,8 @@ nup() {
|
||||
#
|
||||
# N.B. := operator used here, when :- would be better, because "ash"
|
||||
# doesn't have :-
|
||||
-if gs.foo -v >/dev/null 2>&1; then
|
||||
-if eval gs.foo -v >/dev/null 2>&1; then
|
||||
- GSBIN=${GSBIN:-gs.foo}
|
||||
+if gs -v >/dev/null 2>&1; then
|
||||
+if eval gs -v >/dev/null 2>&1; then
|
||||
+ GSBIN=${GSBIN:-gs}
|
||||
else
|
||||
GSBIN=${GSBIN:-gs}
|
||||
fi
|
||||
@@ -343,7 +336,7 @@
|
||||
@@ -359,7 +352,7 @@ case "$BPP" in
|
||||
GSDEV="-sDEVICE=cups -dcupsColorSpace=6 -dcupsBitsPerColor=2"
|
||||
GSDEV="$GSDEV -dcupsColorOrder=2"
|
||||
fi
|
||||
@ -34,7 +34,7 @@
|
||||
GSBIN=gs
|
||||
fi
|
||||
|
||||
@@ -749,18 +742,6 @@
|
||||
@@ -793,18 +786,6 @@ $PREFILTER \
|
||||
$BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD -D$DEBUG
|
||||
|
||||
#
|
||||
@ -46,7 +46,7 @@
|
||||
- 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"
|
||||
-$SAVETONER -O$OFF_C,$OFF_M,$OFF_Y,$OFF_K $BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD"
|
||||
-fi
|
||||
-
|
||||
-#
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- foo2lava-wrapper.in 2009-05-30 05:00:03.000000000 -0500
|
||||
+++ foo2lava-wrapper.in 2009-05-30 05:00:53.000000000 -0500
|
||||
@@ -41,13 +41,6 @@
|
||||
--- 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
|
||||
|
||||
@ -14,18 +14,18 @@
|
||||
usage() {
|
||||
cat <<EOF
|
||||
Usage:
|
||||
@@ -154,8 +147,8 @@
|
||||
@@ -155,8 +148,8 @@ nup() {
|
||||
#
|
||||
# N.B. := operator used here, when :- would be better, because "ash"
|
||||
# doesn't have :-
|
||||
-if gs.foo -v >/dev/null 2>&1; then
|
||||
-if eval gs.foo -v >/dev/null 2>&1; then
|
||||
- GSBIN=${GSBIN:-gs.foo}
|
||||
+if gs -v >/dev/null 2>&1; then
|
||||
+if eval gs -v >/dev/null 2>&1; then
|
||||
+ GSBIN=${GSBIN:-gs}
|
||||
else
|
||||
GSBIN=${GSBIN:-gs}
|
||||
fi
|
||||
@@ -700,18 +693,6 @@
|
||||
@@ -733,18 +726,6 @@ $PREFILTER \
|
||||
$BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD -D$DEBUG
|
||||
|
||||
#
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- foo2oak-wrapper.in 2009-05-30 05:01:17.000000000 -0500
|
||||
+++ foo2oak-wrapper.in 2009-05-30 05:02:12.000000000 -0500
|
||||
@@ -34,13 +34,6 @@
|
||||
--- 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
|
||||
|
||||
@ -14,18 +14,18 @@
|
||||
usage() {
|
||||
cat <<EOF
|
||||
Usage:
|
||||
@@ -141,8 +134,8 @@
|
||||
@@ -144,8 +137,8 @@ nup() {
|
||||
#
|
||||
# N.B. := operator used here, when :- would be better, because "ash"
|
||||
# doesn't have :-
|
||||
-if gs.foo -v >/dev/null 2>&1; then
|
||||
-if eval gs.foo -v >/dev/null 2>&1; then
|
||||
- GSBIN=${GSBIN:-gs.foo}
|
||||
+if gs -v >/dev/null 2>&1; then
|
||||
+if eval gs -v >/dev/null 2>&1; then
|
||||
+ GSBIN=${GSBIN:-gs}
|
||||
else
|
||||
GSBIN=${GSBIN:-gs}
|
||||
fi
|
||||
@@ -668,19 +661,6 @@
|
||||
@@ -701,19 +694,6 @@ $PREFILTER \
|
||||
$BC $AIB $COLOR2MONO -D$DEBUG
|
||||
|
||||
#
|
||||
@ -36,7 +36,7 @@
|
||||
- "$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 -M$MIRROR $COLOR -b$BPP \
|
||||
--n$COPIES -d$DUPLEX -s$SOURCE -z$MODEL -M$MIRROR $COLOR -b$BPP \
|
||||
-$CLIP_UL $CLIP_LR $CLIP_LOG \
|
||||
-$BC $AIB $COLOR2MONO"
|
||||
-fi
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- foo2qpdl-wrapper.in 2009-05-30 05:02:42.000000000 -0500
|
||||
+++ foo2qpdl-wrapper.in 2009-05-30 05:03:26.000000000 -0500
|
||||
@@ -40,13 +40,6 @@
|
||||
--- 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
|
||||
|
||||
@ -14,18 +14,18 @@
|
||||
usage() {
|
||||
cat <<EOF
|
||||
Usage:
|
||||
@@ -157,8 +150,8 @@
|
||||
@@ -161,8 +154,8 @@ nup() {
|
||||
#
|
||||
# N.B. := operator used here, when :- would be better, because "ash"
|
||||
# doesn't have :-
|
||||
-if gs.foo -v >/dev/null 2>&1; then
|
||||
-if eval gs.foo -v >/dev/null 2>&1; then
|
||||
- GSBIN=${GSBIN:-gs.foo}
|
||||
+if gs -v >/dev/null 2>&1; then
|
||||
+if eval gs -v >/dev/null 2>&1; then
|
||||
+ GSBIN=${GSBIN:-gs}
|
||||
else
|
||||
GSBIN=${GSBIN:-gs}
|
||||
fi
|
||||
@@ -671,18 +664,6 @@
|
||||
@@ -708,18 +701,6 @@ $PREFILTER \
|
||||
$BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD -D$DEBUG
|
||||
|
||||
#
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- foo2slx-wrapper.in 2009-05-30 05:03:55.000000000 -0500
|
||||
+++ foo2slx-wrapper.in 2009-05-30 05:04:31.000000000 -0500
|
||||
@@ -32,13 +32,6 @@
|
||||
--- 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
|
||||
|
||||
@ -14,18 +14,18 @@
|
||||
usage() {
|
||||
cat <<EOF
|
||||
Usage:
|
||||
@@ -133,8 +126,8 @@
|
||||
@@ -133,8 +126,8 @@ nup() {
|
||||
#
|
||||
# N.B. := operator used here, when :- would be better, because "ash"
|
||||
# doesn't have :-
|
||||
-if gs.foo -v >/dev/null 2>&1; then
|
||||
-if eval gs.foo -v >/dev/null 2>&1; then
|
||||
- GSBIN=${GSBIN:-gs.foo}
|
||||
+if gs -v >/dev/null 2>&1; then
|
||||
+if eval gs -v >/dev/null 2>&1; then
|
||||
+ GSBIN=${GSBIN:-gs}
|
||||
else
|
||||
GSBIN=${GSBIN:-gs}
|
||||
fi
|
||||
@@ -672,18 +665,6 @@
|
||||
@@ -702,18 +695,6 @@ $PREFILTER \
|
||||
$BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD -D$DEBUG
|
||||
|
||||
#
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- foo2xqx-wrapper.in 2009-05-30 05:04:57.000000000 -0500
|
||||
+++ foo2xqx-wrapper.in 2009-05-30 05:05:34.000000000 -0500
|
||||
@@ -32,13 +32,6 @@
|
||||
--- 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
|
||||
|
||||
@ -14,18 +14,18 @@
|
||||
usage() {
|
||||
cat <<EOF
|
||||
Usage:
|
||||
@@ -139,8 +132,8 @@
|
||||
@@ -150,8 +143,8 @@ nup() {
|
||||
#
|
||||
# N.B. := operator used here, when :- would be better, because "ash"
|
||||
# doesn't have :-
|
||||
-if gs.foo -v >/dev/null 2>&1; then
|
||||
-if eval gs.foo -v >/dev/null 2>&1; then
|
||||
- GSBIN=${GSBIN:-gs.foo}
|
||||
+if gs -v >/dev/null 2>&1; then
|
||||
+if eval gs -v >/dev/null 2>&1; then
|
||||
+ GSBIN=${GSBIN:-gs}
|
||||
else
|
||||
GSBIN=${GSBIN:-gs}
|
||||
fi
|
||||
@@ -614,18 +607,6 @@
|
||||
@@ -666,18 +659,6 @@ $PREFILTER \
|
||||
$BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD -D$DEBUG
|
||||
|
||||
#
|
||||
@ -37,7 +37,7 @@
|
||||
- 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 $BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD"
|
||||
-$SAVETONER -T$DENSITY $BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD"
|
||||
-fi
|
||||
-
|
||||
-#
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- foo2zjs-wrapper.in 2009-05-30 05:05:50.000000000 -0500
|
||||
+++ foo2zjs-wrapper.in 2009-05-30 05:06:36.000000000 -0500
|
||||
@@ -42,13 +42,6 @@
|
||||
--- 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
|
||||
|
||||
@ -14,18 +14,18 @@
|
||||
usage() {
|
||||
cat <<EOF
|
||||
Usage:
|
||||
@@ -153,8 +146,8 @@
|
||||
@@ -187,8 +180,8 @@ nup() {
|
||||
#
|
||||
# N.B. := operator used here, when :- would be better, because "ash"
|
||||
# doesn't have :-
|
||||
-if gs.foo -v >/dev/null 2>&1; then
|
||||
-if eval gs.foo -v >/dev/null 2>&1; then
|
||||
- GSBIN=${GSBIN:-gs.foo}
|
||||
+if gs -v >/dev/null 2>&1; then
|
||||
+if eval gs -v >/dev/null 2>&1; then
|
||||
+ GSBIN=${GSBIN:-gs}
|
||||
else
|
||||
GSBIN=${GSBIN:-gs}
|
||||
fi
|
||||
@@ -707,18 +700,6 @@
|
||||
@@ -900,18 +893,6 @@ $PREFILTER \
|
||||
$BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD -D$DEBUG
|
||||
|
||||
#
|
||||
@ -37,7 +37,7 @@
|
||||
- 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"
|
||||
-$SAVETONER -T$DENSITY $BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD"
|
||||
-fi
|
||||
-
|
||||
-#
|
||||
|
@ -1,15 +1,15 @@
|
||||
--- getweb.in 2009-05-04 09:10:55.000000000 -0500
|
||||
+++ getweb.in 2009-06-23 12:24:38.000000000 -0500
|
||||
--- 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.85 2009/05/04 14:10:55 rick Exp $'
|
||||
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
|
||||
@@ -111,7 +111,7 @@
|
||||
@@ -119,7 +119,7 @@ getexe() {
|
||||
exefile="$2"
|
||||
shift; shift
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
error "Couldn't download $url/$exefile"
|
||||
unzip -oj $exefile "$@"
|
||||
rm $exefile
|
||||
@@ -125,7 +125,7 @@
|
||||
@@ -133,7 +133,7 @@ gettgz() {
|
||||
file="$2"
|
||||
what="$3"
|
||||
|
||||
@ -27,23 +27,7 @@
|
||||
error "Couldn't download $url/$file"
|
||||
gunzip <$file | tar xvf - $what
|
||||
rm $file
|
||||
@@ -193,13 +193,13 @@
|
||||
;;
|
||||
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 @@
|
||||
@@ -236,7 +236,7 @@ getone() {
|
||||
BASE="$BASE/openmind/technic/swfw/mswprtdl.nsf/logdwl"
|
||||
FILE="MC2300DL_v255.zip"
|
||||
URL="$BASE?openagent&4CE486C20839C75AC1256D9E001EBD1F/\$File/$FILE"
|
||||
@ -52,7 +36,7 @@
|
||||
echo "*** Now use a windows box to unzip and install $FILE ***"
|
||||
;;
|
||||
cpwl|pageworks)
|
||||
@@ -224,7 +224,7 @@
|
||||
@@ -252,7 +252,7 @@ getone() {
|
||||
do
|
||||
base=`basename $i .IC_`
|
||||
mv $base.IC_ $base.ic_
|
||||
@ -60,8 +44,8 @@
|
||||
+ msexpand $base.ic_
|
||||
rm -f $base.ic_
|
||||
done
|
||||
copyright "(c) Copyright Minolta-QMS 1998"
|
||||
@@ -332,7 +332,7 @@
|
||||
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"
|
||||
@ -70,7 +54,7 @@
|
||||
error "Couldn't dowload $URL"
|
||||
done
|
||||
;;
|
||||
@@ -368,7 +368,7 @@
|
||||
@@ -420,7 +420,7 @@ getone() {
|
||||
update)
|
||||
url=${URLZJS}
|
||||
file=foo2zjs.tar.gz
|
||||
|
@ -14,6 +14,7 @@ bin/oakdecode
|
||||
bin/foo2slx
|
||||
bin/slxdecode
|
||||
bin/foo2hiperc
|
||||
bin/hbpldecode
|
||||
bin/hipercdecode
|
||||
bin/gipddecode
|
||||
bin/printer-profile
|
||||
@ -63,6 +64,8 @@ share/cups/model/HP-LaserJet_1005.ppd.gz
|
||||
share/cups/model/HP-LaserJet_1018.ppd.gz
|
||||
share/cups/model/HP-LaserJet_1020.ppd.gz
|
||||
share/cups/model/HP-LaserJet_1022.ppd.gz
|
||||
share/cups/model/HP-LaserJet_1022n.ppd.gz
|
||||
share/cups/model/HP-LaserJet_1022nw.ppd.gz
|
||||
share/cups/model/HP-LaserJet_M1005_MFP.ppd.gz
|
||||
share/cups/model/HP-LaserJet_M1120_MFP.ppd.gz
|
||||
share/cups/model/HP-LaserJet_M1319_MFP.ppd.gz
|
||||
@ -71,8 +74,16 @@ share/cups/model/HP-LaserJet_P1006.ppd.gz
|
||||
share/cups/model/HP-LaserJet_P1007.ppd.gz
|
||||
share/cups/model/HP-LaserJet_P1008.ppd.gz
|
||||
share/cups/model/HP-LaserJet_P1505.ppd.gz
|
||||
share/cups/model/HP-LaserJet_P1505n.ppd.gz
|
||||
share/cups/model/HP-LaserJet_P2014.ppd.gz
|
||||
share/cups/model/HP-LaserJet_P2014n.ppd.gz
|
||||
share/cups/model/HP-LaserJet_P2035.ppd.gz
|
||||
share/cups/model/HP-LaserJet_P2035n.ppd.gz
|
||||
share/cups/model/HP-LaserJet_Pro_CP1025nw.ppd.gz
|
||||
share/cups/model/HP-LaserJet_Pro_P1102.ppd.gz
|
||||
share/cups/model/HP-LaserJet_Pro_P1102w.ppd.gz
|
||||
share/cups/model/HP-LaserJet_Pro_P1566.ppd.gz
|
||||
share/cups/model/HP-LaserJet_Pro_P1606dn.ppd.gz
|
||||
share/cups/model/KONICA_MINOLTA-magicolor_1600W.ppd.gz
|
||||
share/cups/model/KONICA_MINOLTA-magicolor_1680MF.ppd.gz
|
||||
share/cups/model/KONICA_MINOLTA-magicolor_1690MF.ppd.gz
|
||||
@ -80,12 +91,15 @@ share/cups/model/KONICA_MINOLTA-magicolor_2480_MF.ppd.gz
|
||||
share/cups/model/Lexmark-C500.ppd.gz
|
||||
share/cups/model/KONICA_MINOLTA-magicolor_2490_MF.ppd.gz
|
||||
share/cups/model/KONICA_MINOLTA-magicolor_2530_DL.ppd.gz
|
||||
share/cups/model/KONICA_MINOLTA-magicolor_4690MF.ppd.gz
|
||||
share/cups/model/Kyocera-KM-1635.ppd.gz
|
||||
share/cups/model/Kyocera-KM-2035.ppd.gz
|
||||
share/cups/model/Minolta-Color_PageWorks_Pro_L.ppd.gz
|
||||
share/cups/model/Minolta-magicolor_2200_DL.ppd.gz
|
||||
share/cups/model/Minolta-magicolor_2300_DL.ppd.gz
|
||||
share/cups/model/Minolta-magicolor_2430_DL.ppd.gz
|
||||
share/cups/model/Oki-C110.ppd.gz
|
||||
share/cups/model/Oki-C310dn.ppd.gz
|
||||
share/cups/model/Oki-C3100.ppd.gz
|
||||
share/cups/model/Oki-C3200.ppd.gz
|
||||
share/cups/model/Oki-C3300.ppd.gz
|
||||
@ -95,23 +109,46 @@ share/cups/model/Oki-C5100.ppd.gz
|
||||
share/cups/model/Oki-C5200.ppd.gz
|
||||
share/cups/model/Oki-C5500.ppd.gz
|
||||
share/cups/model/Oki-C5600.ppd.gz
|
||||
share/cups/model/Oki-C5650.ppd.gz
|
||||
share/cups/model/Oki-C5800.ppd.gz
|
||||
share/cups/model/Olivetti-d-Color_P160W.ppd.gz
|
||||
share/cups/model/Samsung-CLP-300.ppd.gz
|
||||
share/cups/model/Samsung-CLP-310.ppd.gz
|
||||
share/cups/model/Samsung-CLP-315.ppd.gz
|
||||
share/cups/model/Samsung-CLP-325.ppd.gz
|
||||
share/cups/model/Samsung-CLP-600.ppd.gz
|
||||
share/cups/model/Samsung-CLP-610.ppd.gz
|
||||
share/cups/model/Samsung-CLP-620.ppd.gz
|
||||
share/cups/model/Samsung-CLX-2160.ppd.gz
|
||||
share/cups/model/Samsung-CLX-3160.ppd.gz
|
||||
share/cups/model/Samsung-CLX-3175.ppd.gz
|
||||
share/cups/model/Xerox-Phaser_6110.ppd.gz
|
||||
share/cups/model/Xerox-Phaser_6115MFP.ppd.gz
|
||||
share/cups/model/Xerox-Phaser_6121MFP.ppd.gz
|
||||
foomatic/db/source/printer/HP-LaserJet_1022n.xml
|
||||
foomatic/db/source/printer/HP-LaserJet_1022nw.xml
|
||||
foomatic/db/source/printer/HP-LaserJet_M1319_MFP.xml
|
||||
foomatic/db/source/printer/HP-LaserJet_P1505n.xml
|
||||
foomatic/db/source/printer/HP-LaserJet_P2014n.xml
|
||||
foomatic/db/source/printer/HP-LaserJet_P2035.xml
|
||||
foomatic/db/source/printer/HP-LaserJet_P2035n.xml
|
||||
foomatic/db/source/printer/HP-LaserJet_Pro_CP1025nw.xml
|
||||
foomatic/db/source/printer/HP-LaserJet_Pro_P1102.xml
|
||||
foomatic/db/source/printer/HP-LaserJet_Pro_P1102w.xml
|
||||
foomatic/db/source/printer/HP-LaserJet_Pro_P1566.xml
|
||||
foomatic/db/source/printer/HP-LaserJet_Pro_P1606dn.xml
|
||||
foomatic/db/source/printer/KONICA_MINOLTA-magicolor_1600W.xml
|
||||
foomatic/db/source/printer/KONICA_MINOLTA-magicolor_1680MF.xml
|
||||
foomatic/db/source/printer/KONICA_MINOLTA-magicolor_1690MF.xml
|
||||
foomatic/db/source/printer/KONICA_MINOLTA-magicolor_4690MF.xml
|
||||
foomatic/db/source/printer/Oki-C110.xml
|
||||
foomatic/db/source/printer/Oki-C310dn.xml
|
||||
foomatic/db/source/printer/Oki-C5650.xml
|
||||
foomatic/db/source/printer/Olivetti-d-Color_P160W.xml
|
||||
foomatic/db/source/printer/Samsung-CLP-310.xml
|
||||
foomatic/db/source/printer/Samsung-CLP-325.xml
|
||||
foomatic/db/source/printer/Samsung-CLP-620.xml
|
||||
foomatic/db/source/printer/Xerox-Phaser_6121MFP.xml
|
||||
foomatic/db/source/opt/foo2hiperc-ColorMode.xml
|
||||
foomatic/db/source/opt/foo2hiperc-Compression.xml
|
||||
foomatic/db/source/opt/foo2hiperc-Duplex.xml
|
||||
@ -120,6 +157,7 @@ foomatic/db/source/opt/foo2hiperc-InputSlot.xml
|
||||
foomatic/db/source/opt/foo2hiperc-MediaType.xml
|
||||
foomatic/db/source/opt/foo2hiperc-PageSize.xml
|
||||
foomatic/db/source/opt/foo2hiperc-Resolution.xml
|
||||
foomatic/db/source/opt/foo2hp-AlignCMYK.xml
|
||||
foomatic/db/source/opt/foo2hp-BitsPerPlane.xml
|
||||
foomatic/db/source/opt/foo2hp-ColorMode.xml
|
||||
foomatic/db/source/opt/foo2hp-Duplex.xml
|
||||
@ -140,6 +178,7 @@ foomatic/db/source/opt/foo2oak-ColorMode.xml
|
||||
foomatic/db/source/opt/foo2oak-ICM.xml
|
||||
foomatic/db/source/opt/foo2oak-InputSlot.xml
|
||||
foomatic/db/source/opt/foo2oak-MediaType.xml
|
||||
foomatic/db/source/opt/foo2oak-z1-Duplex.xml
|
||||
foomatic/db/source/opt/foo2oak-z1-InputSlot.xml
|
||||
foomatic/db/source/opt/foo2oak-z1-MediaType.xml
|
||||
foomatic/db/source/opt/foo2oak-z1-PageSize.xml
|
||||
@ -157,7 +196,9 @@ foomatic/db/source/opt/foo2slx-InputSlot.xml
|
||||
foomatic/db/source/opt/foo2slx-MediaType.xml
|
||||
foomatic/db/source/opt/foo2slx-PageSize.xml
|
||||
foomatic/db/source/opt/foo2slx-Resolution.xml
|
||||
foomatic/db/source/opt/foo2xqx-Density.xml
|
||||
foomatic/db/source/opt/foo2xqx-Duplex.xml
|
||||
foomatic/db/source/opt/foo2xxx-Halftone.xml
|
||||
foomatic/db/source/opt/foo2xqx-InputSlot.xml
|
||||
foomatic/db/source/opt/foo2xqx-MediaType.xml
|
||||
foomatic/db/source/opt/foo2xqx-Resolution.xml
|
||||
@ -174,6 +215,13 @@ foomatic/db/source/opt/foo2zjs-MediaType.xml
|
||||
foomatic/db/source/opt/foo2zjs-PageSize.xml
|
||||
foomatic/db/source/opt/foo2zjs-PrinterType.xml
|
||||
foomatic/db/source/opt/foo2zjs-Resolution.xml
|
||||
foomatic/db/source/opt/foo2zjs-z1-MediaType.xml
|
||||
foomatic/db/source/opt/foo2zjs-z1-PageSize.xml
|
||||
foomatic/db/source/opt/foo2zjs-z12-Density.xml
|
||||
foomatic/db/source/opt/foo2zjs-z2-MediaType.xml
|
||||
foomatic/db/source/opt/foo2zjs-z2-PageSize.xml
|
||||
foomatic/db/source/opt/foo2zjs-z3-MediaType.xml
|
||||
foomatic/db/source/opt/foo2zjs-z3-PageSize.xml
|
||||
%%PORTDOCS%%@dirrm %%DOCSDIR%%
|
||||
@dirrmtry foomatic/db/source/printer
|
||||
@dirrmtry foomatic/db/source/opt
|
||||
@ -183,6 +231,8 @@ foomatic/db/source/opt/foo2zjs-Resolution.xml
|
||||
@dirrmtry %%DATADIR%%/icm
|
||||
@dirrmtry %%DATADIR%%/firmware
|
||||
@dirrmtry %%DATADIR%%/crd
|
||||
@dirrmtry share/cups/model
|
||||
@dirrmtry share/cups
|
||||
@unexec rmdir %D/%%DATADIR%% 2>/dev/null || echo "Note: %D/%%DATADIR%%: icm and firmware directories not empty, remove it manually"
|
||||
@dirrmtry share/foo2oak/icm
|
||||
@unexec rmdir %D/share/foo2oak 2>/dev/null || echo "Note: %D/share/foo2oak: icm directory not empty, remove it manually"
|
||||
|
Loading…
Reference in New Issue
Block a user