Presenting GNOME 2.30.1 for FreeBSD. The offical release notes for this

release can be found at http://library.gnome.org/misc/release-notes/2.30/ . This release brings initial PackageKit support, Upower (replaces power management part of hal), cuse4bsd integration with HAL and cheese, and a faster Evolution. Sadly GNOME 2.30.x will be the last release with FreeBSD 6.X support. This will also be the last of the 2.x releases. The next release will be the highly-anticipated GNOME 3.0 which will bring with it a new UI experience. Currently, there are a few bugs with GNOME 2.30 that may be of note for our users. Be sure to consult the UPGRADING note or the 2.30 upgrade FAQ at http://www.freebsd.org/gnome/docs/faq230.html for specific upgrading instructions, and the up-to-date list of known issues. This release features commits by avl, ahze, bland, marcus, mezz, and myself. The FreeBSD GNOME Team would like to thank Anders F Bjorklund for doing the initual packagekit porting. And the following contributors & testers for there help with this release: Eric L. Chen Vladimir Grebenschikov Sergio de Almeida Lenzi DomiX walder crsd Kevin Oberman Michal Varga Pavel Plesov Bapt kevin and ITetcu for two exp-run PR: ports/143852 ports/145347 ports/144980 ports/145830 ports/145511
author: Koop Mast <kwm@FreeBSD.org> 2010-05-10 21:19:08 +0000
committer: Koop Mast <kwm@FreeBSD.org> 2010-05-10 21:19:08 +0000
commit: 48e62d9a379cd45a15f6ae89d564f81b3c13d16e (patch)
tree: b627baa77f19bb1eab2fa4dee08aab1908131cd0 /print/system-config-printer
parent: Register conflict between opal and opal3. (diff)
7 files changed, 94 insertions, 75 deletions
diff --git a/print/system-config-printer/Makefile b/print/system-config-printer/Makefile
index 713585d25764..af630ef232fc 100644
--- a/print/system-config-printer/Makefile
+++ b/print/system-config-printer/Makefile
@@ -3,14 +3,14 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/print/system-config-printer/Makefile,v 1.3 2008/03/23 16:10:55 ahze Exp $
+#   $MCom: ports/print/system-config-printer/Makefile,v 1.6 2009/12/29 16:03:58 ahze Exp $
 #
 
 PORTNAME=	system-config-printer
-PORTVERSION=	1.0.16
-PORTREVISION=	2
+PORTVERSION=	1.1.16
+PORTREVISION=	1
 CATEGORIES=	print gnome
-MASTER_SITES=	http://cyberelk.net/tim/data/${PORTNAME}/${PORTVERSION:R}.x/
+MASTER_SITES=	http://cyberelk.net/tim/data/${PORTNAME}/${PORTVERSION:R}/
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	CUPS configuration Gtk+2.0 GUI
@@ -24,10 +24,11 @@ BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/cups.so:${PORTSDIR}/print/py-cups \
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/cups.so:${PORTSDIR}/print/py-cups \
 		${LOCALBASE}/libdata/pkgconfig/notify-python.pc:${PORTSDIR}/devel/py-notify \
 		xmlproc_parse:${PORTSDIR}/textproc/py-xml \
