Date: Fri, 17 Oct 2003 23:58:52 -0500 (CDT) From: Jeremy Messenger <mezz7@cox.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/58182: Maintainer update: deskutils/gdesklets 0.22.1 -> 0.23 Message-ID: <200310180458.h9I4wqfU089099@ns1.mezzweb.com> Resent-Message-ID: <200310180530.h9I5U8wT058436@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 58182 >Category: ports >Synopsis: Maintainer update: deskutils/gdesklets 0.22.1 -> 0.23 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Oct 17 22:30:08 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Mezz >Release: FreeBSD 5.1-CURRENT i386 >Organization: >Environment: System: FreeBSD ns1.mezzweb.com 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Wed Aug 13 22:39:47 CDT 2003 mezz@mezz.mezzweb.com:/usr/obj/usr/src/sys/BSDROCKS i386 >Description: Update to 0.23. >How-To-Repeat: n/a >Fix: --- gdesklets.diff begins here --- diff -ur gdesklets.orig/Makefile gdesklets/Makefile --- gdesklets.orig/Makefile Mon Sep 29 10:09:18 2003 +++ gdesklets/Makefile Fri Oct 17 23:43:00 2003 @@ -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} @@ -25,6 +25,9 @@ USE_PYTHON= yes USE_X_PREFIX= yes USE_GNOME= gnomehack gnomeprefix gnometarget + +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" MAN1= gdesklets.1 diff -ur gdesklets.orig/distinfo gdesklets/distinfo --- gdesklets.orig/distinfo Mon Sep 29 10:09:18 2003 +++ gdesklets/distinfo Fri Oct 17 22:41:29 2003 @@ -1 +1 @@ -MD5 (gDesklets-0.22.1.tar.bz2) = 870af5f577489f898d0f9e271d4c58c2 +MD5 (gDesklets-0.23.tar.bz2) = 14beb76893e1f7f8f90b8a0b37a6856a diff -ur gdesklets.orig/files/patch-configure gdesklets/files/patch-configure --- gdesklets.orig/files/patch-configure Mon Sep 22 12:11:05 2003 +++ gdesklets/files/patch-configure Fri Oct 17 22:43:13 2003 @@ -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 -ur gdesklets.orig/files/patch-data::Makefile.in gdesklets/files/patch-data::Makefile.in --- gdesklets.orig/files/patch-data::Makefile.in Mon Sep 22 12:11:05 2003 +++ gdesklets/files/patch-data::Makefile.in Fri Oct 17 22:45:36 2003 @@ -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 -ur gdesklets.orig/files/patch-libdesklets::CPU.py gdesklets/files/patch-libdesklets::CPU.py --- gdesklets.orig/files/patch-libdesklets::CPU.py Fri Sep 26 06:02:10 2003 +++ gdesklets/files/patch-libdesklets::CPU.py Fri Oct 17 22:54:02 2003 @@ -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 -ur gdesklets.orig/files/patch-libdesklets::Memory.py gdesklets/files/patch-libdesklets::Memory.py --- gdesklets.orig/files/patch-libdesklets::Memory.py Fri Sep 26 06:02:10 2003 +++ gdesklets/files/patch-libdesklets::Memory.py Fri Oct 17 23:30:02 2003 @@ -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 -ur gdesklets.orig/files/patch-libdesklets::Network.py gdesklets/files/patch-libdesklets::Network.py --- gdesklets.orig/files/patch-libdesklets::Network.py Mon Sep 22 14:25:58 2003 +++ gdesklets/files/patch-libdesklets::Network.py Fri Oct 17 23:25:39 2003 @@ -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 -ur gdesklets.orig/files/patch-libdesklets::__init__.py gdesklets/files/patch-libdesklets::__init__.py --- gdesklets.orig/files/patch-libdesklets::__init__.py Mon Sep 22 13:16:54 2003 +++ gdesklets/files/patch-libdesklets::__init__.py Fri Oct 17 23:17:53 2003 @@ -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 -ur gdesklets.orig/pkg-plist gdesklets/pkg-plist --- gdesklets.orig/pkg-plist Sun Sep 28 22:32:37 2003 +++ gdesklets/pkg-plist Fri Oct 17 23:52:23 2003 @@ -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/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/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 @@ @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 @@ @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 --- 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?200310180458.h9I4wqfU089099>