ports/61014: [MAINTAINER UPDATE] sysutils/gdesklets-sysinfo-0.25
Franz Klammer
klammer at webonaut.com
Wed Jan 7 13:00:48 UTC 2004
>Number: 61014
>Category: ports
>Synopsis: [MAINTAINER UPDATE] sysutils/gdesklets-sysinfo-0.25
>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: Wed Jan 07 05:00:34 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Franz Klammer
>Release: FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD ds9.webonaut.com 5.2-CURRENT FreeBSD 5.2-CURRENT #4: Tue Jan 6 00:09:47 CET 2004 root at ds9.webonaut.com:/usr/obj/usr/src/sys/DS9 i386
>Description:
update to 0.25
add some enhancement/fixes from CVS
>How-To-Repeat:
>Fix:
--- gdesklets-sysinfo-025.diff begins here ---
diff -Nur gdesklets-sysinfo.orig/Makefile gdesklets-sysinfo/Makefile
--- gdesklets-sysinfo.orig/Makefile Sun Jan 4 15:59:33 2004
+++ gdesklets-sysinfo/Makefile Wed Jan 7 13:04:26 2004
@@ -6,8 +6,7 @@
#
PORTNAME= sysinfo
-PORTVERSION= 0.23
-PORTREVISION= 1
+PORTVERSION= 0.25
CATEGORIES= sysutils gnome
MASTER_SITES= http://gdesklets.gnomedesktop.org/files/
PKGNAMEPREFIX= gdesklets-
@@ -20,26 +19,25 @@
USE_BZIP2= yes
USE_X_PREFIX= yes
+USE_PYTHON= yes
NAME= SysInfo
DATADIR= ${PREFIX}/share/gnome
LANG= de es fr pt sq sr sr at Latn sv
PKGMESSAGE= ${WRKDIR}/pkg-message
+WRKSRC= ${WRKDIR}/${NAME}
do-build:
- @${WRKSRC}/Install_${NAME}_Sensor.bin --nomsg ${WRKSRC}
- @${PATCH} -d ${WRKDIR} -sp0 < ${PATCHDIR}/postbuild-patch-__init__.py
+ @${WRKDIR}/Install_${NAME}_Sensor.bin --nomsg ${WRKSRC}
+ @${PATCH} -d ${WRKSRC} -sp0 < ${PATCHDIR}/postbuild-patch-__init__.py
@${FIND} ${WRKSRC} -name '*.orig' -delete
@${CAT} pkg-message | ${SED} -e 's|%%PREFIX%%|${PREFIX}|' > ${PKGMESSAGE}
do-install:
@${MKDIR} ${DATADIR}/gdesklets/Displays/${NAME}/gfx
- @${MKDIR} ${DATADIR}/gdesklets/Sensors/${NAME}/gfx
+ @${MKDIR} ${DATADIR}/gdesklets/Sensors/${NAME}
@${INSTALL_DATA} ${WRKSRC}/*.display ${DATADIR}/gdesklets/Displays/${NAME}/
- @${INSTALL_DATA} ${WRKSRC}/AUTHORS ${DATADIR}/gdesklets/Displays/${NAME}/
- @${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DATADIR}/gdesklets/Displays/${NAME}/
@${INSTALL_DATA} ${WRKSRC}/gfx/*.png ${DATADIR}/gdesklets/Displays/${NAME}/gfx/
@${INSTALL_DATA} ${WRKSRC}/${NAME}/__init__.py ${DATADIR}/gdesklets/Sensors/${NAME}
- @${INSTALL_DATA} ${WRKSRC}/${NAME}/gfx/*.png ${DATADIR}/gdesklets/Sensors/${NAME}/gfx/
.for ii in ${LANG}
@${MKDIR} ${DATADIR}/gdesklets/Sensors/${NAME}/locale/${ii}/LC_MESSAGES
@${INSTALL_DATA} ${WRKSRC}/${NAME}/locale/${ii}/LC_MESSAGES/gdesklets.mo \
@@ -47,6 +45,8 @@
.endfor
post-install:
+ @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${DATADIR}/gdesklets/Sensors/${NAME}
+ @${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${DATADIR}/gdesklets/Sensors/${NAME}
@${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>
diff -Nur gdesklets-sysinfo.orig/distinfo gdesklets-sysinfo/distinfo
--- gdesklets-sysinfo.orig/distinfo Mon Dec 29 16:10:52 2003
+++ gdesklets-sysinfo/distinfo Wed Jan 7 12:45:52 2004
@@ -1 +1 @@
-MD5 (SysInfo-0.23.tar.bz2) = 071151b2674937fe4c3f9fc8e0a8bff8
+MD5 (SysInfo-0.25.tar.bz2) = 6d6c6c21b0f73227c33649d07a88b4c6
diff -Nur gdesklets-sysinfo.orig/files/patch-sysinfo.display gdesklets-sysinfo/files/patch-sysinfo.display
--- gdesklets-sysinfo.orig/files/patch-sysinfo.display Thu Jan 1 01:00:00 1970
+++ gdesklets-sysinfo/files/patch-sysinfo.display Wed Jan 7 12:42:15 2004
@@ -0,0 +1,59 @@
+--- sysinfo.display.orig Tue Jan 6 11:29:16 2004
++++ sysinfo.display Tue Jan 6 12:05:28 2004
+@@ -36,9 +36,8 @@
+
+ <label id="value1" relative-to="key1, x"
+ x="0" y="0" visible="false"
+- font="Bitstream Vera Sans 12"
+- watch="value=sys:value1, visible=sys:show1,
+- color=sys:val_color" wrap-at="100"/>
++ watch="font=sys:fonts, value=sys:value1, visible=sys:show1,
++ color=sys:title_color" wrap-at="200"/>
+ </group>
+
+ <group id="line2" relative-to="line1, y">
+@@ -50,7 +49,7 @@
+ x="5" y="0" visible="false"
+ watch="value=sys:value2, visible=sys:show2,
+ font=sys:fonts, color=sys:val_color"
+- wrap-at="80"/>
++ wrap-at="100"/>
+ </group>
+
+ <group id="line3" relative-to="line2, y">
+@@ -62,7 +61,7 @@
+ x="5" y="0" visible="false"
+ watch="value=sys:value3, visible=sys:show3,
+ font=sys:fonts, color=sys:val_color"
+- wrap-at="80"/>
++ wrap-at="100"/>
+ </group>
+
+ <group id="line4" relative-to="line3, y">
+@@ -74,7 +73,7 @@
+ x="5" y="0" visible="false"
+ watch="value=sys:value4, visible=sys:show4,
+ font=sys:fonts, color=sys:val_color"
+- wrap-at="80"/>
++ wrap-at="100"/>
+ </group>
+
+ <group id="line5" relative-to="line4, y">
+@@ -86,7 +85,7 @@
+ x="5" y="0" visible="false"
+ watch="value=sys:value5, visible=sys:show5,
+ font=sys:fonts, color=sys:val_color"
+- wrap-at="80"/>
++ wrap-at="100"/>
+ </group>
+
+ <group id="line6" relative-to="line5, y">
+@@ -98,7 +97,7 @@
+ x="5" y="0" visible="false"
+ watch="value=sys:value6, visible=sys:show6,
+ font=sys:fonts, color=sys:val_color"
+- wrap-at="80"/>
++ wrap-at="100"/>
+ </group>
+
+ <group id="ggauge" relative-to="line6, y" x="0" y="4"
diff -Nur gdesklets-sysinfo.orig/files/postbuild-patch-__init__.py gdesklets-sysinfo/files/postbuild-patch-__init__.py
--- gdesklets-sysinfo.orig/files/postbuild-patch-__init__.py Mon Dec 29 16:10:53 2003
+++ gdesklets-sysinfo/files/postbuild-patch-__init__.py Wed Jan 7 12:51:28 2004
@@ -1,11 +1,130 @@
---- SysInfo-0.23/SysInfo/__init__.py.orig Mon Dec 29 11:45:41 2003
-+++ SysInfo-0.23/SysInfo/__init__.py Mon Dec 29 11:46:51 2003
-@@ -129,7 +129,7 @@
- signal.set("key2[%(index)d]" % vars(), _("Clock:"))
- signal.set("value2[%(index)d]" % vars(), self.__cpu_speed)
- signal.set("key3[%(index)d]" % vars(), _("Cache:"))
-- signal.set("value3[%(index)d]" % vars(), self.__cpu_cache)
-+ signal.set("value3[%(index)d]" % vars(), "Unknown")
- signal.set("fill[%(index)d]" % vars(), load)
- signal.set("show1[%(index)d]" % vars(), 1)
- signal.set("show2[%(index)d]" % vars(), 1)
+--- SysInfo/__init__.py.orig Mon Jan 5 23:16:50 2004
++++ SysInfo/__init__.py Wed Jan 7 12:50:31 2004
+@@ -23,8 +23,9 @@
+
+ self.__backgr = ""
+
+- self.__key_color = ""
+- self.__val_color = ""
++ self.__key_color = ""
++ self.__val_color = ""
++ self.__title_color = ""
+
+ self.__current_size = 0
+ self.__size_changed = 0
+@@ -40,6 +41,7 @@
+ self._set_config_type("fonts", TYPE_STRING, "Sans 10")
+ self._set_config_type("key_color", TYPE_STRING, "white")
+ self._set_config_type("val_color", TYPE_STRING, "yellow")
++ self._set_config_type("title_color", TYPE_STRING, "#FFA500")
+ self._set_config_type("background", TYPE_STRING, "gfx/bg.png")
+ self._set_config_type("memory", TYPE_STRING, "RAM")
+ self._set_config_type("partition", TYPE_STRING, "/")
+@@ -74,6 +76,8 @@
+ _("The color of the key"))
+ configurator.add_color_selector(_("Value color:"), "val_color",
+ _("The color of the value"))
++ configurator.add_color_selector(_("Title color:"), "title_color",
++ _("The color of the titles"))
+ configurator.add_option(_("Partition:"), "partition",
+ "Specify partition type", part)
+ configurator.add_option(_("Memory:"), "memory",
+@@ -103,8 +107,9 @@
+ idle_d, idle_h, idle_m, idle_s = lib.convert.secs_to_dhms(idletime)
+ idle_p = (idletime / float(uptime)) * 100
+
+- signal.set("value1[%(index)d]" % vars(), os + " @ " + name)
+- signal.set("value2[%(index)d]" % vars(), kernel[:6])
++ signal.set("value1[%(index)d]" % vars(), os + " @ " + \
++ name.split(".")[0])
++ signal.set("value2[%(index)d]" % vars(), kernel)
+ signal.set("value3[%(index)d]" % vars(), str(l1) + " " + str(l5) + \
+ " " + str(l15))
+ signal.set("value4[%(index)d]" % vars(), users)
+@@ -128,7 +133,7 @@
+
+ cpu_type = lib.cpu.get_model()
+ cpu_speed = lib.cpu.get_speed()
+- cpu_cache = lib.cpu.get_cache_size()
++ cpu_cache = "Unknown"
+ total, load = lib.cpu.get_load()
+
+ signal.set("value1[%(index)d]" % vars(), cpu_type)
+@@ -234,20 +239,22 @@
+
+ index = 0
+
+- fonts = self._get_config("fonts")
+- key_color = self._get_config("key_color")
+- val_color = self._get_config("val_color")
+- background = self._get_config("background")
+-
+- v1 = (self.__fonts, self.__key_color, self.__val_color, self.__backgr)
+- v2 = (fonts, key_color, val_color, background)
++ fonts = self._get_config("fonts")
++ key_color = self._get_config("key_color")
++ val_color = self._get_config("val_color")
++ title_color = self._get_config("title_color")
++ background = self._get_config("background")
++
++ v1 = (self.__fonts, self.__key_color, self.__val_color,
++ self.__title_color, self.__backgr)
++ v2 = (fonts, key_color, val_color, title_color, background)
+
+ # only take action when some value has changed
+ if (v1 != v2 or self.__size_changed):
+ signal = self._new_output()
+
+ signal.set("icon[%(index)d]" % vars(), "gfx/Info.png")
+- signal.set("key1[%(index)d]" % vars(), _(""))
++ signal.set("key1[%(index)d]" % vars(), (""))
+ signal.set("key2[%(index)d]" % vars(), _("Kernel:"))
+ signal.set("key3[%(index)d]" % vars(), _("Load:"))
+ signal.set("key4[%(index)d]" % vars(), _("Users:"))
+@@ -255,25 +262,25 @@
+ signal.set("key6[%(index)d]" % vars(), _("Idle time:"))
+ index += 1
+ signal.set("icon[%(index)d]" % vars(), "gfx/cpu.png")
+- signal.set("key1[%(index)d]" % vars(), _(""))
++ signal.set("key1[%(index)d]" % vars(), (""))
+ signal.set("key2[%(index)d]" % vars(), _("Clock:"))
+ signal.set("key3[%(index)d]" % vars(), _("Cache:"))
+ signal.set("key4[%(index)d]" % vars(), _("Idle time:"))
+ index += 1
+ signal.set("icon[%(index)d]" % vars(), "gfx/memory.png")
+- signal.set("key1[%(index)d]" % vars(), _(""))
++ signal.set("key1[%(index)d]" % vars(), (""))
+ signal.set("key2[%(index)d]" % vars(), _("Total:"))
+ signal.set("key3[%(index)d]" % vars(), _("Used:"))
+ signal.set("key4[%(index)d]" % vars(), _("Free:"))
+ index += 1
+ signal.set("icon[%(index)d]" % vars(), "gfx/hdd.png")
+- signal.set("key1[%(index)d]" % vars(), _(""))
++ signal.set("key1[%(index)d]" % vars(), (""))
+ signal.set("key2[%(index)d]" % vars(), _("Total:"))
+ signal.set("key3[%(index)d]" % vars(), _("Used:"))
+ signal.set("key4[%(index)d]" % vars(), _("Free:"))
+ index += 1
+ signal.set("icon[%(index)d]" % vars(), "gfx/network.png")
+- signal.set("key1[%(index)d]" % vars(), _(""))
++ signal.set("key1[%(index)d]" % vars(), (""))
+ signal.set("key2[%(index)d]" % vars(), _("IP addr:"))
+ signal.set("key3[%(index)d]" % vars(), _("Bytes in:"))
+ signal.set("key4[%(index)d]" % vars(), _("Bytes out:"))
+@@ -292,12 +299,16 @@
+ if (self.__val_color != val_color or self.__size_changed):
+ for i in xrange(self.__array_size):
+ signal.set("val_color[%(i)d]" %vars(), val_color)
++ if (self.__title_color != title_color or self.__size_changed):
++ for i in xrange(self.__array_size):
++ signal.set("title_color[%(i)d]" %vars(), title_color)
+
+ self._send_output(signal)
+
+ self.__fonts = fonts
+ self.__key_color = key_color
+ self.__val_color = val_color
++ self.__title_color = title_color
+ self.__backgr = background
+ self.__size_changed = 0
+
diff -Nur gdesklets-sysinfo.orig/pkg-plist gdesklets-sysinfo/pkg-plist
--- gdesklets-sysinfo.orig/pkg-plist Sun Jan 4 15:59:33 2004
+++ gdesklets-sysinfo/pkg-plist Wed Jan 7 12:56:34 2004
@@ -1,22 +1,29 @@
+share/gnome/gdesklets/Displays/SysInfo/gfx/Info.png
+share/gnome/gdesklets/Displays/SysInfo/gfx/Info_.png
share/gnome/gdesklets/Displays/SysInfo/gfx/SysInfo.png
+share/gnome/gdesklets/Displays/SysInfo/gfx/_hdd.png
share/gnome/gdesklets/Displays/SysInfo/gfx/bg.png
-share/gnome/gdesklets/Displays/SysInfo/gfx/border-left.png
-share/gnome/gdesklets/Displays/SysInfo/gfx/border-right.png
-share/gnome/gdesklets/Displays/SysInfo/gfx/border-top.png
-share/gnome/gdesklets/Displays/SysInfo/gfx/border-topleft.png
+share/gnome/gdesklets/Displays/SysInfo/gfx/bg_g.png
+share/gnome/gdesklets/Displays/SysInfo/gfx/cpu.png
+share/gnome/gdesklets/Displays/SysInfo/gfx/e.png
+share/gnome/gdesklets/Displays/SysInfo/gfx/expander.png
share/gnome/gdesklets/Displays/SysInfo/gfx/gauge-bg.png
share/gnome/gdesklets/Displays/SysInfo/gfx/gauge.png
-share/gnome/gdesklets/Displays/SysInfo/gfx/gauge_h.png
+share/gnome/gdesklets/Displays/SysInfo/gfx/hdd.png
+share/gnome/gdesklets/Displays/SysInfo/gfx/memory.png
+share/gnome/gdesklets/Displays/SysInfo/gfx/memory_.png
+share/gnome/gdesklets/Displays/SysInfo/gfx/n.png
+share/gnome/gdesklets/Displays/SysInfo/gfx/ne.png
+share/gnome/gdesklets/Displays/SysInfo/gfx/network.png
+share/gnome/gdesklets/Displays/SysInfo/gfx/nw.png
+share/gnome/gdesklets/Displays/SysInfo/gfx/s.png
+share/gnome/gdesklets/Displays/SysInfo/gfx/se.png
+share/gnome/gdesklets/Displays/SysInfo/gfx/sw.png
+share/gnome/gdesklets/Displays/SysInfo/gfx/w.png
share/gnome/gdesklets/Displays/SysInfo/sysinfo.display
-share/gnome/gdesklets/Displays/SysInfo/AUTHORS
-share/gnome/gdesklets/Displays/SysInfo/ChangeLog
share/gnome/gdesklets/Sensors/SysInfo/__init__.py
-share/gnome/gdesklets/Sensors/SysInfo/gfx/SysInfo.png
-share/gnome/gdesklets/Sensors/SysInfo/gfx/boot.png
-share/gnome/gdesklets/Sensors/SysInfo/gfx/cpu.png
-share/gnome/gdesklets/Sensors/SysInfo/gfx/hdd.png
-share/gnome/gdesklets/Sensors/SysInfo/gfx/memory.png
-share/gnome/gdesklets/Sensors/SysInfo/gfx/network.png
+share/gnome/gdesklets/Sensors/SysInfo/__init__.pyc
+share/gnome/gdesklets/Sensors/SysInfo/__init__.pyo
share/gnome/gdesklets/Sensors/SysInfo/locale/de/LC_MESSAGES/sysinfo-sensor.mo
share/gnome/gdesklets/Sensors/SysInfo/locale/es/LC_MESSAGES/sysinfo-sensor.mo
share/gnome/gdesklets/Sensors/SysInfo/locale/fr/LC_MESSAGES/sysinfo-sensor.mo
@@ -25,7 +32,8 @@
share/gnome/gdesklets/Sensors/SysInfo/locale/sr/LC_MESSAGES/sysinfo-sensor.mo
share/gnome/gdesklets/Sensors/SysInfo/locale/sr at Latn/LC_MESSAGES/sysinfo-sensor.mo
share/gnome/gdesklets/Sensors/SysInfo/locale/sv/LC_MESSAGES/sysinfo-sensor.mo
- at dirrm share/gnome/gdesklets/Sensors/SysInfo/gfx
+ at dirrm share/gnome/gdesklets/Displays/SysInfo/gfx
+ at dirrm share/gnome/gdesklets/Displays/SysInfo
@dirrm share/gnome/gdesklets/Sensors/SysInfo/locale/de/LC_MESSAGES
@dirrm share/gnome/gdesklets/Sensors/SysInfo/locale/de
@dirrm share/gnome/gdesklets/Sensors/SysInfo/locale/es/LC_MESSAGES
@@ -44,5 +52,3 @@
@dirrm share/gnome/gdesklets/Sensors/SysInfo/locale/sv
@dirrm share/gnome/gdesklets/Sensors/SysInfo/locale
@dirrm share/gnome/gdesklets/Sensors/SysInfo
- at dirrm share/gnome/gdesklets/Displays/SysInfo/gfx
- at dirrm share/gnome/gdesklets/Displays/SysInfo
--- gdesklets-sysinfo-025.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list