Long overdue major update to system-config-printer-1.3.2.

2011-05-04 09:10:52 +00:00 · 2011-05-04 09:10:52 +00:00 · a3bedc421e
commit a3bedc421e
parent b8d497bcc1
23 changed files with 297 additions and 301 deletions
--- a/print/system-config-printer/Makefile
+++ b/print/system-config-printer/Makefile
@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.20 2010/11/20 09:48:40 espie Exp $
+# $OpenBSD: Makefile,v 1.21 2011/05/04 09:10:52 ajacoutot Exp $

 COMMENT=		printer (CUPS) administration tool

-DISTNAME=		system-config-printer-1.0.16
-REVISION =		3
+DISTNAME=		system-config-printer-1.3.2

 CATEGORIES=		print sysutils

@ -17,8 +16,12 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-MASTER_SITES=		http://cyberelk.net/tim/data/system-config-printer/1.0.x/
-EXTRACT_SUFX=		.tar.bz2
+MASTER_SITES=		http://cyberelk.net/tim/data/system-config-printer/1.3/
+EXTRACT_SUFX=		.tar.xz
+
+BUILD_DEPENDS=  archivers/xz
+EXTRACT_CASES=  *.tar.xz) \
+	${LOCALBASE}/bin/xz -dc ${FULLDISTDIR}/$$archive | ${TAR} xf -;;

 MODULES=		lang/python \
 			textproc/intltool
@ -28,7 +31,8 @@ BUILD_DEPENDS=		${RUN_DEPENDS} \
 RUN_DEPENDS=		devel/desktop-file-utils \
 			devel/gettext \
 			devel/py-notify \
-			print/py-cups \
+			net/py-smbc \
+			print/py-cups>=1.9.55 \
 			textproc/py-xml \
 			x11/dbus-python \
 			x11/gnome/py-gnome
@ -40,17 +44,18 @@ CONFIGURE_STYLE=	gnu
 CONFIGURE_ENV+= 	CPPFLAGS=-I${LOCALBASE}/include \
 			LDFLAGS=-L${LOCALBASE}/lib

-SUBST_FILES=		applet.py cupshelpers/cupshelpers.py pysmb.py \
-			system-config-printer.py \
-			manage-print-jobs.desktop.in \
-			my-default-printer.desktop.in \
-			print-applet.desktop.in \
-			system-config-printer.desktop.in \
-			troubleshoot/SchedulerNotRunning.py \
-			Makefile.in
+SUBST_FILES=		applet.py cupshelpers/cupshelpers.py \
+			probe_printer.py newprinter.py \
+			udev/udev-configure-printer.c \
+			troubleshoot/CheckSELinux.py \
+			cupshelpers/xmldriverprefs.py \
+			dbus/org.fedoraproject.Config.Printing.service \
+			check-device-ids.py
+

 FAKE_FLAGS=	dbusdir=${PREFIX}/share/examples/system-config-printer/dbus-1/system.d/ \
-		autostartdir=${PREFIX}/share/examples/system-config-printer/xdg/autostart/
+		autostartdir=${PREFIX}/share/examples/system-config-printer/xdg/autostart/ \
+		cupshelpersdir=${PREFIX}/share/examples/system-config-printer/cupshelpers/

 pre-configure:
 	find ${WRKDIST} -name \*.py | \
@ -60,10 +65,4 @@ pre-configure:
 	${SUBST_CMD} ${WRKSRC}/$f
 .endfor

-# no need for this utility, we can achieve the same from the main program
-post-install:
-	rm ${PREFIX}/bin/my-default-printer \
-		${PREFIX}/share/applications/my-default-printer.desktop \
-		${PREFIX}/share/system-config-printer/my-default-printer.py
-
 .include <bsd.port.mk>
--- a/print/system-config-printer/distinfo
+++ b/print/system-config-printer/distinfo
@ -1,5 +1,5 @@
-MD5 (system-config-printer-1.0.16.tar.bz2) = 6rCUQRSY3hagws8sKrVCig==
-RMD160 (system-config-printer-1.0.16.tar.bz2) = 12jWTcVCTn/6uCVegtrNH1X43Nc=
-SHA1 (system-config-printer-1.0.16.tar.bz2) = v/QOQABuUjCg9jBxOoVnfksX7EQ=
-SHA256 (system-config-printer-1.0.16.tar.bz2) = chxm4PAquiRdt2JdY6FBsvUimmupweSg8wCiohzgv68=
-SIZE (system-config-printer-1.0.16.tar.bz2) = 837271
+MD5 (system-config-printer-1.3.2.tar.xz) = NKDOmhG+VpWztAZeTxewCQ==
+RMD160 (system-config-printer-1.3.2.tar.xz) = oOkLoMVhAo8fI+64+9bxOSv/tNA=
+SHA1 (system-config-printer-1.3.2.tar.xz) = GuWuMe7ARAXhV1TjBcgJy0WbMl0=
+SHA256 (system-config-printer-1.3.2.tar.xz) = +ObbVcACls+OLSfG+DheKQpK5G9ZZ60Je1mVJCBLZz8=
+SIZE (system-config-printer-1.3.2.tar.xz) = 994508
--- a/print/system-config-printer/patches/patch-Makefile_in
+++ b/print/system-config-printer/patches/patch-Makefile_in
@ -1,65 +1,45 @@
-$OpenBSD: patch-Makefile_in,v 1.7 2009/06/08 19:24:43 ajacoutot Exp $
--- Makefile.in.orig	Wed Feb 18 17:10:32 2009
-+++ Makefile.in	Thu Jun  4 03:22:18 2009
-@@ -308,7 +308,7 @@ man_MANS = \
- dbus_DATA = \
- 	newprinternotification.conf
+$OpenBSD: patch-Makefile_in,v 1.8 2011/05/04 09:10:52 ajacoutot Exp $
+--- Makefile.in.orig	Fri Mar 18 17:07:11 2011
+++ Makefile.in	Wed May  4 10:36:00 2011
+@@ -434,7 +434,7 @@ dbus_DATA = \
+ 	dbus/com.redhat.NewPrinterNotification.conf		\
+ 	dbus/com.redhat.PrinterDriversInstaller.conf
 
 -dbusdir = $(sysconfdir)/dbus-1/system.d/
 +dbusdir = $(datadir)/examples/system-config-printer/
