Sun Apr 18 12:02:59 2010 UTC ()
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.


(obache)
diff -r1.146 -r1.147 pkgsrc/print/cups/Makefile
diff -r1.28 -r1.29 pkgsrc/print/cups/PLIST
diff -r1.3 -r1.4 pkgsrc/print/cups/options.mk
cvs diff -r1.146 -r1.147 pkgsrc/print/cups/Makefile (expand / switch to unified diff)

--- pkgsrc/print/cups/Makefile 2010/03/21 16:29:42 1.146
+++ pkgsrc/print/cups/Makefile 2010/04/18 12:02:58 1.147
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.146 2010/03/21 16:29:42 wiz Exp $ 1# $NetBSD: Makefile,v 1.147 2010/04/18 12:02:58 obache Exp $
2# 2#
3# The CUPS author is very good about taking back changes into the main 3# The CUPS author is very good about taking back changes into the main
4# CUPS distribution. The correct place to send patches or bug-fixes is: 4# CUPS distribution. The correct place to send patches or bug-fixes is:
5# cups-bugs@cups.org. 5# cups-bugs@cups.org.
6 6
7DISTNAME= cups-${DIST_VERS}-source 7DISTNAME= cups-${DIST_VERS}-source
8PKGNAME= cups-${VERS} 8PKGNAME= cups-${VERS}
9BASE_VERS= 1.3.11 9BASE_VERS= 1.3.11
10DIST_VERS= ${BASE_VERS} 10DIST_VERS= ${BASE_VERS}
11DIST_SUBDIR= cups-${DIST_VERS} # temp fix for updated distfile 11DIST_SUBDIR= cups-${DIST_VERS} # temp fix for updated distfile
12VERS= ${DIST_VERS:S/-/./g} 12VERS= ${DIST_VERS:S/-/./g}
13PKGREVISION= 3 13PKGREVISION= 3
14CATEGORIES= print 14CATEGORIES= print
@@ -47,26 +47,28 @@ CONFIGURE_ARGS+= --with-docdir=${PREFIX} @@ -47,26 +47,28 @@ CONFIGURE_ARGS+= --with-docdir=${PREFIX}
47CONFIGURE_ARGS+= --with-serverbindir=${PREFIX}/libexec/cups 47CONFIGURE_ARGS+= --with-serverbindir=${PREFIX}/libexec/cups
48CONFIGURE_ARGS+= --with-rcdir=${RCD_SCRIPTS_DIR:Q} 48CONFIGURE_ARGS+= --with-rcdir=${RCD_SCRIPTS_DIR:Q}
49CONFIGURE_ARGS+= --with-cups-user=${CUPS_USER:Q} 49CONFIGURE_ARGS+= --with-cups-user=${CUPS_USER:Q}
50CONFIGURE_ARGS+= --with-cups-group=${CUPS_GROUP:Q} 50CONFIGURE_ARGS+= --with-cups-group=${CUPS_GROUP:Q}
51CONFIGURE_ARGS+= --with-manext=bsd 51CONFIGURE_ARGS+= --with-manext=bsd
52CONFIGURE_ARGS+= --without-perl 52CONFIGURE_ARGS+= --without-perl
53CONFIGURE_ARGS+= --without-icondir 53CONFIGURE_ARGS+= --without-icondir
54CONFIGURE_ARGS+= --without-menudir 54CONFIGURE_ARGS+= --without-menudir
55CONFIGURE_ARGS+= --enable-libtool 55CONFIGURE_ARGS+= --enable-libtool
56CONFIGURE_ARGS+= --enable-ssl 56CONFIGURE_ARGS+= --enable-ssl
57CONFIGURE_ARGS+= --enable-gnutls=no 57CONFIGURE_ARGS+= --enable-gnutls=no
58CONFIGURE_ARGS+= --enable-openssl 58CONFIGURE_ARGS+= --enable-openssl
59CONFIGURE_ARGS+= --without-php 59CONFIGURE_ARGS+= --without-php
 60CONFIGURE_ARGS+= --without-python
 61CONFIGURE_ARGS+= --without-java
