UPDATE: print/foo2zjs

2009-07-30 Thread Giovanni Bechis 

Update to latest version, added a missing run dependency.
 Comments ? Ok ?
  Cheers
   Giovanni
Index: Makefile
===
RCS file: /cvs/ports/print/foo2zjs/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile18 Feb 2009 14:06:45 -  1.5
+++ Makefile30 Jul 2009 13:40:47 -
@@ -2,21 +2,21 @@
 
 COMMENT=   driver for ZjStream wire protocol compatible printers
 
-VERSION=   20071102
+VERSION=   20090623
 DISTNAME=  foo2zjs-${VERSION}
 CATEGORIES=print
 
 HOMEPAGE=  http://foo2hp.rkkda.com/
 
-MAINTAINER=Giovanni Bechis g.bec...@snb.it
+MAINTAINER=Giovanni Bechis giova...@openbsd.org
 
-# GPL
+# GPLv2
 PERMIT_PACKAGE_CDROM=  Yes
 PERMIT_PACKAGE_FTP=Yes
 PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=  Yes
 
-WANTLIB=   c
+WANTLIB=   c m
 
 MASTER_SITES=  http://bigio.snb.it/openbsd/distfiles/ \
http://openbsd.dead-parrot.de/distfiles/ \
@@ -28,7 +28,7 @@ USE_GMAKE=Yes
 WRKDIST=   ${WRKDIR}/foo2zjs
 
 BUILD_DEPENDS= ::print/ghostscript/gnu # ps2pdf
-RUN_DEPENDS=   ::print/ghostscript/gnu
+RUN_DEPENDS=   ::print/foomatic-filters
 
 NO_REGRESS=Yes
 
Index: distinfo
===
RCS file: /cvs/ports/print/foo2zjs/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo4 Nov 2007 15:47:45 -   1.2
+++ distinfo30 Jul 2009 13:40:47 -
@@ -1,5 +1,5 @@
-MD5 (foo2zjs-20071102.tar.gz) = eTGAgkREeKyvjOfTQoThEw==
-RMD160 (foo2zjs-20071102.tar.gz) = AXYJLlCWZY7n6adNxQFz6auYVFc=
-SHA1 (foo2zjs-20071102.tar.gz) = RzuyK+qm7P0VRPmYpyhcx9sVOU8=
-SHA256 (foo2zjs-20071102.tar.gz) = gp3IgSeQhIlU3iwLXf3/CxDJoXEO68zuq+lhxnOtQeA=
-SIZE (foo2zjs-20071102.tar.gz) = 1517426
+MD5 (foo2zjs-20090623.tar.gz) = N0IgNvk5/PPL4luQ0ASwqw==
+RMD160 (foo2zjs-20090623.tar.gz) = XfZwC6WAnAXObFeD5wlwj8utz0g=
+SHA1 (foo2zjs-20090623.tar.gz) = gDgLApJ7qzvF+3LLNCv1KXTHa7E=
+SHA256 (foo2zjs-20090623.tar.gz) = cTlsxzd5pAkJCnOFRVaNuHq/w9JDsGv66pPuorxeDc0=
+SIZE (foo2zjs-20090623.tar.gz) = 1574001
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/print/foo2zjs/patches/patch-Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile
--- patches/patch-Makefile  4 Nov 2007 15:47:45 -   1.2
+++ patches/patch-Makefile  30 Jul 2009 13:40:47 -
@@ -1,53 +1,34 @@
 $OpenBSD: patch-Makefile,v 1.2 2007/11/04 15:47:45 merdely Exp $
 Makefile.orig  Sat Nov  3 05:22:39 2007
-+++ Makefile   Sat Nov  3 17:19:32 2007
-@@ -6,10 +6,6 @@ SYSNAME := $(shell uname -n)
+--- Makefile.orig  Sun Jun 14 13:52:03 2009
 Makefile   Sun Jul 19 13:16:11 2009
+@@ -15,11 +15,6 @@ SYSNAME := $(shell uname -n)
  # No version number yet...
  VERSION=0.0
  
 -# Installation prefix...
 -PREFIX=/usr/local
 -PREFIX=/usr
+-PREFIX=$(DESTDIR)/usr
 -
  # Pathnames for this package...
  BIN=$(PREFIX)/bin
  SHAREZJS=$(PREFIX)/share/foo2zjs
-@@ -19,11 +15,11 @@ SHAREXQX=$(PREFIX)/share/foo2xqx
- SHARELAVA=$(PREFIX)/share/foo2lava
+@@ -30,12 +25,12 @@ SHARELAVA=$(PREFIX)/share/foo2lava
  SHAREQPDL=$(PREFIX)/share/foo2qpdl
  SHARESLX=$(PREFIX)/share/foo2slx
+ SHAREHC=$(PREFIX)/share/foo2hiperc
 -MANDIR=$(PREFIX)/share/man
 +MANDIR=$(PREFIX)/man
  DOCDIR=$(PREFIX)/share/doc/foo2zjs/
+ INSTALL=install
  
  # Pathnames for referenced packages...
--FOODB=/usr/share/foomatic/db/source
+-FOODB=$(DESTDIR)/usr/share/foomatic/db/source
 +FOODB=${PREFIX}/share/foo2zjs/db/source
  
  # User ID's
- LPuid=-olp
-@@ -40,6 +36,10 @@ ifeq ($(UNAME),OpenBSD)
- LPuid=-oroot
- LPgid=-gwheel
- endif
-+ifeq ($(UNAME),OpenBSD)
-+LPuid=-oroot
-+LPgid=-gwheel
-+endif
- # If we aren't root, don't try to set ownership
- ifneq ($(EUID),0)
- LPuid=
-@@ -54,6 +54,9 @@ endif
- ifeq ($(UNAME),OpenBSD)
- MODTIME= stat -f %Sm -t %a %b %d %T %Y $$1
- endif
-+ifeq ($(UNAME),OpenBSD)
-+MODTIME= stat -f %Sm -t %a %b %d %T %Y $$1
-+endif
- ifeq ($(UNAME),Darwin)
- MODTIME= stat -f %Sm -t %a %b %d %T %Y $$1
- endif
-@@ -210,7 +213,6 @@ ifeq ($(UNAME),Linux)
+ LPuid=-oroot
+@@ -255,7 +250,6 @@ ifeq ($(UNAME),Linux)
  endif
  
  # Compiler flags
