13 files changed, 56 insertions, 197 deletions

diff --git a/deskutils/gdesklets/Makefile b/deskutils/gdesklets/Makefile
index 4499be9be0aa..d83c9488b9b0 100644
--- a/deskutils/gdesklets/Makefile
+++ b/deskutils/gdesklets/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	gdesklets
-PORTVERSION=	0.24.1
-PORTREVISION=	2
+PORTVERSION=	0.25.1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://www.pycage.de/download/${PORTNAME}/
 DISTNAME=	gDesklets-${PORTVERSION}
 
-MAINTAINER=	mezz7@cox.net
+MAINTAINER=	klammer@webonaut.com
 COMMENT=	A framework for Gnome 2.x for desktop applets
 
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gnome/__init__.py:${PORTSDIR}/x11-toolkits/py-gnome2
diff --git a/deskutils/gdesklets/distinfo b/deskutils/gdesklets/distinfo
index ceabe0253261..d20cc7de3c70 100644
--- a/deskutils/gdesklets/distinfo
+++ b/deskutils/gdesklets/distinfo
@@ -1 +1 @@
-MD5 (gDesklets-0.24.1.tar.bz2) = 2187806b52bb81b1a88f6caf6197a4d1
+MD5 (gDesklets-0.25.1.tar.bz2) = 91a25ffc1a158fa3e0a83c28969f685c
diff --git a/deskutils/gdesklets/files/patch-configure b/deskutils/gdesklets/files/patch-configure
index 1ac0f6cd2b08..479c5d3e2272 100644
--- a/deskutils/gdesklets/files/patch-configure
+++ b/deskutils/gdesklets/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Fri Oct 17 22:42:52 2003
-+++ configure	Fri Oct 17 22:42:57 2003
-@@ -7798,6 +7798,7 @@
+--- configure.orig	Tue Dec 30 13:22:59 2003
++++ configure	Tue Dec 30 13:23:27 2003
+@@ -18395,6 +18395,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
diff --git a/deskutils/gdesklets/files/patch-data::Makefile.in b/deskutils/gdesklets/files/patch-data::Makefile.in
index a3cd106a6a74..4b5c1988a09d 100644
--- a/deskutils/gdesklets/files/patch-data::Makefile.in
+++ b/deskutils/gdesklets/files/patch-data::Makefile.in
@@ -1,6 +1,6 @@
---- data/Makefile.in.orig	Fri Oct 17 22:44:59 2003
-+++ data/Makefile.in	Fri Oct 17 22:45:03 2003
-@@ -195,7 +195,7 @@
+--- data/Makefile.in.orig	Tue Dec 30 13:24:16 2003
++++ data/Makefile.in	Tue Dec 30 13:25:10 2003
+@@ -208,7 +208,7 @@
  @USERINST_TRUE@mimedir = ~/.gnome/mime-info
  mime_in_files = gdesklets.keys.in
  mime_DATA = $(mime_in_files:.keys.in=.keys) gdesklets.mime
diff --git a/deskutils/gdesklets/files/patch-display::TargetLabel.py b/deskutils/gdesklets/files/patch-display::TargetLabel.py
index 7832c4a6618e..005b5aa7aa93 100644
--- a/deskutils/gdesklets/files/patch-display::TargetLabel.py
+++ b/deskutils/gdesklets/files/patch-display::TargetLabel.py
@@ -1,6 +1,6 @@
---- display/TargetLabel.py.orig	Sat Oct 25 02:15:56 2003
-+++ display/TargetLabel.py	Sat Oct 25 02:21:05 2003
-@@ -76,7 +76,14 @@
+--- display/TargetLabel.py.orig	Tue Dec 30 13:26:48 2003
++++ display/TargetLabel.py	Tue Dec 30 13:27:20 2003
+@@ -90,7 +90,14 @@
  
  # determine the locale
  import commands
