HPLIP 3.12.10a:

    Fixed crash in HP Device Manager and System Tray due to ValueError
    exception in HPLIP upgrade functionality

    1064889 - HP System Tray and Device Manager fails with ValueError exception

HPLIP 3.12.10:

    Added Support for the Following New Printers:
	- HP Deskjet Ink Advantage 2020HC Printer
	- HP Deskjet Ink Advantage 2520HC  All-in-One
	- HP Envy 120 e-All-in-One
	- HP Envy 121 e-All-in-One
	- HP HotSpot LaserJet Pro M1218nfs MFP
	- HP OfficeJet 150 Mobile All-in-One

    Lunchpad fixes:
	1054584 - data/rules/hplip_cron only works with English locale
	1048732 - hp binary plugin installation fails

    Issues fixed:
	- Cannot scan resolution on a Photosmart C6380
	- Device communication error after alignment operation from Toolbox

    Detailed Change Log:
	- Added permission in 'hp-logcapture' tool


HPLIP 3.12.9:

    Significant Changes:
	- Added logcapture tool. User can collect logs by running
	  'hp-logcapture' command for any issue in print/scan/fax functionality

    Added Support for the Following New Printers:
	- HP DeskJet 3510 All-in-One
	- HP DeskJet 3511 e-All-in-One
	- HP DeskJet 3512 e-All-in-One
	- HP DeskJet Ink Advantage 6525 e-All-in-One
	- HP DeskJet Ink Advantage 3515 e-All-in-One
	- HP DeskJet Ink Advantage 3516 e-All-in-One
	- HP LaserJet Pro 200 color MFP M276nw
	- HP LaserJet Pro 200 color MFP M276n
	- HP LaserJet Pro M251nw Color Printer
	- HP LaserJet Pro M251n Color Printer
	- HP Photosmart 7520 e-All-in-One
	- HP Photosmart 7525 e-All-in-One
	- HP Photosmart 6520 e All-in-One
	- HP Photosmart 6525 e All-in-One


    Launchpad fixes:
	452113  - Installing hplip-systray.desktop and hplip.desktop only if gui
		  build is enabled
	482674  - Support for xdg-open in base/utils.py
	889008  - Scanning in grayscale with HP LaserJet Pro M1212nf give wrong
		  aspect ratio image
	932918  - Configure fix for hpcups_only_build
	1012004 - HP LaserJet M1536nf MFP fails to install on Ubuntu 12.04
	1019826 - Failed plugin install for HP_CP_1025nw
	1029052 - WiFi configuration through USB connection is giving I/O error
		  with DeskJet 3050 610a
	1015319 - Scanning with version 3.12.6 results in End Of File error
		  messages
	1032919 - Use consistent EOL markers


    Issues fixed:
	- Device IO error occurs when configuring or perform Scan operation from
	  toolbox with PhotoSmart 6510 Series
	- Secure Printing(Pin to Print) support for LaserJet M9040 Multifunction
	  Printer
	- Economode is not working as expected with LaserJet 2055dn
	- Duplex printing does not happen in Ubuntu 10.04 and Document Viewer
	  not showing the duplex options in all distributions
	- Fixed incorrect PPD picking issue during auto-plugin
	- Fixed WiFi configuration issue for LaserJet 400 M401, LaserJet 400 MFP
	  M425, LaserJet Professional M1217 nfw MFP etc.
	- Plugin Installation UI is not popping up while connecting the plugin
	  supported device via USB with Fedora17 32bit OS
	- Radio button controls in HP Device Manager do not match default
	  settings in Driver's PPD
	- Align functionality is not working with PhotoSmart 6510 Series,
	  DeskJet 2050 J510, DeskJet 3050A J611, OfficeJet 6500 E710
	- Clean job does not work for the second time and throws Device
	  Communication error
	- 'hp-levels' command does not give any details when execute from
	  terminal with OfficeJet 7500 E910, DeskJet 3050A J611 and Envy 100 D410
	- Fixed scan issue with Photosmart Prem C310 series
	- Command 'hp-scan -contrast=<contrast>' does not work in terminal
	- Updated Manual Instructions for Debian OS

    Detailed Change Log:
	- Added Chinese string to accept password during Chinese OS installation
	- Changes done for PrivateTmp feature. Logs get stored in
	  /var/log/hp/tmp

