Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 96CFA7A474 for ; Sat, 18 Jun 2016 20:36:40 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 1065985E8C; Sat, 18 Jun 2016 20:36:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 94CFC85E6F for ; Sat, 18 Jun 2016 20:36:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id KwUe3nqDnG3G for ; Sat, 18 Jun 2016 20:36:38 +0000 (UTC) Received: from cvs.NetBSD.org (unknown [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id CBB9484C6C for ; Sat, 18 Jun 2016 20:36:38 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id C1CCCFBB5; Sat, 18 Jun 2016 20:36:38 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1466282198288940" MIME-Version: 1.0 Date: Sat, 18 Jun 2016 20:36:38 +0000 From: "Leonardo Taccari" Subject: CVS commit: pkgsrc/print/cups To: pkgsrc-changes@NetBSD.org Reply-To: leot@netbsd.org X-Mailer: log_accum Message-Id: <20160618203638.C1CCCFBB5@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1466282198288940 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: leot Date: Sat Jun 18 20:36:38 UTC 2016 Modified Files: pkgsrc/print/cups: Makefile PLIST distinfo Log Message: Update print/cups to 2.1.4 pkgsrc changes: - Switch MASTER_SITES to MASTER_SITE_GITHUB (per-upstream), simplify DISTNAME handling and get rid of comment (because also the bug handling changed to GitHub issues) Changes: CHANGES IN CUPS V2.1.4 ---------------------- - Fixed reporting of 1284 Device IDs (Issue #3835, PR #3836) - Fixed printing of multiple files to raw queues (Issue #4782) - The scheduler did not implement the Hold-New-Jobs opertion correctly (Issue #4767) - The ipptool program truncated values at 8k (Issue #4786) - The ipptool program did not correctly report uriScheme values in plist output (Issue #4785) - The cups-lpd mini-daemon incorrectly included the document-name attribute when creating a job. It should only be included when sending a job (Issue #4790) - USB quirk updates (Issue #4778, Issue #4789) - Documentation update (Issue #4772) To generate a diff of this commit: cvs rdiff -u -r1.229 -r1.230 pkgsrc/print/cups/Makefile cvs rdiff -u -r1.53 -r1.54 pkgsrc/print/cups/PLIST cvs rdiff -u -r1.116 -r1.117 pkgsrc/print/cups/distinfo Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1466282198288940 Content-Disposition: inline Content-Length: 6827 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/print/cups/Makefile diff -u pkgsrc/print/cups/Makefile:1.229 pkgsrc/print/cups/Makefile:1.230 --- pkgsrc/print/cups/Makefile:1.229 Tue Mar 22 14:43:53 2016 +++ pkgsrc/print/cups/Makefile Sat Jun 18 20:36:38 2016 @@ -1,17 +1,10 @@ -# $NetBSD: Makefile,v 1.229 2016/03/22 14:43:53 khorben Exp $ -# -# The CUPS author is very good about taking back changes into the main -# CUPS distribution. The correct place to send patches or bug-fixes is: -# cups-bugs@cups.org. - -DISTNAME= cups-${DIST_VERS}-source -PKGNAME= cups-${DIST_VERS:S/-/./g} -PKGREVISION= 1 -BASE_VERS= 2.1.3 -DIST_VERS= ${BASE_VERS} +# $NetBSD: Makefile,v 1.230 2016/06/18 20:36:38 leot Exp $ + +DISTNAME= cups-2.1.4-source +PKGNAME= ${DISTNAME:S/-source//} CATEGORIES= print -MASTER_SITES= http://www.cups.org/software/${BASE_VERS}/ -EXTRACT_SUFX= .tar.bz2 +MASTER_SITES= ${MASTER_SITE_GITHUB:=apple/} +GITHUB_RELEASE= release-${PKGVERSION_NOREV} MAINTAINER= sbd@NetBSD.org HOMEPAGE= http://www.cups.org/ @@ -20,7 +13,7 @@ LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2 CONFLICTS+= LPRng-[0-9]* LPRng-core-[0-9]* -WRKSRC= ${WRKDIR}/cups-${BASE_VERS} +WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} UNLIMIT_RESOURCES= datasize memorysize USE_LANGUAGES= c c++ # pdftops is a C++ application USE_PKGLOCALEDIR= yes Index: pkgsrc/print/cups/PLIST diff -u pkgsrc/print/cups/PLIST:1.53 pkgsrc/print/cups/PLIST:1.54 --- pkgsrc/print/cups/PLIST:1.53 Tue Nov 17 10:49:16 2015 +++ pkgsrc/print/cups/PLIST Sat Jun 18 20:36:38 2016 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.53 2015/11/17 10:49:16 hauke Exp $ +@comment $NetBSD: PLIST,v 1.54 2016/06/18 20:36:38 leot Exp $ bin/cancel bin/cups-config bin/cupstestdsc @@ -455,6 +455,73 @@ share/cups/templates/printer-stop.tmpl share/cups/templates/printer.tmpl share/cups/templates/printers-header.tmpl share/cups/templates/printers.tmpl +share/cups/templates/pt_BR/add-class.tmpl +share/cups/templates/pt_BR/add-printer.tmpl +share/cups/templates/pt_BR/add-rss-subscription.tmpl +share/cups/templates/pt_BR/admin.tmpl +share/cups/templates/pt_BR/choose-device.tmpl +share/cups/templates/pt_BR/choose-make.tmpl +share/cups/templates/pt_BR/choose-model.tmpl +share/cups/templates/pt_BR/choose-serial.tmpl +share/cups/templates/pt_BR/choose-uri.tmpl +share/cups/templates/pt_BR/class-added.tmpl +share/cups/templates/pt_BR/class-confirm.tmpl +share/cups/templates/pt_BR/class-deleted.tmpl +share/cups/templates/pt_BR/class-jobs-header.tmpl +share/cups/templates/pt_BR/class-modified.tmpl +share/cups/templates/pt_BR/class.tmpl +share/cups/templates/pt_BR/classes-header.tmpl +share/cups/templates/pt_BR/classes.tmpl +share/cups/templates/pt_BR/command.tmpl +share/cups/templates/pt_BR/edit-config.tmpl +share/cups/templates/pt_BR/error-op.tmpl +share/cups/templates/pt_BR/error.tmpl +share/cups/templates/pt_BR/header.tmpl +share/cups/templates/pt_BR/help-header.tmpl +share/cups/templates/pt_BR/job-cancel.tmpl +share/cups/templates/pt_BR/job-hold.tmpl +share/cups/templates/pt_BR/job-move.tmpl +share/cups/templates/pt_BR/job-moved.tmpl +share/cups/templates/pt_BR/job-release.tmpl +share/cups/templates/pt_BR/job-restart.tmpl +share/cups/templates/pt_BR/jobs-header.tmpl +share/cups/templates/pt_BR/jobs.tmpl +share/cups/templates/pt_BR/list-available-printers.tmpl +share/cups/templates/pt_BR/modify-class.tmpl +share/cups/templates/pt_BR/modify-printer.tmpl +share/cups/templates/pt_BR/norestart.tmpl +share/cups/templates/pt_BR/option-boolean.tmpl +share/cups/templates/pt_BR/option-conflict.tmpl +share/cups/templates/pt_BR/option-header.tmpl +share/cups/templates/pt_BR/option-pickmany.tmpl +share/cups/templates/pt_BR/option-pickone.tmpl +share/cups/templates/pt_BR/option-trailer.tmpl +share/cups/templates/pt_BR/pager.tmpl +share/cups/templates/pt_BR/printer-accept.tmpl +share/cups/templates/pt_BR/printer-added.tmpl +share/cups/templates/pt_BR/printer-configured.tmpl +share/cups/templates/pt_BR/printer-confirm.tmpl +share/cups/templates/pt_BR/printer-default.tmpl +share/cups/templates/pt_BR/printer-deleted.tmpl +share/cups/templates/pt_BR/printer-jobs-header.tmpl +share/cups/templates/pt_BR/printer-modified.tmpl +share/cups/templates/pt_BR/printer-reject.tmpl +share/cups/templates/pt_BR/printer-start.tmpl +share/cups/templates/pt_BR/printer-stop.tmpl +share/cups/templates/pt_BR/printer.tmpl +share/cups/templates/pt_BR/printers-header.tmpl +share/cups/templates/pt_BR/printers.tmpl +share/cups/templates/pt_BR/restart.tmpl +share/cups/templates/pt_BR/samba-export.tmpl +share/cups/templates/pt_BR/samba-exported.tmpl +share/cups/templates/pt_BR/search.tmpl +share/cups/templates/pt_BR/set-printer-options-header.tmpl +share/cups/templates/pt_BR/set-printer-options-trailer.tmpl +share/cups/templates/pt_BR/subscription-added.tmpl +share/cups/templates/pt_BR/subscription-canceled.tmpl +share/cups/templates/pt_BR/test-page.tmpl +share/cups/templates/pt_BR/trailer.tmpl +share/cups/templates/pt_BR/users.tmpl share/cups/templates/restart.tmpl share/cups/templates/ru/add-class.tmpl share/cups/templates/ru/add-printer.tmpl @@ -642,6 +709,7 @@ 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 @@ -655,4 +723,5 @@ 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 Index: pkgsrc/print/cups/distinfo diff -u pkgsrc/print/cups/distinfo:1.116 pkgsrc/print/cups/distinfo:1.117 --- pkgsrc/print/cups/distinfo:1.116 Sun Feb 7 11:29:30 2016 +++ pkgsrc/print/cups/distinfo Sat Jun 18 20:36:38 2016 @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.116 2016/02/07 11:29:30 leot Exp $ +$NetBSD: distinfo,v 1.117 2016/06/18 20:36:38 leot Exp $ -SHA1 (cups-2.1.3-source.tar.bz2) = bba3c97e58902f883f22784aff669968d1231dd7 -RMD160 (cups-2.1.3-source.tar.bz2) = 806bbb2f584799869427ed13c790c39ea7fa259e -SHA512 (cups-2.1.3-source.tar.bz2) = 5cc715b8521b4d6af29a97a8abf7a1b0973840c00727ee8e7926e89a4a9da8e67565d14cc4b57ab7cfb40b238d4faaed7608b9ab95947cc3671ed87b710f8f36 -Size (cups-2.1.3-source.tar.bz2) = 8832400 bytes +SHA1 (cups-2.1.4-source.tar.gz) = 5d935d763169e45cc352472cb27e24893b60b7bb +RMD160 (cups-2.1.4-source.tar.gz) = b84a62416736033e7ecd3dfcaaec9c82bbd987b3 +SHA512 (cups-2.1.4-source.tar.gz) = ba06f593a54bfed972a8423df430ad842b8ef1290f16bfac3a8e1a69a27208b9fd28a9d527cb690a1b63d03be9a3ba5b7de91acf883ae83006989ad6a009609d +Size (cups-2.1.4-source.tar.gz) = 9557631 bytes SHA1 (patch-ae) = 04f314bbbb05538b67a0f68adc241a09e836a4e2 SHA1 (patch-af) = 6ae6ae6006387db69bf7c15f7c8500708c9e8f56 SHA1 (patch-ai) = 2c1ca67ea6f6c1dedb4c8ff97736f328a2b9a7c6 --_----------=_1466282198288940--