Sat Aug 23 20:02:11 2014 UTC ()
Makefile:
    bump PKGREVISION;
    drop a number of no longer supported configuration flags
    Add cups-files.conf to the list of CONF_FILES
PLIST:
    add cups-files.conf to example files installed
options.mk:
    remove a number of now meaningless configuration options.


(schnoebe)
diff -r1.211 -r1.212 pkgsrc/print/cups/Makefile
diff -r1.43 -r1.44 pkgsrc/print/cups/PLIST
diff -r1.104 -r1.105 pkgsrc/print/cups/distinfo
diff -r1.17 -r1.18 pkgsrc/print/cups/options.mk
cvs diff -r1.211 -r1.212 pkgsrc/print/cups/Makefile (expand / switch to unified diff)

--- pkgsrc/print/cups/Makefile 2014/08/22 21:54:38 1.211
+++ pkgsrc/print/cups/Makefile 2014/08/23 20:02:11 1.212
@@ -1,23 +1,24 @@ @@ -1,23 +1,24 @@
1# $NetBSD: Makefile,v 1.211 2014/08/22 21:54:38 wiz Exp $ 1# $NetBSD: Makefile,v 1.212 2014/08/23 20:02:11 schnoebe 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-${DIST_VERS:S/-/./g} 8PKGNAME= cups-${DIST_VERS:S/-/./g}
9PKGREVISION= 1 9PKGREVISION= 2
10BASE_VERS= 1.7.4 10BASE_VERS= 1.7.4
 11#BASE_VERS= 1.7.5
