- Update to 0.23

PR:		ports/60686
Submitted by:	Franz Klammer <klammer@webonaut.com> (maintainer)

6 files changed, 52 insertions, 68 deletions

diff --git a/sysutils/gdesklets-sysinfo/Makefile b/sysutils/gdesklets-sysinfo/Makefile
index 62b41e9d862d..d01af59cdc76 100644
--- a/sysutils/gdesklets-sysinfo/Makefile
+++ b/sysutils/gdesklets-sysinfo/Makefile
@@ -6,41 +6,44 @@
 #
 
 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@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@Latn sv
+PKGMESSAGE=	${WRKDIR}/pkg-message
 
 do-build:
 	@${WRKSRC}/Install_${NAME}_Sensor.bin --nomsg ${WRKSRC}
 	@${PATCH} -d ${WRKDIR} -sp0 < ${PATCHDIR}/postbuild-patch-__init__.py
 	@${FIND} ${WRKSRC} -name '*.orig' -delete
+	@${CAT} pkg-message | ${SED} -e 's|%%PREFIX%%|${PREFIX}|' > ${PKGMESSAGE}
 
 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 --git a/sysutils/gdesklets-sysinfo/distinfo b/sysutils/gdesklets-sysinfo/distinfo
index 9947136f7ba7..d9f235fa0828 100644
--- a/sysutils/gdesklets-sysinfo/distinfo
+++ b/sysutils/gdesklets-sysinfo/distinfo
@@ -1 +1 @@
-MD5 (SysInfo-0.21.2.tar.bz2) = 588c0f52ee113fe8abaa384367753547
+MD5 (SysInfo-0.23.tar.bz2) = 071151b2674937fe4c3f9fc8e0a8bff8
diff --git a/sysutils/gdesklets-sysinfo/files/patch-Install_SysInfo_Sensor.bin b/sysutils/gdesklets-sysinfo/files/patch-Install_SysInfo_Sensor.bin
deleted file mode 100644
index 08c9dcfea3b4..000000000000
--- a/sysutils/gdesklets-sysinfo/files/patch-Install_SysInfo_Sensor.bin
+++ /dev/null
@@ -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 --git a/sysutils/gdesklets-sysinfo/files/postbuild-patch-__init__.py b/sysutils/gdesklets-sysinfo/files/postbuild-patch-__init__.py
index f0865ccb085f..ab09a17e0200 100644
--- a/sysutils/gdesklets-sysinfo/files/postbuild-patch-__init__.py
+++ b/sysutils/gdesklets-sysinfo/files/postbuild-patch-__init__.py
@@ -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 --git a/sysutils/gdesklets-sysinfo/pkg-message b/sysutils/gdesklets-sysinfo/pkg-message
index 3fc99edbeaaa..efc826f97972 100644
--- a/sysutils/gdesklets-sysinfo/pkg-message
+++ b/sysutils/gdesklets-sysinfo/pkg-message
@@ -1,11 +1,11 @@
 ##
 To view all installed applets:
 
-	ls ${PREFIX}/share/gnome/gdesklets/Displays
+	ls %%PREFIX%%/share/gnome/gdesklets/Displays
 
 To use those applets:
 
-	gdesklets ${PREFIX}/share/gnome/gdesklets/Displays/${name}/${name}.display
+	gdesklets %%PREFIX%%/share/gnome/gdesklets/Displays/${name}/${name}.display
 
 Replace ${name} with the correct name of the applets you want to use.
 
diff --git a/sysutils/gdesklets-sysinfo/pkg-plist b/sysutils/gdesklets-sysinfo/pkg-plist
index 5735ef9e15d9..80f56b4eaa45 100644
--- a/sysutils/gdesklets-sysinfo/pkg-plist
+++ b/sysutils/gdesklets-sysinfo/pkg-plist
@@ -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/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/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@Latn/LC_MESSAGES/gdesklets.mo
+share/gnome/gdesklets/Sensors/SysInfo/locale/sv/LC_MESSAGES/gdesklets.mo
 @dirrm share/gnome/gdesklets/Sensors/SysInfo/gfx
+@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
+@dirrm share/gnome/gdesklets/Sensors/SysInfo/locale/es
+@dirrm share/gnome/gdesklets/Sensors/SysInfo/locale/fr/LC_MESSAGES
+@dirrm share/gnome/gdesklets/Sensors/SysInfo/locale/fr
+@dirrm share/gnome/gdesklets/Sensors/SysInfo/locale/pt/LC_MESSAGES
+@dirrm share/gnome/gdesklets/Sensors/SysInfo/locale/pt
+@dirrm share/gnome/gdesklets/Sensors/SysInfo/locale/sq/LC_MESSAGES
+@dirrm share/gnome/gdesklets/Sensors/SysInfo/locale/sq
+@dirrm share/gnome/gdesklets/Sensors/SysInfo/locale/sr/LC_MESSAGES
+@dirrm share/gnome/gdesklets/Sensors/SysInfo/locale/sr
+@dirrm share/gnome/gdesklets/Sensors/SysInfo/locale/sr@Latn/LC_MESSAGES
+@dirrm share/gnome/gdesklets/Sensors/SysInfo/locale/sr@Latn
+@dirrm share/gnome/gdesklets/Sensors/SysInfo/locale/sv/LC_MESSAGES
+@dirrm share/gnome/gdesklets/Sensors/SysInfo/locale/sv
+@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