From 83510ea9468799638fd399f7d4b5d5084c4fd776 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Fri, 19 Oct 2012 09:34:48 +0000
Subject: [PATCH] Merge -cups into -main since cups,-libs does not depend on
 anything.

---
 print/foo2zjs/Makefile                    | 21 +++++++--------------
 print/foo2zjs/pkg/{DESCR-main => DESCR}   |  0
 print/foo2zjs/pkg/DESCR-cups              |  6 ------
 print/foo2zjs/pkg/{PLIST-main => PLIST}   |  7 ++++++-
 print/foo2zjs/pkg/PLIST-cups              |  3 ---
 print/foo2zjs/pkg/{README-main => README} |  2 +-
 6 files changed, 14 insertions(+), 25 deletions(-)
 rename print/foo2zjs/pkg/{DESCR-main => DESCR} (100%)
 delete mode 100644 print/foo2zjs/pkg/DESCR-cups
 rename print/foo2zjs/pkg/{PLIST-main => PLIST} (98%)
 delete mode 100644 print/foo2zjs/pkg/PLIST-cups
 rename print/foo2zjs/pkg/{README-main => README} (93%)

diff --git a/print/foo2zjs/Makefile b/print/foo2zjs/Makefile
index 20a226e270b..da575634c5e 100644
--- a/print/foo2zjs/Makefile
+++ b/print/foo2zjs/Makefile
@@ -1,13 +1,11 @@
-# $OpenBSD: Makefile,v 1.35 2012/10/12 20:00:38 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.36 2012/10/19 09:34:48 ajacoutot Exp $
 
-COMMENT-main=	driver for ZjStream wire protocol compatible printers
-COMMENT-cups=	Konica-Minolta foo2zjs command filter for CUPS
+COMMENT=	driver for ZjStream wire protocol compatible printers
 
 VERSION=	20120909
 DISTNAME=	foo2zjs-${VERSION}
 
-PKGNAME-main=	${DISTNAME}
-PKGNAME-cups=	foo2zjs-cup-${VERSION}
+REVISION=	0
 
 CATEGORIES=	print
 
@@ -21,25 +19,20 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB += c
+WANTLIB += c cups m pthread
 
 MASTER_SITES=	http://distfiles.bsdfrog.org/
 
-MULTI_PACKAGES=	-main -cups
-
 USE_GMAKE=	Yes
+
 WRKDIST=	${WRKDIR}/foo2zjs
 
 BUILD_DEPENDS=	print/ghostscript/gnu # ps2pdf
 
-WANTLIB-main += ${WANTLIB} m
+LIB_DEPENDS=	print/cups,-libs
 
 # share/foomatic/db/source/*/*.xml
-RUN_DEPENDS-main +=	print/foomatic-db-engine
-
-WANTLIB-cups += ${WANTLIB} cups pthread
-RUN_DEPENDS-cups=${BASE_PKGPATH},-main
-LIB_DEPENDS-cups=print/cups,-libs
+RUN_DEPENDS +=	print/foomatic-db-engine
 
 MAKE_FLAGS+=	CUPS_SERVERBIN=`cups-config --serverbin`
 
diff --git a/print/foo2zjs/pkg/DESCR-main b/print/foo2zjs/pkg/DESCR
similarity index 100%
rename from print/foo2zjs/pkg/DESCR-main
rename to print/foo2zjs/pkg/DESCR
diff --git a/print/foo2zjs/pkg/DESCR-cups b/print/foo2zjs/pkg/DESCR-cups
deleted file mode 100644
index 3cd9ddd9a21..00000000000
--- a/print/foo2zjs/pkg/DESCR-cups
+++ /dev/null
@@ -1,6 +0,0 @@
-foo2zjs is an open source printer driver for printers that use the
-Zenographics ZjStream wire protocol for their print data, such as the
-Minolta/QMS magicolor 2300 DL or Konica Minolta magicolor 2430 DL.
-
-This package contains the Konica-Minolta command filter for the Common
-UNIX Printing System.
diff --git a/print/foo2zjs/pkg/PLIST-main b/print/foo2zjs/pkg/PLIST
similarity index 98%
rename from print/foo2zjs/pkg/PLIST-main
rename to print/foo2zjs/pkg/PLIST
index 1dae0e6aaf7..3d91bef6a0a 100644
--- a/print/foo2zjs/pkg/PLIST-main
+++ b/print/foo2zjs/pkg/PLIST
@@ -1,5 +1,8 @@
-@comment $OpenBSD: PLIST-main,v 1.10 2012/08/17 13:54:26 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.9 2012/10/19 09:34:48 ajacoutot Exp $
 @conflict foomatic-db-<4.0.20091207p1
+@conflict foo2zjs-cup-*
+@pkgpath print/foo2zjs,-cups
+@pkgpath print/foo2zjs,-main
 @unexec-delete rm -f %D/share/foo2hiperc/icm/*
 @unexec-delete rm -f %D/share/foo2hp/icm/*
 @unexec-delete rm -f %D/share/foo2lava/icm/*
@@ -10,6 +13,7 @@
 @unexec-delete rm -f %D/share/foo2zjs/firmware/*
 @unexec-delete rm -f %D/share/foo2zjs/icm/*
 @bin bin/arm2hpdl
+@bin bin/command2foo2lava-pjl
 @bin bin/foo2hiperc
 bin/foo2hiperc-wrapper
 @bin bin/foo2hp
@@ -39,6 +43,7 @@ bin/printer-profile
 @bin bin/slxdecode
 @bin bin/xqxdecode
 @bin bin/zjsdecode
+libexec/cups/filter/command2foo2lava-pjl
 @man man/man1/arm2hpdl.1
 @man man/man1/foo2hiperc-wrapper.1
 @man man/man1/foo2hiperc.1
diff --git a/print/foo2zjs/pkg/PLIST-cups b/print/foo2zjs/pkg/PLIST-cups
deleted file mode 100644
index 93d8a245cfc..00000000000
--- a/print/foo2zjs/pkg/PLIST-cups
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $OpenBSD: PLIST-cups,v 1.1 2010/07/31 10:31:58 ajacoutot Exp $
-@bin bin/command2foo2lava-pjl
-libexec/cups/filter/command2foo2lava-pjl
diff --git a/print/foo2zjs/pkg/README-main b/print/foo2zjs/pkg/README
similarity index 93%
rename from print/foo2zjs/pkg/README-main
rename to print/foo2zjs/pkg/README
index 24c0f87e7eb..bc36465355c 100644
--- a/print/foo2zjs/pkg/README-main
+++ b/print/foo2zjs/pkg/README
@@ -1,4 +1,4 @@
-$OpenBSD: README-main,v 1.4 2012/08/04 14:41:07 ajacoutot Exp $
+$OpenBSD: README,v 1.1 2012/10/19 09:34:48 ajacoutot Exp $
 
 +-----------------------------------------------------------------------
 | Running ${FULLPKGNAME} on OpenBSD