Only build the battstat_applet on i386.

Submitted by:	beta

6 files changed, 62 insertions, 38 deletions

diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index a1f254d8d71c..3d629bb96f11 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -29,6 +29,14 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} != "i386"
+PLIST_SUB=      BATTERY="@comment "
+.else
+PLIST_SUB=      BATTERY=""
+.endif
+
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
@@ -39,4 +47,4 @@ pre-patch:
 		 s|\$\(prefix\)/lib/bonobo/servers|\$\(prefix\)/libdata/bonobo/servers|g ; \
 		 s|\$\(libdir\)/bonobo/servers|\$\(prefix\)/libdata/bonobo/servers|g'
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11/gnome-applets/files/patch-aa b/x11/gnome-applets/files/patch-aa
index 9178bd4ee3f8..2ade32e6eba6 100644
--- a/x11/gnome-applets/files/patch-aa
+++ b/x11/gnome-applets/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Tue Apr 16 19:23:54 2002
-+++ configure	Tue Apr 30 13:58:18 2002
-@@ -6968,6 +6968,7 @@
+--- configure.orig	Mon May 20 17:48:43 2002
++++ configure	Thu May 30 10:42:05 2002
+@@ -6966,6 +6966,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,7 +8,7 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -10825,6 +10826,7 @@
+@@ -10556,6 +10557,7 @@
  *irix*) CDROM_HOST=irix; CDROM_LIBS="-lcdaudio -lmediad -lds";cd_device_path="/dev/cdrom";;
  *linux*) CDROM_HOST=linux;cd_device_path="/dev/cdrom";;
  *netbsd*) CDROM_HOST=netbsd;cd_device_path="/dev/rcd0";;
@@ -16,12 +16,13 @@
  *solaris*) CDROM_HOST=solaris;cd_device_path="/vol/dev/aliases/cdrom0";;
  esac
  case "$host" in
-@@ -10870,6 +10872,17 @@
+@@ -10600,6 +10602,21 @@
+   HAVE_LIBAPM_TRUE='#'
    HAVE_LIBAPM_FALSE=
  fi
- 
++
 +	;;
-+  *-*-freebsd*)
++  i386-*-freebsd*)
 +  	HAVE_LIBAPM=no
 +
 +if test "x$HAVE_LIBAPM" = "xyes"; then
@@ -31,6 +32,9 @@
 +    HAVE_LIBAPM_TRUE='#'
 +    HAVE_LIBAPM_FALSE=
 +fi
++	;;
++  *-*-freebsd*)
++  	build_battstat_applet=no
+ 
  	;;
    *-*-linux*)
- 	echo "$as_me:10875: checking for apm_read in -lapm" >&5
diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist
index 48ada08139fa..43d3d02dc3ab 100644
--- a/x11/gnome-applets/pkg-plist
+++ b/x11/gnome-applets/pkg-plist
@@ -1,4 +1,4 @@
-bin/battstat-applet-2
+%%BATTER%%bin/battstat-applet-2
 bin/cdplayer_applet2
 bin/charpick_applet2
 bin/drivemount_applet2
@@ -11,8 +11,8 @@ bin/mini_commander_applet
 bin/mixer_applet2
 bin/modemlights_applet2
 bin/multiload-applet-2
-etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet/prefs/%gconf.xml
+%%BATTER%%etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet/%gconf.xml
+%%BATTER%%etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet/prefs/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/cdplayer-applet/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/cdplayer-applet/prefs/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/charpick/%gconf.xml
@@ -33,7 +33,7 @@ etc/gconf/gconf.xml.defaults/schemas/apps/modemlights/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/modemlights/prefs/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/multiload/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/multiload/prefs/%gconf.xml
-etc/gconf/schemas/battstat.schemas
+%%BATTERY%%etc/gconf/schemas/battstat.schemas
 etc/gconf/schemas/cdplayer.schemas
 etc/gconf/schemas/charpick.schemas
 etc/gconf/schemas/drivemount.schemas
@@ -44,7 +44,7 @@ etc/gconf/schemas/gweather.schemas
 etc/gconf/schemas/mini-commander.schemas
 etc/gconf/schemas/modemlights.schemas
 etc/gconf/schemas/multiload.schemas
