Update to foo2zjs-20111202.

This commit is contained in:
ajacoutot 2011-12-04 17:43:54 +00:00
parent 13f8137926
commit 52ec370b48
3 changed files with 28 additions and 24 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.30 2011/10/22 23:00:31 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.31 2011/12/04 17:43:54 ajacoutot Exp $
COMMENT-main= driver for ZjStream wire protocol compatible printers
COMMENT-cups= Konica-Minolta foo2zjs command filter for CUPS
VERSION= 20111020
VERSION= 20111202
DISTNAME= foo2zjs-${VERSION}
PKGNAME-main= ${DISTNAME}

View File

@ -1,5 +1,5 @@
MD5 (foo2zjs-20111020.tar.gz) = XAEG/ouVouTFRXClT+ns3g==
RMD160 (foo2zjs-20111020.tar.gz) = +0wUSwDIN5jRCYFuK0w2YWoe1Rc=
SHA1 (foo2zjs-20111020.tar.gz) = 14zyh5J10G33b8Pi7g6r4PnlbcQ=
SHA256 (foo2zjs-20111020.tar.gz) = lolDPoZn4Ubn1Bcn046QYaC1G+BJRmvKbssqDu5Z7ic=
SIZE (foo2zjs-20111020.tar.gz) = 1642315
MD5 (foo2zjs-20111202.tar.gz) = ZaGUMAziy0r/TVsJgdpVSQ==
RMD160 (foo2zjs-20111202.tar.gz) = ir9S4i0uYxK+xBBW+MO9LOP6Mxk=
SHA1 (foo2zjs-20111202.tar.gz) = Cx0Dr54rEgdRng5nyMB0X9Qfb8g=
SHA256 (foo2zjs-20111202.tar.gz) = 6Vuwn52gJFREEHTmH0Cc1PK43Y3u5lKtwSyffNkVAs4=
SIZE (foo2zjs-20111202.tar.gz) = 1643647

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.14 2011/10/22 23:00:31 ajacoutot Exp $
--- Makefile.orig Sun Jul 31 15:28:43 2011
+++ Makefile Sun Oct 23 00:55:25 2011
$OpenBSD: patch-Makefile,v 1.15 2011/12/04 17:43:54 ajacoutot Exp $
--- Makefile.orig Sat Dec 3 04:43:14 2011
+++ Makefile Sun Dec 4 18:36:16 2011
@@ -16,11 +16,6 @@ SYSNAME := $(shell uname -n)
# No version number yet...
VERSION=0.0
@ -29,16 +29,20 @@ $OpenBSD: patch-Makefile,v 1.14 2011/10/22 23:00:31 ajacoutot Exp $
# User ID's
LPuid=-oroot
@@ -241,7 +236,7 @@ FILES = \
# sihp1000.img sihp1005.img sihp1020.img sihp1018.img
# sihpP1005.img sihpP1006.img sihpP1505.img
@@ -236,9 +231,9 @@ FILES = \
$(NULL)
-CUPS_DEVEL := $(shell ls /usr/include/cups/sidechannel.h 2>/dev/null)
# CUPS vars
-CUPS_SERVERBIN := $(shell cups-config --serverbin 2>/dev/null)
-CUPS_DEVEL := $(shell grep cupsSideChannelDoRequest /usr/include/cups/sidechannel.h 2>/dev/null)
-CUPS_GOODAPI := $(shell cups-config --api-version 2>/dev/null | sed "s/1\.[0123].*//")
+CUPS_SERVERBIN := 1
+CUPS_DEVEL := 1
+CUPS_GOODAPI := 1
# Programs and libraries
PROGS= foo2zjs zjsdecode arm2hpdl foo2hp foo2xqx xqxdecode
@@ -282,7 +277,7 @@ endif
# hpclj2600n-0.icm km2430_0.icm km2430_1.icm km2430_2.icm samclp300-0.icm
# sihp1000.img sihp1005.img sihp1020.img sihp1018.img
@@ -285,7 +280,7 @@ endif
# Compiler flags
#CFLAGS += -O2 -Wall -Wno-unused-but-set-variable
@ -47,7 +51,7 @@ $OpenBSD: patch-Makefile,v 1.14 2011/10/22 23:00:31 ajacoutot Exp $
#CFLAGS += -g
#
@@ -406,12 +401,6 @@ all-test:
@@ -409,12 +404,6 @@ all-test:
echo " ***"; \
exit 1; \
fi
@ -60,7 +64,7 @@ $OpenBSD: patch-Makefile,v 1.14 2011/10/22 23:00:31 ajacoutot Exp $
ifeq ($(UNAME),Darwin)
@if ! type gsed >/dev/null 2>&1; then \
echo " ***"; \
@@ -564,7 +553,7 @@ zjsdecode: zjsdecode.o $(LIBJBG)
@@ -573,7 +562,7 @@ zjsdecode: zjsdecode.o $(LIBJBG)
$(CC) $(CFLAGS) zjsdecode.o $(LIBJBG) -o $@
command2foo2lava-pjl: command2foo2lava-pjl.o
@ -69,7 +73,7 @@ $OpenBSD: patch-Makefile,v 1.14 2011/10/22 23:00:31 ajacoutot Exp $
command2foo2lava-pjl.o: command2foo2lava-pjl.c
$(CC) $(CFLAGS) -I/usr/local/include -c command2foo2lava-pjl.c
@@ -572,9 +561,8 @@ command2foo2lava-pjl.o: command2foo2lava-pjl.c
@@ -581,9 +570,8 @@ command2foo2lava-pjl.o: command2foo2lava-pjl.c
#
# Installation rules
#
@ -80,7 +84,7 @@ $OpenBSD: patch-Makefile,v 1.14 2011/10/22 23:00:31 ajacoutot Exp $
install-man install-doc
#
# If you use CUPS, then restart the spooler:
@@ -631,11 +619,6 @@ install-prog:
@@ -640,11 +628,6 @@ install-prog:
$(INSTALL) -d $(SHAREZJS)/
$(INSTALL) -c -m 644 gamma.ps $(SHAREZJS)/
$(INSTALL) -c -m 644 gamma-lookup.ps $(SHAREZJS)/
@ -92,7 +96,7 @@ $OpenBSD: patch-Makefile,v 1.14 2011/10/22 23:00:31 ajacoutot Exp $
install-foo:
#
@@ -653,24 +636,14 @@ install-foo:
@@ -662,24 +645,14 @@ install-foo:
#
# Install current database files
#
@ -119,7 +123,7 @@ $OpenBSD: patch-Makefile,v 1.14 2011/10/22 23:00:31 ajacoutot Exp $
#
# Clear foomatic cache and rebuild database if needed
#
@@ -799,50 +772,16 @@ install-extra:
@@ -808,50 +781,16 @@ install-extra:
fi; \
done
@ -174,7 +178,7 @@ $OpenBSD: patch-Makefile,v 1.14 2011/10/22 23:00:31 ajacoutot Exp $
rm -f $(LOCALMODEL)/KonicaMinolta*; \
cd PPD; \
for ppd in *.ppd; do \
@@ -1405,11 +1344,8 @@ install-doc: doc
@@ -1428,11 +1367,8 @@ install-doc: doc
#
$(INSTALL) -d -m 755 $(DOCDIR)
$(INSTALL) -c -m 644 manual.pdf $(DOCDIR)