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

Update to 2.4.1.

Browse Source
This commit is contained in:
Joe Marcus Clarke 2003-09-27 04:20:23 +00:00
parent da61f14a6c
commit 267e8ab456
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=89512
10 changed files with 66 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
x11/gnome-applets/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= gnomeapplets2
PORTVERSION= 2.4.0
PORTVERSION= 2.4.1
PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}

2
x11/gnome-applets/distinfo
View File

@ -1 +1 @@
MD5 (gnome2/gnome-applets-2.4.0.tar.bz2) = c17dba203ea379af5da056862672026c
MD5 (gnome2/gnome-applets-2.4.1.tar.bz2) = bf018f1692ab305954123d8123ef45d1

18
x11/gnome-applets/files/patch-battstat_Makefile.in
View File

@ -1,21 +1,21 @@
--- battstat/Makefile.in.orig Sun Jun 29 16:43:23 2003
+++ battstat/Makefile.in Sun Jun 29 16:45:10 2003
@@ -146,11 +146,11 @@
--- battstat/Makefile.in.orig Tue Sep 23 00:11:20 2003
+++ battstat/Makefile.in Tue Sep 23 00:14:03 2003
@@ -154,11 +154,11 @@
pixmapsdir = $(datadir)/pixmaps
pixmaps_DATA = battstat.png
@HAVE_LIBAPM_TRUE@APMLIB = -lapm
-@HAVE_LIBAPM_FALSE@APMLIB = apmlib/libapm.a
+@HAVE_LIBAPM_FALSE@APMLIB =
@HAVE_LIBAPM_TRUE@APMLIB = @HAVE_LIBAPM_TRUE@-lapm
-@HAVE_LIBAPM_FALSE@APMLIB = @HAVE_LIBAPM_FALSE@apmlib/libapm.a
+@HAVE_LIBAPM_FALSE@APMLIB =
@HAVE_LIBAPM_TRUE@APMDIR =
-@HAVE_LIBAPM_FALSE@APMDIR = apmlib
-@HAVE_LIBAPM_FALSE@APMDIR = @HAVE_LIBAPM_FALSE@apmlib
+@HAVE_LIBAPM_FALSE@APMDIR =
@HAVE_LIBAPM_TRUE@APMINC =
-@HAVE_LIBAPM_FALSE@APMINC = -Iapmlib/
-@HAVE_LIBAPM_FALSE@APMINC = @HAVE_LIBAPM_FALSE@-Iapmlib/
+@HAVE_LIBAPM_FALSE@APMINC =
SUBDIRS = docs sounds $(APMDIR)
@@ -199,8 +199,7 @@
@@ -230,8 +230,7 @@
@HAVE_LIBAPM_TRUE@battstat_applet_2_DEPENDENCIES = \
@HAVE_LIBAPM_TRUE@$(top_builddir)/screen-exec/libscreen-exec.la
@HAVE_LIBAPM_FALSE@battstat_applet_2_DEPENDENCIES = \

32
x11/gnome-applets/files/patch-wireless_wireless-applet.c
View File

@ -1,6 +1,6 @@
--- wireless/wireless-applet.c.orig Sat Aug 23 09:10:54 2003
+++ wireless/wireless-applet.c Thu Aug 28 00:44:16 2003
@@ -30,12 +30,25 @@
--- wireless/wireless-applet.c.orig Mon Sep 22 19:06:44 2003
+++ wireless/wireless-applet.c Tue Sep 23 00:17:03 2003
@@ -30,6 +30,15 @@
#include <math.h>
#include <dirent.h>
@ -16,7 +16,9 @@
#include <gnome.h>
#include <panel-applet.h>
#include <panel-applet-gconf.h>
#include <glade/glade.h>
@@ -37,7 +46,11 @@
#include <egg-screen-help.h>
+#ifdef __FreeBSD__
+#define CFG_DEVICE "an0"
@ -26,7 +28,7 @@
#define CFG_UPDATE_INTERVAL 2
typedef enum {
@@ -89,6 +102,12 @@
@@ -93,6 +106,12 @@
WirelessApplet *applet);
static void wireless_applet_about_cb (BonoboUIComponent *uic,
WirelessApplet *applet);
@ -36,10 +38,10 @@
+static int wi_getval(WirelessApplet *applet, char *device, struct wi_req *areq);
+static void get_wi_data(WirelessApplet *applet, char *device, long int *level);
+#endif
static void prefs_response_cb (GtkDialog *dialog, gint response, gpointer data);
static const BonoboUIVerb wireless_menu_verbs [] = {
BONOBO_UI_UNSAFE_VERB ("WirelessProperties",
@@ -143,9 +162,11 @@
@@ -150,9 +169,11 @@
g_free (tmp);
/* Update the image */
@ -52,7 +54,7 @@
state = PIX_BROKEN;
else if (percent == 0)
state = PIX_NO_LINK;
@@ -176,6 +197,7 @@
@@ -183,6 +204,7 @@
int percent;
/* Calculate the percentage based on the link quality */
@ -60,7 +62,7 @@
if (level < 0) {
percent = -1;
} else {
@@ -186,6 +208,9 @@
@@ -193,6 +215,9 @@
percent = CLAMP (percent, 0, 100);
}
}
@ -70,7 +72,7 @@
wireless_applet_draw (applet, percent);
}
@@ -228,22 +253,179 @@
@@ -235,22 +260,179 @@
}
}
@ -252,7 +254,7 @@
char *ptr;
fgets (line, 256, applet->file);
@@ -276,6 +458,7 @@
@@ -283,6 +465,7 @@
wireless_applet_update_state (applet, device, link, level, noise);
}
}
@ -260,7 +262,7 @@
} while (1);
if (g_list_length (applet->devices)==1) {
@@ -287,17 +470,23 @@
@@ -294,17 +477,23 @@
}
/* rewind the /proc/net/wireless file */
@ -284,7 +286,7 @@
wireless_applet_read_device_state (applet);
@@ -344,6 +533,7 @@
@@ -351,6 +540,7 @@
static void
start_file_read (WirelessApplet *applet)
{
@ -292,7 +294,7 @@
applet->file = fopen ("/proc/net/wireless", "rt");
if (applet->file == NULL) {
gtk_tooltips_set_tip (applet->tips,
@@ -352,6 +542,7 @@
@@ -359,6 +549,7 @@
NULL);
show_error_dialog (_("There doesn't seem to be any wireless devices configured on your system.\nPlease verify your configuration if you think this is incorrect."));
}
@ -300,7 +302,7 @@
}
static void
@@ -577,8 +768,10 @@
@@ -641,8 +832,10 @@
applet->prefs = NULL;
}

5
x11/gnome-applets/pkg-plist
View File

@ -720,6 +720,8 @@ share/gnome/help/modemlights/C/legal.xml
share/gnome/help/modemlights/C/modemlights.xml
share/gnome/help/stickynotes_applet/C/legal.xml
share/gnome/help/stickynotes_applet/C/stickynotes_applet.xml
share/gnome/help/wireless/C/legal.xml
share/gnome/help/wireless/C/wireless.xml
share/gnome/omf/gnome-applets/accessx-status-C.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/accessx-status-C.omf 2>/dev/null || /usr/bin/true
%%BATTERY%%share/gnome/omf/gnome-applets/battstat-C.omf
@ -910,6 +912,8 @@ share/gnome/omf/gnome-applets/modemlights-C.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/modemlights-C.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/stickynotes_applet-C.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-C.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/wireless-C.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/wireless-C.omf 2>/dev/null || /usr/bin/true
share/gnome/pixmaps/accessx-status-applet/ax-applet.png
share/gnome/pixmaps/accessx-status-applet/ax-bouncekeys.png
share/gnome/pixmaps/accessx-status-applet/ax-key-base.png
@ -1539,3 +1543,4 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-zh_TW.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/modemlights-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/wireless-C.omf 2>/dev/null || /usr/bin/true