-etc/sound/events/battstat_applet.soundlist
+%%BATTERY%%etc/sound/events/battstat_applet.soundlist
 libdata/bonobo/servers/GNOME_BattstatApplet.server
 libdata/bonobo/servers/GNOME_CDPlayerApplet.server
 libdata/bonobo/servers/GNOME_CharpickerApplet.server
@@ -57,7 +57,7 @@ libdata/bonobo/servers/GNOME_MiniCommanderApplet.server
 libdata/bonobo/servers/GNOME_MixerApplet.server
 libdata/bonobo/servers/GNOME_ModemLightsApplet.server
 libdata/bonobo/servers/GNOME_MultiLoadApplet_Factory.server
-share/gnome/battstat_applet/battstat_applet.glade
+%%BATTERY%%share/gnome/battstat_applet/battstat_applet.glade
 share/gnome/geyes/Bizarre/Bizarre-eye.png
 share/gnome/geyes/Bizarre/Bizarre-pupil.png
 share/gnome/geyes/Bizarre/config
@@ -238,7 +238,7 @@ share/gnome/omf/gnome-applets/geyes-C.omf
 share/gnome/omf/gnome-applets/gtik2_applet2-C.omf
 share/gnome/omf/gnome-applets/gweather-C.omf
 share/gnome/omf/gnome-applets/mixer_applet2-C.omf
-share/gnome/pixmaps/battstat.png
+%%BATTERY%%share/gnome/pixmaps/battstat.png
 share/gnome/pixmaps/charpick.png
 share/gnome/pixmaps/drivemount-applet.png
 share/gnome/pixmaps/gkb-icon.png
@@ -473,7 +473,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/geyes/Bloodshot
 @dirrm share/gnome/geyes/Bizarre
 @dirrm share/gnome/geyes
-@dirrm share/gnome/battstat_applet
+%%BATTERY%%@dirrm share/gnome/battstat_applet
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/multiload/prefs
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/multiload
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/modemlights/prefs
@@ -494,5 +494,5 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/charpick
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/cdplayer-applet/prefs
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/cdplayer-applet
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet/prefs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet
+%%BATTERY%%@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet/prefs
+%%BATTERY%%@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet
diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile
index a1f254d8d71c..3d629bb96f11 100644
--- a/x11/gnomeapplets2/Makefile
+++ b/x11/gnomeapplets2/Makefile
@@ -29,6 +29,14 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} != "i386"
+PLIST_SUB=      BATTERY="@comment "
+.else
+PLIST_SUB=      BATTERY=""
+.endif
+
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
@@ -39,4 +47,4 @@ pre-patch:
 		 s|\$\(prefix\)/lib/bonobo/servers|\$\(prefix\)/libdata/bonobo/servers|g ; \
 		 s|\$\(libdir\)/bonobo/servers|\$\(prefix\)/libdata/bonobo/servers|g'
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11/gnomeapplets2/files/patch-aa b/x11/gnomeapplets2/files/patch-aa
index 9178bd4ee3f8..2ade32e6eba6 100644
--- a/x11/gnomeapplets2/files/patch-aa
+++ b/x11/gnomeapplets2/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Tue Apr 16 19:23:54 2002
-+++ configure	Tue Apr 30 13:58:18 2002
-@@ -6968,6 +6968,7 @@
+--- configure.orig	Mon May 20 17:48:43 2002
++++ configure	Thu May 30 10:42:05 2002
+@@ -6966,6 +6966,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,7 +8,7 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -10825,6 +10826,7 @@
+@@ -10556,6 +10557,7 @@
  *irix*) CDROM_HOST=irix; CDROM_LIBS="-lcdaudio -lmediad -lds";cd_device_path="/dev/cdrom";;
  *linux*) CDROM_HOST=linux;cd_device_path="/dev/cdrom";;
  *netbsd*) CDROM_HOST=netbsd;cd_device_path="/dev/rcd0";;
@@ -16,12 +16,13 @@
  *solaris*) CDROM_HOST=solaris;cd_device_path="/vol/dev/aliases/cdrom0";;
  esac
  case "$host" in
-@@ -10870,6 +10872,17 @@
+@@ -10600,6 +10602,21 @@
+   HAVE_LIBAPM_TRUE='#'
    HAVE_LIBAPM_FALSE=
  fi
- 
++
 +	;;