60 62
61CONFIGURE_ENV+= DSOFLAGS=${LDFLAGS:M*:Q} 63CONFIGURE_ENV+= DSOFLAGS=${LDFLAGS:M*:Q}
62 64
63.include "../../mk/bsd.prefs.mk" 65.include "../../mk/bsd.prefs.mk"
64.include "options.mk" 66.include "options.mk"
65 67
66# CUPS_USER username of the CUPS administrator 68# CUPS_USER username of the CUPS administrator
67# CUPS_GROUP group of the CUPS administrator 69# CUPS_GROUP group of the CUPS administrator
68# 70#
69CUPS_USER?= lp 71CUPS_USER?= lp
70CUPS_GROUP?= sys 72CUPS_GROUP?= sys
71FILES_SUBST+= CUPS_USER=${CUPS_USER:Q} 73FILES_SUBST+= CUPS_USER=${CUPS_USER:Q}
72FILES_SUBST+= CUPS_GROUP=${CUPS_GROUP:Q} 74FILES_SUBST+= CUPS_GROUP=${CUPS_GROUP:Q}
cvs diff -r1.28 -r1.29 pkgsrc/print/cups/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/print/cups/Attic/PLIST 2009/06/14 21:16:21 1.28
+++ pkgsrc/print/cups/Attic/PLIST 2010/04/18 12:02:58 1.29
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.28 2009/06/14 21:16:21 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.29 2010/04/18 12:02:58 obache Exp $
2bin/cancel 2bin/cancel
3bin/cups-config 3bin/cups-config
4bin/cupstestdsc 4bin/cupstestdsc
5bin/cupstestppd 5bin/cupstestppd
6bin/lp 6bin/lp
7bin/lpoptions 7bin/lpoptions
8bin/lppasswd 8bin/lppasswd
9bin/lpq 9bin/lpq
10bin/lpr 10bin/lpr
11bin/lprm 11bin/lprm
12bin/lpstat 12bin/lpstat
13include/cups/adminutil.h 13include/cups/adminutil.h
14include/cups/array.h 14include/cups/array.h
@@ -38,27 +38,27 @@ libexec/cups/backend/usb @@ -38,27 +38,27 @@ libexec/cups/backend/usb
38libexec/cups/cgi-bin/admin.cgi 38libexec/cups/cgi-bin/admin.cgi
39libexec/cups/cgi-bin/classes.cgi 39libexec/cups/cgi-bin/classes.cgi
40libexec/cups/cgi-bin/help.cgi 40libexec/cups/cgi-bin/help.cgi
41libexec/cups/cgi-bin/jobs.cgi 41libexec/cups/cgi-bin/jobs.cgi
42libexec/cups/cgi-bin/printers.cgi 42libexec/cups/cgi-bin/printers.cgi
43libexec/cups/daemon/cups-deviced 43libexec/cups/daemon/cups-deviced
44libexec/cups/daemon/cups-driverd 44libexec/cups/daemon/cups-driverd
45libexec/cups/daemon/cups-lpd 45libexec/cups/daemon/cups-lpd
46libexec/cups/daemon/cups-polld 46libexec/cups/daemon/cups-polld
47libexec/cups/filter/gziptoany 47libexec/cups/filter/gziptoany
48libexec/cups/filter/hpgltops 48libexec/cups/filter/hpgltops
49libexec/cups/filter/imagetops 49libexec/cups/filter/imagetops
50libexec/cups/filter/imagetoraster 50libexec/cups/filter/imagetoraster
51${PLIST.pdftops}libexec/cups/filter/pdftops 51libexec/cups/filter/pdftops
52libexec/cups/filter/pstops 52libexec/cups/filter/pstops
53libexec/cups/filter/rastertodymo 53libexec/cups/filter/rastertodymo
54libexec/cups/filter/rastertoepson 54libexec/cups/filter/rastertoepson
55libexec/cups/filter/rastertohp 55libexec/cups/filter/rastertohp
56libexec/cups/filter/rastertolabel 56libexec/cups/filter/rastertolabel
57libexec/cups/filter/texttops 57libexec/cups/filter/texttops
58libexec/cups/monitor/bcp 58libexec/cups/monitor/bcp
59libexec/cups/monitor/tbcp 59libexec/cups/monitor/tbcp
60libexec/cups/notifier/mailto 60libexec/cups/notifier/mailto
61libexec/cups/notifier/rss 61libexec/cups/notifier/rss
62man/man1/cancel.1 62man/man1/cancel.1
63man/man1/cups-config.1 63man/man1/cups-config.1
64man/man1/cupstestdsc.1 64man/man1/cupstestdsc.1
cvs diff -r1.3 -r1.4 pkgsrc/print/cups/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/print/cups/Attic/options.mk 2009/06/03 10:20:59 1.3
+++ pkgsrc/print/cups/Attic/options.mk 2010/04/18 12:02:58 1.4
@@ -1,53 +1,53 @@ @@ -1,53 +1,53 @@
1# $NetBSD: options.mk,v 1.3 2009/06/03 10:20:59 wiz Exp $ 1# $NetBSD: options.mk,v 1.4 2010/04/18 12:02:58 obache Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.cups 3PKG_OPTIONS_VAR= PKG_OPTIONS.cups
4PKG_OPTIONS_OPTIONAL_GROUPS= pdftops 4PKG_OPTIONS_REQUIRED_GROUPS= pdftops
5PKG_OPTIONS_GROUP.pdftops= gs poppler xpdf 5PKG_OPTIONS_GROUP.pdftops= ghostscript poppler
6PKG_SUPPORTED_OPTIONS= dnssd kerberos pam slp 6PKG_SUPPORTED_OPTIONS= dnssd kerberos pam slp
7PKG_SUGGESTED_OPTIONS= dnssd kerberos poppler slp 7PKG_SUGGESTED_OPTIONS= dnssd kerberos poppler slp
 8PKG_OPTIONS_LEGACY_OPTS+= xpdf:poppler gs:ghostscript
