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

Update to foo2zjs-20201003.

This commit is contained in:
ajacoutot 2022-08-10 09:41:49 +00:00
parent 9d5f6c2fa0
commit 865a35dfeb
11 changed files with 315 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
print/foo2zjs/Makefile
View File

@ -1,22 +1,22 @@
COMMENT= driver for ZjStream wire protocol compatible printers
VERSION= 20200610
VERSION= 20201003
DISTNAME= foo2zjs-${VERSION}
CATEGORIES= print
HOMEPAGE= http://foo2zjs.rkkda.com/
# http://foo2zjs.rkkda.com/ seems dead
HOMEPAGE= https://www.openprinting.org/driver/foo2zjs
MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
# GPLv2
PERMIT_PACKAGE= Yes
WANTLIB += c cups m pthread
WANTLIB += c cups jbig m pthread
# unversioned distfile
# http://foo2zjs.rkkda.com/foo2zjs.tar.gz
MASTER_SITES= https://distfiles.bsdfrog.org/
# most patches are also from Fedora
MASTER_SITES= https://src.fedoraproject.org/repo/pkgs/foo2zjs/${DISTFILES}/sha512/786ddac87e75bb8515ca4afbffdb39e1fad133403d2ffbca5bd615744c9e2bbd6ac2ec4746b86f24b1523aeb3e25c53d798e41b578aa514546a9db0745ac7b3c/
USE_GMAKE= Yes
@ -24,7 +24,8 @@ WRKDIST= ${WRKDIR}/foo2zjs
BUILD_DEPENDS= print/ghostscript/gnu # ps2pdf
LIB_DEPENDS= print/cups,-libs
LIB_DEPENDS= graphics/jbigkit \
print/cups,-libs
# foomatic-rip(1), foomatic-db(-engine)
RUN_DEPENDS += print/cups-filters
@ -46,7 +47,7 @@ post-patch:
pre-configure:
sed -i 's,/usr/bin,${PREFIX}/bin,g' \
${WRKSRC}/*.1in
${SUBST_CMD} ${WRKSRC}/getweb.in
${SUBST_CMD} ${WRKSRC}/Makefile ${WRKSRC}/getweb.in
post-install:
${INSTALL_SCRIPT} ${WRKSRC}/{getweb,msexpand} \

4
print/foo2zjs/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (foo2zjs-20200610.tar.gz) = jyJtbkxzj1oQqCzYXPvwllf9zM342aKb1sa2iqyoiyo=
SIZE (foo2zjs-20200610.tar.gz) = 1778136
SHA256 (foo2zjs-20201003.tar.gz) = jyJtbkxzj1oQqCzYXPvwllf9zM342aKb1sa2iqyoiyo=
SIZE (foo2zjs-20201003.tar.gz) = 1778136

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

@ -29,7 +29,18 @@ Index: Makefile
# User ID's
LPuid=-oroot
@@ -253,9 +248,9 @@ FILES = \
@@ -128,10 +123,6 @@ FILES = \
Makefile \
foo2zjs.c \
foo2zjs.1in \
- jbig.c \
- jbig.h \
- jbig_ar.c \
- jbig_ar.h \
zjsdecode.c \
zjsdecode.1in \
zjs.h \
@@ -253,9 +244,9 @@ FILES = \
$(NULL)
# CUPS vars
@ -42,7 +53,16 @@ Index: Makefile
# hpclj2600n-0.icm km2430_0.icm km2430_1.icm km2430_2.icm samclp300-0.icm
# sihp1000.img sihp1005.img sihp1020.img sihp1018.img
@@ -305,7 +300,7 @@ endif
@@ -296,7 +287,7 @@ MANPAGES+= foo2ddst-wrapper.1 foo2ddst.1 ddstdecode.1
MANPAGES+= gipddecode.1
MANPAGES+= foo2zjs-pstops.1 arm2hpdl.1 usb_printerid.1
MANPAGES+= printer-profile.1
-LIBJBG = jbig.o jbig_ar.o
+LIBJBG = -L${LOCALBASE}/lib -ljbig
BINPROGS=
ifeq ($(UNAME),Linux)
@@ -305,7 +296,7 @@ endif
# Compiler flags
#CFLAGS += -O2 -Wall -Wno-unused-but-set-variable
@ -51,7 +71,7 @@ Index: Makefile
#CFLAGS += -g
#
@@ -447,16 +442,6 @@ all-test:
@@ -447,16 +438,6 @@ all-test:
echo " ***"; \
exit 1; \
fi
@ -68,7 +88,105 @@ Index: Makefile
ifeq ($(UNAME),Darwin)
@if ! type gsed >/dev/null 2>&1; then \
echo " ***"; \
@@ -635,7 +620,7 @@ zjsdecode: zjsdecode.o $(LIBJBG)
@@ -482,34 +463,34 @@ all-done:
@echo "yourself."
-foo2ddst: foo2ddst.o $(LIBJBG)
+foo2ddst: foo2ddst.o
$(CC) $(CFLAGS) -o $@ foo2ddst.o $(LIBJBG)
-foo2hbpl2: foo2hbpl2.o $(LIBJBG)
+foo2hbpl2: foo2hbpl2.o
$(CC) $(CFLAGS) -o $@ foo2hbpl2.o $(LIBJBG)
-foo2hp: foo2hp.o $(LIBJBG)
+foo2hp: foo2hp.o
$(CC) $(CFLAGS) -o $@ foo2hp.o $(LIBJBG)
-foo2hiperc: foo2hiperc.o $(LIBJBG)
+foo2hiperc: foo2hiperc.o
$(CC) $(CFLAGS) -o $@ foo2hiperc.o $(LIBJBG)
-foo2lava: foo2lava.o $(LIBJBG)
+foo2lava: foo2lava.o
$(CC) $(CFLAGS) -o $@ foo2lava.o $(LIBJBG)
-foo2oak: foo2oak.o $(LIBJBG)
+foo2oak: foo2oak.o
$(CC) $(CFLAGS) -o $@ foo2oak.o $(LIBJBG)
-foo2qpdl: foo2qpdl.o $(LIBJBG)
+foo2qpdl: foo2qpdl.o
$(CC) $(CFLAGS) -o $@ foo2qpdl.o $(LIBJBG)
-foo2slx: foo2slx.o $(LIBJBG)
+foo2slx: foo2slx.o
$(CC) $(CFLAGS) -o $@ foo2slx.o $(LIBJBG)
-foo2xqx: foo2xqx.o $(LIBJBG)
+foo2xqx: foo2xqx.o
$(CC) $(CFLAGS) -o $@ foo2xqx.o $(LIBJBG)
-foo2zjs: foo2zjs.o $(LIBJBG)
+foo2zjs: foo2zjs.o
$(CC) $(CFLAGS) -o $@ foo2zjs.o $(LIBJBG)
@@ -595,47 +576,47 @@ ifeq ($(UNAME),Darwin)
cd osx-hotplug; $(MAKE) all
endif
-ok: ok.o $(LIBJBG)
+ok: ok.o
$(CC) $(CFLAGS) ok.o $(LIBJBG) -o $@
-ddstdecode: ddstdecode.o $(LIBJBG)
+ddstdecode: ddstdecode.o
$(CC) $(CFLAGS) ddstdecode.o $(LIBJBG) -o $@
-gipddecode: gipddecode.o $(LIBJBG)
+gipddecode: gipddecode.o
$(CC) $(CFLAGS) gipddecode.o $(LIBJBG) -o $@
-hbpldecode: hbpldecode.o $(LIBJBG)
+hbpldecode: hbpldecode.o
$(CC) $(CFLAGS) hbpldecode.o $(LIBJBG) -o $@
-hipercdecode: hipercdecode.o $(LIBJBG)
+hipercdecode: hipercdecode.o
$(CC) $(CFLAGS) hipercdecode.o $(LIBJBG) -o $@
-lavadecode: lavadecode.o $(LIBJBG)
+lavadecode: lavadecode.o
$(CC) $(CFLAGS) lavadecode.o $(LIBJBG) -o $@
-oakdecode: oakdecode.o $(LIBJBG)
+oakdecode: oakdecode.o
$(CC) $(CFLAGS) -g oakdecode.o $(LIBJBG) -o $@
-opldecode: opldecode.o $(LIBJBG)
+opldecode: opldecode.o
$(CC) $(CFLAGS) -g opldecode.o $(LIBJBG) -o $@
-qpdldecode: qpdldecode.o $(LIBJBG)
+qpdldecode: qpdldecode.o
$(CC) $(CFLAGS) qpdldecode.o $(LIBJBG) -o $@
-splcdecode: splcdecode.o $(LIBJBG)
+splcdecode: splcdecode.o
$(CC) $(CFLAGS) splcdecode.o $(LIBJBG) -lz -o $@
-slxdecode: slxdecode.o $(LIBJBG)
+slxdecode: slxdecode.o
$(CC) $(CFLAGS) slxdecode.o $(LIBJBG) -o $@
-xqxdecode: xqxdecode.o $(LIBJBG)
+xqxdecode: xqxdecode.o
$(CC) $(CFLAGS) xqxdecode.o $(LIBJBG) -o $@
-zjsdecode: zjsdecode.o $(LIBJBG)
+zjsdecode: zjsdecode.o
$(CC) $(CFLAGS) zjsdecode.o $(LIBJBG) -o $@
command2foo2lava-pjl: command2foo2lava-pjl.o
@ -77,7 +195,7 @@ Index: Makefile
command2foo2lava-pjl.o: command2foo2lava-pjl.c
$(CC) $(CFLAGS) -I/usr/local/include -c command2foo2lava-pjl.c
@@ -643,9 +628,8 @@ command2foo2lava-pjl.o: command2foo2lava-pjl.c
@@ -643,9 +624,8 @@ command2foo2lava-pjl.o: command2foo2lava-pjl.c
#
# Installation rules
#
@ -88,7 +206,7 @@ Index: Makefile
install-man install-doc install-aa
#
# If you use CUPS, then restart the spooler:
@@ -706,11 +690,6 @@ install-prog:
@@ -706,11 +686,6 @@ install-prog:
$(INSTALL) -d $(SHAREZJS)/
$(INSTALL) -c -m 644 gamma.ps $(SHAREZJS)/
$(INSTALL) -c -m 644 gamma-lookup.ps $(SHAREZJS)/
@ -100,7 +218,7 @@ Index: Makefile
install-foo:
#
@@ -729,24 +708,14 @@ install-foo:
@@ -729,24 +704,14 @@ install-foo:
#
# Install current database files
#
@ -127,7 +245,7 @@ Index: Makefile
#
# Clear foomatic cache and rebuild database if needed
#
@@ -890,7 +859,7 @@ install-extra:
@@ -890,7 +855,7 @@ install-extra:
done
MODEL=$(PREFIX)/share/cups/model
@ -136,7 +254,7 @@ Index: Makefile
MACMODEL=/Library/Printers/PPDs/Contents/Resources
PPD=$(PREFIX)/share/ppd
VARPPD=/var/lp/ppd
@@ -898,44 +867,8 @@ install-ppd:
@@ -898,44 +863,8 @@ install-ppd:
#
# Install PPD files for CUPS
#
@ -183,7 +301,67 @@ Index: Makefile
rm -f $(LOCALMODEL)/KonicaMinolta*; \
cd PPD; \
for ppd in *.ppd; do \
@@ -1631,11 +1564,8 @@ install-doc: doc
@@ -1258,7 +1187,7 @@ clean:
-rm -f $(PROGS) $(BINPROGS) $(SHELLS)
-rm -f *.zc *.zm *.zm1
-rm -f xxx.* xxxomatic
- -rm -f foo2zjs.o jbig.o jbig_ar.o zjsdecode.o foo2hp.o
+ -rm -f foo2zjs.o zjsdecode.o foo2hp.o
-rm -f foo2oak.o oakdecode.o
-rm -f foo2xqx.o xqxdecode.o
-rm -f foo2lava.o lavadecode.o
@@ -1288,30 +1217,28 @@ clean:
#
# Header dependencies
#
-jbig.o: jbig.h
+foo2ddst.o: ddst.h
+foo2hiperc.o: hiperc.h
+foo2hp.o: zjs.h cups.h
+foo2hbpl2.o: hbpl.h
+foo2lava.o:
+foo2oak.o: oak.h
+foo2qpdl.o: qpdl.h
+foo2slx.o: slx.h
+foo2xqx.o: xqx.h
+foo2zjs.o: zjs.h
-foo2ddst.o: jbig.h ddst.h
-foo2hiperc.o: jbig.h hiperc.h
-foo2hp.o: jbig.h zjs.h cups.h
-foo2hbpl2.o: jbig.h hbpl.h
-foo2lava.o: jbig.h
-foo2oak.o: jbig.h oak.h
-foo2qpdl.o: jbig.h qpdl.h
-foo2slx.o: jbig.h slx.h
-foo2xqx.o: jbig.h xqx.h
-foo2zjs.o: jbig.h zjs.h
+ddstdecode.o: ddst.h
+gipddecode.o: slx.h
+hbpldecode.o:
+hipercdecode.o: hiperc.h
+lavadecode.o:
+opldecode.o:
+qpdldecode.o:
+slxdecode.o: slx.h
+xqxdecode.o: xqx.h
+zjsdecode.o: zjs.h
-ddstdecode.o: ddst.h jbig.h
-gipddecode.o: slx.h jbig.h
-hbpldecode.o: jbig.h
-hipercdecode.o: hiperc.h jbig.h
-lavadecode.o: jbig.h
-opldecode.o: jbig.h
-qpdldecode.o: jbig.h
-slxdecode.o: slx.h jbig.h
-xqxdecode.o: xqx.h jbig.h
-zjsdecode.o: jbig.h zjs.h
-
#
# foo2* Regression tests
#
@@ -1631,11 +1558,8 @@ install-doc: doc
#
$(INSTALL) -d -m 755 $(DOCDIR)
$(INSTALL) -c -m 644 manual.pdf $(DOCDIR)

11
print/foo2zjs/patches/patch-PPD_Minolta-magicolor_2300_DL_ppd Normal file
View File

@ -0,0 +1,11 @@
Index: PPD/Minolta-magicolor_2300_DL.ppd
--- PPD/Minolta-magicolor_2300_DL.ppd.orig
+++ PPD/Minolta-magicolor_2300_DL.ppd
@@ -61,6 +61,7 @@
*Throughput: "1"
*LandscapeOrientation: Plus90
*TTRasterizer: Type42
+*1284DeviceID: "MANUFACTURER:KONICA MINOLTA;MODEL:magicolor 2300 DL;COMMAND SET:ZJS,PJL;DRV:Dfoo2zjs,R1,M0,TF;"
*1284DeviceID: "MANUFACTURER:MINOLTA-QMS;MODEL:magicolor 2300 DL;COMMAND SET:ZJS,PJL;DRV:Dfoo2zjs,R1,M0,TF;"
*driverName foo2zjs: ""

11
print/foo2zjs/patches/patch-PPD_Minolta-magicolor_2430_DL_ppd Normal file
View File

@ -0,0 +1,11 @@
Index: PPD/Minolta-magicolor_2430_DL.ppd
--- PPD/Minolta-magicolor_2430_DL.ppd.orig
+++ PPD/Minolta-magicolor_2430_DL.ppd
@@ -61,6 +61,7 @@
*Throughput: "1"
*LandscapeOrientation: Plus90
*TTRasterizer: Type42
+*1284DeviceID: "MANUFACTURER:KONICA MINOLTA;MODEL:magicolor 2430 DL;COMMAND SET:ZJS,PJL;DRV:Dfoo2zjs,R1,M0,TF;"
*1284DeviceID: "MANUFACTURER:MINOLTA-QMS;MODEL:magicolor 2430 DL;COMMAND SET:ZJS,PJL;DRV:Dfoo2zjs,R1,M0,TF;"
*driverName foo2zjs: ""

11
print/foo2zjs/patches/patch-PPD_Xerox-WorkCentre_3045_ppd Normal file
View File

@ -0,0 +1,11 @@
Index: PPD/Xerox-WorkCentre_3045.ppd
--- PPD/Xerox-WorkCentre_3045.ppd.orig
+++ PPD/Xerox-WorkCentre_3045.ppd
@@ -61,6 +61,7 @@
*Throughput: "1"
*LandscapeOrientation: Plus90
*TTRasterizer: Type42
+*1284DeviceID: "MFG:Xerox;CMD:HBPL;MDL:WorkCentre 3045B;CLS:Printer;DES:Xerox WorkCentre 3045B;"
*1284DeviceID: "DRV:Dfoo2hbpl2,R1,M0,TF;"
*driverName foo2hbpl2: ""

21
print/foo2zjs/patches/patch-foomatic-db_printer_Minolta-magicolor_2300_DL_xml Normal file
View File

@ -0,0 +1,21 @@
Index: foomatic-db/printer/Minolta-magicolor_2300_DL.xml
--- foomatic-db/printer/Minolta-magicolor_2300_DL.xml.orig
+++ foomatic-db/printer/Minolta-magicolor_2300_DL.xml
@@ -48,8 +48,17 @@
<model>magicolor 2300 DL</model>
<commandset>ZJS,PJL</commandset>
</parallel>
+ <parallel>
+ <ieee1284>CLASS:PRINTER;MODEL:magicolor 2300 DL;MANUFACTURER:KONICA MINOLTA;COMMAND SET:ZJS,PJL;</ieee1284>
+ <manufacturer>KONICA MINOLTA</manufacturer>
+ <model>magicolor 2300 DL</model>
+ <commandset>ZJS,PJL</commandset>
+ </parallel>
<snmp>
<description>MINOLTA-QMS magicolor 2300 DL</description>
+ </snmp>
+ <snmp>
+ <description>KONICA MINOLTA magicolor 2300 DL</description>
</snmp>
</autodetect>
<functionality>B</functionality>

21
print/foo2zjs/patches/patch-foomatic-db_printer_Minolta-magicolor_2430_DL_xml Normal file
View File

@ -0,0 +1,21 @@
Index: foomatic-db/printer/Minolta-magicolor_2430_DL.xml
--- foomatic-db/printer/Minolta-magicolor_2430_DL.xml.orig
+++ foomatic-db/printer/Minolta-magicolor_2430_DL.xml
@@ -46,8 +46,17 @@
<model>magicolor 2430 DL</model>
<commandset>ZJS,PJL</commandset>
</parallel>
+ <parallel>
+ <ieee1284>CLASS:PRINTER;MODEL:magicolor 2430 DL;MANUFACTURER:KONICA MINOLTA;COMMAND SET:ZJS,PJL;</ieee1284>
+ <manufacturer>KONICA MINOLTA</manufacturer>
+ <model>magicolor 2430 DL</model>
+ <commandset>ZJS,PJL</commandset>
+ </parallel>
<snmp>
<description>MINOLTA-QMS magicolor 2430 DL</description>
+ </snmp>
+ <snmp>
+ <description>KONICA MINOLTA magicolor 2430 DL</description>
</snmp>
</autodetect>
<functionality>B</functionality>

17
print/foo2zjs/patches/patch-foomatic-db_printer_Xerox-WorkCentre_3045_xml Normal file
View File

@ -0,0 +1,17 @@
Index: foomatic-db/printer/Xerox-WorkCentre_3045.xml
--- foomatic-db/printer/Xerox-WorkCentre_3045.xml.orig
+++ foomatic-db/printer/Xerox-WorkCentre_3045.xml
@@ -55,6 +55,13 @@
<snmp>
<description>Xerox WorkCentre 3045</description>
</snmp>
+ <usb>
+ <ieee1284>MFG:Xerox;CMD:HBPL;MDL:WorkCentre 3045B;CLS:Printer;DES:Xerox WorkCentre 3045B;</ieee1284>
+ <manufacturer>Xerox</manufacturer>
+ <model>WorkCentre 3045B</model>
+ <commandset>HBPL</commandset>
+ <description>Xerox WorkCentre 3045B</description>
+ </usb>
</autodetect>
<functionality>C</functionality>
<driver>foo2hbpl2</driver>

2
print/foo2zjs/patches/patch-getweb_in
View File

@ -3,7 +3,7 @@ Index: getweb.in
+++ getweb.in
@@ -11,7 +11,7 @@
VERSION='20200610'
VERSION='20201003'
-WGETOPTS="--passive-ftp -q"
+WGETOPTS="-V"

23
print/foo2zjs/patches/patch-icc2ps_foo2zjs-icc2ps_1in Normal file
View File

@ -0,0 +1,23 @@
Index: icc2ps/foo2zjs-icc2ps.1in
--- icc2ps/foo2zjs-icc2ps.1in.orig
+++ icc2ps/foo2zjs-icc2ps.1in
@@ -27,7 +27,7 @@ Input profile: Generates Color Space Array (CSA).
Alternate way to set precision, number of CLUT points (CRD only)
.TP
.BI \-o\ profile
-.p
+.P
Output profile: Generates Color Rendering Dictionary(CRD).
.TP
.B \-t <0,1,2,3>
@@ -48,7 +48,7 @@ Do NOT generate resource name on CRD.
Rick Richardson <rick.richardson@comcast.net>
.br
http://foo2zjs.rkkda.com/
-'/"
-'/"
-'/"
+'\"
+'\"
+'\"
.em pdf_outline