Sat Jun 18 20:36:38 2016 UTC ()
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)


(leot)
diff -r1.229 -r1.230 pkgsrc/print/cups/Makefile
diff -r1.53 -r1.54 pkgsrc/print/cups/PLIST
diff -r1.116 -r1.117 pkgsrc/print/cups/distinfo
cvs diff -r1.229 -r1.230 pkgsrc/print/cups/Makefile (expand / switch to unified diff)

--- pkgsrc/print/cups/Makefile 2016/03/22 14:43:53 1.229
+++ pkgsrc/print/cups/Makefile 2016/06/18 20:36:38 1.230
@@ -1,36 +1,29 @@ @@ -1,36 +1,29 @@
1# $NetBSD: Makefile,v 1.229 2016/03/22 14:43:53 khorben Exp $ 1# $NetBSD: Makefile,v 1.230 2016/06/18 20:36:38 leot Exp $
2# 2
3# The CUPS author is very good about taking back changes into the main 3DISTNAME= cups-2.1.4-source
4# CUPS distribution. The correct place to send patches or bug-fixes is: 4PKGNAME= ${DISTNAME:S/-source//}
5# cups-bugs@cups.org. 
6 
7DISTNAME= cups-${DIST_VERS}-source 
8PKGNAME= cups-${DIST_VERS:S/-/./g} 
9PKGREVISION= 1 
10BASE_VERS= 2.1.3 
11DIST_VERS= ${BASE_VERS} 
12CATEGORIES= print 5CATEGORIES= print
13MASTER_SITES= http://www.cups.org/software/${BASE_VERS}/ 6MASTER_SITES= ${MASTER_SITE_GITHUB:=apple/}
14EXTRACT_SUFX= .tar.bz2 7GITHUB_RELEASE= release-${PKGVERSION_NOREV}
15 8
16MAINTAINER= sbd@NetBSD.org 9MAINTAINER= sbd@NetBSD.org
17HOMEPAGE= http://www.cups.org/ 10HOMEPAGE= http://www.cups.org/
18COMMENT= Common UNIX Printing System 11COMMENT= Common UNIX Printing System
19LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2 12LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2
20 13
21CONFLICTS+= LPRng-[0-9]* LPRng-core-[0-9]* 14CONFLICTS+= LPRng-[0-9]* LPRng-core-[0-9]*
22 15
23WRKSRC= ${WRKDIR}/cups-${BASE_VERS} 16WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
24UNLIMIT_RESOURCES= datasize memorysize 17UNLIMIT_RESOURCES= datasize memorysize
25USE_LANGUAGES= c c++ # pdftops is a C++ application 18USE_LANGUAGES= c c++ # pdftops is a C++ application
26USE_PKGLOCALEDIR= yes 19USE_PKGLOCALEDIR= yes
27USE_TOOLS+= aclocal autoconf automake gmake 20USE_TOOLS+= aclocal autoconf automake gmake
28USE_LIBTOOL= yes 21USE_LIBTOOL= yes
29 22
30GNU_CONFIGURE= yes 23GNU_CONFIGURE= yes
31CONFIGURE_ARGS+= --localedir=${PREFIX}/${PKGLOCALEDIR}/locale 24CONFIGURE_ARGS+= --localedir=${PREFIX}/${PKGLOCALEDIR}/locale
32CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} 25CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
33CONFIGURE_ARGS+= --localstatedir=${VARBASE} 26CONFIGURE_ARGS+= --localstatedir=${VARBASE}
34CONFIGURE_ARGS+= --with-cachedir=${CUPS_CACHE:Q} 27CONFIGURE_ARGS+= --with-cachedir=${CUPS_CACHE:Q}
35CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/cups 28CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/cups
36CONFIGURE_ARGS+= --with-serverbindir=${PREFIX}/libexec/cups 29CONFIGURE_ARGS+= --with-serverbindir=${PREFIX}/libexec/cups
cvs diff -r1.53 -r1.54 pkgsrc/print/cups/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/print/cups/Attic/PLIST 2015/11/17 10:49:16 1.53
+++ pkgsrc/print/cups/Attic/PLIST 2016/06/18 20:36:38 1.54
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.53 2015/11/17 10:49:16 hauke Exp $ 1@comment $NetBSD: PLIST,v 1.54 2016/06/18 20:36:38 leot Exp $
2bin/cancel 2bin/cancel
3bin/cups-config 3bin/cups-config
4bin/cupstestdsc 4bin/cupstestdsc
5bin/cupstestppd 5bin/cupstestppd
6bin/ipptool 6bin/ipptool
7bin/lp 7bin/lp
8bin/lpoptions 8bin/lpoptions
9bin/lpq 9bin/lpq
10bin/lpr 10bin/lpr
11bin/lprm 11bin/lprm
12bin/lpstat 12bin/lpstat
13bin/ppdc 13bin/ppdc
14bin/ppdhtml 14bin/ppdhtml
@@ -445,26 +445,93 @@ share/cups/templates/printer-added.tmpl @@ -445,26 +445,93 @@ share/cups/templates/printer-added.tmpl
445share/cups/templates/printer-cancel-jobs.tmpl 445share/cups/templates/printer-cancel-jobs.tmpl
446share/cups/templates/printer-configured.tmpl 446share/cups/templates/printer-configured.tmpl
447share/cups/templates/printer-confirm.tmpl 447share/cups/templates/printer-confirm.tmpl
448share/cups/templates/printer-default.tmpl 448share/cups/templates/printer-default.tmpl
449share/cups/templates/printer-deleted.tmpl 449share/cups/templates/printer-deleted.tmpl
450share/cups/templates/printer-jobs-header.tmpl 450share/cups/templates/printer-jobs-header.tmpl
451share/cups/templates/printer-modified.tmpl 451share/cups/templates/printer-modified.tmpl
452share/cups/templates/printer-reject.tmpl 452share/cups/templates/printer-reject.tmpl
453share/cups/templates/printer-start.tmpl 453share/cups/templates/printer-start.tmpl
454share/cups/templates/printer-stop.tmpl 454share/cups/templates/printer-stop.tmpl
455share/cups/templates/printer.tmpl 455share/cups/templates/printer.tmpl
456share/cups/templates/printers-header.tmpl 456share/cups/templates/printers-header.tmpl
457share/cups/templates/printers.tmpl 457share/cups/templates/printers.tmpl
 458share/cups/templates/pt_BR/add-class.tmpl
 459share/cups/templates/pt_BR/add-printer.tmpl
 460share/cups/templates/pt_BR/add-rss-subscription.tmpl
 461share/cups/templates/pt_BR/admin.tmpl
 462share/cups/templates/pt_BR/choose-device.tmpl
 463share/cups/templates/pt_BR/choose-make.tmpl
 464share/cups/templates/pt_BR/choose-model.tmpl
 465share/cups/templates/pt_BR/choose-serial.tmpl
 466share/cups/templates/pt_BR/choose-uri.tmpl
 467share/cups/templates/pt_BR/class-added.tmpl
 468share/cups/templates/pt_BR/class-confirm.tmpl
 469share/cups/templates/pt_BR/class-deleted.tmpl
 470share/cups/templates/pt_BR/class-jobs-header.tmpl
 471share/cups/templates/pt_BR/class-modified.tmpl
 472share/cups/templates/pt_BR/class.tmpl
 473share/cups/templates/pt_BR/classes-header.tmpl
 474share/cups/templates/pt_BR/classes.tmpl
 475share/cups/templates/pt_BR/command.tmpl
 476share/cups/templates/pt_BR/edit-config.tmpl
 477share/cups/templates/pt_BR/error-op.tmpl
 478share/cups/templates/pt_BR/error.tmpl
 479share/cups/templates/pt_BR/header.tmpl
 480share/cups/templates/pt_BR/help-header.tmpl
 481share/cups/templates/pt_BR/job-cancel.tmpl
 482share/cups/templates/pt_BR/job-hold.tmpl
 483share/cups/templates/pt_BR/job-move.tmpl
 484share/cups/templates/pt_BR/job-moved.tmpl
 485share/cups/templates/pt_BR/job-release.tmpl
 486share/cups/templates/pt_BR/job-restart.tmpl
 487share/cups/templates/pt_BR/jobs-header.tmpl
 488share/cups/templates/pt_BR/jobs.tmpl
 489share/cups/templates/pt_BR/list-available-printers.tmpl
 490share/cups/templates/pt_BR/modify-class.tmpl
 491share/cups/templates/pt_BR/modify-printer.tmpl
 492share/cups/templates/pt_BR/norestart.tmpl
 493share/cups/templates/pt_BR/option-boolean.tmpl
 494share/cups/templates/pt_BR/option-conflict.tmpl
 495share/cups/templates/pt_BR/option-header.tmpl
 496share/cups/templates/pt_BR/option-pickmany.tmpl
 497share/cups/templates/pt_BR/option-pickone.tmpl
 498share/cups/templates/pt_BR/option-trailer.tmpl
 499share/cups/templates/pt_BR/pager.tmpl
 500share/cups/templates/pt_BR/printer-accept.tmpl
 501share/cups/templates/pt_BR/printer-added.tmpl
 502share/cups/templates/pt_BR/printer-configured.tmpl
 503share/cups/templates/pt_BR/printer-confirm.tmpl
 504share/cups/templates/pt_BR/printer-default.tmpl
 505share/cups/templates/pt_BR/printer-deleted.tmpl
 506share/cups/templates/pt_BR/printer-jobs-header.tmpl
 507share/cups/templates/pt_BR/printer-modified.tmpl
 508share/cups/templates/pt_BR/printer-reject.tmpl
 509share/cups/templates/pt_BR/printer-start.tmpl
 510share/cups/templates/pt_BR/printer-stop.tmpl
 511share/cups/templates/pt_BR/printer.tmpl
 512share/cups/templates/pt_BR/printers-header.tmpl
 513share/cups/templates/pt_BR/printers.tmpl
 514share/cups/templates/pt_BR/restart.tmpl
 515share/cups/templates/pt_BR/samba-export.tmpl
 516share/cups/templates/pt_BR/samba-exported.tmpl
 517share/cups/templates/pt_BR/search.tmpl
 518share/cups/templates/pt_BR/set-printer-options-header.tmpl
 519share/cups/templates/pt_BR/set-printer-options-trailer.tmpl
 520share/cups/templates/pt_BR/subscription-added.tmpl
 521share/cups/templates/pt_BR/subscription-canceled.tmpl
 522share/cups/templates/pt_BR/test-page.tmpl
 523share/cups/templates/pt_BR/trailer.tmpl
 524share/cups/templates/pt_BR/users.tmpl
