Sun May 26 00:43:23 2013 UTC ()
HPLIP 3.13.5 - This release has the following changes:
Added Support for the Following New Printers:

- HP LaserJet Enterprise MFP M725 series
- HP LaserJet Enterprise MFP M725dn
- HP LaserJet Enterprise MFP M725fw
- HP LaserJet Enterprise MFP M725z
- HP LaserJet Enterprise MFP M725z+
- HP Officejet Pro 3610 Black and White e-All-in-One
- HP Officejet Pro 3620 Black and White e-All-in-One

Launchpad fixes:
1176470 - hp-setup fails with the message "ethernet cable is plugged in"
	- But it isn't
1157701 - soapfax.py:139:setStationName:UnicodeEncodeError: 'ascii'
	  codec can't encode characters in position 0-3: ordinal not in
	  range(128)
1163339 - hplip online documentation: manual tarball installation shows
	  package dependancies which are out-of-date

Issues fixed:
- Bottom margin is not printing on 8.5x13in paper size for DeskJet 2050
  J510 device
- Fixed cross resolution issue for pcl3gui2

Detailed Change Log:
- Added 56-hpmud.rules and removed 56-hpmud_support, 86-hpmud_plugin,
  56-hpmud_add_printer, 55-hpmud and 40-hplip rules
- Added hplip-printer@.service to support systemd services in Udev for
  OpenSuSe 12.3


(schnoebe)
diff -r1.19 -r1.20 pkgsrc/print/hplip/Makefile
diff -r1.5 -r1.6 pkgsrc/print/hplip/PLIST.base
diff -r1.5 -r1.6 pkgsrc/print/hplip/distinfo
diff -r1.5 -r1.6 pkgsrc/print/hplip/patches/patch-ae
cvs diff -r1.19 -r1.20 pkgsrc/print/hplip/Makefile (expand / switch to unified diff)

--- pkgsrc/print/hplip/Makefile 2013/04/25 03:53:11 1.19
+++ pkgsrc/print/hplip/Makefile 2013/05/26 00:43:23 1.20
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.19 2013/04/25 03:53:11 sbd Exp $ 1# $NetBSD: Makefile,v 1.20 2013/05/26 00:43:23 schnoebe Exp $
2# 2#
3 3
4DISTNAME= hplip-3.13.4 4DISTNAME= hplip-3.13.5
5PKGREVISION= 1 
6CATEGORIES= print 5CATEGORIES= print
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hplip/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hplip/}
8 7
9MAINTAINER= schnoebe@NetBSD.org 8MAINTAINER= schnoebe@NetBSD.org
10HOMEPAGE= http://hplipopensource.com/ 9HOMEPAGE= http://hplipopensource.com/
11COMMENT= HP Linux Imaging and Printing 10COMMENT= HP Linux Imaging and Printing
12LICENSE= gnu-gpl-v2 AND mit AND modified-bsd 11LICENSE= gnu-gpl-v2 AND mit AND modified-bsd
13 12
14CONFLICTS+= hpijs-[0-9]* 13CONFLICTS+= hpijs-[0-9]*
15 14
16FILES_SUBST+= CUPS_USER=${CUPS_USER} 15FILES_SUBST+= CUPS_USER=${CUPS_USER}
17FILES_SUBST+= CUPS_GROUP=${CUPS_GROUP} 16FILES_SUBST+= CUPS_GROUP=${CUPS_GROUP}
18 17
cvs diff -r1.5 -r1.6 pkgsrc/print/hplip/PLIST.base (expand / switch to unified diff)

--- pkgsrc/print/hplip/PLIST.base 2013/04/12 03:47:30 1.5
+++ pkgsrc/print/hplip/PLIST.base 2013/05/26 00:43:23 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST.base,v 1.5 2013/04/12 03:47:30 schnoebe Exp $ 1@comment $NetBSD: PLIST.base,v 1.6 2013/05/26 00:43:23 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
@@ -31,26 +31,27 @@ bin/hp-setup @@ -31,26 +31,27 @@ bin/hp-setup
31bin/hp-systray 31bin/hp-systray
32bin/hp-testpage 32bin/hp-testpage
33bin/hp-timedate 33bin/hp-timedate
34bin/hp-uninstall 34bin/hp-uninstall
35bin/hp-unload 35bin/hp-unload
36bin/hp-upgrade 36bin/hp-upgrade
37bin/hp-wificonfig 37bin/hp-wificonfig
38bin/hpijs 38bin/hpijs
39lib/libhpip.la 39lib/libhpip.la
40lib/libhpmud.la 40lib/libhpmud.la
41${PYSITELIB}/cupsext.la 41${PYSITELIB}/cupsext.la
42${PYSITELIB}/hpmudext.la 42${PYSITELIB}/hpmudext.la
43${PYSITELIB}/pcardext.la 43${PYSITELIB}/pcardext.la
 44lib/systemd/system/hplip-printer@.service
