Sun Feb 28 20:37:29 2016 UTC ()
Update to 3.16.2:

Release Notes:

Significant Changes:

- Queue configuration using 'hp-setup' command is no more supported for
  HP ScanJets. Scan frontends like xsane, hp-scan, scanimage, simplescan
  will automatically detect usb and network ScanJets.

Added Support for the Following New Printers:

- HP ScanJet Pro 4500 fn1 Network scanner
- HP LaserJet Pro MFP M127fs
- HP DeskJet Ultra Ink Advantage 2029 Printer
- HP DeskJet Ink Advantage Ultra 2529 All-in-One Printer

Added support for the following new Distro's:

- LinuxMint 17.3
- Debian 8.3

Launchpad fixes:

1521687 - /usr/lib/sane/libsane-hpaio.so.1: undefined symbol:
          mdns_probe_nw_scanners
1537467 - udev: 56-hpmud.rules should not run usb_id for all USB devices
          out there
1517494 - Upgrade to HPLIP-3.15.11 fails
1536762 - HPLIP installation fails with non-english locale
1483820 - hp-plugin hangs on 'su'
1484916 - hp-plugin infinite loop
1510950 - hp-plugin not working - stuck on permission
1502025 - HP plugin installation hangs after accepting license
1534404 - Debian 8's hplip version is 3.14.6, not 3.15.2
1532451 - Laserjet Pro MFP M127fs is not supported


(schnoebe)
diff -r1.47 -r1.48 pkgsrc/print/hplip/Makefile
diff -r1.18 -r1.19 pkgsrc/print/hplip/PLIST.base
diff -r1.21 -r1.22 pkgsrc/print/hplip/distinfo
diff -r1.8 -r1.9 pkgsrc/print/hplip/options.mk
diff -r1.1 -r1.2 pkgsrc/print/hplip/patches/patch-configure.in
diff -r1.1 -r1.2 pkgsrc/print/hplip/patches/patch-diagnose_queues.py
diff -r1.1 -r1.2 pkgsrc/print/hplip/patches/patch-protocol_discovery_mdns.c
cvs diff -r1.47 -r1.48 pkgsrc/print/hplip/Makefile (expand / switch to unified diff)