@@ -55,138 +36,94 @@ $OpenBSD: patch-Makefile,v 1.2 2007/11/0
  #CFLAGS +=-g
  
  #
-@@ -444,7 +446,7 @@ slxdecode: slxdecode.o $(LIBJBG)
+@@ -505,9 +499,8 @@ gipddecode: gipddecode.o $(LIBJBG)
  #
  # Installation rules
  #
 -install: all install-test install-prog install-icc2ps install-extra \
-+install: all install-prog install-icc2ps \
-   install-crd install-foo install-ppd install-man install-doc
++install: all install-prog install-icc2ps install-extra \
+   install-crd install-foo install-ppd \
+-  install-gui

UPDATE: print/foo2zjs

2009-07-21 Thread Giovanni Bechis 

Update to latest version of foo2zjs printer driver.
Tested with a hp2600n laser printer @amd64.
 Ok ? Comments ?
  Cheers
   Giovanni

Index: Makefile
===
RCS file: /cvs/ports/print/foo2zjs/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile18 Feb 2009 14:06:45 -  1.5
+++ Makefile21 Jul 2009 16:20:29 -
@@ -2,21 +2,21 @@
 
 COMMENT=   driver for ZjStream wire protocol compatible printers
 
-VERSION=   20071102
+VERSION=   20090623
 DISTNAME=  foo2zjs-${VERSION}
 CATEGORIES=print
 
 HOMEPAGE=  http://foo2hp.rkkda.com/
 
-MAINTAINER=Giovanni Bechis g.bec...@snb.it
+MAINTAINER=Giovanni Bechis giova...@openbsd.org
 
-# GPL
+# GPLv2
 PERMIT_PACKAGE_CDROM=  Yes
 PERMIT_PACKAGE_FTP=Yes
 PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=  Yes
 
-WANTLIB=   c
+WANTLIB=   c m
 
 MASTER_SITES=  http://bigio.snb.it/openbsd/distfiles/ \
http://openbsd.dead-parrot.de/distfiles/ \
Index: distinfo
===
RCS file: /cvs/ports/print/foo2zjs/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo4 Nov 2007 15:47:45 -   1.2
+++ distinfo21 Jul 2009 16:20:29 -
@@ -1,5 +1,5 @@
-MD5 (foo2zjs-20071102.tar.gz) = eTGAgkREeKyvjOfTQoThEw==
-RMD160 (foo2zjs-20071102.tar.gz) = AXYJLlCWZY7n6adNxQFz6auYVFc=
-SHA1 (foo2zjs-20071102.tar.gz) = RzuyK+qm7P0VRPmYpyhcx9sVOU8=
-SHA256 (foo2zjs-20071102.tar.gz) = gp3IgSeQhIlU3iwLXf3/CxDJoXEO68zuq+lhxnOtQeA=
-SIZE (foo2zjs-20071102.tar.gz) = 1517426
+MD5 (foo2zjs-20090623.tar.gz) = N0IgNvk5/PPL4luQ0ASwqw==
+RMD160 (foo2zjs-20090623.tar.gz) = XfZwC6WAnAXObFeD5wlwj8utz0g=
+SHA1 (foo2zjs-20090623.tar.gz) = gDgLApJ7qzvF+3LLNCv1KXTHa7E=
+SHA256 (foo2zjs-20090623.tar.gz) = cTlsxzd5pAkJCnOFRVaNuHq/w9JDsGv66pPuorxeDc0=
+SIZE (foo2zjs-20090623.tar.gz) = 1574001
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/print/foo2zjs/patches/patch-Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile
--- patches/patch-Makefile  4 Nov 2007 15:47:45 -   1.2
+++ patches/patch-Makefile  21 Jul 2009 16:20:29 -
@@ -1,53 +1,34 @@
 $OpenBSD: patch-Makefile,v 1.2 2007/11/04 15:47:45 merdely Exp $
 Makefile.orig  Sat Nov  3 05:22:39 2007
-+++ Makefile   Sat Nov  3 17:19:32 2007
-@@ -6,10 +6,6 @@ SYSNAME := $(shell uname -n)
+--- Makefile.orig  Sun Jun 14 13:52:03 2009
 Makefile   Sun Jul 19 13:16:11 2009
+@@ -15,11 +15,6 @@ SYSNAME := $(shell uname -n)
  # No version number yet...
  VERSION=0.0
  
 -# Installation prefix...
 -PREFIX=/usr/local
 -PREFIX=/usr
+-PREFIX=$(DESTDIR)/usr
 -
  # Pathnames for this package...
  BIN=$(PREFIX)/bin
  SHAREZJS=$(PREFIX)/share/foo2zjs
-@@ -19,11 +15,11 @@ SHAREXQX=$(PREFIX)/share/foo2xqx
- SHARELAVA=$(PREFIX)/share/foo2lava
+@@ -30,12 +25,12 @@ SHARELAVA=$(PREFIX)/share/foo2lava
  SHAREQPDL=$(PREFIX)/share/foo2qpdl
  SHARESLX=$(PREFIX)/share/foo2slx
+ SHAREHC=$(PREFIX)/share/foo2hiperc
 -MANDIR=$(PREFIX)/share/man
 +MANDIR=$(PREFIX)/man
  DOCDIR=$(PREFIX)/share/doc/foo2zjs/
+ INSTALL=install
  
  # Pathnames for referenced packages...
--FOODB=/usr/share/foomatic/db/source
+-FOODB=$(DESTDIR)/usr/share/foomatic/db/source
 +FOODB=${PREFIX}/share/foo2zjs/db/source
  
  # User ID's
- LPuid=-olp
-@@ -40,6 +36,10 @@ ifeq ($(UNAME),OpenBSD)
- LPuid=-oroot
- LPgid=-gwheel
- endif
-+ifeq ($(UNAME),OpenBSD)
-+LPuid=-oroot
-+LPgid=-gwheel
-+endif
- # If we aren't root, don't try to set ownership
- ifneq ($(EUID),0)
- LPuid=
-@@ -54,6 +54,9 @@ endif
- ifeq ($(UNAME),OpenBSD)
- MODTIME= stat -f %Sm -t %a %b %d %T %Y $$1
- endif
-+ifeq ($(UNAME),OpenBSD)
-+MODTIME= stat -f %Sm -t %a %b %d %T %Y $$1
-+endif
- ifeq ($(UNAME),Darwin)
- MODTIME= stat -f %Sm -t %a %b %d %T %Y $$1
- endif
-@@ -210,7 +213,6 @@ ifeq ($(UNAME),Linux)
+ LPuid=-oroot
+@@ -255,7 +250,6 @@ ifeq ($(UNAME),Linux)
  endif
  
  # Compiler flags