458share/cups/templates/restart.tmpl 525share/cups/templates/restart.tmpl
459share/cups/templates/ru/add-class.tmpl 526share/cups/templates/ru/add-class.tmpl
460share/cups/templates/ru/add-printer.tmpl 527share/cups/templates/ru/add-printer.tmpl
461share/cups/templates/ru/add-rss-subscription.tmpl 528share/cups/templates/ru/add-rss-subscription.tmpl
462share/cups/templates/ru/admin.tmpl 529share/cups/templates/ru/admin.tmpl
463share/cups/templates/ru/choose-device.tmpl 530share/cups/templates/ru/choose-device.tmpl
464share/cups/templates/ru/choose-make.tmpl 531share/cups/templates/ru/choose-make.tmpl
465share/cups/templates/ru/choose-model.tmpl 532share/cups/templates/ru/choose-model.tmpl
466share/cups/templates/ru/choose-serial.tmpl 533share/cups/templates/ru/choose-serial.tmpl
467share/cups/templates/ru/choose-uri.tmpl 534share/cups/templates/ru/choose-uri.tmpl
468share/cups/templates/ru/class-added.tmpl 535share/cups/templates/ru/class-added.tmpl
469share/cups/templates/ru/class-confirm.tmpl 536share/cups/templates/ru/class-confirm.tmpl
470share/cups/templates/ru/class-deleted.tmpl 537share/cups/templates/ru/class-deleted.tmpl
@@ -632,27 +699,29 @@ share/doc/cups/images/cups-raster-chain. @@ -632,27 +699,29 @@ share/doc/cups/images/cups-raster-chain.
632share/doc/cups/images/cups.png 699share/doc/cups/images/cups.png
633share/doc/cups/images/generic.png 700share/doc/cups/images/generic.png
634share/doc/cups/images/left.gif 701share/doc/cups/images/left.gif
635share/doc/cups/images/raster-organization.png 702share/doc/cups/images/raster-organization.png
636share/doc/cups/images/raster.png 703share/doc/cups/images/raster.png
637share/doc/cups/images/right.gif 704share/doc/cups/images/right.gif
638share/doc/cups/images/sample-image.png 705share/doc/cups/images/sample-image.png
639share/doc/cups/images/sel.gif 706share/doc/cups/images/sel.gif
640share/doc/cups/images/smiley.jpg 707share/doc/cups/images/smiley.jpg
641share/doc/cups/images/unsel.gif 708share/doc/cups/images/unsel.gif
642share/doc/cups/images/wait.gif 709share/doc/cups/images/wait.gif
643share/doc/cups/index.html 710share/doc/cups/index.html
644share/doc/cups/ja/index.html 711share/doc/cups/ja/index.html
 712share/doc/cups/pt_BR/index.html