diff --git a/deskutils/gdesklets/files/patch-libdesklets::CPU.py b/deskutils/gdesklets/files/patch-libdesklets::CPU.py
deleted file mode 100644
index 9fb06d253f5c..000000000000
--- a/deskutils/gdesklets/files/patch-libdesklets::CPU.py
+++ /dev/null
@@ -1,59 +0,0 @@
-# Many thanks to Alexander Leidinger <netchild@FreeBSD.org> for
-# help and create those patches.
-
---- libdesklets/CPU.py	Thu Nov  6 14:50:47 2003
-+++ libdesklets/CPU.py	Sun Nov  9 01:34:27 2003
-@@ -1,6 +1,8 @@
- import polling
- import glibtop
- 
-+import os
-+import libdesklets as lib
- 
- #
- # TODO: support SMP
-@@ -35,20 +37,36 @@
- 
-     def __poll_cpu(self):
- 
--        import libdesklets as lib
-+        import re
- 
--        fd = open("/proc/cpuinfo", "r")
-+        platform = lib.sys.get_os()
-+
-+        if platform == "FreeBSD":
-+            fd = os.popen("grep -3 CPU /var/run/dmesg.boot | head -7 | tail -4", "r")
-+        elif platform == "Linux":
-+            fd = open("/proc/cpuinfo", "r")
-+        else:
-+            print "Unknown OS, strange things may happen."
-+            return
-         lines = fd.readlines()
-         fd.close()
- 
-         arch = lib.sys.get_arch()
-         if (arch in ["i386", "i486", "i586", "i686"]):
--            fields = lines[4].split()
--            model_name = " ".join(fields[3:])
--            fields = lines[6].split()
--            cpu_mhz = fields[3]
--            fields = lines[7].split()
--            cpu_cache = " ".join(fields[3:5])
-+            if ("FreeBSD" == platform):
-+                m = re.search('^CPU: (.*) \(([0-9]+.*)-MHz [0-9]+-class CPU\)', lines[0])
-+                model_name = m.group(1)           # or sysctl hw.model
-+                cpu_mhz = m.group(2)              # or sysctl hw.clockrate
-+                cpu_cache = " "                   # not available by default
-+            elif ("Linux" == platform):
-+                fields = lines[4].split()
-+                model_name = " ".join(fields[3:])
-+                fields = lines[6].split()
-+                cpu_mhz = fields[3]
-+                fields = lines[7].split()
-+                cpu_cache = " ".join(fields[3:5])
-+            else:
-+                pass
- 
-         elif (arch == "ppc"):
-             fields = lines[0].split()
diff --git a/deskutils/gdesklets/files/patch-libdesklets::Disk.py b/deskutils/gdesklets/files/patch-libdesklets::Disk.py
index 135285ca842e..ee68f1451d31 100644
--- a/deskutils/gdesklets/files/patch-libdesklets::Disk.py
+++ b/deskutils/gdesklets/files/patch-libdesklets::Disk.py
@@ -2,12 +2,15 @@
 # Franz Klammer <klammer@webonaut.com> for help and create
 # those patches.
 #
-# Note that, this is for now. One of us still need to fix the
-# libgtop to correct read the partition so this patch can be
-# remove.
+# Note that, this is for now. It will be remove when the
+# libgtop is update to 2.6 or maybe I can ask gnome@freebsd.org
+# if they won't mind to add a patch in libgtop 2.4 to get this
+# patch remove.
+#
+# Joe has fixed it in the libgtop 2.5.x and isn't in ports yet.
 
---- libdesklets/Disk.py.orig	Mon Nov 17 13:59:20 2003
-+++ libdesklets/Disk.py	Mon Nov 17 14:05:34 2003
+--- libdesklets/Disk.py.orig	Tue Dec 30 13:29:57 2003
++++ libdesklets/Disk.py	Tue Dec 30 13:31:01 2003
 @@ -1,6 +1,6 @@
  import glibtop
  import polling