44libexec/cups/backend/hp 45libexec/cups/backend/hp
45libexec/cups/filter/foomatic-rip-hplip 46libexec/cups/filter/foomatic-rip-hplip
46libexec/cups/filter/hpcac 47libexec/cups/filter/hpcac
47libexec/cups/filter/hpcups 48libexec/cups/filter/hpcups
48libexec/cups/filter/hplipjs 49libexec/cups/filter/hplipjs
49libexec/cups/filter/hpps 50libexec/cups/filter/hpps
50libexec/cups/filter/pstotiff 51libexec/cups/filter/pstotiff
51share/cups/drv/hp/hpcups.drv 52share/cups/drv/hp/hpcups.drv
52share/cups/drv/hp/hpijs.drv 53share/cups/drv/hp/hpijs.drv
53share/cups/model/hplip-ppds 54share/cups/model/hplip-ppds
54share/doc/${PKGNAME}/COPYING 55share/doc/${PKGNAME}/COPYING
55share/doc/${PKGNAME}/README_LIBJPG 56share/doc/${PKGNAME}/README_LIBJPG
56share/doc/${PKGNAME}/commandline.html 57share/doc/${PKGNAME}/commandline.html
@@ -77,30 +78,27 @@ share/doc/${PKGNAME}/printing.html @@ -77,30 +78,27 @@ share/doc/${PKGNAME}/printing.html
77share/doc/${PKGNAME}/printoptions.html 78share/doc/${PKGNAME}/printoptions.html
78share/doc/${PKGNAME}/printtroubleshooting.html 79share/doc/${PKGNAME}/printtroubleshooting.html
79share/doc/${PKGNAME}/scanning.html 80share/doc/${PKGNAME}/scanning.html
80share/doc/${PKGNAME}/scantrouble.html 81share/doc/${PKGNAME}/scantrouble.html
81share/doc/${PKGNAME}/sendfax.html 82share/doc/${PKGNAME}/sendfax.html
82share/doc/${PKGNAME}/setup.html 83share/doc/${PKGNAME}/setup.html
83share/doc/${PKGNAME}/styles/css.css 84share/doc/${PKGNAME}/styles/css.css
84share/doc/${PKGNAME}/systray.html 85share/doc/${PKGNAME}/systray.html
85share/doc/${PKGNAME}/troubleshooting.html 86share/doc/${PKGNAME}/troubleshooting.html
86share/doc/${PKGNAME}/uninstalling.html 87share/doc/${PKGNAME}/uninstalling.html
87share/doc/${PKGNAME}/upgrading.html 88share/doc/${PKGNAME}/upgrading.html
88share/examples/hplip/cron.daily/hplip_cron 89share/examples/hplip/cron.daily/hplip_cron
89share/examples/hplip/hp/hplip.conf 90share/examples/hplip/hp/hplip.conf
90share/examples/hplip/udev/rules.d/55-hpmud.rules 91share/examples/hplip/udev/rules.d/56-hpmud.rules
91share/examples/hplip/udev/rules.d/56-hpmud_add_printer.rules 
92share/examples/hplip/udev/rules.d/56-hpmud_support.rules 
93share/examples/hplip/udev/rules.d/86-hpmud_plugin.rules 
94share/hal/fdi/preprobe/10osvendor/20-hplip-devices.fdi 92share/hal/fdi/preprobe/10osvendor/20-hplip-devices.fdi
95share/hplip/__init__.py 93share/hplip/__init__.py
96share/hplip/__init__.pyc 94share/hplip/__init__.pyc
97share/hplip/align.py 95share/hplip/align.py
98share/hplip/align.pyc 96share/hplip/align.pyc
99share/hplip/base/LedmWifi.py 97share/hplip/base/LedmWifi.py
100share/hplip/base/LedmWifi.pyc 98share/hplip/base/LedmWifi.pyc
101share/hplip/base/__init__.py 99share/hplip/base/__init__.py
102share/hplip/base/__init__.pyc 100share/hplip/base/__init__.pyc
103share/hplip/base/codes.py 101share/hplip/base/codes.py
104share/hplip/base/codes.pyc 102share/hplip/base/codes.pyc
105share/hplip/base/device.py 103share/hplip/base/device.py
106share/hplip/base/device.pyc 104share/hplip/base/device.pyc
@@ -1222,26 +1220,27 @@ share/hplip/ppd/HP/hp-laserjet_m5035_mfp @@ -1222,26 +1220,27 @@ share/hplip/ppd/HP/hp-laserjet_m5035_mfp
1222share/hplip/ppd/HP/hp-laserjet_m5035_mfp-ps.ppd.gz 1220share/hplip/ppd/HP/hp-laserjet_m5035_mfp-ps.ppd.gz
1223share/hplip/ppd/HP/hp-laserjet_m5039_mfp-hpijs-pcl3.ppd.gz 1221share/hplip/ppd/HP/hp-laserjet_m5039_mfp-hpijs-pcl3.ppd.gz
1224share/hplip/ppd/HP/hp-laserjet_m5039_mfp-pcl3.ppd.gz 1222share/hplip/ppd/HP/hp-laserjet_m5039_mfp-pcl3.ppd.gz
1225share/hplip/ppd/HP/hp-laserjet_m9040_mfp-hpijs-pcl3.ppd.gz 1223share/hplip/ppd/HP/hp-laserjet_m9040_mfp-hpijs-pcl3.ppd.gz
1226share/hplip/ppd/HP/hp-laserjet_m9040_mfp-pcl3.ppd.gz 1224share/hplip/ppd/HP/hp-laserjet_m9040_mfp-pcl3.ppd.gz
1227share/hplip/ppd/HP/hp-laserjet_m9040_mfp-ps.ppd.gz 1225share/hplip/ppd/HP/hp-laserjet_m9040_mfp-ps.ppd.gz
1228share/hplip/ppd/HP/hp-laserjet_m9050_mfp-hpijs-pcl3.ppd.gz 1226share/hplip/ppd/HP/hp-laserjet_m9050_mfp-hpijs-pcl3.ppd.gz
1229share/hplip/ppd/HP/hp-laserjet_m9050_mfp-pcl3.ppd.gz 1227share/hplip/ppd/HP/hp-laserjet_m9050_mfp-pcl3.ppd.gz
1230share/hplip/ppd/HP/hp-laserjet_m9050_mfp-ps.ppd.gz 1228share/hplip/ppd/HP/hp-laserjet_m9050_mfp-ps.ppd.gz
1231share/hplip/ppd/HP/hp-laserjet_m9059_mfp-hpijs-pcl3.ppd.gz 1229share/hplip/ppd/HP/hp-laserjet_m9059_mfp-hpijs-pcl3.ppd.gz
1232share/hplip/ppd/HP/hp-laserjet_m9059_mfp-pcl3.ppd.gz 1230share/hplip/ppd/HP/hp-laserjet_m9059_mfp-pcl3.ppd.gz
1233share/hplip/ppd/HP/hp-laserjet_m9059_mfp-ps.ppd.gz 1231share/hplip/ppd/HP/hp-laserjet_m9059_mfp-ps.ppd.gz
1234share/hplip/ppd/HP/hp-laserjet_mfp_m521-ps.ppd.gz 1232share/hplip/ppd/HP/hp-laserjet_mfp_m521-ps.ppd.gz
 1233share/hplip/ppd/HP/hp-laserjet_mfp_m725-ps.ppd.gz
