diff --git a/print/cups/Makefile b/print/cups/Makefile index 32c10595e515..22ef8c1e834a 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -1,119 +1,113 @@ PORTNAME= cups -PORTVERSION= 2.4.2 -PORTREVISION= 1 +PORTVERSION= 2.4.6 DISTVERSIONPREFIX=v CATEGORIES= print -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= b0f1a00a02e9.patch:-p1 -PATCHFILES+= c114e3c9827a.patch:-p1 -PATCHFILES+= ca866d8a9de2.patch:-p1 - MAINTAINER= tijl@FreeBSD.org COMMENT= Common UNIX Printing System WWW= https://github.com/OpenPrinting/cups LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE USES= compiler:c++11-lang cpe gmake iconv localbase pkgconfig CPE_VENDOR= linuxfoundation USE_GITHUB= yes GH_ACCOUNT= OpenPrinting CONFLICTS= LPRng GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-relro \ --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" \ --without-ondemand 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_WITH= dnssd=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_WITH= tls=gnutls 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 .if defined(WITH_DEBUG) CONFIGURE_ARGS+=--enable-debug --enable-debug-printfs .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|' \ ${WRKSRC}/configure @${REINPLACE_CMD} 's|/etc/cups|${LOCALBASE}/etc/cups|g' \ ${WRKSRC}/man/*.[1-9] @${REINPLACE_CMD} -e 's|\.default|.sample|'\ ${WRKSRC}/cgi-bin/admin.c\ ${WRKSRC}/conf/Makefile post-patch-DOCS-off: # Link to online documentation. @${FIND} ${WRKSRC}/doc ${WRKSRC}/templates -type f -exec ${SED} -i '' \ -e 's|[Hh][Rr][Ee][Ff]="/*help/{[^"]*"|href="https://openprinting.github.io/cups/#DOCUMENTATION|g' \ -e 's|[Hh][Rr][Ee][Ff]="/*help/"|href="https://openprinting.github.io/cups/#DOCUMENTATION|g' \ -e '/have_gssapi/s|[Hh][Rr][Ee][Ff]="/*help/|href="https\\://openprinting.github.io/cups/doc/|g' \ -e 's|[Hh][Rr][Ee][Ff]="/*help/|href="https://openprinting.github.io/cups/doc/|g' {} + 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 diff --git a/print/cups/distinfo b/print/cups/distinfo index 46441868855b..426f7817cb5a 100644 --- a/print/cups/distinfo +++ b/print/cups/distinfo @@ -1,9 +1,3 @@ -TIMESTAMP = 1682944127 -SHA256 (OpenPrinting-cups-v2.4.2_GH0.tar.gz) = 7095b2977bb728ded5566a5c802866062840d6541fd027836865949a407c3682 -SIZE (OpenPrinting-cups-v2.4.2_GH0.tar.gz) = 8173207 -SHA256 (b0f1a00a02e9.patch) = 0c3ec2efad307dbbdd45006c3d205344bcce79f53a7fce4e1bd0ed4dfe4e05f0 -SIZE (b0f1a00a02e9.patch) = 3022 -SHA256 (c114e3c9827a.patch) = 5ee80e5bf98c85c2f65b2e41ae5f32fdd0c55bb71b5cf64f9c2420e89b9ec9ba -SIZE (c114e3c9827a.patch) = 1558 -SHA256 (ca866d8a9de2.patch) = b14ed18edd38c9f0a99f5399a19b55cb6ea229df504d88e04fe84b9d156591aa -SIZE (ca866d8a9de2.patch) = 1229 +TIMESTAMP = 1687505666 +SHA256 (OpenPrinting-cups-v2.4.6_GH0.tar.gz) = 7d89f684aace50e17100c78812069168f1bdc06f95623117094f8c47ef867aef +SIZE (OpenPrinting-cups-v2.4.6_GH0.tar.gz) = 8185117