pkgsrc specific:

    Update to 3.12.6
    PR pkgsrc/46475
	remove use of strnlen to support building on older platforms
	that do not support the function.

Changelog/Release Notes:
Significant Changes:
  - 'hp-check' tool when run with "--fix" option resolves missing
    dependencies/groups/plugin and disable SELinux
  - Added PIN to PRINT support for HP Color LaserJet CM4540 MFP
  - libusb-1.0 support added

Added Support for the Following New Printers:
  - HP DeskJet Ink Advantage 2510 All-in-One Series
  - HP DeskJet Ink Advantage 3525 e-All-in-One
  - HP DeskJet Ink Advantage 4610 All-in-One Series
  - HP DeskJet Ink Advantage 4620 e-All-in-One Series
  - HP DeskJet Ink Advantage 5525 e-All-in-One
  - HP DeskJet 2510 All-in-One Series
  - HP DeskJet 3520 e-All-in-One Series
  - HP OfficeJet 4610 All-in-One Series
  - HP OfficeJet 4620 e-All-in-One Series
  - HP Photosmart 5520 e-All-in-One Series
  - HP LaserJet 400 M401
  - HP LaserJet 400 MFP M425 Series
  - HP LaserJet Enterprise 500 MFP M525 Series
  - HP LaserJet Enterprise 500 Color MFP M575 Series
  - HP LaserJet Professional P 1102w Printer
  - HP LaserJet Professional P1107w Printer
  - HP LaserJet Professional P1107 Printer
  - HP LaserJet Professional P1109w Printer
  - HP LaserJet Professional P1109 Printer
  - HP LaserJet Professional M1137 MFP
  - HP LaserJet Professional M1138 MFP
  - HP LaserJet Professional M1139 MFP
  - HP LaserJet Professional P1567
  - HP LaserJet Professional P1568
  - HP LaserJet Professional P1569
  - HP LaserJet Professional P1607dn Printer
  - HP LaserJet Professional P1608dn Printer
  - HP LaserJet Professional P1609dn Printer

Launchpad fixes:
  1007836 - Log files from Print to Photo Tray attempt, not working

Issues fixed:
  - HPLIP installation hangs at "Remove and Install" on Fedora 16 64bit OS
  - Supplies information was not getting refreshed unless hp-toolbox was
    re-launched
  - Fix for multiple queues configured warning message
  - Added dynamic cartridge part number display support for LEDM devices
  - Enabled Low ink alert message display for LEDM devices

Detailed Change Log:
  - libusb-1.0 support added
  - cleaned up hp-upgrade zombie processes
  - Added auto refresh in hp-systray when new device added or removed
    using hp-toolbox
  - Fixed the issue of Dbus install failure centOS 6
  - Removed obsolete ftime function and added gettimeofday
  - Added the hplipjs filter in the hplip.list.in file to include this
    filter in the RHEL5 & RHEL6 for PIN to PRINT
  - SELinux disable supported in hp-check --fix
  - Added Wget as dependency in HPLIP build

9 files changed, 146 insertions, 62 deletions

diff --git a/print/hplip/Makefile b/print/hplip/Makefile
index 8b62e20cb1a..2161e52d66f 100644
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2012/06/14 07:43:46 sbd Exp $
+# $NetBSD: Makefile,v 1.4 2012/06/23 04:50:06 schnoebe Exp $
 #
 
-DISTNAME=		hplip-3.12.4
-PKGREVISION=		1
+DISTNAME=		hplip-3.12.6
 CATEGORIES=		print
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=hplip/}
 
