ports/152998: [UPDATE] sysutils/xfce4-systemload-plugin to 1.0.0

Olivier Duchateau duchateau.olivier at gmail.com
Fri Dec 10 17:20:10 UTC 2010


>Number:         152998
>Category:       ports
>Synopsis:       [UPDATE] sysutils/xfce4-systemload-plugin to 1.0.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Dec 10 17:20:09 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Olivier Duchateau
>Release:        FreeBSD 8.1-RELEASE
>Organization:
>Environment:
FreeBSD bornem.errements.net 8.1-RELEASE FreeBSD 8.1-RELEASE #0: Mon Jul 19 02:55:53 UTC 2010     root at almeida.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC  i386
>Description:
Complete ChangeLog: http://foo-projects.org/pipermail/xfce/2010-December/028011.html

- Use XFCE master site macro, instead of one mirror.
- Clean pkg-plist file, remove 'locale' pathes which are already present in Templates/BSD.local.dist

Note: this package was tested under Xfce 4.8pre2 (the next stable version of Xfce4).
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -urN /usr/ports/sysutils/xfce4-systemload-plugin/Makefile xfce4-systemload-plugin/Makefile
--- /usr/ports/sysutils/xfce4-systemload-plugin/Makefile	2010-05-31 17:27:28.000000000 +0200
+++ xfce4-systemload-plugin/Makefile	2010-12-10 17:47:34.000000000 +0100
@@ -6,20 +6,35 @@
 #
 
 PORTNAME=	xfce4-systemload-plugin
-PORTVERSION=	0.4.2
-PORTREVISION=	13
+PORTVERSION=	1.0.0
 CATEGORIES=	sysutils xfce
