aboutsummaryrefslogtreecommitdiff
path: root/print/system-config-printer/files
diff options
context:
space:
mode:
authorMichael Johnson <ahze@FreeBSD.org>2008-04-05 14:13:27 +0000
committerMichael Johnson <ahze@FreeBSD.org>2008-04-05 14:13:27 +0000
commitfb555beaf045a267cc236a3e804321c06de4a584 (patch)
tree0d0a4219450a070bfb3448d17c18e94971a6bb60 /print/system-config-printer/files
parent702254c7c5e884deecfaa785588d09463a82aba6 (diff)
downloadports-fb555beaf045a267cc236a3e804321c06de4a584.tar.gz
ports-fb555beaf045a267cc236a3e804321c06de4a584.zip
Notes
Diffstat (limited to 'print/system-config-printer/files')
-rw-r--r--print/system-config-printer/files/patch-system-config-printer.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/print/system-config-printer/files/patch-system-config-printer.py b/print/system-config-printer/files/patch-system-config-printer.py
index b87180c9d6bf..a00a5118073a 100644
--- a/print/system-config-printer/files/patch-system-config-printer.py
+++ b/print/system-config-printer/files/patch-system-config-printer.py
@@ -1,15 +1,15 @@
---- system-config-printer.py.orig 2008-03-20 11:58:46.000000000 -0400
-+++ system-config-printer.py 2008-03-20 12:01:44.000000000 -0400
-@@ -72,7 +72,7 @@
+--- system-config-printer.py.orig 2008-04-03 11:54:02.000000000 -0400
++++ system-config-printer.py 2008-04-05 10:02:07.950114470 -0400
+@@ -77,7 +77,7 @@
import gettext
gettext.textdomain (domain)
gtk.glade.bindtextdomain (domain)
-pkgdata = '/usr/share/' + domain
+pkgdata = '%%PREFIX%%/share/' + domain
+ iconpath = pkgdata + '/icons/'
glade_file = pkgdata + '/' + domain + '.glade'
sys.path.append (pkgdata)
-
-@@ -2987,7 +2987,7 @@
+@@ -2855,7 +2855,7 @@
# Try to get make and model via SNMP
if host:
os.environ["HOST"] = host
@@ -17,8 +17,8 @@
+ cmd = '%%LOCALBASE%%/libexec/cups/backend/snmp "${HOST}" 2>/dev/null'
debugprint (host + ": " + cmd)
p = os.popen(cmd, 'r')
- output = p.read()
-@@ -4055,7 +4055,7 @@
+ output = p.read ().strip ()
+@@ -3931,7 +3931,7 @@
os.environ["PPD"] = filename
# We want this to be in the current natural language,
# so we intentionally don't set LC_ALL=C here.
@@ -27,7 +27,7 @@
output = p.readlines ()
p.close ()
err += reduce (lambda x, y: x + y, output)
-@@ -4345,7 +4345,7 @@
+@@ -4212,7 +4212,7 @@
(pkgs, exes) = cupshelpers.missingPackagesAndExecutables (ppd)
if len (pkgs) > 0 or len (exes) > 0:
# We didn't find a necessary executable. Complain.