Date: Thu, 2 Nov 2017 17:03:32 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r453352 - head/print/cups Message-ID: <201711021703.vA2H3WNX046245@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Thu Nov 2 17:03:32 2017 New Revision: 453352 URL: https://svnweb.freebsd.org/changeset/ports/453352 Log: Update to 2.2.6. Modified: head/print/cups/Makefile head/print/cups/distinfo head/print/cups/pkg-descr head/print/cups/pkg-plist Modified: head/print/cups/Makefile ============================================================================== --- head/print/cups/Makefile Thu Nov 2 16:28:06 2017 (r453351) +++ head/print/cups/Makefile Thu Nov 2 17:03:32 2017 (r453352) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= cups -PORTVERSION= 2.2.3 +PORTVERSION= 2.2.6 DISTVERSIONPREFIX=v CATEGORIES= print @@ -95,13 +95,8 @@ post-patch: @${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 + @${FIND} ${WRKSRC}/doc ${WRKSRC}/templates -type f -exec ${SED} -i '' \ + 's|http://www.cups.org|https://www.cups.org|g' {} + @${REINPLACE_CMD} '/stripopt=/s/-x//' ${WRKSRC}/install-sh @${REINPLACE_CMD} 's|/etc/cups|${LOCALBASE}/etc/cups|g' \ ${WRKSRC}/man/*.man* @@ -111,16 +106,10 @@ post-patch: 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 + @${FIND} ${WRKSRC}/doc ${WRKSRC}/templates -type f -exec ${SED} -i '' \ + -e 's|[Hh][Rr][Ee][Ff]="/*help/\([{"]\)|href="https://www.cups.org/documentation.html\1|g' \ + -e '/have_gssapi/s|[Hh][Rr][Ee][Ff]="/*help/|href="https\\://www.cups.org/doc/|g' \ + -e 's|[Hh][Rr][Ee][Ff]="/*help/|href="https://www.cups.org/doc/|g' {} + post-install: ${LN} -sf lpr ${STAGEDIR}${PREFIX}/bin/lpr-cups Modified: head/print/cups/distinfo ============================================================================== --- head/print/cups/distinfo Thu Nov 2 16:28:06 2017 (r453351) +++ head/print/cups/distinfo Thu Nov 2 17:03:32 2017 (r453352) @@ -1,3 +1,3 @@ -TIMESTAMP = 1494962487 -SHA256 (apple-cups-v2.2.3_GH0.tar.gz) = 7aa7e8d581f0eb204f75203082403bfa931f8c058bffae71b210800102e5feb5 -SIZE (apple-cups-v2.2.3_GH0.tar.gz) = 9496214 +TIMESTAMP = 1509625871 +SHA256 (apple-cups-v2.2.6_GH0.tar.gz) = bf75b33755be92ffe11642dc54365d876c57cee13d6e12507645a8c2d570033a +SIZE (apple-cups-v2.2.6_GH0.tar.gz) = 10317889 Modified: head/print/cups/pkg-descr ============================================================================== --- head/print/cups/pkg-descr Thu Nov 2 16:28:06 2017 (r453351) +++ head/print/cups/pkg-descr Thu Nov 2 17:03:32 2017 (r453352) @@ -1,4 +1,4 @@ CUPS is a standards-based, open source printing system. It uses the Internet Printing Protocol (IPP) to support printing to local and network printers. -WWW: https://cups.org/ +WWW: https://www.cups.org/ Modified: head/print/cups/pkg-plist ============================================================================== --- head/print/cups/pkg-plist Thu Nov 2 16:28:06 2017 (r453351) +++ head/print/cups/pkg-plist Thu Nov 2 17:03:32 2017 (r453352) @@ -368,6 +368,76 @@ sbin/reject %%NLS%%%%DATADIR%%/templates/es/test-page.tmpl %%NLS%%%%DATADIR%%/templates/es/trailer.tmpl %%NLS%%%%DATADIR%%/templates/es/users.tmpl +%%NLS%%%%DATADIR%%/templates/fr/add-class.tmpl +%%NLS%%%%DATADIR%%/templates/fr/add-printer.tmpl +%%NLS%%%%DATADIR%%/templates/fr/add-rss-subscription.tmpl +%%NLS%%%%DATADIR%%/templates/fr/admin.tmpl +%%NLS%%%%DATADIR%%/templates/fr/choose-device.tmpl +%%NLS%%%%DATADIR%%/templates/fr/choose-make.tmpl +%%NLS%%%%DATADIR%%/templates/fr/choose-model.tmpl +%%NLS%%%%DATADIR%%/templates/fr/choose-serial.tmpl +%%NLS%%%%DATADIR%%/templates/fr/choose-uri.tmpl +%%NLS%%%%DATADIR%%/templates/fr/class-added.tmpl +%%NLS%%%%DATADIR%%/templates/fr/class-confirm.tmpl +%%NLS%%%%DATADIR%%/templates/fr/class-deleted.tmpl +%%NLS%%%%DATADIR%%/templates/fr/class-jobs-header.tmpl +%%NLS%%%%DATADIR%%/templates/fr/class-modified.tmpl +%%NLS%%%%DATADIR%%/templates/fr/class.tmpl +%%NLS%%%%DATADIR%%/templates/fr/classes-header.tmpl +%%NLS%%%%DATADIR%%/templates/fr/classes.tmpl +%%NLS%%%%DATADIR%%/templates/fr/command.tmpl +%%NLS%%%%DATADIR%%/templates/fr/edit-config.tmpl +%%NLS%%%%DATADIR%%/templates/fr/error-op.tmpl +%%NLS%%%%DATADIR%%/templates/fr/error.tmpl +%%NLS%%%%DATADIR%%/templates/fr/header.tmpl +%%NLS%%%%DATADIR%%/templates/fr/help-header.tmpl +%%NLS%%%%DATADIR%%/templates/fr/help-printable.tmpl +%%NLS%%%%DATADIR%%/templates/fr/help-trailer.tmpl +%%NLS%%%%DATADIR%%/templates/fr/job-cancel.tmpl +%%NLS%%%%DATADIR%%/templates/fr/job-hold.tmpl +%%NLS%%%%DATADIR%%/templates/fr/job-move.tmpl +%%NLS%%%%DATADIR%%/templates/fr/job-moved.tmpl +%%NLS%%%%DATADIR%%/templates/fr/job-release.tmpl +%%NLS%%%%DATADIR%%/templates/fr/job-restart.tmpl +%%NLS%%%%DATADIR%%/templates/fr/jobs-header.tmpl +%%NLS%%%%DATADIR%%/templates/fr/jobs.tmpl +%%NLS%%%%DATADIR%%/templates/fr/list-available-printers.tmpl +%%NLS%%%%DATADIR%%/templates/fr/modify-class.tmpl +%%NLS%%%%DATADIR%%/templates/fr/modify-printer.tmpl +%%NLS%%%%DATADIR%%/templates/fr/norestart.tmpl +%%NLS%%%%DATADIR%%/templates/fr/option-boolean.tmpl +%%NLS%%%%DATADIR%%/templates/fr/option-conflict.tmpl +%%NLS%%%%DATADIR%%/templates/fr/option-header.tmpl +%%NLS%%%%DATADIR%%/templates/fr/option-pickmany.tmpl +%%NLS%%%%DATADIR%%/templates/fr/option-pickone.tmpl +%%NLS%%%%DATADIR%%/templates/fr/option-trailer.tmpl +%%NLS%%%%DATADIR%%/templates/fr/pager.tmpl +%%NLS%%%%DATADIR%%/templates/fr/printer-accept.tmpl +%%NLS%%%%DATADIR%%/templates/fr/printer-added.tmpl +%%NLS%%%%DATADIR%%/templates/fr/printer-cancel-jobs.tmpl +%%NLS%%%%DATADIR%%/templates/fr/printer-configured.tmpl +%%NLS%%%%DATADIR%%/templates/fr/printer-confirm.tmpl +%%NLS%%%%DATADIR%%/templates/fr/printer-default.tmpl +%%NLS%%%%DATADIR%%/templates/fr/printer-deleted.tmpl +%%NLS%%%%DATADIR%%/templates/fr/printer-jobs-header.tmpl +%%NLS%%%%DATADIR%%/templates/fr/printer-modified.tmpl +%%NLS%%%%DATADIR%%/templates/fr/printer-reject.tmpl +%%NLS%%%%DATADIR%%/templates/fr/printer-start.tmpl +%%NLS%%%%DATADIR%%/templates/fr/printer-stop.tmpl +%%NLS%%%%DATADIR%%/templates/fr/printer.tmpl +%%NLS%%%%DATADIR%%/templates/fr/printers-header.tmpl +%%NLS%%%%DATADIR%%/templates/fr/printers.tmpl +%%NLS%%%%DATADIR%%/templates/fr/restart.tmpl +%%NLS%%%%DATADIR%%/templates/fr/samba-export.tmpl +%%NLS%%%%DATADIR%%/templates/fr/samba-exported.tmpl +%%NLS%%%%DATADIR%%/templates/fr/search.tmpl +%%NLS%%%%DATADIR%%/templates/fr/set-printer-options-header.tmpl +%%NLS%%%%DATADIR%%/templates/fr/set-printer-options-trailer.tmpl +%%NLS%%%%DATADIR%%/templates/fr/subscription-added.tmpl +%%NLS%%%%DATADIR%%/templates/fr/subscription-canceled.tmpl +%%NLS%%%%DATADIR%%/templates/fr/test-page.tmpl +%%NLS%%%%DATADIR%%/templates/fr/trailer.tmpl +%%NLS%%%%DATADIR%%/templates/fr/users.tmpl %%DATADIR%%/templates/header.tmpl %%DATADIR%%/templates/help-header.tmpl %%DATADIR%%/templates/help-printable.tmpl @@ -635,15 +705,11 @@ sbin/reject %%NLS%%%%DOCSDIR%%/es/index.html %%PORTDOCS%%%%DOCSDIR%%/help/accounting.html %%PORTDOCS%%%%DOCSDIR%%/help/api-admin.html -%%PORTDOCS%%%%DOCSDIR%%/help/api-array.html -%%PORTDOCS%%%%DOCSDIR%%/help/api-cups.html -%%PORTDOCS%%%%DOCSDIR%%/help/api-filedir.html %%PORTDOCS%%%%DOCSDIR%%/help/api-filter.html -%%PORTDOCS%%%%DOCSDIR%%/help/api-httpipp.html -%%PORTDOCS%%%%DOCSDIR%%/help/api-overview.html %%PORTDOCS%%%%DOCSDIR%%/help/api-ppd.html %%PORTDOCS%%%%DOCSDIR%%/help/api-raster.html %%PORTDOCS%%%%DOCSDIR%%/help/cgi.html +%%PORTDOCS%%%%DOCSDIR%%/help/cupspm.html %%PORTDOCS%%%%DOCSDIR%%/help/encryption.html %%PORTDOCS%%%%DOCSDIR%%/help/glossary.html %%PORTDOCS%%%%DOCSDIR%%/help/kerberos.html @@ -744,6 +810,7 @@ sbin/reject %%NLS%%share/locale/ja/cups_ja.po %%NLS%%share/locale/pt_BR/cups_pt_BR.po %%NLS%%share/locale/ru/cups_ru.po +%%NLS%%share/locale/zh_CN/cups_zh_CN.po @dir(,cups,) %%ETCDIR%%/ppd @dir(,cups,700) %%ETCDIR%%/ssl @dir(,cups,) %%ETCDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201711021703.vA2H3WNX046245>