2
x11/gnomeapplets2/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= gnomeapplets2
PORTVERSION= 2.4.0
PORTVERSION= 2.4.1
PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}

2
x11/gnomeapplets2/distinfo
View File

@ -1 +1 @@
MD5 (gnome2/gnome-applets-2.4.0.tar.bz2) = c17dba203ea379af5da056862672026c
MD5 (gnome2/gnome-applets-2.4.1.tar.bz2) = bf018f1692ab305954123d8123ef45d1

18
x11/gnomeapplets2/files/patch-battstat_Makefile.in
View File

@ -1,21 +1,21 @@
--- battstat/Makefile.in.orig Sun Jun 29 16:43:23 2003
+++ battstat/Makefile.in Sun Jun 29 16:45:10 2003
@@ -146,11 +146,11 @@
--- battstat/Makefile.in.orig Tue Sep 23 00:11:20 2003
+++ battstat/Makefile.in Tue Sep 23 00:14:03 2003
@@ -154,11 +154,11 @@
pixmapsdir = $(datadir)/pixmaps
pixmaps_DATA = battstat.png
@HAVE_LIBAPM_TRUE@APMLIB = -lapm
-@HAVE_LIBAPM_FALSE@APMLIB = apmlib/libapm.a
+@HAVE_LIBAPM_FALSE@APMLIB =
@HAVE_LIBAPM_TRUE@APMLIB = @HAVE_LIBAPM_TRUE@-lapm
-@HAVE_LIBAPM_FALSE@APMLIB = @HAVE_LIBAPM_FALSE@apmlib/libapm.a
+@HAVE_LIBAPM_FALSE@APMLIB =
@HAVE_LIBAPM_TRUE@APMDIR =
-@HAVE_LIBAPM_FALSE@APMDIR = apmlib
-@HAVE_LIBAPM_FALSE@APMDIR = @HAVE_LIBAPM_FALSE@apmlib
+@HAVE_LIBAPM_FALSE@APMDIR =
@HAVE_LIBAPM_TRUE@APMINC =
-@HAVE_LIBAPM_FALSE@APMINC = -Iapmlib/
-@HAVE_LIBAPM_FALSE@APMINC = @HAVE_LIBAPM_FALSE@-Iapmlib/
+@HAVE_LIBAPM_FALSE@APMINC =
SUBDIRS = docs sounds $(APMDIR)
@@ -199,8 +199,7 @@
@@ -230,8 +230,7 @@
@HAVE_LIBAPM_TRUE@battstat_applet_2_DEPENDENCIES = \
@HAVE_LIBAPM_TRUE@$(top_builddir)/screen-exec/libscreen-exec.la
@HAVE_LIBAPM_FALSE@battstat_applet_2_DEPENDENCIES = \

32
x11/gnomeapplets2/files/patch-wireless_wireless-applet.c
View File

