From 8ad17a0cf735f1f1461d8ee378a34bdc3b8e7728 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Wed, 2 Mar 2011 06:59:03 +0000
Subject: [PATCH] Update to hplip-3.11.1.

---
 print/hplip/Makefile                          | 10 ++----
 print/hplip/distinfo                          | 10 +++---
 print/hplip/patches/patch-Makefile_in         | 24 ++++++-------
 print/hplip/patches/patch-base_codes_py       |  8 ++---
 print/hplip/patches/patch-configure           | 14 ++++----
 .../patch-prnt_hpcups_HPCupsFilter_cpp        |  8 ++---
 .../patches/patch-prnt_hpijs_hpcupsfax_cpp    |  8 ++---
 .../patches/patch-ui4_nodevicesdialog_py      | 15 ++------
 print/hplip/patches/patch-ui_devmgr4_py       |  8 ++---
 print/hplip/patches/patch-ui_nodevicesform_py | 15 ++------
 print/hplip/pkg/PLIST-gui                     |  4 ++-
 print/hplip/pkg/PLIST-hpijs                   | 36 +++++++++++++++++--
 print/hplip/pkg/PLIST-main                    |  6 +++-
 13 files changed, 91 insertions(+), 75 deletions(-)

diff --git a/print/hplip/Makefile b/print/hplip/Makefile
index 7c6f593bda7..8b56603e4c6 100644
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.33 2011/01/16 23:02:53 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.34 2011/03/02 06:59:03 ajacoutot Exp $
 
 SHARED_ONLY=	Yes
 
@@ -8,7 +8,7 @@ COMMENT-hpcups=	HP native CUPS driver
 COMMENT-libs=	HPLIP backend libraries
 COMMENT-gui=	HPLIP graphical tools
 
-V=		3.10.9
+V=		3.11.1
 DISTNAME=	hplip-${V}
 
 PKGNAME-main=  ${DISTNAME}
@@ -17,10 +17,6 @@ PKGNAME-hpcups=	hpcups-${V}
 PKGNAME-libs=	hplip-libs-${V}
 PKGNAME-gui=	hplip-gui-${V}
 
-REVISION-main=	5
-REVISION-gui=	0
-REVISION-hpijs=	0
-
 SHARED_LIBS +=  hpmud		2.0 # .0.6
 SHARED_LIBS +=  hpip		2.0 # .0.1
 
@@ -62,7 +58,7 @@ RUN_DEPENDS-main=${MODPY_RUN_DEPENDS} \
 		print/hplip,-hpcups \
 		devel/xdg-utils
 
-WANTLIB-hpijs += ${cWANTLIB} asn1 gssapi krb5 ssl hpip
+WANTLIB-hpijs += ${cWANTLIB} hpip
 WANTLIB-hpijs += c jpeg netsnmp stdc++ usb dbus-1 hpmud
 LIB_DEPENDS-hpijs= print/hplip,-libs \
 		graphics/jpeg \
diff --git a/print/hplip/distinfo b/print/hplip/distinfo
index 1dc9b6a58a2..79233fc252e 100644
--- a/print/hplip/distinfo
+++ b/print/hplip/distinfo
@@ -1,5 +1,5 @@
-MD5 (hplip-3.10.9.tar.gz) = YJcYgwomh0/A6oSke4Ey8w==
-RMD160 (hplip-3.10.9.tar.gz) = N/USxzdo56Ar3ygUu3UogEz62jI=
-SHA1 (hplip-3.10.9.tar.gz) = XhRer++8USK76YNF8phPwKVeV4c=
-SHA256 (hplip-3.10.9.tar.gz) = HTRjAITsz8yAwIBlvs35MT/Y9aCaTPUj29nT7HJCBrk=
-SIZE (hplip-3.10.9.tar.gz) = 21818298
+MD5 (hplip-3.11.1.tar.gz) = hvY6AMkRMTIG/vahR/f6rQ==
+RMD160 (hplip-3.11.1.tar.gz) = CsQe05NaBQ8bzUMUGPooC4U+jK8=
+SHA1 (hplip-3.11.1.tar.gz) = awZWc3PK3H3/SBNMa1j5Ck1yWCo=
+SHA256 (hplip-3.11.1.tar.gz) = L12YjOU8CEVWQlrmxeVqm1z6OsA4EFnu2RO0UjvRyHg=
+SIZE (hplip-3.11.1.tar.gz) = 22167916
diff --git a/print/hplip/patches/patch-Makefile_in b/print/hplip/patches/patch-Makefile_in
index aee9e43e817..7d1ed603a73 100644
--- a/print/hplip/patches/patch-Makefile_in
+++ b/print/hplip/patches/patch-Makefile_in
@@ -1,10 +1,10 @@
-$OpenBSD: patch-Makefile_in,v 1.9 2010/10/31 07:43:44 ajacoutot Exp $
+$OpenBSD: patch-Makefile_in,v 1.10 2011/03/02 06:59:03 ajacoutot Exp $
 
 libcompat is needed because hplip uses ftime(3).
 