--- pkgsrc/print/hplip/Makefile 2015/12/07 11:02:26 1.47
+++ pkgsrc/print/hplip/Makefile 2016/02/28 20:37:28 1.48
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.47 2015/12/07 11:02:26 adam Exp $ 1# $NetBSD: Makefile,v 1.48 2016/02/28 20:37:28 schnoebe Exp $
2 2
3DISTNAME= hplip-3.15.11 3DISTNAME= hplip-3.16.2
4CATEGORIES= print 4CATEGORIES= print
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hplip/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hplip/}
6 6
7MAINTAINER= schnoebe@NetBSD.org 7MAINTAINER= schnoebe@NetBSD.org
8HOMEPAGE= http://hplipopensource.com/ 8HOMEPAGE= http://hplipopensource.com/
9COMMENT= HP Linux Imaging and Printing 9COMMENT= HP Linux Imaging and Printing
10LICENSE= gnu-gpl-v2 AND mit AND modified-bsd 10LICENSE= gnu-gpl-v2 AND mit AND modified-bsd
11 11
12CONFLICTS+= hpijs-[0-9]* 12CONFLICTS+= hpijs-[0-9]*
13 13
14FILES_SUBST+= CUPS_USER=${CUPS_USER} 14FILES_SUBST+= CUPS_USER=${CUPS_USER}
15FILES_SUBST+= CUPS_GROUP=${CUPS_GROUP} 15FILES_SUBST+= CUPS_GROUP=${CUPS_GROUP}
16 16
@@ -161,22 +161,21 @@ BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLI @@ -161,22 +161,21 @@ BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLI
161 161
162pre-configure: 162pre-configure:
163 cd ${WRKSRC} && aclocal && automake --add-missing --foreign && autoconf 163 cd ${WRKSRC} && aclocal && automake --add-missing --foreign && autoconf
164 164
165INSTALLATION_DIRS+= share/cups/model 165INSTALLATION_DIRS+= share/cups/model
166 166
167post-install: 167post-install:
168 ${CHMOD} a-x ${DESTDIR}${PREFIX}/share/hplip/__init__.py 168 ${CHMOD} a-x ${DESTDIR}${PREFIX}/share/hplip/__init__.py
169 ${PY_COMPILE_ALL} ${DESTDIR}${PREFIX}/share/hplip 169 ${PY_COMPILE_ALL} ${DESTDIR}${PREFIX}/share/hplip
170 ${LN} -s ../../../share/hplip/ppd ${DESTDIR}${PREFIX}/share/cups/model/hplip-ppds 170 ${LN} -s ../../../share/hplip/ppd ${DESTDIR}${PREFIX}/share/cups/model/hplip-ppds
171 171
172.include "../../lang/python/application.mk" 172.include "../../lang/python/application.mk"
173.include "../../lang/python/extension.mk" 173.include "../../lang/python/extension.mk"
174.include "../../sysutils/desktop-file-utils/desktopdb.mk" 
175.include "../../mk/jpeg.buildlink3.mk" 174.include "../../mk/jpeg.buildlink3.mk"
176.include "../../net/net-snmp/buildlink3.mk" 175.include "../../net/net-snmp/buildlink3.mk"
177.include "../../print/cups15/buildlink3.mk" 176.include "../../print/cups15/buildlink3.mk"
178.include "../../print/ghostscript/buildlink3.mk" 177.include "../../print/ghostscript/buildlink3.mk"
179.include "../../devel/libusb1/buildlink3.mk" 178.include "../../devel/libusb1/buildlink3.mk"
180.include "../../security/openssl/buildlink3.mk" 179.include "../../security/openssl/buildlink3.mk"
181.include "../../mk/pthread.buildlink3.mk" 180.include "../../mk/pthread.buildlink3.mk"
182.include "../../mk/bsd.pkg.mk" 181.include "../../mk/bsd.pkg.mk"
cvs diff -r1.18 -r1.19 pkgsrc/print/hplip/PLIST.base (expand / switch to unified diff)

