 @@ -1,93 +1,90 @@
-# $NetBSD: Makefile,v 1.236 2016/12/12 14:26:15 wiz Exp $
+# $NetBSD: Makefile,v 1.237 2016/12/30 07:08:34 adam Exp $
 DISTNAME=	cups-2.2.1-source
 PKGNAME=	${DISTNAME:S/-source//}
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_GITHUB:=apple/}
 GITHUB_RELEASE=	v${PKGVERSION_NOREV}
 MAINTAINER=	sbd@NetBSD.org
 HOMEPAGE=	http://www.cups.org/
 COMMENT=	Common UNIX Printing System
 LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2
 GITHUB_RELEASE=	v${PKGVERSION_NOREV}
 CONFLICTS+=	LPRng-[0-9]* LPRng-core-[0-9]*
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 UNLIMIT_RESOURCES=	datasize memorysize
 USE_LANGUAGES=		c c++	# pdftops is a C++ application
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		aclocal autoconf automake gmake
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		aclocal autoconf automake gmake pkg-config
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--localedir=${PREFIX}/${PKGLOCALEDIR}/locale
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR}
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 CONFIGURE_ARGS+=	--with-cachedir=${CUPS_CACHE:Q}
 CONFIGURE_ARGS+=	--with-docdir=${PREFIX}/share/doc/cups
 CONFIGURE_ARGS+=	--with-serverbindir=${PREFIX}/libexec/cups
 CONFIGURE_ARGS+=	--with-cups-user=${CUPS_USER}
 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-ssl
 CONFIGURE_ARGS+=	--with-manext=bsd
 CONFIGURE_ARGS+=	--without-bundledir
 CONFIGURE_ARGS+=	--without-icondir
 CONFIGURE_ARGS+=	--without-menudir
 CONFIGURE_ARGS+=	--without-perl
 CONFIGURE_ARGS+=	--without-php
 CONFIGURE_ARGS+=	--without-python
 CONFIGURE_ARGS+=	--without-java
 CONFIGURE_ARGS+=	--disable-gssapi
 CONFIGURE_ENV+=		DSOFLAGS=${LDFLAGS:M*:Q}
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 .if ${OPSYS} == "SunOS"
 LIBS_SSP=		-lssp_nonshared -lssp
 CONFIGURE_ENV+=		LIBS_SSP=${LIBS_SSP:M*:Q}
 # Explicitly disable epoll on illumos, it is provided for Linux compat only.
 CONFIGURE_ENV+=		ac_cv_func_epoll_create=no
 .endif
 LIBS+=			${BUILDLINK_LDADD.iconv}
 PLIST_VARS+=		notmac
 .if ${OPSYS} != "Darwin"
 PLIST.notmac=		yes
 .endif
 # Avoid the following error when compiling with clang.
 # /usr/local/bin/ld: /usr/lib/crt1.o: relocation R_X86_64_32 against `_DYNAMIC'
 # can not be used when making a shared object; recompile with -fPIC
 BUILDLINK_TRANSFORM.FreeBSD+=	rm:-Wl,-pie
 # CUPS_USER		user to run filter and CGI programs as
 # CUPS_GROUP		group to run filter and CGI programs as
 # CUPS_SYSTEM_GROUPS	group for system administration
+#
 CUPS_USER?=		lp
 CUPS_GROUP?=		lp
 CUPS_SYSTEM_GROUPS?=	${REAL_ROOT_GROUP}
 FILES_SUBST+=		CUPS_USER=${CUPS_USER}
 FILES_SUBST+=		CUPS_GROUP=${CUPS_GROUP}
 FILES_SUBST+=		CUPS_SYSTEM_GROUPS=${CUPS_SYSTEM_GROUPS:Q}
 PKG_GROUPS_VARS+=	CUPS_GROUP CUPS_SYSTEM_GROUPS
