From ade96dba2a8f9c513b9b0f57109213f780ea830f Mon Sep 17 00:00:00 2001 From: obache Date: Sun, 18 Apr 2010 12:02:58 +0000 Subject: Some clean up: * exactly disable python and java support same as perl and php * pdftops filter is installed unconditionally, so change PKG_OPTIONS_GROUP.pdftops to REQUIRED_GROUP * xpdf does not install pdftops tool anymore and using it came from poppler-utils. so deprecate xpdf option and suggest poppler option instead. * change gs option to ghostscript from option.description. * exactly select "gs" or "pdftops" and tell its path to configure script. * change ghostscript dependency from DEPENDS to USE_TOOLS. * exactly disable gssapi support with "-kerberos" option. --- print/cups/Makefile | 4 +++- print/cups/PLIST | 4 ++-- print/cups/options.mk | 28 ++++++++++++++-------------- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/print/cups/Makefile b/print/cups/Makefile index 8602b41f003..44035616b22 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.146 2010/03/21 16:29:42 wiz Exp $ +# $NetBSD: Makefile,v 1.147 2010/04/18 12:02:58 obache Exp $ # # The CUPS author is very good about taking back changes into the main # CUPS distribution. The correct place to send patches or bug-fixes is: @@ -57,6 +57,8 @@ CONFIGURE_ARGS+= --enable-ssl CONFIGURE_ARGS+= --enable-gnutls=no CONFIGURE_ARGS+= --enable-openssl CONFIGURE_ARGS+= --without-php +CONFIGURE_ARGS+= --without-python +CONFIGURE_ARGS+= --without-java CONFIGURE_ENV+= DSOFLAGS=${LDFLAGS:M*:Q} diff --git a/print/cups/PLIST b/print/cups/PLIST index 33a94e5c580..d0973d31f25 100644 --- a/print/cups/PLIST +++ b/print/cups/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.28 2009/06/14 21:16:21 joerg Exp $ +@comment $NetBSD: PLIST,v 1.29 2010/04/18 12:02:58 obache Exp $ bin/cancel bin/cups-config bin/cupstestdsc @@ -48,7 +48,7 @@ libexec/cups/filter/gziptoany libexec/cups/filter/hpgltops libexec/cups/filter/imagetops libexec/cups/filter/imagetoraster -${PLIST.pdftops}libexec/cups/filter/pdftops +libexec/cups/filter/pdftops libexec/cups/filter/pstops libexec/cups/filter/rastertodymo libexec/cups/filter/rastertoepson diff --git a/print/cups/options.mk b/print/cups/options.mk index 091faf16ba1..070285f84b1 100644 --- a/print/cups/options.mk +++ b/print/cups/options.mk @@ -1,26 +1,28 @@ -# $NetBSD: options.mk,v 1.3 2009/06/03 10:20:59 wiz Exp $ +# $NetBSD: options.mk,v 1.4 2010/04/18 12:02:58 obache Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.cups -PKG_OPTIONS_OPTIONAL_GROUPS= pdftops -PKG_OPTIONS_GROUP.pdftops= gs poppler xpdf +PKG_OPTIONS_REQUIRED_GROUPS= pdftops +PKG_OPTIONS_GROUP.pdftops= ghostscript poppler PKG_SUPPORTED_OPTIONS= dnssd kerberos pam slp PKG_SUGGESTED_OPTIONS= dnssd kerberos poppler slp +PKG_OPTIONS_LEGACY_OPTS+= xpdf:poppler gs:ghostscript .include "../../mk/bsd.options.mk" -PLIST_VARS+= pdftops - .if !empty(PKG_OPTIONS:Mdnssd) .include "../../net/mDNSResponder/buildlink3.mk" .endif -.if !empty(PKG_OPTIONS:Mgs) -PLIST.pdftops= yes -DEPENDS+= ghostscript-[0-9]*:../../print/ghostscript +.if !empty(PKG_OPTIONS:Mghostscript) +USE_TOOLS+= gs:run +CONFIGURE_ARGS+= --with-pdftops=gs +CONFIGURE_ENV+= ac_cv_path_CUPS_GHOSTSCRIPT=${TOOLS_PATH.gs} .endif .if !empty(PKG_OPTIONS:Mkerberos) .include "../../mk/krb5.buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-gssapi .endif PLIST_VARS+= pam @@ -36,8 +38,11 @@ MESSAGE_SRC= ${.CURDIR}/MESSAGE .endif .if !empty(PKG_OPTIONS:Mpoppler) -PLIST.pdftops= yes +FIND_PREFIX:= POPPLERDIR=poppler-utils +.include "../../mk/find-prefix.mk" DEPENDS+= poppler-utils-[0-9]*:../../print/poppler-utils +CONFIGURE_ARGS+= --with-pdftops=pdftops +CONFIGURE_ENV+= ac_cv_path_CUPS_PDFTOPS=${POPPLERDIR}/bin/pdftops .endif .if !empty(PKG_OPTIONS:Mslp) @@ -46,8 +51,3 @@ CONFIGURE_ARGS+= --enable-slp .else CONFIGURE_ARGS+= --disable-slp .endif - -.if !empty(PKG_OPTIONS:Mxpdf) -PLIST.pdftops= yes -DEPENDS+= xpdf-[0-9]*:../../print/xpdf -.endif -- cgit v1.2.3