svn commit: r327106 - head/print/system-config-printer/files
Koop Mast
kwm at FreeBSD.org
Thu Sep 12 19:45:51 UTC 2013
Author: kwm
Date: Thu Sep 12 19:45:49 2013
New Revision: 327106
URL: http://svnweb.freebsd.org/changeset/ports/327106
Log:
Part two, of the update to 1.4.2. Forgotten files edition.
Added:
head/print/system-config-printer/files/patch-check-device-ids.py (contents, props changed)
head/print/system-config-printer/files/patch-cupshelpers_xmldriverprefs.py (contents, props changed)
head/print/system-config-printer/files/patch-dbus_com.redhat.NewPrinterNotification.conf (contents, props changed)
head/print/system-config-printer/files/patch-dbus_com.redhat.PrinterDriversInstaller.conf (contents, props changed)
head/print/system-config-printer/files/patch-dbus_org.fedoraproject.Config.Printing.service (contents, props changed)
head/print/system-config-printer/files/patch-newprinter.py (contents, props changed)
head/print/system-config-printer/files/patch-probe-printer.py (contents, props changed)
Added: head/print/system-config-printer/files/patch-check-device-ids.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/print/system-config-printer/files/patch-check-device-ids.py Thu Sep 12 19:45:49 2013 (r327106)
@@ -0,0 +1,25 @@
+--- check-device-ids.py.orig 2013-08-29 15:52:05.000000000 +0200
++++ check-device-ids.py 2013-08-29 15:53:34.000000000 +0200
+@@ -205,11 +205,11 @@
+ elif uri.startswith ("lsb/local/"):
+ return "/usr/local/share/ppd/" + uri[10:]
+
+- return "/usr/share/cups/model/" + uri
++ return "%%PREFIX%%/share/cups/model/" + uri
+
+ scheme = schemeparts[0]
+ if scheme != "drv":
+- return "/usr/lib/cups/driver/" + scheme
++ return "%%PREFIX%%/libexec/cups/driver/" + scheme
+
+ rest = schemeparts[1]
+ rest = rest.lstrip ('/')
+@@ -217,7 +217,7 @@
+ if len (parts) > 1:
+ parts = parts[:len (parts) - 1]
+
+- return "/usr/share/cups/drv/" + reduce (lambda x, y: x + "/" + y, parts)
++ return "%%PREFIX%%/share/cups/drv/" + reduce (lambda x, y: x + "/" + y, parts)
+
+ def driver_uri_to_pkg (uri):
+ filename = driver_uri_to_filename (uri)
Added: head/print/system-config-printer/files/patch-cupshelpers_xmldriverprefs.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/print/system-config-printer/files/patch-cupshelpers_xmldriverprefs.py Thu Sep 12 19:45:49 2013 (r327106)
@@ -0,0 +1,14 @@
+--- cupshelpers/xmldriverprefs.py.orig 2013-08-29 15:44:39.000000000 +0200
++++ cupshelpers/xmldriverprefs.py 2013-08-29 15:46:18.000000000 +0200
+@@ -113,9 +113,9 @@
+ f = drv.rfind ("/")
+ if f != -1:
+ drv = drv[:f]
+- self._packagehint = "/usr/share/cups/drv/%s" % drv
++ self._packagehint = "%%PREFIX%%/share/cups/drv/%s" % drv
+ else:
+- self._packagehint = "/usr/lib/cups/driver/%s" % scheme
++ self._packagehint = "%%PREFIX%%/libexec/cups/driver/%s" % scheme
+
+ def add_attribute (self, name, pattern):
+ """
Added: head/print/system-config-printer/files/patch-dbus_com.redhat.NewPrinterNotification.conf
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/print/system-config-printer/files/patch-dbus_com.redhat.NewPrinterNotification.conf Thu Sep 12 19:45:49 2013 (r327106)
@@ -0,0 +1,11 @@
+--- dbus/com.redhat.NewPrinterNotification.conf.orig 2013-08-29 11:40:22.000000000 +0200
++++ dbus/com.redhat.NewPrinterNotification.conf 2013-08-29 11:41:16.000000000 +0200
+@@ -2,7 +2,7 @@
+ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+ <busconfig>
+- <policy at_console="true">
++ <policy group="operator">
+ <allow own="com.redhat.NewPrinterNotification"/>
+ </policy>
+
Added: head/print/system-config-printer/files/patch-dbus_com.redhat.PrinterDriversInstaller.conf
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/print/system-config-printer/files/patch-dbus_com.redhat.PrinterDriversInstaller.conf Thu Sep 12 19:45:49 2013 (r327106)
@@ -0,0 +1,11 @@
+--- dbus/com.redhat.PrinterDriversInstaller.conf.orig 2013-08-29 11:40:29.000000000 +0200
++++ dbus/com.redhat.PrinterDriversInstaller.conf 2013-08-29 11:41:25.000000000 +0200
+@@ -2,7 +2,7 @@
+ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+ <busconfig>
+- <policy at_console="true">
++ <policy group="operator">
+ <allow own="com.redhat.PrinterDriversInstaller"/>
+ </policy>
+
Added: head/print/system-config-printer/files/patch-dbus_org.fedoraproject.Config.Printing.service
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/print/system-config-printer/files/patch-dbus_org.fedoraproject.Config.Printing.service Thu Sep 12 19:45:49 2013 (r327106)
@@ -0,0 +1,7 @@
+--- dbus/org.fedoraproject.Config.Printing.service.orig 2013-08-29 15:35:25.000000000 +0200
++++ dbus/org.fedoraproject.Config.Printing.service 2013-08-29 15:36:25.000000000 +0200
+@@ -1,3 +1,3 @@
+ [D-BUS Service]
+ Name=org.fedoraproject.Config.Printing
+-Exec=/usr/bin/scp-dbus-service
++Exec=%%PREFIX%%/bin/scp-dbus-service
Added: head/print/system-config-printer/files/patch-newprinter.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/print/system-config-printer/files/patch-newprinter.py Thu Sep 12 19:45:49 2013 (r327106)
@@ -0,0 +1,29 @@
+--- newprinter.py.orig 2013-08-29 15:46:51.000000000 +0200
++++ newprinter.py 2013-08-29 15:48:44.000000000 +0200
+@@ -1038,7 +1038,7 @@
+ # Does the backend need to be installed?
+ if ((self._host == 'localhost' or
+ self._host[0] == '/') and
+- not os.access ("/usr/lib/cups/backend/smb", os.F_OK)):
++ not os.access ("%%PREFIX%%/libexec/cups/backend/smb", os.F_OK)):
+ p = subprocess.Popen (["gpk-install-package-name",
+ "samba-client"],
+ close_fds=True,
+@@ -1844,7 +1844,7 @@
+ host = device.uri[s:s+e]
+ # Try to get make and model via SNMP
+ if host:
+- args = ["/usr/lib/cups/backend/snmp", host]
++ args = ["%%PREFIX%%/libexec/cups/backend/snmp", host]
+ debugprint (host + ": " + repr(args))
+ stdout = None
+ try:
+@@ -3799,7 +3799,7 @@
+ 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 (['%%PREFIX%%/bin/cupstestppd',
+ '-rvv', filename],
+ close_fds=True,
+ stdin=file("/dev/null"),
Added: head/print/system-config-printer/files/patch-probe-printer.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/print/system-config-printer/files/patch-probe-printer.py Thu Sep 12 19:45:49 2013 (r327106)
@@ -0,0 +1,11 @@
+--- probe_printer.py.orig 2013-08-29 15:54:06.000000000 +0200
++++ probe_printer.py 2013-08-29 15:54:27.000000000 +0200
+@@ -275,7 +275,7 @@
+ null = file ("/dev/null", "r+")
+ try:
+ debugprint ("snmp: trying")
+- p = subprocess.Popen (args=["/usr/lib/cups/backend/snmp",
++ p = subprocess.Popen (args=["%%PREFIX%%/libexec/cups/backend/snmp",
+ self.hostname],
+ close_fds=True,
+ stdin=null,
More information about the svn-ports-all
mailing list