1235share/hplip/ppd/HP/hp-laserjet_p1005-hpijs.ppd.gz 1234share/hplip/ppd/HP/hp-laserjet_p1005-hpijs.ppd.gz
1236share/hplip/ppd/HP/hp-laserjet_p1005.ppd.gz 1235share/hplip/ppd/HP/hp-laserjet_p1005.ppd.gz
1237share/hplip/ppd/HP/hp-laserjet_p1006-hpijs.ppd.gz 1236share/hplip/ppd/HP/hp-laserjet_p1006-hpijs.ppd.gz
1238share/hplip/ppd/HP/hp-laserjet_p1006.ppd.gz 1237share/hplip/ppd/HP/hp-laserjet_p1006.ppd.gz
1239share/hplip/ppd/HP/hp-laserjet_p1007-hpijs.ppd.gz 1238share/hplip/ppd/HP/hp-laserjet_p1007-hpijs.ppd.gz
1240share/hplip/ppd/HP/hp-laserjet_p1007.ppd.gz 1239share/hplip/ppd/HP/hp-laserjet_p1007.ppd.gz
1241share/hplip/ppd/HP/hp-laserjet_p1008-hpijs.ppd.gz 1240share/hplip/ppd/HP/hp-laserjet_p1008-hpijs.ppd.gz
1242share/hplip/ppd/HP/hp-laserjet_p1008.ppd.gz 1241share/hplip/ppd/HP/hp-laserjet_p1008.ppd.gz
1243share/hplip/ppd/HP/hp-laserjet_p1009-hpijs.ppd.gz 1242share/hplip/ppd/HP/hp-laserjet_p1009-hpijs.ppd.gz
1244share/hplip/ppd/HP/hp-laserjet_p1009.ppd.gz 1243share/hplip/ppd/HP/hp-laserjet_p1009.ppd.gz
1245share/hplip/ppd/HP/hp-laserjet_p1505-hpijs.ppd.gz 1244share/hplip/ppd/HP/hp-laserjet_p1505-hpijs.ppd.gz
1246share/hplip/ppd/HP/hp-laserjet_p1505.ppd.gz 1245share/hplip/ppd/HP/hp-laserjet_p1505.ppd.gz
1247share/hplip/ppd/HP/hp-laserjet_p1505n-hpijs-pcl3.ppd.gz 1246share/hplip/ppd/HP/hp-laserjet_p1505n-hpijs-pcl3.ppd.gz
@@ -1524,26 +1523,30 @@ share/hplip/ppd/HP/hp-officejet_k7100-hp @@ -1524,26 +1523,30 @@ share/hplip/ppd/HP/hp-officejet_k7100-hp
1524share/hplip/ppd/HP/hp-officejet_k7100.ppd.gz 1523share/hplip/ppd/HP/hp-officejet_k7100.ppd.gz
1525share/hplip/ppd/HP/hp-officejet_k80-hpijs.ppd.gz 1524share/hplip/ppd/HP/hp-officejet_k80-hpijs.ppd.gz
1526share/hplip/ppd/HP/hp-officejet_k80.ppd.gz 1525share/hplip/ppd/HP/hp-officejet_k80.ppd.gz
1527share/hplip/ppd/HP/hp-officejet_k80xi-hpijs.ppd.gz 1526share/hplip/ppd/HP/hp-officejet_k80xi-hpijs.ppd.gz
1528share/hplip/ppd/HP/hp-officejet_k80xi.ppd.gz 1527share/hplip/ppd/HP/hp-officejet_k80xi.ppd.gz
1529share/hplip/ppd/HP/hp-officejet_lx-hpijs.ppd.gz 1528share/hplip/ppd/HP/hp-officejet_lx-hpijs.ppd.gz
1530share/hplip/ppd/HP/hp-officejet_lx.ppd.gz 1529share/hplip/ppd/HP/hp-officejet_lx.ppd.gz
1531share/hplip/ppd/HP/hp-officejet_pro_1150c-hpijs.ppd.gz 1530share/hplip/ppd/HP/hp-officejet_pro_1150c-hpijs.ppd.gz
1532share/hplip/ppd/HP/hp-officejet_pro_1150c.ppd.gz 1531share/hplip/ppd/HP/hp-officejet_pro_1150c.ppd.gz
1533share/hplip/ppd/HP/hp-officejet_pro_1170c_series-hpijs.ppd.gz 1532share/hplip/ppd/HP/hp-officejet_pro_1170c_series-hpijs.ppd.gz
1534share/hplip/ppd/HP/hp-officejet_pro_1170c_series.ppd.gz 1533share/hplip/ppd/HP/hp-officejet_pro_1170c_series.ppd.gz
1535share/hplip/ppd/HP/hp-officejet_pro_251dw_printer-ps.ppd.gz 1534share/hplip/ppd/HP/hp-officejet_pro_251dw_printer-ps.ppd.gz
1536share/hplip/ppd/HP/hp-officejet_pro_276dw_mfp-ps.ppd.gz 1535share/hplip/ppd/HP/hp-officejet_pro_276dw_mfp-ps.ppd.gz
 1536share/hplip/ppd/HP/hp-officejet_pro_3610-hpijs.ppd.gz
 1537share/hplip/ppd/HP/hp-officejet_pro_3610.ppd.gz
 1538share/hplip/ppd/HP/hp-officejet_pro_3620-hpijs.ppd.gz
 1539share/hplip/ppd/HP/hp-officejet_pro_3620.ppd.gz
