4 files changed, 30 insertions, 30 deletions

diff --git a/print/hplip/Makefile b/print/hplip/Makefile
index d959b12e834c..6c40f6e412c0 100644
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	hplip
-PORTVERSION=	3.11.3
+PORTVERSION=	3.11.5
 CATEGORIES=	print
 MASTER_SITES=	SF
 
@@ -21,7 +21,8 @@ LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
 RUN_DEPENDS=	espgs:${PORTSDIR}/print/cups-pstoraster \
 		foomatic-rip:${PORTSDIR}/print/foomatic-filters \
 		${PYTHON_SITELIBDIR}/gtk-2.0/gobject/_gobject.so:${PORTSDIR}/devel/py-gobject \
-		${PYTHON_SITELIBDIR}/dbus/_dbus.py:${PORTSDIR}/devel/py-dbus
+		${PYTHON_SITELIBDIR}/dbus/_dbus.py:${PORTSDIR}/devel/py-dbus \
+		xdg-open:${PORTSDIR}/devel/xdg-utils
 
 CONFLICTS=	hpijs-[0-9]*
 
@@ -41,7 +42,7 @@ CONFIGURE_ARGS=	--enable-foomatic-ppd-install \
 		--with-mimedir=${PREFIX}/etc/cups \
 		--with-docdir=${DOCSDIR} \
 		--with-drvdir=${PREFIX}/libexec/cups/driver
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
diff --git a/print/hplip/distinfo b/print/hplip/distinfo
index 479bbf77ffb7..2f1c7a515228 100644
--- a/print/hplip/distinfo
+++ b/print/hplip/distinfo
@@ -1,2 +1,2 @@
-SHA256 (hplip-3.11.3.tar.gz) = 5ded966c97430b78a8bd53ddd183d71bf12bd9fcf96590f51d50a07352e468bc
-SIZE (hplip-3.11.3.tar.gz) = 22332327
+SHA256 (hplip-3.11.5.tar.gz) = 611f677fc1a0d2d493d44bfe84e5e5aaac4124627e94885f57bc77db9178536c
+SIZE (hplip-3.11.5.tar.gz) = 21227642
diff --git a/print/hplip/files/patch-base__utils.py b/print/hplip/files/patch-base__utils.py
new file mode 100644
index 000000000000..81793d5bfa1b
--- /dev/null
+++ b/print/hplip/files/patch-base__utils.py
@@ -0,0 +1,13 @@
+--- ./base/utils.py.orig	2011-05-14 22:26:06.000000000 +0400
++++ ./base/utils.py	2011-07-04 11:57:33.000000000 +0400
+@@ -840,8 +840,8 @@
+     return True
+ 
+ 
+-BROWSERS = ['firefox', 'mozilla', 'konqueror', 'galeon', 'skipstone'] # in preferred order
+-BROWSER_OPTS = {'firefox': '-new-window', 'mozilla' : '', 'konqueror': '', 'galeon': '-w', 'skipstone': ''}
++BROWSERS = ['xdg-open', 'firefox', 'mozilla', 'konqueror', 'galeon', 'skipstone'] # in preferred order
++BROWSER_OPTS = {'xdg-open': '','firefox': '-new-window', 'mozilla' : '', 'konqueror': '', 'galeon': '-w', 'skipstone': ''}
+ 
+ 
+ def find_browser():
diff --git a/print/hplip/pkg-plist b/print/hplip/pkg-plist
index aff234327d0b..66c98258d001 100644
--- a/print/hplip/pkg-plist
+++ b/print/hplip/pkg-plist
@@ -60,6 +60,7 @@ libexec/cups/filter/hpcac
 libexec/cups/filter/hpcups
 %%FAX%%libexec/cups/filter/hpcupsfax
 libexec/cups/filter/hplipjs
