9 files changed, 34 insertions, 84 deletions

diff --git a/print/system-config-printer/Makefile b/print/system-config-printer/Makefile
index b7c14de160fc..8586b8cedc8e 100644
--- a/print/system-config-printer/Makefile
+++ b/print/system-config-printer/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	system-config-printer
-PORTVERSION=	0.9.90
+PORTVERSION=	0.9.93
 CATEGORIES=	print gnome
 MASTER_SITES=	http://cyberelk.net/tim/data/${PORTNAME}/
 
diff --git a/print/system-config-printer/distinfo b/print/system-config-printer/distinfo
index 11f9f8d17ce8..03ca5a178092 100644
--- a/print/system-config-printer/distinfo
+++ b/print/system-config-printer/distinfo
@@ -1,3 +1,3 @@
-MD5 (system-config-printer-0.9.90.tar.bz2) = 9d058c831fb6ebc5012eebfa14efc827
-SHA256 (system-config-printer-0.9.90.tar.bz2) = b93f0e09e5fa16c108fffda0375c7f62c86d32aed89c87c35935aa01729c675f
-SIZE (system-config-printer-0.9.90.tar.bz2) = 664918
+MD5 (system-config-printer-0.9.93.tar.bz2) = b97deae648bc1c5825874d250a9c140c
+SHA256 (system-config-printer-0.9.93.tar.bz2) = dc14b3709ac671e9aaa1fa726895661352b0f36555ed73ba3eb44d91d6d63257
+SIZE (system-config-printer-0.9.93.tar.bz2) = 686166
diff --git a/print/system-config-printer/files/patch-applet.py b/print/system-config-printer/files/patch-applet.py
index 5196dd3c1532..e7e68ff7d286 100644
--- a/print/system-config-printer/files/patch-applet.py
+++ b/print/system-config-printer/files/patch-applet.py
@@ -1,29 +1,29 @@
---- applet.py.orig	2008-03-20 11:46:28.000000000 -0400
-+++ applet.py	2008-03-20 11:48:47.000000000 -0400
-@@ -22,7 +22,7 @@
- import statereason
- from statereason import StateReason
+--- applet.py.orig	2008-05-23 04:57:31.000000000 -0700
++++ applet.py	2008-05-26 23:23:31.512688566 -0700
+@@ -43,7 +43,7 @@
+     os.environ['LC_ALL'] = 'C'
+     locale.setlocale (locale.LC_ALL, "")
  
 -APPDIR="/usr/share/system-config-printer"
 +APPDIR="%%PREFIX%%/share/system-config-printer"
  DOMAIN="system-config-printer"
  GLADE="applet.glade"
  ICON="printer"
-@@ -976,7 +976,7 @@
+@@ -61,7 +61,7 @@
+     STATUS_GENERIC_DRIVER = 2
+     STATUS_NO_DRIVER = 3
+ 
+-    INSTALL_PACKAGES_COMMAND="/usr/bin/system-install-packages"
++    INSTALL_PACKAGES_COMMAND="/usr/bin/true"
+ 
+     def __init__ (self, bus):
+         self.bus = bus
+@@ -170,7 +170,7 @@
          pid = os.fork ()
          if pid == 0:
              # Child.
 -            cmd = "/usr/bin/system-config-printer"
-+            cmd = "%%PREFIX%%/sbin/system-config-printer"
++            cmd = "%%PREFIX%%/bin/system-config-printer"
              argv.insert (0, cmd)
              os.execvp (cmd, argv)
              sys.exit (1)
