diff --git a/print/foo2zjs/Makefile b/print/foo2zjs/Makefile index 16190bfbf18..20a226e270b 100644 --- a/print/foo2zjs/Makefile +++ b/print/foo2zjs/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.34 2012/08/17 13:54:26 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.35 2012/10/12 20:00:38 ajacoutot Exp $ COMMENT-main= driver for ZjStream wire protocol compatible printers COMMENT-cups= Konica-Minolta foo2zjs command filter for CUPS -VERSION= 20120601 +VERSION= 20120909 DISTNAME= foo2zjs-${VERSION} PKGNAME-main= ${DISTNAME} @@ -43,7 +43,6 @@ LIB_DEPENDS-cups=print/cups,-libs MAKE_FLAGS+= CUPS_SERVERBIN=`cups-config --serverbin` -USE_GROFF = Yes NO_REGRESS= Yes post-patch: diff --git a/print/foo2zjs/distinfo b/print/foo2zjs/distinfo index 36972529125..9c51ab09e1e 100644 --- a/print/foo2zjs/distinfo +++ b/print/foo2zjs/distinfo @@ -1,2 +1,2 @@ -SHA256 (foo2zjs-20120601.tar.gz) = j//q6Z12z597LeqNiTQcmSNJpoDmm6zvM0GtVq/l1Lw= -SIZE (foo2zjs-20120601.tar.gz) = 1644122 +SHA256 (foo2zjs-20120909.tar.gz) = cJTi4ACibvS4qNYaR4OT6giAK8maFoi7X2oeKEeKxLk= +SIZE (foo2zjs-20120909.tar.gz) = 1644146 diff --git a/print/foo2zjs/patches/patch-Makefile b/print/foo2zjs/patches/patch-Makefile index f9d9888bc03..6fa7020c890 100644 --- a/print/foo2zjs/patches/patch-Makefile +++ b/print/foo2zjs/patches/patch-Makefile @@ -1,6 +1,6 @@ -$OpenBSD: patch-Makefile,v 1.17 2012/08/17 13:54:26 ajacoutot Exp $ ---- Makefile.orig Sat Jun 2 01:10:31 2012 -+++ Makefile Fri Aug 17 15:49:21 2012 +$OpenBSD: patch-Makefile,v 1.18 2012/10/12 20:00:38 ajacoutot Exp $ +--- Makefile.orig Sun Sep 9 07:07:40 2012 ++++ Makefile Fri Oct 12 21:19:33 2012 @@ -16,11 +16,6 @@ SYSNAME := $(shell uname -n) # No version number yet... VERSION=0.0 @@ -33,7 +33,7 @@ $OpenBSD: patch-Makefile,v 1.17 2012/08/17 13:54:26 ajacoutot Exp $ $(NULL) # CUPS vars --CUPS_SERVERBIN := $(shell cups-config --serverbin 2>/dev/null) +-CUPS_SERVERBIN := $(DESTDIR)$(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