- Update to 0.26

PR:		ports/63258
Submitted by:	Franz Klammer <klammer@webonaut.com> (maintainer)

9 files changed, 124 insertions, 47 deletions

diff --git a/deskutils/gdesklets/Makefile b/deskutils/gdesklets/Makefile
index e99a587..9f7e779 100644
--- a/deskutils/gdesklets/Makefile
+++ b/deskutils/gdesklets/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gdesklets
-PORTVERSION=	0.25.1
-PORTREVISION=	2
+PORTVERSION=	0.26
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://www.pycage.de/download/${PORTNAME}/
 DISTNAME=	gDesklets-${PORTVERSION}
@@ -35,6 +34,15 @@ MAN1=	gdesklets.1
 
 post-install:
 	@${MKDIR} ${PREFIX}/share/gnome/gdesklets/Displays
+	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/share/gnome/gdesklets/config
+	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/share/gnome/gdesklets/data
+	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/share/gnome/gdesklets/desktop
+	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/share/gnome/gdesklets/display
+	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/share/gnome/gdesklets/factory
+	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/share/gnome/gdesklets/libdesklets
+	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/share/gnome/gdesklets/main
+	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/share/gnome/gdesklets/sensor
+	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/share/gnome/gdesklets/utils
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/deskutils/gdesklets/distinfo b/deskutils/gdesklets/distinfo
index d20cc7d..a7c23c6 100644
--- a/deskutils/gdesklets/distinfo
+++ b/deskutils/gdesklets/distinfo
@@ -1 +1 @@
-MD5 (gDesklets-0.25.1.tar.bz2) = 91a25ffc1a158fa3e0a83c28969f685c
+MD5 (gDesklets-0.26.tar.bz2) = a13af8ab694fd7e1ef2ef21634aa3e39
diff --git a/deskutils/gdesklets/files/patch-configure b/deskutils/gdesklets/files/patch-configure
index 479c5d3..4f69b11 100644
--- a/deskutils/gdesklets/files/patch-configure
+++ b/deskutils/gdesklets/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	Tue Dec 30 13:22:59 2003
-+++ configure	Tue Dec 30 13:23:27 2003
+--- configure.orig	Mon Feb 23 10:03:28 2004
++++ configure	Mon Feb 23 10:03:58 2004
 @@ -18395,6 +18395,7 @@
  
  # This can be used to rebuild libtool when needed
diff --git a/deskutils/gdesklets/files/patch-data::Makefile.in b/deskutils/gdesklets/files/patch-data::Makefile.in
index 4b5c198..4631224 100644
--- a/deskutils/gdesklets/files/patch-data::Makefile.in
+++ b/deskutils/gdesklets/files/patch-data::Makefile.in
@@ -1,11 +1,12 @@
---- 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 @@
+--- data/Makefile.in.orig	Mon Feb 23 09:58:01 2004
++++ data/Makefile.in	Mon Feb 23 09:59:27 2004
+@@ -213,7 +213,8 @@
  @USERINST_TRUE@mimedir = ~/.gnome/mime-info
  mime_in_files = gdesklets.keys.in
  mime_DATA = $(mime_in_files:.keys.in=.keys) gdesklets.mime
 -@USERINST_FALSE@mimeicondir = $(datadir)/icons/gnome/48x48/mimetypes
 +@USERINST_FALSE@mimeicondir = $(prefix)/share/icons/gnome/48x48/mimetypes
++
  
  @USERINST_TRUE@mimeicondir = ~/.icons/gnome/48x48/mimetypes
  mimeicon_DATA = x-gdesklets-display.png
diff --git a/deskutils/gdesklets/files/patch-display::TargetLabel.py b/deskutils/gdesklets/files/patch-display::TargetLabel.py
index 005b5aa..9c35500 100644
--- a/deskutils/gdesklets/files/patch-display::TargetLabel.py
+++ b/deskutils/gdesklets/files/patch-display::TargetLabel.py
@@ -1,13 +1,13 @@
---- 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 @@
+--- display/TargetLabel.py.orig	Mon Feb 23 09:55:46 2004
++++ display/TargetLabel.py	Mon Feb 23 09:56:50 2004
+@@ -103,7 +103,14 @@
  
  # determine the locale
  import commands
 +import string
  fail, CHARMAP = commands.getstatusoutput("locale charmap")
 +if (fail or not CHARMAP):