6 files changed, 88 insertions, 36 deletions

diff --git a/print/hplip/Makefile b/print/hplip/Makefile
index c0744e0c331..28853e0be5b 100644
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2012/10/08 23:02:20 adam Exp $
+# $NetBSD: Makefile,v 1.11 2012/11/18 00:50:42 schnoebe Exp $
 #
 
-DISTNAME=		hplip-3.12.6
-PKGREVISION=		5
+DISTNAME=		hplip-3.12.10a
 CATEGORIES=		print
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=hplip/}
 
@@ -72,12 +71,6 @@ REPLACE_PERL=		prnt/filters/hpcac prnt/hpijs/foomatic-rip-hplip
 
 PY_PATCHPLIST=		yes
 
-SUBST_CLASSES+=			strip-cr
-SUBST_STAGE.strip-cr=		post-extract
-SUBST_MESSAGE.strip-cr=		Strip trailing carriage returns
-SUBST_FILES.strip-cr=		prnt/hpcups/HPCupsFilter.cpp
-SUBST_FILTER_CMD.strip-cr=	${TR} -d '\r'
-
 SUBST_CLASSES+=			fix-python
 SUBST_STAGE.fix-python=		post-configure
 SUBST_MESSAGE.fix-python=	Fixing python invocations in Python files.
diff --git a/print/hplip/PLIST.base b/print/hplip/PLIST.base
index a804de8a1a7..9e150d3bf65 100644
--- a/print/hplip/PLIST.base
+++ b/print/hplip/PLIST.base
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.base,v 1.2 2012/06/23 04:50:06 schnoebe Exp $
+@comment $NetBSD: PLIST.base,v 1.3 2012/11/18 00:50:42 schnoebe Exp $
 bin/hp-align
 bin/hp-check
 bin/hp-check-plugin
@@ -14,6 +14,7 @@ bin/hp-firmware
 bin/hp-info
 bin/hp-levels
 bin/hp-linefeedcal
+bin/hp-logcapture
 bin/hp-makecopies
 bin/hp-makeuri
 bin/hp-mkuri
@@ -47,7 +48,6 @@ libexec/cups/filter/hpcups
 libexec/cups/filter/hplipjs
 libexec/cups/filter/hpps
 libexec/cups/filter/pstotiff
-share/applications/hplip.desktop
 share/cups/drv/hp/hpcups.drv
 share/cups/drv/hp/hpijs.drv
 share/cups/model/hplip-ppds
@@ -85,12 +85,12 @@ share/doc/${PKGNAME}/systray.html
 share/doc/${PKGNAME}/troubleshooting.html
 share/doc/${PKGNAME}/uninstalling.html
 share/doc/${PKGNAME}/upgrading.html
+share/examples/hplip/cron.daily/hplip_cron
 share/examples/hplip/hp/hplip.conf
 share/examples/hplip/udev/rules.d/55-hpmud.rules
 share/examples/hplip/udev/rules.d/56-hpmud_add_printer.rules
 share/examples/hplip/udev/rules.d/56-hpmud_support.rules
 share/examples/hplip/udev/rules.d/86-hpmud_plugin.rules
-share/examples/hplip/xdg/autostart/hplip-systray.desktop
 share/hal/fdi/preprobe/10osvendor/20-hplip-devices.fdi
 share/hplip/__init__.py
 share/hplip/__init__.pyc
@@ -226,6 +226,8 @@ share/hplip/levels.py
 share/hplip/levels.pyc
 share/hplip/linefeedcal.py
 share/hplip/linefeedcal.pyc
+share/hplip/logcapture.py
+share/hplip/logcapture.pyc
 share/hplip/makecopies.py
 share/hplip/makecopies.pyc
 share/hplip/makeuri.py