--- pkgsrc/print/hplip/PLIST.base 2015/12/07 11:02:26 1.18
+++ pkgsrc/print/hplip/PLIST.base 2016/02/28 20:37:28 1.19
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST.base,v 1.18 2015/12/07 11:02:26 adam Exp $ 1@comment $NetBSD: PLIST.base,v 1.19 2016/02/28 20:37:28 schnoebe Exp $
2bin/hp-align 2bin/hp-align
3bin/hp-check 3bin/hp-check
4bin/hp-clean 4bin/hp-clean
5bin/hp-colorcal 5bin/hp-colorcal
6bin/hp-config_usb_printer 6bin/hp-config_usb_printer
7bin/hp-devicesettings 7bin/hp-devicesettings
8bin/hp-diagnose_plugin 8bin/hp-diagnose_plugin
9bin/hp-diagnose_queues 9bin/hp-diagnose_queues
10bin/hp-doctor 10bin/hp-doctor
11bin/hp-fab 11bin/hp-fab
12bin/hp-faxsetup 12bin/hp-faxsetup
13bin/hp-firmware 13bin/hp-firmware
14bin/hp-info 14bin/hp-info
@@ -1426,26 +1426,28 @@ share/hplip/ppd/HP/hp-laserjet_pro_mfp_m @@ -1426,26 +1426,28 @@ share/hplip/ppd/HP/hp-laserjet_pro_mfp_m
1426share/hplip/ppd/HP/hp-laserjet_pro_mfp_m125r.ppd.gz 1426share/hplip/ppd/HP/hp-laserjet_pro_mfp_m125r.ppd.gz
1427share/hplip/ppd/HP/hp-laserjet_pro_mfp_m125ra-hpijs.ppd.gz 1427share/hplip/ppd/HP/hp-laserjet_pro_mfp_m125ra-hpijs.ppd.gz
1428share/hplip/ppd/HP/hp-laserjet_pro_mfp_m125ra.ppd.gz 1428share/hplip/ppd/HP/hp-laserjet_pro_mfp_m125ra.ppd.gz
1429share/hplip/ppd/HP/hp-laserjet_pro_mfp_m125rnw-hpijs.ppd.gz 1429share/hplip/ppd/HP/hp-laserjet_pro_mfp_m125rnw-hpijs.ppd.gz
1430share/hplip/ppd/HP/hp-laserjet_pro_mfp_m125rnw.ppd.gz 1430share/hplip/ppd/HP/hp-laserjet_pro_mfp_m125rnw.ppd.gz
1431share/hplip/ppd/HP/hp-laserjet_pro_mfp_m126a-hpijs.ppd.gz 1431share/hplip/ppd/HP/hp-laserjet_pro_mfp_m126a-hpijs.ppd.gz
1432share/hplip/ppd/HP/hp-laserjet_pro_mfp_m126a.ppd.gz 1432share/hplip/ppd/HP/hp-laserjet_pro_mfp_m126a.ppd.gz
1433share/hplip/ppd/HP/hp-laserjet_pro_mfp_m126nw-hpijs.ppd.gz 1433share/hplip/ppd/HP/hp-laserjet_pro_mfp_m126nw-hpijs.ppd.gz
1434share/hplip/ppd/HP/hp-laserjet_pro_mfp_m126nw.ppd.gz 1434share/hplip/ppd/HP/hp-laserjet_pro_mfp_m126nw.ppd.gz
1435share/hplip/ppd/HP/hp-laserjet_pro_mfp_m127fn-hpijs.ppd.gz 1435share/hplip/ppd/HP/hp-laserjet_pro_mfp_m127fn-hpijs.ppd.gz
1436share/hplip/ppd/HP/hp-laserjet_pro_mfp_m127fn.ppd.gz 1436share/hplip/ppd/HP/hp-laserjet_pro_mfp_m127fn.ppd.gz
1437share/hplip/ppd/HP/hp-laserjet_pro_mfp_m127fp-hpijs.ppd.gz 1437share/hplip/ppd/HP/hp-laserjet_pro_mfp_m127fp-hpijs.ppd.gz
1438share/hplip/ppd/HP/hp-laserjet_pro_mfp_m127fp.ppd.gz 1438share/hplip/ppd/HP/hp-laserjet_pro_mfp_m127fp.ppd.gz
 1439share/hplip/ppd/HP/hp-laserjet_pro_mfp_m127fs-hpijs.ppd.gz
 1440share/hplip/ppd/HP/hp-laserjet_pro_mfp_m127fs.ppd.gz
