Wed Jun 17 10:21:02 2015 UTC ()
perl-5.22 compat. Bump PKGREVISION.


(wiz)
diff -r1.42 -r1.43 pkgsrc/print/hplip/Makefile
diff -r1.16 -r1.17 pkgsrc/print/hplip/distinfo
diff -r0 -r1.1 pkgsrc/print/hplip/patches/patch-prnt_hpijs_foomatic-rip-hplip
cvs diff -r1.42 -r1.43 pkgsrc/print/hplip/Makefile (expand / switch to unified diff)

--- pkgsrc/print/hplip/Makefile 2015/06/14 21:50:53 1.42
+++ pkgsrc/print/hplip/Makefile 2015/06/17 10:21:02 1.43
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.42 2015/06/14 21:50:53 schnoebe Exp $ 1# $NetBSD: Makefile,v 1.43 2015/06/17 10:21:02 wiz Exp $
2 2
3DISTNAME= hplip-3.15.6 3DISTNAME= hplip-3.15.6
 4PKGREVISION= 1
4CATEGORIES= print 5CATEGORIES= print
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hplip/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hplip/}
6 7
7MAINTAINER= schnoebe@NetBSD.org 8MAINTAINER= schnoebe@NetBSD.org
8HOMEPAGE= http://hplipopensource.com/ 9HOMEPAGE= http://hplipopensource.com/
9COMMENT= HP Linux Imaging and Printing 10COMMENT= HP Linux Imaging and Printing
10LICENSE= gnu-gpl-v2 AND mit AND modified-bsd 11LICENSE= gnu-gpl-v2 AND mit AND modified-bsd
11 12
12CONFLICTS+= hpijs-[0-9]* 13CONFLICTS+= hpijs-[0-9]*
13 14
14FILES_SUBST+= CUPS_USER=${CUPS_USER} 15FILES_SUBST+= CUPS_USER=${CUPS_USER}
15FILES_SUBST+= CUPS_GROUP=${CUPS_GROUP} 16FILES_SUBST+= CUPS_GROUP=${CUPS_GROUP}
16 17
cvs diff -r1.16 -r1.17 pkgsrc/print/hplip/distinfo (expand / switch to unified diff)

--- pkgsrc/print/hplip/distinfo 2015/06/14 21:50:53 1.16
+++ pkgsrc/print/hplip/distinfo 2015/06/17 10:21:02 1.17
@@ -1,12 +1,13 @@ @@ -1,12 +1,13 @@
1$NetBSD: distinfo,v 1.16 2015/06/14 21:50:53 schnoebe Exp $ 1$NetBSD: distinfo,v 1.17 2015/06/17 10:21:02 wiz Exp $
2 2
3SHA1 (hplip-3.15.6.tar.gz) = dba9839d3daf1a2dc464a0d3094ba9b71fea422c 3SHA1 (hplip-3.15.6.tar.gz) = dba9839d3daf1a2dc464a0d3094ba9b71fea422c
4RMD160 (hplip-3.15.6.tar.gz) = ded043f1c5c03949957057647f5e3bbeda3d6885 4RMD160 (hplip-3.15.6.tar.gz) = ded043f1c5c03949957057647f5e3bbeda3d6885
5Size (hplip-3.15.6.tar.gz) = 21956752 bytes 5Size (hplip-3.15.6.tar.gz) = 21956752 bytes
6SHA1 (patch-aa) = 68bede16003a2d43c93a0ef547857b9e4196312e 6SHA1 (patch-aa) = 68bede16003a2d43c93a0ef547857b9e4196312e
7SHA1 (patch-ab) = 82b8ab80f778a6a31c1031688d9a16dbd4c55462 7SHA1 (patch-ab) = 82b8ab80f778a6a31c1031688d9a16dbd4c55462
8SHA1 (patch-ae) = 0dfdef7ebb56b04c7d910bf0add1a035fc32a7e7 8SHA1 (patch-ae) = 0dfdef7ebb56b04c7d910bf0add1a035fc32a7e7
9SHA1 (patch-io_hpmud_musb.h) = ad634f5a1f426877e1c88916b6468fcdb7598555 9SHA1 (patch-io_hpmud_musb.h) = ad634f5a1f426877e1c88916b6468fcdb7598555
10SHA1 (patch-prnt_hpijs_context2.cpp) = f81148c1c334a9074453b27ac055833cd1669bd0 10SHA1 (patch-prnt_hpijs_context2.cpp) = f81148c1c334a9074453b27ac055833cd1669bd0
 11SHA1 (patch-prnt_hpijs_foomatic-rip-hplip) = a94c7bbdc90dd68d001ce0325b7aabcd470233eb
11SHA1 (patch-prnt_hpijs_hjzjscolor.cpp) = 5ca9c828ba4aff17a54a803d79c2dc169975d50c 12SHA1 (patch-prnt_hpijs_hjzjscolor.cpp) = 5ca9c828ba4aff17a54a803d79c2dc169975d50c
12SHA1 (patch-scan.py) = 4d942ee0580d5f1818e43164c07edd018529395d 13SHA1 (patch-scan.py) = 4d942ee0580d5f1818e43164c07edd018529395d
File Added: pkgsrc/print/hplip/patches/patch-prnt_hpijs_foomatic-rip-hplip
$NetBSD: patch-prnt_hpijs_foomatic-rip-hplip,v 1.1 2015/06/17 10:21:02 wiz Exp $

perl-5.22 compatibility

--- prnt/hpijs/foomatic-rip-hplip.orig	2015-06-07 19:25:26.000000000 +0000
+++ prnt/hpijs/foomatic-rip-hplip
@@ -1653,7 +1653,7 @@ if ($#datablob >= 0) {
 ## if nexessary.
 
 my $dontparse = 0;
-if ((!defined(@{$dat->{'args'}})) ||
+if ((!@{$dat->{'args'}}) ||
     ($#{$dat->{'args'}} < 0)) {
     # We don't have any options, so we do not need to parse the
     # PostScript data