---- Makefile.in.orig	Sun Sep 26 19:09:46 2010
-+++ Makefile.in	Sun Oct 31 07:30:54 2010
-@@ -3901,10 +3901,10 @@ cups_drv = prnt/drv/hpcups.drv
+--- Makefile.in.orig	Wed Jan 19 06:20:23 2011
++++ Makefile.in	Tue Feb  1 08:42:07 2011
+@@ -4015,10 +4015,10 @@ cups_drv = prnt/drv/hpcups.drv
  @HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@        scan/sane/soaphti.h scan/sane/soapi.h scan/sane/xml.c scan/sane/xml.h scan/sane/ledm.h scan/sane/ledmi.h scan/sane/ledm.c \
  @HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@        scan/sane/bb_ledm.c scan/sane/http.h scan/sane/http.c
  
@@ -17,7 +17,7 @@ libcompat is needed because hplip uses ftime(3).
  #libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DSOAP_DEBUG
  @HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_CFLAGS = $(DBUS_CFLAGS)
  
-@@ -3928,7 +3928,7 @@ cups_drv = prnt/drv/hpcups.drv
+@@ -4042,7 +4042,7 @@ cups_drv = prnt/drv/hpcups.drv
  # hp-mkuri.
  @HPLIP_BUILD_TRUE@hp_mkuridir = $(bindir)
  @HPLIP_BUILD_TRUE@hp_mkuri_SOURCES = io/hpmud/hp-mkuri.c
@@ -26,7 +26,7 @@ libcompat is needed because hplip uses ftime(3).
  @HPLIP_BUILD_TRUE@hp_mkuri_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\"
  
  # hpmud.rules
-@@ -4119,7 +4119,7 @@ cups_drv = prnt/drv/hpcups.drv
+@@ -4232,7 +4232,7 @@ cups_drv = prnt/drv/hpcups.drv
  @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hppgsz_SOURCES = prnt/hpijs/PrinterProperties.cpp prnt/hpijs/PrinterProperties.h prnt/hpijs/bug.h
  @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hppgsz_CXXFLAGS = $(libapdk_la_CXXFLAGS)
  @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hppgsz_CFLAGS = $(libapdk_la_CFLAGS)
@@ -35,7 +35,7 @@ libcompat is needed because hplip uses ftime(3).
  
  # hplip.desktop
  @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hplip_desktopdir = $(icondir)
-@@ -4186,8 +4186,8 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
+@@ -4299,8 +4299,8 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
  
  @HPIJS_INSTALL_TRUE@hpijs_CXXFLAGS = $(libapdk_la_CXXFLAGS)
  @HPIJS_INSTALL_TRUE@hpijs_CFLAGS = $(libapdk_la_CFLAGS)
@@ -46,7 +46,7 @@ libcompat is needed because hplip uses ftime(3).
  
  # hpcups
  #if NEW_HPCUPS
-@@ -4225,7 +4225,7 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
+@@ -4338,7 +4338,7 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
  @HPCUPS_INSTALL_TRUE@        prnt/hpcups/dj4100PrintModes.h
  
  @HPCUPS_INSTALL_TRUE@hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG)
@@ -55,7 +55,7 @@ libcompat is needed because hplip uses ftime(3).
  #else
  #hpcupsdir = $(cupsfilterdir)
  #hpcups_PROGRAMS = hpcups