1439share/hplip/ppd/HP/hp-laserjet_pro_mfp_m127fw-hpijs.ppd.gz 1441share/hplip/ppd/HP/hp-laserjet_pro_mfp_m127fw-hpijs.ppd.gz
1440share/hplip/ppd/HP/hp-laserjet_pro_mfp_m127fw.ppd.gz 1442share/hplip/ppd/HP/hp-laserjet_pro_mfp_m127fw.ppd.gz
1441share/hplip/ppd/HP/hp-laserjet_pro_mfp_m128fn-hpijs.ppd.gz 1443share/hplip/ppd/HP/hp-laserjet_pro_mfp_m128fn-hpijs.ppd.gz
1442share/hplip/ppd/HP/hp-laserjet_pro_mfp_m128fn.ppd.gz 1444share/hplip/ppd/HP/hp-laserjet_pro_mfp_m128fn.ppd.gz
1443share/hplip/ppd/HP/hp-laserjet_pro_mfp_m128fp-hpijs.ppd.gz 1445share/hplip/ppd/HP/hp-laserjet_pro_mfp_m128fp-hpijs.ppd.gz
1444share/hplip/ppd/HP/hp-laserjet_pro_mfp_m128fp.ppd.gz 1446share/hplip/ppd/HP/hp-laserjet_pro_mfp_m128fp.ppd.gz
1445share/hplip/ppd/HP/hp-laserjet_pro_mfp_m128fw-hpijs.ppd.gz 1447share/hplip/ppd/HP/hp-laserjet_pro_mfp_m128fw-hpijs.ppd.gz
1446share/hplip/ppd/HP/hp-laserjet_pro_mfp_m128fw.ppd.gz 1448share/hplip/ppd/HP/hp-laserjet_pro_mfp_m128fw.ppd.gz
1447share/hplip/ppd/HP/hp-laserjet_pro_mfp_m225_m226-ps.ppd.gz 1449share/hplip/ppd/HP/hp-laserjet_pro_mfp_m225_m226-ps.ppd.gz
1448share/hplip/ppd/HP/hp-laserjet_pro_mfp_m435-ps.ppd.gz 1450share/hplip/ppd/HP/hp-laserjet_pro_mfp_m435-ps.ppd.gz
1449share/hplip/ppd/HP/hp-laserjet_professional_m1132_mfp-hpijs.ppd.gz 1451share/hplip/ppd/HP/hp-laserjet_professional_m1132_mfp-hpijs.ppd.gz
1450share/hplip/ppd/HP/hp-laserjet_professional_m1132_mfp.ppd.gz 1452share/hplip/ppd/HP/hp-laserjet_professional_m1132_mfp.ppd.gz
1451share/hplip/ppd/HP/hp-laserjet_professional_m1136_mfp-hpijs.ppd.gz 1453share/hplip/ppd/HP/hp-laserjet_professional_m1136_mfp-hpijs.ppd.gz
@@ -2056,28 +2058,26 @@ share/hplip/ppd/HP/hp-psc_780-hpijs.ppd. @@ -2056,28 +2058,26 @@ share/hplip/ppd/HP/hp-psc_780-hpijs.ppd.
2056share/hplip/ppd/HP/hp-psc_780.ppd.gz 2058share/hplip/ppd/HP/hp-psc_780.ppd.gz
2057share/hplip/ppd/HP/hp-psc_780xi-hpijs.ppd.gz 2059share/hplip/ppd/HP/hp-psc_780xi-hpijs.ppd.gz
2058share/hplip/ppd/HP/hp-psc_780xi.ppd.gz 2060share/hplip/ppd/HP/hp-psc_780xi.ppd.gz
2059share/hplip/ppd/HP/hp-psc_900_series-hpijs.ppd.gz 2061share/hplip/ppd/HP/hp-psc_900_series-hpijs.ppd.gz
2060share/hplip/ppd/HP/hp-psc_900_series.ppd.gz 2062share/hplip/ppd/HP/hp-psc_900_series.ppd.gz
2061share/hplip/ppd/HP/hp-psc_920-hpijs.ppd.gz 2063share/hplip/ppd/HP/hp-psc_920-hpijs.ppd.gz
2062share/hplip/ppd/HP/hp-psc_920.ppd.gz 2064share/hplip/ppd/HP/hp-psc_920.ppd.gz
2063share/hplip/ppd/HP/hp-psc_950-hpijs.ppd.gz 2065share/hplip/ppd/HP/hp-psc_950-hpijs.ppd.gz
2064share/hplip/ppd/HP/hp-psc_950.ppd.gz 2066share/hplip/ppd/HP/hp-psc_950.ppd.gz
2065share/hplip/ppd/HP/hp-psc_950vr-hpijs.ppd.gz 2067share/hplip/ppd/HP/hp-psc_950vr-hpijs.ppd.gz
2066share/hplip/ppd/HP/hp-psc_950vr.ppd.gz 2068share/hplip/ppd/HP/hp-psc_950vr.ppd.gz
2067share/hplip/ppd/HP/hp-psc_950xi-hpijs.ppd.gz 2069share/hplip/ppd/HP/hp-psc_950xi-hpijs.ppd.gz
2068share/hplip/ppd/HP/hp-psc_950xi.ppd.gz 2070share/hplip/ppd/HP/hp-psc_950xi.ppd.gz
2069share/hplip/ppd/HP/hp-scanjet_pro_3500_f1-hpijs.ppd.gz 
2070share/hplip/ppd/HP/hp-scanjet_pro_3500_f1.ppd.gz 
2071share/hplip/pqdiag.py 2071share/hplip/pqdiag.py
2072share/hplip/pqdiag.pyc 2072share/hplip/pqdiag.pyc
2073share/hplip/print.py 2073share/hplip/print.py
2074share/hplip/print.pyc 2074share/hplip/print.pyc
2075share/hplip/printsettings.py 2075share/hplip/printsettings.py
2076share/hplip/printsettings.pyc 2076share/hplip/printsettings.pyc
2077share/hplip/prnt/__init__.py 2077share/hplip/prnt/__init__.py
2078share/hplip/prnt/__init__.pyc 2078share/hplip/prnt/__init__.pyc
2079share/hplip/prnt/colorcal.py 2079share/hplip/prnt/colorcal.py
2080share/hplip/prnt/colorcal.pyc 2080share/hplip/prnt/colorcal.pyc
2081share/hplip/prnt/cups.py 2081share/hplip/prnt/cups.py
2082share/hplip/prnt/cups.pyc 2082share/hplip/prnt/cups.pyc
2083share/hplip/prnt/ldl.py 2083share/hplip/prnt/ldl.py
cvs diff -r1.21 -r1.22 pkgsrc/print/hplip/distinfo (expand / switch to unified diff)

