Date: Mon, 23 Feb 2004 11:15:36 +0100 From: "Franz Klammer" <klammer@webonaut.com> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/63258: [maintainer-update]: deskutils/gdesklets-0.26 Message-ID: <1077531336.0@ds9.webonaut.com> Resent-Message-ID: <200402231020.i1NAKOgx038227@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 63258
>Category: ports
>Synopsis: [maintainer-update]: deskutils/gdesklets-0.26
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Feb 23 02:20:23 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Franz Klammer
>Release: FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD 5.2-CURRENT #10: Fri Feb 20 22:12:45 CET 2004
root@ds9.webonaut.com:/usr/obj/usr/src/sys/DS9
>Description:
update gdesklets to version 0.26
>How-To-Repeat:
>Fix:
--- gdesklets.diff begins here ---
diff -Nur gdesklets.orig/Makefile gdesklets/Makefile
--- gdesklets.orig/Makefile Wed Feb 4 09:55:14 2004
+++ gdesklets/Makefile Mon Feb 23 11:12:53 2004
@@ -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 @@
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 -Nur gdesklets.orig/distinfo gdesklets/distinfo
--- gdesklets.orig/distinfo Tue Dec 30 23:34:22 2003
+++ gdesklets/distinfo Mon Feb 23 09:51:47 2004
@@ -1 +1 @@
-MD5 (gDesklets-0.25.1.tar.bz2) = 91a25ffc1a158fa3e0a83c28969f685c
+MD5 (gDesklets-0.26.tar.bz2) = a13af8ab694fd7e1ef2ef21634aa3e39
diff -Nur gdesklets.orig/files/patch-configure gdesklets/files/patch-configure
--- gdesklets.orig/files/patch-configure Tue Dec 30 23:34:22 2003
+++ gdesklets/files/patch-configure Mon Feb 23 10:04:24 2004
@@ -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 -Nur gdesklets.orig/files/patch-data::Makefile.in gdesklets/files/patch-data::Makefile.in
--- gdesklets.orig/files/patch-data::Makefile.in Tue Dec 30 23:34:22 2003
+++ gdesklets/files/patch-data::Makefile.in Mon Feb 23 10:00:19 2004
@@ -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 -Nur gdesklets.orig/files/patch-display::TargetLabel.py gdesklets/files/patch-display::TargetLabel.py
--- gdesklets.orig/files/patch-display::TargetLabel.py Tue Dec 30 23:34:22 2003
+++ gdesklets/files/patch-display::TargetLabel.py Mon Feb 23 09:57:31 2004
@@ -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 -Nur gdesklets.orig/files/patch-libdesklets::Disk.py gdesklets/files/patch-libdesklets::Disk.py
--- gdesklets.orig/files/patch-libdesklets::Disk.py Tue Dec 30 23:34:22 2003
+++ gdesklets/files/patch-libdesklets::Disk.py Mon Feb 23 10:55:08 2004
@@ -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 -Nur gdesklets.orig/files/patch-libdesklets::Network.py gdesklets/files/patch-libdesklets::Network.py
--- gdesklets.orig/files/patch-libdesklets::Network.py Thu Jan 1 01:00:00 1970
+++ gdesklets/files/patch-libdesklets::Network.py Mon Feb 23 11:02:39 2004
@@ -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 -Nur gdesklets.orig/files/patch-utils::i18n.py gdesklets/files/patch-utils::i18n.py
--- gdesklets.orig/files/patch-utils::i18n.py Mon Jan 5 11:38:36 2004
+++ gdesklets/files/patch-utils::i18n.py Thu Jan 1 01:00:00 1970
@@ -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 -Nur gdesklets.orig/pkg-plist gdesklets/pkg-plist
--- gdesklets.orig/pkg-plist Tue Dec 30 23:34:22 2003
+++ gdesklets/pkg-plist Mon Feb 23 10:43:49 2004
@@ -1,76 +1,125 @@
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/schemas/gdesklets-display-thumbnail.schemas
+etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gdesklets-display/%gconf.xml
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/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 +130,61 @@
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 +210,8 @@
@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 +224,8 @@
@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 +238,8 @@
@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
--- gdesklets.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1077531336.0>