Major update to hplip-3.10.2.

Take maintainership.
Tweak, flush and fix dependencies...

Add some example on how to use hplip.

print/hplip/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2010/01/10 18:09:29 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.15 2010/03/21 11:07:43 ajacoutot Exp $
 
 SHARED_ONLY=	Yes
 
@@ -8,21 +8,23 @@ COMMENT-hpcups=	HP native CUPS driver
 COMMENT-libs=	HPLIP backend libraries
 COMMENT-gui=	HPLIP graphical tools
 
-V=		3.9.8
+V=		3.10.2
 DISTNAME=	hplip-${V}
 
-PKGNAME-main=	${DISTNAME}p0
-PKGNAME-hpijs=	hpijs-${V}p1
-PKGNAME-hpcups=	hpcups-${V}p1
-PKGNAME-libs=	hplip-libs-${V}p0
-PKGNAME-gui=	hplip-gui-${V}p0
+PKGNAME-main=	${DISTNAME}
+PKGNAME-hpijs=	hpijs-${V}
+PKGNAME-hpcups=	hpcups-${V}
+PKGNAME-libs=	hplip-libs-${V}
+PKGNAME-gui=	hplip-gui-${V}
 
-SHARED_LIBS +=  hpmud		1.0 # .0.6
-SHARED_LIBS +=  hpip		1.0 # .0.1
+SHARED_LIBS +=  hpmud		2.0 # .0.6
+SHARED_LIBS +=  hpip		2.0 # .0.1
 
 CATEGORIES=	print
 
-HOMEPAGE=	http://hplipopensource.com/hplip-web/
+HOMEPAGE=	http://hplipopensource.com/
+
+MAINTAINER=	Antoine Jacoutot <ajacoutot@openbsd.org>
 
 # GPLv2 - MIT (backend) - BSD (hpijs)
 PERMIT_PACKAGE_CDROM=	Yes
@@ -56,11 +58,12 @@ RUN_DEPENDS-main=${MODPY_RUN_DEPENDS} \
 WANTLIB-hpijs += ${WANTLIB}
 WANTLIB-hpijs += c jpeg netsnmp stdc++ usb
 LIB_DEPENDS-hpijs= hpip,hpmud::print/hplip,-libs \
+		jpeg.>=6.3::graphics/jpeg \
 		dbus-1.>=7::x11/dbus
 
 WANTLIB-hpcups += ${WANTLIB}
-WANTLIB-hpcups += c dbus-1 jpeg netsnmp stdc++ usb
-LIB_DEPENDS-hpcups= hpip,hpmud::print/hplip,-libs \
+WANTLIB-hpcups += c jpeg stdc++
+LIB_DEPENDS-hpcups= hpip::print/hplip,-libs \
 		cups.>=3,cupsimage::print/cups
 
 LIB_DEPENDS-libs= netsnmp.>=7::net/net-snmp \
@@ -78,7 +81,8 @@ MODULES=	devel/gettext \
 USE_LIBTOOL=	Yes
 LIBTOOL_FLAGS=	--tag=disable-static
 FAKE_FLAGS=	hplip_confdir=${PREFIX}/share/examples/hplip/hp \
-		hplip_statedir=${PREFIX}/share/examples/hplip/db
+		hplip_statedir=${PREFIX}/share/examples/hplip/db \
+		mimedir=${PREFIX}/share/examples/hplip/cups
 
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
@@ -113,7 +117,7 @@ pre-configure:
 	@find ${WRKSRC} -name \*.py | \
 		xargs perl -pi -e 's,/usr/bin/env python,${MODPY_BIN},g'
 	${SUBST_CMD} ${WRKSRC}/prnt/cups.py \
-		${WRKSRC}/prnt/hpijs/hpcups.cpp \
+		${WRKSRC}/prnt/hpcups/HPCupsFilter.cpp \
 		${WRKSRC}/prnt/hpijs/hpcupsfax.cpp \
 		${WRKSRC}/prnt/hpijs/foomatic-rip-hplip \
 		${WRKSRC}/prnt/hpijs/hpijs.cpp \
@@ -129,6 +133,7 @@ pre-configure:
 		${WRKSRC}/doc/upgrading.html \
 		${WRKSRC}/doc/uninstalling.html \
 		${WRKSRC}/fax/coverpages.py \
+		${WRKSRC}/fax/filters/pstotiff \
 		${WRKSRC}/base/pkit.py \
 		${WRKSRC}/prnt/hpijs/foomatic-rip-hplip \
 		${WRKSRC}/installer/dcheck.py \
@@ -139,4 +144,8 @@ pre-configure:
 		${WRKSRC}/ui/devmgr4.py \
 		${WRKSRC}/ui/nodevicesform.py
 
+post-install:
+	${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
+		${PREFIX}/share/hplip
+
 .include <bsd.port.mk>

print/hplip/distinfo

@@ -1,5 +1,5 @@
-MD5 (hplip-3.9.8.tar.gz) = yxz0nF8GKZO3j8J2j1Me2A==
-RMD160 (hplip-3.9.8.tar.gz) = iwZTcXa/sy0yriDuwc+mdlYJ7MA=
-SHA1 (hplip-3.9.8.tar.gz) = vPDR2NagBt0AIktPkMIIwhryjlU=
-SHA256 (hplip-3.9.8.tar.gz) = ZHHZm94rEYL0UILFDb2eQko+wsDpjEjJNKHNDUzLTjY=
-SIZE (hplip-3.9.8.tar.gz) = 15715640
+MD5 (hplip-3.10.2.tar.gz) = TfbxbEeuft0BW/LPUVXybw==
+RMD160 (hplip-3.10.2.tar.gz) = RIO9SXu8JygSwx21dLdfblwDs5E=
+SHA1 (hplip-3.10.2.tar.gz) = fNu4ecwSIVKqnj1dwtfdO687BgQ=
+SHA256 (hplip-3.10.2.tar.gz) = u5o67amo0x8Mx5DmKfFNISL5v/ERsNPMl6wZqGB9eVY=
+SIZE (hplip-3.10.2.tar.gz) = 21446275

print/hplip/patches/patch-Makefile_in

@@ -1,7 +1,10 @@
-$OpenBSD: patch-Makefile_in,v 1.5 2009/08/20 08:07:48 ajacoutot Exp $
---- Makefile.in.orig	Tue Aug  4 23:42:38 2009
-+++ Makefile.in	Thu Aug 20 09:26:03 2009
-@@ -3649,10 +3649,10 @@ cups_drv = prnt/drv/hpcups.drv
+$OpenBSD: patch-Makefile_in,v 1.6 2010/03/21 11:07:43 ajacoutot Exp $
+
+libcompat is needed because hplip uses ftime(3).
+
+--- Makefile.in.orig	Thu Feb 25 00:10:02 2010
++++ Makefile.in	Fri Mar 12 14:45:37 2010
+@@ -3746,10 +3746,10 @@ cups_drv = prnt/drv/hpcups.drv
  @HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@	  scan/sane/sanei_init_debug.c scan/sane/marvell.h scan/sane/marvelli.h scan/sane/marvell.c scan/sane/soapht.c scan/sane/soap.c \
  @HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@          scan/sane/soaphti.h scan/sane/soapi.h scan/sane/xml.c scan/sane/xml.h
  
@@ -9,21 +12,21 @@ $OpenBSD: patch-Makefile_in,v 1.5 2009/08/20 08:07:48 ajacoutot Exp $
 +@DARWIN_BUILD_FALSE@@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LDFLAGS = -module -avoid-version
  @DARWIN_BUILD_TRUE@@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LDFLAGS = -module -framework CoreFoundation -version-info 1:0:0
  # The following is a interlibrary dependency that must be compiled first.
--@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la $(DBUS_LIBS) -lcups -ldl -lsane
-+@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la $(DBUS_LIBS) -lcups -lsane
+-@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la $(DBUS_LIBS) -lcups -ldl
++@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la $(DBUS_LIBS) -lcups
  #libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DSOAP_DEBUG
  @HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_CFLAGS = $(DBUS_CFLAGS)
  
-@@ -3676,7 +3676,7 @@ cups_drv = prnt/drv/hpcups.drv
+@@ -3773,7 +3773,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
 -@HPLIP_BUILD_TRUE@hp_mkuri_LDADD = -ldl libhpmud.la
 +@HPLIP_BUILD_TRUE@hp_mkuri_LDADD = libhpmud.la
+ @HPLIP_BUILD_TRUE@hp_mkuri_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\"
  
  # hpmud.rules
- @HPLIP_BUILD_TRUE@rulesdir = /etc/udev/rules.d
-@@ -3858,7 +3858,7 @@ cups_drv = prnt/drv/hpcups.drv
+@@ -3964,7 +3964,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)
@@ -32,7 +35,7 @@ $OpenBSD: patch-Makefile_in,v 1.5 2009/08/20 08:07:48 ajacoutot Exp $
  
  # hplip.desktop
  @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hplip_desktopdir = $(icondir)