--- pkgsrc/print/hplip/distinfo 2015/12/07 11:02:26 1.21
+++ pkgsrc/print/hplip/distinfo 2016/02/28 20:37:28 1.22
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: distinfo,v 1.21 2015/12/07 11:02:26 adam Exp $ 1$NetBSD: distinfo,v 1.22 2016/02/28 20:37:28 schnoebe Exp $
2 2
3SHA1 (hplip-3.15.11.tar.gz) = c28f373e85a1355c10c3112e1274138372a9c832 3SHA1 (hplip-3.16.2.tar.gz) = 28efa845832c77e7015442e7934fc01cc5c4b346
4RMD160 (hplip-3.15.11.tar.gz) = 1d6c50650f2e6e1d4549d0b539023e4ce51bd8c6 4RMD160 (hplip-3.16.2.tar.gz) = 9e83fbfc8517b13e664135006ea240bf1f7ff3cb
5SHA512 (hplip-3.15.11.tar.gz) = 003789e30f45d71a78ebcd2fa57231381ba7bf7aba0ebbcfffda5b01a9c4e8bf763c03488883aba77368920d0dea31a2e80da2d036cf5cb7d07cf65511a7eb49 5SHA512 (hplip-3.16.2.tar.gz) = fa73f85cc255a30486ebde12d1615a4c164dd4ecb616a8d509b6ad5857aa52edca14c488e2b11ade4254f71d76bea1ca8d85dc2b0ee99ba32d9381ef42fc80a5
6Size (hplip-3.15.11.tar.gz) = 22277756 bytes 6Size (hplip-3.16.2.tar.gz) = 22285808 bytes
7SHA1 (patch-ab) = 82b8ab80f778a6a31c1031688d9a16dbd4c55462 7SHA1 (patch-ab) = 82b8ab80f778a6a31c1031688d9a16dbd4c55462
8SHA1 (patch-ae) = c4bae69fce7d9061d4c7dc53f1f8c5404577c605 8SHA1 (patch-ae) = c4bae69fce7d9061d4c7dc53f1f8c5404577c605
9SHA1 (patch-configure.in) = 329ff2e27acf3acb57c1afc182e8e32da45aab9a 9SHA1 (patch-configure.in) = c5d3d88a4ae5b1c30c23bc27ac94caf6be493851
10SHA1 (patch-diagnose_queues.py) = aa3e544dc131accf4f799d26924b50f511c8c69f 10SHA1 (patch-diagnose_queues.py) = 0ef5c12a3f3de217064d5b0c40611ba3f1e72c9e
11SHA1 (patch-installer_dcheck.py) = e381086ccdfbdcd84d3ffe29995d5d3643709be6 11SHA1 (patch-installer_dcheck.py) = e381086ccdfbdcd84d3ffe29995d5d3643709be6
12SHA1 (patch-io_hpmud_musb.h) = ad634f5a1f426877e1c88916b6468fcdb7598555 12SHA1 (patch-io_hpmud_musb.h) = ad634f5a1f426877e1c88916b6468fcdb7598555
13SHA1 (patch-prnt_hpijs_context2.cpp) = f81148c1c334a9074453b27ac055833cd1669bd0 13SHA1 (patch-prnt_hpijs_context2.cpp) = f81148c1c334a9074453b27ac055833cd1669bd0
14SHA1 (patch-prnt_hpijs_foomatic-rip-hplip) = a94c7bbdc90dd68d001ce0325b7aabcd470233eb 14SHA1 (patch-prnt_hpijs_foomatic-rip-hplip) = a94c7bbdc90dd68d001ce0325b7aabcd470233eb
15SHA1 (patch-prnt_hpijs_hjzjscolor.cpp) = 5ca9c828ba4aff17a54a803d79c2dc169975d50c 15SHA1 (patch-prnt_hpijs_hjzjscolor.cpp) = 5ca9c828ba4aff17a54a803d79c2dc169975d50c
16SHA1 (patch-protocol_discovery_mdns.c) = 3923ebc318e702b45ea69c533d275cc16986c979 16SHA1 (patch-protocol_discovery_mdns.c) = e2ca43f6ab13fe2124a38bcc0eff292a57b34b06
17SHA1 (patch-scan.py) = 4d942ee0580d5f1818e43164c07edd018529395d 17SHA1 (patch-scan.py) = 4d942ee0580d5f1818e43164c07edd018529395d
cvs diff -r1.8 -r1.9 pkgsrc/print/hplip/options.mk (expand / switch to unified diff)