-PKG_USERS_VARS+=	CUPS_USER
+PKG_USERS_VARS=		CUPS_USER
 BUILD_DEFS+=		CUPS_USER CUPS_GROUP CUPS_SYSTEM_GROUPS VARBASE
 DOCDIR=			${PREFIX}/share/doc/cups
 EGDIR=			${PREFIX}/share/examples/cups
 MIMEDIR=		${PREFIX}/share/cups/mime
 PKG_SYSCONFSUBDIR=	cups
 CUPS_CONFDIR=		${PKG_SYSCONFDIR}
 CUPS_LOGDIR=		${VARBASE}/log/cups
 CUPS_REQUESTS=		${VARBASE}/spool/cups
 CUPS_CACHE=		${VARBASE}/cache/cups
 CUPS_STATEDIR=		${VARBASE}/run/cups
 @@ -123,30 +120,26 @@ 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}${PREFIX}/lib|g'
 SUBST_STAGE.rpathfix=	post-patch
 .if !empty(OPSYS:MNetBSD) && !empty(MACHINE_ARCH:Mpowerpc)
 SUBST_CLASSES+=		piefix
 SUBST_FILES.piefix=	Makedefs.in
 SUBST_MESSAGE.piefix=	Removing PIE flags
 SUBST_SED.piefix=	-e 's|@PIEFLAGS@||g'
 SUBST_STAGE.piefix=	post-patch
 .endif
 .if ${OPSYS} == "Darwin"
 PLIST_SRC=		PLIST.Darwin
 .endif
 INSTALLATION_DIRS=	${DOCDIR} ${EGDIR} ${MIMEDIR} ${CUPS_CONFDIR}
 INSTALL_ENV+=		DSTROOT=${DESTDIR}
 pre-configure:
 .if !empty(CUPS_SYSTEM_GROUPS:M${CUPS_GROUP})
 	${ERROR_MSG} "CUPS_SYSTEM_GROUPS may not contain the CUPS_GROUP"
 	exit 1
 .endif
 	cd ${WRKSRC} && aclocal && autoconf
 post-extract:
 	${CP} ${FILESDIR}/cups.pam ${WRKDIR}/cups.pam
 @@ -161,19 +154,19 @@ post-install:
 	done
 	${CHMOD} g-w ${DESTDIR}${PREFIX}/libexec/cups/cgi-bin
 .if !empty(PKG_OPTIONS:Mpam)
 	${INSTALL_DATA} ${WRKDIR}/cups.pam ${DESTDIR}${EGDIR}
 .endif
 .if !empty(PKG_OPTIONS:Mdnssd)
 	${LN} -sf ${DESTDIR}${PREFIX}/libexec/cups/backend/dnssd ${DESTDIR}${PREFIX}/libexec/cups/backend/mdns
 .endif
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../print/libpaper/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../print/libpaper/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,18 +1,19 @@
-@comment $NetBSD: PLIST,v 1.57 2016/10/09 08:33:16 leot Exp $
+@comment $NetBSD: PLIST,v 1.58 2016/12/30 07:08:34 adam Exp $
 bin/cancel
 bin/cups-config
 bin/cupstestdsc
 bin/cupstestppd
 ${PLIST.ippfind}bin/ippfind
 bin/ipptool
 bin/lp
 bin/lpoptions
 bin/lpq
 bin/lpr
 bin/lprm
 bin/lpstat
 bin/ppdc
 bin/ppdhtml
 bin/ppdi
 bin/ppdmerge
 bin/ppdpo
 include/cups/adminutil.h
 @@ -25,26 +26,30 @@ include/cups/http.h
 include/cups/ipp.h
 include/cups/language.h
 include/cups/ppd.h
 include/cups/pwg.h
 include/cups/raster.h
 include/cups/sidechannel.h
 include/cups/transcode.h
 include/cups/versioning.h
 lib/libcups.la
 lib/libcupscgi.la
 lib/libcupsimage.la
 lib/libcupsmime.la
 lib/libcupsppdc.la
 ${PLIST.apple}libexec/cups/apple/http
 ${PLIST.apple}libexec/cups/apple/https
 ${PLIST.apple}libexec/cups/apple/ipp
 ${PLIST.apple}libexec/cups/apple/ipps
 ${PLIST.dnssd}libexec/cups/backend/dnssd
 libexec/cups/backend/http
 libexec/cups/backend/https
 libexec/cups/backend/ipp
 libexec/cups/backend/ipps
 libexec/cups/backend/lpd
 ${PLIST.dnssd}libexec/cups/backend/mdns
 libexec/cups/backend/snmp
 libexec/cups/backend/socket
 libexec/cups/backend/usb
 libexec/cups/cgi-bin/admin.cgi
 libexec/cups/cgi-bin/classes.cgi
 libexec/cups/cgi-bin/help.cgi
 @@ -62,26 +67,27 @@ libexec/cups/filter/rastertoepson
 libexec/cups/filter/rastertohp
 libexec/cups/filter/rastertolabel
 libexec/cups/filter/rastertopwg
 libexec/cups/monitor/bcp
 libexec/cups/monitor/tbcp
 ${PLIST.dbus}libexec/cups/notifier/dbus
 libexec/cups/notifier/mailto
 libexec/cups/notifier/rss
 man/man1/cancel.1
 man/man1/cups-config.1
 man/man1/cups.1
 man/man1/cupstestdsc.1
 man/man1/cupstestppd.1
 ${PLIST.ippfind}man/man1/ippfind.1
 man/man1/ipptool.1
 man/man1/lp.1
 man/man1/lpoptions.1
 man/man1/lpq.1
 man/man1/lpr.1
 man/man1/lprm.1
 man/man1/lpstat.1
 man/man1/ppdc.1
 man/man1/ppdhtml.1
 man/man1/ppdi.1
 man/man1/ppdmerge.1
 man/man1/ppdpo.1
 man/man5/classes.conf.5
 @@ -701,25 +707,25 @@ share/doc/cups/images/raster-organizatio
 share/doc/cups/images/raster.png
 share/doc/cups/images/right.gif
 share/doc/cups/images/sample-image.png
 share/doc/cups/images/sel.gif
 share/doc/cups/images/smiley.jpg
 share/doc/cups/images/unsel.gif
 share/doc/cups/images/wait.gif
 share/doc/cups/index.html
 share/doc/cups/ja/index.html
 share/doc/cups/pt_BR/index.html
 share/doc/cups/robots.txt
 share/doc/cups/ru/index.html
 share/examples/cups/cups-files.conf
 share/examples/cups/cupsd.conf
 ${PLIST.pam}share/examples/cups/cups.pam
 share/examples/cups/cupsd.conf
 share/examples/cups/snmp.conf
 share/locale/ca/cups_ca.po
 share/locale/cs/cups_cs.po
 share/locale/de/cups_de.po
 share/locale/es/cups_es.po
 share/locale/fr/cups_fr.po
 share/locale/it/cups_it.po
 share/locale/ja/cups_ja.po
 share/locale/pt_BR/cups_pt_BR.po
 share/locale/ru/cups_ru.po

 @@ -1,73 +1,85 @@
