Index: head/print/cups/Makefile =================================================================== --- head/print/cups/Makefile (revision 441050) +++ head/print/cups/Makefile (revision 441051) @@ -1,132 +1,131 @@ # Created by: Alan Eldridge # $FreeBSD$ PORTNAME= cups -PORTVERSION= 2.2.2 +PORTVERSION= 2.2.3 DISTVERSIONPREFIX=v -PORTREVISION= 1 CATEGORIES= print MAINTAINER= tijl@FreeBSD.org COMMENT= Common UNIX Printing System LICENSE= GPLv2 LGPL20 LICENSE_COMB= multi LICENSE_FILE_GPLv2= ${WRKSRC}/LICENSE.txt LICENSE_FILE_LGPL20= ${WRKSRC}/LICENSE.txt CONFLICTS= LPRng-[0-9]* USE_GITHUB= yes GH_ACCOUNT= apple DESTDIRNAME= DSTROOT GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-dnssd \ --disable-gssapi \ --disable-launchd \ --disable-systemd \ --with-cups-user=${USERS} \ --with-cups-group=${GROUPS} \ --with-system-groups=wheel \ --with-dbusdir="${PREFIX}/etc/dbus-1" \ --with-icondir="${PREFIX}/share/icons" \ --with-menudir="${DESKTOPDIR}" \ --with-printcap="${PREFIX}/etc/printcap" \ --with-rcdir=no \ --with-optim=" " \ --with-pam-module="unix" \ ac_cv_path_JAVA= ac_cv_path_PERL= ac_cv_path_PHPCGI= \ ac_cv_path_PHP= ac_cv_path_PYTHON= USES= cpe gmake iconv localbase pkgconfig CPE_VENDOR= apple USE_LDCONFIG= yes USE_RC_SUBR= cupsd GROUPS= cups USERS= cups OPTIONS_DEFINE= AVAHI DBUS DOCS GNUTLS IPPTOOL LIBPAPER NLS X11 OPTIONS_DEFAULT= AVAHI DBUS GNUTLS LIBPAPER OPTIONS_SUB= yes AVAHI_LIB_DEPENDS= libavahi-client.so:net/avahi-app AVAHI_CONFIGURE_ENABLE= avahi AVAHI_SUB_LIST= AVAHI_DAEMON=avahi_daemon AVAHI_SUB_LIST_OFF= AVAHI_DAEMON= DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus DBUS_CONFIGURE_ENABLE= dbus DBUS_SUB_LIST= DBUS_DAEMON=dbus DBUS_SUB_LIST_OFF= DBUS_DAEMON= GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GNUTLS_CONFIGURE_ON= --enable-gnutls GNUTLS_CONFIGURE_OFF= --disable-ssl IPPTOOL_DESC= Internet Printing Protocol testing tool LIBPAPER_LIB_DEPENDS= libpaper.so:print/libpaper LIBPAPER_CONFIGURE_ENABLE=libpaper X11_DESC= Install desktop menu item X11_BUILD_DEPENDS= xdg-open:devel/xdg-utils X11_RUN_DEPENDS= xdg-open:devel/xdg-utils .if defined(CUPS_OVERWRITE_BASE) PLIST_SUB+= OVERWRITE="" .else PLIST_SUB+= OVERWRITE="@comment " .endif .if exists(/usr/lib/libusb.so) PLIST_SUB+= USB="" .else PLIST_SUB+= USB="@comment " .endif .include .if empty(ICONV_LIB) CONFIGURE_ARGS+=ac_cv_search_libiconv_open=no .endif post-patch: @${REINPLACE_CMD} -e '/SILENT/d' ${WRKSRC}/Makedefs.in @${REINPLACE_CMD} 's/usblp/ulpt/g' ${WRKSRC}/backend/usb-libusb.c @${REINPLACE_CMD} -e 's|/usr/local/etc/pam.d|${LOCALBASE}/etc/pam.d|' \ -e 's/-fstack-protector//' ${WRKSRC}/configure @${REINPLACE_CMD} 's|http://www.cups.org|https://cups.org|' \ ${WRKSRC}/doc/index.html.in \ ${WRKSRC}/doc/??/index.html.in \ ${WRKSRC}/templates/header.tmpl.in \ ${WRKSRC}/templates/??/header.tmpl.in \ ${WRKSRC}/templates/help-header.tmpl \ ${WRKSRC}/templates/??/help-header.tmpl @${REINPLACE_CMD} '/stripopt=/s/-x//' ${WRKSRC}/install-sh @${REINPLACE_CMD} 's|/etc/cups|${LOCALBASE}/etc/cups|g' \ ${WRKSRC}/man/*.man* @${REINPLACE_CMD} -e 's|\.default|.sample|'\ ${WRKSRC}/cgi-bin/admin.c\ ${WRKSRC}/conf/Makefile post-patch-DOCS-off: # Link to online documentation. @${REINPLACE_CMD} \ 's|"/*help/|"https://cups.org/documentation.php/doc-${PORTVERSION:R}/|' \ ${WRKSRC}/doc/index.html.in \ ${WRKSRC}/doc/??/index.html.in \ ${WRKSRC}/templates/choose-uri.tmpl \ ${WRKSRC}/templates/??/choose-uri.tmpl \ ${WRKSRC}/templates/header.tmpl.in \ ${WRKSRC}/templates/??/header.tmpl.in \ ${WRKSRC}/templates/samba-export.tmpl \ ${WRKSRC}/templates/??/samba-export.tmpl post-install: ${LN} -sf lpr ${STAGEDIR}${PREFIX}/bin/lpr-cups ${INSTALL_DATA} ${FILESDIR}/cups.conf.sample \ ${STAGEDIR}${PREFIX}/etc/devd ${INSTALL_DATA} ${FILESDIR}/cups ${STAGEDIR}${PREFIX}/etc/pam.d .include Index: head/print/cups/distinfo =================================================================== --- head/print/cups/distinfo (revision 441050) +++ head/print/cups/distinfo (revision 441051) @@ -1,3 +1,3 @@ -TIMESTAMP = 1484746082 -SHA256 (apple-cups-v2.2.2_GH0.tar.gz) = 5e7b396b41f55231dde8dd0465cdd81583cd47ecffe4960c777162fbe3cce03c -SIZE (apple-cups-v2.2.2_GH0.tar.gz) = 9489493 +TIMESTAMP = 1494962487 +SHA256 (apple-cups-v2.2.3_GH0.tar.gz) = 7aa7e8d581f0eb204f75203082403bfa931f8c058bffae71b210800102e5feb5 +SIZE (apple-cups-v2.2.3_GH0.tar.gz) = 9496214 Index: head/print/cups/files/patch-conf_cupsd.conf.in =================================================================== --- head/print/cups/files/patch-conf_cupsd.conf.in (revision 441050) +++ head/print/cups/files/patch-conf_cupsd.conf.in (nonexistent) @@ -1,52 +0,0 @@ ---- conf/cupsd.conf.in.orig 2017-01-17 19:27:22 UTC -+++ conf/cupsd.conf.in -@@ -134,49 +134,3 @@ WebInterface @CUPS_WEBIF@ - Order deny,allow - - -- --# Set the kerberized printer/job policies... -- -- # Job/subscription privacy... -- JobPrivateAccess default -- JobPrivateValues default -- SubscriptionPrivateAccess default -- SubscriptionPrivateValues default -- -- # Job-related operations must be done by the owner or an administrator... -- -- AuthType Negotiate -- Order deny,allow -- -- -- -- AuthType Negotiate -- Require user @OWNER @SYSTEM -- Order deny,allow -- -- -- # All administration operations require an administrator to authenticate... -- -- AuthType Default -- Require user @SYSTEM -- Order deny,allow -- -- -- # All printer operations require a printer operator to authenticate... -- -- AuthType Default -- Require user @CUPS_DEFAULT_PRINTOPERATOR_AUTH@ -- Order deny,allow -- -- -- # Only the owner or an administrator can cancel or authenticate a job... -- -- AuthType Negotiate -- Require user @OWNER @CUPS_DEFAULT_PRINTOPERATOR_AUTH@ -- Order deny,allow -- -- -- -- Order deny,allow -- -- Property changes on: head/print/cups/files/patch-conf_cupsd.conf.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property