@@ -184,7 +183,7 @@ post-install:
 .include "../../net/net-snmp/buildlink3.mk"
 .include "../../print/cups/buildlink3.mk"
 .include "../../print/ghostscript/buildlink3.mk"
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../devel/libusb1/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/py-xml/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/print/hplip/PLIST.base b/print/hplip/PLIST.base
index 978a2e89f51..a804de8a1a7 100644
--- a/print/hplip/PLIST.base
+++ b/print/hplip/PLIST.base
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.base,v 1.1.1.1 2012/05/18 03:03:22 schnoebe Exp $
+@comment $NetBSD: PLIST.base,v 1.2 2012/06/23 04:50:06 schnoebe Exp $
 bin/hp-align
 bin/hp-check
 bin/hp-check-plugin
@@ -522,6 +522,8 @@ 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_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_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
@@ -542,6 +544,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_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
 share/hplip/ppd/HP/hp-deskjet_3550.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_3600-hpijs.ppd.gz
@@ -578,6 +582,10 @@ share/hplip/ppd/HP/hp-deskjet_400l-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_400l.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_460-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_460.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_4610_series-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_4610_series.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_4620_series-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_4620_series.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_500-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_500.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_500c-hpijs.ppd.gz
@@ -596,6 +604,8 @@ share/hplip/ppd/HP/hp-deskjet_5400_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_5400_series.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_550c-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_550c.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_5520_series-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_5520_series.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_5550-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_5550.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_5551-hpijs.ppd.gz
@@ -974,6 +984,9 @@ share/hplip/ppd/HP/hp-laserjet_4-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_4000_series-hpijs-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_4000_series-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_4000_series-ps.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_400_m401-ps.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_400_m401d-ps.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_400_mfp_m425-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_4050_series-hpijs-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_4050_series-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_4050_series-ps.ppd.gz
@@ -1027,6 +1040,8 @@ 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_m575-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
 share/hplip/ppd/HP/hp-laserjet_5100_series-ps.ppd.gz
@@ -1276,6 +1291,12 @@ share/hplip/ppd/HP/hp-laserjet_professional_m1132_mfp-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_professional_m1132_mfp.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_professional_m1136_mfp-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_professional_m1136_mfp.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_professional_m1137_mfp-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_professional_m1137_mfp.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_professional_m1138_mfp-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_professional_m1138_mfp.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_professional_m1139_mfp-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_professional_m1139_mfp.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_professional_m1212nf_mfp-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_professional_m1212nf_mfp.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_professional_m1213nf_mfp-hpijs.ppd.gz
@@ -1294,12 +1315,36 @@ share/hplip/ppd/HP/hp-laserjet_professional_p1102w-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_professional_p1102w.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_professional_p1106-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_professional_p1106.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_professional_p1106w-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_professional_p1106w.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_professional_p1107-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_professional_p1107.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_professional_p1107w-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_professional_p1107w.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_professional_p1108-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_professional_p1108.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_professional_p1108w-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_professional_p1108w.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_professional_p1109-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_professional_p1109.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_professional_p1109w-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_professional_p1109w.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_professional_p1566-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_professional_p1566.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_professional_p1567-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_professional_p1567.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_professional_p1568-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_professional_p1568.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_professional_p1569-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_professional_p1569.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_professional_p1606dn-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_professional_p1606dn.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_professional_p1607dn-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_professional_p1607dn.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_professional_p1608dn-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_professional_p1608dn.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_professional_p1609dn-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_professional_p1609dn.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_professional_p_1102w-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_professional_p_1102w.ppd.gz
 share/hplip/ppd/HP/hp-lj_300_400_color_m351_m451-ps.ppd.gz
@@ -1338,6 +1383,10 @@ share/hplip/ppd/HP/hp-officejet_4500_g510n-z-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-officejet_4500_g510n-z.ppd.gz
 share/hplip/ppd/HP/hp-officejet_4500_k710-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-officejet_4500_k710.ppd.gz
+share/hplip/ppd/HP/hp-officejet_4610_series-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-officejet_4610_series.ppd.gz
+share/hplip/ppd/HP/hp-officejet_4620_series-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-officejet_4620_series.ppd.gz
 share/hplip/ppd/HP/hp-officejet_5100_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-officejet_5100_series.ppd.gz
 share/hplip/ppd/HP/hp-officejet_5105-hpijs.ppd.gz