+libexec/cups/filter/hpps
 libexec/cups/filter/pstotiff
 share/applications/hplip.desktop
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
@@ -98,6 +99,7 @@ share/applications/hplip.desktop
 %%PORTDOCS%%%%DOCSDIR%%/upgrading.html
 %%DATADIR%%/__init__.py
 %%DATADIR%%/align.py
+%%DATADIR%%/base/LedmWifi.py
 %%DATADIR%%/base/__init__.py
 %%DATADIR%%/base/codes.py
 %%DATADIR%%/base/device.py
@@ -599,7 +601,6 @@ share/applications/hplip.desktop
 %%FAX%%share/ppd/HP/HP-Fax3-hpijs.ppd.gz
 %%FAX%%share/ppd/HP/HP-Fax4-hpcups.ppd.gz
 %%FAX%%share/ppd/HP/HP-Fax4-hpijs.ppd.gz
-libexec/cups/filter/hpps
 share/ppd/HP/hp-2000c-hpijs.ppd.gz
 share/ppd/HP/hp-2500c-hpijs.ppd.gz
 share/ppd/HP/hp-910-hpijs.ppd.gz
@@ -759,11 +760,14 @@ share/ppd/HP/hp-designjet_t1100ps_44in-ps.ppd.gz
 share/ppd/HP/hp-designjet_t1120ps_24in-ps.ppd.gz
 share/ppd/HP/hp-designjet_t1120ps_44in-ps.ppd.gz
 share/ppd/HP/hp-designjet_t1200_postscript-ps.ppd.gz
+share/ppd/HP/hp-designjet_t1300_postscript-ps.ppd.gz
 share/ppd/HP/hp-designjet_t2300_postscript-ps.ppd.gz
 share/ppd/HP/hp-designjet_t7100ps-ps.ppd.gz
 share/ppd/HP/hp-designjet_t7100ps_monochrome-ps.ppd.gz
 share/ppd/HP/hp-designjet_t770_postscript-ps.ppd.gz
 share/ppd/HP/hp-designjet_t770ps_24in-ps.ppd.gz
+share/ppd/HP/hp-designjet_t790ps_24in-ps.ppd.gz
+share/ppd/HP/hp-designjet_t790ps_44in-ps.ppd.gz
 share/ppd/HP/hp-designjet_z6100ps_42in_photo-ps.ppd.gz
 share/ppd/HP/hp-designjet_z6100ps_60in_photo-ps.ppd.gz
 share/ppd/HP/hp-designjet_z6200_42in_photo-ps.ppd.gz
@@ -1134,9 +1138,7 @@ share/ppd/HP/hp-laserjet_m1537dnf_mfp-hpijs-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_m1538dnf_mfp-hpijs-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_m1539dnf_mfp-hpijs-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_m2727_mfp-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_m2727_mfp-ps.ppd.gz
-share/ppd/HP/hp-laserjet_m2727nf_mfp-ps.ppd.gz
-share/ppd/HP/hp-laserjet_m2727nfs_mfp-ps.ppd.gz
+share/ppd/HP/hp-laserjet_m2727_mfp_series-ps.ppd.gz
 share/ppd/HP/hp-laserjet_m3027_mfp-hpijs-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_m3027_mfp-ps.ppd.gz
 share/ppd/HP/hp-laserjet_m3035_mfp-hpijs-pcl3.ppd.gz
@@ -1145,6 +1147,7 @@ share/ppd/HP/hp-laserjet_m4345_mfp-hpijs-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_m4345_mfp-ps.ppd.gz
 share/ppd/HP/hp-laserjet_m4349_mfp-hpijs-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_m4349_mfp-ps.ppd.gz
+share/ppd/HP/hp-laserjet_m4555_mfp-ps.ppd.gz
 share/ppd/HP/hp-laserjet_m5025_mfp-hpijs-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_m5025_mfp-ps.ppd.gz
 share/ppd/HP/hp-laserjet_m5035_mfp-hpijs-pcl3.ppd.gz