-+  *-*-freebsd*)
++  i386-*-freebsd*)
 +  	HAVE_LIBAPM=no
 +
 +if test "x$HAVE_LIBAPM" = "xyes"; then
@@ -31,6 +32,9 @@
 +    HAVE_LIBAPM_TRUE='#'
 +    HAVE_LIBAPM_FALSE=
 +fi
++	;;
++  *-*-freebsd*)
++  	build_battstat_applet=no
+ 
  	;;
    *-*-linux*)
- 	echo "$as_me:10875: checking for apm_read in -lapm" >&5
diff --git a/x11/gnomeapplets2/pkg-plist b/x11/gnomeapplets2/pkg-plist
index 48ada08139fa..43d3d02dc3ab 100644
--- a/x11/gnomeapplets2/pkg-plist
+++ b/x11/gnomeapplets2/pkg-plist
@@ -1,4 +1,4 @@
-bin/battstat-applet-2
+%%BATTER%%bin/battstat-applet-2
 bin/cdplayer_applet2
 bin/charpick_applet2
 bin/drivemount_applet2
@@ -11,8 +11,8 @@ bin/mini_commander_applet
 bin/mixer_applet2
 bin/modemlights_applet2
 bin/multiload-applet-2
-etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet/prefs/%gconf.xml
+%%BATTER%%etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet/%gconf.xml
+%%BATTER%%etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet/prefs/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/cdplayer-applet/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/cdplayer-applet/prefs/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/charpick/%gconf.xml
@@ -33,7 +33,7 @@ etc/gconf/gconf.xml.defaults/schemas/apps/modemlights/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/modemlights/prefs/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/multiload/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/multiload/prefs/%gconf.xml
-etc/gconf/schemas/battstat.schemas
+%%BATTERY%%etc/gconf/schemas/battstat.schemas
 etc/gconf/schemas/cdplayer.schemas
 etc/gconf/schemas/charpick.schemas
 etc/gconf/schemas/drivemount.schemas
@@ -44,7 +44,7 @@ etc/gconf/schemas/gweather.schemas
 etc/gconf/schemas/mini-commander.schemas
 etc/gconf/schemas/modemlights.schemas
 etc/gconf/schemas/multiload.schemas
-etc/sound/events/battstat_applet.soundlist
+%%BATTERY%%etc/sound/events/battstat_applet.soundlist
 libdata/bonobo/servers/GNOME_BattstatApplet.server
 libdata/bonobo/servers/GNOME_CDPlayerApplet.server
 libdata/bonobo/servers/GNOME_CharpickerApplet.server
@@ -57,7 +57,7 @@ libdata/bonobo/servers/GNOME_MiniCommanderApplet.server
 libdata/bonobo/servers/GNOME_MixerApplet.server
 libdata/bonobo/servers/GNOME_ModemLightsApplet.server
 libdata/bonobo/servers/GNOME_MultiLoadApplet_Factory.server
-share/gnome/battstat_applet/battstat_applet.glade
+%%BATTERY%%share/gnome/battstat_applet/battstat_applet.glade
 share/gnome/geyes/Bizarre/Bizarre-eye.png
 share/gnome/geyes/Bizarre/Bizarre-pupil.png
 share/gnome/geyes/Bizarre/config
@@ -238,7 +238,7 @@ share/gnome/omf/gnome-applets/geyes-C.omf
 share/gnome/omf/gnome-applets/gtik2_applet2-C.omf
 share/gnome/omf/gnome-applets/gweather-C.omf
 share/gnome/omf/gnome-applets/mixer_applet2-C.omf
-share/gnome/pixmaps/battstat.png
+%%BATTERY%%share/gnome/pixmaps/battstat.png
 share/gnome/pixmaps/charpick.png
 share/gnome/pixmaps/drivemount-applet.png
 share/gnome/pixmaps/gkb-icon.png
@@ -473,7 +473,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/geyes/Bloodshot
 @dirrm share/gnome/geyes/Bizarre
 @dirrm share/gnome/geyes
-@dirrm share/gnome/battstat_applet
+%%BATTERY%%@dirrm share/gnome/battstat_applet
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/multiload/prefs
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/multiload
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/modemlights/prefs
@@ -494,5 +494,5 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/charpick
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/cdplayer-applet/prefs
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/cdplayer-applet
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet/prefs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet
+%%BATTERY%%@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet/prefs
+%%BATTERY%%@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet