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 (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,185 +1,186 @@ @@ -1,185 +1,186 @@
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
17PKG_GROUPS_VARS+= CUPS_GROUP 18PKG_GROUPS_VARS+= CUPS_GROUP
18PKG_USERS_VARS+= CUPS_USER 19PKG_USERS_VARS+= CUPS_USER
19 20
20PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # py-xml 21PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # py-xml
21 22
22BUILD_DEFS+= CUPS_USER CUPS_GROUP VARBASE 23BUILD_DEFS+= CUPS_USER CUPS_GROUP VARBASE
23 24
24GNU_CONFIGURE= yes 25GNU_CONFIGURE= yes
25USE_LIBTOOL= yes 26USE_LIBTOOL= yes
26USE_LANGUAGES= c c++ 27USE_LANGUAGES= c c++
27USE_TOOLS+= aclocal autoconf automake gmake pkg-config 28USE_TOOLS+= aclocal autoconf automake gmake pkg-config
28USE_TOOLS+= perl:run 29USE_TOOLS+= perl:run
29 30
30CONFIGURE_ARGS= --sysconfdir=${PKG_SYSCONFDIR} \ 31CONFIGURE_ARGS= --sysconfdir=${PKG_SYSCONFDIR} \
31 --localstatedir=${VARBASE} \ 32 --localstatedir=${VARBASE} \
32 --with-cupsbackenddir=${PREFIX}/libexec/cups/backend \ 33 --with-cupsbackenddir=${PREFIX}/libexec/cups/backend \
33 --with-cupsfilterdir=${PREFIX}/libexec/cups/filter \ 34 --with-cupsfilterdir=${PREFIX}/libexec/cups/filter \
34 --with-hpppddir=${PREFIX}/share/hplip/ppd/HP 35 --with-hpppddir=${PREFIX}/share/hplip/ppd/HP
35CONFIGURE_ARGS+= --enable-network-build 36CONFIGURE_ARGS+= --enable-network-build
36CONFIGURE_ARGS+= --disable-pp-build 37CONFIGURE_ARGS+= --disable-pp-build
37CONFIGURE_ARGS+= --enable-hpcups-install 38CONFIGURE_ARGS+= --enable-hpcups-install
38CONFIGURE_ARGS+= --enable-hpijs-install 39CONFIGURE_ARGS+= --enable-hpijs-install
39CONFIGURE_ARGS+= --enable-cups-drv-install 40CONFIGURE_ARGS+= --enable-cups-drv-install
40CONFIGURE_ARGS+= --enable-cups-ppd-install 41CONFIGURE_ARGS+= --enable-cups-ppd-install
41CONFIGURE_ARGS+= --enable-foomatic-drv-install 42CONFIGURE_ARGS+= --enable-foomatic-drv-install
42CONFIGURE_ARGS+= --enable-foomatic-ppd-install 43CONFIGURE_ARGS+= --enable-foomatic-ppd-install
43CONFIGURE_ARGS+= --enable-foomatic-rip-hplip-install 44CONFIGURE_ARGS+= --enable-foomatic-rip-hplip-install
44 45
45EGDIR= ${PREFIX}/share/examples/${PKGBASE} 46EGDIR= ${PREFIX}/share/examples/${PKGBASE}
46EGFILES= hp/hplip.conf 47EGFILES= hp/hplip.conf
47 48
48INSTALL_MAKE_FLAGS+= ${MAKE_FLAGS} 49INSTALL_MAKE_FLAGS+= ${MAKE_FLAGS}
49INSTALL_MAKE_FLAGS+= sysconfdir=${EGDIR} 50INSTALL_MAKE_FLAGS+= sysconfdir=${EGDIR}
50INSTALL_MAKE_FLAGS+= localstatedir=${EGDIR} 51INSTALL_MAKE_FLAGS+= localstatedir=${EGDIR}
51INSTALL_MAKE_FLAGS+= systraydir=${EGDIR}/xdg/autostart 52INSTALL_MAKE_FLAGS+= systraydir=${EGDIR}/xdg/autostart
52INSTALL_MAKE_FLAGS+= mimedir=${EGDIR}/cups 53INSTALL_MAKE_FLAGS+= mimedir=${EGDIR}/cups
53 54
54OWN_DIRS+= ${PKG_SYSCONFDIR}/hp 55OWN_DIRS+= ${PKG_SYSCONFDIR}/hp
55OWN_DIRS+= ${VARBASE}/lib/hp 56OWN_DIRS+= ${VARBASE}/lib/hp
56OWN_DIRS+= ${PREFIX}/share/examples/hplip/log/hp 57OWN_DIRS+= ${PREFIX}/share/examples/hplip/log/hp
57 58
58OWN_DIRS_PERMS+= ${PREFIX}/share/examples/hplip/log/hp ${CUPS_USER} ${CUPS_GROUP} 0774 59OWN_DIRS_PERMS+= ${PREFIX}/share/examples/hplip/log/hp ${CUPS_USER} ${CUPS_GROUP} 0774
59 60
60PLIST_SRC= PLIST.base 61PLIST_SRC= PLIST.base
61 62
62.include "options.mk" 63.include "options.mk"
63 64
64.for file in ${EGFILES} 65.for file in ${EGFILES}
65CONF_FILES+= ${EGDIR}/${file} ${PKG_SYSCONFDIR}/${file} 66CONF_FILES+= ${EGDIR}/${file} ${PKG_SYSCONFDIR}/${file}
66.endfor 67.endfor
67CONF_FILES+= 68CONF_FILES+=
68 69
69REPLACE_PYTHON= *.py */*.py */*/*.py 70REPLACE_PYTHON= *.py */*.py */*/*.py
70REPLACE_PYTHON+= fax/filters/pstotiff 71REPLACE_PYTHON+= fax/filters/pstotiff
71REPLACE_PYTHON+= prnt/filters/hpps 72REPLACE_PYTHON+= prnt/filters/hpps
72REPLACE_PERL= prnt/filters/hpcac prnt/hpijs/foomatic-rip-hplip 73REPLACE_PERL= prnt/filters/hpcac prnt/hpijs/foomatic-rip-hplip
73 74
74PY_PATCHPLIST= yes 75PY_PATCHPLIST= yes
75 76
76SUBST_CLASSES+= fix-python 77SUBST_CLASSES+= fix-python
77SUBST_STAGE.fix-python= post-configure 78SUBST_STAGE.fix-python= post-configure
78SUBST_MESSAGE.fix-python= Fixing python invocations in Python files. 79SUBST_MESSAGE.fix-python= Fixing python invocations in Python files.
79SUBST_FILES.fix-python= check.py scan.py setup.py 80SUBST_FILES.fix-python= check.py scan.py setup.py
80SUBST_FILES.fix-python+= base/utils.py base/pkit.py 81SUBST_FILES.fix-python+= base/utils.py base/pkit.py
81SUBST_FILES.fix-python+= installer/core_install.py 82SUBST_FILES.fix-python+= installer/core_install.py
82SUBST_FILES.fix-python+= ui/nodevicesform.py ui/devmgr4.py 83SUBST_FILES.fix-python+= ui/nodevicesform.py ui/devmgr4.py
83SUBST_FILES.fix-python+= ui4/nodevicesdialog.py ui4/devmgr5.py 84SUBST_FILES.fix-python+= ui4/nodevicesdialog.py ui4/devmgr5.py
84SUBST_SED.fix-python= -e 's,\(['\''"]\)python ,\1${PYTHONBIN} ,g' 85SUBST_SED.fix-python= -e 's,\(['\''"]\)python ,\1${PYTHONBIN} ,g'
85 86
86SUBST_CLASSES+= fix-paths-0 87SUBST_CLASSES+= fix-paths-0
87SUBST_STAGE.fix-paths-0= pre-configure 88SUBST_STAGE.fix-paths-0= pre-configure
88SUBST_MESSAGE.fix-paths-0= Fixing /var/run in hplip.conf.in. 89SUBST_MESSAGE.fix-paths-0= Fixing /var/run in hplip.conf.in.
89SUBST_FILES.fix-paths-0= hplip.conf.in 90SUBST_FILES.fix-paths-0= hplip.conf.in
90SUBST_SED.fix-paths-0= -e 's,run=/var/run,run=${VARBASE}/run,g' 91SUBST_SED.fix-paths-0= -e 's,run=/var/run,run=${VARBASE}/run,g'
91 92
92SUBST_CLASSES+= fix-paths-1 93SUBST_CLASSES+= fix-paths-1
93SUBST_STAGE.fix-paths-1= post-configure 94SUBST_STAGE.fix-paths-1= post-configure
94SUBST_MESSAGE.fix-paths-1= Fixing /etc and /var paths in Python and C++ files. 95SUBST_MESSAGE.fix-paths-1= Fixing /etc and /var paths in Python and C++ files.
95SUBST_FILES.fix-paths-1= check.py base/codes.py base/g.py base/utils.py 96SUBST_FILES.fix-paths-1= check.py base/codes.py base/g.py base/utils.py
96SUBST_FILES.fix-paths-1+= installer/core_install.py 97SUBST_FILES.fix-paths-1+= installer/core_install.py
97SUBST_FILES.fix-paths-1+= fax/backend/hpfax.py prnt/cups.py 98SUBST_FILES.fix-paths-1+= fax/backend/hpfax.py prnt/cups.py
98SUBST_FILES.fix-paths-1+= ui/devmgr4.py ui4/devmgr5.py 99SUBST_FILES.fix-paths-1+= ui/devmgr4.py ui4/devmgr5.py
99SUBST_FILES.fix-paths-1+= prnt/filters/hpps 100SUBST_FILES.fix-paths-1+= prnt/filters/hpps
100SUBST_FILES.fix-paths-1+= prnt/hpcups/HPCupsFilter.cpp prnt/hpcups/Utils.cpp 101SUBST_FILES.fix-paths-1+= prnt/hpcups/HPCupsFilter.cpp prnt/hpcups/Utils.cpp
101SUBST_FILES.fix-paths-1+= prnt/hpijs/globals.cpp prnt/hpijs/hpcupsfax.cpp 102SUBST_FILES.fix-paths-1+= prnt/hpijs/globals.cpp prnt/hpijs/hpcupsfax.cpp
102SUBST_FILES.fix-paths-1+= prnt/hpijs/hpijs.cpp 103SUBST_FILES.fix-paths-1+= prnt/hpijs/hpijs.cpp
103SUBST_SED.fix-paths-1= -e 's,\([ '\''"=]\)/etc/hp,\1${PKG_SYSCONFDIR}/hp,g' 104SUBST_SED.fix-paths-1= -e 's,\([ '\''"=]\)/etc/hp,\1${PKG_SYSCONFDIR}/hp,g'
104SUBST_SED.fix-paths-1+= -e 's,\([ '\''"=]\)/etc/cups,\1${PKG_SYSCONFDIR}/cups,g' 105SUBST_SED.fix-paths-1+= -e 's,\([ '\''"=]\)/etc/cups,\1${PKG_SYSCONFDIR}/cups,g'
105SUBST_SED.fix-paths-1+= -e 's,\([ '\''"=]\)/etc/sane.d,\1${PKG_SYSCONFDIR}/sane.d,g' 106SUBST_SED.fix-paths-1+= -e 's,\([ '\''"=]\)/etc/sane.d,\1${PKG_SYSCONFDIR}/sane.d,g'
106SUBST_SED.fix-paths-1+= -e 's,\([ '\''"=]\)/var/lib/hp,\1${VARBASE}/lib/hp,g' 107SUBST_SED.fix-paths-1+= -e 's,\([ '\''"=]\)/var/lib/hp,\1${VARBASE}/lib/hp,g'
107SUBST_SED.fix-paths-1+= -e 's,\([ '\''"=]\)/var/log/cups,\1${VARBASE}/log/cups,g' 108SUBST_SED.fix-paths-1+= -e 's,\([ '\''"=]\)/var/log/cups,\1${VARBASE}/log/cups,g'
108SUBST_SED.fix-paths-1+= -e 's,\([ '\''"=]\)/var/spool/cups,\1${VARBASE}/spool/cups,g' 109SUBST_SED.fix-paths-1+= -e 's,\([ '\''"=]\)/var/spool/cups,\1${VARBASE}/spool/cups,g'
109 110
110SUBST_CLASSES+= fix-paths-2 111SUBST_CLASSES+= fix-paths-2
111SUBST_STAGE.fix-paths-2= post-configure 112SUBST_STAGE.fix-paths-2= post-configure
112SUBST_MESSAGE.fix-paths-2= Fixing additional paths in installer/core_install.py. 113SUBST_MESSAGE.fix-paths-2= Fixing additional paths in installer/core_install.py.
113SUBST_FILES.fix-paths-2= installer/core_install.py 114SUBST_FILES.fix-paths-2= installer/core_install.py
114SUBST_SED.fix-paths-2= -e 's,"/etc/PolicyKit,"${PKG_SYSCONFDIR}/PolicyKit,g' 115SUBST_SED.fix-paths-2= -e 's,"/etc/PolicyKit,"${PKG_SYSCONFDIR}/PolicyKit,g'
115SUBST_SED.fix-paths-2+= -e 's,"/etc/polkit-1,"${PKG_SYSCONFDIR}/polkit-1,g' 116SUBST_SED.fix-paths-2+= -e 's,"/etc/polkit-1,"${PKG_SYSCONFDIR}/polkit-1,g'
116SUBST_SED.fix-paths-2+= -e 's,"file:///etc/hp,"file://${PKG_SYSCONFDIR}/hp,g' 117SUBST_SED.fix-paths-2+= -e 's,"file:///etc/hp,"file://${PKG_SYSCONFDIR}/hp,g'
117SUBST_SED.fix-paths-2+= -e 's,"/usr/lib/cups/driver,"${PREFIX}/libexec/cups/driver,g' 118SUBST_SED.fix-paths-2+= -e 's,"/usr/lib/cups/driver,"${PREFIX}/libexec/cups/driver,g'
118SUBST_SED.fix-paths-2+= -e 's,\([ '\''"=]\)/usr,\1${PREFIX},g' 119SUBST_SED.fix-paths-2+= -e 's,\([ '\''"=]\)/usr,\1${PREFIX},g'
119 120
120SUBST_CLASSES+= fix-paths-3 121SUBST_CLASSES+= fix-paths-3
121SUBST_STAGE.fix-paths-3= post-configure 122SUBST_STAGE.fix-paths-3= post-configure
122SUBST_MESSAGE.fix-paths-3= Fixing additional paths in base/pkit.py. 123SUBST_MESSAGE.fix-paths-3= Fixing additional paths in base/pkit.py.
123SUBST_FILES.fix-paths-3= base/pkit.py 124SUBST_FILES.fix-paths-3= base/pkit.py
124SUBST_SED.fix-paths-3= -e 's,\([ '\''"=]\)/usr,\1${PREFIX},g' 125SUBST_SED.fix-paths-3= -e 's,\([ '\''"=]\)/usr,\1${PREFIX},g'
125 126
126SUBST_CLASSES+= fix-paths-4 127SUBST_CLASSES+= fix-paths-4
127SUBST_STAGE.fix-paths-4= post-configure 128SUBST_STAGE.fix-paths-4= post-configure
128SUBST_MESSAGE.fix-paths-4= Fixing default PPD search path in base/g.py and prnt/cups.py. 129SUBST_MESSAGE.fix-paths-4= Fixing default PPD search path in base/g.py and prnt/cups.py.
129SUBST_FILES.fix-paths-4= base/g.py prnt/cups.py 130SUBST_FILES.fix-paths-4= base/g.py prnt/cups.py
130SUBST_SED.fix-paths-4= -e '\,ppd_search_path =, { s,/usr/\([a-z]*\);,/usr/\1;${PREFIX}/\1;,g ; }' 131SUBST_SED.fix-paths-4= -e '\,ppd_search_path =, { s,/usr/\([a-z]*\);,/usr/\1;${PREFIX}/\1;,g ; }'
131SUBST_SED.fix-paths-4+= -e 's,\([ '\''"=]\)/usr/share/ppd,\1${PREFIX}/share/ppd,g' 132SUBST_SED.fix-paths-4+= -e 's,\([ '\''"=]\)/usr/share/ppd,\1${PREFIX}/share/ppd,g'
132 133
133SUBST_CLASSES+= fix-paths-5 134SUBST_CLASSES+= fix-paths-5
134SUBST_STAGE.fix-paths-5= post-configure 135SUBST_STAGE.fix-paths-5= post-configure
135SUBST_MESSAGE.fix-paths-5= Fixing paths in prnt/hpijs/foomatic-rip-hplip. 136SUBST_MESSAGE.fix-paths-5= Fixing paths in prnt/hpijs/foomatic-rip-hplip.
136SUBST_FILES.fix-paths-5= prnt/hpijs/foomatic-rip-hplip 137SUBST_FILES.fix-paths-5= prnt/hpijs/foomatic-rip-hplip
137SUBST_SED.fix-paths-5= -e 's,\([ '\''"=]\)/etc/cups,\1${PKG_SYSCONFDIR}/cups,g' 138SUBST_SED.fix-paths-5= -e 's,\([ '\''"=]\)/etc/cups,\1${PKG_SYSCONFDIR}/cups,g'
138SUBST_SED.fix-paths-5+= -e 's,\([ '\''"=]\)/etc/foomatic,\1${PKG_SYSCONFDIR}/foomatic,g' 139SUBST_SED.fix-paths-5+= -e 's,\([ '\''"=]\)/etc/foomatic,\1${PKG_SYSCONFDIR}/foomatic,g'
139SUBST_SED.fix-paths-5+= -e 's,\([ '\''"=]\)/var/spool,\1${VARBASE}/spool,g' 140SUBST_SED.fix-paths-5+= -e 's,\([ '\''"=]\)/var/spool,\1${VARBASE}/spool,g'
140SUBST_SED.fix-paths-5+= -e 's,prefix = "/usr",prefix = "${PREFIX}",g' 141SUBST_SED.fix-paths-5+= -e 's,prefix = "/usr",prefix = "${PREFIX}",g'
141SUBST_SED.fix-paths-5+= -e 's,\(path = "/usr/bin:\),\1${PREFIX}/bin:,g' 142SUBST_SED.fix-paths-5+= -e 's,\(path = "/usr/bin:\),\1${PREFIX}/bin:,g'
142SUBST_SED.fix-paths-5+= -e 's,\(path = "/usr/lib/cups/filter:\),\1${PREFIX}/libexec/cups/filter:,g' 143SUBST_SED.fix-paths-5+= -e 's,\(path = "/usr/lib/cups/filter:\),\1${PREFIX}/libexec/cups/filter:,g'
143SUBST_SED.fix-paths-5+= -e '\,} elsif (-r "/usr/share/ppr, { N ; p ; s,"/usr,"${PREFIX},g ; }' 144SUBST_SED.fix-paths-5+= -e '\,} elsif (-r "/usr/share/ppr, { N ; p ; s,"/usr,"${PREFIX},g ; }'
144 145
145SUBST_CLASSES+= fix-paths-6 146SUBST_CLASSES+= fix-paths-6
146SUBST_STAGE.fix-paths-6= post-configure 147SUBST_STAGE.fix-paths-6= post-configure
147SUBST_MESSAGE.fix-paths-6= Fixing paths in fax/filters/pstotiff. 148SUBST_MESSAGE.fix-paths-6= Fixing paths in fax/filters/pstotiff.
148SUBST_FILES.fix-paths-6= fax/filters/pstotiff 149SUBST_FILES.fix-paths-6= fax/filters/pstotiff
149SUBST_SED.fix-paths-6= -e 's,"-I/usr/share/cups/fonts","-I${PREFIX}/share/cups/fonts",g' 150SUBST_SED.fix-paths-6= -e 's,"-I/usr/share/cups/fonts","-I${PREFIX}/share/cups/fonts",g'
150SUBST_SED.fix-paths-6+= -e 's,"/usr/bin/gs","${PREFIX}/bin/gs",g' 151SUBST_SED.fix-paths-6+= -e 's,"/usr/bin/gs","${PREFIX}/bin/gs",g'
151 152
152# NetBSD has strnlen(3) since 5.99.12 153# NetBSD has strnlen(3) since 5.99.12
153.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M5.99.*) && empty(OS_VERSION:M[6-9].*) 154.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M5.99.*) && empty(OS_VERSION:M[6-9].*)
154SUBST_CLASSES+= fix-strnlen 155SUBST_CLASSES+= fix-strnlen
155SUBST_STAGE.fix-strnlen= post-configure 156SUBST_STAGE.fix-strnlen= post-configure
156SUBST_MESSAGE.fix-strnlen= Replacing strnlen() with strlen() in two C++ files. 157SUBST_MESSAGE.fix-strnlen= Replacing strnlen() with strlen() in two C++ files.
157SUBST_FILES.fix-strnlen= prnt/hpijs/context2.cpp prnt/hpijs/ljzjscolor.cpp 158SUBST_FILES.fix-strnlen= prnt/hpijs/context2.cpp prnt/hpijs/ljzjscolor.cpp
158SUBST_SED.fix-strnlen= -e 's/\([ (]\)strnlen(\([^,]*\), DevIDBuffSize)/\1strlen(\2)/g' 159SUBST_SED.fix-strnlen= -e 's/\([ (]\)strnlen(\([^,]*\), DevIDBuffSize)/\1strlen(\2)/g'
159.endif 160.endif
160 161
161.include "../../mk/dlopen.buildlink3.mk" 162.include "../../mk/dlopen.buildlink3.mk"
162BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q} 163BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q}
163 164
164pre-configure: 165pre-configure:
165 cd ${WRKSRC} && aclocal && automake --add-missing --foreign && autoconf 166 cd ${WRKSRC} && aclocal && automake --add-missing --foreign && autoconf
166 167
167INSTALLATION_DIRS+= share/cups/model 168INSTALLATION_DIRS+= share/cups/model
168 169
169post-install: 170post-install:
170 ${CHMOD} a-x ${DESTDIR}${PREFIX}/share/hplip/__init__.py 171 ${CHMOD} a-x ${DESTDIR}${PREFIX}/share/hplip/__init__.py
171 ${PY_COMPILE_ALL} ${DESTDIR}${PREFIX}/share/hplip 172 ${PY_COMPILE_ALL} ${DESTDIR}${PREFIX}/share/hplip
172 ${LN} -s ../../../share/hplip/ppd ${DESTDIR}${PREFIX}/share/cups/model/hplip-ppds 173 ${LN} -s ../../../share/hplip/ppd ${DESTDIR}${PREFIX}/share/cups/model/hplip-ppds
173 174
174.include "../../lang/python/application.mk" 175.include "../../lang/python/application.mk"
175.include "../../lang/python/extension.mk" 176.include "../../lang/python/extension.mk"
176.include "../../sysutils/desktop-file-utils/desktopdb.mk" 177.include "../../sysutils/desktop-file-utils/desktopdb.mk"
177.include "../../mk/jpeg.buildlink3.mk" 178.include "../../mk/jpeg.buildlink3.mk"
178.include "../../net/net-snmp/buildlink3.mk" 179.include "../../net/net-snmp/buildlink3.mk"
179.include "../../print/cups15/buildlink3.mk" 180.include "../../print/cups15/buildlink3.mk"
180.include "../../print/ghostscript/buildlink3.mk" 181.include "../../print/ghostscript/buildlink3.mk"
181.include "../../devel/libusb1/buildlink3.mk" 182.include "../../devel/libusb1/buildlink3.mk"
182.include "../../security/openssl/buildlink3.mk" 183.include "../../security/openssl/buildlink3.mk"
183.include "../../textproc/py-xml/buildlink3.mk" 184.include "../../textproc/py-xml/buildlink3.mk"
184.include "../../mk/pthread.buildlink3.mk" 185.include "../../mk/pthread.buildlink3.mk"
185.include "../../mk/bsd.pkg.mk" 186.include "../../mk/bsd.pkg.mk"
cvs diff -r1.16 -r1.17 pkgsrc/print/hplip/distinfo (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