@@ -1172,71 +1175,54 @@ share/ppd/HP/hp-laserjet_p2015_series-hpijs-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_p2015_series-ps.ppd.gz
 share/ppd/HP/hp-laserjet_p2015d_series-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_p2015dn_series-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_p2015dn_series-ps.ppd.gz
 share/ppd/HP/hp-laserjet_p2015n_series-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_p2015n_series-ps.ppd.gz
 share/ppd/HP/hp-laserjet_p2015x_series-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_p2015x_series-ps.ppd.gz
 share/ppd/HP/hp-laserjet_p2035-hpijs-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_p2035-hpijs-zjs.ppd.gz
 share/ppd/HP/hp-laserjet_p2035n-hpijs-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_p2035n-hpijs-zjs.ppd.gz
 share/ppd/HP/hp-laserjet_p2055-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_p2055-ps.ppd.gz
+share/ppd/HP/hp-laserjet_p2055_series-ps.ppd.gz
 share/ppd/HP/hp-laserjet_p2055d-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_p2055d-ps.ppd.gz
 share/ppd/HP/hp-laserjet_p2055dn-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_p2055dn-ps.ppd.gz
 share/ppd/HP/hp-laserjet_p2055x-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_p2055x-ps.ppd.gz
 share/ppd/HP/hp-laserjet_p3004-hpijs-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_p3004-ps.ppd.gz
 share/ppd/HP/hp-laserjet_p3005-hpijs-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_p3005-ps.ppd.gz
 share/ppd/HP/hp-laserjet_p3010_series-hpijs-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_p3010_series-ps.ppd.gz
+share/ppd/HP/hp-laserjet_p4010_series-ps.ppd.gz
 share/ppd/HP/hp-laserjet_p4014-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_p4014-ps.ppd.gz
 share/ppd/HP/hp-laserjet_p4014dn-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_p4014dn-ps.ppd.gz
 share/ppd/HP/hp-laserjet_p4014n-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_p4014n-ps.ppd.gz
 share/ppd/HP/hp-laserjet_p4015-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_p4015-ps.ppd.gz
 share/ppd/HP/hp-laserjet_p4015dn-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_p4015dn-ps.ppd.gz
 share/ppd/HP/hp-laserjet_p4015n-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_p4015n-ps.ppd.gz
 share/ppd/HP/hp-laserjet_p4015tn-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_p4015tn-ps.ppd.gz
 share/ppd/HP/hp-laserjet_p4015x-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_p4015x-ps.ppd.gz
 share/ppd/HP/hp-laserjet_p4515-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_p4515-ps.ppd.gz
 share/ppd/HP/hp-laserjet_p4515n-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_p4515n-ps.ppd.gz
 share/ppd/HP/hp-laserjet_p4515tn-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_p4515tn-ps.ppd.gz
 share/ppd/HP/hp-laserjet_p4515x-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_p4515x-ps.ppd.gz
 share/ppd/HP/hp-laserjet_p4515xm-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_p4515xm-ps.ppd.gz
 share/ppd/HP/hp-laserjet_professional_m1132_mfp-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_professional_m1136_mfp-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_professional_m1212nf_mfp-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_professional_m1213nf_mfp-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_professional_m1214nfh_mfp-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_professional_m1217nfw_mfp-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_professional_p1102-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_professional_p1102w-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_professional_p1566-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_professional_p1606dn-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_professional_p_1102w-hpijs.ppd.gz
 share/ppd/HP/hp-mopier_240-hpijs-pcl3.ppd.gz
 share/ppd/HP/hp-mopier_240-ps.ppd.gz
 share/ppd/HP/hp-mopier_320-hpijs-pcl3.ppd.gz
 share/ppd/HP/hp-mopier_320-ps.ppd.gz
 share/ppd/HP/hp-officejet-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_100_mobile_l411-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_150_mobile_l511-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_4000_k210-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_4100_series-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_4105-hpijs.ppd.gz