diff options
author | sbd <sbd> | 2010-05-20 09:35:58 +0000 |
---|---|---|
committer | sbd <sbd> | 2010-05-20 09:35:58 +0000 |
commit | 75969cc461b4dcca86b877bfd44a651b788ae696 (patch) | |
tree | 77e7d549592ed00bf5825d59a9f8cfbf696e7b53 /print/cups | |
parent | c15526ff23f9443f3b2d7d28e9d88b7956137cc2 (diff) | |
download | pkgsrc-75969cc461b4dcca86b877bfd44a651b788ae696.tar.gz |
Cleanup of the Makefile and options.mk:
* Remove unneeded ${VARS} variable.
* add a blank line after PKGREVISON for readability.
* remove unneeded --with-rcdir and --enable-gnutls=no from CONFIGURE_ARGS.
* reorder part of CONFIGURE_ARGS for a little more readability.
* explicitly enable jpeg/png/tiff.
* change a LOCALBASE reference to PREFIX (pkglint warning).
* remove write permission from a set-uid program (checkperms warning).
* add "set -e" in front of shell for loops (pkglint warning)
* explicitly enable/disable dnssd and gssapi in options.
Diffstat (limited to 'print/cups')
-rw-r--r-- | print/cups/Makefile | 26 | ||||
-rw-r--r-- | print/cups/options.mk | 6 |
2 files changed, 19 insertions, 13 deletions
diff --git a/print/cups/Makefile b/print/cups/Makefile index 0760368f9de..757af0b1bfb 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -1,16 +1,16 @@ -# $NetBSD: Makefile,v 1.150 2010/05/20 08:05:29 sbd Exp $ +# $NetBSD: Makefile,v 1.151 2010/05/20 09:35:58 sbd 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: # cups-bugs@cups.org. DISTNAME= cups-${DIST_VERS}-source -PKGNAME= cups-${VERS} +PKGNAME= cups-${DIST_VERS:S/-/./g} BASE_VERS= 1.3.11 DIST_VERS= ${BASE_VERS} DIST_SUBDIR= cups-${DIST_VERS} # temp fix for updated distfile -VERS= ${DIST_VERS:S/-/./g} PKGREVISION= 3 + CATEGORIES= print MASTER_SITES= http://ftp.easysw.com/pub/cups/${BASE_VERS}/ \ ftp://ftp.easysw.com/pub/cups/${BASE_VERS}/ \ @@ -45,17 +45,18 @@ CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} CONFIGURE_ARGS+= --with-cachedir=${VARBASE:Q}/cache/cups CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/cups CONFIGURE_ARGS+= --with-serverbindir=${PREFIX}/libexec/cups -CONFIGURE_ARGS+= --with-rcdir=${RCD_SCRIPTS_DIR:Q} CONFIGURE_ARGS+= --with-cups-user=${CUPS_USER:Q} CONFIGURE_ARGS+= --with-cups-group=${CUPS_GROUP:Q} -CONFIGURE_ARGS+= --with-manext=bsd -CONFIGURE_ARGS+= --without-perl -CONFIGURE_ARGS+= --without-icondir -CONFIGURE_ARGS+= --without-menudir CONFIGURE_ARGS+= --enable-libtool +CONFIGURE_ARGS+= --enable-jpeg +CONFIGURE_ARGS+= --enable-png +CONFIGURE_ARGS+= --enable-tiff CONFIGURE_ARGS+= --enable-ssl -CONFIGURE_ARGS+= --enable-gnutls=no CONFIGURE_ARGS+= --enable-openssl +CONFIGURE_ARGS+= --with-manext=bsd +CONFIGURE_ARGS+= --without-icondir +CONFIGURE_ARGS+= --without-menudir +CONFIGURE_ARGS+= --without-perl CONFIGURE_ARGS+= --without-php CONFIGURE_ARGS+= --without-python CONFIGURE_ARGS+= --without-java @@ -121,7 +122,7 @@ SUBST_STAGE.paths= post-patch SUBST_CLASSES+= rpathfix SUBST_FILES.rpathfix= cups-config.in SUBST_MESSAGE.rpathfix= Adding rpath to cups-config. -SUBST_SED.rpathfix= -e 's|@EXPORT_LDFLAGS@|${COMPILER_RPATH_FLAG}${LOCALBASE}/lib|g' +SUBST_SED.rpathfix= -e 's|@EXPORT_LDFLAGS@|${COMPILER_RPATH_FLAG}${PREFIX}/lib|g' SUBST_STAGE.rpathfix= post-patch INSTALLATION_DIRS= ${DOCDIR} ${EGDIR} @@ -134,11 +135,12 @@ post-extract: ${CP} ${FILESDIR}/cups.pam ${WRKDIR}/cups.pam post-install: - for file in LICENSE.txt README.txt; do \ + ${RUN} chmod -r ${DESTDIR}${PREFIX}/bin/lppasswd + set -e; for file in LICENSE.txt README.txt; do \ ${INSTALL_DATA} ${WRKSRC}/$${file} \ ${DESTDIR}${DOCDIR}/$${file}; \ done - cd ${WRKSRC}/conf; for file in *.conf mime.convs mime.types; do \ + set -e; cd ${WRKSRC}/conf; for file in *.conf mime.convs mime.types; do \ case $${file} in \ pam.conf) \ ;; \ diff --git a/print/cups/options.mk b/print/cups/options.mk index 070285f84b1..4ce4244b5cc 100644 --- a/print/cups/options.mk +++ b/print/cups/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2010/04/18 12:02:58 obache Exp $ +# $NetBSD: options.mk,v 1.5 2010/05/20 09:35:58 sbd Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.cups PKG_OPTIONS_REQUIRED_GROUPS= pdftops @@ -11,6 +11,9 @@ PKG_OPTIONS_LEGACY_OPTS+= xpdf:poppler gs:ghostscript .if !empty(PKG_OPTIONS:Mdnssd) .include "../../net/mDNSResponder/buildlink3.mk" +CONFIGURE_ARGS+= --enable-dnssd +.else +CONFIGURE_ARGS+= --disable-dnssd .endif .if !empty(PKG_OPTIONS:Mghostscript) @@ -21,6 +24,7 @@ CONFIGURE_ENV+= ac_cv_path_CUPS_GHOSTSCRIPT=${TOOLS_PATH.gs} .if !empty(PKG_OPTIONS:Mkerberos) .include "../../mk/krb5.buildlink3.mk" +CONFIGURE_ARGS+= --enable-gssapi .else CONFIGURE_ARGS+= --disable-gssapi .endif |