9 files changed, 61 insertions, 36 deletions

diff --git a/deskutils/gdesklets/Makefile b/deskutils/gdesklets/Makefile
index 13aa6a37da81..0c1765f510b5 100644
--- a/deskutils/gdesklets/Makefile
+++ b/deskutils/gdesklets/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gdesklets
-PORTVERSION=	0.22.1
+PORTVERSION=	0.23
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://www.pycage.de/download/${PORTNAME}/
 DISTNAME=	gDesklets-${PORTVERSION}
@@ -26,6 +26,9 @@ USE_PYTHON=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix gnometarget
 
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
+
 MAN1=	gdesklets.1
 
 post-install:
diff --git a/deskutils/gdesklets/distinfo b/deskutils/gdesklets/distinfo
index cc37b497e120..cc9cc8b650bf 100644
--- a/deskutils/gdesklets/distinfo
+++ b/deskutils/gdesklets/distinfo
@@ -1 +1 @@
-MD5 (gDesklets-0.22.1.tar.bz2) = 870af5f577489f898d0f9e271d4c58c2
+MD5 (gDesklets-0.23.tar.bz2) = 14beb76893e1f7f8f90b8a0b37a6856a
diff --git a/deskutils/gdesklets/files/patch-configure b/deskutils/gdesklets/files/patch-configure
index 6fb8f7156838..1ac0f6cd2b08 100644
--- a/deskutils/gdesklets/files/patch-configure
+++ b/deskutils/gdesklets/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Tue Sep  2 01:50:56 2003
-+++ configure	Tue Sep  2 01:51:56 2003
-@@ -7795,6 +7795,7 @@
+--- configure.orig	Fri Oct 17 22:42:52 2003
++++ configure	Fri Oct 17 22:42:57 2003
+@@ -7798,6 +7798,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 507a429ade18..a3cd106a6a74 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	Wed Sep 17 18:19:06 2003
-+++ data/Makefile.in	Wed Sep 17 18:20:02 2003
-@@ -190,7 +190,7 @@
+--- 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 @@
  @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-libdesklets::CPU.py b/deskutils/gdesklets/files/patch-libdesklets::CPU.py
index 940cececebb4..46f995be5a86 100644
--- a/deskutils/gdesklets/files/patch-libdesklets::CPU.py
+++ b/deskutils/gdesklets/files/patch-libdesklets::CPU.py
@@ -1,8 +1,8 @@
 # Many thanks to Alexander Leidinger <netchild@FreeBSD.org> for
 # help and create those patches.
 
---- libdesklets/CPU.py.orig	Mon Sep 22 12:16:08 2003
-+++ libdesklets/CPU.py	Mon Sep 22 12:22:32 2003
+--- libdesklets/CPU.py.orig	Fri Oct 17 22:47:02 2003
++++ libdesklets/CPU.py	Fri Oct 17 22:53:05 2003
 @@ -1,5 +1,7 @@
  import polling
  
@@ -29,7 +29,7 @@
          except IOError, e:
              import traceback; traceback.print_exc()
              print e
-@@ -40,15 +51,24 @@
+@@ -40,15 +50,24 @@
  
      def __poll_cpu(self):
  
@@ -61,7 +61,7 @@
  
          elif (arch == "ppc"):
              fields = self.__lines[0].split()
-@@ -68,17 +88,34 @@
+@@ -68,17 +87,34 @@
  
      def __poll_load(self):
  
diff --git a/deskutils/gdesklets/files/patch-libdesklets::Memory.py b/deskutils/gdesklets/files/patch-libdesklets::Memory.py
index cbe2d7e3be07..3d6ebf75c44b 100644
--- a/deskutils/gdesklets/files/patch-libdesklets::Memory.py
+++ b/deskutils/gdesklets/files/patch-libdesklets::Memory.py
@@ -1,8 +1,8 @@
 # Many thanks to Alexander Leidinger <netchild@FreeBSD.org> for
 # help and create those patches.
 
---- libdesklets/Memory.py.orig	Sun Sep 21 14:08:18 2003
-+++ libdesklets/Memory.py	Thu Sep 25 12:08:35 2003
+--- libdesklets/Memory.py.orig	Fri Oct 17 22:57:33 2003
++++ libdesklets/Memory.py	Fri Oct 17 23:01:14 2003
 @@ -1,7 +1,7 @@
  import polling
  