@ -1,6 +1,6 @@
--- wireless/wireless-applet.c.orig Sat Aug 23 09:10:54 2003
+++ wireless/wireless-applet.c Thu Aug 28 00:44:16 2003
@@ -30,12 +30,25 @@
--- wireless/wireless-applet.c.orig Mon Sep 22 19:06:44 2003
+++ wireless/wireless-applet.c Tue Sep 23 00:17:03 2003
@@ -30,6 +30,15 @@
#include <math.h>
#include <dirent.h>
@ -16,7 +16,9 @@
#include <gnome.h>
#include <panel-applet.h>
#include <panel-applet-gconf.h>
#include <glade/glade.h>
@@ -37,7 +46,11 @@
#include <egg-screen-help.h>
+#ifdef __FreeBSD__
+#define CFG_DEVICE "an0"
@ -26,7 +28,7 @@
#define CFG_UPDATE_INTERVAL 2
typedef enum {
@@ -89,6 +102,12 @@
@@ -93,6 +106,12 @@
WirelessApplet *applet);
static void wireless_applet_about_cb (BonoboUIComponent *uic,
WirelessApplet *applet);
@ -36,10 +38,10 @@
+static int wi_getval(WirelessApplet *applet, char *device, struct wi_req *areq);
+static void get_wi_data(WirelessApplet *applet, char *device, long int *level);
+#endif
static void prefs_response_cb (GtkDialog *dialog, gint response, gpointer data);
static const BonoboUIVerb wireless_menu_verbs [] = {
BONOBO_UI_UNSAFE_VERB ("WirelessProperties",
@@ -143,9 +162,11 @@
@@ -150,9 +169,11 @@
g_free (tmp);
/* Update the image */
@ -52,7 +54,7 @@
state = PIX_BROKEN;
else if (percent == 0)
state = PIX_NO_LINK;
@@ -176,6 +197,7 @@
@@ -183,6 +204,7 @@
int percent;
/* Calculate the percentage based on the link quality */
@ -60,7 +62,7 @@
if (level < 0) {
percent = -1;
} else {
@@ -186,6 +208,9 @@
@@ -193,6 +215,9 @@
percent = CLAMP (percent, 0, 100);
}
}
@ -70,7 +72,7 @@
wireless_applet_draw (applet, percent);
}
@@ -228,22 +253,179 @@
@@ -235,22 +260,179 @@
}
}
@ -252,7 +254,7 @@
char *ptr;
fgets (line, 256, applet->file);
@@ -276,6 +458,7 @@
@@ -283,6 +465,7 @@
wireless_applet_update_state (applet, device, link, level, noise);
}
}
@ -260,7 +262,7 @@
} while (1);
if (g_list_length (applet->devices)==1) {
@@ -287,17 +470,23 @@
@@ -294,17 +477,23 @@
}
/* rewind the /proc/net/wireless file */
@ -284,7 +286,7 @@
wireless_applet_read_device_state (applet);
@@ -344,6 +533,7 @@
@@ -351,6 +540,7 @@
static void
start_file_read (WirelessApplet *applet)
{
@ -292,7 +294,7 @@
applet->file = fopen ("/proc/net/wireless", "rt");
if (applet->file == NULL) {
gtk_tooltips_set_tip (applet->tips,
@@ -352,6 +542,7 @@
@@ -359,6 +549,7 @@
NULL);
show_error_dialog (_("There doesn't seem to be any wireless devices configured on your system.\nPlease verify your configuration if you think this is incorrect."));
}
@ -300,7 +302,7 @@
}
static void
@@ -577,8 +768,10 @@
@@ -641,8 +832,10 @@
applet->prefs = NULL;
}

5
x11/gnomeapplets2/pkg-plist
View File

@ -720,6 +720,8 @@ share/gnome/help/modemlights/C/legal.xml
share/gnome/help/modemlights/C/modemlights.xml
share/gnome/help/stickynotes_applet/C/legal.xml
share/gnome/help/stickynotes_applet/C/stickynotes_applet.xml
share/gnome/help/wireless/C/legal.xml
share/gnome/help/wireless/C/wireless.xml
share/gnome/omf/gnome-applets/accessx-status-C.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/accessx-status-C.omf 2>/dev/null || /usr/bin/true
%%BATTERY%%share/gnome/omf/gnome-applets/battstat-C.omf
@ -910,6 +912,8 @@ share/gnome/omf/gnome-applets/modemlights-C.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/modemlights-C.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/stickynotes_applet-C.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-C.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gnome-applets/wireless-C.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/wireless-C.omf 2>/dev/null || /usr/bin/true
share/gnome/pixmaps/accessx-status-applet/ax-applet.png
share/gnome/pixmaps/accessx-status-applet/ax-bouncekeys.png
share/gnome/pixmaps/accessx-status-applet/ax-key-base.png
@ -1539,3 +1543,4 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-zh_TW.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/modemlights-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/wireless-C.omf 2>/dev/null || /usr/bin/true