--- pkgsrc/print/hplip/options.mk 2015/12/05 21:25:55 1.8
+++ pkgsrc/print/hplip/options.mk 2016/02/28 20:37:28 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.8 2015/12/05 21:25:55 adam Exp $ 1# $NetBSD: options.mk,v 1.9 2016/02/28 20:37:28 schnoebe Exp $
2# 2#
3# HPLIP dependencies are detailed in the following page: 3# HPLIP dependencies are detailed in the following page:
4# http://hplipopensource.com/hplip-web/install/manual/distros/other.html 4# http://hplipopensource.com/hplip-web/install/manual/distros/other.html
5 5
6PKG_OPTIONS_VAR= PKG_OPTIONS.hplip 6PKG_OPTIONS_VAR= PKG_OPTIONS.hplip
7PKG_SUPPORTED_OPTIONS= fax sane qt 7PKG_SUPPORTED_OPTIONS= fax sane qt
8PKG_SUGGESTED_OPTIONS= fax 8PKG_SUGGESTED_OPTIONS= fax
9PKG_OPTIONS_LEGACY_OPTS+= scan:sane 9PKG_OPTIONS_LEGACY_OPTS+= scan:sane
10PKG_OPTIONS_LEGACY_OPTS+= gui:qt 10PKG_OPTIONS_LEGACY_OPTS+= gui:qt
11 11
12.include "../../mk/bsd.options.mk" 12.include "../../mk/bsd.options.mk"
13 13
14.if !empty(PKG_OPTIONS:Mfax) 14.if !empty(PKG_OPTIONS:Mfax)
@@ -42,20 +42,21 @@ DEPENDS+= {${PYPKGPREFIX}-imaging-[0-9]* @@ -42,20 +42,21 @@ DEPENDS+= {${PYPKGPREFIX}-imaging-[0-9]*
42.else 42.else
43CONFIGURE_ARGS+= --disable-scan-build 43CONFIGURE_ARGS+= --disable-scan-build
44.endif 44.endif
45 45
46.if !empty(PKG_OPTIONS:Mqt) 46.if !empty(PKG_OPTIONS:Mqt)
47PLIST_SRC+= PLIST.gui 47PLIST_SRC+= PLIST.gui
48CONFIGURE_ARGS+= --enable-gui-build 48CONFIGURE_ARGS+= --enable-gui-build
49CONFIGURE_ARGS+= --enable-qt4 49CONFIGURE_ARGS+= --enable-qt4
50CONFIGURE_ARGS+= --enable-policykit 50CONFIGURE_ARGS+= --enable-policykit
51EGFILES+= dbus-1/system.d/com.hp.hplip.conf 51EGFILES+= dbus-1/system.d/com.hp.hplip.conf
52MAKE_DIRS+= ${PKG_SYSCONFDIR}/dbus-1/system.d 52MAKE_DIRS+= ${PKG_SYSCONFDIR}/dbus-1/system.d
53.include "../../x11/py-qt4/buildlink3.mk" 53.include "../../x11/py-qt4/buildlink3.mk"
54.include "../../security/policykit/buildlink3.mk" 54.include "../../security/policykit/buildlink3.mk"
 55.include "../../sysutils/desktop-file-utils/desktopdb.mk"
55DEPENDS+= ${PYPKGPREFIX}-notify-[0-9]*:../../sysutils/py-notify 56DEPENDS+= ${PYPKGPREFIX}-notify-[0-9]*:../../sysutils/py-notify
56PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # py-notify 57PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # py-notify
57.else 58.else
58CONFIGURE_ARGS+= --disable-policykit 59CONFIGURE_ARGS+= --disable-policykit
59CONFIGURE_ARGS+= --disable-qt4 60CONFIGURE_ARGS+= --disable-qt4
60CONFIGURE_ARGS+= --disable-gui-build 61CONFIGURE_ARGS+= --disable-gui-build
61.endif 62.endif
cvs diff -r1.1 -r1.2 pkgsrc/print/hplip/patches/patch-configure.in (expand / switch to unified diff)

--- pkgsrc/print/hplip/patches/patch-configure.in 2015/12/07 11:02:26 1.1
+++ pkgsrc/print/hplip/patches/patch-configure.in 2016/02/28 20:37:28 1.2
@@ -1,14 +1,17 @@ @@ -1,14 +1,17 @@
1$NetBSD: patch-configure.in,v 1.1 2015/12/07 11:02:26 adam Exp $ 1$NetBSD: patch-configure.in,v 1.2 2016/02/28 20:37:28 schnoebe Exp $
 2
 3convert configure to use more configure paths instead of hard coded
 4paths.
2 5
3--- configure.in.orig 2015-11-12 10:29:29.000000000 +0000 6--- configure.in.orig 2015-11-12 10:29:29.000000000 +0000
4+++ configure.in 7+++ configure.in
5@@ -34,14 +34,15 @@ AC_DISABLE_STATIC 8@@ -34,14 +34,15 @@ AC_DISABLE_STATIC
6 # Checks for programs. 9 # Checks for programs.
7 AC_PROG_CXX 10 AC_PROG_CXX
8 AC_PROG_CC 11 AC_PROG_CC
9+AM_PROG_CC_C_O 12+AM_PROG_CC_C_O
10 AC_PROG_INSTALL 13 AC_PROG_INSTALL
11+AC_LIBTOOL_DLOPEN 14+AC_LIBTOOL_DLOPEN
12 AC_PROG_LIBTOOL 15 AC_PROG_LIBTOOL
13  16
14 # Checks for required libraries, don't set global -lpthread, -lm, -ljpeg, ... here, set in Makefile. 17 # Checks for required libraries, don't set global -lpthread, -lm, -ljpeg, ... here, set in Makefile.
cvs diff -r1.1 -r1.2 pkgsrc/print/hplip/patches/patch-diagnose_queues.py (expand / switch to unified diff)

--- pkgsrc/print/hplip/patches/patch-diagnose_queues.py 2015/11/03 15:08:50 1.1
+++ pkgsrc/print/hplip/patches/patch-diagnose_queues.py 2016/02/28 20:37:28 1.2
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: patch-diagnose_queues.py,v 1.1 2015/11/03 15:08:50 schnoebe Exp $ 1$NetBSD: patch-diagnose_queues.py,v 1.2 2016/02/28 20:37:28 schnoebe Exp $
 2
 3Correct the spelling on the module name.
2 4
3--- diagnose_queues.py.orig 2015-08-19 13:25:37.000000000 +0000 5--- diagnose_queues.py.orig 2015-08-19 13:25:37.000000000 +0000
4+++ diagnose_queues.py 6+++ diagnose_queues.py
5@@ -22,7 +22,7 @@ 7@@ -22,7 +22,7 @@
6 from __future__ import print_function 8 from __future__ import print_function
7 __version__ = '1.1' 9 __version__ = '1.1'
8 __title__ = 'AutoConfig Utility to check queues configuration' 10 __title__ = 'AutoConfig Utility to check queues configuration'
9-__mod__ = 'hp-daignose-queues' 11-__mod__ = 'hp-daignose-queues'
10+__mod__ = 'hp-diagnose-queues' 12+__mod__ = 'hp-diagnose-queues'
11 __doc__ = """Auto config utility for HPLIP supported multifunction Devices to diagnose queues configuration.""" 13 __doc__ = """Auto config utility for HPLIP supported multifunction Devices to diagnose queues configuration."""
12  14
13 # Std Lib 15 # Std Lib
cvs diff -r1.1 -r1.2 pkgsrc/print/hplip/patches/patch-protocol_discovery_mdns.c (expand / switch to unified diff)

--- pkgsrc/print/hplip/patches/patch-protocol_discovery_mdns.c 2015/12/07 11:02:26 1.1
+++ pkgsrc/print/hplip/patches/patch-protocol_discovery_mdns.c 2016/02/28 20:37:28 1.2
@@ -1,12 +1,14 @@ @@ -1,12 +1,14 @@
1$NetBSD: patch-protocol_discovery_mdns.c,v 1.1 2015/12/07 11:02:26 adam Exp $ 1$NetBSD: patch-protocol_discovery_mdns.c,v 1.2 2016/02/28 20:37:28 schnoebe Exp $
 2
 3Add <sys/time> to allow building on a wider variety of systems.
2 4
3--- protocol/discovery/mdns.c.orig 2015-12-05 13:17:06.000000000 +0000 5--- protocol/discovery/mdns.c.orig 2015-12-05 13:17:06.000000000 +0000
4+++ protocol/discovery/mdns.c 6+++ protocol/discovery/mdns.c
5@@ -28,6 +28,7 @@ 7@@ -28,6 +28,7 @@
6 #include <string.h> 8 #include <string.h>
7 #include <syslog.h> 9 #include <syslog.h>
8 #include <sys/socket.h> 10 #include <sys/socket.h>
9+#include <sys/time.h> 11+#include <sys/time.h>
10 #include <netinet/in.h> 12 #include <netinet/in.h>
11 #include <netdb.h> 13 #include <netdb.h>
12 #include <arpa/inet.h> 14 #include <arpa/inet.h>