-MASTER_SITES=	http://goodies.xfce.org/releases/${PORTNAME}/
+MASTER_SITES=	${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=	src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	thorsten.greiner at web.de
 COMMENT=	System Load plugin for XFce4
 
+USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnometarget gtk20 intltool intlhack pkgconfig
-USE_XFCE=	configenv panel
+USE_GNOME=	gnomehack gtk20 intltool intlhack pkgconfig
+USE_XFCE=	configenv libgui panel
+
+CONFIGURE_ARGS=	--disable-debug
+
+OPTIONS=	NLS "Enable Native Language Support" on
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
+PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -urN /usr/ports/sysutils/xfce4-systemload-plugin/distinfo xfce4-systemload-plugin/distinfo
--- /usr/ports/sysutils/xfce4-systemload-plugin/distinfo	2007-01-22 17:45:08.000000000 +0100
+++ xfce4-systemload-plugin/distinfo	2010-12-10 17:47:34.000000000 +0100
@@ -1,3 +1,2 @@
-MD5 (xfce4/xfce4-systemload-plugin-0.4.2.tar.bz2) = cc5777bb1621704927513eb8eef5f07c
-SHA256 (xfce4/xfce4-systemload-plugin-0.4.2.tar.bz2) = 0ca193fd7a21403566b452e42951e5ab816dcc69cfcca816b245da00f41ffc55
-SIZE (xfce4/xfce4-systemload-plugin-0.4.2.tar.bz2) = 184575
+SHA256 (xfce4/xfce4-systemload-plugin-1.0.0.tar.bz2) = 4a2ffe49572105e301b5bf6666fff9e48126f1ef7e5fbed9f4b495fd48c192f9
+SIZE (xfce4/xfce4-systemload-plugin-1.0.0.tar.bz2) = 305892
diff -urN /usr/ports/sysutils/xfce4-systemload-plugin/files/patch-panel-plugin-memswap.c xfce4-systemload-plugin/files/patch-panel-plugin-memswap.c
--- /usr/ports/sysutils/xfce4-systemload-plugin/files/patch-panel-plugin-memswap.c	2008-03-30 00:56:27.000000000 +0100
+++ xfce4-systemload-plugin/files/patch-panel-plugin-memswap.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,24 +0,0 @@
---- panel-plugin/memswap.c.orig	2007-01-18 02:01:09.000000000 +0800
-+++ panel-plugin/memswap.c	2008-03-03 21:01:50.000000000 +0800
-@@ -203,7 +203,7 @@
- gint read_memswap(gulong *mem, gulong *swap, gulong *MT, gulong *MU, gulong *ST, gulong *SU)
- {
-     int total_pages;
--    int free_pages;
-+    u_int free_pages;
-     int inactive_pages;
-     int pagesize = getpagesize();
-     int swap_avail;
-@@ -222,8 +222,8 @@
-         return -1;
-     }
- 
--    *MT = (total_pages*pagesize) >> 10;
--    *MU = ((total_pages-free_pages-inactive_pages) * pagesize) >> 10;
-+    *MT = CONVERT(total_pages);
-+    *MU = CONVERT(total_pages-free_pages-inactive_pages);
-     *mem = *MU * 100 / *MT;
- 
-     if((*swap = swapmode(&swap_avail, &swap_free)) >= 0) {
-
-
diff -urN /usr/ports/sysutils/xfce4-systemload-plugin/files/patch-panel-plugin:uptime.c xfce4-systemload-plugin/files/patch-panel-plugin:uptime.c
--- /usr/ports/sysutils/xfce4-systemload-plugin/files/patch-panel-plugin:uptime.c	2005-05-21 10:58:59.000000000 +0200
+++ xfce4-systemload-plugin/files/patch-panel-plugin:uptime.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,19 +0,0 @@
---- panel-plugin/uptime.c.orig	Thu Nov 13 20:01:50 2003
-+++ panel-plugin/uptime.c	Fri May 20 22:31:11 2005
-@@ -81,6 +81,7 @@
- #include <string.h>
- #include <sys/param.h>
- #include <sys/sysctl.h>
-+#include <sys/time.h>
- #include <sys/types.h>
- #include <sys/vmmeter.h>
- #include <unistd.h>
-@@ -94,7 +95,7 @@
-    int mib[2] = {CTL_KERN, KERN_BOOTTIME};
-    struct timeval boottime;
-    time_t now;
--   int size = sizeof(boottime);
-+   size_t size = sizeof(boottime);
-    gulong uptime;
-  
-    if((sysctl(mib, 2, &boottime, &size, NULL, 0) != -1)
diff -urN /usr/ports/sysutils/xfce4-systemload-plugin/pkg-plist xfce4-systemload-plugin/pkg-plist
--- /usr/ports/sysutils/xfce4-systemload-plugin/pkg-plist	2007-01-22 17:45:08.000000000 +0100
+++ xfce4-systemload-plugin/pkg-plist	2010-12-10 17:47:34.000000000 +0100
@@ -1,22 +1,48 @@
 libexec/xfce4/panel-plugins/xfce4-systemload-plugin
-share/locale/ca/LC_MESSAGES/xfce4-systemload-plugin.mo
-share/locale/cs/LC_MESSAGES/xfce4-systemload-plugin.mo
-share/locale/de/LC_MESSAGES/xfce4-systemload-plugin.mo
-share/locale/eu/LC_MESSAGES/xfce4-systemload-plugin.mo
-share/locale/fr/LC_MESSAGES/xfce4-systemload-plugin.mo
-share/locale/gl/LC_MESSAGES/xfce4-systemload-plugin.mo
-share/locale/hu/LC_MESSAGES/xfce4-systemload-plugin.mo
-share/locale/ko/LC_MESSAGES/xfce4-systemload-plugin.mo
-share/locale/lt/LC_MESSAGES/xfce4-systemload-plugin.mo
-share/locale/nl/LC_MESSAGES/xfce4-systemload-plugin.mo
-share/locale/pl/LC_MESSAGES/xfce4-systemload-plugin.mo
-share/locale/pt_BR/LC_MESSAGES/xfce4-systemload-plugin.mo
-share/locale/sv/LC_MESSAGES/xfce4-systemload-plugin.mo
-share/locale/uk/LC_MESSAGES/xfce4-systemload-plugin.mo
-share/locale/vi/LC_MESSAGES/xfce4-systemload-plugin.mo
-share/locale/zh_TW/LC_MESSAGES/xfce4-systemload-plugin.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/xfce4-systemload-plugin.mo
+%%NLS%%share/locale/ast/LC_MESSAGES/xfce4-systemload-plugin.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/xfce4-systemload-plugin.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/xfce4-systemload-plugin.mo
+%%NLS%%share/locale/da/LC_MESSAGES/xfce4-systemload-plugin.mo
+%%NLS%%share/locale/de/LC_MESSAGES/xfce4-systemload-plugin.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-systemload-plugin.mo
+%%NLS%%share/locale/es/LC_MESSAGES/xfce4-systemload-plugin.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/xfce4-systemload-plugin.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/xfce4-systemload-plugin.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/xfce4-systemload-plugin.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/xfce4-systemload-plugin.mo
+%%NLS%%share/locale/id/LC_MESSAGES/xfce4-systemload-plugin.mo
+%%NLS%%share/locale/it/LC_MESSAGES/xfce4-systemload-plugin.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/xfce4-systemload-plugin.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/xfce4-systemload-plugin.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/xfce4-systemload-plugin.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/xfce4-systemload-plugin.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/xfce4-systemload-plugin.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/xfce4-systemload-plugin.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/xfce4-systemload-plugin.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/xfce4-systemload-plugin.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-systemload-plugin.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/xfce4-systemload-plugin.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/xfce4-systemload-plugin.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/xfce4-systemload-plugin.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/xfce4-systemload-plugin.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/xfce4-systemload-plugin.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/xfce4-systemload-plugin.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/xfce4-systemload-plugin.mo
+%%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-systemload-plugin.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/xfce4-systemload-plugin.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-systemload-plugin.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-systemload-plugin.mo
 share/xfce4/panel-plugins/systemload.desktop
 @dirrmtry share/xfce4/panel-plugins
 @dirrmtry share/xfce4
+%%NLS%%@dirrmtry share/locale/ur_PK/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ur_PK
+%%NLS%%@dirrmtry share/locale/ur/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ur
+%%NLS%%@dirrmtry share/locale/ug/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ug
+%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ast
 @dirrmtry libexec/xfce4/panel-plugins
 @dirrmtry libexec/xfce4


>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list