-+    fail, CHARMAP = commands.getstatusoutput("echo $MM_CHARSET") 
++    fail, CHARMAP = commands.getstatusoutput("echo $MM_CHARSET")
 +    if (fail or not CHARMAP):
 +        fail, CHARMAP = commands.getstatusoutput("echo $LANG")
 +        CHARMAP = CHARMAP[string.find(CHARMAP, ".")+1:len(CHARMAP)]
diff --git a/deskutils/gdesklets/files/patch-libdesklets::Disk.py b/deskutils/gdesklets/files/patch-libdesklets::Disk.py
index ee68f14..0b4a640 100644
--- a/deskutils/gdesklets/files/patch-libdesklets::Disk.py
+++ b/deskutils/gdesklets/files/patch-libdesklets::Disk.py
@@ -1,16 +1,5 @@
-# Many thanks to Alexander Leidinger <netchild@FreeBSD.org> and
-# Franz Klammer <klammer@webonaut.com> for help and create
-# those patches.
-#
-# 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	Tue Dec 30 13:29:57 2003
-+++ libdesklets/Disk.py	Tue Dec 30 13:31:01 2003
+--- libdesklets/Disk.py.orig	Mon Feb 23 10:52:50 2004
++++ libdesklets/Disk.py	Mon Feb 23 10:54:31 2004
 @@ -1,6 +1,6 @@
  import glibtop
  import polling
@@ -19,8 +8,8 @@
  
  class Disk:
  
-@@ -14,18 +14,22 @@
- 
+@@ -21,14 +21,19 @@
+     #
      def __poll_partitions(self):
  
 -        data = glibtop.get_mountlist(0)
@@ -42,11 +31,7 @@
 +                          "hfs", "befs", "bfs", "efs", "iso9660", "minix",
 +                          "sysv", "coda", "nfs", "udf", "ufs", "xiafs")):
 +               partitions.append((fields[0], fields[1]))
-         #end for
- 
-         return partitions
--            
 +
  
- 
-     def __poll_size(self, partition):
+         return partitions
+             
diff --git a/deskutils/gdesklets/files/patch-libdesklets::Network.py b/deskutils/gdesklets/files/patch-libdesklets::Network.py
new file mode 100644
index 0000000..1fd0d05
--- /dev/null
+++ b/deskutils/gdesklets/files/patch-libdesklets::Network.py
@@ -0,0 +1,11 @@
+--- libdesklets/Network.py.orig	Mon Feb 23 11:01:31 2004
++++ libdesklets/Network.py	Mon Feb 23 11:01:55 2004
+@@ -142,7 +142,7 @@
+         
+         if ("FreeBSD" == platform or "NetBSD" == platform):
+             fd = os.popen("ifconfig -a | grep mtu", "r")
+-            data = fs.readlines()
++            data = fd.readlines()
+             fd.close()
+ 
+             for lines in data:
diff --git a/deskutils/gdesklets/files/patch-utils::i18n.py b/deskutils/gdesklets/files/patch-utils::i18n.py
deleted file mode 100644
index f62cd5a..0000000
--- a/deskutils/gdesklets/files/patch-utils::i18n.py
+++ /dev/null
@@ -1,13 +0,0 @@
---- utils/i18n.py.orig	Sun Jan  4 13:56:21 2004
-+++ utils/i18n.py	Sun Jan  4 14:26:10 2004
-@@ -12,6 +12,9 @@
-         translate = gettext.translation(domain, localedir).gettext
- 
-     except:
--        translate = dummy
-+	try:
-+	   translate = gettext.translation("gdesklets", localedir).gettext
-+	except:
-+           translate = dummy
- 
-     return translate
diff --git a/deskutils/gdesklets/pkg-plist b/deskutils/gdesklets/pkg-plist
index 0314ea4..c4d5282 100644
--- a/deskutils/gdesklets/pkg-plist
+++ b/deskutils/gdesklets/pkg-plist
@@ -1,7 +1,7 @@
 bin/gdesklets
 bin/gdesklets-display-thumbnailer
-etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gdesklets-display/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gdesklets-display/%gconf.xml
+etc/gconf/gconf.xml.defaults/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
@@ -9,68 +9,118 @@ 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/ConfigManager.pyc
 share/gnome/gdesklets/config/DummyBackend.py
+share/gnome/gdesklets/config/DummyBackend.pyc
 share/gnome/gdesklets/config/GConfBackend.py
+share/gnome/gdesklets/config/GConfBackend.pyc
 share/gnome/gdesklets/config/__init__.py
+share/gnome/gdesklets/config/__init__.pyc
 share/gnome/gdesklets/config/migration.py
+share/gnome/gdesklets/config/migration.pyc
 share/gnome/gdesklets/config/settings.py
+share/gnome/gdesklets/config/settings.pyc
 share/gnome/gdesklets/data/gdesklets.png
 share/gnome/gdesklets/desktop/BGWatcher.py
+share/gnome/gdesklets/desktop/BGWatcher.pyc
 share/gnome/gdesklets/desktop/GlassWindow.py
+share/gnome/gdesklets/desktop/GlassWindow.pyc
 share/gnome/gdesklets/desktop/__init__.py
+share/gnome/gdesklets/desktop/__init__.pyc
 share/gnome/gdesklets/display/ContainerTarget.py
+share/gnome/gdesklets/display/ContainerTarget.pyc
 share/gnome/gdesklets/display/DataTarget.py
+share/gnome/gdesklets/display/DataTarget.pyc
 share/gnome/gdesklets/display/Display.py
+share/gnome/gdesklets/display/Display.pyc
 share/gnome/gdesklets/display/DisplayConfigurator.py
+share/gnome/gdesklets/display/DisplayConfigurator.pyc
 share/gnome/gdesklets/display/DisplayContainer.py
+share/gnome/gdesklets/display/DisplayContainer.pyc
 share/gnome/gdesklets/display/DisplayTarget.py
+share/gnome/gdesklets/display/DisplayTarget.pyc
+share/gnome/gdesklets/display/Plug.py
+share/gnome/gdesklets/display/Plug.pyc
 share/gnome/gdesklets/display/TargetAlignment.py
+share/gnome/gdesklets/display/TargetAlignment.pyc
 share/gnome/gdesklets/display/TargetArray.py
+share/gnome/gdesklets/display/TargetArray.pyc
 share/gnome/gdesklets/display/TargetBonoboControl.py
+share/gnome/gdesklets/display/TargetBonoboControl.pyc
 share/gnome/gdesklets/display/TargetCanvas.py
+share/gnome/gdesklets/display/TargetCanvas.pyc
 share/gnome/gdesklets/display/TargetExpander.py
+share/gnome/gdesklets/display/TargetExpander.pyc
 share/gnome/gdesklets/display/TargetFrame.py
+share/gnome/gdesklets/display/TargetFrame.pyc
 share/gnome/gdesklets/display/TargetGauge.py
+share/gnome/gdesklets/display/TargetGauge.pyc
 share/gnome/gdesklets/display/TargetGroup.py
+share/gnome/gdesklets/display/TargetGroup.pyc
 share/gnome/gdesklets/display/TargetHTML.py
+share/gnome/gdesklets/display/TargetHTML.pyc
 share/gnome/gdesklets/display/TargetImage.py
+share/gnome/gdesklets/display/TargetImage.pyc
 share/gnome/gdesklets/display/TargetLabel.py
+share/gnome/gdesklets/display/TargetLabel.pyc
 share/gnome/gdesklets/display/TargetPlotter.py