1537share/hplip/ppd/HP/hp-officejet_pro_451_series-ps.ppd.gz 1540share/hplip/ppd/HP/hp-officejet_pro_451_series-ps.ppd.gz
1538share/hplip/ppd/HP/hp-officejet_pro_476_576_series-ps.ppd.gz 1541share/hplip/ppd/HP/hp-officejet_pro_476_576_series-ps.ppd.gz
1539share/hplip/ppd/HP/hp-officejet_pro_551_series-ps.ppd.gz 1542share/hplip/ppd/HP/hp-officejet_pro_551_series-ps.ppd.gz
1540share/hplip/ppd/HP/hp-officejet_pro_8000_a809-hpijs.ppd.gz 1543share/hplip/ppd/HP/hp-officejet_pro_8000_a809-hpijs.ppd.gz
1541share/hplip/ppd/HP/hp-officejet_pro_8000_a809.ppd.gz 1544share/hplip/ppd/HP/hp-officejet_pro_8000_a809.ppd.gz
1542share/hplip/ppd/HP/hp-officejet_pro_8000_enterprise_a811a-ps.ppd.gz 1545share/hplip/ppd/HP/hp-officejet_pro_8000_enterprise_a811a-ps.ppd.gz
1543share/hplip/ppd/HP/hp-officejet_pro_8100-hpijs.ppd.gz 1546share/hplip/ppd/HP/hp-officejet_pro_8100-hpijs.ppd.gz
1544share/hplip/ppd/HP/hp-officejet_pro_8100.ppd.gz 1547share/hplip/ppd/HP/hp-officejet_pro_8100.ppd.gz
1545share/hplip/ppd/HP/hp-officejet_pro_8500_a909a-hpijs.ppd.gz 1548share/hplip/ppd/HP/hp-officejet_pro_8500_a909a-hpijs.ppd.gz
1546share/hplip/ppd/HP/hp-officejet_pro_8500_a909a.ppd.gz 1549share/hplip/ppd/HP/hp-officejet_pro_8500_a909a.ppd.gz
1547share/hplip/ppd/HP/hp-officejet_pro_8500_a909g-hpijs.ppd.gz 1550share/hplip/ppd/HP/hp-officejet_pro_8500_a909g-hpijs.ppd.gz
1548share/hplip/ppd/HP/hp-officejet_pro_8500_a909g.ppd.gz 1551share/hplip/ppd/HP/hp-officejet_pro_8500_a909g.ppd.gz
1549share/hplip/ppd/HP/hp-officejet_pro_8500_a909n-hpijs.ppd.gz 1552share/hplip/ppd/HP/hp-officejet_pro_8500_a909n-hpijs.ppd.gz
cvs diff -r1.5 -r1.6 pkgsrc/print/hplip/distinfo (expand / switch to unified diff)