-@@ -994,7 +994,7 @@
-         pid = os.fork ()
-         if pid == 0:
-             # Child.
--            argv = ["/usr/bin/system-install-packages"]
-+            argv = ["/usr/bin/true"]
-             argv.extend (missing_pkgs)
-             os.execv (argv[0], argv)
-             sys.exit (1)
diff --git a/print/system-config-printer/files/patch-manage-print-jobs.desktop.in b/print/system-config-printer/files/patch-manage-print-jobs.desktop.in
deleted file mode 100644
index 0eff6d030f1e..000000000000
--- a/print/system-config-printer/files/patch-manage-print-jobs.desktop.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- manage-print-jobs.desktop.in.orig	2008-03-20 11:51:36.000000000 -0400
-+++ manage-print-jobs.desktop.in	2008-03-20 11:51:59.000000000 -0400
-@@ -2,8 +2,8 @@
- Encoding=UTF-8
- _Name=Manage Print Jobs
- _Comment=Cancel, pause, resume or reprint jobs
--Exec=/usr/bin/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
diff --git a/print/system-config-printer/files/patch-my-default-printer.desktop.in b/print/system-config-printer/files/patch-my-default-printer.desktop.in
deleted file mode 100644
index 41571263959d..000000000000
--- a/print/system-config-printer/files/patch-my-default-printer.desktop.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- my-default-printer.desktop.in.orig	2008-03-20 11:53:43.000000000 -0400
-+++ my-default-printer.desktop.in	2008-03-20 11:53:59.000000000 -0400
-@@ -2,7 +2,7 @@
- Encoding=UTF-8
- _Name=Default Printer
- _Comment=Select default printer
--Exec=/usr/bin/my-default-printer
-+Exec=%%PREFIX%%/bin/my-default-printer
- Terminal=false
- Type=Application
- Icon=printer
diff --git a/print/system-config-printer/files/patch-print-applet.desktop.in b/print/system-config-printer/files/patch-print-applet.desktop.in
deleted file mode 100644
index fd0755e39e2e..000000000000
--- a/print/system-config-printer/files/patch-print-applet.desktop.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- print-applet.desktop.in.orig	2008-03-20 11:54:56.000000000 -0400
-+++ print-applet.desktop.in	2008-03-20 11:55:10.000000000 -0400
-@@ -2,7 +2,7 @@
- Encoding=UTF-8
- _Name=Print Queue Applet
- _Comment=System tray icon for managing print jobs
--Exec=/usr/bin/system-config-printer-applet
-+Exec=%%PREFIX%%/bin/system-config-printer-applet
- Terminal=false
- Type=Application
- Icon=printer
diff --git a/print/system-config-printer/files/patch-system-config-printer.desktop.in b/print/system-config-printer/files/patch-system-config-printer.desktop.in
deleted file mode 100644
index 6d503bd4df76..000000000000
--- a/print/system-config-printer/files/patch-system-config-printer.desktop.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- system-config-printer.desktop.in.orig	2008-03-20 11:58:12.000000000 -0400
-+++ system-config-printer.desktop.in	2008-03-20 11:58:25.000000000 -0400
-@@ -2,7 +2,7 @@
- Encoding=UTF-8
- _Name=Printing
- _Comment=Configure printers
--Exec=/usr/bin/system-config-printer
-+Exec=%%PREFIX%%/sbin/system-config-printer
- Terminal=false
- Type=Application
- Icon=printer
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 a00a5118073a..0c545351c11e 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,6 @@
---- 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)
-@@ -2855,7 +2855,7 @@
+--- system-config-printer.py.orig	2008-05-23 04:57:31.000000000 -0700
++++ system-config-printer.py	2008-05-26 23:25:11.159502896 -0700
+@@ -3098,7 +3098,7 @@
          # Try to get make and model via SNMP
          if host:
              os.environ["HOST"] = host
@@ -18,7 +9,7 @@
              debugprint (host + ": " + cmd)
              p = os.popen(cmd, 'r')
              output = p.read ().strip ()
-@@ -3931,7 +3931,7 @@
+@@ -4370,7 +4370,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 +18,7 @@
                  output = p.readlines ()
                  p.close ()
                  err += reduce (lambda x, y: x + y, output)
-@@ -4212,7 +4212,7 @@
+@@ -4655,7 +4655,7 @@
          (pkgs, exes) = cupshelpers.missingPackagesAndExecutables (ppd)
          if len (pkgs) > 0 or len (exes) > 0:
              # We didn't find a necessary executable.  Complain.
diff --git a/print/system-config-printer/pkg-plist b/print/system-config-printer/pkg-plist
index f81dde700469..28bebb01b7ec 100644
--- a/print/system-config-printer/pkg-plist
+++ b/print/system-config-printer/pkg-plist
@@ -1,8 +1,8 @@
 bin/my-default-printer
+bin/system-config-printer
 bin/system-config-printer-applet
 etc/dbus-1/system.d/newprinternotification.conf
 etc/xdg/autostart/redhat-print-applet.desktop
-sbin/system-config-printer
 share/applications/redhat-manage-print-jobs.desktop
 share/applications/redhat-my-default-printer.desktop
 share/applications/redhat-system-config-printer.desktop
@@ -57,7 +57,7 @@ share/locale/si/LC_MESSAGES/system-config-printer.mo
 share/locale/sk/LC_MESSAGES/system-config-printer.mo
 share/locale/sl/LC_MESSAGES/system-config-printer.mo
 share/locale/sr/LC_MESSAGES/system-config-printer.mo
-share/locale/sr@Latn/LC_MESSAGES/system-config-printer.mo
+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
@@ -73,6 +73,7 @@ share/locale/zh_TW/LC_MESSAGES/system-config-printer.mo
 %%DATADIR%%/contextmenu.py
 %%DATADIR%%/cupshelpers.py
 %%DATADIR%%/debug.py
+%%DATADIR%%/errordialogs.py
 %%DATADIR%%/gtk_label_autowrap.py
 %%DATADIR%%/gtk_treeviewtooltips.py
 %%DATADIR%%/icons/i-network-printer.png
@@ -117,6 +118,8 @@ share/locale/zh_TW/LC_MESSAGES/system-config-printer.mo
 @dirrm %%DATADIR%%
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
 @dirrmtry share/locale/si/LC_MESSAGES
 @dirrmtry share/locale/si
 @dirrmtry share/locale/my/LC_MESSAGES
@@ -132,5 +135,7 @@ share/locale/zh_TW/LC_MESSAGES/system-config-printer.mo
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
 @dirrmtry share/applications
-@dirrmtry etc/xdg/autostart
-@dirrmtry etc/xdg
+@dirrm etc/xdg/autostart
+@dirrm etc/xdg
+@dirrm etc/dbus-1/system.d
+@dirrm etc/dbus-1