pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/print/ghostscript-esp Make CUPS support optional using...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/74ba1131649d
branches:  trunk
changeset: 506971:74ba1131649d
user:      ben <ben%pkgsrc.org@localhost>
date:      Tue Jan 24 15:28:30 2006 +0000

description:
Make CUPS support optional using the pkgsrc option framework.

diffstat:

 print/ghostscript-esp/Makefile   |  21 +--------------------
 print/ghostscript-esp/PLIST      |  12 ++++++------
 print/ghostscript-esp/options.mk |  33 ++++++++++++++++++++++++++++++---
 3 files changed, 37 insertions(+), 29 deletions(-)

diffs (141 lines):

diff -r 40cacd53ad64 -r 74ba1131649d print/ghostscript-esp/Makefile
--- a/print/ghostscript-esp/Makefile    Tue Jan 24 15:26:06 2006 +0000
+++ b/print/ghostscript-esp/Makefile    Tue Jan 24 15:28:30 2006 +0000
@@ -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 @@
 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 @@
 
 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 @@
        ${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 -r 40cacd53ad64 -r 74ba1131649d print/ghostscript-esp/PLIST
--- a/print/ghostscript-esp/PLIST       Tue Jan 24 15:26:06 2006 +0000
+++ b/print/ghostscript-esp/PLIST       Tue Jan 24 15:28:30 2006 +0000
@@ -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/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/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/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 -r 40cacd53ad64 -r 74ba1131649d print/ghostscript-esp/options.mk
--- a/print/ghostscript-esp/options.mk  Tue Jan 24 15:26:06 2006 +0000
+++ b/print/ghostscript-esp/options.mk  Tue Jan 24 15:28:30 2006 +0000
@@ -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 @@
 .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



Home | Main Index | Thread Index | Old Index