@@ -520,10 +522,14 @@ share/hplip/ppd/HP/hp-deskjet_1600cn-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_1600cn.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_2000_j210_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_2000_j210_series.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_2020_series-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_2020_series.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_2050_j510_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_2050_j510_series.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_2510_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_2510_series.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_2520_series-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_2520_series.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_3000_j310_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_3000_j310_series.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_3050_j610_series-hpijs.ppd.gz
@@ -544,6 +550,8 @@ share/hplip/ppd/HP/hp-deskjet_3450-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_3450.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_3500-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_3500.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_3510_series-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_3510_series.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_3520_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_3520_series.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_3550-hpijs.ppd.gz
@@ -650,6 +658,8 @@ share/hplip/ppd/HP/hp-deskjet_648c-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_648c.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_6500-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_6500.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_6520_series-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_6520_series.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_656c-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_656c.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_660-hpijs.ppd.gz
@@ -836,6 +846,8 @@ share/hplip/ppd/HP/hp-envy_100_d410_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-envy_100_d410_series.ppd.gz
 share/hplip/ppd/HP/hp-envy_110_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-envy_110_series.ppd.gz
+share/hplip/ppd/HP/hp-envy_120_series-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-envy_120_series.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_1000-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_1000.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_1005_series-hpijs.ppd.gz
@@ -911,7 +923,9 @@ share/hplip/ppd/HP/hp-laserjet_1320nw.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_1320tn-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_1320tn-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_1320tn.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_200_color_m251-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_200_colormfp_m275-ps.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_200_colormfp_m276-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_2100-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_2100-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_2100.ppd.gz
@@ -1040,7 +1054,9 @@ share/hplip/ppd/HP/hp-laserjet_5000_series-hpijs-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_5000_series-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_5000_series-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_500_color_m551-ps.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_500_color_mfp_m570-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_500_color_mfp_m575-ps.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_500_mfp_m521-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_500_mfp_m525-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_5100_series-hpijs-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_5100_series-pcl3.ppd.gz
@@ -1077,6 +1093,8 @@ share/hplip/ppd/HP/hp-laserjet_6mp-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_6p-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_6p-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_6p.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_700_color_mfp_m775-ps.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_700_m712-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_8000-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_8000-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_8000.ppd.gz
@@ -1135,6 +1153,7 @@ share/hplip/ppd/HP/hp-laserjet_cm1417fnw-hpijs-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_cm1417fnw-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_cm1418fnw-hpijs-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_cm1418fnw-pcl3.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_color_flow_mfp_m575-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_cp1025-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_cp1025.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_cp1025nw-hpijs.ppd.gz
@@ -1144,6 +1163,7 @@ share/hplip/ppd/HP/hp-laserjet_cp_1025-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_cp_1025.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_cp_1025nw-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_cp_1025nw.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_flow_mfp_m525-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_m1005-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_m1005.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_m1120_mfp-hpijs.ppd.gz
@@ -1158,8 +1178,6 @@ share/hplip/ppd/HP/hp-laserjet_m1522nf_mfp-hpijs-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_m1522nf_mfp-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_m1522nf_mfp-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_m1530_mfp_series-ps.ppd.gz
-share/hplip/ppd/HP/hp-laserjet_m1536dnf_mfp-hpijs-pcl3.ppd.gz
-share/hplip/ppd/HP/hp-laserjet_m1536dnf_mfp-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_m1537dnf_mfp-hpijs-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_m1537dnf_mfp-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_m1538dnf_mfp-hpijs-pcl3.ppd.gz
@@ -1307,8 +1325,16 @@ share/hplip/ppd/HP/hp-laserjet_professional_m1216nfh_mfp-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_professional_m1216nfh_mfp.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_professional_m1217nfw_mfp-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_professional_m1217nfw_mfp.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_professional_m1218nfg_mfp-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_professional_m1218nfg_mfp.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_professional_m1218nfs_mfp-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_professional_m1218nfs_mfp.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_professional_m1219nf_mfp-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_professional_m1219nf_mfp.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_professional_m1219nfg_mfp-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_professional_m1219nfg_mfp.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_professional_m1219nfs_mfp-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_professional_m1219nfs_mfp.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_professional_p1102-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_professional_p1102.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_professional_p1102w-hpijs.ppd.gz
@@ -1359,6 +1385,8 @@ share/hplip/ppd/HP/hp-officejet-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-officejet.ppd.gz
 share/hplip/ppd/HP/hp-officejet_100_mobile_l411-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-officejet_100_mobile_l411.ppd.gz
+share/hplip/ppd/HP/hp-officejet_150_mobile_l511-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-officejet_150_mobile_l511.ppd.gz
 share/hplip/ppd/HP/hp-officejet_4000_k210-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-officejet_4000_k210.ppd.gz
 share/hplip/ppd/HP/hp-officejet_4100_series-hpijs.ppd.gz
