Date: Sat, 25 Jun 2016 15:41:38 +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: r417473 - in head/print/cups: . files Message-ID: <201606251541.u5PFfcqQ097082@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Sat Jun 25 15:41:38 2016 New Revision: 417473 URL: https://svnweb.freebsd.org/changeset/ports/417473 Log: - Update to 2.1.4. - Let the socket backend print debug messages on the DEBUG channel. The other channels affect the printer status message in lpstat(1) which can be confusing. [1] PR: 203058 [1] Added: head/print/cups/files/patch-backend_socket.c (contents, props changed) Modified: head/print/cups/Makefile head/print/cups/distinfo head/print/cups/pkg-plist Modified: head/print/cups/Makefile ============================================================================== --- head/print/cups/Makefile Sat Jun 25 15:08:30 2016 (r417472) +++ head/print/cups/Makefile Sat Jun 25 15:41:38 2016 (r417473) @@ -2,11 +2,9 @@ # $FreeBSD$ PORTNAME= cups -PORTVERSION= 2.1.3 -DISTVERSIONSUFFIX=-source -PORTREVISION= 2 +PORTVERSION= 2.1.4 +DISTVERSIONPREFIX=release- CATEGORIES= print -MASTER_SITES= http://www.cups.org/software/${PORTVERSION}/ MAINTAINER= tijl@FreeBSD.org COMMENT= Common UNIX Printing System @@ -18,6 +16,9 @@ LICENSE_FILE_LGPL20= ${WRKSRC}/LICENSE.t CONFLICTS= LPRng-[0-9]* +USE_GITHUB= yes +GH_ACCOUNT= apple + DESTDIRNAME= DSTROOT GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-dnssd \ @@ -42,7 +43,6 @@ USES= cpe gmake iconv pkgconfig tar:bzi CPE_VENDOR= apple USE_LDCONFIG= yes USE_RC_SUBR= cupsd -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} GROUPS= cups USERS= cups Modified: head/print/cups/distinfo ============================================================================== --- head/print/cups/distinfo Sat Jun 25 15:08:30 2016 (r417472) +++ head/print/cups/distinfo Sat Jun 25 15:41:38 2016 (r417473) @@ -1,2 +1,3 @@ -SHA256 (cups-2.1.3-source.tar.bz2) = 36a70d43584aea2617da914b9331e23341c3501a8254c4d2eae9c11ec01fd4d3 -SIZE (cups-2.1.3-source.tar.bz2) = 8832400 +TIMESTAMP = 1466787089 +SHA256 (apple-cups-release-2.1.4_GH0.tar.gz) = 1f182f145489e2454969b221056b6b9bac2beb4e38cd75fa12a9ec15d24d5301 +SIZE (apple-cups-release-2.1.4_GH0.tar.gz) = 9572653 Added: head/print/cups/files/patch-backend_socket.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/print/cups/files/patch-backend_socket.c Sat Jun 25 15:41:38 2016 (r417473) @@ -0,0 +1,36 @@ +--- backend/socket.c.orig 2014-06-09 18:35:32 UTC ++++ backend/socket.c +@@ -316,7 +316,6 @@ main(int argc, /* I - Number of comm + */ + + fprintf(stderr, "DEBUG: Connecting to %s:%d\n", hostname, port); +- _cupsLangPrintFilter(stderr, "INFO", _("Connecting to printer.")); + + for (delay = 5;;) + { +@@ -397,7 +396,6 @@ main(int argc, /* I - Number of comm + } + + fputs("STATE: -connecting-to-device\n", stderr); +- _cupsLangPrintFilter(stderr, "INFO", _("Connected to printer.")); + + fprintf(stderr, "DEBUG: Connected to %s:%d...\n", + httpAddrString(&(addr->addr), addrname, sizeof(addrname)), +@@ -426,7 +424,7 @@ main(int argc, /* I - Number of comm + 0, backendNetworkSideCB); + + if (print_fd != 0 && tbytes >= 0) +- _cupsLangPrintFilter(stderr, "INFO", _("Print file sent.")); ++ fputs("DEBUG: Print file sent.\n", stderr); + } + + fputs("STATE: +cups-waiting-for-job-completed\n", stderr); +@@ -437,7 +435,7 @@ main(int argc, /* I - Number of comm + * Shutdown the socket and wait for the other end to finish... + */ + +- _cupsLangPrintFilter(stderr, "INFO", _("Waiting for printer to finish.")); ++ fputs("DEBUG: Waiting for printer to finish.\n", stderr); + + shutdown(device_fd, 1); + Modified: head/print/cups/pkg-plist ============================================================================== --- head/print/cups/pkg-plist Sat Jun 25 15:08:30 2016 (r417472) +++ head/print/cups/pkg-plist Sat Jun 25 15:41:38 2016 (r417473) @@ -480,6 +480,73 @@ sbin/reject %%DATADIR%%/templates/printer.tmpl %%DATADIR%%/templates/printers-header.tmpl %%DATADIR%%/templates/printers.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/add-class.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/add-printer.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/add-rss-subscription.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/admin.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/choose-device.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/choose-make.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/choose-model.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/choose-serial.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/choose-uri.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/class-added.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/class-confirm.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/class-deleted.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/class-jobs-header.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/class-modified.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/class.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/classes-header.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/classes.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/command.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/edit-config.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/error-op.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/error.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/header.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/help-header.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/job-cancel.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/job-hold.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/job-move.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/job-moved.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/job-release.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/job-restart.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/jobs-header.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/jobs.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/list-available-printers.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/modify-class.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/modify-printer.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/norestart.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/option-boolean.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/option-conflict.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/option-header.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/option-pickmany.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/option-pickone.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/option-trailer.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/pager.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/printer-accept.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/printer-added.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/printer-configured.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/printer-confirm.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/printer-default.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/printer-deleted.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/printer-jobs-header.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/printer-modified.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/printer-reject.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/printer-start.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/printer-stop.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/printer.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/printers-header.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/printers.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/restart.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/samba-export.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/samba-exported.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/search.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/set-printer-options-header.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/set-printer-options-trailer.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/subscription-added.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/subscription-canceled.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/test-page.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/trailer.tmpl +%%NLS%%%%DATADIR%%/templates/pt_BR/users.tmpl %%DATADIR%%/templates/restart.tmpl %%NLS%%%%DATADIR%%/templates/ru/add-class.tmpl %%NLS%%%%DATADIR%%/templates/ru/add-printer.tmpl @@ -665,6 +732,7 @@ sbin/reject %%DOCSDIR%%/images/wait.gif %%DOCSDIR%%/index.html %%NLS%%%%DOCSDIR%%/ja/index.html +%%NLS%%%%DOCSDIR%%/pt_BR/index.html %%DOCSDIR%%/robots.txt %%NLS%%%%DOCSDIR%%/ru/index.html %%X11%%share/icons/hicolor/128x128/apps/cups.png @@ -678,6 +746,7 @@ sbin/reject %%NLS%%share/locale/fr/cups_fr.po %%NLS%%share/locale/it/cups_it.po %%NLS%%share/locale/ja/cups_ja.po +%%NLS%%share/locale/pt_BR/cups_pt_BR.po %%NLS%%share/locale/ru/cups_ru.po @dir(,cups,) %%ETCDIR%%/interfaces @dir(,cups,) %%ETCDIR%%/ppd
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606251541.u5PFfcqQ097082>