Update to foo2zjs-20200610.

This commit is contained in:
ajacoutot 2020-10-22 08:23:40 +00:00
parent b9205b0860
commit 84bb7e32e7
6 changed files with 23 additions and 18 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.69 2019/09/29 13:41:11 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.70 2020/10/22 08:23:40 ajacoutot Exp $
COMMENT= driver for ZjStream wire protocol compatible printers
VERSION= 20190909
VERSION= 20200610
DISTNAME= foo2zjs-${VERSION}
CATEGORIES= print

View File

@ -1,2 +1,2 @@
SHA256 (foo2zjs-20190909.tar.gz) = NUMN49FcDy52+m/72FnNby9RgmHvOXm/N3vVQgAjyNo=
SIZE (foo2zjs-20190909.tar.gz) = 1776810
SHA256 (foo2zjs-20200610.tar.gz) = jyJtbkxzj1oQqCzYXPvwllf9zM342aKb1sa2iqyoiyo=
SIZE (foo2zjs-20200610.tar.gz) = 1778136

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-Makefile,v 1.31 2019/09/29 13:41:11 ajacoutot Exp $
$OpenBSD: patch-Makefile,v 1.32 2020/10/22 08:23:40 ajacoutot Exp $
Index: Makefile
--- Makefile.orig
@ -53,7 +53,7 @@ Index: Makefile
#CFLAGS += -g
#
@@ -441,12 +436,6 @@ all-test:
@@ -447,16 +442,6 @@ all-test:
echo " ***"; \
exit 1; \
fi
@ -61,12 +61,16 @@ Index: Makefile
- echo " ***"; \
- echo " *** Error: must install GNU dc with the -e option!"; \
- echo " ***"; \
- echo " *** Install dc/bc package"; \
- echo " ***"; \
- echo " *** sudo dnf install bc OR sudo apt-get install dc"; \
- echo " ***"; \
- exit 1; \
- fi
ifeq ($(UNAME),Darwin)
@if ! type gsed >/dev/null 2>&1; then \
echo " ***"; \
@@ -625,7 +614,7 @@ zjsdecode: zjsdecode.o $(LIBJBG)
@@ -635,7 +620,7 @@ zjsdecode: zjsdecode.o $(LIBJBG)
$(CC) $(CFLAGS) zjsdecode.o $(LIBJBG) -o $@
command2foo2lava-pjl: command2foo2lava-pjl.o
@ -75,7 +79,7 @@ Index: Makefile
command2foo2lava-pjl.o: command2foo2lava-pjl.c
$(CC) $(CFLAGS) -I/usr/local/include -c command2foo2lava-pjl.c
@@ -633,9 +622,8 @@ command2foo2lava-pjl.o: command2foo2lava-pjl.c
@@ -643,9 +628,8 @@ command2foo2lava-pjl.o: command2foo2lava-pjl.c
#
# Installation rules
#
@ -86,7 +90,7 @@ Index: Makefile
install-man install-doc install-aa
#
# If you use CUPS, then restart the spooler:
@@ -694,11 +682,6 @@ install-prog:
@@ -706,11 +690,6 @@ install-prog:
$(INSTALL) -d $(SHAREZJS)/
$(INSTALL) -c -m 644 gamma.ps $(SHAREZJS)/
$(INSTALL) -c -m 644 gamma-lookup.ps $(SHAREZJS)/
@ -98,7 +102,7 @@ Index: Makefile
install-foo:
#
@@ -717,24 +700,14 @@ install-foo:
@@ -729,24 +708,14 @@ install-foo:
#
# Install current database files
#
@ -125,7 +129,7 @@ Index: Makefile
#
# Clear foomatic cache and rebuild database if needed
#
@@ -878,7 +851,7 @@ install-extra:
@@ -890,7 +859,7 @@ install-extra:
done
MODEL=$(PREFIX)/share/cups/model
@ -134,7 +138,7 @@ Index: Makefile
MACMODEL=/Library/Printers/PPDs/Contents/Resources
PPD=$(PREFIX)/share/ppd
VARPPD=/var/lp/ppd
@@ -886,44 +859,8 @@ install-ppd:
@@ -898,44 +867,8 @@ install-ppd:
#
# Install PPD files for CUPS
#
@ -181,7 +185,7 @@ Index: Makefile
rm -f $(LOCALMODEL)/KonicaMinolta*; \
cd PPD; \
for ppd in *.ppd; do \
@@ -1618,11 +1555,8 @@ install-doc: doc
@@ -1631,11 +1564,8 @@ install-doc: doc
#
$(INSTALL) -d -m 755 $(DOCDIR)
$(INSTALL) -c -m 644 manual.pdf $(DOCDIR)

View File

@ -1,5 +1,5 @@
$OpenBSD: patch-foo2zjs-pstops_sh,v 1.1 2017/11/25 17:37:46 ajacoutot Exp $
use gsed
$OpenBSD: patch-foo2zjs-pstops_sh,v 1.2 2020/10/22 08:23:40 ajacoutot Exp $
Index: foo2zjs-pstops.sh
--- foo2zjs-pstops.sh.orig
+++ foo2zjs-pstops.sh

View File

@ -1,11 +1,11 @@
$OpenBSD: patch-getweb_in,v 1.31 2019/09/29 13:41:11 ajacoutot Exp $
$OpenBSD: patch-getweb_in,v 1.32 2020/10/22 08:23:40 ajacoutot Exp $
Index: getweb.in
--- getweb.in.orig
+++ getweb.in
@@ -11,7 +11,7 @@
VERSION='20190909'
VERSION='20200610'
-WGETOPTS="--passive-ftp -q"
+WGETOPTS="-V"

View File

@ -1,4 +1,5 @@
$OpenBSD: patch-icc2ps_Makefile,v 1.4 2010/12/09 07:04:48 ajacoutot Exp $
$OpenBSD: patch-icc2ps_Makefile,v 1.5 2020/10/22 08:23:40 ajacoutot Exp $
--- icc2ps/Makefile.orig Sat Nov 27 11:04:56 2010
+++ icc2ps/Makefile Thu Dec 9 08:01:15 2010
@@ -1,15 +1,12 @@