@@ -1487,6 +1515,11 @@ share/hplip/ppd/HP/hp-officejet_pro_1150c-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-officejet_pro_1150c.ppd.gz
 share/hplip/ppd/HP/hp-officejet_pro_1170c_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-officejet_pro_1170c_series.ppd.gz
+share/hplip/ppd/HP/hp-officejet_pro_251dw_printer-ps.ppd.gz
+share/hplip/ppd/HP/hp-officejet_pro_276dw_mfp-ps.ppd.gz
+share/hplip/ppd/HP/hp-officejet_pro_451_series-ps.ppd.gz
+share/hplip/ppd/HP/hp-officejet_pro_476_576_series-ps.ppd.gz
+share/hplip/ppd/HP/hp-officejet_pro_551_series-ps.ppd.gz
 share/hplip/ppd/HP/hp-officejet_pro_8000_a809-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-officejet_pro_8000_a809.ppd.gz
 share/hplip/ppd/HP/hp-officejet_pro_8000_enterprise_a811a-ps.ppd.gz
@@ -1628,6 +1661,8 @@ share/hplip/ppd/HP/hp-photosmart_5520_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-photosmart_5520_series.ppd.gz
 share/hplip/ppd/HP/hp-photosmart_6510_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-photosmart_6510_series.ppd.gz
+share/hplip/ppd/HP/hp-photosmart_6520_series-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-photosmart_6520_series.ppd.gz
 share/hplip/ppd/HP/hp-photosmart_7150-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-photosmart_7150.ppd.gz
 share/hplip/ppd/HP/hp-photosmart_7200_series-hpijs.ppd.gz
@@ -1640,6 +1675,8 @@ share/hplip/ppd/HP/hp-photosmart_7400_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-photosmart_7400_series.ppd.gz
 share/hplip/ppd/HP/hp-photosmart_7510_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-photosmart_7510_series.ppd.gz
+share/hplip/ppd/HP/hp-photosmart_7520_series-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-photosmart_7520_series.ppd.gz
 share/hplip/ppd/HP/hp-photosmart_7550-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-photosmart_7550.ppd.gz
 share/hplip/ppd/HP/hp-photosmart_7600_series-hpijs.ppd.gz
@@ -1891,3 +1928,4 @@ share/hplip/upgrade.pyc
 share/hplip/wificonfig.py
 share/hplip/wificonfig.pyc
 @pkgdir share/examples/hplip/log/hp
+@pkgdir share/examples/hplip/log/hp/tmp
diff --git a/print/hplip/PLIST.gui b/print/hplip/PLIST.gui
index 1b1c5b09c26..109063262e2 100644
--- a/print/hplip/PLIST.gui
+++ b/print/hplip/PLIST.gui
@@ -1,8 +1,10 @@
-@comment $NetBSD: PLIST.gui,v 1.1.1.1 2012/05/18 03:03:22 schnoebe Exp $
+@comment $NetBSD: PLIST.gui,v 1.2 2012/11/18 00:50:42 schnoebe Exp $
 bin/hp-toolbox
 share/PolicyKit/policy/com.hp.hplip.policy
+share/applications/hplip.desktop
 share/dbus-1/system-services/com.hp.hplip.service
 share/examples/hplip/dbus-1/system.d/com.hp.hplip.conf
+share/examples/hplip/xdg/autostart/hplip-systray.desktop
 share/hplip/data/images/128x128/audio.png
 share/hplip/data/images/128x128/bmp.png
 share/hplip/data/images/128x128/gif.png
diff --git a/print/hplip/PLIST.scan b/print/hplip/PLIST.scan
index af50062c81f..c54c58bbbd0 100644
--- a/print/hplip/PLIST.scan
+++ b/print/hplip/PLIST.scan
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST.scan,v 1.1.1.1 2012/05/18 03:03:22 schnoebe Exp $
+@comment $NetBSD: PLIST.scan,v 1.2 2012/11/18 00:50:42 schnoebe Exp $
 ${PYSITELIB}/scanext.la
 lib/sane/libsane-hpaio.la