11DIST_VERS= ${BASE_VERS} 12DIST_VERS= ${BASE_VERS}
12CATEGORIES= print 13CATEGORIES= print
13MASTER_SITES= http://www.cups.org/software/${BASE_VERS}/ 14MASTER_SITES= http://www.cups.org/software/${BASE_VERS}/
14EXTRACT_SUFX= .tar.bz2 15EXTRACT_SUFX= .tar.bz2
15 16
16MAINTAINER= sbd@NetBSD.org 17MAINTAINER= sbd@NetBSD.org
17HOMEPAGE= http://www.cups.org/ 18HOMEPAGE= http://www.cups.org/
18COMMENT= Common UNIX Printing System 19COMMENT= Common UNIX Printing System
19LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2 20LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2
20 21
21CONFLICTS+= LPRng-[0-9]* LPRng-core-[0-9]* 22CONFLICTS+= LPRng-[0-9]* LPRng-core-[0-9]*
22 23
23#PKG_INSTALLATION_TYPES= overwrite pkgviews 24#PKG_INSTALLATION_TYPES= overwrite pkgviews
@@ -33,43 +34,37 @@ AUTOCONF_REQD= 2.60 @@ -33,43 +34,37 @@ AUTOCONF_REQD= 2.60
33 34
34GNU_CONFIGURE= yes 35GNU_CONFIGURE= yes
35CONFIGURE_ARGS+= --localedir=${PREFIX}/${PKGLOCALEDIR}/locale 36CONFIGURE_ARGS+= --localedir=${PREFIX}/${PKGLOCALEDIR}/locale
36CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} 37CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
37CONFIGURE_ARGS+= --localstatedir=${VARBASE} 38CONFIGURE_ARGS+= --localstatedir=${VARBASE}
38CONFIGURE_ARGS+= --with-cachedir=${CUPS_CACHE:Q} 39CONFIGURE_ARGS+= --with-cachedir=${CUPS_CACHE:Q}
39CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/cups 40CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/cups
40CONFIGURE_ARGS+= --with-serverbindir=${PREFIX}/libexec/cups 41CONFIGURE_ARGS+= --with-serverbindir=${PREFIX}/libexec/cups
41CONFIGURE_ARGS+= --with-cups-user=${CUPS_USER} 42CONFIGURE_ARGS+= --with-cups-user=${CUPS_USER}
42CONFIGURE_ARGS+= --with-cups-group=${CUPS_GROUP} 43CONFIGURE_ARGS+= --with-cups-group=${CUPS_GROUP}
43CONFIGURE_ARGS+= --with-system-groups=${CUPS_SYSTEM_GROUPS:Q} 44CONFIGURE_ARGS+= --with-system-groups=${CUPS_SYSTEM_GROUPS:Q}
44CONFIGURE_ARGS+= --enable-libpaper 45CONFIGURE_ARGS+= --enable-libpaper
45CONFIGURE_ARGS+= --enable-libtool 46CONFIGURE_ARGS+= --enable-libtool
46CONFIGURE_ARGS+= --enable-jpeg 
47CONFIGURE_ARGS+= --enable-png 
48CONFIGURE_ARGS+= --enable-tiff 
49CONFIGURE_ARGS+= --enable-ssl 47CONFIGURE_ARGS+= --enable-ssl
50CONFIGURE_ARGS+= --enable-openssl 48CONFIGURE_ARGS+= --enable-openssl
51CONFIGURE_ARGS+= --enable-bannertops 
52CONFIGURE_ARGS+= --enable-texttops 
53CONFIGURE_ARGS+= --with-manext=bsd 49CONFIGURE_ARGS+= --with-manext=bsd
54CONFIGURE_ARGS+= --without-icondir 50CONFIGURE_ARGS+= --without-icondir
55CONFIGURE_ARGS+= --without-menudir 51CONFIGURE_ARGS+= --without-menudir
56CONFIGURE_ARGS+= --without-perl 52CONFIGURE_ARGS+= --without-perl
57CONFIGURE_ARGS+= --without-php 53CONFIGURE_ARGS+= --without-php
58CONFIGURE_ARGS+= --without-python 54CONFIGURE_ARGS+= --without-python
59CONFIGURE_ARGS+= --without-java 55CONFIGURE_ARGS+= --without-java
60CONFIGURE_ARGS+= --disable-gssapi 56CONFIGURE_ARGS+= --disable-gssapi
61CONFIGURE_ARGS+= --disable-gnutls 57CONFIGURE_ARGS+= --disable-gnutls
62CONFIGURE_ARGS+= --disable-ldap 
63 58
64CONFIGURE_ENV+= DSOFLAGS=${LDFLAGS:M*:Q} 59CONFIGURE_ENV+= DSOFLAGS=${LDFLAGS:M*:Q}
65 60
66.include "../../mk/bsd.prefs.mk" 61.include "../../mk/bsd.prefs.mk"
67.include "options.mk" 62.include "options.mk"
68 63
69.if ${OPSYS} == "SunOS" 64.if ${OPSYS} == "SunOS"
70LIBS_SSP = -lssp_nonshared -lssp 65LIBS_SSP = -lssp_nonshared -lssp
71CONFIGURE_ENV+= LIBS_SSP=${LIBS_SSP:M*:Q} 66CONFIGURE_ENV+= LIBS_SSP=${LIBS_SSP:M*:Q}
72LIBS.SunOS+= -liconv 67LIBS.SunOS+= -liconv
73.endif 68.endif
74 69
75PLIST_VARS+= notmac 70PLIST_VARS+= notmac
@@ -105,27 +100,28 @@ EGDIR= ${PREFIX}/share/examples/cups @@ -105,27 +100,28 @@ EGDIR= ${PREFIX}/share/examples/cups
105MIMEDIR= ${PREFIX}/share/cups/mime 100MIMEDIR= ${PREFIX}/share/cups/mime
106PKG_SYSCONFSUBDIR= cups 101PKG_SYSCONFSUBDIR= cups
107CUPS_CONFDIR= ${PKG_SYSCONFDIR} 102CUPS_CONFDIR= ${PKG_SYSCONFDIR}
108CUPS_LOGDIR= ${VARBASE}/log/cups 103CUPS_LOGDIR= ${VARBASE}/log/cups
109CUPS_REQUESTS= ${VARBASE}/spool/cups 104CUPS_REQUESTS= ${VARBASE}/spool/cups
110CUPS_CACHE= ${VARBASE}/cache/cups 105CUPS_CACHE= ${VARBASE}/cache/cups
111CUPS_STATEDIR= ${VARBASE}/run/cups 106CUPS_STATEDIR= ${VARBASE}/run/cups
112 107
113PKG_GROUPS= ${CUPS_GROUP} 108PKG_GROUPS= ${CUPS_GROUP}
114PKG_USERS= ${CUPS_USER}:${CUPS_GROUP} 109PKG_USERS= ${CUPS_USER}:${CUPS_GROUP}
115PKG_GECOS.${CUPS_USER}= Common UNIX Printing System user 110PKG_GECOS.${CUPS_USER}= Common UNIX Printing System user
116PKG_SHELL.${CUPS_USER}= ${SH} 111PKG_SHELL.${CUPS_USER}= ${SH}
117 112
118CONF_FILES= ${EGDIR}/cupsd.conf ${CUPS_CONFDIR}/cupsd.conf 113CONF_FILES+= ${EGDIR}/cupsd.conf ${CUPS_CONFDIR}/cupsd.conf
 114CONF_FILES+= ${EGDIR}/cups-files.conf ${CUPS_CONFDIR}/cups-files.conf
