From c907456745aef693e7ec291fd569c0b21a54cbbc Mon Sep 17 00:00:00 2001
From: sbd <sbd>
Date: Sun, 8 Jul 2012 07:45:25 +0000
Subject: 1) Add 'bsdlpr' option.

2) Make bsdlpr and cups options the members of a PKG_OPTIONS_NONEMPTY_SETS.
   (Because it is an error to build xfce4-print without lpr and cups support.)

3) On SunOS and Linux make cups the suggested option, otherwise make
   bsdlpr the suggested options.

Bump PKGREVISION.
---
 print/xfce4-print/Makefile   |  9 ++-------
 print/xfce4-print/options.mk | 21 +++++++++++++++++++--
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile
index ca4bf94ab88..0ea7b41e1d9 100644
--- a/print/xfce4-print/Makefile
+++ b/print/xfce4-print/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2012/03/03 00:12:06 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2012/07/08 07:45:25 sbd Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -6,7 +6,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 PKGNAME=	xfce4-print-${XFCE4_VERSION}
 DISTNAME=	xfprint-${XFCE4_VERSION}
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	print
 COMMENT=	Xfce print dialog
 
@@ -21,11 +21,6 @@ MAKE_DIRS+=	${PREFIX}/share/xfce4/doc/fr ${PREFIX}/share/xfce4/doc/fr/images
 
 .include "options.mk"
 
-PLIST_VARS+=	bsdlpr
-.if ${OPSYS} != "SunOS"
-PLIST.bsdlpr=	yes
-.endif
-
 .include "../../devel/xfconf/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../print/a2ps/buildlink3.mk"
diff --git a/print/xfce4-print/options.mk b/print/xfce4-print/options.mk
index 061d03509f4..3dc1ac75817 100644
--- a/print/xfce4-print/options.mk
+++ b/print/xfce4-print/options.mk
@@ -1,10 +1,27 @@
-# $NetBSD: options.mk,v 1.5 2008/04/12 22:43:09 jlam Exp $
+# $NetBSD: options.mk,v 1.6 2012/07/08 07:45:25 sbd Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.xfce4-print
-PKG_SUPPORTED_OPTIONS=	cups
+
+PKG_OPTIONS_NONEMPTY_SETS+=		printing-system
+PKG_OPTIONS_SET.printing-system=	bsdlpr cups
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS" || ${OPSYS} == "Linux"
+PKG_SUGGESTED_OPTIONS+=	cups
+.else
+PKG_SUGGESTED_OPTIONS+=	bsdlpr
+.endif
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=    bsdlpr
+.if !empty(PKG_OPTIONS:Mbsdlpr)
+PLIST.bsdlpr=   yes
+.else
+CONFIGURE_ARGS+=        --disable-bsdlpr
+.endif
+
 PLIST_VARS+=		cups
 .if !empty(PKG_OPTIONS:Mcups)
 .include "../../print/cups/buildlink3.mk"
-- 
cgit v1.2.3