Make CUPS support optional using the pkgsrc option framework.

3 files changed, 37 insertions, 29 deletions

diff --git a/print/ghostscript-esp/Makefile b/print/ghostscript-esp/Makefile
index b1b35192625..b70f5d4bc83 100644
--- a/print/ghostscript-esp/Makefile
+++ b/print/ghostscript-esp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/12/29 06:22:07 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2006/01/24 15:28:30 ben Exp $
 
 DISTNAME=	espgs-${GS_VERS}-source
 PKGNAME=	ghostscript-esp-${GS_VERS}
@@ -31,7 +31,6 @@ DEPENDS+=	ghostscript-fonts>=6.0:../../fonts/ghostscript-fonts
 WRKSRC=			${WRKDIR}/${DISTNAME:S/-source//}
 USE_TOOLS+=		gmake pkg-config
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--enable-cups
 CONFIGURE_ARGS+=	--with-ijs
 CONFIGURE_ARGS+=	--without-omni
 CONFIGURE_ARGS+=	--with-drivers=ALL
@@ -65,18 +64,12 @@ CFLAGS+=		-DHAVE_MKSTEMP=1
 
 REPLACE_PERL=		lib/fixmswrd.pl
 
-CUPS_CONFDIR?=		${PKG_SYSCONFBASEDIR}/cups
-CUPS_EGDIR=		${PREFIX}/share/examples/cups
-CUPS_MODEL_DIR=		${PREFIX}/share/cups/model
 DOCDIR=			${PREFIX}/share/doc/ghostscript
 
 PLIST_SUBST+=		GS_VERS=${BASEGS_VERS:Q}
 
-CONF_FILES=	${CUPS_EGDIR}/pstoraster.convs ${CUPS_CONFDIR}/pstoraster.convs
-
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../print/cups/buildlink3.mk"
 .include "../../print/gimp-print-lib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 
@@ -86,18 +79,6 @@ post-extract:
 	${RM} -f ${WRKSRC}/jpeg
 	${LN} -s ${JPEG_WRKSRC} ${WRKSRC}/jpeg
 
-post-install:
-	${INSTALL_PROGRAM_DIR} ${PREFIX}/libexec/cups/filter
-	${INSTALL_SCRIPT} ${WRKSRC}/pstoraster/pstopxl			\
-		${PREFIX}/libexec/cups/filter
-	${INSTALL_SCRIPT} ${WRKSRC}/pstoraster/pstoraster		\
-		${PREFIX}/libexec/cups/filter
-	${INSTALL_DATA_DIR} ${CUPS_MODEL_DIR}
-	${INSTALL_DATA} ${WRKSRC}/pstoraster/pxlcolor.ppd ${CUPS_MODEL_DIR}
-	${INSTALL_DATA} ${WRKSRC}/pstoraster/pxlmono.ppd ${CUPS_MODEL_DIR}
-	${INSTALL_DATA_DIR} ${CUPS_EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/pstoraster/pstoraster.convs ${CUPS_EGDIR}
-
 SUBST_CLASSES+=         ps2epsi-sh
 SUBST_MESSAGE.ps2epsi-sh=   "Fixing ps2epsi shell."
 SUBST_FILES.ps2epsi-sh=     lib/ps2epsi
diff --git a/print/ghostscript-esp/PLIST b/print/ghostscript-esp/PLIST
index a37ccb8f526..3f5308562aa 100644
--- a/print/ghostscript-esp/PLIST
+++ b/print/ghostscript-esp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2005/11/21 06:17:58 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/01/24 15:28:30 ben Exp $
 bin/bdftops
 bin/dvipdf
 bin/eps2eps
@@ -29,8 +29,8 @@ bin/ps2ps
 bin/pv.sh
 bin/unix-lpr.sh
 bin/wftopfa
-libexec/cups/filter/pstopxl
-libexec/cups/filter/pstoraster
+${CUPS}libexec/cups/filter/pstopxl
+${CUPS}libexec/cups/filter/pstoraster
 man/de/man1/dvipdf.1
 man/de/man1/eps2eps.1
 man/de/man1/font2c.1
@@ -69,8 +69,8 @@ man/man1/ps2pdf13.1
 man/man1/ps2pdfwr.1
 man/man1/ps2ps.1
 man/man1/wftopfa.1
-share/cups/model/pxlcolor.ppd
-share/cups/model/pxlmono.ppd
+${CUPS}share/cups/model/pxlcolor.ppd
+${CUPS}share/cups/model/pxlmono.ppd
 share/doc/ghostscript/API.htm
 share/doc/ghostscript/Bug-form.htm
 share/doc/ghostscript/Bug-info.htm
@@ -113,7 +113,7 @@ share/doc/ghostscript/Use.htm
 share/doc/ghostscript/Xfonts.htm
 share/doc/ghostscript/gs.css
 share/doc/ghostscript/index.html
-share/examples/cups/pstoraster.convs
+${CUPS}share/examples/cups/pstoraster.convs
 share/examples/ghostscript/alphabet.ps
 share/examples/ghostscript/colorcir.ps
 share/examples/ghostscript/doretree.ps
diff --git a/print/ghostscript-esp/options.mk b/print/ghostscript-esp/options.mk
index 1918659bead..5d412cb4a66 100644
--- a/print/ghostscript-esp/options.mk
+++ b/print/ghostscript-esp/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2005/12/09 20:30:16 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2006/01/24 15:28:30 ben Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ghostscript-esp
-PKG_SUPPORTED_OPTIONS=	x11
-PKG_SUGGESTED_OPTIONS=	x11
+PKG_SUPPORTED_OPTIONS=	x11 cups
+PKG_SUGGESTED_OPTIONS=	x11 cups
 
 .include "../../mk/bsd.options.mk"
 
@@ -12,3 +12,30 @@ CONFIGURE_ARGS+=	--with-x
 .else
 CONFIGURE_ARGS+=        --without-x
 .endif
+
+.if !empty(PKG_OPTIONS:Mcups)
+CONFIGURE_ARGS+=	--enable-cups
+PLIST_SUBST+=		CUPS=
+
+CUPS_CONFDIR?=	${PKG_SYSCONFBASEDIR}/cups
+CUPS_EGDIR=	${PREFIX}/share/examples/cups
+CUPS_MODEL_DIR=	${PREFIX}/share/cups/model
+CONF_FILES=	${CUPS_EGDIR}/pstoraster.convs ${CUPS_CONFDIR}/pstoraster.convs
+
+.include "../../print/cups/buildlink3.mk"
+post-install: ghostscript-esp-cups-install
+ghostscript-esp-cups-install:
+	${INSTALL_PROGRAM_DIR} ${PREFIX}/libexec/cups/filter
+	${INSTALL_SCRIPT} ${WRKSRC}/pstoraster/pstopxl			\
+		${PREFIX}/libexec/cups/filter
+	${INSTALL_SCRIPT} ${WRKSRC}/pstoraster/pstoraster		\
+		${PREFIX}/libexec/cups/filter
+	${INSTALL_DATA_DIR} ${CUPS_MODEL_DIR}
+	${INSTALL_DATA} ${WRKSRC}/pstoraster/pxlcolor.ppd ${CUPS_MODEL_DIR}
+	${INSTALL_DATA} ${WRKSRC}/pstoraster/pxlmono.ppd ${CUPS_MODEL_DIR}
+	${INSTALL_DATA_DIR} ${CUPS_EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/pstoraster/pstoraster.convs ${CUPS_EGDIR}
+.else
+CONFIGURE_ARGS+=	--disable-cups
+PLIST_SUBST+=		CUPS="@comment "
+.endif