-share/examples/hplip/sane.d/dll.conf
 share/hplip/scan/__init__.py
 share/hplip/scan/__init__.pyc
 share/hplip/scan/sane.py
diff --git a/print/hplip/distinfo b/print/hplip/distinfo
index a41592b1aa0..94f045ec776 100644
--- a/print/hplip/distinfo
+++ b/print/hplip/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.2 2012/06/23 04:50:06 schnoebe Exp $
+$NetBSD: distinfo,v 1.3 2012/11/18 00:50:42 schnoebe Exp $
 
-SHA1 (hplip-3.12.6.tar.gz) = f3d7f66fb5eff2158ac42bb5a115f8ef8bd7a383
-RMD160 (hplip-3.12.6.tar.gz) = 521dffcf8b777d1f51908d771b2636ba95bca880
-Size (hplip-3.12.6.tar.gz) = 21227044 bytes
+SHA1 (hplip-3.12.10a.tar.gz) = 4a0710ed15350b5f70cb2dcd38b5bf53fd6f31e6
+RMD160 (hplip-3.12.10a.tar.gz) = 1141dc59b41df65d6e2694d1c611ab97064f283a
+Size (hplip-3.12.10a.tar.gz) = 21827613 bytes
 SHA1 (patch-aa) = bad4a3a9570d9bbd1e0fe226b625f1ddc3f31b8c
 SHA1 (patch-ab) = ce2775ef74746aefd942bda49c4e548f7c771ff5
 SHA1 (patch-ad) = 468fbf167e1f20bb8617e444977969e46b19f3be
-SHA1 (patch-ae) = 772b37365927e462408c123fa1642c86f762a477
+SHA1 (patch-ae) = 556beb7afe1983c8112f0bf3d275f00c21f09db7
 SHA1 (patch-io_hpmud_musb.h) = ad634f5a1f426877e1c88916b6468fcdb7598555
 SHA1 (patch-io_hpmud_pml.c) = 9bd341140afbc9ddb8eb8dff7eee05365231f94f
 SHA1 (patch-prnt_hpijs_context2.cpp) = f81148c1c334a9074453b27ac055833cd1669bd0
diff --git a/print/hplip/patches/patch-ae b/print/hplip/patches/patch-ae
index 62af801dc49..cf960d9f71f 100644
--- a/print/hplip/patches/patch-ae
+++ b/print/hplip/patches/patch-ae
@@ -1,22 +1,27 @@
-$NetBSD: patch-ae,v 1.2 2012/06/23 04:50:07 schnoebe Exp $
+$NetBSD: patch-ae,v 1.3 2012/11/18 00:50:42 schnoebe Exp $
 
 # Conform to autoconf's standard variable usage, making it easier
 # to install on pkgsrc platforms
 
 # reported upstream as https://bugs.launchpad.net/hplip/+bug/726218
 
---- Makefile.am.orig	2012-06-05 09:30:18.000000000 +0000
+--- Makefile.am.orig	2012-10-10 06:14:21.000000000 +0000
 +++ Makefile.am
-@@ -107,7 +107,7 @@ hp_mkuri_LDADD = -ldl libhpmud.la
+@@ -107,11 +107,11 @@ hp_mkuri_LDADD = -ldl libhpmud.la
  hp_mkuri_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\"
  
+ # cron files
+-crondir = /etc/cron.daily
++crondir = $(sysconfdir)/cron.daily
+ dist_cron_DATA = data/rules/hplip_cron
+ 
  # hpmud.rules
 -rulesdir = /etc/udev/rules.d
 +rulesdir = $(sysconfdir)/udev/rules.d
  if UDEV_SYSFS_RULES
  dist_rules_DATA = data/rules/56-hpmud_support_sysfs.rules
  dist_rules_DATA += data/rules/86-hpmud_plugin_sysfs.rules
-@@ -127,11 +127,11 @@ else
+@@ -131,11 +131,11 @@ else
  dist_rules_DATA += data/rules/55-hpmud.rules
  endif
  endif
@@ -30,7 +35,7 @@ $NetBSD: patch-ae,v 1.2 2012/06/23 04:50:07 schnoebe Exp $
  hplip_conf_DATA = hplip.conf
  
  #pstotiff filter