@@ -55,138 +36,94 @@ $OpenBSD: patch-Makefile,v 1.2 2007/11/0
  #CFLAGS +=-g
  
  #
-@@ -444,7 +446,7 @@ slxdecode: slxdecode.o $(LIBJBG)
+@@ -505,9 +499,8 @@ gipddecode: gipddecode.o $(LIBJBG)
  #
  # Installation rules
  #
 -install: all install-test install-prog install-icc2ps install-extra \
-+install: all install-prog install-icc2ps \
-   install-crd install-foo install-ppd install-man install-doc
++install: all install-prog install-icc2ps install-extra \
+   install-crd install-foo install-ppd \
+-  install-gui install-desktop \
+   install-man install-doc
#
# If you use CUPS, then restart the spooler:
-@@ -493,10 +495,6 @@ install-prog:
-   install -d $(SHAREZJS)/
-   install -c -m 644 gamma.ps $(SHAREZJS)/
-   install

UPDATE: print/foo2zjs

2008-12-02 Thread Giovanni Bechis 

Update to latest version of this printer driver.
Some bug fixed and many drivers added.
Full changelog available at http://foo2zjs.rkkda.com/ChangeLog
Port tested @amd64 with Hp2600n laser color printer.
 Cheers
  Giovanni
Index: Makefile
===
RCS file: /cvs/ports/print/foo2zjs/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile13 Feb 2008 04:40:17 -  1.3
+++ Makefile2 Dec 2008 08:12:47 -
@@ -2,7 +2,7 @@
 
 COMMENT=   driver for ZjStream wire protocol compatible printers
 
-VERSION=   20071102
+VERSION=   20081130
 DISTNAME=  foo2zjs-${VERSION}
 CATEGORIES=print
 
@@ -10,13 +10,13 @@ HOMEPAGE=   http://foo2hp.rkkda.com/
 
 MAINTAINER=Giovanni Bechis [EMAIL PROTECTED]
 
-# GPL
+# GPLv2
 PERMIT_PACKAGE_CDROM=  Yes
 PERMIT_PACKAGE_FTP=Yes
 PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=  Yes
 
-WANTLIB=   c
+WANTLIB=   c m
 
 MASTER_SITES=  http://bigio.snb.it/openbsd/distfiles/ \
http://openbsd.dead-parrot.de/distfiles/ \
@@ -29,13 +29,16 @@ WRKDIST=${WRKDIR}/foo2zjs
 SUBST_VARS=LOCALBASE
 
 BUILD_DEPENDS= ::print/ghostscript/gnu # ps2pdf
-RUN_DEPENDS=   ::print/ghostscript/gnu
+RUN_DEPENDS=   ::print/ghostscript/gnu \
+   ::shells/bash
 
 NO_REGRESS=Yes
 
 pre-configure:
@perl -pi -e 's,/usr/bin,${PREFIX}/bin,g' \
${WRKSRC}/*.1in
+   @perl -pi -e 's,/bin/sh,${LOCALBASE}/bin/bash,g' \
+   ${WRKSRC}/*-wrapper.in
 
 post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/foo2zjs/{firmware,icm}
Index: distinfo
===
RCS file: /cvs/ports/print/foo2zjs/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo4 Nov 2007 15:47:45 -   1.2
+++ distinfo2 Dec 2008 08:12:47 -
@@ -1,5 +1,5 @@
-MD5 (foo2zjs-20071102.tar.gz) = eTGAgkREeKyvjOfTQoThEw==
-RMD160 (foo2zjs-20071102.tar.gz) = AXYJLlCWZY7n6adNxQFz6auYVFc=
-SHA1 (foo2zjs-20071102.tar.gz) = RzuyK+qm7P0VRPmYpyhcx9sVOU8=
-SHA256 (foo2zjs-20071102.tar.gz) = gp3IgSeQhIlU3iwLXf3/CxDJoXEO68zuq+lhxnOtQeA=
-SIZE (foo2zjs-20071102.tar.gz) = 1517426
+MD5 (foo2zjs-20081130.tar.gz) = vDR/wwXE+ZAXx1oFYgWkcQ==
+RMD160 (foo2zjs-20081130.tar.gz) = oCVEJlJfaEzDuWuoCQCEi2qkysw=
+SHA1 (foo2zjs-20081130.tar.gz) = CUMzHlkRmGKadWTldJtVclFbHGk=
+SHA256 (foo2zjs-20081130.tar.gz) = n6RbYIgS39NcXpWhKmdATcey0O3bEaAZTG9iRm4fBxQ=
+SIZE (foo2zjs-20081130.tar.gz) = 1556480
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/print/foo2zjs/patches/patch-Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile
--- patches/patch-Makefile  4 Nov 2007 15:47:45 -   1.2
+++ patches/patch-Makefile  2 Dec 2008 08:12:47 -
@@ -1,53 +1,44 @@
 $OpenBSD: patch-Makefile,v 1.2 2007/11/04 15:47:45 merdely Exp $
 Makefile.orig  Sat Nov  3 05:22:39 2007
-+++ Makefile   Sat Nov  3 17:19:32 2007
-@@ -6,10 +6,6 @@ SYSNAME := $(shell uname -n)
+--- Makefile.orig  Tue Sep 23 15:56:20 2008
 Makefile   Wed Nov 26 10:18:53 2008
+@@ -15,11 +15,6 @@ SYSNAME := $(shell uname -n)
  # No version number yet...
  VERSION=0.0
  
 -# Installation prefix...
 -PREFIX=/usr/local
 -PREFIX=/usr
+-PREFIX=$(DESTDIR)/usr
 -
  # Pathnames for this package...
  BIN=$(PREFIX)/bin
  SHAREZJS=$(PREFIX)/share/foo2zjs
-@@ -19,11 +15,11 @@ SHAREXQX=$(PREFIX)/share/foo2xqx
- SHARELAVA=$(PREFIX)/share/foo2lava
+@@ -30,12 +25,12 @@ SHARELAVA=$(PREFIX)/share/foo2lava
  SHAREQPDL=$(PREFIX)/share/foo2qpdl
  SHARESLX=$(PREFIX)/share/foo2slx
+ SHAREHC=$(PREFIX)/share/foo2hiperc
 -MANDIR=$(PREFIX)/share/man
 +MANDIR=$(PREFIX)/man
  DOCDIR=$(PREFIX)/share/doc/foo2zjs/
+ INSTALL=install
  
  # Pathnames for referenced packages...
--FOODB=/usr/share/foomatic/db/source
-+FOODB=${PREFIX}/share/foo2zjs/db/source
+-FOODB=$(DESTDIR)/usr/share/foomatic/db/source
++FOODB=$(PREFIX)/share/foo2zjs/db/source
  
  # User ID's
  LPuid=-olp
-@@ -40,6 +36,10 @@ ifeq ($(UNAME),OpenBSD)
- LPuid=-oroot
- LPgid=-gwheel
- endif
-+ifeq ($(UNAME),OpenBSD)
-+LPuid=-oroot
-+LPgid=-gwheel
-+endif
- # If we aren't root, don't try to set ownership
- ifneq ($(EUID),0)
- LPuid=
-@@ -54,6 +54,9 @@ endif
- ifeq ($(UNAME),OpenBSD)
- MODTIME= stat -f %Sm -t %a %b %d %T %Y $$1
- endif
-+ifeq ($(UNAME),OpenBSD)
-+MODTIME= stat -f %Sm -t %a %b %d %T %Y $$1
-+endif
- ifeq ($(UNAME),Darwin)
- MODTIME= stat -f %Sm -t %a %b %d %T %Y $$1
- endif
-@@ -210,7 +213,6 @@ ifeq ($(UNAME),Linux)
+@@ -116,9 +111,7 @@ FILES  =   \
+   README.in \
+   INSTALL \
+   INSTALL.in \
+-  INSTALL.osx \
+   INSTALL.usb \
+-

UPDATE: print/foo2zjs

2008-07-17 Thread Giovanni Bechis 
Update to latest version, some bugs fixed and support for other printers 
added.

Full Changelog avaliable at http://foo2zjs.rkkda.com/ChangeLog
Port tested @amd64 with a Hp2600n printer.
 Cheers
  Giovanni
Index: Makefile
===
RCS file: /cvs/ports/print/foo2zjs/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile13 Feb 2008 04:40:17 -  1.3
+++ Makefile17 Jul 2008 12:29:20 -
@@ -2,7 +2,7 @@
 
 COMMENT=   driver for ZjStream wire protocol compatible printers
 
-VERSION=   20071102
+VERSION=   20080605
 DISTNAME=  foo2zjs-${VERSION}
 CATEGORIES=print
 
Index: distinfo
===
RCS file: /cvs/ports/print/foo2zjs/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo4 Nov 2007 15:47:45 -   1.2
+++ distinfo17 Jul 2008 12:29:20 -
@@ -1,5 +1,5 @@
-MD5 (foo2zjs-20071102.tar.gz) = eTGAgkREeKyvjOfTQoThEw==
-RMD160 (foo2zjs-20071102.tar.gz) = AXYJLlCWZY7n6adNxQFz6auYVFc=
-SHA1 (foo2zjs-20071102.tar.gz) = RzuyK+qm7P0VRPmYpyhcx9sVOU8=
-SHA256 (foo2zjs-20071102.tar.gz) = gp3IgSeQhIlU3iwLXf3/CxDJoXEO68zuq+lhxnOtQeA=
-SIZE (foo2zjs-20071102.tar.gz) = 1517426
+MD5 (foo2zjs-20080605.tar.gz) = 5hcDgjuJNSgh/rn709jhPA==
+RMD160 (foo2zjs-20080605.tar.gz) = 7ylWxHhqfuP6+VQQ+ABshZQGXcg=
+SHA1 (foo2zjs-20080605.tar.gz) = 4VF54AGQWPIrfPAW9EbkbRar/Iw=
+SHA256 (foo2zjs-20080605.tar.gz) = EFUgu7mab0vKj2cqxl84TdJcn3xrXzIqE2954p8a8F8=
+SIZE (foo2zjs-20080605.tar.gz) = 1552650
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/print/foo2zjs/patches/patch-Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile
--- patches/patch-Makefile  4 Nov 2007 15:47:45 -   1.2
+++ patches/patch-Makefile  17 Jul 2008 12:29:20 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-Makefile,v 1.2 2007/11/04 15:47:45 merdely Exp $
 Makefile.orig  Sat Nov  3 05:22:39 2007
-+++ Makefile   Sat Nov  3 17:19:32 2007
-@@ -6,10 +6,6 @@ SYSNAME := $(shell uname -n)
+--- Makefile.orig  Thu Jun  5 14:22:39 2008
 Makefile   Thu Jul 17 14:25:18 2008
+@@ -15,10 +15,6 @@ SYSNAME := $(shell uname -n)
  # No version number yet...
  VERSION=0.0
  
@@ -12,13 +12,14 @@ $OpenBSD: patch-Makefile,v 1.2 2007/11/0
  # Pathnames for this package...
  BIN=$(PREFIX)/bin
  SHAREZJS=$(PREFIX)/share/foo2zjs
-@@ -19,11 +15,11 @@ SHAREXQX=$(PREFIX)/share/foo2xqx
- SHARELAVA=$(PREFIX)/share/foo2lava
+@@ -29,12 +25,12 @@ SHARELAVA=$(PREFIX)/share/foo2lava
  SHAREQPDL=$(PREFIX)/share/foo2qpdl
  SHARESLX=$(PREFIX)/share/foo2slx
+ SHAREHC=$(PREFIX)/share/foo2hiperc
 -MANDIR=$(PREFIX)/share/man
 +MANDIR=$(PREFIX)/man
  DOCDIR=$(PREFIX)/share/doc/foo2zjs/
+ INSTALL=install
  
  # Pathnames for referenced packages...
 -FOODB=/usr/share/foomatic/db/source
@@ -26,9 +27,9 @@ $OpenBSD: patch-Makefile,v 1.2 2007/11/0
  
  # User ID's
  LPuid=-olp
-@@ -40,6 +36,10 @@ ifeq ($(UNAME),OpenBSD)
- LPuid=-oroot
- LPgid=-gwheel
+@@ -56,6 +52,10 @@ ifeq ($(UNAME),SunOS)
+ LPgid=-glp
+ INSTALL=/usr/ucb/install
  endif
 +ifeq ($(UNAME),OpenBSD)
 +LPuid=-oroot
@@ -37,7 +38,7 @@ $OpenBSD: patch-Makefile,v 1.2 2007/11/0
  # If we aren't root, don't try to set ownership
  ifneq ($(EUID),0)
  LPuid=
-@@ -54,6 +54,9 @@ endif
+@@ -70,6 +70,9 @@ endif
  ifeq ($(UNAME),OpenBSD)
  MODTIME= stat -f %Sm -t %a %b %d %T %Y $$1
  endif
@@ -47,7 +48,17 @@ $OpenBSD: patch-Makefile,v 1.2 2007/11/0
  ifeq ($(UNAME),Darwin)
  MODTIME= stat -f %Sm -t %a %b %d %T %Y $$1
  endif
-@@ -210,7 +213,6 @@ ifeq ($(UNAME),Linux)
+@@ -115,9 +118,7 @@ FILES  =   \
+   README.in \
+   INSTALL \
+   INSTALL.in \
+-  INSTALL.osx \
+   INSTALL.usb \
+-  COPYING \
+   ChangeLog \
+   Makefile \
+   foo2zjs.c \
+@@ -248,7 +249,6 @@ ifeq ($(UNAME),Linux)
  endif
  
  # Compiler flags
@@ -55,138 +66,153 @@ $OpenBSD: patch-Makefile,v 1.2 2007/11/0
  #CFLAGS +=-g
  
  #
-@@ -444,7 +446,7 @@ slxdecode: slxdecode.o $(LIBJBG)
+@@ -498,9 +498,8 @@ gipddecode: gipddecode.o $(LIBJBG)
  #
  # Installation rules
  #
 -install: all install-test install-prog install-icc2ps install-extra \
 +install: all install-prog install-icc2ps \
-   install-crd install-foo install-ppd install-man install-doc
+   install-crd install-foo install-ppd \
+-  install-gui install-desktop \
+   install-man install-doc
#
# If you use CUPS, then restart the spooler:
-@@ -493,10 +495,6 @@ install-prog:
-   install -d $(SHAREZJS)/
-   install -c -m 644 gamma.ps $(SHAREZJS)/
-   install -c -m 644 gamma-lookup.ps $(SHAREZJS)/
--  install -d $(SHAREOAK)/
--  install -d $(SHAREHP)/
--  install -d $(SHAREXQX)/
--

UPDATE: print/foo2zjs

2008-04-09 Thread Giovanni Bechis 

Foo2zjs updated to latest version,
some patches has been included upstream, bugs fixed and some other 
printers are supported.

Full changelog available at:
http://foo2zjs.rkkda.com/ChangeLog
 Cheers
  Giovanni
Index: Makefile
===
RCS file: /cvs/ports/print/foo2zjs/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile13 Feb 2008 04:40:17 -  1.3
+++ Makefile5 Apr 2008 14:21:06 -
@@ -2,7 +2,7 @@
 
 COMMENT=   driver for ZjStream wire protocol compatible printers
 
-VERSION=   20071102
+VERSION=   20080401
 DISTNAME=  foo2zjs-${VERSION}
 CATEGORIES=print
 
Index: distinfo
===
RCS file: /cvs/ports/print/foo2zjs/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo4 Nov 2007 15:47:45 -   1.2
+++ distinfo5 Apr 2008 14:21:06 -
@@ -1,5 +1,5 @@
-MD5 (foo2zjs-20071102.tar.gz) = eTGAgkREeKyvjOfTQoThEw==
-RMD160 (foo2zjs-20071102.tar.gz) = AXYJLlCWZY7n6adNxQFz6auYVFc=
-SHA1 (foo2zjs-20071102.tar.gz) = RzuyK+qm7P0VRPmYpyhcx9sVOU8=
-SHA256 (foo2zjs-20071102.tar.gz) = gp3IgSeQhIlU3iwLXf3/CxDJoXEO68zuq+lhxnOtQeA=
-SIZE (foo2zjs-20071102.tar.gz) = 1517426
+MD5 (foo2zjs-20080401.tar.gz) = zkhmM7s/zyHgnbNueUycKg==
+RMD160 (foo2zjs-20080401.tar.gz) = 5ob9VCOGsPgQY4f4zcpzOdJZq/E=
+SHA1 (foo2zjs-20080401.tar.gz) = cLKrO0wGLUSo9YC2sqcHuS5H8WM=
+SHA256 (foo2zjs-20080401.tar.gz) = E2r+1KfWf5Ic3hND9HBz2dVIacdJhyjhToSRLcRruoo=
+SIZE (foo2zjs-20080401.tar.gz) = 1543257
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/print/foo2zjs/patches/patch-Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile
--- patches/patch-Makefile  4 Nov 2007 15:47:45 -   1.2
+++ patches/patch-Makefile  5 Apr 2008 14:21:06 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-Makefile,v 1.2 2007/11/04 15:47:45 merdely Exp $
 Makefile.orig  Sat Nov  3 05:22:39 2007
-+++ Makefile   Sat Nov  3 17:19:32 2007
-@@ -6,10 +6,6 @@ SYSNAME := $(shell uname -n)
+--- Makefile.orig  Fri Mar 21 16:21:41 2008
 Makefile   Sat Apr  5 16:14:39 2008
+@@ -15,10 +15,6 @@ SYSNAME := $(shell uname -n)
  # No version number yet...
  VERSION=0.0
  
@@ -12,13 +12,14 @@ $OpenBSD: patch-Makefile,v 1.2 2007/11/0
  # Pathnames for this package...
  BIN=$(PREFIX)/bin
  SHAREZJS=$(PREFIX)/share/foo2zjs
-@@ -19,11 +15,11 @@ SHAREXQX=$(PREFIX)/share/foo2xqx
- SHARELAVA=$(PREFIX)/share/foo2lava
+@@ -29,12 +25,12 @@ SHARELAVA=$(PREFIX)/share/foo2lava
  SHAREQPDL=$(PREFIX)/share/foo2qpdl
  SHARESLX=$(PREFIX)/share/foo2slx
+ SHAREHC=$(PREFIX)/share/foo2hiperc
 -MANDIR=$(PREFIX)/share/man
 +MANDIR=$(PREFIX)/man
  DOCDIR=$(PREFIX)/share/doc/foo2zjs/
+ INSTALL=install
  
  # Pathnames for referenced packages...
 -FOODB=/usr/share/foomatic/db/source
@@ -26,9 +27,9 @@ $OpenBSD: patch-Makefile,v 1.2 2007/11/0
  
  # User ID's
  LPuid=-olp
-@@ -40,6 +36,10 @@ ifeq ($(UNAME),OpenBSD)
- LPuid=-oroot
- LPgid=-gwheel
+@@ -56,6 +52,10 @@ ifeq ($(UNAME),SunOS)
+ LPgid=-glp
+ INSTALL=/usr/ucb/install
  endif
 +ifeq ($(UNAME),OpenBSD)
 +LPuid=-oroot
@@ -37,7 +38,7 @@ $OpenBSD: patch-Makefile,v 1.2 2007/11/0
  # If we aren't root, don't try to set ownership
  ifneq ($(EUID),0)
  LPuid=
-@@ -54,6 +54,9 @@ endif
+@@ -70,6 +70,9 @@ endif
  ifeq ($(UNAME),OpenBSD)
  MODTIME= stat -f %Sm -t %a %b %d %T %Y $$1
  endif
@@ -47,7 +48,17 @@ $OpenBSD: patch-Makefile,v 1.2 2007/11/0
  ifeq ($(UNAME),Darwin)
  MODTIME= stat -f %Sm -t %a %b %d %T %Y $$1
  endif
-@@ -210,7 +213,6 @@ ifeq ($(UNAME),Linux)
+@@ -115,9 +118,7 @@ FILES  =   \
+   README.in \
+   INSTALL \
+   INSTALL.in \
+-  INSTALL.osx \
+   INSTALL.usb \
+-  COPYING \
+   ChangeLog \
+   Makefile \
+   foo2zjs.c \
+@@ -247,7 +248,6 @@ ifeq ($(UNAME),Linux)
  endif
  
  # Compiler flags
@@ -55,115 +66,127 @@ $OpenBSD: patch-Makefile,v 1.2 2007/11/0
  #CFLAGS +=-g
  
  #
-@@ -444,7 +446,7 @@ slxdecode: slxdecode.o $(LIBJBG)
+@@ -497,9 +497,8 @@ gipddecode: gipddecode.o $(LIBJBG)
  #
  # Installation rules
  #
 -install: all install-test install-prog install-icc2ps install-extra \
 +install: all install-prog install-icc2ps \
-   install-crd install-foo install-ppd install-man install-doc
+   install-crd install-foo install-ppd \
+-  install-gui install-desktop \
+   install-man install-doc
#
# If you use CUPS, then restart the spooler:
-@@ -493,10 +495,6 @@ install-prog:
-   install -d $(SHAREZJS)/
-   install -c -m 644 gamma.ps $(SHAREZJS)/
-   install -c -m 644 gamma-lookup.ps $(SHAREZJS)/
--  install -d $(SHAREOAK)/
--  install -d $(SHAREHP)/
--  install -d $(SHAREXQX)/
--

Re: UPDATE: print/foo2zjs

2008-04-09 Thread Mike Erdely 
On Wed, Apr 09, 2008 at 06:52:06PM +0200, Giovanni Bechis wrote:
 Foo2zjs updated to latest version,
 some patches has been included upstream, bugs fixed and some other printers 
 are supported.
 Full changelog available at:
 http://foo2zjs.rkkda.com/ChangeLog
  Cheers
   Giovanni

Tested with my HP LaserJet 2600n w/ CUPS on alpha.

ok?

-ME

Re: UPDATE: print/foo2zjs

2008-04-09 Thread Matthias Kilian 
On Wed, Apr 09, 2008 at 03:51:02PM -0400, Mike Erdely wrote:
  Foo2zjs updated to latest version,
  some patches has been included upstream, bugs fixed and some other printers 
  are supported.
  Full changelog available at:
  http://foo2zjs.rkkda.com/ChangeLog
   Cheers
Giovanni
 
 Tested with my HP LaserJet 2600n w/ CUPS on alpha.
 
 ok?

Yep, looks good (portswise, didn't test because I don't have a
printer running here).

With the exception that binaries aren't stripped (this is similar
to the dwm thing i just sent rant about to some people), but I don't
want to block commits just because of this, so go ahead. There're
probably millions of ports around that unconditionally strip or
don't strip during install, regardless wether DEBUG is set or not.

Ciao,
Kili

-- 
I am swiss, we duplicate some letters,
just to give the words a twist...
-- mbalmer

UPDATE: print/foo2zjs

2007-11-03 Thread Giovanni Bechis 
Foo2zjs updated to latest version, some printers added,
some fixes to make it work with Ghostscript 8.60.
Full Changelog: http://foo2zjs.rkkda.com/ChangeLog
 Ok ? Comments ?
  Giovanni
? patches/patch-foo2oak_c
? patches/patch-oakdecode_c
Index: Makefile
===
RCS file: /cvs/ports/print/foo2zjs/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- Makefile26 Sep 2007 06:26:19 -  1.1.1.1
+++ Makefile3 Nov 2007 16:49:53 -
@@ -2,7 +2,7 @@
 
 COMMENT=   driver for ZjStream wire protocol compatible printers
 
-VERSION=   20070901
+VERSION=   20071102
 DISTNAME=  foo2zjs-${VERSION}
 CATEGORIES=print
 
@@ -16,7 +16,7 @@
 PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=  Yes
 
-WANTLIB=   c m 
+WANTLIB=   c
 
 MASTER_SITES=  http://bigio.snb.it/openbsd/distfiles/ \
http://openbsd.dead-parrot.de/distfiles/ \
Index: distinfo
===
RCS file: /cvs/ports/print/foo2zjs/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo26 Sep 2007 06:26:19 -  1.1.1.1
+++ distinfo3 Nov 2007 16:49:53 -
@@ -1,5 +1,5 @@
-MD5 (foo2zjs-20070901.tar.gz) = tLIQeYjKNf8BAu4JLGfcgQ==
-RMD160 (foo2zjs-20070901.tar.gz) = gSiXJ/e29YUvjCL7NCkf1mIUV3w=
-SHA1 (foo2zjs-20070901.tar.gz) = A3Ndn6Z6LDchXpIr9k041CClRLY=
-SHA256 (foo2zjs-20070901.tar.gz) = GcloKyridkUU07Vwuj2fJpbR6C1xbi5Tfc52hcZBzHQ=
-SIZE (foo2zjs-20070901.tar.gz) = 1457733
+MD5 (foo2zjs-20071102.tar.gz) = eTGAgkREeKyvjOfTQoThEw==
+RMD160 (foo2zjs-20071102.tar.gz) = AXYJLlCWZY7n6adNxQFz6auYVFc=
+SHA1 (foo2zjs-20071102.tar.gz) = RzuyK+qm7P0VRPmYpyhcx9sVOU8=
+SHA256 (foo2zjs-20071102.tar.gz) = gp3IgSeQhIlU3iwLXf3/CxDJoXEO68zuq+lhxnOtQeA=
+SIZE (foo2zjs-20071102.tar.gz) = 1517426
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/print/foo2zjs/patches/patch-Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-Makefile
--- patches/patch-Makefile  26 Sep 2007 06:26:19 -  1.1.1.1
+++ patches/patch-Makefile  3 Nov 2007 16:49:53 -
@@ -1,6 +1,6 @@
 $OpenBSD: patch-Makefile,v 1.1.1.1 2007/09/26 06:26:19 ajacoutot Exp $
 Makefile.orig  Wed Jul 18 20:34:22 2007
-+++ Makefile   Tue Sep 25 17:10:02 2007
+--- Makefile.orig  Sat Nov  3 05:22:39 2007
 Makefile   Sat Nov  3 17:19:32 2007
 @@ -6,10 +6,6 @@ SYSNAME := $(shell uname -n)
  # No version number yet...
  VERSION=0.0
@@ -12,10 +12,10 @@
  # Pathnames for this package...
  BIN=$(PREFIX)/bin
  SHAREZJS=$(PREFIX)/share/foo2zjs
-@@ -18,11 +14,11 @@ SHAREHP=$(PREFIX)/share/foo2hp
- SHAREXQX=$(PREFIX)/share/foo2xqx
+@@ -19,11 +15,11 @@ SHAREXQX=$(PREFIX)/share/foo2xqx
  SHARELAVA=$(PREFIX)/share/foo2lava
  SHAREQPDL=$(PREFIX)/share/foo2qpdl
+ SHARESLX=$(PREFIX)/share/foo2slx
 -MANDIR=$(PREFIX)/share/man
 +MANDIR=$(PREFIX)/man
  DOCDIR=$(PREFIX)/share/doc/foo2zjs/
@@ -26,7 +26,7 @@
  
  # User ID's
  LPuid=-olp
-@@ -35,6 +31,10 @@ ifeq ($(UNAME),FreeBSD)
+@@ -40,6 +36,10 @@ ifeq ($(UNAME),OpenBSD)
  LPuid=-oroot
  LPgid=-gwheel
  endif
@@ -37,8 +37,8 @@
  # If we aren't root, don't try to set ownership
  ifneq ($(EUID),0)
  LPuid=
-@@ -46,6 +46,9 @@ MODTIME= date -d 1/1/1970 utc + `stat -t $$1 | cut -f
- ifeq ($(UNAME),FreeBSD)
+@@ -54,6 +54,9 @@ endif
+ ifeq ($(UNAME),OpenBSD)
  MODTIME= stat -f %Sm -t %a %b %d %T %Y $$1
  endif
 +ifeq ($(UNAME),OpenBSD)
@@ -47,7 +47,7 @@
  ifeq ($(UNAME),Darwin)
  MODTIME= stat -f %Sm -t %a %b %d %T %Y $$1
  endif
-@@ -196,7 +199,6 @@ ifeq ($(UNAME),Linux)
+@@ -210,7 +213,6 @@ ifeq ($(UNAME),Linux)
  endif
  
  # Compiler flags
@@ -55,7 +55,7 @@
  #CFLAGS +=-g
  
  #
-@@ -388,7 +390,7 @@ opldecode: opldecode.o $(LIBJBG)
+@@ -444,7 +446,7 @@ slxdecode: slxdecode.o $(LIBJBG)
  #
  # Installation rules
  #
@@ -64,7 +64,7 @@
install-crd install-foo install-ppd install-man install-doc
#
# If you use CUPS, then restart the spooler:
-@@ -434,10 +436,6 @@ install-prog:
+@@ -493,10 +495,6 @@ install-prog:
install -d $(SHAREZJS)/
install -c -m 644 gamma.ps $(SHAREZJS)/
install -c -m 644 gamma-lookup.ps $(SHAREZJS)/
@@ -75,7 +75,7 @@
  
  install-foo:
#
-@@ -450,6 +448,7 @@ install-foo:
+@@ -509,6 +507,7 @@ install-foo:
#
# Install current database files
#
@@ -83,7 +83,7 @@
@if [ -d $(FOODB) ]; then \
for dir in driver printer opt; do \
echo install -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \
-@@ -476,40 +475,6 @@ install-foo:
+@@ -535,40 +534,6 @@ install-foo:
foomatic-combo-xml -O overview.xml; \
fi
  
@@ -124,24 +124,24 @@
  install-extra:
#
# Install extra files (ICM and firmware), if any exist here.
-@@

Re: UPDATE: print/foo2zjs

2007-11-03 Thread Mike Erdely 
On Sat, Nov 03, 2007 at 05:56:45PM +0100, Giovanni Bechis wrote:
 Foo2zjs updated to latest version, some printers added,
 some fixes to make it work with Ghostscript 8.60.
 Full Changelog: http://foo2zjs.rkkda.com/ChangeLog
  Ok ? Comments ?
   Giovanni

 ? patches/patch-foo2oak_c
 ? patches/patch-oakdecode_c

This won't build for me.  Looking at the above from your diff, it seems
you didn't 'cvs add' your new *oak* patches before creating your diff.

-ME

Re: UPDATE: print/foo2zjs

2007-11-03 Thread Antoine Jacoutot 

On Sat, 3 Nov 2007, Mike Erdely wrote:

? patches/patch-foo2oak_c
? patches/patch-oakdecode_c


This won't build for me.  Looking at the above from your diff, it seems
you didn't 'cvs add' your new *oak* patches before creating your diff.


Yes, I already asked him twice to tell me if his diff was complete but 
got no useful answer so far.


--
Antoine

Re: UPDATE: print/foo2zjs

2007-11-03 Thread Giovanni Bechis 
On Sat, Nov 03, 2007 at 02:46:13PM -0400, Mike Erdely wrote:
 This won't build for me.  Looking at the above from your diff, it seems
 you didn't 'cvs add' your new *oak* patches before creating your diff.
 
You are right, I forgot it.
 Cheers
  Giovanni
Index: Makefile
===
RCS file: /cvs/ports/print/foo2zjs/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- Makefile26 Sep 2007 06:26:19 -  1.1.1.1
+++ Makefile3 Nov 2007 19:12:38 -
@@ -2,7 +2,7 @@
 
 COMMENT=   driver for ZjStream wire protocol compatible printers
 
-VERSION=   20070901
+VERSION=   20071102
 DISTNAME=  foo2zjs-${VERSION}
 CATEGORIES=print
 
@@ -16,7 +16,7 @@
 PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=  Yes
 
-WANTLIB=   c m 
+WANTLIB=   c
 
 MASTER_SITES=  http://bigio.snb.it/openbsd/distfiles/ \
http://openbsd.dead-parrot.de/distfiles/ \
Index: distinfo
===
RCS file: /cvs/ports/print/foo2zjs/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo26 Sep 2007 06:26:19 -  1.1.1.1
+++ distinfo3 Nov 2007 19:12:38 -
@@ -1,5 +1,5 @@
-MD5 (foo2zjs-20070901.tar.gz) = tLIQeYjKNf8BAu4JLGfcgQ==
-RMD160 (foo2zjs-20070901.tar.gz) = gSiXJ/e29YUvjCL7NCkf1mIUV3w=
-SHA1 (foo2zjs-20070901.tar.gz) = A3Ndn6Z6LDchXpIr9k041CClRLY=
-SHA256 (foo2zjs-20070901.tar.gz) = GcloKyridkUU07Vwuj2fJpbR6C1xbi5Tfc52hcZBzHQ=
-SIZE (foo2zjs-20070901.tar.gz) = 1457733
+MD5 (foo2zjs-20071102.tar.gz) = eTGAgkREeKyvjOfTQoThEw==
+RMD160 (foo2zjs-20071102.tar.gz) = AXYJLlCWZY7n6adNxQFz6auYVFc=
+SHA1 (foo2zjs-20071102.tar.gz) = RzuyK+qm7P0VRPmYpyhcx9sVOU8=
+SHA256 (foo2zjs-20071102.tar.gz) = gp3IgSeQhIlU3iwLXf3/CxDJoXEO68zuq+lhxnOtQeA=
+SIZE (foo2zjs-20071102.tar.gz) = 1517426
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/print/foo2zjs/patches/patch-Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-Makefile
--- patches/patch-Makefile  26 Sep 2007 06:26:19 -  1.1.1.1
+++ patches/patch-Makefile  3 Nov 2007 19:12:38 -
@@ -1,6 +1,6 @@
 $OpenBSD: patch-Makefile,v 1.1.1.1 2007/09/26 06:26:19 ajacoutot Exp $
 Makefile.orig  Wed Jul 18 20:34:22 2007
-+++ Makefile   Tue Sep 25 17:10:02 2007
+--- Makefile.orig  Sat Nov  3 05:22:39 2007
 Makefile   Sat Nov  3 17:19:32 2007
 @@ -6,10 +6,6 @@ SYSNAME := $(shell uname -n)
  # No version number yet...
  VERSION=0.0
@@ -12,10 +12,10 @@
  # Pathnames for this package...
  BIN=$(PREFIX)/bin
  SHAREZJS=$(PREFIX)/share/foo2zjs
-@@ -18,11 +14,11 @@ SHAREHP=$(PREFIX)/share/foo2hp
- SHAREXQX=$(PREFIX)/share/foo2xqx
+@@ -19,11 +15,11 @@ SHAREXQX=$(PREFIX)/share/foo2xqx
  SHARELAVA=$(PREFIX)/share/foo2lava
  SHAREQPDL=$(PREFIX)/share/foo2qpdl
+ SHARESLX=$(PREFIX)/share/foo2slx
 -MANDIR=$(PREFIX)/share/man
 +MANDIR=$(PREFIX)/man
  DOCDIR=$(PREFIX)/share/doc/foo2zjs/
@@ -26,7 +26,7 @@
  
  # User ID's
  LPuid=-olp
-@@ -35,6 +31,10 @@ ifeq ($(UNAME),FreeBSD)
+@@ -40,6 +36,10 @@ ifeq ($(UNAME),OpenBSD)
  LPuid=-oroot
  LPgid=-gwheel
  endif
@@ -37,8 +37,8 @@
  # If we aren't root, don't try to set ownership
  ifneq ($(EUID),0)
  LPuid=
-@@ -46,6 +46,9 @@ MODTIME= date -d 1/1/1970 utc + `stat -t $$1 | cut -f
- ifeq ($(UNAME),FreeBSD)
+@@ -54,6 +54,9 @@ endif
+ ifeq ($(UNAME),OpenBSD)
  MODTIME= stat -f %Sm -t %a %b %d %T %Y $$1
  endif
 +ifeq ($(UNAME),OpenBSD)
@@ -47,7 +47,7 @@
  ifeq ($(UNAME),Darwin)
  MODTIME= stat -f %Sm -t %a %b %d %T %Y $$1
  endif
-@@ -196,7 +199,6 @@ ifeq ($(UNAME),Linux)
+@@ -210,7 +213,6 @@ ifeq ($(UNAME),Linux)
  endif
  
  # Compiler flags
@@ -55,7 +55,7 @@
  #CFLAGS +=-g
  
  #
-@@ -388,7 +390,7 @@ opldecode: opldecode.o $(LIBJBG)
+@@ -444,7 +446,7 @@ slxdecode: slxdecode.o $(LIBJBG)
  #
  # Installation rules
  #
@@ -64,7 +64,7 @@
install-crd install-foo install-ppd install-man install-doc
#
# If you use CUPS, then restart the spooler:
-@@ -434,10 +436,6 @@ install-prog:
+@@ -493,10 +495,6 @@ install-prog:
install -d $(SHAREZJS)/
install -c -m 644 gamma.ps $(SHAREZJS)/
install -c -m 644 gamma-lookup.ps $(SHAREZJS)/
@@ -75,7 +75,7 @@
  
  install-foo:
#
-@@ -450,6 +448,7 @@ install-foo:
+@@ -509,6 +507,7 @@ install-foo:
#
# Install current database files
#
@@ -83,7 +83,7 @@
@if [ -d $(FOODB) ]; then \
for dir in driver printer opt; do \
echo install -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \
-@@ -476,40 +475,6 @@ install-foo:
+@@ -535,40 +534,6 @@ install-foo:
foomatic-combo-xml -O overview.xml; \
fi
  
@@ -124,24 +124,24 @@
  install-extra:
#
# Install extra files (ICM and firmware), if any