cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Update to 0.26

Browse Source 
PR:		ports/67824
Submitted by:	Franz Klammer <klammer@webonaut.com> (maintainer)
This commit is contained in:
Pav Lucistnik 2004-06-11 19:29:33 +00:00
parent a8a837684b
commit 58b469b1f1
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=111300
7 changed files with 20 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sysutils/gdesklets-sysinfo/Makefile
View File

@ -6,8 +6,7 @@
#
PORTNAME= sysinfo
PORTVERSION= 0.25
PORTREVISION= 1
PORTVERSION= 0.26
CATEGORIES= sysutils gnome
MASTER_SITES= http://gdesklets.gnomedesktop.org/files/
PKGNAMEPREFIX= gdesklets-
@ -18,7 +17,6 @@ COMMENT= Desklet shows various information about your system
RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gdesklets-core.pc:${PORTSDIR}/deskutils/gdesklets
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_PYTHON= yes
NAME= SysInfo
@ -28,8 +26,8 @@ PKGMESSAGE= ${WRKDIR}/pkg-message
WRKSRC= ${WRKDIR}/${NAME}
do-build:
@${WRKDIR}/Install_${NAME}_Sensor.bin --nomsg ${WRKSRC}
@${PATCH} -d ${WRKSRC} -sp0 < ${PATCHDIR}/postbuild-patch-__init__.py
@${WRKSRC}/Install_${NAME}_Sensor.bin --nomsg ${WRKSRC}
@${PATCH} -d ${WRKSRC} -sp0 < ${PATCHDIR}/postbuild-patch-SysInfo.py
@${FIND} ${WRKSRC} -name '*.orig' -delete
@${CAT} pkg-message | ${SED} -e 's|%%PREFIX%%|${PREFIX}|' > ${PKGMESSAGE}
@ -38,7 +36,7 @@ do-install:
@${MKDIR} ${DATADIR}/gdesklets/Sensors/${NAME}
@${INSTALL_DATA} ${WRKSRC}/*.display ${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}/*.py ${DATADIR}/gdesklets/Sensors/${NAME}
.for ii in ${LANG}
@${MKDIR} ${DATADIR}/gdesklets/Sensors/${NAME}/locale/${ii}/LC_MESSAGES
@${INSTALL_DATA} ${WRKSRC}/${NAME}/locale/${ii}/LC_MESSAGES/gdesklets.mo \
@ -47,7 +45,6 @@ do-install:
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>

4
sysutils/gdesklets-sysinfo/distinfo
View File

@ -1,2 +1,2 @@
MD5 (SysInfo-0.25.tar.bz2) = 6d6c6c21b0f73227c33649d07a88b4c6
SIZE (SysInfo-0.25.tar.bz2) = 145588
MD5 (SysInfo-0.26.tar.gz) = 0f1d314bf082975a82baa09445c6d4c6
SIZE (SysInfo-0.26.tar.bz2) = 136448

59
sysutils/gdesklets-sysinfo/files/patch-sysinfo.display
View File

@ -1,59 +0,0 @@
--- 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"

11
sysutils/gdesklets-sysinfo/files/postbuild-patch-SysInfo.py Normal file
View File

@ -0,0 +1,11 @@
--- SysInfo/SysInfo.py.orig Fri Jun 11 11:43:36 2004
+++ SysInfo/SysInfo.py Fri Jun 11 11:46:47 2004
@@ -72,7 +72,7 @@
cpu_type = lib.cpu.get_model()
cpu_speed = lib.cpu.get_speed()
- cpu_cache = lib.cpu.get_cache_size()
+ cpu_cache = "n/a" #lib.cpu.get_cache_size()
total, load = lib.cpu.get_load()
signal.set("value1[%(index)d]" % vars(), cpu_type)

130
sysutils/gdesklets-sysinfo/files/postbuild-patch-__init__.py
View File

@ -1,130 +0,0 @@
--- 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

2
sysutils/gdesklets-sysinfo/pkg-message
View File

@ -5,7 +5,7 @@ To view all installed applets:
To use those applets:
gdesklets %%PREFIX%%/share/gnome/gdesklets/Displays/${name}/${name}.display
gdesklets %%PREFIX%%/share/gnome/gdesklets/Displays/SysInfo/sysinfo.display
Replace ${name} with the correct name of the applets you want to use.

6
sysutils/gdesklets-sysinfo/pkg-plist
View File

@ -1,7 +1,5 @@
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/bg_g.png
share/gnome/gdesklets/Displays/SysInfo/gfx/cpu.png
@ -11,7 +9,6 @@ share/gnome/gdesklets/Displays/SysInfo/gfx/gauge-bg.png
share/gnome/gdesklets/Displays/SysInfo/gfx/gauge.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
@ -23,7 +20,8 @@ share/gnome/gdesklets/Displays/SysInfo/gfx/w.png
share/gnome/gdesklets/Displays/SysInfo/sysinfo.display
share/gnome/gdesklets/Sensors/SysInfo/__init__.py
share/gnome/gdesklets/Sensors/SysInfo/__init__.pyc
share/gnome/gdesklets/Sensors/SysInfo/__init__.pyo
share/gnome/gdesklets/Sensors/SysInfo/SysInfo.py
share/gnome/gdesklets/Sensors/SysInfo/SysInfo.pyc
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