Update to 3.13.9:

Added Support for the Following New Printers:

- HP Designjet Z5400 44-in PostScript ePrinter
- HP Deskjet Ink Advantage 1018 Printer
- HP Deskjet Ink Advantage 1518 All-in-One Printer
- HP Deskjet Ink Advantage 2540 All-in-One Printer Series
- HP Deskjet Ink Advantage 2545 All-in-One Printer
- HP Deskjet Ink Advantage 2546 All-in-One Printer
- HP DeskJet Ink Advantage 4515 e-All-in-One Printer
- HP DeskJet Ink Advantage 4518 e-All-in-One Printer
- HP Envy 4504 e-All-in-One
- HP LaserJet Pro MFP M435nw
- HP Officejet 4630 e-All-in-One
- HP Officejet 4632 e-All-in-One Printer
- HP Officejet 4635 e-All-in-One Printer
- HP OfficeJet Pro 8600 Premium e-AiO N911n
- HP Photosmart 5521 e-All-in-One Printer

Launchpad fixes:

1209339  - HP OfficeJet G55 is not detecting through USB
1209352  - Collate broken under Fedora 19/CUPS-1.6/hplip-3.13.7 as hpps
           sends SET COPIES

Issues fixed:

- Added support for print queue addition using hostname(hp-setup
  <HOSTNAME>)
- Fix for plugin installation and test page in 'hp-setup -i'

4 files changed, 18 insertions, 14 deletions

diff --git a/print/hplip/Makefile b/print/hplip/Makefile
index b7adead8ee9..3d949a0d58e 100644
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2013/08/24 16:44:15 schnoebe Exp $
+# $NetBSD: Makefile,v 1.27 2013/09/12 16:12:13 schnoebe Exp $
 #
 
-DISTNAME=		hplip-3.13.8
+DISTNAME=		hplip-3.13.9
 CATEGORIES=		print
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=hplip/}
 
diff --git a/print/hplip/PLIST.base b/print/hplip/PLIST.base
index 5b04431947f..c5beece91d6 100644
--- a/print/hplip/PLIST.base
+++ b/print/hplip/PLIST.base
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.base,v 1.8 2013/08/24 16:44:15 schnoebe Exp $
+@comment $NetBSD: PLIST.base,v 1.9 2013/09/12 16:12:13 schnoebe Exp $
 bin/hp-align
 bin/hp-check
 bin/hp-clean
@@ -44,9 +44,7 @@ ${PYSITELIB}/pcardext.la
 lib/systemd/system/hplip-printer@.service
 libexec/cups/backend/hp
 libexec/cups/filter/foomatic-rip-hplip
-libexec/cups/filter/hpcac
 libexec/cups/filter/hpcups
-libexec/cups/filter/hplipjs
 libexec/cups/filter/hpps
 libexec/cups/filter/pstotiff
 share/cups/drv/hp/hpcups.drv
@@ -511,6 +509,7 @@ share/hplip/ppd/HP/hp-designjet_t790ps_24in-ps.ppd.gz
 share/hplip/ppd/HP/hp-designjet_t790ps_44in-ps.ppd.gz
 share/hplip/ppd/HP/hp-designjet_t920-postscript.ppd.gz
 share/hplip/ppd/HP/hp-designjet_z5200_postscript-ps.ppd.gz
+share/hplip/ppd/HP/hp-designjet_z5400-postscript.ppd.gz
 share/hplip/ppd/HP/hp-designjet_z6100ps_42in_photo-ps.ppd.gz
 share/hplip/ppd/HP/hp-designjet_z6100ps_60in_photo-ps.ppd.gz
 share/hplip/ppd/HP/hp-designjet_z6200_42in_photo-ps.ppd.gz
@@ -613,6 +612,8 @@ share/hplip/ppd/HP/hp-deskjet_400-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_400.ppd.gz
 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_4510_series-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_4510_series.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
@@ -1335,6 +1336,7 @@ share/hplip/ppd/HP/hp-laserjet_p4515x-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_p4515x.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_p4515xm-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_p4515xm.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_pro_mfp_m435-ps.ppd.gz
 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
@@ -1445,6 +1447,8 @@ 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_4630_series-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-officejet_4630_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
diff --git a/print/hplip/distinfo b/print/hplip/distinfo
index 6ec1ed88d6c..30c717845c4 100644
--- a/print/hplip/distinfo
+++ b/print/hplip/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.8 2013/08/24 16:44:15 schnoebe Exp $
+$NetBSD: distinfo,v 1.9 2013/09/12 16:12:13 schnoebe Exp $
 
-SHA1 (hplip-3.13.8.tar.gz) = c91fd5231e056f03dc7e715a84afcb13074364d1
-RMD160 (hplip-3.13.8.tar.gz) = b693ecbd06acf3217a292e9465eabb4874431071
-Size (hplip-3.13.8.tar.gz) = 20836354 bytes
+SHA1 (hplip-3.13.9.tar.gz) = 208f4816661e35cc32850c0ed2b402e0c54350c6
+RMD160 (hplip-3.13.9.tar.gz) = 13983458847b1fd17019f15cf3e4c3b6f9587294
+Size (hplip-3.13.9.tar.gz) = 20878480 bytes
 SHA1 (patch-aa) = bad4a3a9570d9bbd1e0fe226b625f1ddc3f31b8c
 SHA1 (patch-ab) = ce2775ef74746aefd942bda49c4e548f7c771ff5
-SHA1 (patch-ad) = 468fbf167e1f20bb8617e444977969e46b19f3be
+SHA1 (patch-ad) = e993aee9ffc51b32861d7cd17798b2bfd7742fb5
 SHA1 (patch-ae) = 0a4b30b841822ea3c268442d9ac1d81b3a59ad1e
 SHA1 (patch-io_hpmud_musb.h) = ad634f5a1f426877e1c88916b6468fcdb7598555
 SHA1 (patch-prnt_hpijs_context2.cpp) = f81148c1c334a9074453b27ac055833cd1669bd0
diff --git a/print/hplip/patches/patch-ad b/print/hplip/patches/patch-ad
index f8de1e9a8ad..1b3b1ae7cb5 100644
--- a/print/hplip/patches/patch-ad
+++ b/print/hplip/patches/patch-ad
@@ -1,15 +1,15 @@
-$NetBSD: patch-ad,v 1.1.1.1 2012/05/18 03:03:22 schnoebe Exp $
+$NetBSD: patch-ad,v 1.2 2013/09/12 16:12:13 schnoebe Exp $
 
 # reported upstream as https://bugs.launchpad.net/hplip/+bug/726213
 
---- prnt/hpcups/ErnieFilter.cpp.orig	2010-07-19 02:14:09.000000000 +0000
+--- prnt/hpcups/ErnieFilter.cpp.orig	2013-09-05 08:49:06.000000000 +0000
 +++ prnt/hpcups/ErnieFilter.cpp
 @@ -50,7 +50,7 @@
  #include "ErnieFilter.h"
  
  
--#if defined(__APPLE__) || defined(__linux)
-+#if defined(__APPLE__) || defined(__linux) || defined(__NetBSD__)
+-#if defined(__APPLE__) || defined(__linux) || defined(__GLIBC__)
++#if defined(__APPLE__) || defined(__linux) || defined(__GLIBC__) || defined(__NetBSD__)
  #include <math.h>
  #endif