Re-enable battstat on amd64, and fix some bashisms in configure.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4257 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 84 insertions, 28 deletions

diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index a750e29a9..5364b97e3 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnomeapplets2/Makefile,v 1.85 2005/07/04 00:15:01 marcus Exp $
+#   $MCom: ports/x11/gnomeapplets2/Makefile,v 1.86 2005/07/13 23:13:18 marcus Exp $
 #
 
 PORTNAME=	gnomeapplets2
 PORTVERSION=	2.11.2
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-applets/2.11
diff --git a/x11/gnome-applets/files/patch-aa b/x11/gnome-applets/files/patch-aa
index 1bb20f296..48b84e456 100644
--- a/x11/gnome-applets/files/patch-aa
+++ b/x11/gnome-applets/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Tue Mar  1 12:35:29 2005
-+++ configure	Tue Mar  1 12:36:09 2005
-@@ -23136,8 +23136,7 @@
+--- configure.orig	Sat Jul 16 12:55:48 2005
++++ configure	Sat Jul 16 13:04:33 2005
+@@ -23272,8 +23272,7 @@
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -10,8 +10,35 @@
    GNOMELOCALEDIR="$ac_define_dir"
  
  
-@@ -25795,6 +25800,9 @@
-       *linux*)
+@@ -25126,7 +25125,7 @@
+ 
+ 	   ;;
+        # list of supported OS cores that do not use libapm
+-       i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
++       i386-*-freebsd*|amd64-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
+           if  -n "${OS_SYS}" ; then
+ 	       ACPIINC="-I${OS_SYS}"
+ 	   else
+@@ -25406,7 +25405,7 @@
+   APPLET_MIXER_FALSE=
+ fi
+ 
+-if test x"$P_MIXER" == x"mixer"; then
++if test x"$P_MIXER" = x"mixer"; then
+ 	echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+@@ -25983,7 +25982,7 @@
+ fi
+ 
+ 
+-if test "x$SU_TOOL" == "x" -o "x$HAVE_LIBUTIL" != "xtrue" -o "x$P_MODEMLIGHTS" != "xmodemlights"; then
++if test "x$SU_TOOL" = "x" -o "x$HAVE_LIBUTIL" != "xtrue" -o "x$P_MODEMLIGHTS" != "xmodemlights"; then
+   { echo "$as_me:$LINENO: WARNING: *** \`modemlights' applet will not be built ***" >&5
+ echo "$as_me: WARNING: *** \`modemlights' applet will not be built ***" >&2;}
+ else
+@@ -26119,6 +26118,9 @@
+ echo "${ECHO_T}yes" >&6
           build_cpufreq_applet=yes
  	 ;;
 +      i386-*-freebsd*|amd64-*-freebsd*)
@@ -20,7 +47,7 @@
        *)
           echo "warning: ${host} is not supported by cpufreq applet, not building" >&2
  	 build_cpufreq_applet=no
-@@ -26085,7 +26093,7 @@
+@@ -26409,7 +26411,7 @@
  ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
  
  
@@ -29,7 +56,7 @@
  
  pixmapsdir="${datadir}/pixmaps"
  
-@@ -26099,8 +26107,7 @@
+@@ -26423,8 +26425,7 @@
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -39,7 +66,7 @@
    GNOME_ICONDIR="$ac_define_dir"
  
  
-@@ -26112,8 +26119,7 @@
+@@ -26436,8 +26437,7 @@
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -49,7 +76,7 @@
    GNOME_PIXMAPSDIR="$ac_define_dir"
  
  
-@@ -26125,8 +26131,7 @@
+@@ -26449,8 +26449,7 @@
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -59,7 +86,7 @@
    GNOME_GLADEDIR="$ac_define_dir"
  
  
-@@ -26138,8 +26143,7 @@
+@@ -26462,8 +26461,7 @@
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -69,7 +96,7 @@
    DATADIR="$ac_define_dir"
  
  
-@@ -26151,8 +26155,7 @@
+@@ -26475,8 +26473,7 @@
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -79,7 +106,7 @@
    SYSCONFDIR="$ac_define_dir"
  
  
-@@ -26164,8 +26167,7 @@
+@@ -26488,8 +26485,7 @@
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -89,7 +116,7 @@
    LIBDIR="$ac_define_dir"
  
  