@@ -1575,6 +1624,8 @@ share/hplip/ppd/HP/hp-photosmart_5510_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-photosmart_5510_series.ppd.gz
 share/hplip/ppd/HP/hp-photosmart_5510d_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-photosmart_5510d_series.ppd.gz
+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_7150-hpijs.ppd.gz
diff --git a/print/hplip/distinfo b/print/hplip/distinfo
index 29914d0407d..a41592b1aa0 100644
--- a/print/hplip/distinfo
+++ b/print/hplip/distinfo
@@ -1,12 +1,14 @@
-$NetBSD: distinfo,v 1.1.1.1 2012/05/18 03:03:20 schnoebe Exp $
+$NetBSD: distinfo,v 1.2 2012/06/23 04:50:06 schnoebe Exp $
 
-SHA1 (hplip-3.12.4.tar.gz) = 6c095321fac3a06c508531e193dcdd83c30ea99b
-RMD160 (hplip-3.12.4.tar.gz) = 616d23a39db65d1590e6cbd821f130a53c2743c2
-Size (hplip-3.12.4.tar.gz) = 20603723 bytes
-SHA1 (patch-aa) = 6487ae3ccfd73d40e7f48e9d65f165d2e283056a
+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 (patch-aa) = bad4a3a9570d9bbd1e0fe226b625f1ddc3f31b8c
 SHA1 (patch-ab) = ce2775ef74746aefd942bda49c4e548f7c771ff5
-SHA1 (patch-ac) = 82e2951ec3edf44dd78dae9ac6abb307eb60b9fc
 SHA1 (patch-ad) = 468fbf167e1f20bb8617e444977969e46b19f3be
-SHA1 (patch-ae) = 39138102e490f32045f361b2a8d66d7a6598e520
+SHA1 (patch-ae) = 772b37365927e462408c123fa1642c86f762a477
+SHA1 (patch-io_hpmud_musb.h) = ad634f5a1f426877e1c88916b6468fcdb7598555
 SHA1 (patch-io_hpmud_pml.c) = 9bd341140afbc9ddb8eb8dff7eee05365231f94f
+SHA1 (patch-prnt_hpijs_context2.cpp) = f81148c1c334a9074453b27ac055833cd1669bd0
+SHA1 (patch-prnt_hpijs_hjzjscolor.cpp) = 5ca9c828ba4aff17a54a803d79c2dc169975d50c
 SHA1 (patch-scan.py) = 3db0f55a915812fa9535fcf1fa2eaebd9daa93e3
diff --git a/print/hplip/patches/patch-aa b/print/hplip/patches/patch-aa
index 92c5ee06174..efd20a3f2c3 100644
--- a/print/hplip/patches/patch-aa
+++ b/print/hplip/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.1.1.1 2012/05/18 03:03:22 schnoebe Exp $
+$NetBSD: patch-aa,v 1.2 2012/06/23 04:50:07 schnoebe Exp $
 
 # lots of portability changes to configure.in, removing hard-coded paths
 # and pulling in the dynamic library loading modules..
 
 # pushed upstream as https://bugs.launchpad.net/hplip/+bug/726207
 
---- configure.in.orig	2010-07-19 02:18:37.000000000 +0000
+--- configure.in.orig	2012-06-05 09:32:41.000000000 +0000
 +++ configure.in
 @@ -34,14 +34,15 @@ AC_DISABLE_STATIC
  # Checks for programs.
@@ -24,9 +24,9 @@ $NetBSD: patch-aa,v 1.1.1.1 2012/05/18 03:03:22 schnoebe Exp $
  
  # Checks for required header files.
  AC_CHECK_HEADERS(pthread.h,, [AC_MSG_ERROR([cannot find pthread-devel support], 7)])