8 9
9.include "../../mk/bsd.options.mk" 10.include "../../mk/bsd.options.mk"
10 11
11PLIST_VARS+= pdftops 
12 
13.if !empty(PKG_OPTIONS:Mdnssd) 12.if !empty(PKG_OPTIONS:Mdnssd)
14.include "../../net/mDNSResponder/buildlink3.mk" 13.include "../../net/mDNSResponder/buildlink3.mk"
15.endif 14.endif
16 15
17.if !empty(PKG_OPTIONS:Mgs) 16.if !empty(PKG_OPTIONS:Mghostscript)
18PLIST.pdftops= yes 17USE_TOOLS+= gs:run
19DEPENDS+= ghostscript-[0-9]*:../../print/ghostscript 18CONFIGURE_ARGS+= --with-pdftops=gs
 19CONFIGURE_ENV+= ac_cv_path_CUPS_GHOSTSCRIPT=${TOOLS_PATH.gs}
20.endif 20.endif
21 21
22.if !empty(PKG_OPTIONS:Mkerberos) 22.if !empty(PKG_OPTIONS:Mkerberos)
23.include "../../mk/krb5.buildlink3.mk" 23.include "../../mk/krb5.buildlink3.mk"
 24.else
 25CONFIGURE_ARGS+= --disable-gssapi
24.endif 26.endif
25 27
26PLIST_VARS+= pam 28PLIST_VARS+= pam
27.if !empty(PKG_OPTIONS:Mpam) 29.if !empty(PKG_OPTIONS:Mpam)
28. include "../../mk/pam.buildlink3.mk" 30. include "../../mk/pam.buildlink3.mk"
29CONFIGURE_ARGS+= --enable-pam 31CONFIGURE_ARGS+= --enable-pam
30MESSAGE_SRC= ${PKGDIR}/MESSAGE 32MESSAGE_SRC= ${PKGDIR}/MESSAGE
31MESSAGE_SRC+= ${PKGDIR}/MESSAGE.pam 33MESSAGE_SRC+= ${PKGDIR}/MESSAGE.pam
32PLIST.pam= yes 34PLIST.pam= yes
33.else 35.else
34CONFIGURE_ARGS+= --disable-pam 36CONFIGURE_ARGS+= --disable-pam
35MESSAGE_SRC= ${.CURDIR}/MESSAGE 37MESSAGE_SRC= ${.CURDIR}/MESSAGE
36.endif 38.endif
37 39
38.if !empty(PKG_OPTIONS:Mpoppler) 40.if !empty(PKG_OPTIONS:Mpoppler)
39PLIST.pdftops= yes 41FIND_PREFIX:= POPPLERDIR=poppler-utils
 42.include "../../mk/find-prefix.mk"
40DEPENDS+= poppler-utils-[0-9]*:../../print/poppler-utils 43DEPENDS+= poppler-utils-[0-9]*:../../print/poppler-utils
 44CONFIGURE_ARGS+= --with-pdftops=pdftops
 45CONFIGURE_ENV+= ac_cv_path_CUPS_PDFTOPS=${POPPLERDIR}/bin/pdftops
41.endif 46.endif
42 47
43.if !empty(PKG_OPTIONS:Mslp) 48.if !empty(PKG_OPTIONS:Mslp)
44.include "../../net/openslp/buildlink3.mk" 49.include "../../net/openslp/buildlink3.mk"
45CONFIGURE_ARGS+= --enable-slp 50CONFIGURE_ARGS+= --enable-slp
46.else 51.else
47CONFIGURE_ARGS+= --disable-slp 52CONFIGURE_ARGS+= --disable-slp
48.endif 53.endif
49 
50.if !empty(PKG_OPTIONS:Mxpdf) 
51PLIST.pdftops= yes 
52DEPENDS+= xpdf-[0-9]*:../../print/xpdf 
53.endif