119CONF_FILES+= ${EGDIR}/snmp.conf ${CUPS_CONFDIR}/snmp.conf 115CONF_FILES+= ${EGDIR}/snmp.conf ${CUPS_CONFDIR}/snmp.conf
120RCD_SCRIPTS= cupsd 116RCD_SCRIPTS= cupsd
121 117
122OWN_DIRS= ${CUPS_CONFDIR} 118OWN_DIRS= ${CUPS_CONFDIR}
123OWN_DIRS+= ${CUPS_CONFDIR}/interfaces 119OWN_DIRS+= ${CUPS_CONFDIR}/interfaces
124OWN_DIRS+= ${CUPS_CONFDIR}/ppd 120OWN_DIRS+= ${CUPS_CONFDIR}/ppd
125OWN_DIRS+= ${PREFIX}/libexec/cups/driver 121OWN_DIRS+= ${PREFIX}/libexec/cups/driver
126OWN_DIRS+= ${CUPS_LOGDIR} 122OWN_DIRS+= ${CUPS_LOGDIR}
127OWN_DIRS+= ${CUPS_STATEDIR} 123OWN_DIRS+= ${CUPS_STATEDIR}
128OWN_DIRS_PERMS= ${CUPS_STATEDIR}/certs ${CUPS_USER} ${CUPS_GROUP} 0711 124OWN_DIRS_PERMS= ${CUPS_STATEDIR}/certs ${CUPS_USER} ${CUPS_GROUP} 0711
129OWN_DIRS_PERMS+= ${CUPS_CONFDIR}/ssl ${REAL_ROOT_USER} ${CUPS_GROUP} 0700 125OWN_DIRS_PERMS+= ${CUPS_CONFDIR}/ssl ${REAL_ROOT_USER} ${CUPS_GROUP} 0700
130OWN_DIRS_PERMS+= ${CUPS_REQUESTS} ${REAL_ROOT_USER} ${CUPS_GROUP} 0710 126OWN_DIRS_PERMS+= ${CUPS_REQUESTS} ${REAL_ROOT_USER} ${CUPS_GROUP} 0710
131OWN_DIRS_PERMS+= ${CUPS_REQUESTS}/tmp ${REAL_ROOT_USER} ${CUPS_GROUP} 1770 127OWN_DIRS_PERMS+= ${CUPS_REQUESTS}/tmp ${REAL_ROOT_USER} ${CUPS_GROUP} 1770
@@ -159,27 +155,27 @@ pre-configure: @@ -159,27 +155,27 @@ pre-configure:
159 ${ERROR_MSG} "CUPS_SYSTEM_GROUPS may not contain the CUPS_GROUP" 155 ${ERROR_MSG} "CUPS_SYSTEM_GROUPS may not contain the CUPS_GROUP"
160 exit 1 156 exit 1
161.endif 157.endif
162 cd ${WRKSRC} && aclocal && autoconf 158 cd ${WRKSRC} && aclocal && autoconf
163 159
164post-extract: 160post-extract:
165 ${CP} ${FILESDIR}/cups.pam ${WRKDIR}/cups.pam 161 ${CP} ${FILESDIR}/cups.pam ${WRKDIR}/cups.pam
166 162
167post-install: 163post-install:
168 set -e; for file in LICENSE.txt README.txt; do \ 164 set -e; for file in LICENSE.txt README.txt; do \
169 ${INSTALL_DATA} ${WRKSRC}/$${file} \ 165 ${INSTALL_DATA} ${WRKSRC}/$${file} \
170 ${DESTDIR}${DOCDIR}/$${file}; \ 166 ${DESTDIR}${DOCDIR}/$${file}; \
171 done 167 done
172 ${RUN} for file in cupsd.conf snmp.conf ; do \ 168 ${RUN} for file in cupsd.conf cups-files.conf snmp.conf ; do \
173 ${INSTALL_DATA} ${WRKSRC}/conf/$${file} \ 169 ${INSTALL_DATA} ${WRKSRC}/conf/$${file} \
174 ${DESTDIR}${EGDIR}/$${file}; \ 170 ${DESTDIR}${EGDIR}/$${file}; \
175 done 171 done
176.if !empty(PKG_OPTIONS:Mpam) 172.if !empty(PKG_OPTIONS:Mpam)
177 ${INSTALL_DATA} ${WRKDIR}/cups.pam ${DESTDIR}${EGDIR} 173 ${INSTALL_DATA} ${WRKDIR}/cups.pam ${DESTDIR}${EGDIR}
178.endif 174.endif
179.if !empty(PKG_OPTIONS:Mdnssd) 175.if !empty(PKG_OPTIONS:Mdnssd)
180 ${LN} -s ${DESTDIR}${PREFIX}/libexec/cups/backend/dnssd ${DESTDIR}${PREFIX}/libexec/cups/backend/mdns 176 ${LN} -s ${DESTDIR}${PREFIX}/libexec/cups/backend/dnssd ${DESTDIR}${PREFIX}/libexec/cups/backend/mdns
181.endif 177.endif
182 178
183.include "../../converters/libiconv/buildlink3.mk" 179.include "../../converters/libiconv/buildlink3.mk"
184.include "../../devel/zlib/buildlink3.mk" 180.include "../../devel/zlib/buildlink3.mk"
185.include "../../graphics/png/buildlink3.mk" 181.include "../../graphics/png/buildlink3.mk"
cvs diff -r1.43 -r1.44 pkgsrc/print/cups/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/print/cups/Attic/PLIST 2014/08/22 21:54:38 1.43
+++ pkgsrc/print/cups/Attic/PLIST 2014/08/23 20:02:11 1.44
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.43 2014/08/22 21:54:38 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.44 2014/08/23 20:02:11 schnoebe Exp $
2bin/cancel 2bin/cancel
3bin/cups-config 3bin/cups-config
4bin/cupstestdsc 4bin/cupstestdsc
5bin/cupstestppd 5bin/cupstestppd
6bin/ipptool 6bin/ipptool
7bin/lp 7bin/lp
8bin/lpoptions 8bin/lpoptions
9bin/lppasswd 9bin/lppasswd
10bin/lpq 10bin/lpq
11bin/lpr 11bin/lpr
12bin/lprm 12bin/lprm
13bin/lpstat 13bin/lpstat
14bin/ppdc 14bin/ppdc
@@ -990,26 +990,27 @@ share/doc/cups/images/raster.png @@ -990,26 +990,27 @@ share/doc/cups/images/raster.png
990share/doc/cups/images/right.gif 990share/doc/cups/images/right.gif
991share/doc/cups/images/sample-image.png 991share/doc/cups/images/sample-image.png
992share/doc/cups/images/sel.gif 992share/doc/cups/images/sel.gif
993share/doc/cups/images/smiley.jpg 993share/doc/cups/images/smiley.jpg
994share/doc/cups/images/unsel.gif 994share/doc/cups/images/unsel.gif
995share/doc/cups/images/wait.gif 995share/doc/cups/images/wait.gif
996share/doc/cups/index.html 996share/doc/cups/index.html
997share/doc/cups/it/index.html 997share/doc/cups/it/index.html
998share/doc/cups/ja/index.html 998share/doc/cups/ja/index.html
999share/doc/cups/pt_BR/index.html 999share/doc/cups/pt_BR/index.html
1000share/doc/cups/robots.txt 1000share/doc/cups/robots.txt
1001share/doc/cups/ru/index.html 1001share/doc/cups/ru/index.html
1002${PLIST.pam}share/examples/cups/cups.pam 1002${PLIST.pam}share/examples/cups/cups.pam
 1003share/examples/cups/cups-files.conf