-@@ -4233,9 +4233,9 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
+@@ -4346,9 +4346,9 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
  #hpcups_CXXFLAGS = $(libapdk_la_CXXFLAGS)
  #hpcups_CFLAGS = $(libapdk_la_CFLAGS)
  #if HPCUPS_ONLY_BUILD
@@ -67,7 +67,7 @@ libcompat is needed because hplip uses ftime(3).
  #endif #HPCUPS_ONLY_BUILD
  #endif # NEW_HPCUPS
  # hpcupsfax
-@@ -8100,7 +8100,7 @@ install-data-am: install-cupsdrv2DATA install-cupsdrvD
+@@ -8213,7 +8213,7 @@ install-data-am: install-cupsdrv2DATA install-cupsdrvD
  	install-cupsextLTLIBRARIES install-dist_baseDATA \
  	install-dist_cacSCRIPTS install-dist_cmdSCRIPTS \
  	install-dist_copierDATA install-dist_faxDATA \
@@ -76,7 +76,7 @@ libcompat is needed because hplip uses ftime(3).
  	install-dist_hpcupsfaxppdDATA install-dist_hpfaxSCRIPTS \
  	install-dist_hpijsfaxppdDATA install-dist_hplipSCRIPTS \
  	install-dist_hplip_stateDATA install-dist_images_128x128DATA \
-@@ -8115,7 +8115,7 @@ install-data-am: install-cupsdrv2DATA install-cupsdrvD
+@@ -8228,7 +8228,7 @@ install-data-am: install-cupsdrv2DATA install-cupsdrvD
  	install-dist_policykit_dbus_shareDATA \
  	install-dist_policykit_policyDATA install-dist_postscriptDATA \
  	install-dist_ppdDATA install-dist_prntDATA \
@@ -85,7 +85,7 @@ libcompat is needed because hplip uses ftime(3).
  	install-dist_scanDATA install-dist_ui4DATA install-dist_uiDATA \
  	install-dist_unrelDATA install-dist_www0DATA \
  	install-dist_www3DATA install-dist_www4DATA install-docDATA \
-@@ -8307,17 +8307,6 @@ uninstall-am: uninstall-binPROGRAMS uninstall-cupsdrv2
+@@ -8420,17 +8420,6 @@ uninstall-am: uninstall-binPROGRAMS uninstall-cupsdrv2
  
  
  install-data-hook:
diff --git a/print/hplip/patches/patch-base_codes_py b/print/hplip/patches/patch-base_codes_py
index e5a7fc497cc..918db74875c 100644
--- a/print/hplip/patches/patch-base_codes_py
+++ b/print/hplip/patches/patch-base_codes_py
@@ -1,7 +1,7 @@
-$OpenBSD: patch-base_codes_py,v 1.4 2010/10/31 07:43:44 ajacoutot Exp $
---- base/codes.py.orig	Sun Sep 26 19:07:36 2010
-+++ base/codes.py	Sun Oct 31 07:30:54 2010
-@@ -282,7 +282,7 @@ EVENT_RAISE_DEVICE_MANAGER = 9001
+$OpenBSD: patch-base_codes_py,v 1.5 2011/03/02 06:59:03 ajacoutot Exp $
+--- base/codes.py.orig	Wed Jan 19 06:18:24 2011
++++ base/codes.py	Tue Feb  1 08:42:07 2011
+@@ -283,7 +283,7 @@ EVENT_RAISE_DEVICE_MANAGER = 9001
  #EVENT_JOB_STORAGE_UI_REQUEST = 9002 # sent by hplipjs CUPS filter for job storage UI
  EVENT_HISTORY_UPDATE = 9003 # sent by hp-systray to hp-toolbox when a device's history changes
  EVENT_USER_CONFIGURATION_CHANGED = 9004 # sent when ~/.hplip/hplip.conf has been changed by another app.
diff --git a/print/hplip/patches/patch-configure b/print/hplip/patches/patch-configure
index e98137e79d9..6442c80e778 100644
--- a/print/hplip/patches/patch-configure
+++ b/print/hplip/patches/patch-configure
@@ -1,6 +1,6 @@
-$OpenBSD: patch-configure,v 1.8 2010/10/31 07:43:44 ajacoutot Exp $
---- configure.orig	Sun Sep 26 19:09:47 2010
-+++ configure	Sun Oct 31 07:32:53 2010
+$OpenBSD: patch-configure,v 1.9 2011/03/02 06:59:03 ajacoutot Exp $
+--- configure.orig	Wed Jan 19 06:20:25 2011
++++ configure	Tue Feb  1 08:43:24 2011
 @@ -748,10 +748,10 @@ MAKEFLAGS=
  SHELL=${CONFIG_SHELL-/bin/sh}
  