-@@ -3925,8 +3925,8 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
+@@ -4031,8 +4031,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)
@@ -42,41 +45,47 @@ $OpenBSD: patch-Makefile_in,v 1.5 2009/08/20 08:07:48 ajacoutot Exp $
 +@HPIJS_INSTALL_TRUE@@HPLIP_BUILD_TRUE@hpijs_LDADD = libapdk.la -ljpeg libhpip.la libhpmud.la $(DBUS_LIBS)
  
  # hpcups
+ #if NEW_HPCUPS
+@@ -4070,7 +4070,7 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
+ @HPCUPS_INSTALL_TRUE@        prnt/hpcups/dj4100PrintModes.h
+ 
+ @HPCUPS_INSTALL_TRUE@hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG)
+-@HPCUPS_INSTALL_TRUE@hpcups_LDADD = -ljpeg -ldl -lcups -lcupsimage
++@HPCUPS_INSTALL_TRUE@hpcups_LDADD = -ljpeg -lcups -lcupsimage -lcompat
+ #else
  #hpcupsdir = $(cupsfilterdir)
-@@ -3948,12 +3948,12 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
- #	prnt/hpcups/BreakTables.cpp prnt/hpcups/PrinterCommands.h prnt/hpcups/Utils.cpp prnt/hpcups/Utils.h \
- #	prnt/hpcups/SystemServices.cpp prnt/hpcups/SystemServices.h
- #hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG)
--#hpcups_LDADD = -ljpeg -ldl libhpip.la libhpmud.la -lcups -lcupsimage
-+#hpcups_LDADD = -ljpeg libhpip.la libhpmud.la -lcups -lcupsimage
- @HPCUPS_INSTALL_TRUE@@NEW_HPCUPS_FALSE@hpcupsdir = $(cupsfilterdir)
- @HPCUPS_INSTALL_TRUE@@NEW_HPCUPS_FALSE@hpcups_SOURCES = prnt/hpijs/hpcups.cpp prnt/hpijs/hpcups.h prnt/hpijs/services.cpp prnt/hpijs/services.h prnt/hpijs/hpiom.c prnt/hpijs/hpiom.h prnt/hpijs/bug.h prnt/hpijs/hpimage.cpp prnt/hpijs/hpimage.h
- @HPCUPS_INSTALL_TRUE@@NEW_HPCUPS_FALSE@hpcups_CXXFLAGS = $(libapdk_la_CXXFLAGS)
- @HPCUPS_INSTALL_TRUE@@NEW_HPCUPS_FALSE@hpcups_CFLAGS = $(libapdk_la_CFLAGS)
--@HPCUPS_INSTALL_TRUE@@NEW_HPCUPS_FALSE@hpcups_LDADD = libapdk.la -ljpeg -ldl libhpip.la libhpmud.la $(DBUS_LIBS) -lcups -lcupsimage
-+@HPCUPS_INSTALL_TRUE@@NEW_HPCUPS_FALSE@hpcups_LDADD = libapdk.la -ljpeg libhpip.la libhpmud.la $(DBUS_LIBS) -lcups -lcupsimage
+ #hpcups_PROGRAMS = hpcups
+@@ -4078,9 +4078,9 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
+ #hpcups_CXXFLAGS = $(libapdk_la_CXXFLAGS)
+ #hpcups_CFLAGS = $(libapdk_la_CFLAGS)
+ #if HPCUPS_ONLY_BUILD
+-#hpcups_LDADD = libapdk.la -ljpeg -ldl -lcups -lcupsimage
++#hpcups_LDADD = libapdk.la -ljpeg -lcups -lcupsimage
+ #else
+-#hpcups_LDADD = libapdk.la -ljpeg -ldl libhpip.la libhpmud.la $(DBUS_LIBS) -lcups -lcupsimage
++#hpcups_LDADD = libapdk.la -ljpeg libhpip.la libhpmud.la $(DBUS_LIBS) -lcups -lcupsimage
+ #endif #HPCUPS_ONLY_BUILD
+ #endif # NEW_HPCUPS
  # hpcupsfax
- @FAX_BUILD_TRUE@@HPCUPS_INSTALL_TRUE@hpcupsfaxdir = $(cupsfilterdir)
- @FAX_BUILD_TRUE@@HPCUPS_INSTALL_TRUE@hpcupsfax_SOURCES = prnt/hpijs/hpcupsfax.cpp prnt/hpijs/hpcupsfax.h
-@@ -6817,7 +6817,7 @@ install-data-am: install-cupsdrv2DATA install-cupsdrvD
- 	install-cupsextLTLIBRARIES install-dist_baseSCRIPTS \
+@@ -7921,7 +7921,7 @@ install-data-am: install-cupsdrv2DATA install-cupsdrvD
+ 	install-cupsextLTLIBRARIES install-dist_baseDATA \
  	install-dist_cacSCRIPTS install-dist_cmdSCRIPTS \
- 	install-dist_copierSCRIPTS install-dist_faxSCRIPTS \
--	install-dist_halpreDATA install-dist_hpcupsfaxppdDATA \
-+	install-dist_hpcupsfaxppdDATA \
- 	install-dist_hpfaxSCRIPTS install-dist_hpijsfaxppdDATA \
- 	install-dist_hplipSCRIPTS install-dist_hplip_stateDATA \
- 	install-dist_images_128x128DATA install-dist_images_16x16DATA \
-@@ -6832,7 +6832,7 @@ install-data-am: install-cupsdrv2DATA install-cupsdrvD
+ 	install-dist_copierDATA install-dist_faxDATA \
+-	install-dist_fax_filtersDATA install-dist_halpreDATA \
++	install-dist_fax_filtersDATA \
+ 	install-dist_hpcupsfaxppdDATA install-dist_hpfaxSCRIPTS \
+ 	install-dist_hpijsfaxppdDATA install-dist_hplipSCRIPTS \
+ 	install-dist_hplip_stateDATA install-dist_images_128x128DATA \
+@@ -7936,7 +7936,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_prntSCRIPTS \
+ 	install-dist_ppdDATA install-dist_prntDATA \
 -	install-dist_ripSCRIPTS install-dist_rulesDATA \
 +	install-dist_ripSCRIPTS \
- 	install-dist_scanSCRIPTS install-dist_ui4SCRIPTS \
- 	install-dist_uiSCRIPTS install-dist_unrelDATA \
- 	install-dist_www0DATA install-dist_www3DATA \
-@@ -7013,17 +7013,6 @@ uninstall-am: uninstall-binPROGRAMS uninstall-cupsdrv2
+ 	install-dist_scanDATA install-dist_ui4DATA install-dist_uiDATA \
+ 	install-dist_unrelDATA install-dist_www0DATA \
+ 	install-dist_www3DATA install-dist_www4DATA install-docDATA \
+@@ -8128,17 +8128,6 @@ uninstall-am: uninstall-binPROGRAMS uninstall-cupsdrv2
  
  
  install-data-hook:

print/hplip/patches/patch-base_codes_py

@@ -1,7 +1,7 @@
-$OpenBSD: patch-base_codes_py,v 1.1 2009/07/13 08:14:28 ajacoutot Exp $
---- base/codes.py.orig	Thu Jul  2 14:07:17 2009
-+++ base/codes.py	Thu Jul  2 14:07:29 2009
-@@ -266,7 +266,7 @@ EVENT_RAISE_DEVICE_MANAGER = 9001
+$OpenBSD: patch-base_codes_py,v 1.2 2010/03/21 11:07:43 ajacoutot Exp $
+--- base/codes.py.orig	Thu Feb 25 00:07:40 2010
++++ base/codes.py	Fri Mar 12 13:40:17 2010
+@@ -267,7 +267,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.

print/hplip/patches/patch-base_pkit_py

@@ -1,7 +1,7 @@
-$OpenBSD: patch-base_pkit_py,v 1.1 2009/07/13 08:14:28 ajacoutot Exp $
---- base/pkit.py.orig	Thu Jun 25 21:05:53 2009
-+++ base/pkit.py	Thu Jul  2 18:38:28 2009
-@@ -277,8 +277,8 @@ def copyPluginFiles(src_dir):
+$OpenBSD: patch-base_pkit_py,v 1.2 2010/03/21 11:07:43 ajacoutot Exp $
+--- base/pkit.py.orig	Thu Feb 25 00:07:40 2010
++++ base/pkit.py	Fri Mar 12 13:40:17 2010
+@@ -346,8 +346,8 @@ def copyPluginFiles(src_dir):
          SANELIBDIR = '/usr/lib64/sane'
          LIBDIR = '/usr/lib64'
      else:
@@ -12,7 +12,7 @@ $OpenBSD: patch-base_pkit_py,v 1.1 2009/07/13 08:14:28 ajacoutot Exp $
  
      copies = []
  