-# $NetBSD: options.mk,v 1.18 2014/08/23 20:02:11 schnoebe Exp $
+# $NetBSD: options.mk,v 1.19 2016/12/30 07:08:34 adam Exp $
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cups
-PKG_SUPPORTED_OPTIONS=	acl dbus dnssd kerberos pam tcpwrappers
+PKG_SUPPORTED_OPTIONS=	acl dnssd kerberos pam tcpwrappers
-PKG_SUGGESTED_OPTIONS=	dbus dnssd kerberos
+PKG_SUGGESTED_OPTIONS=	dnssd kerberos
 PLIST_VARS+=		apple dbus dnssd ippfind libusb pam
 .if ${OPSYS} == "Darwin"
 PLIST.apple=		yes
 PLIST.ippfind=		yes
 .else
 # CUPS on Darwin does not support DBus and libusb
 PKG_SUPPORTED_OPTIONS+=	avahi dbus
 PKG_SUGGESTED_OPTIONS+=	dbus
 # Neither DragonFly nor SunOS can build libusb1
-.if ${OPSYS} != "DragonFly" && ${OPSYS} != "SunOS"
+.  if ${OPSYS} != "DragonFly" && ${OPSYS} != "SunOS"
-PKG_SUPPORTED_OPTIONS+= libusb
+PKG_SUPPORTED_OPTIONS+=	libusb
-PKG_SUGGESTED_OPTIONS+= libusb
+PKG_SUGGESTED_OPTIONS+=	libusb
 .  endif
 .endif
 .include "../../mk/bsd.options.mk"
 MESSAGE_SRC=		${PKGDIR}/MESSAGE
 .if !empty(PKG_OPTIONS:Macl)
 CONFIGURE_ARGS+=	--enable-acl
 .else
 CONFIGURE_ARGS+=	--disable-acl
 .endif