--- pkgsrc/print/hplip/distinfo 2013/04/12 03:47:30 1.5
+++ pkgsrc/print/hplip/distinfo 2013/05/26 00:43:23 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.5 2013/04/12 03:47:30 schnoebe Exp $ 1$NetBSD: distinfo,v 1.6 2013/05/26 00:43:23 schnoebe Exp $
2 2
3SHA1 (hplip-3.13.4.tar.gz) = df8e1cd027e7fc56f4d344904cd58d0105914e9d 3SHA1 (hplip-3.13.5.tar.gz) = a28ebd754a94a83e493aa91673def890564c85f1
4RMD160 (hplip-3.13.4.tar.gz) = 65df3b65aec0b588d80635cdff7dc88e21d22424 4RMD160 (hplip-3.13.5.tar.gz) = 056289cd233e4c95cb16cf30e136bebe691deed7
5Size (hplip-3.13.4.tar.gz) = 20680774 bytes 5Size (hplip-3.13.5.tar.gz) = 20737422 bytes
6SHA1 (patch-aa) = bad4a3a9570d9bbd1e0fe226b625f1ddc3f31b8c 6SHA1 (patch-aa) = bad4a3a9570d9bbd1e0fe226b625f1ddc3f31b8c
7SHA1 (patch-ab) = ce2775ef74746aefd942bda49c4e548f7c771ff5 7SHA1 (patch-ab) = ce2775ef74746aefd942bda49c4e548f7c771ff5
8SHA1 (patch-ad) = 468fbf167e1f20bb8617e444977969e46b19f3be 8SHA1 (patch-ad) = 468fbf167e1f20bb8617e444977969e46b19f3be
9SHA1 (patch-ae) = 1d619e74413d14271bdd428ce1dafcd1944c2423 9SHA1 (patch-ae) = da7a6f9ccb3787101496dd6588c3ebd31f69157d
10SHA1 (patch-io_hpmud_musb.h) = ad634f5a1f426877e1c88916b6468fcdb7598555 10SHA1 (patch-io_hpmud_musb.h) = ad634f5a1f426877e1c88916b6468fcdb7598555
11SHA1 (patch-io_hpmud_pml.c) = 9bd341140afbc9ddb8eb8dff7eee05365231f94f 11SHA1 (patch-io_hpmud_pml.c) = 9bd341140afbc9ddb8eb8dff7eee05365231f94f
12SHA1 (patch-prnt_hpijs_context2.cpp) = f81148c1c334a9074453b27ac055833cd1669bd0 12SHA1 (patch-prnt_hpijs_context2.cpp) = f81148c1c334a9074453b27ac055833cd1669bd0
13SHA1 (patch-prnt_hpijs_hjzjscolor.cpp) = 5ca9c828ba4aff17a54a803d79c2dc169975d50c 13SHA1 (patch-prnt_hpijs_hjzjscolor.cpp) = 5ca9c828ba4aff17a54a803d79c2dc169975d50c
14SHA1 (patch-scan.py) = 6f861843ee3b990cc1eaaa0d957cdfd5e6f5f262 14SHA1 (patch-scan.py) = 6f861843ee3b990cc1eaaa0d957cdfd5e6f5f262
cvs diff -r1.5 -r1.6 pkgsrc/print/hplip/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/print/hplip/patches/patch-ae 2013/04/12 03:47:30 1.5
+++ pkgsrc/print/hplip/patches/patch-ae 2013/05/26 00:43:23 1.6
@@ -1,106 +1,112 @@ @@ -1,106 +1,112 @@
1$NetBSD: patch-ae,v 1.5 2013/04/12 03:47:30 schnoebe Exp $ 1$NetBSD: patch-ae,v 1.6 2013/05/26 00:43:23 schnoebe Exp $
2 2
3# Conform to autoconf's standard variable usage, making it easier 3# Conform to autoconf's standard variable usage, making it easier
4# to install on pkgsrc platforms 4# to install on pkgsrc platforms
5 5
6# reported upstream as https://bugs.launchpad.net/hplip/+bug/726218 6# reported upstream as https://bugs.launchpad.net/hplip/+bug/726218
7 7
8--- Makefile.am.orig 2013-03-08 07:15:32.000000000 +0000 8# still needs to handle the buildlink path for libusb-1.0 :(
 9# schnoebe -- Fri May 24 14:55:57 CDT 2013
 10
 11--- Makefile.am.orig 2013-05-10 10:09:32.000000000 +0000