-@@ -400,7 +400,7 @@ def run_plugin_command(required=True, plugin_reason=PL
+@@ -469,7 +469,7 @@ def run_plugin_command(required=True, plugin_reason=PL
      if utils.which("hp-plugin"):
          cmd = su_sudo % ("hp-plugin -u %s --reason %s" % (req, plugin_reason))
      else:

print/hplip/patches/patch-check_py

@@ -1,6 +1,6 @@
-$OpenBSD: patch-check_py,v 1.3 2009/08/20 08:07:48 ajacoutot Exp $
---- check.py.orig	Tue Aug  4 23:37:39 2009
-+++ check.py	Thu Aug 20 09:24:10 2009
+$OpenBSD: patch-check_py,v 1.4 2010/03/21 11:07:43 ajacoutot Exp $
+--- check.py.orig	Thu Feb 25 00:07:55 2010
++++ check.py	Fri Mar 12 13:40:17 2010
 @@ -344,7 +344,7 @@ try:
              num_errors += 1
  
@@ -22,7 +22,7 @@ $OpenBSD: patch-check_py,v 1.3 2009/08/20 08:07:48 ajacoutot Exp $
      try:
          import dbus
          try:
-@@ -482,18 +477,18 @@ try:
+@@ -490,18 +485,18 @@ try:
              log.info("HPLIP %s currently installed in '%s'." % (v, home))
  
              log.info()
@@ -45,7 +45,7 @@ $OpenBSD: patch-check_py,v 1.3 2009/08/20 08:07:48 ajacoutot Exp $
              except (IOError, OSError), e:
                  log.error("Could not access file: %s" % e.strerror)
              else:
-@@ -607,7 +602,7 @@ try:
+@@ -615,7 +610,7 @@ try:
                  #log.info("Installed in HPLIP?: %s" % x)
                  log.info("Device URI: %s" % device_uri)
  
@@ -54,7 +54,7 @@ $OpenBSD: patch-check_py,v 1.3 2009/08/20 08:07:48 ajacoutot Exp $
  
                  if os.path.exists(ppd):
                      log.info("PPD: %s" % ppd)
-@@ -709,11 +704,11 @@ try:
+@@ -717,11 +712,11 @@ try:
  
          if scanning_enabled:
              tui.header("SANE CONFIGURATION")
@@ -69,7 +69,7 @@ $OpenBSD: patch-check_py,v 1.3 2009/08/20 08:07:48 ajacoutot Exp $
                  num_errors += 1
              else:
                  found = False
-@@ -725,7 +720,7 @@ try:
+@@ -733,7 +728,7 @@ try:
                      log.info("OK, found. SANE backend 'hpaio' is properly set up.")
                  else:
                      num_errors += 1

print/hplip/patches/patch-configure

@@ -1,20 +1,20 @@
-$OpenBSD: patch-configure,v 1.4 2009/08/20 08:07:48 ajacoutot Exp $
---- configure.orig	Thu Aug 20 09:22:03 2009
-+++ configure	Thu Aug 20 09:23:14 2009
-@@ -743,10 +743,10 @@ MAKEFLAGS=
+$OpenBSD: patch-configure,v 1.5 2010/03/21 11:07:43 ajacoutot Exp $
+--- configure.orig	Thu Feb 25 00:10:03 2010
++++ configure	Fri Mar 12 13:50:59 2010
+@@ -748,10 +748,10 @@ MAKEFLAGS=
  SHELL=${CONFIG_SHELL-/bin/sh}
  
  # Identity of this package.
 -PACKAGE_NAME='HP Linux Imaging and Printing'
 +PACKAGE_NAME='HP Linux (& Unix) Imaging and Printing'
  PACKAGE_TARNAME='hplip'
- PACKAGE_VERSION='3.9.8'
--PACKAGE_STRING='HP Linux Imaging and Printing 3.9.8'
-+PACKAGE_STRING='HP Linux (& Unix) Imaging and Printing 3.9.8'
- PACKAGE_BUGREPORT='3.9.8.36'
+ PACKAGE_VERSION='3.10.2'
+-PACKAGE_STRING='HP Linux Imaging and Printing 3.10.2'
++PACKAGE_STRING='HP Linux (& Unix) Imaging and Printing 3.10.2'
+ PACKAGE_BUGREPORT='3.10.2rc1.9'
  
  # Factoring default headers for most tests.
-@@ -16242,14 +16242,14 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL
+@@ -21571,14 +21571,14 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
  
@@ -33,7 +33,7 @@ $OpenBSD: patch-configure,v 1.4 2009/08/20 08:07:48 ajacoutot Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -16460,82 +16460,6 @@ else
+@@ -21789,82 +21789,6 @@ else
    { { $as_echo "$as_me:$LINENO: error: \"cannot find libjpeg support\"" >&5
  $as_echo "$as_me: error: \"cannot find libjpeg support\"" >&2;}
     { (exit 102); exit 102; }; }

print/hplip/patches/patch-installer_core_install_py

@@ -1,127 +1,127 @@
-$OpenBSD: patch-installer_core_install_py,v 1.5 2009/08/20 08:07:48 ajacoutot Exp $
---- installer/core_install.py.orig	Tue Aug  4 23:37:17 2009
-+++ installer/core_install.py	Thu Aug 20 09:24:11 2009
-@@ -190,7 +190,7 @@ class CoreInstall(object):
-         self.endian = utils.LITTLE_ENDIAN
-         self.distro, self.distro_name, self.distro_version = DISTRO_UNKNOWN, '', DISTRO_VER_UNKNOWN
-         self.distro_version_supported = False
--        self.install_location = '/usr'
-+        self.install_location = '${PREFIX}'
-         self.hplip_present = False
-         self.have_dependencies = {}
-         self.native_cups = True
-@@ -825,14 +825,14 @@ class CoreInstall(object):
- 
- 
-     def check_make(self):
--        return check_tool('make --version', 3.0)
+$OpenBSD: patch-installer_core_install_py,v 1.6 2010/03/21 11:07:43 ajacoutot Exp $
+--- installer/core_install.py.orig	Thu Feb 25 00:07:12 2010
++++ installer/core_install.py	Fri Mar 12 13:46:51 2010
+@@ -190,7 +190,7 @@ class CoreInstall(object):
+         self.endian = utils.LITTLE_ENDIAN
+         self.distro, self.distro_name, self.distro_version = DISTRO_UNKNOWN, '', DISTRO_VER_UNKNOWN
+         self.distro_version_supported = False
+-        self.install_location = '/usr'
++        self.install_location = '${PREFIX}'
+         self.hplip_present = False
+         self.have_dependencies = {}
+         self.native_cups = True
+@@ -826,14 +826,14 @@ class CoreInstall(object):
+ 
+ 
+     def check_make(self):
+-        return check_tool('make --version', 3.0)
 +        return True
- 
- 
-     def check_libusb(self):
-         if not check_lib('libusb'):
-             return False
- 
--        return len(locate_file_contains("usb.h", '/usr/include', 'usb_init(void)'))
+ 
+ 
+     def check_libusb(self):
+         if not check_lib('libusb'):
+             return False
+ 
+-        return len(locate_file_contains("usb.h", '/usr/include', 'usb_init(void)'))
 +        return len(locate_file_contains("usb.h", '${LOCALBASE}/include', 'usb_init(void)'))
- 
- 
-     def check_libjpeg(self):
-@@ -840,11 +840,11 @@ class CoreInstall(object):
- 
- 
-     def check_libcrypto(self):
--        return check_lib("libcrypto") and check_file("crypto.h")
+ 
+ 
+     def check_libjpeg(self):
+@@ -841,11 +841,11 @@ class CoreInstall(object):
+ 
+ 
+     def check_libcrypto(self):
+-        return check_lib("libcrypto") and check_file("crypto.h")
 +        return True
- 
- 
-     def check_libpthread(self):
--        return check_lib("libpthread") and check_file("pthread.h")
-+        return True
- 
- 
-     def check_libnetsnmp(self):
-@@ -896,7 +896,7 @@ class CoreInstall(object):
- 
- 
-     def check_sane_devel(self):
--        return len(locate_file_contains("sane.h", '/usr/include', 'extern SANE_Status sane_init'))
-+        return len(locate_file_contains("sane.h", '${LOCALBASE}/include', 'extern SANE_Status sane_init'))
- 
- 
-     def check_xsane(self):
-@@ -985,9 +985,8 @@ class CoreInstall(object):
- 
- 
-     def check_dbus(self):
--        log.debug("Checking for dbus running and header files present (dbus-devel)...")
--        return check_ps(['dbus-daemon'])  and \
--            len(locate_file_contains("dbus-message.h", '/usr/include', 'dbus_message_new_signal'))
+ 
+ 
+     def check_libpthread(self):
+-        return check_lib("libpthread") and check_file("pthread.h")
++	return True
+ 
+ 
+     def check_libnetsnmp(self):
+@@ -897,7 +897,7 @@ class CoreInstall(object):
+ 
+ 
+     def check_sane_devel(self):
+-        return len(locate_file_contains("sane.h", '/usr/include', 'extern SANE_Status sane_init'))
++	return len(locate_file_contains("sane.h", '${LOCALBASE}/include', 'extern SANE_Status sane_init'))
+ 
+ 
+     def check_xsane(self):
+@@ -986,9 +986,8 @@ class CoreInstall(object):
+ 
+ 
+     def check_dbus(self):
+-        log.debug("Checking for dbus running and header files present (dbus-devel)...")
+-        return check_ps(['dbus-daemon'])  and \
+-            len(locate_file_contains("dbus-message.h", '/usr/include', 'dbus_message_new_signal'))
 +        log.debug("Checking for dbus header files present (dbus-devel)...")
 +        return check_file("dbus-message.h", "${LOCALBASE}/include")
- 
- 
-     def check_cups_devel(self):
-@@ -1005,12 +1004,12 @@ class CoreInstall(object):
- 
- 
-     def check_cups_image(self):
--      return check_file("raster.h", "/usr/include/cups")
+ 
+ 
+     def check_cups_devel(self):
+@@ -1006,12 +1005,12 @@ class CoreInstall(object):
+ 
+ 
+     def check_cups_image(self):
+-      return check_file("raster.h", "/usr/include/cups")
 +      return check_file("raster.h", "${LOCALBASE}/include/cups")
- 
- 
-     def check_hplip(self):
-         log.debug("Checking for HPLIP...")
--        return locate_files('hplip.conf', '/etc/hp')
+ 
+ 
+     def check_hplip(self):
+         log.debug("Checking for HPLIP...")
+-        return locate_files('hplip.conf', '/etc/hp')
 +        return locate_files('hplip.conf', '${SYSCONFDIR}/hp')
- 
- 
-     def check_hpssd(self):
-@@ -1035,14 +1034,14 @@ class CoreInstall(object):
-     def check_cupsddk(self):
-         log.debug("Checking for cups-ddk...")
-         # TODO: Compute these paths some way or another...
--        #return check_tool("/usr/lib/cups/driver/drv list") and os.path.exists("/usr/share/cupsddk/include/media.defs")
--        return (check_file('drv', "/usr/lib/cups/driver") or check_file('drv', "/usr/lib64/cups/driver")) and \
--            check_file('media.defs', "/usr/share/cupsddk/include")
+ 
+ 
+     def check_hpssd(self):
+@@ -1036,14 +1035,14 @@ class CoreInstall(object):
+     def check_cupsddk(self):
+         log.debug("Checking for cups-ddk...")
+         # TODO: Compute these paths some way or another...
+-        #return check_tool("/usr/lib/cups/driver/drv list") and os.path.exists("/usr/share/cupsddk/include/media.defs")
+-        return (check_file('drv', "/usr/lib/cups/driver") or check_file('drv', "/usr/lib64/cups/driver")) and \
+-            check_file('media.defs', "/usr/share/cupsddk/include")
 +        #return check_tool("${LOCALBASE}/libexec/cups/driver/drv list") and os.path.exists("/usr/share/cupsddk/include/media.defs")
 +        return (check_file('drv', "${LOCALBASE}/libexec/cups/driver") or check_file('drv', "/usr/lib64/cups/driver")) and \
 +            check_file('media.defs', "${LOCALBASE}/share/cupsddk/include")
- 
- 
-     def check_policykit(self):
-         log.debug("Checking for PolicyKit...")
--        return check_file('PolicyKit.conf', "/etc/PolicyKit") and check_file('org.gnome.PolicyKit.AuthorizationManager.service', "/usr/share/dbus-1/services")
-+        return check_file('PolicyKit.conf', "${SYSCONFDIR}/PolicyKit") and check_file('org.gnome.PolicyKit.AuthorizationManager.service', "${LOCALBASE}/share/dbus-1/services")
- 
- 
-     def check_pkg_mgr(self):
-@@ -1221,7 +1220,7 @@ class CoreInstall(object):
-             cmd = self.su_sudo() % '/etc/init.d/cupsys restart'
- 
-         else:
--            cmd = self.su_sudo() % 'killall -HUP cupsd'
+ 
+ 
+     def check_policykit(self):
+         log.debug("Checking for PolicyKit...")
+-        return (check_file('PolicyKit.conf', "/etc/PolicyKit") and check_file('org.gnome.PolicyKit.AuthorizationManager.service', "/usr/share/dbus-1/services")) or (check_file('50-localauthority.conf', "/etc/polkit-1/localauthority.conf.d") and check_file('org.freedesktop.PolicyKit1.service', "/usr/share/dbus-1/system-services"))
++        return (check_file('PolicyKit.conf', "${SYSCONFDIR}/PolicyKit") and check_file('org.gnome.PolicyKit.AuthorizationManager.service', "${LOCALBASE}/share/dbus-1/services")) or (check_file('50-localauthority.conf', "${SYSCONFDIR}/polkit-1/localauthority.conf.d") and check_file('org.freedesktop.PolicyKit1.service', "${LOCALBASE}/share/dbus-1/system-services"))
+ 
+     def check_pkg_mgr(self):
+         """
+@@ -1327,7 +1326,7 @@ class CoreInstall(object):
+             cmd = self.su_sudo() % '/etc/init.d/cupsys restart'
+ 
+         else:
+-            cmd = self.su_sudo() % 'killall -HUP cupsd'
 +            cmd = self.su_sudo() % 'pkill -HUP cupsd'
- 
-         self.run(cmd)
- 
-@@ -1536,7 +1535,7 @@ class CoreInstall(object):
-     def pre_build(self):
-         cmds = []
-         if self.get_distro_ver_data('fix_ppd_symlink', False):
--            cmds.append(self.su_sudo() % 'python ./installer/fix_symlink.py')
+ 
+         self.run(cmd)
+ 
+@@ -1649,7 +1648,7 @@ class CoreInstall(object):
+     def pre_build(self):
+         cmds = []
+         if self.get_distro_ver_data('fix_ppd_symlink', False):
+-            cmds.append(self.su_sudo() % 'python ./installer/fix_symlink.py')
 +            cmds.append(self.su_sudo() % '${MODPY_BIN} ./installer/fix_symlink.py')
- 
-         return cmds
- 
-@@ -1706,8 +1705,8 @@ class CoreInstall(object):
-         url = "http://hplip.sf.net/plugin.conf"
-         home = sys_conf.get('dirs', 'home')
- 
--        if os.path.exists('/etc/hp/plugin.conf'):
--            url = "file:///etc/hp/plugin.conf"
+ 
+         return cmds
+ 
+@@ -1819,8 +1818,8 @@ class CoreInstall(object):
+         url = "http://hplip.sf.net/plugin.conf"
+         home = sys_conf.get('dirs', 'home')
+ 
+-        if os.path.exists('/etc/hp/plugin.conf'):
+-            url = "file:///etc/hp/plugin.conf"
 +        if os.path.exists('${SYSCONFDIR}/hp/plugin.conf'):
 +            url = "file:///${SYSCONFDIR}/hp/plugin.conf"
- 
-         elif os.path.exists(os.path.join(home, 'plugin.conf')):
-             url = "file://" + os.path.join(home, 'plugin.conf')
+ 
+         elif os.path.exists(os.path.join(home, 'plugin.conf')):
+             url = "file://" + os.path.join(home, 'plugin.conf')

print/hplip/patches/patch-io_hpmud_musb_c

@@ -1,10 +1,10 @@
-$OpenBSD: patch-io_hpmud_musb_c,v 1.1 2009/07/13 08:14:28 ajacoutot Exp $
+$OpenBSD: patch-io_hpmud_musb_c,v 1.2 2010/03/21 11:07:43 ajacoutot Exp $
 
 Fix probing HP PS 8250 printer, from FreeBSD.
 
---- io/hpmud/musb.c.orig	Thu Jun 25 21:05:49 2009
-+++ io/hpmud/musb.c	Thu Jul  2 14:46:21 2009
-@@ -124,8 +124,10 @@ static int get_string_descriptor(usb_dev_handle *dev, 
+--- io/hpmud/musb.c.orig	Thu Feb 25 00:07:17 2010
++++ io/hpmud/musb.c	Fri Mar 12 13:40:17 2010
+@@ -125,8 +125,10 @@ static int get_string_descriptor(usb_dev_handle *dev, 
                 0x409, tbuf, sizeof(tbuf), LIBUSB_CONTROL_REQ_TIMEOUT);
        if (ret==0)
        {

print/hplip/patches/patch-prnt_hpcups_ErnieFilter_cpp

@@ -0,0 +1,12 @@
+$OpenBSD: patch-prnt_hpcups_ErnieFilter_cpp,v 1.1 2010/03/21 11:07:43 ajacoutot Exp $
+--- prnt/hpcups/ErnieFilter.cpp.orig	Fri Mar 12 14:08:01 2010
++++ prnt/hpcups/ErnieFilter.cpp	Fri Mar 12 14:08:12 2010
+@@ -50,7 +50,7 @@
+ #include "ErnieFilter.h"
+ 
+ 
+-#if defined(__APPLE__) || defined(__linux)
++#if defined(__APPLE__) || defined(__linux) || defined(__OpenBSD__)
+ #include <math.h>
+ #endif
+ 

print/hplip/patches/patch-prnt_hpcups_HPCupsFilter_cpp

@@ -0,0 +1,12 @@
+$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 ()
+     FILE    *fp;
+     char    str[258];
+     char    *p;
+-    fp = fopen ("/etc/cups/cupsd.conf", "r");
++    fp = fopen ("${SYSCONFDIR}/cups/cupsd.conf", "r");
+     if (fp == NULL)
+         return;
+     while (!feof (fp))

print/hplip/patches/patch-prnt_hpijs_globals_cpp

@@ -1,7 +1,7 @@
-$OpenBSD: patch-prnt_hpijs_globals_cpp,v 1.2 2009/07/13 08:14:28 ajacoutot Exp $
---- prnt/hpijs/globals.cpp.orig	Thu Jul  2 14:06:40 2009
-+++ prnt/hpijs/globals.cpp	Thu Jul  2 14:06:50 2009
-@@ -249,7 +249,7 @@ void *LoadPlugin (const char *szPluginName)
+$OpenBSD: patch-prnt_hpijs_globals_cpp,v 1.3 2010/03/21 11:07:43 ajacoutot Exp $
+--- prnt/hpijs/globals.cpp.orig	Thu Feb 25 00:10:32 2010
++++ prnt/hpijs/globals.cpp	Fri Mar 12 13:40:17 2010
+@@ -251,7 +251,7 @@ void *LoadPlugin (const char *szPluginName)
      void    *ptemp = NULL;
      char    *p = NULL;
      int     bFound = 0;

print/hplip/patches/patch-prnt_hpijs_hpcups_cpp

@@ -1,12 +0,0 @@
-$OpenBSD: patch-prnt_hpijs_hpcups_cpp,v 1.1 2009/07/13 08:14:28 ajacoutot Exp $
---- prnt/hpijs/hpcups.cpp.orig	Thu Jul  2 14:10:57 2009
-+++ prnt/hpijs/hpcups.cpp	Thu Jul  2 14:11:08 2009
-@@ -96,7 +96,7 @@ void HPCups::setLogLevel ()
-     FILE    *fp;
-     char    str[258];
-     char    *p;
--    fp = fopen ("/etc/cups/cupsd.conf", "r");
-+    fp = fopen ("${SYSCONFDIR}/cups/cupsd.conf", "r");
-     if (fp == NULL)
-         return;
-     while (!feof (fp))

print/hplip/patches/patch-prnt_hpijs_hpcupsfax_cpp

@@ -1,7 +1,7 @@
-$OpenBSD: patch-prnt_hpijs_hpcupsfax_cpp,v 1.1 2009/07/13 08:14:28 ajacoutot Exp $
---- prnt/hpijs/hpcupsfax.cpp.orig	Thu Jul  2 14:11:13 2009
-+++ prnt/hpijs/hpcupsfax.cpp	Thu Jul  2 14:11:25 2009
-@@ -74,7 +74,7 @@ static void GetLogLevel ()
+$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 ()
      FILE    *fp;
      char    str[258];
      char    *p;

print/hplip/patches/patch-ui4_devmgr5_py

@@ -1,6 +1,6 @@
-$OpenBSD: patch-ui4_devmgr5_py,v 1.2 2009/08/20 08:07:48 ajacoutot Exp $
---- ui4/devmgr5.py.orig	Tue Aug  4 23:37:22 2009
-+++ ui4/devmgr5.py	Thu Aug 20 09:24:11 2009
+$OpenBSD: patch-ui4_devmgr5_py,v 1.3 2010/03/21 11:07:43 ajacoutot Exp $
+--- ui4/devmgr5.py.orig	Thu Feb 25 00:07:15 2010
++++ ui4/devmgr5.py	Fri Mar 12 13:40:19 2010
 @@ -988,7 +988,7 @@ class DevMgr5(QMainWindow,  Ui_MainWindow):
                      return
  
@@ -10,7 +10,7 @@ $OpenBSD: patch-ui4_devmgr5_py,v 1.2 2009/08/20 08:07:48 ajacoutot Exp $
                  hplip_conf.readfp(fp)
                  fp.close()
  
-@@ -2032,7 +2032,7 @@ class DevMgr5(QMainWindow,  Ui_MainWindow):
+@@ -2034,7 +2034,7 @@ class DevMgr5(QMainWindow,  Ui_MainWindow):
          if utils.which('hp-setup'):
              cmd = 'hp-setup --gui'
          else:
@@ -19,7 +19,7 @@ $OpenBSD: patch-ui4_devmgr5_py,v 1.2 2009/08/20 08:07:48 ajacoutot Exp $
  
          log.debug(cmd)
          utils.run(cmd, log_output=True, password_func=None, timeout=1)
-@@ -2044,7 +2044,7 @@ class DevMgr5(QMainWindow,  Ui_MainWindow):
+@@ -2046,7 +2046,7 @@ class DevMgr5(QMainWindow,  Ui_MainWindow):
          if utils.which('hp-setup'):
              cmd = 'hp-setup --gui --remove'
          else:

print/hplip/pkg/MESSAGE-hpcups

@@ -0,0 +1,8 @@
+To add a CUPS printer, use the 'hp-makeuri' command.
+e.g. for a network printer:
+$ hp-makeuri 192.168.10.100
+<...>
+CUPS URI: hp:/net/HP_LaserJet_5100_Series?ip=192.168.10.100
+
+Then in the CUPS interface, add an 'HP Printer (HPLIP)' entry with the
+corresponding URI.

print/hplip/pkg/PLIST-gui

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-gui,v 1.2 2009/12/22 15:54:32 ajacoutot Exp $
+@comment $OpenBSD: PLIST-gui,v 1.3 2010/03/21 11:07:43 ajacoutot Exp $
 @conflict hplip-<3.9.6b
 bin/hp-check
 bin/hp-print
@@ -12,7 +12,9 @@ share/examples/hplip/xdg/autostart/
 share/examples/hplip/xdg/autostart/hplip-systray.desktop
 @sample ${SYSCONFDIR}/xdg/autostart/hplip-systray.desktop
 share/hplip/check.py
+share/hplip/check.pyc
 share/hplip/clean.py
+share/hplip/clean.pyc
 share/hplip/data/images/
 share/hplip/data/images/128x128/
 share/hplip/data/images/128x128/audio.png
@@ -83,6 +85,7 @@ share/hplip/data/images/24x24/remove_user.png
 share/hplip/data/images/24x24/rename_group.png
 share/hplip/data/images/256x256/
 share/hplip/data/images/256x256/hp_logo.png
+share/hplip/data/images/256x256/logo.png
 share/hplip/data/images/32x32/
 share/hplip/data/images/32x32/align.png
 share/hplip/data/images/32x32/battery.png
@@ -335,70 +338,134 @@ share/hplip/data/images/other/v-kc-2.png
 share/hplip/data/images/other/v-kc-3.png
 share/hplip/data/images/other/zca.png
 share/hplip/print.py
+share/hplip/print.pyc
 share/hplip/systray.py
+share/hplip/systray.pyc
 share/hplip/toolbox.py
+share/hplip/toolbox.pyc
 share/hplip/ui4/
 share/hplip/ui4/__init__.py
+share/hplip/ui4/__init__.pyc
 share/hplip/ui4/aboutdialog.py
+share/hplip/ui4/aboutdialog.pyc
 share/hplip/ui4/aboutdialog_base.py
+share/hplip/ui4/aboutdialog_base.pyc
 share/hplip/ui4/aligndialog.py
+share/hplip/ui4/aligndialog.pyc
 share/hplip/ui4/aligndialog_base.py
+share/hplip/ui4/aligndialog_base.pyc
 share/hplip/ui4/cleandialog.py
+share/hplip/ui4/cleandialog.pyc
 share/hplip/ui4/cleandialog_base.py
+share/hplip/ui4/cleandialog_base.pyc
 share/hplip/ui4/colorcaldialog.py
+share/hplip/ui4/colorcaldialog.pyc
 share/hplip/ui4/colorcaldialog_base.py
+share/hplip/ui4/colorcaldialog_base.pyc
 share/hplip/ui4/devicesetupdialog.py
+share/hplip/ui4/devicesetupdialog.pyc
 share/hplip/ui4/devicesetupdialog_base.py
+share/hplip/ui4/devicesetupdialog_base.pyc
 share/hplip/ui4/deviceuricombobox.py
+share/hplip/ui4/deviceuricombobox.pyc
 share/hplip/ui4/devmgr5.py
+share/hplip/ui4/devmgr5.pyc
 share/hplip/ui4/devmgr5_base.py
+share/hplip/ui4/devmgr5_base.pyc
 share/hplip/ui4/fabgrouptable.py
+share/hplip/ui4/fabgrouptable.pyc
 share/hplip/ui4/fabnametable.py
+share/hplip/ui4/fabnametable.pyc
 share/hplip/ui4/fabwindow.py
+share/hplip/ui4/fabwindow.pyc
 share/hplip/ui4/fabwindow_base.py
+share/hplip/ui4/fabwindow_base.pyc
 share/hplip/ui4/faxsetupdialog.py
+share/hplip/ui4/faxsetupdialog.pyc
 share/hplip/ui4/faxsetupdialog_base.py
+share/hplip/ui4/faxsetupdialog_base.pyc
 share/hplip/ui4/filetable.py
+share/hplip/ui4/filetable.pyc
 share/hplip/ui4/firmwaredialog.py
+share/hplip/ui4/firmwaredialog.pyc
 share/hplip/ui4/firmwaredialog_base.py
+share/hplip/ui4/firmwaredialog_base.pyc
 share/hplip/ui4/infodialog.py
+share/hplip/ui4/infodialog.pyc
 share/hplip/ui4/infodialog_base.py
+share/hplip/ui4/infodialog_base.pyc
 share/hplip/ui4/linefeedcaldialog.py
+share/hplip/ui4/linefeedcaldialog.pyc
 share/hplip/ui4/linefeedcaldialog_base.py
+share/hplip/ui4/linefeedcaldialog_base.pyc
 share/hplip/ui4/loadpapergroupbox.py
+share/hplip/ui4/loadpapergroupbox.pyc
 share/hplip/ui4/makecopiesdialog.py
+share/hplip/ui4/makecopiesdialog.pyc
 share/hplip/ui4/makecopiesdialog_base.py
+share/hplip/ui4/makecopiesdialog_base.pyc
 share/hplip/ui4/mimetypesdialog.py
+share/hplip/ui4/mimetypesdialog.pyc
 share/hplip/ui4/mimetypesdialog_base.py
+share/hplip/ui4/mimetypesdialog_base.pyc
 share/hplip/ui4/nodevicesdialog.py
+share/hplip/ui4/nodevicesdialog.pyc
 share/hplip/ui4/nodevicesdialog_base.py
+share/hplip/ui4/nodevicesdialog_base.pyc
 share/hplip/ui4/plugindialog.py
+share/hplip/ui4/plugindialog.pyc
 share/hplip/ui4/plugindialog_base.py
+share/hplip/ui4/plugindialog_base.pyc
 share/hplip/ui4/pluginlicensedialog.py
+share/hplip/ui4/pluginlicensedialog.pyc
 share/hplip/ui4/pluginlicensedialog_base.py
+share/hplip/ui4/pluginlicensedialog_base.pyc
 share/hplip/ui4/plugins/
 share/hplip/ui4/pqdiagdialog.py
+share/hplip/ui4/pqdiagdialog.pyc
 share/hplip/ui4/pqdiagdialog_base.py
+share/hplip/ui4/pqdiagdialog_base.pyc
 share/hplip/ui4/printdialog.py
+share/hplip/ui4/printdialog.pyc
 share/hplip/ui4/printdialog_base.py
+share/hplip/ui4/printdialog_base.pyc
 share/hplip/ui4/printernamecombobox.py
+share/hplip/ui4/printernamecombobox.pyc
 share/hplip/ui4/printsettingsdialog.py
+share/hplip/ui4/printsettingsdialog.pyc
 share/hplip/ui4/printsettingsdialog_base.py
+share/hplip/ui4/printsettingsdialog_base.pyc
 share/hplip/ui4/printsettingstoolbox.py
+share/hplip/ui4/printsettingstoolbox.pyc
 share/hplip/ui4/printtestpagedialog.py
+share/hplip/ui4/printtestpagedialog.pyc
 share/hplip/ui4/printtestpagedialog_base.py
+share/hplip/ui4/printtestpagedialog_base.pyc
 share/hplip/ui4/readonlyradiobutton.py
+share/hplip/ui4/readonlyradiobutton.pyc
 share/hplip/ui4/sendfaxdialog.py
+share/hplip/ui4/sendfaxdialog.pyc
 share/hplip/ui4/sendfaxdialog_base.py
+share/hplip/ui4/sendfaxdialog_base.pyc
 share/hplip/ui4/settingsdialog.py
+share/hplip/ui4/settingsdialog.pyc
 share/hplip/ui4/settingsdialog_base.py
+share/hplip/ui4/settingsdialog_base.pyc
 share/hplip/ui4/setupdialog.py
+share/hplip/ui4/setupdialog.pyc
 share/hplip/ui4/setupdialog_base.py
+share/hplip/ui4/setupdialog_base.pyc
 share/hplip/ui4/systemtray.py
+share/hplip/ui4/systemtray.pyc
 share/hplip/ui4/systrayframe.py
+share/hplip/ui4/systrayframe.pyc
 share/hplip/ui4/systrayframe_base.py
+share/hplip/ui4/systrayframe_base.pyc
 share/hplip/ui4/ui_utils.py
+share/hplip/ui4/ui_utils.pyc
 share/hplip/ui4/wifisetupdialog.py
+share/hplip/ui4/wifisetupdialog.pyc
 share/hplip/ui4/wifisetupdialog_base.py
+share/hplip/ui4/wifisetupdialog_base.pyc
 @exec %D/bin/update-desktop-database
 @unexec-delete %D/bin/update-desktop-database

print/hplip/pkg/PLIST-hpijs

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-hpijs,v 1.5 2010/01/10 16:43:18 ajacoutot Exp $
+@comment $OpenBSD: PLIST-hpijs,v 1.6 2010/03/21 11:07:43 ajacoutot Exp $
 @conflict hplip-libs-<=3.9.8
 @pkgpath print/hpijs
 @bin bin/hpijs
@@ -12,6 +12,8 @@ share/foomatic/db/source/PPD/
 share/foomatic/db/source/PPD/HP/
 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-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
@@ -119,6 +121,7 @@ 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
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_cm6030_mfp-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_cm6040_mfp-hpijs.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-color_laserjet_cm6040_mfp-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_cm6049_mfp-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_cm6049_mfp-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_cp1215-hpijs.ppd.gz
@@ -142,16 +145,27 @@ share/foomatic/db/source/PPD/HP/hp-color_laserjet_cp3525-hpijs-pcl3.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_cp3525-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_cp4005-hpijs-pcl3.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_cp4005-ps.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-color_laserjet_cp4020_series-hpijs-pcl3.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-color_laserjet_cp4020_series-ps.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-color_laserjet_cp4520_series-hpijs-pcl3.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-color_laserjet_cp4520_series-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_cp5225-hpijs-pcl3.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-color_laserjet_cp5225-ps.ppd.gz
 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_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
 share/foomatic/db/source/PPD/HP/hp-designjet_4020ps-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-designjet_4520mfp-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-designjet_4520ps-ps.ppd.gz
-share/foomatic/db/source/PPD/HP/hp-deskjet_670c-hpijs.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-designjet_t1120ps_24in-ps.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-designjet_t1120ps_44in-ps.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-designjet_t1200_postscript-ps.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-designjet_t770_postscript-ps.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-designjet_t770ps_24in-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-deskjet_1100-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-deskjet_1120-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-deskjet_1125-hpijs.ppd.gz
@@ -220,6 +234,7 @@ share/foomatic/db/source/PPD/HP/hp-deskjet_656c-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-deskjet_660-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-deskjet_6600-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-deskjet_670-hpijs.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-deskjet_670c-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-deskjet_670tv-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-deskjet_672c-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-deskjet_680-hpijs.ppd.gz
@@ -291,12 +306,14 @@ share/foomatic/db/source/PPD/HP/hp-deskjet_d5500_series-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-deskjet_d730-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-deskjet_f2100_series-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-deskjet_f2200_series-hpijs.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-deskjet_f2400_series-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-deskjet_f300_series-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-deskjet_f4100_series-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-deskjet_f4200_series-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-deskjet_f4210_series-hpijs.ppd.gz
 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_advant_k109a-z-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-deskjet_ink_advant_k209a-z-hpijs.ppd.gz
@@ -376,13 +393,10 @@ share/foomatic/db/source/PPD/HP/hp-laserjet_3052-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_3055-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_3100-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_3150-hpijs.ppd.gz
-share/foomatic/db/source/PPD/HP/hp-laserjet_3200-hpijs-pcl3.ppd.gz
-share/foomatic/db/source/PPD/HP/hp-laserjet_3200-ps.ppd.gz
-share/foomatic/db/source/PPD/HP/hp-laserjet_3200_series-ps.ppd.gz
-share/foomatic/db/source/PPD/HP/hp-laserjet_3200m-hpijs.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-laserjet_3200-hpijs.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-laserjet_3200m-hpijs-pcl3.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_3200m-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_3200se-hpijs.ppd.gz
-share/foomatic/db/source/PPD/HP/hp-laserjet_3200se-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_3300_3310_3320-hpijs-pcl3.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_3300_3310_3320-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_3330-hpijs.ppd.gz
@@ -583,6 +597,8 @@ share/foomatic/db/source/PPD/HP/hp-officejet_4115_series-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-officejet_4200_series-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-officejet_4255-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-officejet_4300_series-hpijs.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-officejet_4500_g510a-f-hpijs.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-officejet_4500_g510g-m-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-officejet_5100_series-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-officejet_5105-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-officejet_5110-hpijs.ppd.gz
@@ -610,7 +626,6 @@ share/foomatic/db/source/PPD/HP/hp-officejet_g85-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-officejet_g85xi-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-officejet_g95-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-officejet_h470-hpijs.ppd.gz
-share/foomatic/db/source/PPD/HP/hp-officejet_j3500_series-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-officejet_j3600_series-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-officejet_j4500_series-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-officejet_j4660_series-hpijs.ppd.gz
@@ -715,8 +730,10 @@ share/foomatic/db/source/PPD/HP/hp-photosmart_a530_series-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-photosmart_a610_series-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-photosmart_a620_series-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-photosmart_a630_series-hpijs.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-photosmart_a640_series-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-photosmart_a710_series-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-photosmart_a820_series-hpijs.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-photosmart_b109a_series-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-photosmart_b8500_series-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-photosmart_c309a_series-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-photosmart_c3100_series-hpijs.ppd.gz
@@ -751,8 +768,11 @@ share/foomatic/db/source/PPD/HP/hp-photosmart_d7500_series-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_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
+share/foomatic/db/source/PPD/HP/hp-photosmart_wireless_b109n-z-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-printer_scanner_copier_300-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-psc_1000_series-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-psc_1100_series-hpijs.ppd.gz

print/hplip/pkg/PLIST-main

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.6 2009/08/20 08:07:48 ajacoutot Exp $
+@comment $OpenBSD: PLIST-main,v 1.7 2010/03/21 11:07:43 ajacoutot Exp $
 @conflict hplip-docs-*
 bin/hp-align
 bin/hp-clean
@@ -39,6 +39,7 @@ lib/sane/libsane-hpaio.so
 @bin libexec/cups/backend/hp
 libexec/cups/backend/hpfax
 libexec/cups/filter/hpcac
+libexec/cups/filter/pstotiff
 share/doc/hplip/
 share/doc/hplip/COPYING
 share/doc/hplip/README_LIBJPG
@@ -77,6 +78,11 @@ share/doc/hplip/troubleshooting.html
 share/doc/hplip/uninstalling.html
 share/doc/hplip/upgrading.html
 share/examples/hplip/
+share/examples/hplip/cups/
+share/examples/hplip/cups/pstotiff.convs
+@sample ${SYSCONFDIR}/cups/pstotiff.convs
+share/examples/hplip/cups/pstotiff.types
+@sample ${SYSCONFDIR}/cups/pstotiff.types
 share/examples/hplip/db/
 @sample /var/db/hp/
 share/examples/hplip/db/hplip.state
@@ -87,37 +93,67 @@ share/examples/hplip/hp/hplip.conf
 @sample ${SYSCONFDIR}/hp/hplip.conf
 share/hplip/
 share/hplip/__init__.py
+share/hplip/__init__.pyc
 share/hplip/align.py
+share/hplip/align.pyc
 share/hplip/base/
 share/hplip/base/__init__.py
+share/hplip/base/__init__.pyc
 share/hplip/base/codes.py
+share/hplip/base/codes.pyc
 share/hplip/base/device.py
+share/hplip/base/device.pyc
 share/hplip/base/dime.py
+share/hplip/base/dime.pyc
 share/hplip/base/exif.py
+share/hplip/base/exif.pyc
 share/hplip/base/g.py
+share/hplip/base/g.pyc
 share/hplip/base/imagesize.py
+share/hplip/base/imagesize.pyc
 share/hplip/base/ldif.py
+share/hplip/base/ldif.pyc
 share/hplip/base/logger.py
+share/hplip/base/logger.pyc
 share/hplip/base/magic.py
+share/hplip/base/magic.pyc
 share/hplip/base/maint.py
+share/hplip/base/maint.pyc
 share/hplip/base/mdns.py
+share/hplip/base/mdns.pyc
 share/hplip/base/mfpdtf.py
+share/hplip/base/mfpdtf.pyc
 share/hplip/base/models.py
+share/hplip/base/models.pyc
 share/hplip/base/module.py
+share/hplip/base/module.pyc
 share/hplip/base/pexpect.py
+share/hplip/base/pexpect.pyc
 share/hplip/base/pkit.py
+share/hplip/base/pkit.pyc
 share/hplip/base/pml.py
+share/hplip/base/pml.pyc
 share/hplip/base/slp.py
+share/hplip/base/slp.pyc
 share/hplip/base/status.py
+share/hplip/base/status.pyc
 share/hplip/base/strings.py
+share/hplip/base/strings.pyc
 share/hplip/base/tui.py
+share/hplip/base/tui.pyc
 share/hplip/base/utils.py
+share/hplip/base/utils.pyc
 share/hplip/base/vcard.py
+share/hplip/base/vcard.pyc
 share/hplip/base/wifi.py
+share/hplip/base/wifi.pyc
 share/hplip/colorcal.py
+share/hplip/colorcal.pyc
 share/hplip/copier/
 share/hplip/copier/__init__.py
+share/hplip/copier/__init__.pyc
 share/hplip/copier/copier.py
+share/hplip/copier/copier.pyc
 share/hplip/data/
 share/hplip/data/ldl/
 share/hplip/data/ldl/cb2pcal.ldl.gz
@@ -160,50 +196,97 @@ share/hplip/data/ps/
 share/hplip/data/ps/clean_page.pdf.gz
 share/hplip/data/ps/testpage.ps.gz
 share/hplip/devicesettings.py
+share/hplip/devicesettings.pyc
 share/hplip/fab.py
+share/hplip/fab.pyc
 share/hplip/fax/
 share/hplip/fax/__init__.py
+share/hplip/fax/__init__.pyc
 share/hplip/fax/coverpages.py
+share/hplip/fax/coverpages.pyc
 share/hplip/fax/fax.py
+share/hplip/fax/fax.pyc
 share/hplip/fax/faxdevice.py
+share/hplip/fax/faxdevice.pyc
+share/hplip/fax/marvellfax.py
+share/hplip/fax/marvellfax.pyc
 share/hplip/fax/pmlfax.py
+share/hplip/fax/pmlfax.pyc
+share/hplip/fax/pstotiff
+share/hplip/fax/pstotiff.convs
+share/hplip/fax/pstotiff.types
 share/hplip/fax/soapfax.py
+share/hplip/fax/soapfax.pyc
 share/hplip/faxsetup.py
+share/hplip/faxsetup.pyc
 share/hplip/firmware.py
+share/hplip/firmware.pyc
 share/hplip/hpdio.py
+share/hplip/hpdio.pyc
 share/hplip/hpssd.py
+share/hplip/hpssd.pyc
 share/hplip/info.py
+share/hplip/info.pyc
 share/hplip/installer/
 share/hplip/installer/__init__.py
+share/hplip/installer/__init__.pyc
 share/hplip/installer/core_install.py
+share/hplip/installer/core_install.pyc
 share/hplip/installer/dcheck.py
+share/hplip/installer/dcheck.pyc
 share/hplip/installer/distros.dat
 share/hplip/levels.py
+share/hplip/levels.pyc
 share/hplip/linefeedcal.py
+share/hplip/linefeedcal.pyc
 share/hplip/makecopies.py
+share/hplip/makecopies.pyc
 share/hplip/makeuri.py
+share/hplip/makeuri.pyc
 share/hplip/pcard/
 share/hplip/pcard/__init__.py
+share/hplip/pcard/__init__.pyc
 share/hplip/pcard/photocard.py
+share/hplip/pcard/photocard.pyc
 share/hplip/pkservice.py
+share/hplip/pkservice.pyc
 share/hplip/plugin.py
+share/hplip/plugin.pyc
 share/hplip/pqdiag.py
+share/hplip/pqdiag.pyc
 share/hplip/printsettings.py
+share/hplip/printsettings.pyc
 share/hplip/prnt/
 share/hplip/prnt/__init__.py
+share/hplip/prnt/__init__.pyc
 share/hplip/prnt/colorcal.py
+share/hplip/prnt/colorcal.pyc
 share/hplip/prnt/cups.py
+share/hplip/prnt/cups.pyc
 share/hplip/prnt/ldl.py
+share/hplip/prnt/ldl.pyc
 share/hplip/prnt/pcl.py
+share/hplip/prnt/pcl.pyc
 share/hplip/probe.py
+share/hplip/probe.pyc
 share/hplip/query.py
+share/hplip/query.pyc
 share/hplip/scan/
 share/hplip/scan.py
+share/hplip/scan.pyc
 share/hplip/scan/__init__.py
+share/hplip/scan/__init__.pyc
 share/hplip/scan/sane.py
+share/hplip/scan/sane.pyc
 share/hplip/sendfax.py
+share/hplip/sendfax.pyc
 share/hplip/setup.py
+share/hplip/setup.pyc
 share/hplip/testpage.py
+share/hplip/testpage.pyc
 share/hplip/timedate.py
+share/hplip/timedate.pyc
 share/hplip/unload.py
+share/hplip/unload.pyc
 share/hplip/wificonfig.py
+share/hplip/wificonfig.pyc