-PLIST_VARS+=		dbus
+.if !empty(PKG_OPTIONS:Mavahi)
 .include "../../net/avahi/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-avahi
 PLIST.ippfind=		yes
 .else
 CONFIGURE_ARGS+=	--disable-avahi
 .endif
 .if !empty(PKG_OPTIONS:Mdbus)
 USE_TOOLS+=		pkg-config
 .  include "../../sysutils/dbus/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-dbus
 PLIST.dbus=		yes
 .else
 CONFIGURE_ARGS+=	--disable-dbus
 .endif
 PLIST_VARS+=		dnssd
 .if !empty(PKG_OPTIONS:Mdnssd)
 .include "../../net/mDNSResponder/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-dnssd
 PLIST.dnssd=		yes
 .else
 CONFIGURE_ARGS+=	--disable-dnssd
 .endif
 .if !empty(PKG_OPTIONS:Mkerberos)
 .include "../../mk/krb5.buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-gssapi
 .else
 CONFIGURE_ARGS+=	--disable-gssapi
 .endif
 PLIST_VARS+=		libusb
 .if !empty(PKG_OPTIONS:Mlibusb)
 .include "../../devel/libusb1/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-libusb
 MESSAGE_SRC+=		${PKGDIR}/MESSAGE.libusb
 USE_TOOLS+=		pkg-config
 PLIST.libusb=		yes
 .else
 CONFIGURE_ARGS+=	--disable-libusb
 .endif
 PLIST_VARS+=		pam
 .if !empty(PKG_OPTIONS:Mpam)
 .  include "../../mk/pam.buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-pam
 MESSAGE_SRC+=		${PKGDIR}/MESSAGE.pam
 PLIST.pam=		yes
 .else
 CONFIGURE_ARGS+=	--disable-pam
 MESSAGE_SRC=		${.CURDIR}/MESSAGE
 .endif
 .if !empty(PKG_OPTIONS:Mtcpwrappers)
 .include "../../security/tcp_wrappers/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-tcp-wrappers

 @@ -1,29 +1,33 @@
-# $NetBSD: buildlink3.mk,v 1.36 2016/09/20 11:12:22 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.37 2016/12/30 07:08:34 adam Exp $
 BUILDLINK_TREE+=	cups
 .if !defined(CUPS_BUILDLINK3_MK)
 CUPS_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.cups+=	cups>=1.1.19nb3
 BUILDLINK_ABI_DEPENDS.cups+=	cups>=2.1.4nb2
 BUILDLINK_PKGSRCDIR.cups?=	../../print/cups
 pkgbase := cups
 .include "../../mk/pkg-build-options.mk"
 .if !empty(PKG_BUILD_OPTIONS.cups:Mkerberos)
 .include "../../mk/krb5.buildlink3.mk"
 .endif
 .if !empty(PKG_BUILD_OPTIONS.cups:Mdnssd)
 .include "../../net/mDNSResponder/buildlink3.mk"
 .endif
 .if ${OPSYS} != "Darwin" && !empty(PKG_BUILD_OPTIONS.cups:Mavahi)
 .include "../../net/avahi/buildlink3.mk"
 .endif
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
 .endif # CUPS_BUILDLINK3_MK
 BUILDLINK_TREE+=	-cups