9+++ Makefile.am 12+++ Makefile.am
10@@ -110,11 +110,11 @@ hp_mkuri_LDADD = -ldl libhpmud.la 13@@ -110,26 +110,26 @@ hp_mkuri_LDADD = -ldl libhpmud.la
11 hp_mkuri_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\" 14 hp_mkuri_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\"
12  15
 16 #hpmud rules data dir
 17-rulessystemdir=/usr/lib/systemd/system
 18+rulessystemdir= $(libdir)/systemd/system
 19 dist_rulessystem_DATA =data/rules/hplip-printer@.service
 20
13 # cron files 21 # cron files
14-crondir = /etc/cron.daily 22-crondir = /etc/cron.daily
15+crondir = $(sysconfdir)/cron.daily 23+crondir = $(sysconfdir)/cron.daily
16 dist_cron_DATA = data/rules/hplip_cron 24 dist_cron_DATA = data/rules/hplip_cron
17  25
18 # hpmud.rules 26 # hpmud.rules
19-rulesdir = /etc/udev/rules.d 27-rulesdir = /etc/udev/rules.d
20+rulesdir = $(sysconfdir)/udev/rules.d 28+rulesdir = $(sysconfdir)/udev/rules.d
21 if UDEV_SYSFS_RULES 29 if UDEV_SYSFS_RULES
22 dist_rules_DATA = data/rules/56-hpmud_support_sysfs.rules 30 dist_rules_DATA = data/rules/56-hpmud_sysfs.rules
23 dist_rules_DATA += data/rules/86-hpmud_plugin_sysfs.rules 31 else
24@@ -134,11 +134,11 @@ else 32 dist_rules_DATA = data/rules/56-hpmud.rules
25 dist_rules_DATA += data/rules/55-hpmud.rules 
26 endif 
27 endif 33 endif
 34
