Update to 2.0.4.

svn path=/head/; revision=70549
2024-10-22 20:41:26 +00:00 · 2002-11-20 08:49:13 +00:00 · 2002-11-20 08:49:13 +00:00 · 38d5cb7cc9 · 2021-03-31 03:12:20 +00:00
commit 38d5cb7cc9
parent 0af307b14d
10 changed files with 54 additions and 78 deletions
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@ -6,8 +6,7 @@
 #

 PORTNAME=	gnomeapplets2
-PORTVERSION=	2.0.3
-PORTREVISION=	1
+PORTVERSION=	2.0.4
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-applets/2.0
--- a/x11/gnome-applets/distinfo
+++ b/x11/gnome-applets/distinfo
@ -1 +1 @@
-MD5 (gnome2/gnome-applets-2.0.3.tar.bz2) = bb77b796fa7f0c4b714d45198c8c286b
+MD5 (gnome2/gnome-applets-2.0.4.tar.bz2) = a31f48077622bb28c6672b46abbcd7a3
--- a/x11/gnome-applets/files/patch-aa
+++ b/x11/gnome-applets/files/patch-aa
@ -1,6 +1,6 @@
--- configure.orig	Fri Sep 13 15:58:55 2002
-+++ configure	Wed Sep 18 01:18:40 2002
-@@ -6994,6 +6994,7 @@
+--- configure.orig	Mon Nov 18 18:04:37 2002
+++ configure	Wed Nov 20 02:25:38 2002
+@@ -5683,6 +5683,7 @@
 
 # This can be used to rebuild libtool when needed
 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@ -8,16 +8,7 @@
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -10518,7 +10519,7 @@
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- CATOBJEXT=.mo
-	         DATADIRNAME=lib
-+	         DATADIRNAME=share
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	      INSTOBJEXT=.mo
-@@ -10765,6 +10766,7 @@
+@@ -8771,6 +8772,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";;
@ -25,7 +16,7 @@
 *solaris*) CDROM_HOST=solaris;cd_device_path="/vol/dev/aliases/cdrom0";cdplayer_type_sun=true;;
 esac
 case "$host" in
-@@ -10817,6 +10819,20 @@
+@@ -8831,6 +8833,20 @@
   HAVE_LIBAPM_TRUE='#'
   HAVE_LIBAPM_FALSE=
 fi
@ -34,7 +25,7 @@
 +  	HAVE_LIBAPM=no
 +
 +if test "x$HAVE_LIBAPM" = "xyes"; then
-+	HAVE_LIBAPM_TRUE=
+    	HAVE_LIBAPM_TRUE=
 +	HAVE_LIBAPM_FALSE='#'
 +else
 +    	HAVE_LIBAPM_TRUE='#'
@ -43,22 +34,23 @@
 +	;;
 +  *-*-freebsd*)
 +  	build_battstat_applet=no
- 
+ 	
 	;;
   *-*-linux*)
-@@ -11494,13 +11510,13 @@
+@@ -9420,14 +9436,14 @@
 ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
 
- cat >>confdefs.h <<EOF
+ cat >> confdefs.h <<EOF
 -#define GNOME_ICONDIR "${prefix}/share/pixmaps"
 +#define GNOME_ICONDIR "${datadir}/pixmaps"
 EOF
 
- #defined the below to enable help to work for applets
 
- cat >>confdefs.h <<EOF
+ #defined the below to enable help to work for applets 
+ 
+ cat >> confdefs.h <<EOF
 -#define DATADIR "${prefix}/share"
 +#define DATADIR "${datadir}"
 EOF
 
- cat >>confdefs.h <<EOF
+ cat >> confdefs.h <<EOF
--- a/x11/gnome-applets/files/patch-battstat_Makefile.in
+++ b/x11/gnome-applets/files/patch-battstat_Makefile.in
@ -1,26 +1,26 @@
--- battstat/Makefile.in.orig	Tue Apr 30 14:48:53 2002
-+++ battstat/Makefile.in	Tue Apr 30 15:00:42 2002
-@@ -138,11 +138,11 @@
+--- battstat/Makefile.in.orig	Wed Nov 20 02:26:09 2002
+++ battstat/Makefile.in	Wed Nov 20 02:28:24 2002
+@@ -144,11 +144,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_FALSE@APMLIB = 
 @HAVE_LIBAPM_TRUE@APMDIR = 
 -@HAVE_LIBAPM_FALSE@APMDIR = apmlib
-+@HAVE_LIBAPM_FALSE@APMDIR =
+@HAVE_LIBAPM_FALSE@APMDIR = 
 @HAVE_LIBAPM_TRUE@APMINC = 
 -@HAVE_LIBAPM_FALSE@APMINC = -Iapmlib/
-+@HAVE_LIBAPM_FALSE@APMINC =
+@HAVE_LIBAPM_FALSE@APMINC = 
 
