cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to foo2zjs-20100728.

Browse Source 
Add a -cups subpackage that contains the command2foo2lava-pjl that
brings support for more features.
Unconditionally enable CUPS commands in the PPD files. Foomatic will
ignore them and CUPS will use them if there.
This commit is contained in:
ajacoutot 2010-07-31 10:31:58 +00:00
parent 89a38bc119
commit a2299e5ae4
9 changed files with 86 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
print/foo2zjs/Makefile
View File

@ -1,11 +1,13 @@
# $OpenBSD: Makefile,v 1.14 2010/07/31 08:18:56 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.15 2010/07/31 10:31:58 ajacoutot Exp $
COMMENT= driver for ZjStream wire protocol compatible printers
COMMENT-main= driver for ZjStream wire protocol compatible printers
COMMENT-cups= Konica-Minolta foo2zjs command filter for CUPS
VERSION= 20100507
VERSION= 20100728
DISTNAME= foo2zjs-${VERSION}
REVISION= 1
PKGNAME-main= ${DISTNAME}
PKGNAME-cups= foo2zjs-cup-${VERSION}
CATEGORIES= print
@ -19,25 +21,42 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c m
WANTLIB += c
MASTER_SITES= http://www.bsdfrog.org/OpenBSD/distfiles/
MULTI_PACKAGES= -main -cups
USE_GMAKE= Yes
WRKDIST= ${WRKDIR}/foo2zjs
BUILD_DEPENDS= ::print/ghostscript/gnu # ps2pdf
RUN_DEPENDS= ::print/foomatic-filters
WANTLIB-main += ${WANTLIB} m
RUN_DEPENDS-main=::print/foomatic-filters
WANTLIB-cups += ${WANTLIB} cups pthread
RUN_DEPENDS-cups=::${BASE_PKGPATH},-main
LIB_DEPENDS-cups=::print/cups
MAKE_FLAGS+= CUPS_SERVERBIN=`cups-config --serverbin`
NO_REGRESS= Yes
post-patch:
ln -sf ${WRKSRC}/modify-ppd ${WRKDIR}/bin/modify-ppd
pre-configure:
@perl -pi -e 's,/usr/bin,${PREFIX}/bin,g' \
perl -pi -e 's,/usr/bin,${PREFIX}/bin,g' \
${WRKSRC}/*.1in
perl -pi -e 's,\$\(shell ,\$\(,g' ${WRKSRC}/{,icc2ps}/Makefile
${SUBST_CMD} ${WRKSRC}/getweb.in
post-install:
${INSTALL_SCRIPT} ${WRKSRC}/{getweb,msexpand} \
${PREFIX}/share/doc/foo2zjs
${INSTALL_DATA_DIR} ${PREFIX}/libexec/cups/filter
ln -sf ${TRUEPREFIX}/bin/command2foo2lava-pjl \
${WRKINST}/${LOCALBASE}/libexec/cups/filter/
.include <bsd.port.mk>

10
print/foo2zjs/distinfo
View File

@ -1,5 +1,5 @@
MD5 (foo2zjs-20100507.tar.gz) = 47S74gxn4JShE+2PCtM+4g==
RMD160 (foo2zjs-20100507.tar.gz) = YSSRR2zMj/dM69wkdstvqsH0Gsk=
SHA1 (foo2zjs-20100507.tar.gz) = /IozE3ez3Vnk+nrClIQJeZTfm70=
SHA256 (foo2zjs-20100507.tar.gz) = kIs6YJJbDP/u2VuC0uNzlPvRPT7w4BSmmB+yVA8/3ak=
SIZE (foo2zjs-20100507.tar.gz) = 1601013
MD5 (foo2zjs-20100728.tar.gz) = Iy4/kosv90EQ7Rjvc5vP2Q==
RMD160 (foo2zjs-20100728.tar.gz) = 6XgY4UMGZ/jlBYRv2cyAweSY5Sg=
SHA1 (foo2zjs-20100728.tar.gz) = AD1V12yPHKoFupSfFr/WrYPn8yk=
SHA256 (foo2zjs-20100728.tar.gz) = HRqucYLHVI7R+JFG6vYYTdDNYHNh2dQlskQy09Ig3I4=
SIZE (foo2zjs-20100728.tar.gz) = 1616956

50
print/foo2zjs/patches/patch-Makefile
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.7 2010/07/31 08:18:56 ajacoutot Exp $
--- Makefile.orig Wed Apr 21 18:14:18 2010
+++ Makefile Sat Jul 31 09:01:57 2010
$OpenBSD: patch-Makefile,v 1.8 2010/07/31 10:31:58 ajacoutot Exp $
--- Makefile.orig Wed Jul 28 15:22:04 2010
+++ Makefile Sat Jul 31 12:02:46 2010
@@ -16,11 +16,6 @@ SYSNAME := $(shell uname -n)
# No version number yet...
VERSION=0.0
@ -13,7 +13,7 @@ $OpenBSD: patch-Makefile,v 1.7 2010/07/31 08:18:56 ajacoutot Exp $
# Pathnames for this package...
BIN=$(PREFIX)/bin
SHAREZJS=$(PREFIX)/share/foo2zjs
@@ -31,12 +26,12 @@ SHARELAVA=$(PREFIX)/share/foo2lava
@@ -31,13 +26,13 @@ SHARELAVA=$(PREFIX)/share/foo2lava
SHAREQPDL=$(PREFIX)/share/foo2qpdl
SHARESLX=$(PREFIX)/share/foo2slx
SHAREHC=$(PREFIX)/share/foo2hiperc
@ -21,6 +21,7 @@ $OpenBSD: patch-Makefile,v 1.7 2010/07/31 08:18:56 ajacoutot Exp $
+MANDIR=$(PREFIX)/man
DOCDIR=$(PREFIX)/share/doc/foo2zjs/
INSTALL=install
ROOT=root
# Pathnames for referenced packages...
-FOODB=$(DESTDIR)/usr/share/foomatic/db/source
@ -28,7 +29,7 @@ $OpenBSD: patch-Makefile,v 1.7 2010/07/31 08:18:56 ajacoutot Exp $
# User ID's
LPuid=-oroot
@@ -258,7 +253,6 @@ ifeq ($(UNAME),Linux)
@@ -270,7 +265,6 @@ ifeq ($(UNAME),Linux)
endif
# Compiler flags
@ -36,18 +37,27 @@ $OpenBSD: patch-Makefile,v 1.7 2010/07/31 08:18:56 ajacoutot Exp $
#CFLAGS += -g
#
@@ -508,9 +502,8 @@ gipddecode: gipddecode.o $(LIBJBG)
@@ -518,7 +512,7 @@ gipddecode: gipddecode.o $(LIBJBG)
$(CC) $(CFLAGS) gipddecode.o $(LIBJBG) -o $@
command2foo2lava-pjl: command2foo2lava-pjl.o
- $(CC) $(CFLAGS) -L/usr/local/lib command2foo2lava-pjl.o -lcups -o $@
+ $(CC) $(CFLAGS) -L/usr/local/lib command2foo2lava-pjl.o -pthread -lcups -o $@
command2foo2lava-pjl.o: command2foo2lava-pjl.c
$(CC) $(CFLAGS) -I/usr/local/include -c command2foo2lava-pjl.c
@@ -526,9 +520,8 @@ command2foo2lava-pjl.o: command2foo2lava-pjl.c
#
# Installation rules
#
-install: all install-test install-prog install-icc2ps install-extra \
+install: all install-prog install-icc2ps install-extra \
install-crd install-foo install-ppd \
- install-gui install-desktop \
- install-gui install-desktop install-filter \
install-man install-doc
#
# If you use CUPS, then restart the spooler:
@@ -567,11 +560,6 @@ install-prog:
@@ -585,11 +578,6 @@ install-prog:
$(INSTALL) -d $(SHAREZJS)/
$(INSTALL) -c -m 644 gamma.ps $(SHAREZJS)/
$(INSTALL) -c -m 644 gamma-lookup.ps $(SHAREZJS)/
@ -59,7 +69,7 @@ $OpenBSD: patch-Makefile,v 1.7 2010/07/31 08:18:56 ajacoutot Exp $
install-foo:
#
@@ -589,24 +577,14 @@ install-foo:
@@ -607,24 +595,14 @@ install-foo:
#
# Install current database files
#
@ -86,7 +96,7 @@ $OpenBSD: patch-Makefile,v 1.7 2010/07/31 08:18:56 ajacoutot Exp $
#
# Clear foomatic cache and rebuild database if needed
#
@@ -728,49 +706,21 @@ install-extra:
@@ -746,46 +724,15 @@ install-extra:
done
MODEL=$(DESTDIR)/usr/share/cups/model
@ -98,13 +108,14 @@ $OpenBSD: patch-Makefile,v 1.7 2010/07/31 08:18:56 ajacoutot Exp $
#
# Install PPD files for CUPS
#
- export PATH=$$PATH:`pwd`:; \
- if [ -x /usr/sbin/ppdmgr -a -s $(VARPPD)/ppdcache ]; then \
- $(INSTALL) $(LPgid) -d $(VARPPD)/user; \
- cd PPD; \
- for ppd in *.ppd; do \
- manuf=`echo "$$ppd" | sed 's/-.*//'`; \
- $(INSTALL) $(LPgid) -d $(VARPPD)/user/$$manuf; \
- gzip < $$ppd > $(VARPPD)/user/$$manuf/$$ppd.gz; \
- modify-ppd <$$ppd | gzip > $(VARPPD)/user/$$manuf/$$ppd.gz; \
- done; \
- ppdmgr -u; \
- elif [ -d $(PPD) ]; then \
@ -118,14 +129,16 @@ $OpenBSD: patch-Makefile,v 1.7 2010/07/31 08:18:56 ajacoutot Exp $
- [ -d $(PPD)/foo2zjs ] || mkdir $(PPD)/foo2zjs; \
- cd PPD; \
- for ppd in *.ppd; do \
- gzip < $$ppd > $(PPD)/foo2zjs/$$ppd.gz; \
- modify-ppd <$$ppd | gzip > $(PPD)/foo2zjs/$$ppd.gz; \
- done; \
- fi
- #
- export PATH=$$PATH:`pwd`:; \
- if [ -d $(MODEL) ]; then \
- rm -f $(MODEL)/KonicaMinolta*; \
- cd PPD; \
- for ppd in *.ppd; do \
- gzip < $$ppd > $(MODEL)/$$ppd.gz; \
- modify-ppd <$$ppd | gzip > $(MODEL)/$$ppd.gz; \
- done; \
- elif [ -d $(LOCALMODEL) ]; then \
+ mkdir -p $(LOCALMODEL)
@ -133,16 +146,7 @@ $OpenBSD: patch-Makefile,v 1.7 2010/07/31 08:18:56 ajacoutot Exp $
rm -f $(LOCALMODEL)/KonicaMinolta*; \
cd PPD; \
for ppd in *.ppd; do \
- gzip < $$ppd > $(LOCALMODEL)/$$ppd.gz; \
- done; \
- fi
+ gzip < $$ppd > $(LOCALMODEL)/$$ppd.gz; \
+ done; \
+ fi
APPL=$(DESTDIR)/usr/share/applications
OLDAPPL=$(DESTDIR)/usr/share/gnome/apps/System
@@ -1264,11 +1214,8 @@ install-doc: doc
@@ -1308,11 +1255,8 @@ install-doc: doc
#
$(INSTALL) -d -m 755 $(DOCDIR)
$(INSTALL) -c -m 644 manual.pdf $(DOCDIR)

