Date: Sat, 21 Jun 2008 16:15:16 +0800 (CST) From: chinsan <chinsan.tw@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: b89605222@ntu.edu.tw Subject: ports/124815: [PATCH] x11/lxpanel: update to 0.3.7 Message-ID: <20080621081517.8B160B820@chinsan.info> Resent-Message-ID: <200806210820.m5L8K1AY097086@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 124815
>Category: ports
>Synopsis: [PATCH] x11/lxpanel: update to 0.3.7
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Jun 21 08:20:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: chinsan
>Release: FreeBSD 7.0-STABLE i386
>Organization:
Taiwan
>Environment:
System: FreeBSD chinsan.info 7.0-STABLE FreeBSD 7.0-STABLE #2: Mon Apr 21 11:50:08 CST 2008
>Description:
- Update to 0.3.7
Added file(s):
- files/patch-src-plugins-cpu-cpu.c
Removed file(s):
- files/patch-src-plugin-cpu-cpu.c
Port maintainer (b89605222@ntu.edu.tw) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- lxpanel-0.3.7.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/x11/lxpanel/Makefile /usr/home/chinsan/projects/lxpanel/Makefile
--- /usr/ports/x11/lxpanel/Makefile 2008-06-09 22:50:55.000000000 +0800
+++ /usr/home/chinsan/projects/lxpanel/Makefile 2008-06-21 16:14:13.000000000 +0800
@@ -6,8 +6,7 @@
#
PORTNAME= lxpanel
-PORTVERSION= 0.2.4
-PORTREVISION= 3
+PORTVERSION= 0.3.7
CATEGORIES= x11
MASTER_SITES= SF
MASTER_SITE_SUBDIR= lxde
@@ -15,15 +14,29 @@
MAINTAINER= b89605222@ntu.edu.tw
COMMENT= LXPanel is a lightweight X11 desktop panel
+OPTIONS= ALSA "enable ALSA audio architecture support" Off \
+ NLS "NLS support" On
+
USE_XORG= x11 xmu
-USE_GNOME= gtk20 gnomelibs gnomedesktop
+USE_GNOME= gtk20 gnomedesktop gnomeprefix libgnome
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= automake:19
-CONFIGURE_ARGS= --prefix=${PREFIX}
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" CFLAGS="-I${LOCALBASE}/include"
+USE_AUTOTOOLS= automake:110:env
+CONFIGURE_ARGS= --prefix=${PREFIX} \
+ CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
CFLAGS+= -I${WRKSRC}
USE_GMAKE= yes
+MAN1= lxpanel.1 lxpanelctl.1
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_ALSA)
+RUN_DEPENDS+= ${LINUXBASE}/lib/libasound.so.2:${PORTSDIR}/audio/linux-alsa-lib
+.else
+CONFIGURE_ARGS+=--disable-alsa
+.endif
+
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
PLIST_SUB+= NLS=""
@@ -38,4 +51,4 @@
@${REINPLACE_CMD} -e 's,$$(DATADIRNAME)/locale,share/locale,' \
${WRKSRC}/po/Makefile.in.in
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/x11/lxpanel/distinfo /usr/home/chinsan/projects/lxpanel/distinfo
--- /usr/ports/x11/lxpanel/distinfo 2007-01-28 13:03:53.000000000 +0800
+++ /usr/home/chinsan/projects/lxpanel/distinfo 2008-06-21 16:12:40.000000000 +0800
@@ -1,3 +1,3 @@
-MD5 (lxpanel-0.2.4.tar.gz) = 37d0e9f2993fc63d9e7e1684552e10b4
-SHA256 (lxpanel-0.2.4.tar.gz) = c6e9bb54bb999f0a00bb6f6f77f01e572b4ad66b753339cf796c68525d557f79
-SIZE (lxpanel-0.2.4.tar.gz) = 714278
+MD5 (lxpanel-0.3.7.tar.gz) = 9a963d2e8b1ce9da70d2bb3c3aa61297
+SHA256 (lxpanel-0.3.7.tar.gz) = b0db3edc8ebd6cbf4291e6b336667d1e691a84f57d20dc5bc36591d425cff3a5
+SIZE (lxpanel-0.3.7.tar.gz) = 753241
diff -ruN --exclude=CVS /usr/ports/x11/lxpanel/files/patch-src-plugin-cpu-cpu.c /usr/home/chinsan/projects/lxpanel/files/patch-src-plugin-cpu-cpu.c
--- /usr/ports/x11/lxpanel/files/patch-src-plugin-cpu-cpu.c 2007-01-28 13:03:54.000000000 +0800
+++ /usr/home/chinsan/projects/lxpanel/files/patch-src-plugin-cpu-cpu.c 1970-01-01 08:00:00.000000000 +0800
@@ -1,87 +0,0 @@
---- src/plugins/cpu/cpu.c.orig Sat Dec 23 17:32:42 2006
-+++ src/plugins/cpu/cpu.c Sat Dec 23 17:32:49 2006
-@@ -24,7 +24,15 @@
- #include <string.h>
- #include <sys/time.h>
- #include <time.h>
--#include <sys/sysinfo.h>
-+
-+#ifdef __FreeBSD__
-+# include <sys/types.h>
-+# include <sys/resource.h>
-+# include <sys/sysctl.h>
-+#else
-+# include <sys/sysinfo.h>
-+#endif
-+
- #include <stdlib.h>
- #include <glib/gi18n.h>
-
-@@ -61,6 +69,38 @@
- struct cpu_stat cpu_anterior;
- } cpu_t;
-
-+#ifdef __FreeBSD__
-+static void
-+get_procstat(unsigned long *u, unsigned long *n, unsigned long *s,
-+ unsigned long *i)
-+{
-+ static int mib[2] = { -1, -1 }, init = 0, j, realhz;
-+ long ct[CPUSTATES];
-+
-+
-+ if(init == 0) {
-+ struct clockinfo ci;
-+ j = sizeof(ci);
-+ sysctlbyname("kern.clockrate", &ci, &j, NULL, 0);
-+ realhz = ci.stathz ? ci.stathz : ci.hz;
-+
-+ j = 2;
-+ sysctlnametomib("kern.cp_time", mib, &j);
-+
-+ init = 1;
-+ j = sizeof(ct);
-+ }
-+
-+ sysctl(mib, 2, ct, &j, NULL, 0);
-+ *u = ct[CP_USER] / realhz;
-+ *n = ct[CP_NICE] / realhz;
-+ *s = ct[CP_SYS] / realhz;
-+ *i = ct[CP_IDLE] / realhz;
-+
-+ return;
-+ }
-+#endif
-+
-
- static int
- cpu_update(cpu_t *c)
-@@ -68,18 +108,28 @@
- int cpu_u=0, cpu_s=0, cpu_n=0, cpu_i=100;
- unsigned int i;
- struct cpu_stat cpu, cpu_r;
-+
-+#ifndef __FreeBSD__
-+ FILE *stat;
-+#endif
-+
- FILE *stat;
- float total;
-
- ENTER;
- if(!c->pixmap)
- RET(TRUE);
-+
-+#ifdef __FreeBSD__
-+ get_procstat(&cpu.u, &cpu.n, &cpu.s, &cpu.i);
-+#else
-
- stat = fopen("/proc/stat", "r");
- if(!stat)
- RET(TRUE);
- fscanf(stat, "cpu %lu %lu %lu %lu", &cpu.u, &cpu.n, &cpu.s, &cpu.i);
- fclose(stat);
-+#endif
-
- cpu_r.u = cpu.u - c->cpu_anterior.u;
- cpu_r.n = cpu.n - c->cpu_anterior.n;
diff -ruN --exclude=CVS /usr/ports/x11/lxpanel/files/patch-src-plugins-cpu-cpu.c /usr/home/chinsan/projects/lxpanel/files/patch-src-plugins-cpu-cpu.c
--- /usr/ports/x11/lxpanel/files/patch-src-plugins-cpu-cpu.c 1970-01-01 08:00:00.000000000 +0800
+++ /usr/home/chinsan/projects/lxpanel/files/patch-src-plugins-cpu-cpu.c 2008-06-21 16:12:40.000000000 +0800
@@ -0,0 +1,94 @@
+--- src/plugins/cpu/cpu.c.orig 2008-06-21 13:06:29.000000000 +0800
++++ src/plugins/cpu/cpu.c 2008-06-21 13:14:46.000000000 +0800
+@@ -18,14 +18,24 @@
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+-/*A little bug fixed by Mykola <mykola@2ka.mipt.ru>:) */
++/*
++ * A little bug fixed by Mykola <mykola@2ka.mipt.ru> :)
++ * FreeBSD support added by Andreas Wiese <aw@instandbesetzt.net>
++ */
+
+
+ #include <string.h>
+ #include <sys/time.h>
+ #include <time.h>
+-#include <sys/sysinfo.h>
++#ifdef __FreeBSD__
++# include <sys/types.h>
++# include <sys/resource.h>
++# include <sys/sysctl.h>
++#else
++# include <sys/sysinfo.h>
++#endif
+ #include <stdlib.h>
++#include <stdio.h>
+ #include <glib/gi18n.h>
+
+ #include "plugin.h"
+@@ -59,6 +69,38 @@
+ struct cpu_stat cpu_anterior;
+ } cpu_t;
+
++#ifdef __FreeBSD__
++static void
++get_procstat(unsigned long *u, unsigned long *n, unsigned long *s,
++ unsigned long *i)
++{
++ static int mib[2] = { -1, -1 }, init = 0, j, realhz;
++ long ct[CPUSTATES];
++
++
++ if(init == 0) {
++ struct clockinfo ci;
++ j = sizeof(ci);
++ sysctlbyname("kern.clockrate", &ci, &j, NULL, 0);
++ realhz = ci.stathz ? ci.stathz : ci.hz;
++
++ j = 2;
++ sysctlnametomib("kern.cp_time", mib, &j);
++
++ init = 1;
++ j = sizeof(ct);
++ }
++
++ sysctl(mib, 2, ct, &j, NULL, 0);
++ *u = ct[CP_USER] / realhz;
++ *n = ct[CP_NICE] / realhz;
++ *s = ct[CP_SYS] / realhz;
++ *i = ct[CP_IDLE] / realhz;
++
++ return;
++}
++#endif
++
+
+ static int
+ cpu_update(cpu_t *c)
+@@ -66,18 +108,24 @@
+ int cpu_u=0, cpu_s=0, cpu_n=0, cpu_i=100;
+ unsigned int i;
+ struct cpu_stat cpu, cpu_r;
++#ifndef __FreeBSD__
+ FILE *stat;
++ #endif
+ float total;
+
+ ENTER;
+ if(!c->pixmap)
+ RET(TRUE);
+-
++
++#ifdef __FreeBSD__
++ get_procstat(&cpu.u, &cpu.n, &cpu.s, &cpu.i);
++#else
+ stat = fopen("/proc/stat", "r");
+ if(!stat)
+ RET(TRUE);
+ fscanf(stat, "cpu %lu %lu %lu %lu", &cpu.u, &cpu.n, &cpu.s, &cpu.i);
+ fclose(stat);
++#endif
+
+ cpu_r.u = cpu.u - c->cpu_anterior.u;
+ cpu_r.n = cpu.n - c->cpu_anterior.n;
diff -ruN --exclude=CVS /usr/ports/x11/lxpanel/pkg-plist /usr/home/chinsan/projects/lxpanel/pkg-plist
--- /usr/ports/x11/lxpanel/pkg-plist 2007-01-28 13:03:53.000000000 +0800
+++ /usr/home/chinsan/projects/lxpanel/pkg-plist 2008-06-21 16:12:40.000000000 +0800
@@ -1,25 +1,26 @@
bin/lxpanel
bin/lxpanelctl
-lib/lxpanel/plugins/netstatus.so
-lib/lxpanel/plugins/volume.so
+lib/lxpanel/plugins/batt.so
lib/lxpanel/plugins/cpu.so
lib/lxpanel/plugins/deskno.so
+lib/lxpanel/plugins/kbled.so
+lib/lxpanel/plugins/netstatus.so
+lib/lxpanel/plugins/volume.so
+%%NLS%%share/locale/de/LC_MESSAGES/lxpanel.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/lxpanel.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/lxpanel.mo
%%NLS%%share/locale/hu/LC_MESSAGES/lxpanel.mo
%%NLS%%share/locale/ko/LC_MESSAGES/lxpanel.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/lxpanel.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/lxpanel.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/lxpanel.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/lxpanel.mo
-%%DATADIR%%/default
-%%DATADIR%%/images/my-computer.svg
-%%DATADIR%%/images/redhat-internet.svg
-%%DATADIR%%/images/stock_volume.png
-%%DATADIR%%/images/thunderbird.svg
-%%DATADIR%%/images/default.xpm
-%%DATADIR%%/images/emacs.svg
-%%DATADIR%%/images/file-manager.svg
-%%DATADIR%%/images/firefox2.svg
+%%DATADIR%%/images/background.png
+%%DATADIR%%/images/file-manager.png
%%DATADIR%%/images/gnome-applications.png
%%DATADIR%%/images/gnome-control-center.png
%%DATADIR%%/images/gnome-devel.png
-%%DATADIR%%/images/gnome-fs-desktop.svg
+%%DATADIR%%/images/gnome-fs-desktop.png
%%DATADIR%%/images/gnome-globe.png
%%DATADIR%%/images/gnome-graphics.png
%%DATADIR%%/images/gnome-joystick.png
@@ -30,18 +31,42 @@
%%DATADIR%%/images/gnome-netstatus-25-49.png
%%DATADIR%%/images/gnome-netstatus-50-74.png
%%DATADIR%%/images/gnome-netstatus-75-100.png
-%%DATADIR%%/images/gnome-netstatus-disconn.svg
-%%DATADIR%%/images/gnome-netstatus-error.svg
-%%DATADIR%%/images/gnome-netstatus-idle.svg
-%%DATADIR%%/images/gnome-netstatus-rx.svg
-%%DATADIR%%/images/gnome-netstatus-txrx.svg
-%%DATADIR%%/images/gnome-netstatus-tx.svg
-%%DATADIR%%/images/gnome-setting.svg
+%%DATADIR%%/images/gnome-netstatus-disconn.png
+%%DATADIR%%/images/gnome-netstatus-error.png
+%%DATADIR%%/images/gnome-netstatus-idle.png
+%%DATADIR%%/images/gnome-netstatus-rx.png
+%%DATADIR%%/images/gnome-netstatus-txrx.png
+%%DATADIR%%/images/gnome-netstatus-tx.png
+%%DATADIR%%/images/gnome-setting.png
%%DATADIR%%/images/gnome-system.png
-%%DATADIR%%/images/gnome_terminal.svg
%%DATADIR%%/images/gnome-util.png
-%%DATADIR%%/pager
+%%DATADIR%%/images/mute.png
+%%DATADIR%%/images/ns-bothrs.png
+%%DATADIR%%/images/ns-connected.png
+%%DATADIR%%/images/ns-disconnect.png
+%%DATADIR%%/images/ns-problem.png
+%%DATADIR%%/images/ns-recvdata.png
+%%DATADIR%%/images/ns-senddata.png
+%%DATADIR%%/images/ns-lock.png
+%%DATADIR%%/images/capslock-on.png
+%%DATADIR%%/images/capslock-off.png
+%%DATADIR%%/images/numlock-on.png
+%%DATADIR%%/images/numlock-off.png
+%%DATADIR%%/images/scrllock-on.png
+%%DATADIR%%/images/scrllock-off.png
+%%DATADIR%%/images/my-computer.png
+%%DATADIR%%/images/redhat-internet.png
+%%DATADIR%%/images/stock_volume.png
+%%DATADIR%%/images/volume.png
+%%DATADIR%%/profile/default/config
+%%DATADIR%%/profile/default/panels/panel
+%%DATADIR%%/ui/panel-pref.glade
@dirrmtry lib/lxpanel/plugins
@dirrmtry lib/lxpanel
+@dirrm %%DATADIR%%/ui
+@dirrm %%DATADIR%%/profile/default/panels
+@dirrm %%DATADIR%%/profile/default/config
+@dirrm %%DATADIR%%/profile/default
+@dirrm %%DATADIR%%/profile
@dirrm %%DATADIR%%/images
@dirrm %%DATADIR%%
--- lxpanel-0.3.7.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20080621081517.8B160B820>