@@ -8,10 +8,10 @@ $OpenBSD: patch-configure,v 1.8 2010/10/31 07:43:44 ajacoutot Exp $
 -PACKAGE_NAME='HP Linux Imaging and Printing'
 +PACKAGE_NAME='HP Linux (& Unix) Imaging and Printing'
  PACKAGE_TARNAME='hplip'
- PACKAGE_VERSION='3.10.9'
--PACKAGE_STRING='HP Linux Imaging and Printing 3.10.9'
-+PACKAGE_STRING='HP Linux (& Unix) Imaging and Printing 3.10.9'
- PACKAGE_BUGREPORT='3.10.9.11'
+ PACKAGE_VERSION='3.11.1'
+-PACKAGE_STRING='HP Linux Imaging and Printing 3.11.1'
++PACKAGE_STRING='HP Linux (& Unix) Imaging and Printing 3.11.1'
+ PACKAGE_BUGREPORT='3.11.1.19'
  
  # Factoring default headers for most tests.
 @@ -20262,14 +20262,14 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/print/hplip/patches/patch-prnt_hpcups_HPCupsFilter_cpp b/print/hplip/patches/patch-prnt_hpcups_HPCupsFilter_cpp
index 89e11077b81..f7165a75a7f 100644
--- a/print/hplip/patches/patch-prnt_hpcups_HPCupsFilter_cpp
+++ b/print/hplip/patches/patch-prnt_hpcups_HPCupsFilter_cpp
@@ -1,7 +1,7 @@
-$OpenBSD: patch-prnt_hpcups_HPCupsFilter_cpp,v 1.1 2010/03/21 11:07:43 ajacoutot Exp $
---- prnt/hpcups/HPCupsFilter.cpp.orig	Fri Mar 12 13:51:31 2010
-+++ prnt/hpcups/HPCupsFilter.cpp	Fri Mar 12 13:51:45 2010
-@@ -773,7 +773,7 @@ void HPCupsFilter::getLogLevel ()
+$OpenBSD: patch-prnt_hpcups_HPCupsFilter_cpp,v 1.2 2011/03/02 06:59:03 ajacoutot Exp $
+--- prnt/hpcups/HPCupsFilter.cpp.orig	Wed Jan 19 06:15:27 2011
++++ prnt/hpcups/HPCupsFilter.cpp	Tue Feb  1 08:42:07 2011
+@@ -780,7 +780,7 @@ void HPCupsFilter::getLogLevel ()
      FILE    *fp;
      char    str[258];
      char    *p;
diff --git a/print/hplip/patches/patch-prnt_hpijs_hpcupsfax_cpp b/print/hplip/patches/patch-prnt_hpijs_hpcupsfax_cpp
index 7e490d0d15f..8c7cccfd9c7 100644
--- a/print/hplip/patches/patch-prnt_hpijs_hpcupsfax_cpp
+++ b/print/hplip/patches/patch-prnt_hpijs_hpcupsfax_cpp
@@ -1,7 +1,7 @@
-$OpenBSD: patch-prnt_hpijs_hpcupsfax_cpp,v 1.2 2010/03/21 11:07:43 ajacoutot Exp $
---- prnt/hpijs/hpcupsfax.cpp.orig	Thu Feb 25 00:05:02 2010
-+++ prnt/hpijs/hpcupsfax.cpp	Fri Mar 12 13:40:19 2010
-@@ -90,7 +90,7 @@ static void GetLogLevel ()
+$OpenBSD: patch-prnt_hpijs_hpcupsfax_cpp,v 1.3 2011/03/02 06:59:03 ajacoutot Exp $
+--- prnt/hpijs/hpcupsfax.cpp.orig	Wed Jan 19 06:15:28 2011
++++ prnt/hpijs/hpcupsfax.cpp	Tue Feb  1 08:42:07 2011
+@@ -92,7 +92,7 @@ static void GetLogLevel ()
      FILE    *fp;
      char    str[258];
      char    *p;