12
print/foo2zjs/patches/patch-icc2ps_Makefile
View File

@ -1,17 +1,17 @@
$OpenBSD: patch-icc2ps_Makefile,v 1.2 2009/08/03 13:10:09 giovanni Exp $
--- icc2ps/Makefile.orig Sun Mar 1 23:04:53 2009
+++ icc2ps/Makefile Sun Jul 19 13:00:16 2009
@@ -1,11 +1,11 @@
$OpenBSD: patch-icc2ps_Makefile,v 1.3 2010/07/31 10:31:58 ajacoutot Exp $
--- icc2ps/Makefile.orig Wed Jul 28 14:13:19 2010
+++ icc2ps/Makefile Sat Jul 31 11:09:12 2010
@@ -1,12 +1,10 @@
UNAME := $(shell uname)
-PREFIX= /usr
+
BIN= $(PREFIX)/bin
-MANDIR=$(PREFIX)/share/man
+MANDIR=$(PREFIX)/man
SRC= icc2ps.c xgetopt.c
LIB= cmscam97.c cmscnvrt.c cmserr.c cmsgamma.c cmsgmt.c cmsintrp.c cmsio1.c \
cmslut.c cmsmatsh.c cmsmtrx.c cmsnamed.c cmspack.c cmspcs.c cmsps2.c \
cmssamp.c cmswtpnt.c cmsxform.c cmsio0.c cmsvirt.c
-CFLAGS= -O3
+
INSTALL=install
ifeq ($(UNAME),SunOS)
INSTALL=/usr/ucb/install