@@ -16,23 +19,22 @@
  
  class Disk:
  
-@@ -13,18 +13,22 @@
+@@ -14,18 +14,22 @@
  
      def __poll_partitions(self):
  
 -        data = glibtop.get_mountlist(0)
--        partitions = []
++        fd = os.popen("mount -p")
++        data = fd.readlines()
++        fd.close()
++
+         partitions = []
 -        for size, device, mpoint, fstype in data:
 -            if (fstype in ("ext2", "ext3", "msdos", "vfat", "ntfs", "hpfs"
 -                           "jfs", "reiserfs", "xfs", "qnx4", "adfs", "ffs",
 -                           "hfs", "befs", "bfs", "efs", "iso9660", "minix",
 -                           "sysv", "coda", "nfs", "udf", "ufs", "xiafs")):
 -                partitions.append((device, mpoint))
-+        fd = os.popen("mount -p")
-+        data = fd.readlines()
-+        fd.close()
-+
-+        partitions = []
 +        for lines in data:
 +           fields = lines.strip().replace("\t", " ").split()
 +           if (fields[2] in ("ext2", "ext3", "msdos", "vfat", "ntfs", "hpfs"
diff --git a/deskutils/gdesklets/files/patch-libdesklets::Memory.py b/deskutils/gdesklets/files/patch-libdesklets::Memory.py
deleted file mode 100644
index d6702e7fe74f..000000000000
--- a/deskutils/gdesklets/files/patch-libdesklets::Memory.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# Many thanks to Alexander Leidinger <netchild@FreeBSD.org> and
-# Franz Klammer <klammer@webonaut.com> for help and create
-# those patches.
-
---- libdesklets/Memory.py.orig	Sun Nov 16 17:02:45 2003
-+++ libdesklets/Memory.py	Sun Nov 16 17:03:19 2003
-@@ -49,7 +49,7 @@
- 
-         # Swap
-         elif (mode == 1):
--            total, used, free = glibtop.get_mem()[:3]
-+            total, used, free = glibtop.get_swap()[:3]
-             #for l in lines:
-             #    if (l.startswith("SwapTotal:")):
-             #        value = l.split()
diff --git a/deskutils/gdesklets/files/patch-libdesklets::Network.py b/deskutils/gdesklets/files/patch-libdesklets::Network.py
deleted file mode 100644
index a109edb44012..000000000000
--- a/deskutils/gdesklets/files/patch-libdesklets::Network.py
+++ /dev/null
@@ -1,69 +0,0 @@
-# Many thanks to Alexander Leidinger <netchild@FreeBSD.org> and
-# Franz Klammer <klammer@webonaut.com> for help and create
-# those patches.
-
---- libdesklets/Network.py.orig	Sun Nov 16 15:15:30 2003
-+++ libdesklets/Network.py	Sun Nov 16 15:18:22 2003
-@@ -1,8 +1,8 @@
- import polling
- import glibtop
--
-+import os
- import time
--
-+import libdesklets as lib
- 
- class Network:
- 
-@@ -27,21 +27,40 @@
- 
-     def __poll_devices(self):
- 
--        fd = open("/proc/net/dev", "r")
-+        platform = lib.sys.get_os()
-+
-+        if ("FreeBSD" == platform):
-+            fd = os.popen("ifconfig -a | grep mtu", "r")
-+        elif ("Linux" == platform):
-+            fd = open("/proc/net/dev", "r")
-+        else:
-+            return []
-         data = fd.readlines()
-         fd.close()
- 
-         devices = []
--        for lines in data[2:]:
--            l = lines.strip()
--            l = l.replace(":", " ")
--            fields = l.split()
--
--            if (fields[0] == "lo"):
--                continue
--            else:
--                device = fields[0]
--                devices.append(device)
-+        if ("FreeBSD" == platform):
-+            for lines in data:
-+                fields = lines.strip().split(":")
-+
-+                if (fields[0][:2] == "lo"):
-+                    continue
-+                else:
-+                    device = fields[0]
-+                    devices.append(device)
-+        elif ("Linux" == platform):
-+            for lines in data[2:]:
-+                l = lines.strip()
-+                l = l.replace(":", " ")
-+                fields = l.split()
-+
-+                if (fields[0] == "lo"):
-+                    continue
-+                else:
-+                    device = fields[0]
-+                    devices.append(device)
-+        else:
-+            pass
- 
-         return devices
- 
diff --git a/deskutils/gdesklets/files/patch-locale::install_locales.py b/deskutils/gdesklets/files/patch-locale::install_locales.py
deleted file mode 100644
index b3d026917b83..000000000000
--- a/deskutils/gdesklets/files/patch-locale::install_locales.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- locale/install_locales.py.orig	Sun Aug 31 23:07:07 2003
-+++ locale/install_locales.py	Sun Aug 31 23:07:33 2003
-@@ -17,7 +17,7 @@
-     file = os.path.basename(source)
-     lang, ext = os.path.splitext(file)
-     fulltargetpath = os.path.join(targetpath, lang, "LC_MESSAGES")
--    os.system("mkdir --parents " + fulltargetpath)
-+    os.system("mkdir -p " + fulltargetpath)
-     
-     print (source)
-     mofile = os.path.join(fulltargetpath, domain + ".mo")
diff --git a/deskutils/gdesklets/files/patch-sensor::Sensor.py b/deskutils/gdesklets/files/patch-sensor::Sensor.py
deleted file mode 100644
index c2c3430d51fb..000000000000
--- a/deskutils/gdesklets/files/patch-sensor::Sensor.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# Yay! Many thanks to Franz Klammer <klammer@webonaut.com>,
-# the theads is now work. That make a lot of desklets work now.
-
---- sensor/Sensor.py.orig	Tue Nov 18 13:32:10 2003
-+++ sensor/Sensor.py	Tue Nov 18 13:33:39 2003
-@@ -346,3 +346,7 @@
-     def __on_quit(self, src):
- 
-         gtk.main_quit()
-+
-+
-+# FreeBSD needs this; Linux doesn't but it's cleaner to use it
-+gtk.threads_init()
diff --git a/deskutils/gdesklets/pkg-message b/deskutils/gdesklets/pkg-message
index 069f68ca0774..fa2f698e0a18 100644
--- a/deskutils/gdesklets/pkg-message
+++ b/deskutils/gdesklets/pkg-message
@@ -7,6 +7,6 @@ There are only few desklets in the ports tree at the moment. To help porting
 more desklets please visit http://gdesklets.gnomedesktop.org/ and port
 some desklets. Those ports should have a PKGNAMEPREFIX of "gdesklets-".
 If the port only provides a sensor or a display the name should have a
--sensor or -display appended, so it would be e.g.
-"gdesklets-<name>-sensor".
+sensor- or display- appended, so it would be e.g.
+"gdesklets-sensor-<name>".
 ##
diff --git a/deskutils/gdesklets/pkg-plist b/deskutils/gdesklets/pkg-plist
index d039eae7d49f..0314ea432f06 100644
--- a/deskutils/gdesklets/pkg-plist
+++ b/deskutils/gdesklets/pkg-plist
@@ -12,6 +12,7 @@ share/gnome/gdesklets/config/ConfigManager.py
 share/gnome/gdesklets/config/DummyBackend.py
 share/gnome/gdesklets/config/GConfBackend.py
 share/gnome/gdesklets/config/__init__.py
+share/gnome/gdesklets/config/migration.py
 share/gnome/gdesklets/config/settings.py
 share/gnome/gdesklets/data/gdesklets.png
 share/gnome/gdesklets/desktop/BGWatcher.py
@@ -21,11 +22,13 @@ share/gnome/gdesklets/display/ContainerTarget.py
 share/gnome/gdesklets/display/DataTarget.py
 share/gnome/gdesklets/display/Display.py
 share/gnome/gdesklets/display/DisplayConfigurator.py
+share/gnome/gdesklets/display/DisplayContainer.py
 share/gnome/gdesklets/display/DisplayTarget.py
 share/gnome/gdesklets/display/TargetAlignment.py
 share/gnome/gdesklets/display/TargetArray.py
 share/gnome/gdesklets/display/TargetBonoboControl.py
 share/gnome/gdesklets/display/TargetCanvas.py
+share/gnome/gdesklets/display/TargetExpander.py
 share/gnome/gdesklets/display/TargetFrame.py
 share/gnome/gdesklets/display/TargetGauge.py
 share/gnome/gdesklets/display/TargetGroup.py
@@ -34,6 +37,8 @@ share/gnome/gdesklets/display/TargetImage.py
 share/gnome/gdesklets/display/TargetLabel.py
 share/gnome/gdesklets/display/TargetPlotter.py
 share/gnome/gdesklets/display/TargetPopup.py
+share/gnome/gdesklets/display/Window.py
+share/gnome/gdesklets/display/WindowSnapper.py
 share/gnome/gdesklets/display/__init__.py
 share/gnome/gdesklets/display/layouters.py
 share/gnome/gdesklets/display/targetregistry.py
@@ -53,17 +58,23 @@ share/gnome/gdesklets/libdesklets/glibtop.py
 share/gnome/gdesklets/libdesklets/polling.py
 share/gnome/gdesklets/locale/ar/LC_MESSAGES/gdesklets.mo
 share/gnome/gdesklets/locale/az/LC_MESSAGES/gdesklets.mo
+share/gnome/gdesklets/locale/ca/LC_MESSAGES/gdesklets.mo
 share/gnome/gdesklets/locale/de/LC_MESSAGES/gdesklets.mo
-share/gnome/gdesklets/locale/de_BY/LC_MESSAGES/gdesklets.mo
 share/gnome/gdesklets/locale/el/LC_MESSAGES/gdesklets.mo
 share/gnome/gdesklets/locale/es/LC_MESSAGES/gdesklets.mo
+share/gnome/gdesklets/locale/eu/LC_MESSAGES/gdesklets.mo
 share/gnome/gdesklets/locale/fr/LC_MESSAGES/gdesklets.mo
 share/gnome/gdesklets/locale/he/LC_MESSAGES/gdesklets.mo
+share/gnome/gdesklets/locale/it/LC_MESSAGES/gdesklets.mo
+share/gnome/gdesklets/locale/ja/LC_MESSAGES/gdesklets.mo
 share/gnome/gdesklets/locale/ko/LC_MESSAGES/gdesklets.mo
+share/gnome/gdesklets/locale/lt/LC_MESSAGES/gdesklets.mo
 share/gnome/gdesklets/locale/ms/LC_MESSAGES/gdesklets.mo
 share/gnome/gdesklets/locale/nl/LC_MESSAGES/gdesklets.mo
 share/gnome/gdesklets/locale/pl/LC_MESSAGES/gdesklets.mo
 share/gnome/gdesklets/locale/pt/LC_MESSAGES/gdesklets.mo
+share/gnome/gdesklets/locale/pt_BR/LC_MESSAGES/gdesklets.mo
+share/gnome/gdesklets/locale/ru/LC_MESSAGES/gdesklets.mo
 share/gnome/gdesklets/locale/sq/LC_MESSAGES/gdesklets.mo
 share/gnome/gdesklets/locale/sr/LC_MESSAGES/gdesklets.mo
 share/gnome/gdesklets/locale/sr@Latn/LC_MESSAGES/gdesklets.mo
@@ -78,11 +89,13 @@ share/gnome/gdesklets/sensor/Menu.py
 share/gnome/gdesklets/sensor/Sensor.py
 share/gnome/gdesklets/sensor/SensorConfigurator.py
 share/gnome/gdesklets/sensor/__init__.py
+share/gnome/gdesklets/utils/BinTree.py
 share/gnome/gdesklets/utils/FileWatcher.py
 share/gnome/gdesklets/utils/GConfWatcher.py
 share/gnome/gdesklets/utils/Hash2D.py
 share/gnome/gdesklets/utils/Observable.py
 share/gnome/gdesklets/utils/TargetSettings.py
+share/gnome/gdesklets/utils/TilingImage.py
 share/gnome/gdesklets/utils/TypeConverter.py
 share/gnome/gdesklets/utils/__init__.py
 share/gnome/gdesklets/utils/_ewmhmodule.so
@@ -111,6 +124,10 @@ share/icons/gnome/48x48/mimetypes/x-gdesklets-display.png
 @dirrm share/gnome/gdesklets/locale/sr
 @dirrm share/gnome/gdesklets/locale/sq/LC_MESSAGES
 @dirrm share/gnome/gdesklets/locale/sq
+@dirrm share/gnome/gdesklets/locale/ru/LC_MESSAGES
+@dirrm share/gnome/gdesklets/locale/ru
+@dirrm share/gnome/gdesklets/locale/pt_BR/LC_MESSAGES
+@dirrm share/gnome/gdesklets/locale/pt_BR
 @dirrm share/gnome/gdesklets/locale/pt/LC_MESSAGES
 @dirrm share/gnome/gdesklets/locale/pt
 @dirrm share/gnome/gdesklets/locale/pl/LC_MESSAGES
@@ -119,20 +136,28 @@ share/icons/gnome/48x48/mimetypes/x-gdesklets-display.png
 @dirrm share/gnome/gdesklets/locale/nl
 @dirrm share/gnome/gdesklets/locale/ms/LC_MESSAGES
 @dirrm share/gnome/gdesklets/locale/ms
+@dirrm share/gnome/gdesklets/locale/lt/LC_MESSAGES
+@dirrm share/gnome/gdesklets/locale/lt
 @dirrm share/gnome/gdesklets/locale/ko/LC_MESSAGES
 @dirrm share/gnome/gdesklets/locale/ko
+@dirrm share/gnome/gdesklets/locale/ja/LC_MESSAGES
+@dirrm share/gnome/gdesklets/locale/ja
+@dirrm share/gnome/gdesklets/locale/it/LC_MESSAGES
+@dirrm share/gnome/gdesklets/locale/it
 @dirrm share/gnome/gdesklets/locale/he/LC_MESSAGES
 @dirrm share/gnome/gdesklets/locale/he
 @dirrm share/gnome/gdesklets/locale/fr/LC_MESSAGES
 @dirrm share/gnome/gdesklets/locale/fr
+@dirrm share/gnome/gdesklets/locale/eu/LC_MESSAGES
+@dirrm share/gnome/gdesklets/locale/eu
 @dirrm share/gnome/gdesklets/locale/es/LC_MESSAGES
 @dirrm share/gnome/gdesklets/locale/es
 @dirrm share/gnome/gdesklets/locale/el/LC_MESSAGES
 @dirrm share/gnome/gdesklets/locale/el
-@dirrm share/gnome/gdesklets/locale/de_BY/LC_MESSAGES
-@dirrm share/gnome/gdesklets/locale/de_BY
 @dirrm share/gnome/gdesklets/locale/de/LC_MESSAGES
 @dirrm share/gnome/gdesklets/locale/de
+@dirrm share/gnome/gdesklets/locale/ca/LC_MESSAGES
+@dirrm share/gnome/gdesklets/locale/ca
 @dirrm share/gnome/gdesklets/locale/az/LC_MESSAGES
 @dirrm share/gnome/gdesklets/locale/az
 @dirrm share/gnome/gdesklets/locale/ar/LC_MESSAGES