-@@ -26177,8 +26179,7 @@
+@@ -26501,8 +26497,7 @@
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile
index a750e29a9..5364b97e3 100644
--- a/x11/gnomeapplets2/Makefile
+++ b/x11/gnomeapplets2/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnomeapplets2/Makefile,v 1.85 2005/07/04 00:15:01 marcus Exp $
+#   $MCom: ports/x11/gnomeapplets2/Makefile,v 1.86 2005/07/13 23:13:18 marcus Exp $
 #
 
 PORTNAME=	gnomeapplets2
 PORTVERSION=	2.11.2
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-applets/2.11
diff --git a/x11/gnomeapplets2/files/patch-aa b/x11/gnomeapplets2/files/patch-aa
index 1bb20f296..48b84e456 100644
--- a/x11/gnomeapplets2/files/patch-aa
+++ b/x11/gnomeapplets2/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Tue Mar  1 12:35:29 2005
-+++ configure	Tue Mar  1 12:36:09 2005
-@@ -23136,8 +23136,7 @@
+--- configure.orig	Sat Jul 16 12:55:48 2005
++++ configure	Sat Jul 16 13:04:33 2005
+@@ -23272,8 +23272,7 @@
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -10,8 +10,35 @@
    GNOMELOCALEDIR="$ac_define_dir"
  
  
-@@ -25795,6 +25800,9 @@
-       *linux*)
+@@ -25126,7 +25125,7 @@
+ 
+ 	   ;;
+        # list of supported OS cores that do not use libapm
+-       i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
++       i386-*-freebsd*|amd64-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
+           if  -n "${OS_SYS}" ; then
+ 	       ACPIINC="-I${OS_SYS}"
+ 	   else
+@@ -25406,7 +25405,7 @@
+   APPLET_MIXER_FALSE=
+ fi
+ 
+-if test x"$P_MIXER" == x"mixer"; then
++if test x"$P_MIXER" = x"mixer"; then
+ 	echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+@@ -25983,7 +25982,7 @@
+ fi
+ 
+ 
+-if test "x$SU_TOOL" == "x" -o "x$HAVE_LIBUTIL" != "xtrue" -o "x$P_MODEMLIGHTS" != "xmodemlights"; then
++if test "x$SU_TOOL" = "x" -o "x$HAVE_LIBUTIL" != "xtrue" -o "x$P_MODEMLIGHTS" != "xmodemlights"; then
+   { echo "$as_me:$LINENO: WARNING: *** \`modemlights' applet will not be built ***" >&5
+ echo "$as_me: WARNING: *** \`modemlights' applet will not be built ***" >&2;}
+ else
+@@ -26119,6 +26118,9 @@
+ echo "${ECHO_T}yes" >&6
           build_cpufreq_applet=yes
  	 ;;
 +      i386-*-freebsd*|amd64-*-freebsd*)
@@ -20,7 +47,7 @@
        *)
           echo "warning: ${host} is not supported by cpufreq applet, not building" >&2
  	 build_cpufreq_applet=no
-@@ -26085,7 +26093,7 @@
+@@ -26409,7 +26411,7 @@
  ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
  
  
@@ -29,7 +56,7 @@
  
  pixmapsdir="${datadir}/pixmaps"
  
-@@ -26099,8 +26107,7 @@
+@@ -26423,8 +26425,7 @@
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -39,7 +66,7 @@
    GNOME_ICONDIR="$ac_define_dir"
  
  
-@@ -26112,8 +26119,7 @@
+@@ -26436,8 +26437,7 @@
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -49,7 +76,7 @@
    GNOME_PIXMAPSDIR="$ac_define_dir"
  
  
-@@ -26125,8 +26131,7 @@
+@@ -26449,8 +26449,7 @@
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -59,7 +86,7 @@
    GNOME_GLADEDIR="$ac_define_dir"
  
  
-@@ -26138,8 +26143,7 @@
+@@ -26462,8 +26461,7 @@
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -69,7 +96,7 @@
    DATADIR="$ac_define_dir"
  
  
-@@ -26151,8 +26155,7 @@
+@@ -26475,8 +26473,7 @@
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -79,7 +106,7 @@
    SYSCONFDIR="$ac_define_dir"
  
  
-@@ -26164,8 +26167,7 @@
+@@ -26488,8 +26485,7 @@
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -89,7 +116,7 @@
    LIBDIR="$ac_define_dir"
  
  
-@@ -26177,8 +26179,7 @@
+@@ -26501,8 +26497,7 @@
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'