-@@ -139,12 +139,12 @@ pstotiffdir = $(cupsfilterdir)
+@@ -143,13 +143,13 @@ pstotiffdir = $(cupsfilterdir)
  pstotiff_SCRIPTS = fax/filters/pstotiff
  
  # hplip.state
@@ -41,11 +46,13 @@ $NetBSD: patch-ae,v 1.2 2012/06/23 04:50:07 schnoebe Exp $
  
  # Log Files
 -hplip_Logdir=/var/log/hp
+-hplip_tmpdir=/var/log/hp/tmp
 +hplip_Logdir=$(localstatedir)/log/hp
++hplip_tmpdir=$(localstatedir)/log/hp/tmp
  
  if FULL_BUILD
  
-@@ -359,9 +359,9 @@ endif
+@@ -365,9 +365,9 @@ endif
  
  # PolicyKit
  if POLICYKIT_INSTALL
@@ -57,7 +64,7 @@ $NetBSD: patch-ae,v 1.2 2012/06/23 04:50:07 schnoebe Exp $
  dist_policykit_dbus_share_DATA = data/policykit/com.hp.hplip.service
  policykit_policydir = $(policykit_dir)
  dist_policykit_policy_DATA = data/policykit/com.hp.hplip.policy
-@@ -543,26 +543,22 @@ endif
+@@ -552,25 +552,17 @@ endif
  install-dist_hplip_LogDATA:
  if FULL_BUILD
  	test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
@@ -70,23 +77,36 @@ $NetBSD: patch-ae,v 1.2 2012/06/23 04:50:07 schnoebe Exp $
 -	chmod 774 $(DESTDIR)$(hplip_Logdir)
  endif	#FULL_BUILD
  
- install-data-hook:
+ install-dist_hplip_tmpDATA:
+ if FULL_BUILD
+ 	test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
+-	chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
+-	chmod 1774 $(DESTDIR)$(hplip_tmpdir)
+ endif	#FULL_BUILD
+ if HPLIP_BUILD
+ 	test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
+-	chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
+-	chmod 1774 $(DESTDIR)$(hplip_tmpdir)
+ endif	#FULL_BUILD
+ 
+ install-dist_cronDATA:$(dist_cron_DATA)
+@@ -589,13 +581,13 @@ install-data-hook:
  if HPLIP_BUILD
  #	   If scanner build, add hpaio entry to sane dll.conf.
  	if [ "$(scan_build)" = "yes" ]; then \
 -	   $(mkinstalldirs) $(DESTDIR)/etc/sane.d; \
 -	   if [ ! -f $(DESTDIR)/etc/sane.d/dll.conf ]; then \
 -		  touch $(DESTDIR)/etc/sane.d/dll.conf; \
-+	   $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/sane.d; \
-+	   if [ ! -f $(DESTDIR)$(sysconfdir)/sane.d/dll.conf ]; then \
-+		  touch $(DESTDIR)$(sysconfdir)/sane.d/dll.conf; \
++	   $(mkinstalldirs) $(DESTDIR)$(sysconfidir)/sane.d; \
++	   if [ ! -f $(DESTDIR)$(sysconfidir)/sane.d/dll.conf ]; then \
++		  touch $(DESTDIR)$(sysconfidir)/sane.d/dll.conf; \
  	   fi; \
 -	   if ! grep ^hpaio $(DESTDIR)/etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then \
 -		  echo "Adding hpaio entry to /etc/sane.d/dll.conf." ; \
 -		  echo hpaio >>$(DESTDIR)/etc/sane.d/dll.conf ; \
-+	   if ! grep ^hpaio $(DESTDIR)$(sysconfdir)/sane.d/dll.conf >/dev/null 2>/dev/null ; then \
-+		  echo "Adding hpaio entry to $(sysconfdir)/sane.d/dll.conf." ; \
-+		  echo hpaio >>$(DESTDIR)$(sysconfdir)/sane.d/dll.conf ; \
++	   if ! grep ^hpaio $(DESTDIR)$(sysconfidir)/sane.d/dll.conf >/dev/null 2>/dev/null ; then \
++		  echo "Adding hpaio entry to $(sysconfidir)/sane.d/dll.conf." ; \
++		  echo hpaio >>$(DESTDIR)$(sysconfidir)/sane.d/dll.conf ; \
  	   fi \
  	fi
  if FULL_BUILD