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.

4 files changed, 13 insertions, 39 deletions

diff --git a/print/cups/Makefile b/print/cups/Makefile
index 14f8a88bc48..50fd87903d5 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.211 2014/08/22 21:54:38 wiz Exp $
+# $NetBSD: Makefile,v 1.212 2014/08/23 20:02:11 schnoebe 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:
@@ -6,8 +6,9 @@
 
 DISTNAME=	cups-${DIST_VERS}-source
 PKGNAME=	cups-${DIST_VERS:S/-/./g}
-PKGREVISION=	1
+PKGREVISION=	2
 BASE_VERS=	1.7.4
+#BASE_VERS=	1.7.5
 DIST_VERS=	${BASE_VERS}
 CATEGORIES=	print
 MASTER_SITES=	http://www.cups.org/software/${BASE_VERS}/
@@ -43,13 +44,8 @@ CONFIGURE_ARGS+=	--with-cups-group=${CUPS_GROUP}
 CONFIGURE_ARGS+=	--with-system-groups=${CUPS_SYSTEM_GROUPS:Q}
 CONFIGURE_ARGS+=	--enable-libpaper
 CONFIGURE_ARGS+=	--enable-libtool
-CONFIGURE_ARGS+=	--enable-jpeg
-CONFIGURE_ARGS+=	--enable-png
-CONFIGURE_ARGS+=	--enable-tiff
 CONFIGURE_ARGS+=	--enable-ssl
 CONFIGURE_ARGS+=	--enable-openssl
-CONFIGURE_ARGS+=	--enable-bannertops
-CONFIGURE_ARGS+=	--enable-texttops
 CONFIGURE_ARGS+=	--with-manext=bsd
 CONFIGURE_ARGS+=	--without-icondir
 CONFIGURE_ARGS+=	--without-menudir
@@ -59,7 +55,6 @@ CONFIGURE_ARGS+=	--without-python
 CONFIGURE_ARGS+=	--without-java
 CONFIGURE_ARGS+=	--disable-gssapi
 CONFIGURE_ARGS+=	--disable-gnutls
-CONFIGURE_ARGS+=	--disable-ldap
 
 CONFIGURE_ENV+=		DSOFLAGS=${LDFLAGS:M*:Q}
 
@@ -115,7 +110,8 @@ PKG_USERS=		${CUPS_USER}:${CUPS_GROUP}
 PKG_GECOS.${CUPS_USER}=	Common UNIX Printing System user
 PKG_SHELL.${CUPS_USER}=	${SH}
 
-CONF_FILES=		${EGDIR}/cupsd.conf ${CUPS_CONFDIR}/cupsd.conf
+CONF_FILES+=		${EGDIR}/cupsd.conf ${CUPS_CONFDIR}/cupsd.conf
+CONF_FILES+=		${EGDIR}/cups-files.conf ${CUPS_CONFDIR}/cups-files.conf
 CONF_FILES+=		${EGDIR}/snmp.conf ${CUPS_CONFDIR}/snmp.conf
 RCD_SCRIPTS=		cupsd
 
@@ -169,7 +165,7 @@ post-install:
 		${INSTALL_DATA} ${WRKSRC}/$${file}			\
 		     ${DESTDIR}${DOCDIR}/$${file}; \
 	done
-	${RUN} for file in cupsd.conf snmp.conf ; do			\
+	${RUN} for file in cupsd.conf cups-files.conf snmp.conf ; do	\
 		${INSTALL_DATA} ${WRKSRC}/conf/$${file}			\
 			${DESTDIR}${EGDIR}/$${file};			\
 	done
diff --git a/print/cups/PLIST b/print/cups/PLIST
index d5b09f463dd..409b236b04e 100644
--- a/print/cups/PLIST
+++ b/print/cups/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.43 2014/08/22 21:54:38 wiz Exp $
+@comment $NetBSD: PLIST,v 1.44 2014/08/23 20:02:11 schnoebe Exp $
 bin/cancel
 bin/cups-config
 bin/cupstestdsc
