ports/60686: [UPDATE PORT] sysutils/gdesklets-sysinfo to 0.23
Franz Klammer
klammer at webonaut.com
Mon Dec 29 11:10:15 UTC 2003
>Number: 60686
>Category: ports
>Synopsis: [UPDATE PORT] sysutils/gdesklets-sysinfo to 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: Mon Dec 29 03:10:08 PST 2003
>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 #0: Tue Dec 23 15:59:47 CET 2003 root at ds9.webonaut.com:/usr/obj/usr/src/sys/DS9 i386
>Description:
update port: sysutils/gdesklets-sysinfo to 0.23
>How-To-Repeat:
>Fix:
--- gdesklets-sysinfo.diff begins here ---
diff -Nur gdesklets-sysinfo.orig/Makefile gdesklets-sysinfo/Makefile
--- gdesklets-sysinfo.orig/Makefile Wed Nov 19 14:13:29 2003
+++ gdesklets-sysinfo/Makefile Mon Dec 29 12:00:32 2003
@@ -6,26 +6,22 @@
#
PORTNAME= sysinfo
-PORTVERSION= 0.21.2
+PORTVERSION= 0.23
CATEGORIES= sysutils gnome
MASTER_SITES= http://gdesklets.gnomedesktop.org/files/
PKGNAMEPREFIX= gdesklets-
DISTNAME= SysInfo-${PORTVERSION}
-EXTRACT_SUFX= .tar.bz2
MAINTAINER= klammer at webonaut.com
COMMENT= Desklet shows various information about your system
RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gdesklets-core.pc:${PORTSDIR}/deskutils/gdesklets
-# XXX Note, this file is a gzip file with a .bz2 extension.
-#USE_BZIP2= yes
+USE_BZIP2= yes
USE_X_PREFIX= yes
NAME= SysInfo
-WRKSRC= ${WRKDIR}/${NAME}
-
-post-extract:
- @${MV} ${WRKDIR}/Install_${NAME}_Sensor.bin ${WRKSRC}/
+DATADIR= ${PREFIX}/share/gnome
+LANG= de es fr pt sq sr sr at Latn sv
do-build:
@${WRKSRC}/Install_${NAME}_Sensor.bin --nomsg ${WRKSRC}
@@ -33,14 +29,19 @@
@${FIND} ${WRKSRC} -name '*.orig' -delete
do-install:
- @${MKDIR} ${PREFIX}/share/gnome/gdesklets/Displays/${NAME}/gfx
- @${MKDIR} ${PREFIX}/share/gnome/gdesklets/Sensors/${NAME}/gfx
- @${INSTALL_DATA} ${WRKSRC}/*.display ${PREFIX}/share/gnome/gdesklets/Displays/${NAME}/
- @${INSTALL_DATA} ${WRKSRC}/AUTHORS ${PREFIX}/share/gnome/gdesklets/Displays/${NAME}/
- @${INSTALL_DATA} ${WRKSRC}/ChangeLog ${PREFIX}/share/gnome/gdesklets/Displays/${NAME}/
- @${INSTALL_DATA} ${WRKSRC}/gfx/*.png ${PREFIX}/share/gnome/gdesklets/Displays/${NAME}/gfx/
- @${INSTALL_DATA} ${WRKSRC}/${NAME}/*.py ${PREFIX}/share/gnome/gdesklets/Sensors/${NAME}/
- @${INSTALL_DATA} ${WRKSRC}/${NAME}/gfx/*.png ${PREFIX}/share/gnome/gdesklets/Sensors/${NAME}/gfx/
+ @${MKDIR} ${DATADIR}/gdesklets/Displays/${NAME}/gfx
+ @${MKDIR} ${DATADIR}/gdesklets/Sensors/${NAME}/gfx
+ @${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/*.mo \
+ ${DATADIR}/gdesklets/Sensors/${NAME}/locale/${ii}/LC_MESSAGES/
+.endfor
post-install:
@${CAT} ${PKGMESSAGE}
diff -Nur gdesklets-sysinfo.orig/distinfo gdesklets-sysinfo/distinfo
--- gdesklets-sysinfo.orig/distinfo Tue Nov 18 12:33:14 2003
+++ gdesklets-sysinfo/distinfo Mon Dec 29 11:02:38 2003
@@ -1 +1 @@
-MD5 (SysInfo-0.21.2.tar.bz2) = 588c0f52ee113fe8abaa384367753547
+MD5 (SysInfo-0.23.tar.bz2) = 071151b2674937fe4c3f9fc8e0a8bff8
diff -Nur gdesklets-sysinfo.orig/files/patch-Install_SysInfo_Sensor.bin gdesklets-sysinfo/files/patch-Install_SysInfo_Sensor.bin
--- gdesklets-sysinfo.orig/files/patch-Install_SysInfo_Sensor.bin Tue Nov 18 12:25:45 2003
+++ gdesklets-sysinfo/files/patch-Install_SysInfo_Sensor.bin Thu Jan 1 01:00:00 1970
@@ -1,19 +0,0 @@
---- Install_SysInfo_Sensor.bin.orig Thu Nov 13 17:37:51 2003
-+++ Install_SysInfo_Sensor.bin Thu Nov 13 17:38:37 2003
-@@ -75,15 +75,9 @@
- else:
- cmd = "mkdir -p %(destination)s; cd %(destination)s; " \
- "LANG=C tar -xzvf %(tmp)s 2>&1"
-- fail, out = commands.getstatusoutput(cmd % vars())
-+ commands.getstatusoutput(cmd % vars())
- os.unlink(tmp)
-
-- if (fail):
-- if (no_message): print ERROR_TAR + out
-- else: message(ERROR_TAR + out, "error")
-- sys.exit(1)
--
-- print out
- if (not list_only):
- if (no_message): print SUCCESS
- else: message(SUCCESS, "info")
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 Wed Nov 19 11:27:48 2003
+++ gdesklets-sysinfo/files/postbuild-patch-__init__.py Mon Dec 29 11:47:55 2003
@@ -1,37 +1,11 @@
---- SysInfo/SysInfo/__init__.py.orig Fri Sep 12 22:38:38 2003
-+++ SysInfo/SysInfo/__init__.py Mon Nov 17 10:50:07 2003
-@@ -129,7 +129,8 @@
+--- 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(), self.__cpu_cache)
-+ signal.set("value3[%(index)d]" % vars(), _("unknown"))
++ 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)
-@@ -203,8 +204,8 @@
- l5 = lib.sys.get_load_avg_5m()
- l15 = lib.sys.get_load_avg_15m()
- tasks, running = lib.sys.get_tasks()
-- start = lib.sys.get_sysstart()
-- d_start, h_start, m_start, s_start = lib.convert.secs_to_dhms(start)
-+ #start = lib.sys.get_sysstart()
-+ #d_start, h_start, m_start, s_start = lib.convert.secs_to_dhms(start)
- uptime = lib.sys.get_uptime()
- d, h, m, s = lib.convert.secs_to_dhms(uptime)
- idletime = lib.sys.get_idletime()
-@@ -216,9 +217,10 @@
- signal.set("key1[%(index)d]" % vars(), _("Load:"))
- signal.set("value1[%(index)d]" % vars(), str(l1) + " " + str(l5) + " " + str(l15))
- signal.set("key2[%(index)d]" % vars(), _("Sysstart:"))
-- signal.set("value2[%(index)d]" % vars(), str(h_start) + ":" +
-- str(m_start) + ":" +
-- str(s_start))
-+ signal.set("value2[%(index)d]" % vars(), _("unknown"))
-+ #signal.set("value2[%(index)d]" % vars(), str(h_start) + ":" +
-+ # str(m_start) + ":" +
-+ # str(s_start))
- signal.set("key3[%(index)d]" % vars(), _("Uptime:"))
- signal.set("value3[%(index)d]" % vars(), str(d) + "d " + \
- str(h) + "h " + str(m) + "m ")
diff -Nur gdesklets-sysinfo.orig/pkg-plist gdesklets-sysinfo/pkg-plist
--- gdesklets-sysinfo.orig/pkg-plist Tue Nov 18 18:39:47 2003
+++ gdesklets-sysinfo/pkg-plist Mon Dec 29 11:57:33 2003
@@ -1,3 +1,4 @@
+share/gnome/gdesklets/Displays/SysInfo/gfx/SysInfo.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
@@ -16,7 +17,32 @@
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/locale/de/LC_MESSAGES/gdesklets.mo
+share/gnome/gdesklets/Sensors/SysInfo/locale/es/LC_MESSAGES/gdesklets.mo
+share/gnome/gdesklets/Sensors/SysInfo/locale/fr/LC_MESSAGES/gdesklets.mo
+share/gnome/gdesklets/Sensors/SysInfo/locale/pt/LC_MESSAGES/gdesklets.mo
+share/gnome/gdesklets/Sensors/SysInfo/locale/sq/LC_MESSAGES/gdesklets.mo
+share/gnome/gdesklets/Sensors/SysInfo/locale/sr/LC_MESSAGES/gdesklets.mo
+share/gnome/gdesklets/Sensors/SysInfo/locale/sr at Latn/LC_MESSAGES/gdesklets.mo
+share/gnome/gdesklets/Sensors/SysInfo/locale/sv/LC_MESSAGES/gdesklets.mo
@dirrm share/gnome/gdesklets/Sensors/SysInfo/gfx
+ at dirrm share/gnome/gdesklets/Sensors/SysInfo/locale/de/LC_MESSAGES
+ at dirrm share/gnome/gdesklets/Sensors/SysInfo/locale/de
+ at dirrm share/gnome/gdesklets/Sensors/SysInfo/locale/es/LC_MESSAGES
+ at dirrm share/gnome/gdesklets/Sensors/SysInfo/locale/es
+ at dirrm share/gnome/gdesklets/Sensors/SysInfo/locale/fr/LC_MESSAGES
+ at dirrm share/gnome/gdesklets/Sensors/SysInfo/locale/fr
+ at dirrm share/gnome/gdesklets/Sensors/SysInfo/locale/pt/LC_MESSAGES
+ at dirrm share/gnome/gdesklets/Sensors/SysInfo/locale/pt
+ at dirrm share/gnome/gdesklets/Sensors/SysInfo/locale/sq/LC_MESSAGES
+ at dirrm share/gnome/gdesklets/Sensors/SysInfo/locale/sq
+ at dirrm share/gnome/gdesklets/Sensors/SysInfo/locale/sr/LC_MESSAGES
+ at dirrm share/gnome/gdesklets/Sensors/SysInfo/locale/sr
+ at dirrm share/gnome/gdesklets/Sensors/SysInfo/locale/sr at Latn/LC_MESSAGES
+ at dirrm share/gnome/gdesklets/Sensors/SysInfo/locale/sr at Latn
+ at dirrm share/gnome/gdesklets/Sensors/SysInfo/locale/sv/LC_MESSAGES
+ at dirrm share/gnome/gdesklets/Sensors/SysInfo/locale/sv
+ at dirrm share/gnome/gdesklets/Sensors/SysInfo/locale
@dirrm share/gnome/gdesklets/Sensors/SysInfo
@dirrm share/gnome/gdesklets/Displays/SysInfo/gfx
@dirrm share/gnome/gdesklets/Displays/SysInfo
--- gdesklets-sysinfo.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list