645share/doc/cups/robots.txt 713share/doc/cups/robots.txt
646share/doc/cups/ru/index.html 714share/doc/cups/ru/index.html
647share/examples/cups/cups-files.conf 715share/examples/cups/cups-files.conf
648share/examples/cups/cupsd.conf 716share/examples/cups/cupsd.conf
649${PLIST.pam}share/examples/cups/cups.pam 717${PLIST.pam}share/examples/cups/cups.pam
650share/examples/cups/snmp.conf 718share/examples/cups/snmp.conf
651share/locale/ca/cups_ca.po 719share/locale/ca/cups_ca.po
652share/locale/cs/cups_cs.po 720share/locale/cs/cups_cs.po
653share/locale/de/cups_de.po 721share/locale/de/cups_de.po
654share/locale/es/cups_es.po 722share/locale/es/cups_es.po
655share/locale/fr/cups_fr.po 723share/locale/fr/cups_fr.po
656share/locale/it/cups_it.po 724share/locale/it/cups_it.po
657share/locale/ja/cups_ja.po 725share/locale/ja/cups_ja.po
 726share/locale/pt_BR/cups_pt_BR.po
658share/locale/ru/cups_ru.po 727share/locale/ru/cups_ru.po
cvs diff -r1.116 -r1.117 pkgsrc/print/cups/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/print/cups/Attic/distinfo 2016/02/07 11:29:30 1.116
+++ pkgsrc/print/cups/Attic/distinfo 2016/06/18 20:36:38 1.117
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: distinfo,v 1.116 2016/02/07 11:29:30 leot Exp $ 1$NetBSD: distinfo,v 1.117 2016/06/18 20:36:38 leot Exp $
2 2
3SHA1 (cups-2.1.3-source.tar.bz2) = bba3c97e58902f883f22784aff669968d1231dd7 3SHA1 (cups-2.1.4-source.tar.gz) = 5d935d763169e45cc352472cb27e24893b60b7bb
4RMD160 (cups-2.1.3-source.tar.bz2) = 806bbb2f584799869427ed13c790c39ea7fa259e 4RMD160 (cups-2.1.4-source.tar.gz) = b84a62416736033e7ecd3dfcaaec9c82bbd987b3
5SHA512 (cups-2.1.3-source.tar.bz2) = 5cc715b8521b4d6af29a97a8abf7a1b0973840c00727ee8e7926e89a4a9da8e67565d14cc4b57ab7cfb40b238d4faaed7608b9ab95947cc3671ed87b710f8f36 5SHA512 (cups-2.1.4-source.tar.gz) = ba06f593a54bfed972a8423df430ad842b8ef1290f16bfac3a8e1a69a27208b9fd28a9d527cb690a1b63d03be9a3ba5b7de91acf883ae83006989ad6a009609d
6Size (cups-2.1.3-source.tar.bz2) = 8832400 bytes 6Size (cups-2.1.4-source.tar.gz) = 9557631 bytes
7SHA1 (patch-ae) = 04f314bbbb05538b67a0f68adc241a09e836a4e2 7SHA1 (patch-ae) = 04f314bbbb05538b67a0f68adc241a09e836a4e2
8SHA1 (patch-af) = 6ae6ae6006387db69bf7c15f7c8500708c9e8f56 8SHA1 (patch-af) = 6ae6ae6006387db69bf7c15f7c8500708c9e8f56
9SHA1 (patch-ai) = 2c1ca67ea6f6c1dedb4c8ff97736f328a2b9a7c6 9SHA1 (patch-ai) = 2c1ca67ea6f6c1dedb4c8ff97736f328a2b9a7c6
10SHA1 (patch-at) = ef6303936daf0826dc4725f5369bfb1add832b1f 10SHA1 (patch-at) = ef6303936daf0826dc4725f5369bfb1add832b1f
11SHA1 (patch-conf_Makefile) = bb8313e493c02959edfe1e53f50b9f16ce6f42e0 11SHA1 (patch-conf_Makefile) = bb8313e493c02959edfe1e53f50b9f16ce6f42e0
12SHA1 (patch-config-scripts_cups-compiler.m4) = 5984c94c154ac732d97c0af26fc4099a7889096f 12SHA1 (patch-config-scripts_cups-compiler.m4) = 5984c94c154ac732d97c0af26fc4099a7889096f
13SHA1 (patch-config-scripts_cups-directories.m4) = 3750c110eb6599870ce68a34586a442f630a11c7 13SHA1 (patch-config-scripts_cups-directories.m4) = 3750c110eb6599870ce68a34586a442f630a11c7
14SHA1 (patch-config-scripts_cups-gssapi.m4) = 0f7e4c35473e6117d2fe103750eda820b6fade55 14SHA1 (patch-config-scripts_cups-gssapi.m4) = 0f7e4c35473e6117d2fe103750eda820b6fade55
15SHA1 (patch-config-scripts_cups-manpages.m4) = 58148287a64e52007ace5d9659912261aa3ea611 15SHA1 (patch-config-scripts_cups-manpages.m4) = 58148287a64e52007ace5d9659912261aa3ea611
16SHA1 (patch-config-scripts_cups-sharedlibs.m4) = 5b95da8f91de0aaab8b3f826ce0a2662cee3f63a 16SHA1 (patch-config-scripts_cups-sharedlibs.m4) = 5b95da8f91de0aaab8b3f826ce0a2662cee3f63a
17SHA1 (patch-configure.ac) = 0e48669372badc477db7d6f26c8180062f4e78de 17SHA1 (patch-configure.ac) = 0e48669372badc477db7d6f26c8180062f4e78de
18SHA1 (patch-cups-tls.c) = f89c25f8089d9e11a983a270adbb2cbde3c22511 18SHA1 (patch-cups-tls.c) = f89c25f8089d9e11a983a270adbb2cbde3c22511
19SHA1 (patch-ppdc_Makefile) = 575ab7d75bebf086cde52956679164c9f01fd37e 19SHA1 (patch-ppdc_Makefile) = 575ab7d75bebf086cde52956679164c9f01fd37e