1003share/examples/cups/cupsd.conf 1004share/examples/cups/cupsd.conf
1004share/examples/cups/snmp.conf 1005share/examples/cups/snmp.conf
1005share/locale/ca/cups_ca.po 1006share/locale/ca/cups_ca.po
1006share/locale/cs/cups_cs.po 1007share/locale/cs/cups_cs.po
1007share/locale/de/cups_de.po 1008share/locale/de/cups_de.po
1008share/locale/es/cups_es.po 1009share/locale/es/cups_es.po
1009share/locale/fr/cups_fr.po 1010share/locale/fr/cups_fr.po
1010share/locale/it/cups_it.po 1011share/locale/it/cups_it.po
1011share/locale/ja/cups_ja.po 1012share/locale/ja/cups_ja.po
1012share/locale/pt_BR/cups_pt_BR.po 1013share/locale/pt_BR/cups_pt_BR.po
1013share/locale/ru/cups_ru.po 1014share/locale/ru/cups_ru.po
1014@pkgdir share/cups/profiles 1015@pkgdir share/cups/profiles
1015@pkgdir share/cups/model 1016@pkgdir share/cups/model
cvs diff -r1.104 -r1.105 pkgsrc/print/cups/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/print/cups/Attic/distinfo 2014/08/22 21:54:38 1.104
+++ pkgsrc/print/cups/Attic/distinfo 2014/08/23 20:02:11 1.105
@@ -1,21 +1,22 @@ @@ -1,21 +1,22 @@
1$NetBSD: distinfo,v 1.104 2014/08/22 21:54:38 wiz Exp $ 1$NetBSD: distinfo,v 1.105 2014/08/23 20:02:11 schnoebe Exp $
2 2
3SHA1 (cups-1.7.4-source.tar.bz2) = f6eaf9f5b60992e678868719c8ee81841972a9d0 3SHA1 (cups-1.7.4-source.tar.bz2) = f6eaf9f5b60992e678868719c8ee81841972a9d0
4RMD160 (cups-1.7.4-source.tar.bz2) = 93074532d4051e7a2289c22d38ca8b5b1a86bbee 4RMD160 (cups-1.7.4-source.tar.bz2) = 93074532d4051e7a2289c22d38ca8b5b1a86bbee
5Size (cups-1.7.4-source.tar.bz2) = 8792324 bytes 5Size (cups-1.7.4-source.tar.bz2) = 8792324 bytes
6SHA1 (patch-ac) = a6f3ed84b727fe4735060a804eaf564ef813748b 6SHA1 (patch-ac) = a6f3ed84b727fe4735060a804eaf564ef813748b
7SHA1 (patch-ad) = c7c6b052e6ed5a78f8d3aeceaac9c5b08597df38 7SHA1 (patch-ad) = c7c6b052e6ed5a78f8d3aeceaac9c5b08597df38
8SHA1 (patch-ae) = e8f4bbbbbe43cd5f6f9236e10d7241caeaedc3a3 8SHA1 (patch-ae) = e8f4bbbbbe43cd5f6f9236e10d7241caeaedc3a3
9SHA1 (patch-af) = 1bac8b3ae3c44034be6fa6d2878f10d7f89cd1ce 9SHA1 (patch-af) = 1bac8b3ae3c44034be6fa6d2878f10d7f89cd1ce
10SHA1 (patch-ah) = d7a43f4fc9d4439fe9a490d6ea6d6c75afd7b777 10SHA1 (patch-ah) = d7a43f4fc9d4439fe9a490d6ea6d6c75afd7b777
11SHA1 (patch-ai) = 2c1ca67ea6f6c1dedb4c8ff97736f328a2b9a7c6 11SHA1 (patch-ai) = 2c1ca67ea6f6c1dedb4c8ff97736f328a2b9a7c6
12SHA1 (patch-an) = c75ce52b7afc252c293da7024d93788fd5da3957 12SHA1 (patch-an) = c75ce52b7afc252c293da7024d93788fd5da3957
13SHA1 (patch-ao) = 26a9fbfbe44bdf9ba615a747a40521cb49a13fa3 13SHA1 (patch-ao) = 26a9fbfbe44bdf9ba615a747a40521cb49a13fa3
14SHA1 (patch-at) = 66222cb2ab84d5889cd6d42fa08827e1a4e8c178 14SHA1 (patch-at) = 66222cb2ab84d5889cd6d42fa08827e1a4e8c178
15SHA1 (patch-conf_Makefile) = bb076cc51309477c95940bd437f0892e41337516 15SHA1 (patch-conf_Makefile) = bb076cc51309477c95940bd437f0892e41337516
 16SHA1 (patch-conf_cupsd.conf) = 2da36e537931463417776d5675930cf75953f17b