- SUBDIRS = sounds $(APMDIR)
+ SUBDIRS = docs sounds $(APMDIR)
 
-@@ -187,7 +187,7 @@
- X_PRE_LIBS = @X_PRE_LIBS@
+@@ -194,7 +194,7 @@
 battstat_applet_2_OBJECTS =  properties.$(OBJEXT) \
 battstat_applet.$(OBJEXT) acpi-linux.$(OBJEXT)
+ @HAVE_LIBAPM_TRUE@battstat_applet_2_DEPENDENCIES = 
 -@HAVE_LIBAPM_FALSE@battstat_applet_2_DEPENDENCIES =  apmlib/libapm.a
 +@HAVE_LIBAPM_FALSE@battstat_applet_2_DEPENDENCIES =
- @HAVE_LIBAPM_TRUE@battstat_applet_2_DEPENDENCIES = 
 battstat_applet_2_LDFLAGS = 
 CFLAGS = @CFLAGS@
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--- a/x11/gnome-applets/pkg-plist
+++ b/x11/gnome-applets/pkg-plist
@ -338,15 +338,10 @@ share/gnome/pixmaps/gweather/tstorm.xpm
 share/gnome/pixmaps/mini-commander/browser-mini.xpm
 share/gnome/pixmaps/mini-commander/history-mini.xpm
 share/gnome/pixmaps/mixer/gnome-mixer-applet.png
-share/gnome/pixmaps/mixer/volume-max-small.png
 share/gnome/pixmaps/mixer/volume-max.png
-share/gnome/pixmaps/mixer/volume-medium-small.png
 share/gnome/pixmaps/mixer/volume-medium.png
-share/gnome/pixmaps/mixer/volume-min-small.png
 share/gnome/pixmaps/mixer/volume-min.png
-share/gnome/pixmaps/mixer/volume-mute-small.png
 share/gnome/pixmaps/mixer/volume-mute.png
-share/gnome/pixmaps/mixer/volume-zero-small.png
 share/gnome/pixmaps/mixer/volume-zero.png
 share/gnome/xmodmap/xmodmap.am
 share/gnome/xmodmap/xmodmap.be
@ -422,8 +417,10 @@ share/gnome/xmodmap/xmodmap.us-sun
 share/gnome/xmodmap/xmodmap.us.old
 share/gnome/xmodmap/xmodmap.us_intl
 share/gnome/xmodmap/xmodmap.yu
+share/locale/am/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/be/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/bg/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ca/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/cs/LC_MESSAGES/gnome-applets-2.0.mo
--- a/x11/gnomeapplets2/Makefile
+++ b/x11/gnomeapplets2/Makefile
@ -6,8 +6,7 @@
 #

 PORTNAME=	gnomeapplets2
-PORTVERSION=	2.0.3
-PORTREVISION=	1
+PORTVERSION=	2.0.4
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-applets/2.0
--- a/x11/gnomeapplets2/distinfo
+++ b/x11/gnomeapplets2/distinfo
@ -1 +1 @@
-MD5 (gnome2/gnome-applets-2.0.3.tar.bz2) = bb77b796fa7f0c4b714d45198c8c286b
+MD5 (gnome2/gnome-applets-2.0.4.tar.bz2) = a31f48077622bb28c6672b46abbcd7a3
--- a/x11/gnomeapplets2/files/patch-aa
+++ b/x11/gnomeapplets2/files/patch-aa
@ -1,6 +1,6 @@
--- configure.orig	Fri Sep 13 15:58:55 2002
-+++ configure	Wed Sep 18 01:18:40 2002
-@@ -6994,6 +6994,7 @@
+--- configure.orig	Mon Nov 18 18:04:37 2002
+++ configure	Wed Nov 20 02:25:38 2002
+@@ -5683,6 +5683,7 @@
 
 # This can be used to rebuild libtool when needed
 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@ -8,16 +8,7 @@
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -10518,7 +10519,7 @@
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- CATOBJEXT=.mo
-	         DATADIRNAME=lib
-+	         DATADIRNAME=share
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	      INSTOBJEXT=.mo
-@@ -10765,6 +10766,7 @@
+@@ -8771,6 +8772,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";;
@ -25,7 +16,7 @@
 *solaris*) CDROM_HOST=solaris;cd_device_path="/vol/dev/aliases/cdrom0";cdplayer_type_sun=true;;
 esac
 case "$host" in
-@@ -10817,6 +10819,20 @@
+@@ -8831,6 +8833,20 @@
   HAVE_LIBAPM_TRUE='#'
   HAVE_LIBAPM_FALSE=
 fi
@ -34,7 +25,7 @@
 +  	HAVE_LIBAPM=no
 +
 +if test "x$HAVE_LIBAPM" = "xyes"; then