- desktop_DATA = \
- 	system-config-printer.desktop \
- 	print-applet.desktop \
-@@ -1040,35 +1040,31 @@ clean-local:
- install-desktopDATA: $(desktop_DATA)
- 	mkdir -p $(DESTDIR)$(desktopdir)
- 	mkdir -p $(DESTDIR)$(desktopdir)
-	desktop-file-install --vendor redhat	\
-+	desktop-file-install 			\
- 	  --dir $(DESTDIR)$(desktopdir)		\
-	  --add-category X-Red-Hat-Base		\
- 	  --add-category System			\
- 	  --add-category Settings		\
- 	  --add-category HardwareSettings	\
- 	  --add-category Printing		\
- 	  --add-category GTK			\
- 	  system-config-printer.desktop
-	desktop-file-install --vendor redhat	\
-+	desktop-file-install 			\
- 	  --dir $(DESTDIR)$(desktopdir)		\
-	  --add-category X-Red-Hat-Base		\
- 	  --add-category System			\
- 	  --add-category Monitor		\
- 	  --add-category GTK			\
- 	  manage-print-jobs.desktop
-	desktop-file-install --vendor redhat	\
-+	desktop-file-install 			\
- 	  --dir $(DESTDIR)$(desktopdir)		\
-	  --add-category X-Red-Hat-Base		\
- 	  --add-category Settings		\
- 	  --add-category HardwareSettings	\
- 	  --add-category GTK			\
- 	  my-default-printer.desktop
-	desktop-file-install --vendor redhat	\
-	  --dir $(DESTDIR)$(autostartdir)	\
-	  --add-category X-Red-Hat-Base		\
-	  --add-category System			\
-	  --add-category Monitor		\
-	  --add-category GTK			\
-+	desktop-file-install			\
-+	  --dir $(DESTDIR)$(autostartdir)       \
-+	  --add-category System                 \
-+	  --add-category Monitor                \
-+	  --add-category GTK                    \
- 	  print-applet.desktop
+ dbusinterfaces_DATA = \
+ 	dbus/org.fedoraproject.Config.Printing.xml
 
- uninstall-desktopDATA:
-@@ -1120,7 +1116,7 @@ help:
- 	@echo " run-applet         Run system-config-printer-applet with local glade file"
+@@ -1551,7 +1551,7 @@ update-po: missing-languages
+ 	$(MAKE) -C po update-po
+ 
+ missing-languages:
+-	bash -c '\
+	sh -c '\
+ 	eval $$(grep ALL_LINGUAS configure.in); \
+ 	diff -u <(echo $$ALL_LINGUAS | xargs -rn1 echo) \
+ 		<(cd po; ls -1 *.po | sed -e "s,\.po$$,,")'
+@@ -1584,7 +1584,7 @@ run-dbus-service:	config.py cupshelpers/config.py
+ 	$(PYTHON) $(top_srcdir)/scp-dbus-service.py --debug
+ 
+ test-xmldriverprefs:	cupshelpers/xmldriverprefs.py xml/preferreddrivers.xml
+-	python -c 'from cupshelpers.xmldriverprefs import test; test()' \
+	$(PYTHON) -c 'from cupshelpers.xmldriverprefs import test; test()' \
+ 		2>&1 | less
+ 
+ help:
+@@ -1607,12 +1607,12 @@ test-ppd-module.sh:	FORCE
+ 	chmod 755 "$@"
+ 
+ test-xml-validity.sh:	FORCE
+-	echo "#!/bin/bash" > "$@"
+	echo "#!/bin/sh" > "$@"
+ 	echo "set -e" >> "$@"
+ 	echo "xmllint --relaxng \\" >> "$@"
+ 	echo "    $(top_srcdir)/xml/preferreddrivers.rng \\" >> "$@"
+ 	echo "    $(top_srcdir)/xml/preferreddrivers.xml >/dev/null" >> "$@"
+-	echo "python $(top_srcdir)/xml/validate.py \\" >> "$@"
+	echo "$(PYTHON) $(top_srcdir)/xml/validate.py \\" >> "$@"
+ 	echo "    $(top_srcdir)/xml/preferreddrivers.xml" >> "$@"
+ 	chmod 755 "$@"
 
- test-ppd-module.sh:
-	echo "#!/usr/bin/env python" > "$@"
-+	echo "#!${MODPY_BIN}" > "$@"
- 	echo "import sys; sys.path.append ('$(top_srcdir)')" >> "$@"
- 	echo "from cupshelpers.ppds import _self_test" >> "$@"
- 	echo "_self_test(sys.argv)" >> "$@"
--- a/print/system-config-printer/patches/patch-applet_py
+++ b/print/system-config-printer/patches/patch-applet_py
@ -1,30 +1,12 @@
-$OpenBSD: patch-applet_py,v 1.5 2009/01/31 12:37:30 ajacoutot Exp $
--- applet.py.orig	Sat Jan 31 12:09:28 2009
-+++ applet.py	Sat Jan 31 12:10:37 2009
-@@ -43,7 +43,7 @@ except locale.Error, e:
-     os.environ['LC_ALL'] = 'C'
-     locale.setlocale (locale.LC_ALL, "")
+$OpenBSD: patch-applet_py,v 1.6 2011/05/04 09:10:52 ajacoutot Exp $
+--- applet.py.orig	Wed Mar 16 17:44:41 2011
+++ applet.py	Wed May  4 10:04:38 2011
+@@ -47,7 +47,7 @@ except RuntimeError, e:
+     print "This is a graphical application and requires DISPLAY to be set."
+     sys.exit (1)
 
 -APPDIR="/usr/share/system-config-printer"
 +APPDIR="${PREFIX}/share/system-config-printer"