diff --git a/print/hplip/patches/patch-ui4_nodevicesdialog_py b/print/hplip/patches/patch-ui4_nodevicesdialog_py
index 09f63e8d1b8..c8794a11183 100644
--- a/print/hplip/patches/patch-ui4_nodevicesdialog_py
+++ b/print/hplip/patches/patch-ui4_nodevicesdialog_py
@@ -1,6 +1,6 @@
-$OpenBSD: patch-ui4_nodevicesdialog_py,v 1.2 2010/11/05 08:21:22 ajacoutot Exp $
---- ui4/nodevicesdialog.py.orig	Sun Sep 26 19:07:19 2010
-+++ ui4/nodevicesdialog.py	Fri Nov  5 09:14:47 2010
+$OpenBSD: patch-ui4_nodevicesdialog_py,v 1.3 2011/03/02 06:59:03 ajacoutot Exp $
+--- ui4/nodevicesdialog.py.orig	Wed Jan 19 06:18:20 2011
++++ ui4/nodevicesdialog.py	Tue Feb  1 08:42:07 2011
 @@ -53,7 +53,7 @@ class NoDevicesDialog(QDialog, Ui_NoDevicesDialog_base
          if utils.which('hp-setup'):
              cmd = 'hp-setup -u'
@@ -10,12 +10,3 @@ $OpenBSD: patch-ui4_nodevicesdialog_py,v 1.2 2010/11/05 08:21:22 ajacoutot Exp $
  
          log.debug(cmd)
          utils.run(cmd, log_output=True, password_func=None, timeout=1)
-@@ -71,7 +71,7 @@ class NoDevicesDialog(QDialog, Ui_NoDevicesDialog_base
- 
-     def CUPSButton_clicked(self):
-         self.close()
--        utils.openURL("http://localhost:631/admin?op=add-printer")
-+        utils.openURL("http://localhost:631/admin/")
- 
- 
-     def CloseButton_clicked(self):
diff --git a/print/hplip/patches/patch-ui_devmgr4_py b/print/hplip/patches/patch-ui_devmgr4_py
index e46215a71a4..8556149b359 100644
--- a/print/hplip/patches/patch-ui_devmgr4_py
+++ b/print/hplip/patches/patch-ui_devmgr4_py
@@ -1,7 +1,7 @@
-$OpenBSD: patch-ui_devmgr4_py,v 1.2 2010/09/08 07:13:16 ajacoutot Exp $
---- ui/devmgr4.py.orig	Mon Jul 19 04:17:45 2010
-+++ ui/devmgr4.py	Wed Sep  8 08:34:11 2010
-@@ -2752,7 +2752,7 @@ class DevMgr4(DevMgr4_base):
+$OpenBSD: patch-ui_devmgr4_py,v 1.3 2011/03/02 06:59:03 ajacoutot Exp $
+--- ui/devmgr4.py.orig	Wed Jan 19 06:18:26 2011
++++ ui/devmgr4.py	Tue Feb  1 08:42:07 2011
+@@ -2758,7 +2758,7 @@ class DevMgr4(DevMgr4_base):
          if utils.which('hp-setup'):
              cmd = 'hp-setup -u'
          else:
diff --git a/print/hplip/patches/patch-ui_nodevicesform_py b/print/hplip/patches/patch-ui_nodevicesform_py
index 36966bb30b3..f6a538f1316 100644
--- a/print/hplip/patches/patch-ui_nodevicesform_py
+++ b/print/hplip/patches/patch-ui_nodevicesform_py
@@ -1,15 +1,6 @@
-$OpenBSD: patch-ui_nodevicesform_py,v 1.2 2010/11/05 08:21:22 ajacoutot Exp $
---- ui/nodevicesform.py.orig	Sun Sep 26 19:07:46 2010
-+++ ui/nodevicesform.py	Fri Nov  5 09:15:01 2010
-@@ -43,7 +43,7 @@ class NoDevicesForm(NoDevicesForm_base):
- 
-     def CUPSButton_clicked(self):
-         self.close()
--        utils.openURL("http://localhost:631/admin?op=add-printer")
-+        utils.openURL("http://localhost:631/admin/")
- 
- 
-     def ExitButton_clicked(self):
+$OpenBSD: patch-ui_nodevicesform_py,v 1.3 2011/03/02 06:59:03 ajacoutot Exp $
+--- ui/nodevicesform.py.orig	Wed Jan 19 06:18:26 2011
++++ ui/nodevicesform.py	Tue Feb  1 08:42:07 2011
 @@ -56,7 +56,7 @@ class NoDevicesForm(NoDevicesForm_base):
          if utils.which('hp-setup'):
              cmd = 'hp-setup -u'
diff --git a/print/hplip/pkg/PLIST-gui b/print/hplip/pkg/PLIST-gui
index e13f62c07bb..4efa6d4d5cb 100644
--- a/print/hplip/pkg/PLIST-gui
+++ b/print/hplip/pkg/PLIST-gui
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-gui,v 1.4 2010/03/26 08:00:03 ajacoutot Exp $
+@comment $OpenBSD: PLIST-gui,v 1.5 2011/03/02 06:59:03 ajacoutot Exp $
 @conflict hplip-<3.9.6b
 bin/hp-print
 bin/hp-systray
@@ -309,6 +309,8 @@ share/hplip/data/images/other/fax.png
 share/hplip/data/images/other/fax2.png
 share/hplip/data/images/other/generic_coverpage.png
 share/hplip/data/images/other/generic_title.png
+share/hplip/data/images/other/h-k-2.png
+share/hplip/data/images/other/h-k-3.png
 share/hplip/data/images/other/h-kc-2.png
 share/hplip/data/images/other/h-kc-3.png
 share/hplip/data/images/other/hp-tux-printer.png
diff --git a/print/hplip/pkg/PLIST-hpijs b/print/hplip/pkg/PLIST-hpijs
index 5cb2614a9b4..1439ecafb3e 100644
--- a/print/hplip/pkg/PLIST-hpijs
+++ b/print/hplip/pkg/PLIST-hpijs
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-hpijs,v 1.10 2010/10/31 07:43:44 ajacoutot Exp $
+@comment $OpenBSD: PLIST-hpijs,v 1.11 2011/03/02 06:59:03 ajacoutot Exp $
 @conflict hplip-libs-<=3.9.8
 @pkgpath print/hpijs
 @bin bin/hpijs
@@ -14,6 +14,8 @@ share/foomatic/db/source/PPD/HP/HP-Fax-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/HP-Fax2-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/HP-Fax3-hpcups.ppd.gz
 share/foomatic/db/source/PPD/HP/HP-Fax3-hpijs.ppd.gz
+share/foomatic/db/source/PPD/HP/HP-Fax4-hpcups.ppd.gz
+share/foomatic/db/source/PPD/HP/HP-Fax4-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-2000c-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-2500c-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-910-hpijs.ppd.gz
@@ -116,6 +118,8 @@ share/foomatic/db/source/PPD/HP/hp-color_laserjet_cm2320nf_mfp-hpijs-pcl3.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_cm2320nf_mfp-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_cm3530_mfp-hpijs-pcl3.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_cm3530_mfp-ps.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-color_laserjet_cm4540_mfp-hpijs-pcl3.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-color_laserjet_cm4540_mfp-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_cm4730_mfp-hpijs-pcl3.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_cm4730_mfp-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_cm6030_mfp-hpijs-pcl3.ppd.gz
@@ -155,6 +159,8 @@ share/foomatic/db/source/PPD/HP/hp-color_laserjet_cp5225dn-hpijs-pcl3.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_cp5225dn-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_cp5225n-hpijs-pcl3.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_cp5225n-ps.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-color_laserjet_cp5520_series-hpijs-pcl3.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-color_laserjet_cp5520_series-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_cp6015-hpijs-pcl3.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_cp6015-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-cp1160-hpijs.ppd.gz
@@ -325,6 +331,8 @@ share/foomatic/db/source/PPD/HP/hp-deskjet_f4213_series-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-deskjet_f4400_series-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-deskjet_f4500_series-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-deskjet_f735-hpijs.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-deskjet_ink_adv_2010_k010-hpijs.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-deskjet_ink_adv_2060_k110-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-deskjet_ink_advant_k109a-z-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-deskjet_ink_advant_k209a-z-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-dj350-hpijs.ppd.gz
@@ -502,6 +510,23 @@ share/foomatic/db/source/PPD/HP/hp-laserjet_9055mfp-hpijs-pcl3.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_9055mfp-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_9065mfp-hpijs-pcl3.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_9065mfp-ps.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-laserjet_cm1411fn-hpijs-pcl3.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-laserjet_cm1412fn-hpijs-pcl3.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-laserjet_cm1413fn-hpijs-pcl3.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-laserjet_cm1415fn-hpijs-pcl3.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-laserjet_cm1415fnw-hpijs-pcl3.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-laserjet_cm1415fnw-ps.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-laserjet_cm1416fnw-hpijs-pcl3.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-laserjet_cm1417fnw-hpijs-pcl3.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-laserjet_cm1418fnw-hpijs-pcl3.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-laserjet_cp1021-hpijs.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-laserjet_cp1022-hpijs.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-laserjet_cp1023-hpijs.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-laserjet_cp1025-hpijs.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-laserjet_cp1025nw-hpijs.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-laserjet_cp1026nw-hpijs.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-laserjet_cp1027nw-hpijs.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-laserjet_cp1028nw-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_m1005-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_m1120_mfp-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_m1120n_mfp-hpijs.ppd.gz
@@ -510,6 +535,11 @@ share/foomatic/db/source/PPD/HP/hp-laserjet_m1522_mfp-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_m1522n_mfp-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_m1522nf_mfp-hpijs-pcl3.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_m1522nf_mfp-ps.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-laserjet_m1536dnf_mfp-hpijs-pcl3.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-laserjet_m1536dnf_mfp-ps.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-laserjet_m1537dnf_mfp-hpijs-pcl3.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-laserjet_m1538dnf_mfp-hpijs-pcl3.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-laserjet_m1539dnf_mfp-hpijs-pcl3.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_m2727_mfp-hpijs-pcl3.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_m2727_mfp-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_m2727nf_mfp-ps.ppd.gz
@@ -601,6 +631,7 @@ share/foomatic/db/source/PPD/HP/hp-laserjet_p4515xm-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_professional_m1132_mfp-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_professional_m1136_mfp-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_professional_m1212nf_mfp-hpijs.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-laserjet_professional_m1213nf_mfp-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_professional_m1217nfw_mfp-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_professional_p1102-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_professional_p1102w-hpijs.ppd.gz
@@ -801,13 +832,14 @@ share/foomatic/db/source/PPD/HP/hp-photosmart_d7300_series-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-photosmart_d7400_series-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-photosmart_d7500_series-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-photosmart_estn_c510_series-hpijs.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-photosmart_ink_adv_k510-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-photosmart_p1000-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-photosmart_p1100-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-photosmart_plus_b209a-m-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-photosmart_plus_b210_series-hpijs.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-photosmart_prem-web_c309n-s-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-photosmart_prem_c310_series-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-photosmart_prem_c410_series-hpijs.ppd.gz
-share/foomatic/db/source/PPD/HP/hp-photosmart_prem-web_c309n-s-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-photosmart_premium_c309g-m-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-photosmart_pro_b8300_series-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-photosmart_pro_b8800_series-hpijs.ppd.gz
diff --git a/print/hplip/pkg/PLIST-main b/print/hplip/pkg/PLIST-main
index 6d7b772334b..a93348729ea 100644
--- a/print/hplip/pkg/PLIST-main
+++ b/print/hplip/pkg/PLIST-main
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.9 2010/07/07 16:42:25 ajacoutot Exp $
+@comment $OpenBSD: PLIST-main,v 1.10 2011/03/02 06:59:03 ajacoutot Exp $
 @conflict hplip-docs-*
 @conflict hplip-gui-<3.10.2p0
 bin/hp-align
@@ -215,6 +215,10 @@ share/hplip/fax/fax.py
 share/hplip/fax/fax.pyc
 share/hplip/fax/faxdevice.py
 share/hplip/fax/faxdevice.pyc
+share/hplip/fax/ledmfax.py
+share/hplip/fax/ledmfax.pyc
+share/hplip/fax/ledmsoapfax.py
+share/hplip/fax/ledmsoapfax.pyc
 share/hplip/fax/marvellfax.py
 share/hplip/fax/marvellfax.pyc
 share/hplip/fax/pmlfax.py