@@ -12,10 +12,10 @@
  
  class Memory:
  
-@@ -17,39 +17,83 @@
+@@ -16,41 +16,85 @@
  
      def __poll_total_ram(self):
-         
+ 
 -        memtotal = os.stat("/proc/kcore")[stat.ST_SIZE]
 +        platform = lib.sys.get_os()
 +        
@@ -31,7 +31,9 @@
 +            memtotal = 0
 +
          return memtotal
-         
+ 
+ 
+ 
      def __poll_mem(self, mode):
  
 -        fd = open("/proc/meminfo", "r")
@@ -39,7 +41,7 @@
 -        fd.close()
 -        lines = mem.splitlines()
 +        platform = lib.sys.get_os()
-         
+ 
          # RAM
          if (mode == 0):
 -            total = int(self.__get_total_ram()/1024)
diff --git a/deskutils/gdesklets/files/patch-libdesklets::Network.py b/deskutils/gdesklets/files/patch-libdesklets::Network.py
index 17ee7c971f07..3629576fdfbb 100644
--- a/deskutils/gdesklets/files/patch-libdesklets::Network.py
+++ b/deskutils/gdesklets/files/patch-libdesklets::Network.py
@@ -1,8 +1,8 @@
 # Many thanks to Alexander Leidinger <netchild@FreeBSD.org> for
 # help and create those patches.
 
---- libdesklets/Network.py.orig	Mon Sep 22 12:51:42 2003
-+++ libdesklets/Network.py	Mon Sep 22 13:04:06 2003
+--- libdesklets/Network.py.orig	Fri Oct 17 23:02:41 2003
++++ libdesklets/Network.py	Fri Oct 17 23:24:47 2003
 @@ -1,7 +1,9 @@
  import polling
  
@@ -13,10 +13,10 @@
  
  class Network:
  
-@@ -25,22 +27,42 @@
+@@ -26,21 +28,42 @@
  
      def __poll_devices(self):
-         
+ 
 -        fd = open("/proc/net/dev", "r")
 +        platform = lib.sys.get_os()
 +
@@ -28,7 +28,7 @@
 +            return []
          data = fd.readlines()
          fd.close()
-         
+ 
          devices = []
 -        for lines in data[2:]:
 -            l = lines.strip()
@@ -37,10 +37,9 @@
  
 -            if (fields[0] == "lo"):
 -                continue
--            else: # (fields[0].startswith("eth")):
+-            else:
 -                device = fields[0]
 -                devices.append(device)
--        #end for
 +        if ("FreeBSD" == platform):
 +            for lines in data:
 +                fields = lines.strip().strip(":")
@@ -67,7 +66,7 @@
  
          return devices
  
-@@ -48,13 +70,15 @@
+@@ -48,14 +71,15 @@
  
      def __poll_ipaddr(self, dev):
  
@@ -81,13 +80,13 @@
              l = l.strip()
              fields = l.split()
  
--            if (fields[0] == "inet"): return fields[1].split(":")[1]
-+            if (fields[0] == "inet"):
+             if (fields[0] == "inet"):
+-                return fields[1].split(":")[1]
 +                return fields[1]
-         #end for
  
-         #fd = open("/proc/net/rt_cache", "r")
-@@ -78,6 +102,8 @@
+         return ("xxx.xxx.xxx.xxx")
+ 
+@@ -63,6 +87,8 @@
  
      def __poll_in_out(self, dev):
  
@@ -96,7 +95,7 @@
          t = time.time()
          interval = t - self.__time
          self.__time = t
-@@ -88,24 +114,40 @@
+@@ -73,24 +99,40 @@
          speed_in = 0
          speed_out = 0
  
diff --git a/deskutils/gdesklets/files/patch-libdesklets::__init__.py b/deskutils/gdesklets/files/patch-libdesklets::__init__.py
index 7ce5ad8123c5..71559b0c184f 100644
--- a/deskutils/gdesklets/files/patch-libdesklets::__init__.py
+++ b/deskutils/gdesklets/files/patch-libdesklets::__init__.py
@@ -1,12 +1,13 @@
 # Many thanks to Alexander Leidinger <netchild@FreeBSD.org> for
 # help and create those patches.
 