- DOMAIN="system-config-printer"
- GLADE="applet.glade"
 ICON="printer"
-@@ -61,7 +61,7 @@ class NewPrinterNotification(dbus.service.Object):
-     STATUS_GENERIC_DRIVER = 2
-     STATUS_NO_DRIVER = 3
 
-    INSTALL_PACKAGES_COMMAND="/usr/bin/gpk-install-package-name"
-+    INSTALL_PACKAGES_COMMAND="/usr/bin/true"
- 
-     def __init__ (self, bus):
-         self.bus = bus
-@@ -173,7 +173,7 @@ class NewPrinterNotification(dbus.service.Object):
-         pid = os.fork ()
-         if pid == 0:
-             # Child.
-            cmd = "/usr/bin/system-config-printer"
-+            cmd = "${PREFIX}/bin/system-config-printer"
-             argv.insert (0, cmd)
-             os.execvp (cmd, argv)
-             sys.exit (1)
+ # We need to call pynotify.init before we can check the server for caps
--- a/print/system-config-printer/patches/patch-check-device-ids_py
+++ b/print/system-config-printer/patches/patch-check-device-ids_py
@ -0,0 +1,29 @@
+$OpenBSD: patch-check-device-ids_py,v 1.1 2011/05/04 09:10:52 ajacoutot Exp $
+--- check-device-ids.py.orig	Wed May  4 10:27:58 2011
+++ check-device-ids.py	Wed May  4 10:28:33 2011
+@@ -163,13 +163,13 @@ def driver_uri_to_filename (uri):
+         elif uri.startswith ("lsb/opt/"):
+             return "/opt/share/ppd/" + uri[8:]
+         elif uri.startswith ("lsb/local/"):
+-            return "/usr/local/share/ppd/" + uri[10:]
+            return "${LOCALBASE}/local/share/ppd/" + uri[10:]
+ 
+-        return "/usr/share/cups/model/" + uri
+        return "${LOCALBASE}/share/cups/model/" + uri
+ 
+     scheme = schemeparts[0]
+     if scheme != "drv":
+-        return "/usr/lib/cups/driver/" + scheme
+        return "${LOCALBASE}/libexec/cups/driver/" + scheme
+ 
+     rest = schemeparts[1]
+     rest = rest.lstrip ('/')
+@@ -177,7 +177,7 @@ def driver_uri_to_filename (uri):
+     if len (parts) > 1:
+         parts = parts[:len (parts) - 1]
+ 
+-    return "/usr/share/cups/drv/" + reduce (lambda x, y: x + "/" + y, parts)
+    return "${LOCALBASE}/share/cups/drv/" + reduce (lambda x, y: x + "/" + y, parts)
+ 
+ def driver_uri_to_pkg (uri):
+     filename = driver_uri_to_filename (uri)
--- a/print/system-config-printer/patches/patch-cupshelpers_cupshelpers_py
+++ b/print/system-config-printer/patches/patch-cupshelpers_cupshelpers_py
@ -1,16 +1,16 @@
-$OpenBSD: patch-cupshelpers_cupshelpers_py,v 1.4 2009/06/08 19:24:43 ajacoutot Exp $
--- cupshelpers/cupshelpers.py.orig	Wed Feb 18 16:46:02 2009
-+++ cupshelpers/cupshelpers.py	Thu Jun  4 03:19:02 2009
-@@ -714,7 +714,7 @@ def missingPackagesAndExecutables(ppd):
+$OpenBSD: patch-cupshelpers_cupshelpers_py,v 1.5 2011/05/04 09:10:52 ajacoutot Exp $
+--- cupshelpers/cupshelpers.py.orig	Wed Mar 16 17:44:41 2011
+++ cupshelpers/cupshelpers.py	Wed May  4 10:04:38 2011
+@@ -699,7 +699,7 @@ def missingPackagesAndExecutables(ppd):
 
     # First, a local function.  How to check that something exists
     # in a path:
 -    def pathcheck (name, path="/usr/bin:/bin"):
 +    def pathcheck (name, path="/usr/bin:/bin:${PREFIX}/bin:${LOCALBASE}/bin"):