@@ -1000,6 +1000,7 @@ share/doc/cups/pt_BR/index.html
 share/doc/cups/robots.txt
 share/doc/cups/ru/index.html
 ${PLIST.pam}share/examples/cups/cups.pam
+share/examples/cups/cups-files.conf
 share/examples/cups/cupsd.conf
 share/examples/cups/snmp.conf
 share/locale/ca/cups_ca.po
diff --git a/print/cups/distinfo b/print/cups/distinfo
index 443fdaa18c3..0c4100b6d1a 100644
--- a/print/cups/distinfo
+++ b/print/cups/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.104 2014/08/22 21:54:38 wiz Exp $
+$NetBSD: distinfo,v 1.105 2014/08/23 20:02:11 schnoebe Exp $
 
 SHA1 (cups-1.7.4-source.tar.bz2) = f6eaf9f5b60992e678868719c8ee81841972a9d0
 RMD160 (cups-1.7.4-source.tar.bz2) = 93074532d4051e7a2289c22d38ca8b5b1a86bbee
@@ -13,6 +13,7 @@ SHA1 (patch-an) = c75ce52b7afc252c293da7024d93788fd5da3957
 SHA1 (patch-ao) = 26a9fbfbe44bdf9ba615a747a40521cb49a13fa3
 SHA1 (patch-at) = 66222cb2ab84d5889cd6d42fa08827e1a4e8c178
 SHA1 (patch-conf_Makefile) = bb076cc51309477c95940bd437f0892e41337516
+SHA1 (patch-conf_cupsd.conf) = 2da36e537931463417776d5675930cf75953f17b
 SHA1 (patch-config-scripts_cups-gssapi.m4) = 7c8b0dd893b9d21597088062711cc50f13031338
 SHA1 (patch-config.h.in) = c18c4afac00eb2c4e03e5886095152091fd217aa
 SHA1 (patch-data_Makefile) = 090e240f851dfb062c7f645dcbe0d15d67f283bc
diff --git a/print/cups/options.mk b/print/cups/options.mk
index f4f1bd9ab87..9b0f494b98e 100644
--- a/print/cups/options.mk
+++ b/print/cups/options.mk
@@ -1,11 +1,8 @@
-# $NetBSD: options.mk,v 1.17 2014/06/07 11:54:54 wiz Exp $
+# $NetBSD: options.mk,v 1.18 2014/08/23 20:02:11 schnoebe Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cups
-PKG_OPTIONS_REQUIRED_GROUPS=	pdftops
-PKG_OPTIONS_GROUP.pdftops=	ghostscript poppler
-PKG_SUPPORTED_OPTIONS=	acl dbus dnssd kerberos pam slp tcpwrappers
-PKG_SUGGESTED_OPTIONS=	dbus dnssd kerberos poppler slp
-PKG_OPTIONS_LEGACY_OPTS+=	xpdf:poppler gs:ghostscript
+PKG_SUPPORTED_OPTIONS=	acl dbus dnssd kerberos pam tcpwrappers
+PKG_SUGGESTED_OPTIONS=	dbus dnssd kerberos
 
 # Neither DragonFly nor SunOS can build libusb1
 .if ${OPSYS} != "DragonFly" && ${OPSYS} != "SunOS"
@@ -42,12 +39,6 @@ PLIST.dnssd=		yes
 CONFIGURE_ARGS+=	--disable-dnssd
 .endif
 
-.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"
 CONFIGURE_ARGS+=	--enable-gssapi
@@ -77,21 +68,6 @@ CONFIGURE_ARGS+=	--disable-pam
 MESSAGE_SRC=		${.CURDIR}/MESSAGE
 .endif
 
-.if !empty(PKG_OPTIONS:Mpoppler)
-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)
-.include "../../net/openslp/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-slp
-.else
-CONFIGURE_ARGS+=	--disable-slp
-.endif
-
 .if !empty(PKG_OPTIONS:Mtcpwrappers)
 .include "../../security/tcp_wrappers/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-tcp-wrappers