---- libdesklets/__init__.py.orig	Mon Sep 22 13:15:25 2003
-+++ libdesklets/__init__.py	Mon Sep 22 13:15:30 2003
-@@ -52,10 +52,10 @@
+--- libdesklets/__init__.py.orig	Fri Oct 17 23:16:45 2003
++++ libdesklets/__init__.py	Fri Oct 17 23:17:09 2003
+@@ -51,11 +51,10 @@
+ from Network import Network
  from Sys import Sys
  
- 
+-
 +sys = Sys()
  convert = Convert()
  cpu = CPU()
diff --git a/deskutils/gdesklets/pkg-plist b/deskutils/gdesklets/pkg-plist
index fb6d0021a7a5..452e0d5a338a 100644
--- a/deskutils/gdesklets/pkg-plist
+++ b/deskutils/gdesklets/pkg-plist
@@ -1,12 +1,20 @@
 bin/gdesklets
+bin/gdesklets-display-thumbnailer
+etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gdesklets-display/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gdesklets-display/%gconf.xml
+etc/gconf/schemas/gdesklets-display-thumbnail.schemas
 libdata/pkgconfig/gdesklets-core.pc
 share/gnome/application-registry/gdesklets.applications
 share/gnome/applications/gdesklets.desktop
 share/gnome/gdesklets/Sensors/External/__init__.py
 share/gnome/gdesklets/Sensors/FontSelector/__init__.py
 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/settings.py
 share/gnome/gdesklets/data/gdesklets.png
 share/gnome/gdesklets/desktop/BGWatcher.py
 share/gnome/gdesklets/desktop/GlassWindow.py
@@ -45,9 +53,11 @@ share/gnome/gdesklets/libdesklets/__init__.py
 share/gnome/gdesklets/libdesklets/polling.py
 share/gnome/gdesklets/locale/ar/LC_MESSAGES/gdesklets.mo
 share/gnome/gdesklets/locale/de/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/fr/LC_MESSAGES/gdesklets.mo
 share/gnome/gdesklets/locale/he/LC_MESSAGES/gdesklets.mo
+share/gnome/gdesklets/locale/ko/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
@@ -73,11 +83,13 @@ share/gnome/gdesklets/utils/TargetSettings.py
 share/gnome/gdesklets/utils/TypeConverter.py
 share/gnome/gdesklets/utils/__init__.py
 share/gnome/gdesklets/utils/_ewmhmodule.so
+share/gnome/gdesklets/utils/actionparser.py
 share/gnome/gdesklets/utils/datatypes.py
 share/gnome/gdesklets/utils/dialog.py
 share/gnome/gdesklets/utils/i18n.py
 share/gnome/gdesklets/utils/pwstore.py
 share/gnome/gdesklets/utils/singleton.py
+share/gnome/gdesklets/utils/vfs.py
 share/gnome/mime-info/gdesklets.keys
 share/gnome/mime-info/gdesklets.mime
 share/gnome/pixmaps/gdesklets.png
@@ -101,12 +113,16 @@ share/icons/gnome/48x48/mimetypes/x-gdesklets-display.png
 @dirrm share/gnome/gdesklets/locale/pl
 @dirrm share/gnome/gdesklets/locale/nl/LC_MESSAGES
 @dirrm share/gnome/gdesklets/locale/nl
+@dirrm share/gnome/gdesklets/locale/ko/LC_MESSAGES
+@dirrm share/gnome/gdesklets/locale/ko
 @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/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/LC_MESSAGES
 @dirrm share/gnome/gdesklets/locale/de
 @dirrm share/gnome/gdesklets/locale/ar/LC_MESSAGES
@@ -123,3 +139,7 @@ share/icons/gnome/48x48/mimetypes/x-gdesklets-display.png
 @dirrm share/gnome/gdesklets/Sensors
 @dirrm share/gnome/gdesklets/Displays
 @dirrm share/gnome/gdesklets
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gdesklets-display
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gdesklets-display
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers