From 226cfc845e9e5a88b8f97f13f64be5c93d0ef27e Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Sat, 4 Aug 2012 14:55:37 +0000
Subject: [PATCH] Properly set dependencies on cups or cups-libs according to
 the subpackage. While here, tweak the README a bit.

---
 print/hplip/Makefile          | 19 ++++++++++++-------
 print/hplip/pkg/README-hpcups |  4 ++--
 print/hplip/pkg/README-main   |  8 ++++----
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/print/hplip/Makefile b/print/hplip/Makefile
index 191aa64f220..89276355080 100644
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.54 2012/06/30 04:22:11 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.55 2012/08/04 14:55:37 ajacoutot Exp $
 
 SHARED_ONLY=	Yes
 
@@ -9,10 +9,6 @@ COMMENT-libs=	HPLIP backend libraries
 COMMENT-gui=	HPLIP graphical tools
 
 V=		3.12.6
-REVISION-main=	2
-REVISION-gui=	0
-REVISION-hpcups=0
-REVISION-libs=	0
 DISTNAME=	hplip-${V}
 
 PKGNAME-main=	${DISTNAME}
@@ -21,6 +17,12 @@ PKGNAME-hpcups=	hpcups-${V}
 PKGNAME-libs=	hplip-libs-${V}
 PKGNAME-gui=	hplip-gui-${V}
 
+REVISION-main=	3
+REVISION-gui=	0
+REVISION-hpcups=1
+REVISION-libs=	0
+REVISION-hpijs=	0
+
 SHARED_LIBS +=  hpmud		2.0 # .0.6
 SHARED_LIBS +=  hpip		2.0 # .0.1
 
@@ -54,7 +56,7 @@ BUILD_DEPENDS=	sysutils/polkit
 
 LIB_DEPENDS-main=${LIB_DEPENDS} \
 		graphics/sane-backends \
-		print/cups>=1.5.0 \
+		print/cups,-libs \
 		print/hplip,-libs
 RUN_DEPENDS-main=${MODPY_RUN_DEPENDS} \
 		print/py-reportlab/reportlab \
@@ -64,6 +66,9 @@ RUN_DEPENDS-main=${MODPY_RUN_DEPENDS} \
 		print/hplip,-hpcups \
 		sysutils/polkit
 
+# package is only useful if cups is installed
+RUN_DEPENDS-main +=	print/cups
+
 WANTLIB-hpijs += ${cWANTLIB} hpip usb-1.0
 WANTLIB-hpijs += c jpeg netsnmp stdc++ dbus-1 hpmud
 LIB_DEPENDS-hpijs= print/hplip,-libs \
@@ -74,7 +79,7 @@ RUN_DEPENDS-hpijs= print/foomatic-filters
 WANTLIB-hpcups += ${cWANTLIB} png tiff z asn1 gssapi krb5 ssl
 WANTLIB-hpcups += c jpeg stdc++ hpip cups cupsimage dbus-1
 LIB_DEPENDS-hpcups= print/hplip,-libs \
-		print/cups>=1.5.0
+		print/cups,-libs
 
 WANTLIB-libs +=	${cWANTLIB} netsnmp usb-1.0
 LIB_DEPENDS-libs= net/net-snmp \
diff --git a/print/hplip/pkg/README-hpcups b/print/hplip/pkg/README-hpcups
index 79e55f79499..61aced9f7f4 100644
--- a/print/hplip/pkg/README-hpcups
+++ b/print/hplip/pkg/README-hpcups
@@ -1,10 +1,10 @@
-$OpenBSD: README-hpcups,v 1.1 2012/01/17 09:54:27 ajacoutot Exp $
+$OpenBSD: README-hpcups,v 1.2 2012/08/04 14:55:37 ajacoutot Exp $
 
 +-----------------------------------------------------------------------
 | Running ${FULLPKGNAME} on OpenBSD
 +-----------------------------------------------------------------------
 
-To add a CUPS printer, use the 'hp-makeuri' command.
+To add a CUPS printer, use the `hp-makeuri' command.
 e.g. for a network printer:
     $ hp-makeuri 192.168.10.100
     <...>
diff --git a/print/hplip/pkg/README-main b/print/hplip/pkg/README-main
index 55f8b32ea8c..aed9a2e045b 100644
--- a/print/hplip/pkg/README-main
+++ b/print/hplip/pkg/README-main
@@ -1,13 +1,13 @@
-$OpenBSD: README-main,v 1.1 2012/01/17 09:54:27 ajacoutot Exp $
+$OpenBSD: README-main,v 1.2 2012/08/04 14:55:37 ajacoutot Exp $
 
 +-----------------------------------------------------------------------
 | Running ${FULLPKGNAME} on OpenBSD
 +-----------------------------------------------------------------------
 
 Communication with the printer is done via CUPS over libusb, make sure
-you read the "USB" section of the OpenBSD documentation that comes with
-the cups package.
+you read the "USB" section of the pkg-readmes documentation that comes
+with the cups package.
 
 To make the hpaio backend available to SANE, simply add "hpaio" to
-its configuration file.  As root:
+the sane-backends configuration file.  As root:
     echo "hpaio" >> ${SYSCONFDIR}/sane.d/dll.conf