+share/gnome/gdesklets/display/TargetPlotter.pyc
 share/gnome/gdesklets/display/TargetPopup.py
+share/gnome/gdesklets/display/TargetPopup.pyc
 share/gnome/gdesklets/display/Window.py
+share/gnome/gdesklets/display/Window.pyc
 share/gnome/gdesklets/display/WindowSnapper.py
+share/gnome/gdesklets/display/WindowSnapper.pyc
 share/gnome/gdesklets/display/__init__.py
+share/gnome/gdesklets/display/__init__.pyc
 share/gnome/gdesklets/display/layouters.py
+share/gnome/gdesklets/display/layouters.pyc
 share/gnome/gdesklets/display/targetregistry.py
+share/gnome/gdesklets/display/targetregistry.pyc
 share/gnome/gdesklets/factory/DisplayFactory.py
+share/gnome/gdesklets/factory/DisplayFactory.pyc
 share/gnome/gdesklets/factory/SensorFactory.py
+share/gnome/gdesklets/factory/SensorFactory.pyc
 share/gnome/gdesklets/factory/__init__.py
+share/gnome/gdesklets/factory/__init__.pyc
 share/gnome/gdesklets/gdesklets
 share/gnome/gdesklets/libdesklets/CPU.py
+share/gnome/gdesklets/libdesklets/CPU.pyc
 share/gnome/gdesklets/libdesklets/Convert.py
+share/gnome/gdesklets/libdesklets/Convert.pyc
 share/gnome/gdesklets/libdesklets/Disk.py
+share/gnome/gdesklets/libdesklets/Disk.pyc
 share/gnome/gdesklets/libdesklets/Memory.py
+share/gnome/gdesklets/libdesklets/Memory.pyc
 share/gnome/gdesklets/libdesklets/Network.py
+share/gnome/gdesklets/libdesklets/Network.pyc
 share/gnome/gdesklets/libdesklets/Sys.py
+share/gnome/gdesklets/libdesklets/Sys.pyc
 share/gnome/gdesklets/libdesklets/__init__.py
+share/gnome/gdesklets/libdesklets/__init__.pyc
 share/gnome/gdesklets/libdesklets/_glibtopmodule.so
 share/gnome/gdesklets/libdesklets/glibtop.py
+share/gnome/gdesklets/libdesklets/glibtop.pyc
 share/gnome/gdesklets/libdesklets/polling.py
+share/gnome/gdesklets/libdesklets/polling.pyc
 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/cs/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/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/hr/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/no/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
@@ -81,32 +131,61 @@ share/gnome/gdesklets/locale/sr@Latn/LC_MESSAGES/gdesklets.mo
 share/gnome/gdesklets/locale/sv/LC_MESSAGES/gdesklets.mo
 share/gnome/gdesklets/locale/tr/LC_MESSAGES/gdesklets.mo
 share/gnome/gdesklets/main/CmdLineParser.py
+share/gnome/gdesklets/main/CmdLineParser.pyc
 share/gnome/gdesklets/main/Starter.py
+share/gnome/gdesklets/main/Starter.pyc
 share/gnome/gdesklets/main/__init__.py
+share/gnome/gdesklets/main/__init__.pyc
 share/gnome/gdesklets/main/admin.py
+share/gnome/gdesklets/main/admin.pyc
 share/gnome/gdesklets/sensor/DefaultSensor.py
+share/gnome/gdesklets/sensor/DefaultSensor.pyc
 share/gnome/gdesklets/sensor/Menu.py
+share/gnome/gdesklets/sensor/Menu.pyc
 share/gnome/gdesklets/sensor/Sensor.py
+share/gnome/gdesklets/sensor/Sensor.pyc
 share/gnome/gdesklets/sensor/SensorConfigurator.py
+share/gnome/gdesklets/sensor/SensorConfigurator.pyc
 share/gnome/gdesklets/sensor/__init__.py
+share/gnome/gdesklets/sensor/__init__.pyc
 share/gnome/gdesklets/utils/BinTree.py
