- Update system-config-printer to 0.9.90

- Link py-cups with iconv

5 files changed, 26 insertions, 14 deletions

diff --git a/print/py-cups/Makefile b/print/py-cups/Makefile
index 189b735f912..d5ff0c9d025 100644
--- a/print/py-cups/Makefile
+++ b/print/py-cups/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cups
 PORTVERSION=	1.9.38
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://cyberelk.net/tim/data/pycups/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -18,10 +19,11 @@ COMMENT=	CUPS bindings for Python
 LIB_DEPENDS=	cups.2:${PORTSDIR}/print/cups-base
 
 USE_PYTHON=	yes
+USE_ICONV=	yes
 USE_BZIP2=	yes
 USE_PYDISTUTILS=	yes
 CFLAGS+=	-I${LOCALBASE}/include -DVERSION=\\\"${PORTVERSION}\\\"
-LDFLAGS+=	-L${LOCALBASE}/lib
+LDFLAGS+=	-L${LOCALBASE}/lib -liconv
 MAKE_ENV=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 PYDISTUTILS_EGGINFO=${PORTNAME}-1.0-py2.5.egg-info
 PLIST_FILES=	%%PYTHON_SITELIBDIR%%/cups.so
diff --git a/print/system-config-printer/Makefile b/print/system-config-printer/Makefile
index 63856f3da3c..b7c14de160f 100644
--- a/print/system-config-printer/Makefile
+++ b/print/system-config-printer/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	system-config-printer
-PORTVERSION=	0.7.82
-PORTREVISION=	3
+PORTVERSION=	0.9.90
 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 e2c41ee5a30..11f9f8d17ce 100644
--- a/print/system-config-printer/distinfo
+++ b/print/system-config-printer/distinfo
@@ -1,3 +1,3 @@
-MD5 (system-config-printer-0.7.82.tar.bz2) = a85efc175c58506239f3613baf992fca
-SHA256 (system-config-printer-0.7.82.tar.bz2) = 4756a7bf3d36eb7bcb2993b97f4543ee8a6d5c68f775c6d73f2c02cc6dfd1f5f
-SIZE (system-config-printer-0.7.82.tar.bz2) = 622767
+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
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 b87180c9d6b..a00a5118073 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.
diff --git a/print/system-config-printer/pkg-plist b/print/system-config-printer/pkg-plist
index 0edfc86bcbc..f81dde70046 100644
--- a/print/system-config-printer/pkg-plist
+++ b/print/system-config-printer/pkg-plist
@@ -68,10 +68,16 @@ share/locale/zh_CN/LC_MESSAGES/system-config-printer.mo
 share/locale/zh_TW/LC_MESSAGES/system-config-printer.mo
 %%DATADIR%%/applet.glade
 %%DATADIR%%/applet.py
+%%DATADIR%%/authconn.py
 %%DATADIR%%/config.py
+%%DATADIR%%/contextmenu.py
 %%DATADIR%%/cupshelpers.py
+%%DATADIR%%/debug.py
 %%DATADIR%%/gtk_label_autowrap.py
 %%DATADIR%%/gtk_treeviewtooltips.py
+%%DATADIR%%/icons/i-network-printer.png
+%%DATADIR%%/jobviewer.py
+%%DATADIR%%/monitor.py
 %%DATADIR%%/my-default-printer.py
 %%DATADIR%%/openprinting.py
 %%DATADIR%%/options.py
@@ -79,13 +85,17 @@ share/locale/zh_TW/LC_MESSAGES/system-config-printer.mo
 %%DATADIR%%/ppds.py
 %%DATADIR%%/probe_printer.py
 %%DATADIR%%/pysmb.py
+%%DATADIR%%/smburi.py
 %%DATADIR%%/statereason.py
 %%DATADIR%%/system-config-printer.glade
 %%DATADIR%%/system-config-printer.py
+%%DATADIR%%/troubleshoot/CheckLocalServerPublishing.py
 %%DATADIR%%/troubleshoot/CheckNetworkServerSanity.py
+%%DATADIR%%/troubleshoot/CheckPPDSanity.py
 %%DATADIR%%/troubleshoot/CheckPrinterSanity.py
 %%DATADIR%%/troubleshoot/ChooseNetworkPrinter.py
 %%DATADIR%%/troubleshoot/ChoosePrinter.py
+%%DATADIR%%/troubleshoot/DeviceListed.py
 %%DATADIR%%/troubleshoot/ErrorLogCheckpoint.py
 %%DATADIR%%/troubleshoot/ErrorLogFetch.py
 %%DATADIR%%/troubleshoot/ErrorLogParse.py
@@ -103,6 +113,7 @@ share/locale/zh_TW/LC_MESSAGES/system-config-printer.mo
 %%DATADIR%%/troubleshoot/__init__.py
 %%DATADIR%%/troubleshoot/base.py
 @dirrm %%DATADIR%%/troubleshoot
+@dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te