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

4 files changed, 39 insertions, 53 deletions

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">' +