-+	HAVE_LIBAPM_TRUE=
+    	HAVE_LIBAPM_TRUE=
 +	HAVE_LIBAPM_FALSE='#'
 +else
 +    	HAVE_LIBAPM_TRUE='#'
@ -43,22 +34,23 @@
 +	;;
 +  *-*-freebsd*)
 +  	build_battstat_applet=no
- 
+ 	
 	;;
   *-*-linux*)
-@@ -11494,13 +11510,13 @@
+@@ -9420,14 +9436,14 @@
 ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
 
- cat >>confdefs.h <<EOF
+ cat >> confdefs.h <<EOF
 -#define GNOME_ICONDIR "${prefix}/share/pixmaps"
 +#define GNOME_ICONDIR "${datadir}/pixmaps"
 EOF
 
- #defined the below to enable help to work for applets
 
- cat >>confdefs.h <<EOF
+ #defined the below to enable help to work for applets 
+ 
+ cat >> confdefs.h <<EOF
 -#define DATADIR "${prefix}/share"
 +#define DATADIR "${datadir}"
 EOF
 
- cat >>confdefs.h <<EOF
+ cat >> confdefs.h <<EOF
--- a/x11/gnomeapplets2/files/patch-battstat_Makefile.in
+++ b/x11/gnomeapplets2/files/patch-battstat_Makefile.in
@ -1,26 +1,26 @@
--- battstat/Makefile.in.orig	Tue Apr 30 14:48:53 2002
-+++ battstat/Makefile.in	Tue Apr 30 15:00:42 2002
-@@ -138,11 +138,11 @@
+--- battstat/Makefile.in.orig	Wed Nov 20 02:26:09 2002
+++ battstat/Makefile.in	Wed Nov 20 02:28:24 2002
+@@ -144,11 +144,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_FALSE@APMLIB = 
 @HAVE_LIBAPM_TRUE@APMDIR = 
 -@HAVE_LIBAPM_FALSE@APMDIR = apmlib
-+@HAVE_LIBAPM_FALSE@APMDIR =
+@HAVE_LIBAPM_FALSE@APMDIR = 
 @HAVE_LIBAPM_TRUE@APMINC = 
 -@HAVE_LIBAPM_FALSE@APMINC = -Iapmlib/
-+@HAVE_LIBAPM_FALSE@APMINC =
+@HAVE_LIBAPM_FALSE@APMINC = 
 
- SUBDIRS = sounds $(APMDIR)
+ SUBDIRS = docs sounds $(APMDIR)
 
-@@ -187,7 +187,7 @@
- X_PRE_LIBS = @X_PRE_LIBS@
+@@ -194,7 +194,7 @@
 battstat_applet_2_OBJECTS =  properties.$(OBJEXT) \
 battstat_applet.$(OBJEXT) acpi-linux.$(OBJEXT)
+ @HAVE_LIBAPM_TRUE@battstat_applet_2_DEPENDENCIES = 
 -@HAVE_LIBAPM_FALSE@battstat_applet_2_DEPENDENCIES =  apmlib/libapm.a
 +@HAVE_LIBAPM_FALSE@battstat_applet_2_DEPENDENCIES =
- @HAVE_LIBAPM_TRUE@battstat_applet_2_DEPENDENCIES = 
 battstat_applet_2_LDFLAGS = 
 CFLAGS = @CFLAGS@
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--- a/x11/gnomeapplets2/pkg-plist
+++ b/x11/gnomeapplets2/pkg-plist
@ -338,15 +338,10 @@ share/gnome/pixmaps/gweather/tstorm.xpm
 share/gnome/pixmaps/mini-commander/browser-mini.xpm
 share/gnome/pixmaps/mini-commander/history-mini.xpm
 share/gnome/pixmaps/mixer/gnome-mixer-applet.png
-share/gnome/pixmaps/mixer/volume-max-small.png
 share/gnome/pixmaps/mixer/volume-max.png
-share/gnome/pixmaps/mixer/volume-medium-small.png
 share/gnome/pixmaps/mixer/volume-medium.png
-share/gnome/pixmaps/mixer/volume-min-small.png
 share/gnome/pixmaps/mixer/volume-min.png
-share/gnome/pixmaps/mixer/volume-mute-small.png
 share/gnome/pixmaps/mixer/volume-mute.png
-share/gnome/pixmaps/mixer/volume-zero-small.png
 share/gnome/pixmaps/mixer/volume-zero.png
 share/gnome/xmodmap/xmodmap.am
 share/gnome/xmodmap/xmodmap.be
@ -422,8 +417,10 @@ share/gnome/xmodmap/xmodmap.us-sun
 share/gnome/xmodmap/xmodmap.us.old
 share/gnome/xmodmap/xmodmap.us_intl
 share/gnome/xmodmap/xmodmap.yu
+share/locale/am/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/be/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/bg/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ca/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/cs/LC_MESSAGES/gnome-applets-2.0.mo