16SHA1 (patch-config-scripts_cups-gssapi.m4) = 7c8b0dd893b9d21597088062711cc50f13031338 17SHA1 (patch-config-scripts_cups-gssapi.m4) = 7c8b0dd893b9d21597088062711cc50f13031338
17SHA1 (patch-config.h.in) = c18c4afac00eb2c4e03e5886095152091fd217aa 18SHA1 (patch-config.h.in) = c18c4afac00eb2c4e03e5886095152091fd217aa
18SHA1 (patch-data_Makefile) = 090e240f851dfb062c7f645dcbe0d15d67f283bc 19SHA1 (patch-data_Makefile) = 090e240f851dfb062c7f645dcbe0d15d67f283bc
19SHA1 (patch-ppdc_Makefile) = a45af3310e706dd6433f029c55cf62e492de3448 20SHA1 (patch-ppdc_Makefile) = a45af3310e706dd6433f029c55cf62e492de3448
20SHA1 (patch-scheduler_auth.c) = 70f1eda9d6d81eabc080c037fac0c2d4bb229db4 21SHA1 (patch-scheduler_auth.c) = 70f1eda9d6d81eabc080c037fac0c2d4bb229db4
21SHA1 (patch-scheduler_dirsvc.c) = 4d1a3945401c03a8f1b557129b73c57459703b69 22SHA1 (patch-scheduler_dirsvc.c) = 4d1a3945401c03a8f1b557129b73c57459703b69
cvs diff -r1.17 -r1.18 pkgsrc/print/cups/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/print/cups/Attic/options.mk 2014/06/07 11:54:54 1.17
+++ pkgsrc/print/cups/Attic/options.mk 2014/08/23 20:02:11 1.18
@@ -1,21 +1,18 @@ @@ -1,21 +1,18 @@
1# $NetBSD: options.mk,v 1.17 2014/06/07 11:54:54 wiz Exp $ 1# $NetBSD: options.mk,v 1.18 2014/08/23 20:02:11 schnoebe Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.cups 3PKG_OPTIONS_VAR= PKG_OPTIONS.cups
4PKG_OPTIONS_REQUIRED_GROUPS= pdftops 4PKG_SUPPORTED_OPTIONS= acl dbus dnssd kerberos pam tcpwrappers
5PKG_OPTIONS_GROUP.pdftops= ghostscript poppler 5PKG_SUGGESTED_OPTIONS= dbus dnssd kerberos
6PKG_SUPPORTED_OPTIONS= acl dbus dnssd kerberos pam slp tcpwrappers 
7PKG_SUGGESTED_OPTIONS= dbus dnssd kerberos poppler slp 
8PKG_OPTIONS_LEGACY_OPTS+= xpdf:poppler gs:ghostscript 
9 6
10# Neither DragonFly nor SunOS can build libusb1 7# Neither DragonFly nor SunOS can build libusb1
11.if ${OPSYS} != "DragonFly" && ${OPSYS} != "SunOS" 8.if ${OPSYS} != "DragonFly" && ${OPSYS} != "SunOS"
12PKG_SUPPORTED_OPTIONS+= libusb 9PKG_SUPPORTED_OPTIONS+= libusb
13PKG_SUGGESTED_OPTIONS+= libusb 10PKG_SUGGESTED_OPTIONS+= libusb
14.endif 11.endif
15 12
16.include "../../mk/bsd.options.mk" 13.include "../../mk/bsd.options.mk"
17 14
18MESSAGE_SRC= ${PKGDIR}/MESSAGE 15MESSAGE_SRC= ${PKGDIR}/MESSAGE
19 16
20.if !empty(PKG_OPTIONS:Macl) 17.if !empty(PKG_OPTIONS:Macl)
21CONFIGURE_ARGS+= --enable-acl 18CONFIGURE_ARGS+= --enable-acl
@@ -32,32 +29,26 @@ PLIST.dbus= yes @@ -32,32 +29,26 @@ PLIST.dbus= yes
32.else 29.else
33CONFIGURE_ARGS+= --disable-dbus 30CONFIGURE_ARGS+= --disable-dbus
34.endif 31.endif
35 32
36PLIST_VARS+= dnssd 33PLIST_VARS+= dnssd
37.if !empty(PKG_OPTIONS:Mdnssd) 34.if !empty(PKG_OPTIONS:Mdnssd)
38.include "../../net/mDNSResponder/buildlink3.mk" 35.include "../../net/mDNSResponder/buildlink3.mk"
39CONFIGURE_ARGS+= --enable-dnssd 36CONFIGURE_ARGS+= --enable-dnssd
40PLIST.dnssd= yes 37PLIST.dnssd= yes
41.else 38.else
42CONFIGURE_ARGS+= --disable-dnssd 39CONFIGURE_ARGS+= --disable-dnssd
43.endif 40.endif
44 41
45.if !empty(PKG_OPTIONS:Mghostscript) 
46USE_TOOLS+= gs:run 
47CONFIGURE_ARGS+= --with-pdftops=gs 
48CONFIGURE_ENV+= ac_cv_path_CUPS_GHOSTSCRIPT=${TOOLS_PATH.gs} 
49.endif 
50 
51.if !empty(PKG_OPTIONS:Mkerberos) 42.if !empty(PKG_OPTIONS:Mkerberos)
52.include "../../mk/krb5.buildlink3.mk" 43.include "../../mk/krb5.buildlink3.mk"
53CONFIGURE_ARGS+= --enable-gssapi 44CONFIGURE_ARGS+= --enable-gssapi
54.else 45.else
55CONFIGURE_ARGS+= --disable-gssapi 46CONFIGURE_ARGS+= --disable-gssapi
56.endif 47.endif
57 48
58PLIST_VARS+= libusb 49PLIST_VARS+= libusb
59.if !empty(PKG_OPTIONS:Mlibusb) 50.if !empty(PKG_OPTIONS:Mlibusb)
60.include "../../devel/libusb1/buildlink3.mk" 51.include "../../devel/libusb1/buildlink3.mk"
61CONFIGURE_ARGS+= --enable-libusb 52CONFIGURE_ARGS+= --enable-libusb
62MESSAGE_SRC+= ${PKGDIR}/MESSAGE.libusb 53MESSAGE_SRC+= ${PKGDIR}/MESSAGE.libusb
63USE_TOOLS+= pkg-config 54USE_TOOLS+= pkg-config
@@ -67,34 +58,19 @@ CONFIGURE_ARGS+= --disable-libusb @@ -67,34 +58,19 @@ CONFIGURE_ARGS+= --disable-libusb
67.endif 58.endif
68 59
69PLIST_VARS+= pam 60PLIST_VARS+= pam
70.if !empty(PKG_OPTIONS:Mpam) 61.if !empty(PKG_OPTIONS:Mpam)
71. include "../../mk/pam.buildlink3.mk" 62. include "../../mk/pam.buildlink3.mk"
72CONFIGURE_ARGS+= --enable-pam 63CONFIGURE_ARGS+= --enable-pam
73MESSAGE_SRC+= ${PKGDIR}/MESSAGE.pam 64MESSAGE_SRC+= ${PKGDIR}/MESSAGE.pam
74PLIST.pam= yes 65PLIST.pam= yes
75.else 66.else
76CONFIGURE_ARGS+= --disable-pam 67CONFIGURE_ARGS+= --disable-pam
77MESSAGE_SRC= ${.CURDIR}/MESSAGE 68MESSAGE_SRC= ${.CURDIR}/MESSAGE
78.endif 69.endif
79 70
80.if !empty(PKG_OPTIONS:Mpoppler) 
81FIND_PREFIX:= POPPLERDIR=poppler-utils 
82.include "../../mk/find-prefix.mk" 
83DEPENDS+= poppler-utils-[0-9]*:../../print/poppler-utils 
84CONFIGURE_ARGS+= --with-pdftops=pdftops 
85CONFIGURE_ENV+= ac_cv_path_CUPS_PDFTOPS=${POPPLERDIR}/bin/pdftops 
86.endif 
87 
88.if !empty(PKG_OPTIONS:Mslp) 
89.include "../../net/openslp/buildlink3.mk" 
90CONFIGURE_ARGS+= --enable-slp 
91.else 
92CONFIGURE_ARGS+= --disable-slp 
93.endif 
94 
95.if !empty(PKG_OPTIONS:Mtcpwrappers) 71.if !empty(PKG_OPTIONS:Mtcpwrappers)
96.include "../../security/tcp_wrappers/buildlink3.mk" 72.include "../../security/tcp_wrappers/buildlink3.mk"
97CONFIGURE_ARGS+= --enable-tcp-wrappers 73CONFIGURE_ARGS+= --enable-tcp-wrappers
98.else 74.else
99CONFIGURE_ARGS+= --disable-tcp-wrappers 75CONFIGURE_ARGS+= --disable-tcp-wrappers
100.endif 76.endif