-         # Strip out foomatic '%'-style place-holders.
-         p = name.find ('%')
-         if p != -1:
-@@ -812,8 +812,7 @@ def missingPackagesAndExecutables(ppd):
+         if name == "-":
+             # A filter of "-" means that no filter is required,
+             # i.e. the device accepts the given format as-is.
+@@ -801,8 +801,7 @@ def missingPackagesAndExecutables(ppd):
                     continue
 
                 exepath = pathcheck (exe,
--- a/print/system-config-printer/patches/patch-cupshelpers_xmldriverprefs_py
+++ b/print/system-config-printer/patches/patch-cupshelpers_xmldriverprefs_py
@ -0,0 +1,15 @@
+$OpenBSD: patch-cupshelpers_xmldriverprefs_py,v 1.1 2011/05/04 09:10:52 ajacoutot Exp $
+--- cupshelpers/xmldriverprefs.py.orig	Wed May  4 10:27:06 2011
+++ cupshelpers/xmldriverprefs.py	Wed May  4 10:27:35 2011
+@@ -113,9 +113,9 @@ class DriverType:
+                     f = drv.rfind ("/")
+                     if f != -1:
+                         drv = drv[:f]
+-                        self._packagehint = "/usr/share/cups/drv/%s" % drv
+                        self._packagehint = "${LOCALBASE}/share/cups/drv/%s" % drv
+             else:
+-                self._packagehint = "/usr/lib/cups/driver/%s" % scheme
+                self._packagehint = "${LOCALBASE}/libexec/cups/driver/%s" % scheme
+ 
+     def add_attribute (self, name, pattern):
+         """
--- a/print/system-config-printer/patches/patch-dbus_org_fedoraproject_Config_Printing_service
+++ b/print/system-config-printer/patches/patch-dbus_org_fedoraproject_Config_Printing_service
@ -0,0 +1,8 @@
+$OpenBSD: patch-dbus_org_fedoraproject_Config_Printing_service,v 1.1 2011/05/04 09:10:52 ajacoutot Exp $
+--- dbus/org.fedoraproject.Config.Printing.service.orig	Wed May  4 10:27:42 2011
+++ dbus/org.fedoraproject.Config.Printing.service	Wed May  4 10:27:52 2011
+@@ -1,3 +1,3 @@
+ [D-BUS Service]
+ Name=org.fedoraproject.Config.Printing
+-Exec=/usr/bin/scp-dbus-service
+Exec=${PREFIX}/bin/scp-dbus-service
--- a/print/system-config-printer/patches/patch-firewall_py
+++ b/print/system-config-printer/patches/patch-firewall_py
@ -0,0 +1,36 @@
+$OpenBSD: patch-firewall_py,v 1.1 2011/05/04 09:10:52 ajacoutot Exp $
+
+Disable firewall checks.
+
+--- firewall.py.orig	Wed Mar 16 17:44:41 2011
+++ firewall.py	Wed May  4 11:01:26 2011
+@@ -83,26 +83,13 @@ class Firewall:
+         self._client_error_handler (exc)
+ 
+     def write (self):
+-        try:
+-            self._firewall.write (pickle.dumps (self._fw_data[0]))
+-        except:
+-            pass
+        pass
+ 
+     def _check_any_allowed (self, search):
+-        (args, filename) = self._get_fw_data ()
+-        if filename == None: return True
+-        isect = set (search).intersection (set (args))
+-        return len (isect) != 0
+        return True
+ 
+     def add_rule (self, rule):
+-        try:
+-            (args, filename) = self._fw_data
+-        except AttributeError:
+-            (args, filename) = self._get_fw_data ()
+-        if filename == None: return
+-
+-        args.append (rule)
+-        self._fw_data = (args, filename)
+        pass
+ 
+     def check_ipp_client_allowed (self):
+         return self._check_any_allowed (set(["--port=631:udp",
--- a/print/system-config-printer/patches/patch-manage-print-jobs_desktop_in
+++ b/print/system-config-printer/patches/patch-manage-print-jobs_desktop_in
@ -1,14 +0,0 @@
-$OpenBSD: patch-manage-print-jobs_desktop_in,v 1.4 2009/02/10 17:19:42 ajacoutot Exp $
--- manage-print-jobs.desktop.in.orig	Fri Dec  5 16:45:20 2008
-+++ manage-print-jobs.desktop.in	Tue Feb 10 17:29:49 2009
-@@ -2,8 +2,8 @@
- Encoding=UTF-8
- _Name=Manage Print Jobs
- _Comment=Cancel, pause, resume or reprint jobs
-Exec=system-config-printer-applet --no-tray-icon
-+Exec=${PREFIX}/bin/system-config-printer-applet --no-tray-icon
- Terminal=false
- Type=Application
- Icon=printer
-NoDisplay=true
-+NoDisplay=false
--- a/print/system-config-printer/patches/patch-my-default-printer_desktop_in
+++ b/print/system-config-printer/patches/patch-my-default-printer_desktop_in
@ -1,12 +0,0 @@
-$OpenBSD: patch-my-default-printer_desktop_in,v 1.3 2008/07/08 09:33:21 ajacoutot Exp $
--- my-default-printer.desktop.in.orig	Wed Jul  2 15:35:37 2008
-+++ my-default-printer.desktop.in	Wed Jul  2 15:35:50 2008
-@@ -2,7 +2,7 @@
- Encoding=UTF-8
- _Name=Default Printer
- _Comment=Select default printer
-Exec=my-default-printer
-+Exec=${PREFIX}/bin/my-default-printer
- Terminal=false
- Type=Application
- Icon=printer
--- a/print/system-config-printer/patches/patch-newprinter_py
+++ b/print/system-config-printer/patches/patch-newprinter_py
@ -0,0 +1,21 @@
+$OpenBSD: patch-newprinter_py,v 1.1 2011/05/04 09:10:52 ajacoutot Exp $
+--- newprinter.py.orig	Wed May  4 10:21:39 2011
+++ newprinter.py	Wed May  4 10:22:09 2011
+@@ -1527,7 +1527,7 @@ class NewPrinterGUI(GtkGUI):
+         # Try to get make and model via SNMP
+         if host:
+             os.environ["HOST"] = host
+-            cmd = '/usr/lib/cups/backend/snmp "${HOST}"'
+            cmd = '${LOCALBASE}/libexec/cups/backend/snmp "${HOST}"'
+             debugprint (host + ": " + cmd)
+             stdout = None
+             try:
+@@ -3419,7 +3419,7 @@ class NewPrinterGUI(GtkGUI):
+                 try:
+                     # We want this to be in the current natural language,
+                     # so we intentionally don't set LC_ALL=C here.
+-                    p = subprocess.Popen (['/usr/bin/cupstestppd',
+                    p = subprocess.Popen (['${LOCALBASE}/bin/cupstestppd',
+                                            '-rvv', filename],
+                                           close_fds=True,
+                                           stdin=file("/dev/null"),
--- a/print/system-config-printer/patches/patch-newprinternotification_conf
+++ b/print/system-config-printer/patches/patch-newprinternotification_conf
@ -1,27 +0,0 @@
-$OpenBSD: patch-newprinternotification_conf,v 1.2 2009/06/08 19:24:43 ajacoutot Exp $
-
-Allow anyone to listen to the new printer notification dbus signal.
-cf. Debian bug #486613.
-
--- newprinternotification.conf.orig	Wed Feb  4 17:14:05 2009
-+++ newprinternotification.conf	Thu Jun  4 03:19:02 2009
-@@ -2,10 +2,6 @@
-  "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
-  "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
- <busconfig>
-	<policy at_console="true">
-		<allow own="com.redhat.NewPrinterNotification"/>
-	</policy>
-
- 	<policy user="root">
- 		<allow own="com.redhat.NewPrinterNotification"/>
- 	</policy>
-@@ -16,7 +12,7 @@
- 	</policy>
- 	
-         <policy context="default">
-                <deny own="com.redhat.NewPrinterNotification"/>
-+                <allow own="com.redhat.NewPrinterNotification"/>
- 
-                 <deny send_destination="com.redhat.NewPrinterNotification"
- 		      send_interface="com.redhat.NewPrinterNotification"/>
--- a/print/system-config-printer/patches/patch-print-applet_desktop_in
+++ b/print/system-config-printer/patches/patch-print-applet_desktop_in
@ -1,12 +0,0 @@
-$OpenBSD: patch-print-applet_desktop_in,v 1.3 2008/07/08 09:33:21 ajacoutot Exp $
--- print-applet.desktop.in.orig	Wed Jul  2 15:36:13 2008
-+++ print-applet.desktop.in	Wed Jul  2 15:36:24 2008
-@@ -2,7 +2,7 @@
- Encoding=UTF-8
- _Name=Print Queue Applet
- _Comment=System tray icon for managing print jobs
-Exec=system-config-printer-applet
-+Exec=${PREFIX}/bin/system-config-printer-applet
- Terminal=false
- Type=Application
- Icon=printer
--- a/print/system-config-printer/patches/patch-probe_printer_py
+++ b/print/system-config-printer/patches/patch-probe_printer_py
@ -0,0 +1,12 @@
+$OpenBSD: patch-probe_printer_py,v 1.1 2011/05/04 09:10:52 ajacoutot Exp $
+--- probe_printer.py.orig	Wed May  4 10:21:21 2011
+++ probe_printer.py	Wed May  4 10:21:33 2011
+@@ -259,7 +259,7 @@ class PrinterFinder:
+         null = file ("/dev/null", "r+")
+         try:
+             debugprint ("snmp: trying")
+-            p = subprocess.Popen (args=["/usr/lib/cups/backend/snmp",
+            p = subprocess.Popen (args=["${LOCALBASE}/libexec/cups/backend/snmp",
+                                         self.hostname],
+                                   close_fds=True,
+                                   stdin=null,
--- a/print/system-config-printer/patches/patch-pysmb_py
+++ b/print/system-config-printer/patches/patch-pysmb_py
@ -1,20 +0,0 @@
-$OpenBSD: patch-pysmb_py,v 1.5 2009/01/31 12:37:30 ajacoutot Exp $
--- pysmb.py.orig	Fri Jan 16 10:50:57 2009
-+++ pysmb.py	Sat Jan 31 12:11:42 2009
-@@ -194,13 +194,13 @@ import os
- import sys
- import re
- 
-nmblookup = "/usr/bin/nmblookup"
-smbclient = "/usr/bin/smbclient"
-+nmblookup = "${LOCALBASE}/bin/nmblookup"
-+smbclient = "${LOCALBASE}/bin/smbclient"
- 
- wins = None
- 
- def get_wins_server():
-        smbconf = "/etc/samba/smb.conf"
-+        smbconf = "${SYSCONFDIR}/samba/smb.conf"
-         wsregex = re.compile("\s*wins\s*server.*",re.IGNORECASE)
- 	
- 	global wins	
--- a/print/system-config-printer/patches/patch-system-config-printer_desktop_in
+++ b/print/system-config-printer/patches/patch-system-config-printer_desktop_in
@ -1,12 +0,0 @@
-$OpenBSD: patch-system-config-printer_desktop_in,v 1.4 2008/07/08 09:33:21 ajacoutot Exp $
--- system-config-printer.desktop.in.orig	Fri May 23 13:57:31 2008
-+++ system-config-printer.desktop.in	Wed Jul  2 15:47:35 2008
-@@ -2,7 +2,7 @@
- Encoding=UTF-8
- _Name=Printing
- _Comment=Configure printers
-Exec=system-config-printer
-+Exec=${PREFIX}/bin/system-config-printer
- Terminal=false
- Type=Application
- Icon=printer
--- a/print/system-config-printer/patches/patch-system-config-printer_py
+++ b/print/system-config-printer/patches/patch-system-config-printer_py
@ -1,58 +0,0 @@
-$OpenBSD: patch-system-config-printer_py,v 1.10 2009/09/01 08:13:32 ajacoutot Exp $
--- system-config-printer.py.orig	Fri Mar 13 18:08:53 2009
-+++ system-config-printer.py	Tue Sep  1 10:09:24 2009
-@@ -101,10 +101,6 @@ busy_cursor = gtk.gdk.Cursor(gtk.gdk.WATCH)
- ready_cursor = gtk.gdk.Cursor(gtk.gdk.LEFT_PTR)
- ellipsis = unichr(0x2026)
- 
-TEXT_start_firewall_tool = _("To do this, select "
-                             "System->Administration->Firewall "
-                             "from the main menu.")
-
- try:
-     try_CUPS_SERVER_REMOTE_ANY = cups.CUPS_SERVER_REMOTE_ANY
- except AttributeError:
-@@ -2518,25 +2514,6 @@ class GUI(GtkGUI, monitor.Watcher):
-         self.changed = set()
-         self.setDataButtonState()
- 
-        old_setting = self.server_settings.get (cups.CUPS_SERVER_SHARE_PRINTERS,
-                                                '0')
-        new_setting = setting_dict.get (cups.CUPS_SERVER_SHARE_PRINTERS, '0')
-        if (old_setting == '0' and new_setting != '0'):
-            # We have just enabled print queue sharing.
-            # Ideally, this is the time we would check the firewall
-            # settings on this machine and request that the IPP TCP port
-            # be unblocked.  Unfortunately, this is not yet possible
-            # (bug #440469).  However, we can display a dialog to suggest
-            # that now might be a good time to review the firewall settings.
-            show_info_dialog (_("Review Firewall"),
-                              _("You may need to adjust the firewall "
-                                "to allow network printing to this "
-                                "computer.") + '\n\n' +
-                              TEXT_start_firewall_tool,
-                              parent=self.ServerSettingsDialog)
-
-        time.sleep(1) # give the server a chance to process our request
-
-         # Now reconnect, in case the server needed to reload.
-         self.reconnect ()
- 
-@@ -3705,7 +3682,7 @@ class NewPrinterGUI(GtkGUI):
-         # Try to get make and model via SNMP
-         if host:
-             os.environ["HOST"] = host
-            cmd = '/usr/lib/cups/backend/snmp "${HOST}"'
-+            cmd = '${LOCALBASE}/libexec/cups/backend/snmp "${HOST}"'
-             debugprint (host + ": " + cmd)
-             stdout = None
-             try:
-@@ -5208,7 +5185,7 @@ class NewPrinterGUI(GtkGUI):
-                 try:
-                     # We want this to be in the current natural language,
-                     # so we intentionally don't set LC_ALL=C here.
-                    p = subprocess.Popen (['/usr/bin/cupstestppd',
-+                    p = subprocess.Popen (['${LOCALBASE}/bin/cupstestppd',
-                                            '-rvv', filename],
-                                           stdin=file("/dev/null"),
-                                           stdout=subprocess.PIPE,
--- a/print/system-config-printer/patches/patch-troubleshoot_CheckPPDSanity_py
+++ b/print/system-config-printer/patches/patch-troubleshoot_CheckPPDSanity_py
@ -1,12 +0,0 @@
-$OpenBSD: patch-troubleshoot_CheckPPDSanity_py,v 1.3 2009/01/31 12:37:30 ajacoutot Exp $
--- troubleshoot/CheckPPDSanity.py.orig	Sat Jan 31 12:11:18 2009
-+++ troubleshoot/CheckPPDSanity.py	Sat Jan 31 12:11:34 2009
-@@ -25,7 +25,7 @@ import os
- import subprocess
- from base import *
- 
-install_cmd = "/usr/bin/gpk-install-package-name"
-+install_cmd = "/usr/bin/true"
- 
- class CheckPPDSanity(Question):
-     def __init__ (self, troubleshooter):
--- a/print/system-config-printer/patches/patch-troubleshoot_CheckSELinux_py
+++ b/print/system-config-printer/patches/patch-troubleshoot_CheckSELinux_py
@ -0,0 +1,12 @@
+$OpenBSD: patch-troubleshoot_CheckSELinux_py,v 1.1 2011/05/04 09:10:52 ajacoutot Exp $
+--- troubleshoot/CheckSELinux.py.orig	Wed May  4 10:25:31 2011
+++ troubleshoot/CheckSELinux.py	Wed May  4 10:26:56 2011
+@@ -45,7 +45,7 @@ class CheckSELinux(Question):
+         if not selinux.is_selinux_enabled():
+             return False
+ 
+-        paths = "/etc/cups/ /usr/lib/cups/ /usr/share/cups/"
+        paths = "${SYSCONFDIR}/cups/ ${LOCALBASE}/libexec/cups/ ${LOCALBASE}/share/cups/"
+         null = file ("/dev/null", "r+")
+         parent = self.troubleshooter.get_window ()
+         contexts = {}
--- a/print/system-config-printer/patches/patch-troubleshoot_SchedulerNotRunning_py
+++ b/print/system-config-printer/patches/patch-troubleshoot_SchedulerNotRunning_py
@ -1,16 +1,16 @@
-$OpenBSD: patch-troubleshoot_SchedulerNotRunning_py,v 1.1 2008/12/21 11:40:40 ajacoutot Exp $
--- troubleshoot/SchedulerNotRunning.py.orig	Sun Dec 21 12:29:40 2008
-+++ troubleshoot/SchedulerNotRunning.py	Sun Dec 21 12:33:10 2008
-@@ -26,10 +26,9 @@ class SchedulerNotRunning(Question):
+$OpenBSD: patch-troubleshoot_SchedulerNotRunning_py,v 1.2 2011/05/04 09:10:52 ajacoutot Exp $
+--- troubleshoot/SchedulerNotRunning.py.orig	Fri Apr  1 16:23:58 2011
+++ troubleshoot/SchedulerNotRunning.py	Wed May  4 08:37:29 2011
+@@ -27,10 +27,9 @@ class SchedulerNotRunning(Question):
         Question.__init__ (self, troubleshooter, "Scheduler not running?")
         page = self.initial_vbox (_("CUPS Service Stopped"),
                                   _("The CUPS print spooler does not appear "
 -                                    "to be running.  To correct this, choose "
 -                                    "System->Administration->Services from "
-                                    "the main menu and look for the `cups' "
+-                                    "the main menu and look for the 'cups' "
 -                                    "service."))
 +                                    "to be running.  To correct this, run "
-+                                    "'${LOCALBASE}/sbin/cupsd' "))
+                                    "'/etc/rc.d/cups start' "
 +                                    "as root in a terminal."))
         troubleshooter.new_page (page, self)
 
--- a/print/system-config-printer/patches/patch-udev_udev-configure-printer_c
+++ b/print/system-config-printer/patches/patch-udev_udev-configure-printer_c
@ -0,0 +1,12 @@
+$OpenBSD: patch-udev_udev-configure-printer_c,v 1.1 2011/05/04 09:10:52 ajacoutot Exp $
+--- udev/udev-configure-printer.c.orig	Wed May  4 10:20:40 2011
+++ udev/udev-configure-printer.c	Wed May  4 10:21:09 2011
+@@ -717,7 +717,7 @@ device_id_from_bluetooth (const char *bdaddr, struct d
+   gchar *argv[4];
+ 
+   id->full_device_id = id->mfg = id->mdl = id->sern = NULL;
+-  argv[0] = g_strdup ("/usr/lib/cups/backend/bluetooth");
+  argv[0] = g_strdup ("${LOCALBASE}/libexec/cups/backend/bluetooth");
+   argv[1] = g_strdup ("--get-deviceid");
+   argv[2] = g_strdup (bdaddr);
+   argv[3] = NULL;
--- a/print/system-config-printer/pkg/PLIST
+++ b/print/system-config-printer/pkg/PLIST
@ -1,25 +1,39 @@
-@comment $OpenBSD: PLIST,v 1.8 2010/09/22 15:41:15 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.9 2011/05/04 09:10:52 ajacoutot Exp $
+bin/scp-dbus-service
 bin/system-config-printer
 bin/system-config-printer-applet
 lib/python${MODPY_VERSION}/site-packages/cupshelpers/
 lib/python${MODPY_VERSION}/site-packages/cupshelpers-1.0-py${MODPY_VERSION}.egg-info
 lib/python${MODPY_VERSION}/site-packages/cupshelpers/__init__.py
 lib/python${MODPY_VERSION}/site-packages/cupshelpers/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/cupshelpers/config.py
+lib/python${MODPY_VERSION}/site-packages/cupshelpers/config.pyc
 lib/python${MODPY_VERSION}/site-packages/cupshelpers/cupshelpers.py
 lib/python${MODPY_VERSION}/site-packages/cupshelpers/cupshelpers.pyc
+lib/python${MODPY_VERSION}/site-packages/cupshelpers/installdriver.py
+lib/python${MODPY_VERSION}/site-packages/cupshelpers/installdriver.pyc
 lib/python${MODPY_VERSION}/site-packages/cupshelpers/openprinting.py
 lib/python${MODPY_VERSION}/site-packages/cupshelpers/openprinting.pyc
 lib/python${MODPY_VERSION}/site-packages/cupshelpers/ppds.py
 lib/python${MODPY_VERSION}/site-packages/cupshelpers/ppds.pyc
+lib/python${MODPY_VERSION}/site-packages/cupshelpers/xmldriverprefs.py
+lib/python${MODPY_VERSION}/site-packages/cupshelpers/xmldriverprefs.pyc
@man man/man1/system-config-printer-applet.1
@man man/man1/system-config-printer.1
-share/applications/manage-print-jobs.desktop
 share/applications/system-config-printer.desktop
+share/dbus-1/interfaces/org.fedoraproject.Config.Printing.xml
+share/dbus-1/services/org.fedoraproject.Config.Printing.service
 share/examples/system-config-printer/
+share/examples/system-config-printer/cupshelpers/
+@sample ${SYSCONFDIR}/cupshelpers/
+share/examples/system-config-printer/cupshelpers/preferreddrivers.xml
+@sample ${SYSCONFDIR}/cupshelpers/preferreddrivers.xml
 share/examples/system-config-printer/dbus-1/
 share/examples/system-config-printer/dbus-1/system.d/
-share/examples/system-config-printer/dbus-1/system.d/newprinternotification.conf
-@sample ${SYSCONFDIR}/dbus-1/system.d/newprinternotification.conf
+share/examples/system-config-printer/dbus-1/system.d/com.redhat.NewPrinterNotification.conf
+@sample ${SYSCONFDIR}/dbus-1/system.d/com.redhat.NewPrinterNotification.conf
+share/examples/system-config-printer/dbus-1/system.d/com.redhat.PrinterDriversInstaller.conf
+@sample ${SYSCONFDIR}/dbus-1/system.d/com.redhat.PrinterDriversInstaller.conf
 share/examples/system-config-printer/xdg/
@sample ${SYSCONFDIR}/xdg/
 share/examples/system-config-printer/xdg/autostart/
@ -31,6 +45,7 @@ share/locale/as/LC_MESSAGES/system-config-printer.mo
 share/locale/bg/LC_MESSAGES/system-config-printer.mo
 share/locale/bn/LC_MESSAGES/system-config-printer.mo
 share/locale/bn_IN/LC_MESSAGES/system-config-printer.mo
+share/locale/br/LC_MESSAGES/system-config-printer.mo
 share/locale/bs/LC_MESSAGES/system-config-printer.mo
 share/locale/ca/LC_MESSAGES/system-config-printer.mo
 share/locale/cs/LC_MESSAGES/system-config-printer.mo
@ -61,12 +76,14 @@ share/locale/lo/
 share/locale/lo/LC_MESSAGES/
 share/locale/lo/LC_MESSAGES/system-config-printer.mo
 share/locale/lv/LC_MESSAGES/system-config-printer.mo
+share/locale/mai/LC_MESSAGES/system-config-printer.mo
 share/locale/mk/LC_MESSAGES/system-config-printer.mo
 share/locale/ml/LC_MESSAGES/system-config-printer.mo
 share/locale/mr/LC_MESSAGES/system-config-printer.mo
 share/locale/ms/LC_MESSAGES/system-config-printer.mo
 share/locale/my/LC_MESSAGES/system-config-printer.mo
 share/locale/nb/LC_MESSAGES/system-config-printer.mo
+share/locale/nds/LC_MESSAGES/system-config-printer.mo
 share/locale/nl/LC_MESSAGES/system-config-printer.mo
 share/locale/nn/LC_MESSAGES/system-config-printer.mo
 share/locale/or/LC_MESSAGES/system-config-printer.mo
@ -84,40 +101,62 @@ share/locale/sr@latin/LC_MESSAGES/system-config-printer.mo
 share/locale/sv/LC_MESSAGES/system-config-printer.mo
 share/locale/ta/LC_MESSAGES/system-config-printer.mo
 share/locale/te/LC_MESSAGES/system-config-printer.mo
+share/locale/th/LC_MESSAGES/system-config-printer.mo
 share/locale/tr/LC_MESSAGES/system-config-printer.mo
 share/locale/uk/LC_MESSAGES/system-config-printer.mo
 share/locale/vi/LC_MESSAGES/system-config-printer.mo
 share/locale/zh_CN/LC_MESSAGES/system-config-printer.mo
 share/locale/zh_TW/LC_MESSAGES/system-config-printer.mo
 share/system-config-printer/
-share/system-config-printer/AdvancedServerSettings.py
+share/system-config-printer/GroupsPane.py
+share/system-config-printer/GroupsPaneModel.py
+share/system-config-printer/HIG.py
 share/system-config-printer/PhysicalDevice.py
-share/system-config-printer/applet.glade
+share/system-config-printer/SearchCriterion.py
+share/system-config-printer/ToolbarSearchEntry.py
+share/system-config-printer/XmlHelper.py
 share/system-config-printer/applet.py
+share/system-config-printer/asyncconn.py
+share/system-config-printer/asyncipp.py
+share/system-config-printer/asyncpk1.py
 share/system-config-printer/authconn.py
+share/system-config-printer/check-device-ids.py
 share/system-config-printer/config.py
-share/system-config-printer/contextmenu.py
+share/system-config-printer/cupspk.py
 share/system-config-printer/debug.py
+share/system-config-printer/dnssdresolve.py
 share/system-config-printer/errordialogs.py
+share/system-config-printer/firewall.py
 share/system-config-printer/gtk_label_autowrap.py
-share/system-config-printer/gtk_treeviewtooltips.py
+share/system-config-printer/gtkinklevel.py
+share/system-config-printer/gtkspinner.py
+share/system-config-printer/gui.py
 share/system-config-printer/icons/
 share/system-config-printer/icons/i-network-printer.png
+share/system-config-printer/installpackage.py
 share/system-config-printer/jobviewer.py
 share/system-config-printer/monitor.py
+share/system-config-printer/newprinter.py
 share/system-config-printer/options.py
 share/system-config-printer/optionwidgets.py
+share/system-config-printer/ppdcache.py
+share/system-config-printer/ppdippstr.py
+share/system-config-printer/ppdsloader.py
+share/system-config-printer/printerproperties.py
 share/system-config-printer/probe_printer.py
 share/system-config-printer/pysmb.py
+share/system-config-printer/scp-dbus-service.py
+share/system-config-printer/serversettings.py
 share/system-config-printer/smburi.py
 share/system-config-printer/statereason.py
-share/system-config-printer/system-config-printer.glade
 share/system-config-printer/system-config-printer.py
+share/system-config-printer/timedops.py
 share/system-config-printer/troubleshoot/
 share/system-config-printer/troubleshoot/CheckLocalServerPublishing.py
 share/system-config-printer/troubleshoot/CheckNetworkServerSanity.py
 share/system-config-printer/troubleshoot/CheckPPDSanity.py
 share/system-config-printer/troubleshoot/CheckPrinterSanity.py
+share/system-config-printer/troubleshoot/CheckSELinux.py
 share/system-config-printer/troubleshoot/CheckUSBPermissions.py
 share/system-config-printer/troubleshoot/ChooseNetworkPrinter.py
 share/system-config-printer/troubleshoot/ChoosePrinter.py
@ -136,9 +175,27 @@ share/system-config-printer/troubleshoot/RemoteAddress.py
 share/system-config-printer/troubleshoot/SchedulerNotRunning.py
 share/system-config-printer/troubleshoot/ServerFirewalled.py
 share/system-config-printer/troubleshoot/Shrug.py
+share/system-config-printer/troubleshoot/VerifyPackages.py
 share/system-config-printer/troubleshoot/Welcome.py
 share/system-config-printer/troubleshoot/__init__.py
 share/system-config-printer/troubleshoot/base.py
+share/system-config-printer/ui/
+share/system-config-printer/ui/AboutDialog.glade
+share/system-config-printer/ui/ConnectDialog.glade
+share/system-config-printer/ui/ConnectingDialog.glade
+share/system-config-printer/ui/InstallDialog.glade
+share/system-config-printer/ui/JobsWindow.glade
+share/system-config-printer/ui/NewPrinterName.glade
+share/system-config-printer/ui/NewPrinterWindow.glade
+share/system-config-printer/ui/PrinterPropertiesDialog.glade
+share/system-config-printer/ui/PrintersWindow.glade
+share/system-config-printer/ui/SMBBrowseDialog.glade
+share/system-config-printer/ui/ServerSettingsDialog.glade
+share/system-config-printer/ui/WaitWindow.glade
+share/system-config-printer/ui/statusicon_popupmenu.glade
 share/system-config-printer/userdefault.py
+share/system-config-printer/xml/
+share/system-config-printer/xml/preferreddrivers.rng
+share/system-config-printer/xml/validate.py
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database