-@@ -301,25 +302,25 @@ else
+@@ -324,25 +325,25 @@ else
  fi
- AM_CONDITIONAL(SHADOW_BUILD, test x$shadow_build = xyes)
+ AM_CONDITIONAL(LIBUSB01_BUILD, test x$libusb01_build = xyes)
  
 -AC_ARG_WITH(cupsbackenddir, AC_HELP_STRING([--with-cupsbackenddir=DIR], [set cups backend install directory [default=/usr/lib/cups/backend]]),
 -   cupsbackenddir=$withval, cupsbackenddir="/usr/lib/cups/backend")
@@ -57,11 +57,11 @@ $NetBSD: patch-aa,v 1.1.1.1 2012/05/18 03:03:22 schnoebe Exp $
 +   abs_mimedir="$datadir/cups/mime/"
  else
 -   abs_mimedir="/etc/cups/"
-+   abs_mimedir="$sysconfdir/cups/"
++   abs_mimedir="$sysconfdir/etc/cups/"
  fi
  AC_ARG_WITH(mimedir, AC_HELP_STRING([--with-mimedir=DIR], [set cups mime.types location [default=abs_mimedir]]),
     mimedir=$withval, mimedir="$abs_mimedir")
-@@ -446,12 +447,12 @@ AM_CONDITIONAL(POLICYKIT_INSTALL, test x
+@@ -469,12 +470,12 @@ AM_CONDITIONAL(POLICYKIT_INSTALL, test x
  
  # Determine where the PolicyKit policy file goes
  if test "$policykit" = "yes"; then
@@ -79,7 +79,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2012/05/18 03:03:22 schnoebe Exp $
     fi
  else
     policykit_dir=
-@@ -551,6 +552,7 @@ AC_DEFINE_DIR([abs_datadir], [datadir])
+@@ -579,6 +580,7 @@ AC_DEFINE_DIR([abs_datadir], [datadir])
  AC_DEFINE_DIR([abs_sbindir], [sbindir])
  AC_DEFINE_DIR([abs_hpppddir], [hpppddir])
  AC_DEFINE_DIR([abs_docdir], [hpdocdir])
@@ -87,7 +87,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2012/05/18 03:03:22 schnoebe Exp $
  abs_ppddir=${abs_hpppddir%/*}
  AC_DEFINE_DIR([abs_drvdir], [drvdir])
  
-@@ -558,6 +560,7 @@ AC_SUBST(abs_datadir) 
+@@ -586,6 +588,7 @@ AC_SUBST(abs_datadir) 
  AC_SUBST(abs_sbindir) 
  AC_SUBST(abs_hpppddir) 
  AC_SUBST(abs_docdir) 
diff --git a/print/hplip/patches/patch-ac b/print/hplip/patches/patch-ac
deleted file mode 100644
index 92f094a4381..00000000000
--- a/print/hplip/patches/patch-ac
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2012/05/18 03:03:22 schnoebe Exp $
-
-# reported upstream as https://bugs.launchpad.net/hplip/+bug/726210
-
---- prnt/hpcups/HPCupsFilter.cpp.orig	2010-07-19 02:14:09.000000000 +0000
-+++ prnt/hpcups/HPCupsFilter.cpp
-@@ -33,7 +33,6 @@
- #include <sys/wait.h>
- #include <sys/utsname.h>
- #include <time.h>
--#include <sys/timeb.h>
- 
- #define HP_FILE_VERSION_STR    "03.09.08.0"
- 
-@@ -433,13 +432,13 @@ int HPCupsFilter::StartPrintJob(int  arg
- 
-     memset(&m_JA, 0, sizeof(JobAttributes));
-     struct    tm       *t;
--    struct    timeb    tb;
-+    struct    timeval  tv;
-     time_t             long_time;
-     time(&long_time);
-     t = localtime(&long_time);
--    ftime(&tb);
-+    gettimeofday(&tv, NULL);
-     strncpy(m_JA.job_start_time, asctime(t), sizeof(m_JA.job_start_time)-1);    // returns Fri Jun  5 08:12:16 2009
--    snprintf(m_JA.job_start_time+19, sizeof(m_JA.job_start_time) - 20, ":%d %d", tb.millitm, t->tm_year + 1900); // add milliseconds
-+    snprintf(m_JA.job_start_time+19, sizeof(m_JA.job_start_time) - 20, ":%d %d", tv.tv_usec / 1000, t->tm_year + 1900); // add milliseconds
- 
-     getLogLevel();
-     m_JA.job_id = atoi(argv[1]);
diff --git a/print/hplip/patches/patch-ae b/print/hplip/patches/patch-ae
index adc0a73c4c0..62af801dc49 100644
--- a/print/hplip/patches/patch-ae
+++ b/print/hplip/patches/patch-ae
@@ -1,25 +1,25 @@
-$NetBSD: patch-ae,v 1.1.1.1 2012/05/18 03:03:22 schnoebe Exp $
+$NetBSD: patch-ae,v 1.2 2012/06/23 04:50:07 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-04-10 08:35:14.000000000 +0000
+--- Makefile.am.orig	2012-06-05 09:30:18.000000000 +0000
 +++ Makefile.am
-@@ -91,7 +91,7 @@ hp_mkuri_LDADD = -ldl libhpmud.la
+@@ -107,7 +107,7 @@ hp_mkuri_LDADD = -ldl libhpmud.la
  hp_mkuri_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\"
  
  # hpmud.rules
 -rulesdir = /etc/udev/rules.d
 +rulesdir = $(sysconfdir)/udev/rules.d
- dist_rules_DATA = data/rules/56-hpmud_support.rules
- dist_rules_DATA += data/rules/86-hpmud_plugin.rules
- dist_rules_DATA += data/rules/56-hpmud_add_printer.rules
-@@ -100,11 +100,11 @@ dist_rules_DATA += data/rules/40-hplip.r
- else
+ 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
  dist_rules_DATA += data/rules/55-hpmud.rules
  endif
+ endif
 -halpredir = /usr/share/hal/fdi/preprobe/10osvendor
 +halpredir = $(datadir)/hal/fdi/preprobe/10osvendor
  dist_halpre_DATA = data/rules/20-hplip-devices.fdi
@@ -30,7 +30,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2012/05/18 03:03:22 schnoebe Exp $
  hplip_conf_DATA = hplip.conf
  
  #pstotiff filter
-@@ -112,12 +112,12 @@ pstotiffdir = $(cupsfilterdir)
+@@ -139,12 +139,12 @@ pstotiffdir = $(cupsfilterdir)
  pstotiff_SCRIPTS = fax/filters/pstotiff
  
  # hplip.state
@@ -45,7 +45,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2012/05/18 03:03:22 schnoebe Exp $
  
  if FULL_BUILD
  
-@@ -326,9 +326,9 @@ endif
+@@ -359,9 +359,9 @@ endif
  
  # PolicyKit
  if POLICYKIT_INSTALL
@@ -57,7 +57,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2012/05/18 03:03:22 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
-@@ -509,26 +509,22 @@ endif
+@@ -543,26 +543,22 @@ endif
  install-dist_hplip_LogDATA:
  if FULL_BUILD
  	test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
diff --git a/print/hplip/patches/patch-io_hpmud_musb.h b/print/hplip/patches/patch-io_hpmud_musb.h
new file mode 100644
index 00000000000..2dca8a17877
--- /dev/null
+++ b/print/hplip/patches/patch-io_hpmud_musb.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-io_hpmud_musb.h,v 1.1 2012/06/23 04:50:07 schnoebe Exp $
+
+handle libusb 1.0 being installed in a subdir in pkgsrc
+
+--- io/hpmud/musb.h.orig	2012-06-05 09:30:15.000000000 +0000
++++ io/hpmud/musb.h
+@@ -30,7 +30,7 @@
+ #ifdef HAVE_LIBUSB01
+ #include <usb.h>
+ #else
+-#include <libusb.h>
++#include <libusb-1.0/libusb.h>
+ #endif
+ 
+ #include "hpmud.h"
diff --git a/print/hplip/patches/patch-prnt_hpijs_context2.cpp b/print/hplip/patches/patch-prnt_hpijs_context2.cpp
new file mode 100644
index 00000000000..df62b63cbf4
--- /dev/null
+++ b/print/hplip/patches/patch-prnt_hpijs_context2.cpp
@@ -0,0 +1,23 @@
+$NetBSD: patch-prnt_hpijs_context2.cpp,v 1.1 2012/06/23 04:50:07 schnoebe Exp $
+
+use strlen(3) instead of strnlen(3), for use on NetBSD 4.0 and earlier
+as well as other systems that don't have strnlen.
+
+Ideally, the configure script would check for strnlen, and include a
+replacement  implementation if required.
+
+--- prnt/hpijs/context2.cpp.orig	2012-06-05 09:27:40.000000000 +0000
++++ prnt/hpijs/context2.cpp
+@@ -1299,7 +1299,11 @@ DRIVER_ERROR PrintContext::SelectDevice
+     {
+         return UNSUPPORTED_PRINTER;
+     }
+-	if(0 == strnlen((const char *)pSS->strDevID, DevIDBuffSize))
++
++	/* make sure a trailing zero/null exists in the string */
++	pSS->strDevID[(DevIDBuffSize - 1)] = 0;
++
++	if(0 == strlen((const char *)pSS->strDevID))
+ 	{
+ 		strncpy((char *)pSS->strDevID,szDeviceId,DevIDBuffSize);
+ 	}
diff --git a/print/hplip/patches/patch-prnt_hpijs_hjzjscolor.cpp b/print/hplip/patches/patch-prnt_hpijs_hjzjscolor.cpp
new file mode 100644
index 00000000000..47a8e48c62b
--- /dev/null
+++ b/print/hplip/patches/patch-prnt_hpijs_hjzjscolor.cpp
@@ -0,0 +1,25 @@
+$NetBSD: patch-prnt_hpijs_hjzjscolor.cpp,v 1.1 2012/06/23 04:50:07 schnoebe Exp $
+
+use strlen(3) instead of strnlen(3), for use on NetBSD 4.0 and earlier
+as well as other systems that don't have strnlen.
+
+Ideally, the configure script would check for strnlen, and include a
+replacement  implementation if required.
+
+--- prnt/hpijs/ljzjscolor.cpp.orig	2012-06-05 09:34:13.000000000 +0000
++++ prnt/hpijs/ljzjscolor.cpp
+@@ -522,11 +522,13 @@ bool LJZjsColor::IsLJZjsColor2Printer(Sy
+ 	DRIVER_ERROR err;
+ 	bool bLJZjsColor2Printer = FALSE;
+ 	err = pSS->GetDeviceID(strDeviceID,DevIDBuffSize,FALSE);
++	/* make sure there is a NULL terminator on the string */
++	strDeviceID[(DevIDBuffSize - 1)] = 0;
+ 
+ 	for(int i=0; i< LJZJSCOLOR2DEVICESCOUNT; i++)
+ 	{
+ 		if( NO_ERROR == err &&
+-			(strnlen((const char*)strDeviceID, DevIDBuffSize)< DevIDBuffSize) && 
++			(strlen((const char*)strDeviceID) < DevIDBuffSize) && 
+ 			(strstr((const char*)strDeviceID, (const char*)szLJZjsColor2ModelNames[i])))
+ 		{
+ 			bLJZjsColor2Printer = TRUE;