6
print/foo2zjs/pkg/DESCR-cups Normal file
View File

@ -0,0 +1,6 @@
foo2zjs is an open source printer driver for printers that use the
Zenographics ZjStream wire protocol for their print data, such as the
Minolta/QMS magicolor 2300 DL or Konica Minolta magicolor 2430 DL.
This package contains the Konica-Minolta command filter for the Common
UNIX Printing System.

0
print/foo2zjs/pkg/DESCR → print/foo2zjs/pkg/DESCR-main
View File

0
print/foo2zjs/pkg/MESSAGE → print/foo2zjs/pkg/MESSAGE-main
View File

3
print/foo2zjs/pkg/PLIST-cups Normal file
View File

@ -0,0 +1,3 @@
@comment $OpenBSD: PLIST-cups,v 1.1 2010/07/31 10:31:58 ajacoutot Exp $
@bin bin/command2foo2lava-pjl
libexec/cups/filter/command2foo2lava-pjl

14
print/foo2zjs/pkg/PLIST → print/foo2zjs/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.7 2010/07/31 08:18:56 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.1 2010/07/31 10:31:58 ajacoutot Exp $
@conflict foomatic-db-<4.0.20091207p1
@bin bin/arm2hpdl
@bin bin/foo2hiperc
@ -44,9 +44,11 @@ bin/printer-profile
@man man/man1/foo2slx.1
@man man/man1/foo2xqx-wrapper.1
@man man/man1/foo2xqx.1
@man man/man1/foo2zjs-icc2ps.1
@man man/man1/foo2zjs-pstops.1
@man man/man1/foo2zjs-wrapper.1
@man man/man1/foo2zjs.1
@man man/man1/gipddecode.1
@man man/man1/hipercdecode.1
@man man/man1/lavadecode.1
@man man/man1/oakdecode.1
@ -149,6 +151,7 @@ share/foomatic/db/source/PPD/foo2zjs/Minolta-Color_PageWorks_Pro_L.ppd.gz
share/foomatic/db/source/PPD/foo2zjs/Minolta-magicolor_2200_DL.ppd.gz
share/foomatic/db/source/PPD/foo2zjs/Minolta-magicolor_2300_DL.ppd.gz
share/foomatic/db/source/PPD/foo2zjs/Minolta-magicolor_2430_DL.ppd.gz
share/foomatic/db/source/PPD/foo2zjs/Oki-C110.ppd.gz
share/foomatic/db/source/PPD/foo2zjs/Oki-C3100.ppd.gz
share/foomatic/db/source/PPD/foo2zjs/Oki-C3200.ppd.gz
share/foomatic/db/source/PPD/foo2zjs/Oki-C3300.ppd.gz
@ -180,6 +183,8 @@ share/foomatic/db/source/driver/foo2oak.xml
share/foomatic/db/source/driver/foo2qpdl.xml
share/foomatic/db/source/driver/foo2slx.xml
share/foomatic/db/source/driver/foo2xqx.xml
share/foomatic/db/source/driver/foo2zjs-z1.xml
share/foomatic/db/source/driver/foo2zjs-z2.xml
share/foomatic/db/source/driver/foo2zjs.xml
share/foomatic/db/source/opt/
share/foomatic/db/source/opt/foo2hiperc-ColorMode.xml
@ -229,6 +234,7 @@ share/foomatic/db/source/opt/foo2slx-InputSlot.xml
share/foomatic/db/source/opt/foo2slx-MediaType.xml
share/foomatic/db/source/opt/foo2slx-PageSize.xml
share/foomatic/db/source/opt/foo2slx-Resolution.xml
share/foomatic/db/source/opt/foo2xqx-Density.xml
share/foomatic/db/source/opt/foo2xqx-Duplex.xml
share/foomatic/db/source/opt/foo2xqx-InputSlot.xml
share/foomatic/db/source/opt/foo2xqx-MediaType.xml
@ -246,6 +252,11 @@ share/foomatic/db/source/opt/foo2zjs-MediaType.xml
share/foomatic/db/source/opt/foo2zjs-PageSize.xml
share/foomatic/db/source/opt/foo2zjs-PrinterType.xml
share/foomatic/db/source/opt/foo2zjs-Resolution.xml
share/foomatic/db/source/opt/foo2zjs-z1-MediaType.xml
share/foomatic/db/source/opt/foo2zjs-z1-PageSize.xml
share/foomatic/db/source/opt/foo2zjs-z12-Density.xml
share/foomatic/db/source/opt/foo2zjs-z2-MediaType.xml
share/foomatic/db/source/opt/foo2zjs-z2-PageSize.xml
share/foomatic/db/source/printer/
share/foomatic/db/source/printer/Generic-OAKT_Printer.xml
share/foomatic/db/source/printer/Generic-ZjStream_Printer.xml
@ -289,6 +300,7 @@ share/foomatic/db/source/printer/Minolta-Color_PageWorks_Pro_L.xml
share/foomatic/db/source/printer/Minolta-magicolor_2200_DL.xml
share/foomatic/db/source/printer/Minolta-magicolor_2300_DL.xml
share/foomatic/db/source/printer/Minolta-magicolor_2430_DL.xml
share/foomatic/db/source/printer/Oki-C110.xml
share/foomatic/db/source/printer/Oki-C3100.xml
share/foomatic/db/source/printer/Oki-C3200.xml
share/foomatic/db/source/printer/Oki-C3300.xml