28-halpredir = /usr/share/hal/fdi/preprobe/10osvendor 35-halpredir = /usr/share/hal/fdi/preprobe/10osvendor
29+halpredir = $(datadir)/hal/fdi/preprobe/10osvendor 36+halpredir = $(datadir)/hal/fdi/preprobe/10osvendor
30 dist_halpre_DATA = data/rules/20-hplip-devices.fdi 37 dist_halpre_DATA = data/rules/20-hplip-devices.fdi
31  38
32 # hplip.conf 39 # hplip.conf
33-hplip_confdir = /etc/hp 40-hplip_confdir = /etc/hp
34+hplip_confdir = $(sysconfdir)/hp 41+hplip_confdir = $(sysconfdir)/hp
35 hplip_conf_DATA = hplip.conf 42 hplip_conf_DATA = hplip.conf
36  43
37 #pstotiff filter 44 #pstotiff filter
38@@ -146,13 +146,13 @@ pstotiffdir = $(cupsfilterdir) 45@@ -137,12 +137,12 @@ pstotiffdir = $(cupsfilterdir)
39 pstotiff_SCRIPTS = fax/filters/pstotiff 46 pstotiff_SCRIPTS = fax/filters/pstotiff
40  47
41 # hplip.state 48 # hplip.state
42-hplip_statedir = /var/lib/hp 49-hplip_statedir = /var/lib/hp
43+hplip_statedir = ($localstatedir)/lib/hp 50+hplip_statedir = $(localstatedir)/lib/hp
44 dist_hplip_state_DATA = 51 dist_hplip_state_DATA =
45 #dist_hplip_state_DATA = hplip.state 
46  52
47 # Log Files 53 # Log Files
48-hplip_Logdir=/var/log/hp 54-hplip_Logdir=/var/log/hp
49-hplip_tmpdir=/var/log/hp/tmp 55-hplip_tmpdir=/var/log/hp/tmp
50+hplip_Logdir=$(localstatedir)/log/hp 56+hplip_Logdir= $(localstatedir)/log/hp
51+hplip_tmpdir=$(localstatedir)/log/hp/tmp 57+hplip_tmpdir= $(localstatedir)/log/hp/tmp
52  58
53 if FULL_BUILD 59 if FULL_BUILD
54  60
55@@ -372,9 +372,9 @@ endif 61@@ -358,9 +358,9 @@ endif
56  62
57 # PolicyKit 63 # PolicyKit
58 if POLICYKIT_INSTALL 64 if POLICYKIT_INSTALL
59-policykit_dbus_etcdir = /etc/dbus-1/system.d 65-policykit_dbus_etcdir = /etc/dbus-1/system.d
60+policykit_dbus_etcdir = $(sysconfdir)/dbus-1/system.d 66+policykit_dbus_etcdir = $(sysconfdir)/dbus-1/system.d
61 dist_policykit_dbus_etc_DATA = data/policykit/com.hp.hplip.conf 67 dist_policykit_dbus_etc_DATA = data/policykit/com.hp.hplip.conf
62-policykit_dbus_sharedir = /usr/share/dbus-1/system-services 68-policykit_dbus_sharedir = /usr/share/dbus-1/system-services
63+policykit_dbus_sharedir = $(datadir)/dbus-1/system-services 69+policykit_dbus_sharedir = $(datadir)/dbus-1/system-services
64 dist_policykit_dbus_share_DATA = data/policykit/com.hp.hplip.service 70 dist_policykit_dbus_share_DATA = data/policykit/com.hp.hplip.service
65 policykit_policydir = $(policykit_dir) 71 policykit_policydir = $(policykit_dir)
66 dist_policykit_policy_DATA = data/policykit/com.hp.hplip.policy 72 dist_policykit_policy_DATA = data/policykit/com.hp.hplip.policy
67@@ -563,25 +563,17 @@ endif 73@@ -549,25 +549,17 @@ endif
68 install-dist_hplip_LogDATA: 74 install-dist_hplip_LogDATA:
69 if FULL_BUILD 75 if FULL_BUILD
70 test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir) 76 test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
71- chgrp "lp" -R $(DESTDIR)$(hplip_Logdir) 77- chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
72- chmod 775 $(DESTDIR)$(hplip_Logdir) 78- chmod 775 $(DESTDIR)$(hplip_Logdir)
73 endif #FULL_BUILD 79 endif #FULL_BUILD
74 if HPLIP_BUILD 80 if HPLIP_BUILD
75 test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir) 81 test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
76- chgrp "lp" -R $(DESTDIR)$(hplip_Logdir) 82- chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
77- chmod 775 $(DESTDIR)$(hplip_Logdir) 83- chmod 775 $(DESTDIR)$(hplip_Logdir)
78 endif #FULL_BUILD 84 endif #FULL_BUILD
79  85
80 install-dist_hplip_tmpDATA: 86 install-dist_hplip_tmpDATA:
81 if FULL_BUILD 87 if FULL_BUILD
82 test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir) 88 test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
83- chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir) 89- chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
84- chmod 1775 $(DESTDIR)$(hplip_tmpdir) 90- chmod 1775 $(DESTDIR)$(hplip_tmpdir)
85 endif #FULL_BUILD 91 endif #FULL_BUILD
86 if HPLIP_BUILD 92 if HPLIP_BUILD
87 test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir) 93 test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
88- chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir) 94- chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
89- chmod 1775 $(DESTDIR)$(hplip_tmpdir) 95- chmod 1775 $(DESTDIR)$(hplip_tmpdir)
90 endif #FULL_BUILD 96 endif #FULL_BUILD
91  97
92 install-dist_cronDATA:$(dist_cron_DATA) 98 install-dist_cronDATA:$(dist_cron_DATA)
93@@ -600,13 +592,13 @@ install-data-hook: 99@@ -586,13 +578,13 @@ install-data-hook:
94 if HPLIP_BUILD 100 if HPLIP_BUILD
95 # If scanner build, add hpaio entry to sane dll.conf. 101 # If scanner build, add hpaio entry to sane dll.conf.
96 if [ "$(scan_build)" = "yes" ]; then \ 102 if [ "$(scan_build)" = "yes" ]; then \
97- $(mkinstalldirs) $(DESTDIR)/etc/sane.d; \ 103- $(mkinstalldirs) $(DESTDIR)/etc/sane.d; \
98- if [ ! -f $(DESTDIR)/etc/sane.d/dll.conf ]; then \ 104- if [ ! -f $(DESTDIR)/etc/sane.d/dll.conf ]; then \
99- touch $(DESTDIR)/etc/sane.d/dll.conf; \ 105- touch $(DESTDIR)/etc/sane.d/dll.conf; \
100+ $(mkinstalldirs) $(DESTDIR)$(sysconfidir)/sane.d; \ 106+ $(mkinstalldirs) $(DESTDIR)$(sysconfidir)/sane.d; \
101+ if [ ! -f $(DESTDIR)$(sysconfidir)/sane.d/dll.conf ]; then \ 107+ if [ ! -f $(DESTDIR)$(sysconfidir)/sane.d/dll.conf ]; then \
102+ touch $(DESTDIR)$(sysconfidir)/sane.d/dll.conf; \ 108+ touch $(DESTDIR)$(sysconfidir)/sane.d/dll.conf; \
103 fi; \ 109 fi; \
104- if ! grep ^hpaio $(DESTDIR)/etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then \ 110- if ! grep ^hpaio $(DESTDIR)/etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then \
105- echo "Adding hpaio entry to /etc/sane.d/dll.conf." ; \ 111- echo "Adding hpaio entry to /etc/sane.d/dll.conf." ; \
106- echo hpaio >>$(DESTDIR)/etc/sane.d/dll.conf ; \ 112- echo hpaio >>$(DESTDIR)/etc/sane.d/dll.conf ; \