+share/gnome/gdesklets/utils/BinTree.pyc
 share/gnome/gdesklets/utils/FileWatcher.py
+share/gnome/gdesklets/utils/FileWatcher.pyc
 share/gnome/gdesklets/utils/GConfWatcher.py
+share/gnome/gdesklets/utils/GConfWatcher.pyc
 share/gnome/gdesklets/utils/Hash2D.py
+share/gnome/gdesklets/utils/Hash2D.pyc
 share/gnome/gdesklets/utils/Observable.py
+share/gnome/gdesklets/utils/Observable.pyc
 share/gnome/gdesklets/utils/TargetSettings.py
+share/gnome/gdesklets/utils/TargetSettings.pyc
 share/gnome/gdesklets/utils/TilingImage.py
+share/gnome/gdesklets/utils/TilingImage.pyc
 share/gnome/gdesklets/utils/TypeConverter.py
+share/gnome/gdesklets/utils/TypeConverter.pyc
 share/gnome/gdesklets/utils/__init__.py
+share/gnome/gdesklets/utils/__init__.pyc
 share/gnome/gdesklets/utils/_ewmhmodule.so
+share/gnome/gdesklets/utils/_systraymodule.so
 share/gnome/gdesklets/utils/actionparser.py
+share/gnome/gdesklets/utils/actionparser.pyc
 share/gnome/gdesklets/utils/datatypes.py
+share/gnome/gdesklets/utils/datatypes.pyc
 share/gnome/gdesklets/utils/dialog.py
+share/gnome/gdesklets/utils/dialog.pyc
 share/gnome/gdesklets/utils/i18n.py
+share/gnome/gdesklets/utils/i18n.pyc
 share/gnome/gdesklets/utils/installer.py
+share/gnome/gdesklets/utils/installer.pyc
 share/gnome/gdesklets/utils/pwstore.py
+share/gnome/gdesklets/utils/pwstore.pyc
 share/gnome/gdesklets/utils/singleton.py
+share/gnome/gdesklets/utils/singleton.pyc
+share/gnome/gdesklets/utils/systray.py
+share/gnome/gdesklets/utils/systray.pyc
 share/gnome/gdesklets/utils/vfs.py
+share/gnome/gdesklets/utils/vfs.pyc
 share/gnome/mime-info/gdesklets.keys
 share/gnome/mime-info/gdesklets.mime
 share/gnome/pixmaps/gdesklets.png
@@ -132,6 +211,8 @@ share/icons/gnome/48x48/mimetypes/x-gdesklets-display.png
 @dirrm share/gnome/gdesklets/locale/pt
 @dirrm share/gnome/gdesklets/locale/pl/LC_MESSAGES
 @dirrm share/gnome/gdesklets/locale/pl
+@dirrm share/gnome/gdesklets/locale/no/LC_MESSAGES
+@dirrm share/gnome/gdesklets/locale/no
 @dirrm share/gnome/gdesklets/locale/nl/LC_MESSAGES
 @dirrm share/gnome/gdesklets/locale/nl
 @dirrm share/gnome/gdesklets/locale/ms/LC_MESSAGES
@@ -144,6 +225,8 @@ share/icons/gnome/48x48/mimetypes/x-gdesklets-display.png
 @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/hr/LC_MESSAGES
+@dirrm share/gnome/gdesklets/locale/hr
 @dirrm share/gnome/gdesklets/locale/he/LC_MESSAGES
 @dirrm share/gnome/gdesklets/locale/he
 @dirrm share/gnome/gdesklets/locale/fr/LC_MESSAGES
@@ -156,6 +239,8 @@ share/icons/gnome/48x48/mimetypes/x-gdesklets-display.png
 @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/cs/LC_MESSAGES
+@dirrm share/gnome/gdesklets/locale/cs
 @dirrm share/gnome/gdesklets/locale/ca/LC_MESSAGES
 @dirrm share/gnome/gdesklets/locale/ca
 @dirrm share/gnome/gdesklets/locale/az/LC_MESSAGES