-		${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus
+		${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus \
+		${LOCALBASE}/libexec/cups-pk-helper-mechanism:${PORTSDIR}/print/cups-pk-helper
 
 USE_BZIP2=	yes
-USE_PYTHON=	yes
+USE_PYTHON=	2.6+
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
diff --git a/print/system-config-printer/distinfo b/print/system-config-printer/distinfo
index fb1d983f445e..166a1797f53c 100644
--- a/print/system-config-printer/distinfo
+++ b/print/system-config-printer/distinfo
@@ -1,3 +1,3 @@
-MD5 (system-config-printer-1.0.16.tar.bz2) = eab094411498de16a0c2cf2c2ab5428a
-SHA256 (system-config-printer-1.0.16.tar.bz2) = 721c66e0f02aba245db7625d63a141b2f5229a6ba9c1e4a0f300a2a21ce0bfaf
-SIZE (system-config-printer-1.0.16.tar.bz2) = 837271
+MD5 (system-config-printer-1.1.16.tar.bz2) = 22394a052fa730a890f6bfea1aec0aa2
+SHA256 (system-config-printer-1.1.16.tar.bz2) = 176b63ee6af2208313469192eb34eb12b41fe8b890a18c8a5ab693010a8e785d
+SIZE (system-config-printer-1.1.16.tar.bz2) = 1036604
diff --git a/print/system-config-printer/files/patch-applet.py b/print/system-config-printer/files/patch-applet.py
index 07e729441373..d21bb2a2ec76 100644
--- a/print/system-config-printer/files/patch-applet.py
+++ b/print/system-config-printer/files/patch-applet.py
@@ -1,5 +1,5 @@
---- applet.py.orig	2008-11-21 10:58:21.000000000 -0600
-+++ applet.py	2008-11-22 11:28:38.936928214 -0600
+--- applet.py.orig	2009-12-22 09:44:19.000000000 -0500
++++ applet.py	2009-12-29 00:06:27.000000000 -0500
 @@ -43,7 +43,7 @@
      os.environ['LC_ALL'] = 'C'
      locale.setlocale (locale.LC_ALL, "")
@@ -7,18 +7,9 @@
 -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 @@
-     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 @@
+ SEARCHING_ICON="document-print-preview"
+@@ -234,7 +234,7 @@
          pid = os.fork ()
          if pid == 0:
              # Child.
diff --git a/print/system-config-printer/files/patch-cupshelpers_cupshelpers.py b/print/system-config-printer/files/patch-cupshelpers_cupshelpers.py
index 6624df0adb63..079c395adf40 100644
--- a/print/system-config-printer/files/patch-cupshelpers_cupshelpers.py
+++ b/print/system-config-printer/files/patch-cupshelpers_cupshelpers.py
@@ -1,15 +1,15 @@
---- cupshelpers/cupshelpers.py.orig	2008-07-09 06:23:44.000000000 -0500
-+++ cupshelpers/cupshelpers.py	2008-07-26 13:33:50.596144479 -0500
-@@ -699,7 +699,7 @@
+--- cupshelpers/cupshelpers.py.orig	2009-12-22 09:44:19.000000000 -0500
++++ cupshelpers/cupshelpers.py	2009-12-29 00:08:26.000000000 -0500
+@@ -663,7 +663,7 @@
  
      # First, a local function.  How to check that something exists
      # in a path:
 -    def pathcheck (name, path="/usr/bin:/bin"):
-+    def pathcheck (name, path="%%LOCALBASE%%/bin:/usr/bin:/bin:%%PREFIX%%/bin"):
-         # Strip out foomatic '%'-style place-holders.
-         p = name.find ('%')
-         if p != -1:
-@@ -794,7 +794,7 @@
++    def pathcheck (name, path="%%LOCALBASE%%/bin:%%PREFIX%%/bin:/usr/bin:/bin"):
+         if name == "-":
+             # A filter of "-" means that no filter is required,
+             # i.e. the device accepts the given format as-is.
+@@ -765,7 +765,7 @@
                      continue
  
                  exepath = pathcheck (exe,
diff --git a/print/system-config-printer/files/patch-pysmb.py b/print/system-config-printer/files/patch-pysmb.py
deleted file mode 100644
index 648837de6d98..000000000000
--- a/print/system-config-printer/files/patch-pysmb.py
+++ /dev/null
@@ -1,19 +0,0 @@
---- pysmb.py.orig	2008-03-20 11:55:30.000000000 -0400
-+++ pysmb.py	2008-03-20 11:56:22.000000000 -0400
-@@ -24,13 +24,13 @@
- 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 = "%%LOCALBASE%%/etc/smb.conf"
-         wsregex = re.compile("\s*wins\s*server.*",re.IGNORECASE)
- 	
- 	global wins	
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 784a0a8cea29..c0129a32c5ae 100644
--- a/print/system-config-printer/files/patch-system-config-printer.py
+++ b/print/system-config-printer/files/patch-system-config-printer.py
@@ -1,6 +1,29 @@
---- system-config-printer.py.orig	2008-11-21 11:19:25.000000000 -0600
-+++ system-config-printer.py	2008-11-22 11:30:37.732537129 -0600
-@@ -3668,7 +3668,7 @@
+--- system-config-printer.py.orig	2009-12-22 09:44:19.000000000 -0500
++++ system-config-printer.py	2009-12-29 00:35:54.000000000 -0500
+@@ -4344,7 +4344,7 @@
+                 if may_be_ps:
+                     debugprint ("Printer might support PostScript")
+                     try:
+-                        os.stat ("/usr/share/cups/model/foomatic-db-ppds")
++                        os.stat ("%%LOCALBASE%%/share/cups/model/foomatic-db-ppds")
+                         debugprint ("foomatic-db-ppds already installed")
+                     except OSError:
+                         debugprint ("foomatic-db-ppds not yet installed")
+@@ -4892,11 +4892,11 @@
+                 # Problem executing command.
+                 return True # assume plugin not required
+         else:
+-            if glob.glob("/usr/share/hplip/data/plugin/*%s*plugin*" %
++            if glob.glob("%%LOCALBASE%%share/hplip/data/plugin/*%s*plugin*" %
+                          hplip_version):
+                 if hplip_version.startswith("2"):
+                     try:
+-                        f = open('/etc/hp/hplip.conf', 'r')
++                        f = open('%%LOCALBASE%%/etc/hp/hplip.conf', 'r')
+                         for line in f:
+                             if line.strip ().startswith("plugin") and \
+                                     line.strip ().endswith("1"):
+@@ -5082,7 +5082,7 @@
          # Try to get make and model via SNMP
          if host:
              os.environ["HOST"] = host
@@ -9,7 +32,7 @@
              debugprint (host + ": " + cmd)
              stdout = None
              try:
-@@ -5140,7 +5140,7 @@
+@@ -6621,7 +6621,7 @@
                  try:
                      # We want this to be in the current natural language,
                      # so we intentionally don't set LC_ALL=C here.
@@ -18,12 +41,3 @@
                                             '-rvv', filename],
                                            stdin=file("/dev/null"),
                                            stdout=subprocess.PIPE,
-@@ -5433,7 +5433,7 @@
-         (pkgs, exes) = cupshelpers.missingPackagesAndExecutables (ppd)
-         if len (pkgs) > 0 or len (exes) > 0:
-             # We didn't find a necessary executable.  Complain.
--            install = "/usr/bin/gpk-install-package-name"
-+            install = "/usr/bin/true"
-             if len (pkgs) > 0 and os.access (install, os.X_OK):
-                 pkg = pkgs[0]
-                 install_text = ('<span weight="bold" size="larger">' +
diff --git a/print/system-config-printer/pkg-plist b/print/system-config-printer/pkg-plist
index b1408928a6a8..fea8725a0580 100644
--- a/print/system-config-printer/pkg-plist
+++ b/print/system-config-printer/pkg-plist
@@ -2,8 +2,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
-%%PYTHON_SITELIBDIR%%/cupshelpers-1.0-py%%PYTHON_VER%%.egg-info
+etc/xdg/autostart/print-applet.desktop
+%%PYTHON_SITELIBDIR%%/cupshelpers-1.0-py%PYTHON_VER%%.egg-info
 %%PYTHON_SITELIBDIR%%/cupshelpers/__init__.py
 %%PYTHON_SITELIBDIR%%/cupshelpers/__init__.pyc
 %%PYTHON_SITELIBDIR%%/cupshelpers/cupshelpers.py
@@ -12,9 +12,9 @@ etc/xdg/autostart/redhat-print-applet.desktop
 %%PYTHON_SITELIBDIR%%/cupshelpers/openprinting.pyc
 %%PYTHON_SITELIBDIR%%/cupshelpers/ppds.py
 %%PYTHON_SITELIBDIR%%/cupshelpers/ppds.pyc
-share/applications/redhat-manage-print-jobs.desktop
-share/applications/redhat-my-default-printer.desktop
-share/applications/redhat-system-config-printer.desktop
+share/applications/manage-print-jobs.desktop
+share/applications/my-default-printer.desktop
+share/applications/system-config-printer.desktop
 share/locale/ar/LC_MESSAGES/system-config-printer.mo
 share/locale/as/LC_MESSAGES/system-config-printer.mo
 share/locale/bg/LC_MESSAGES/system-config-printer.mo
@@ -48,6 +48,7 @@ share/locale/kn/LC_MESSAGES/system-config-printer.mo
 share/locale/ko/LC_MESSAGES/system-config-printer.mo
 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
@@ -71,34 +72,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
 %%DATADIR%%/AdvancedServerSettings.py
+%%DATADIR%%/GroupsPane.py
+%%DATADIR%%/GroupsPaneModel.py
+%%DATADIR%%/HIG.py
 %%DATADIR%%/PhysicalDevice.py
-%%DATADIR%%/applet.glade
+%%DATADIR%%/SearchCriterion.py
+%%DATADIR%%/ToolbarSearchEntry.py
+%%DATADIR%%/XmlHelper.py
 %%DATADIR%%/applet.py
+%%DATADIR%%/asyncconn.py
+%%DATADIR%%/asyncipp.py
+%%DATADIR%%/asyncpk0.py
+%%DATADIR%%/asyncpk1.py
 %%DATADIR%%/authconn.py
 %%DATADIR%%/config.py
-%%DATADIR%%/contextmenu.py
+%%DATADIR%%/cupspk.py
 %%DATADIR%%/debug.py
 %%DATADIR%%/errordialogs.py
+%%DATADIR%%/firewall.py
+%%DATADIR%%/glade.py
+%%DATADIR%%/glade/AboutDialog.glade
+%%DATADIR%%/glade/ConnectDialog.glade
+%%DATADIR%%/glade/ConnectingDialog.glade
+%%DATADIR%%/glade/InstallDialog.glade
+%%DATADIR%%/glade/JobsWindow.glade
+%%DATADIR%%/glade/NewPrinterName.glade
+%%DATADIR%%/glade/NewPrinterWindow.glade
+%%DATADIR%%/glade/PrinterPropertiesDialog.glade
+%%DATADIR%%/glade/PrintersWindow.glade
+%%DATADIR%%/glade/SMBBrowseDialog.glade
+%%DATADIR%%/glade/ServerSettingsDialog.glade
+%%DATADIR%%/glade/WaitWindow.glade
+%%DATADIR%%/glade/statusicon_popupmenu.glade
 %%DATADIR%%/gtk_label_autowrap.py
-%%DATADIR%%/gtk_treeviewtooltips.py
+%%DATADIR%%/gtkinklevel.py
+%%DATADIR%%/gtkspinner.py
 %%DATADIR%%/icons/i-network-printer.png
+%%DATADIR%%/installpackage.py
 %%DATADIR%%/jobviewer.py
 %%DATADIR%%/monitor.py
 %%DATADIR%%/my-default-printer.py
 %%DATADIR%%/options.py
 %%DATADIR%%/optionwidgets.py
+%%DATADIR%%/ppdippstr.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%%/timedops.py
 %%DATADIR%%/troubleshoot/CheckLocalServerPublishing.py
 %%DATADIR%%/troubleshoot/CheckNetworkServerSanity.py
 %%DATADIR%%/troubleshoot/CheckPPDSanity.py
@@ -127,7 +156,12 @@ share/locale/zh_TW/LC_MESSAGES/system-config-printer.mo
 %%DATADIR%%/userdefault.py
 @dirrm %%DATADIR%%/troubleshoot
 @dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%/glade
 @dirrm %%DATADIR%%
+@dirrmtry share/applications
+@dirrm %%PYTHON_SITELIBDIR%%/cupshelpers
+@dirrmtry etc/xdg/autostart
+@dirrmtry etc/xdg
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
 @dirrmtry share/locale/sr@latin/LC_MESSAGES
@@ -138,6 +172,8 @@ share/locale/zh_TW/LC_MESSAGES/system-config-printer.mo
 @dirrmtry share/locale/my
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
 @dirrmtry share/locale/lo/LC_MESSAGES
 @dirrmtry share/locale/lo
 @dirrmtry share/locale/hy/LC_MESSAGES
@@ -146,7 +182,3 @@ share/locale/zh_TW/LC_MESSAGES/system-config-printer.mo
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
-@dirrmtry share/applications
-@dirrm %%PYTHON_SITELIBDIR%%/cupshelpers
-@dirrmtry etc/xdg/autostart
-@dirrmtry etc/xdg
author	Koop Mast <kwm@FreeBSD.org>	2010-05-10 21:19:08 +0000
committer	Koop Mast <kwm@FreeBSD.org>	2010-05-10 21:19:08 +0000
commit	48e62d9a379cd45a15f6ae89d564f81b3c13d16e (patch)
tree	b627baa77f19bb1eab2fa4dee08aab1908131cd0 /print/system-config-printer
parent	Register conflict between opal and opal3. (diff)