Update to 2.1.90.

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

10 files changed, 48 insertions, 64 deletions

diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 8826242b0..18192d645 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomepanel
-PORTVERSION=	2.1.5
+PORTVERSION=	2.1.90
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-panel/2.1
@@ -37,5 +37,7 @@ MAN1=	gnome-panel.1 gnome-panel-preferences.1
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|[(]libdir[)]/locale|(prefix)/share/locale|g' \
+		${WRKSRC}/po/Makefile.in.in
 
 .include <bsd.port.mk>
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index 0f3bcf84d..13f383bc7 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-panel-2.1.5.tar.bz2) = 008b591f00da45f422ce001f28a60fb0
+MD5 (gnome2/gnome-panel-2.1.90.tar.bz2) = ff91c86e524745e01c820a7b669cc3ef
diff --git a/x11/gnome-panel/files/patch-config.h.in b/x11/gnome-panel/files/patch-config.h.in
index 9f8390dbe..8a59166a5 100644
--- a/x11/gnome-panel/files/patch-config.h.in
+++ b/x11/gnome-panel/files/patch-config.h.in
@@ -1,14 +1,11 @@
-
-$FreeBSD: ports/x11/gnomepanel/files/patch-config.h.in,v 1.1 2002/05/14 14:32:33 sobomax Exp $
-
---- config.h.in	2002/05/14 14:15:00	1.1
-+++ config.h.in	2002/05/14 14:15:35
-@@ -148,6 +148,8 @@
- /* Define if you have the `strdup' function. */
- #undef HAVE_STRDUP
+--- config.h.in.orig	Thu Jan  2 19:50:41 2003
++++ config.h.in	Mon Jan  6 13:11:12 2003
+@@ -96,6 +96,8 @@
+ /* Define to 1 if you have the <stdlib.h> header file. */
+ #undef HAVE_STDLIB_H
  
 +#undef HAVE_LANGINFO_H
 +
- /* Define if you have the <strings.h> header file. */
+ /* Define to 1 if you have the <strings.h> header file. */
  #undef HAVE_STRINGS_H
  
diff --git a/x11/gnome-panel/files/patch-configure b/x11/gnome-panel/files/patch-configure
index e1d0567b7..a94d4761c 100644
--- a/x11/gnome-panel/files/patch-configure
+++ b/x11/gnome-panel/files/patch-configure
@@ -1,22 +1,19 @@
-
-$FreeBSD: ports/x11/gnomepanel/files/patch-configure,v 1.2 2002/05/14 14:32:33 sobomax Exp $
-
---- configure.orig	Tue May 14 17:16:32 2002
-+++ configure	Tue May 14 17:17:03 2002
-@@ -7232,6 +7232,7 @@
+--- configure.orig	Mon Jan  6 01:04:20 2003
++++ configure	Mon Jan  6 13:12:56 2003
+@@ -4254,7 +4254,7 @@
  
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9288,7 +9289,7 @@
- # On IRIX 5.3, sys/types and inttypes.h are conflicting.
  
  for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 -                  inttypes.h stdint.h unistd.h
 +                  inttypes.h stdint.h unistd.h langinfo.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- echo "$as_me:9294: checking for $ac_header" >&5
+ echo "$as_me:$LINENO: checking for $ac_header" >&5
+@@ -7878,6 +7878,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist
index ef836c15a..dfddabe1a 100644
--- a/x11/gnome-panel/pkg-plist
+++ b/x11/gnome-panel/pkg-plist
@@ -94,21 +94,15 @@ share/gnome/help/clock/C/clock.xml
 share/gnome/help/clock/C/figures/clock_applet.png
 share/gnome/help/clock/C/legal.xml
 share/gnome/help/fish-applet-2/C/figures/fish_applet.png
-share/gnome/help/fish-applet-2/C/figures/fish_settings.png
 share/gnome/help/fish-applet-2/C/fish-applet-2.xml
 share/gnome/help/fish-applet-2/C/legal.xml
-share/gnome/help/mailcheck/C/figures/mailcheck-applet.png
-share/gnome/help/mailcheck/C/figures/mailcheck-properties-mailbox.png
-share/gnome/help/mailcheck/C/figures/mailcheck-properties-mailcheck.png
 share/gnome/help/mailcheck/C/figures/mailcheck_applet.png
 share/gnome/help/mailcheck/C/legal.xml
 share/gnome/help/mailcheck/C/mailcheck.xml
 share/gnome/help/window-list/C/figures/window_list_applet.png
-share/gnome/help/window-list/C/figures/window_list_group.png
 share/gnome/help/window-list/C/figures/window_list_group_applet.png
 share/gnome/help/window-list/C/legal.xml
 share/gnome/help/window-list/C/window-list.xml
-share/gnome/help/workspace-switcher/C/figures/workspacelist_applet.png
 share/gnome/help/workspace-switcher/C/figures/workspace_switcher_applet.png
 share/gnome/help/workspace-switcher/C/legal.xml
 share/gnome/help/workspace-switcher/C/workspace-switcher.xml
@@ -132,6 +126,7 @@ share/gnome/pixmaps/mailcheck/email-tiny.png
 share/gnome/pixmaps/mailcheck/email.png
 share/gnome/pixmaps/mailcheck/tux-anim.png
 share/gnome/pixmaps/gnome-show-desktop.png
+share/locale/am/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/be/LC_MESSAGES/gnome-panel-2.0.mo
@@ -149,6 +144,7 @@ share/locale/fi/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/fr/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ga/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/gl/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/he/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/hu/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/it/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-panel-2.0.mo
diff --git a/x11/gnomepanel/Makefile b/x11/gnomepanel/Makefile
index 8826242b0..18192d645 100644
--- a/x11/gnomepanel/Makefile
+++ b/x11/gnomepanel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomepanel
-PORTVERSION=	2.1.5
+PORTVERSION=	2.1.90
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-panel/2.1
@@ -37,5 +37,7 @@ MAN1=	gnome-panel.1 gnome-panel-preferences.1
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|[(]libdir[)]/locale|(prefix)/share/locale|g' \
+		${WRKSRC}/po/Makefile.in.in
 
 .include <bsd.port.mk>
diff --git a/x11/gnomepanel/distinfo b/x11/gnomepanel/distinfo
index 0f3bcf84d..13f383bc7 100644
--- a/x11/gnomepanel/distinfo
+++ b/x11/gnomepanel/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-panel-2.1.5.tar.bz2) = 008b591f00da45f422ce001f28a60fb0
+MD5 (gnome2/gnome-panel-2.1.90.tar.bz2) = ff91c86e524745e01c820a7b669cc3ef
diff --git a/x11/gnomepanel/files/patch-config.h.in b/x11/gnomepanel/files/patch-config.h.in
index 9f8390dbe..8a59166a5 100644
--- a/x11/gnomepanel/files/patch-config.h.in
+++ b/x11/gnomepanel/files/patch-config.h.in
@@ -1,14 +1,11 @@
-
-$FreeBSD: ports/x11/gnomepanel/files/patch-config.h.in,v 1.1 2002/05/14 14:32:33 sobomax Exp $
-
---- config.h.in	2002/05/14 14:15:00	1.1
-+++ config.h.in	2002/05/14 14:15:35
-@@ -148,6 +148,8 @@
- /* Define if you have the `strdup' function. */
- #undef HAVE_STRDUP
+--- config.h.in.orig	Thu Jan  2 19:50:41 2003
++++ config.h.in	Mon Jan  6 13:11:12 2003
+@@ -96,6 +96,8 @@
+ /* Define to 1 if you have the <stdlib.h> header file. */
+ #undef HAVE_STDLIB_H
  
 +#undef HAVE_LANGINFO_H
 +
- /* Define if you have the <strings.h> header file. */
+ /* Define to 1 if you have the <strings.h> header file. */
  #undef HAVE_STRINGS_H
  
diff --git a/x11/gnomepanel/files/patch-configure b/x11/gnomepanel/files/patch-configure
index e1d0567b7..a94d4761c 100644
--- a/x11/gnomepanel/files/patch-configure
+++ b/x11/gnomepanel/files/patch-configure
@@ -1,22 +1,19 @@
-
-$FreeBSD: ports/x11/gnomepanel/files/patch-configure,v 1.2 2002/05/14 14:32:33 sobomax Exp $
-
---- configure.orig	Tue May 14 17:16:32 2002
-+++ configure	Tue May 14 17:17:03 2002
-@@ -7232,6 +7232,7 @@
+--- configure.orig	Mon Jan  6 01:04:20 2003
++++ configure	Mon Jan  6 13:12:56 2003
+@@ -4254,7 +4254,7 @@
  
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9288,7 +9289,7 @@
- # On IRIX 5.3, sys/types and inttypes.h are conflicting.
  
  for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 -                  inttypes.h stdint.h unistd.h
 +                  inttypes.h stdint.h unistd.h langinfo.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- echo "$as_me:9294: checking for $ac_header" >&5
+ echo "$as_me:$LINENO: checking for $ac_header" >&5
+@@ -7878,6 +7878,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/x11/gnomepanel/pkg-plist b/x11/gnomepanel/pkg-plist
index ef836c15a..dfddabe1a 100644
--- a/x11/gnomepanel/pkg-plist
+++ b/x11/gnomepanel/pkg-plist
@@ -94,21 +94,15 @@ share/gnome/help/clock/C/clock.xml
 share/gnome/help/clock/C/figures/clock_applet.png
 share/gnome/help/clock/C/legal.xml
 share/gnome/help/fish-applet-2/C/figures/fish_applet.png
-share/gnome/help/fish-applet-2/C/figures/fish_settings.png
 share/gnome/help/fish-applet-2/C/fish-applet-2.xml
 share/gnome/help/fish-applet-2/C/legal.xml
-share/gnome/help/mailcheck/C/figures/mailcheck-applet.png
-share/gnome/help/mailcheck/C/figures/mailcheck-properties-mailbox.png
-share/gnome/help/mailcheck/C/figures/mailcheck-properties-mailcheck.png
 share/gnome/help/mailcheck/C/figures/mailcheck_applet.png
 share/gnome/help/mailcheck/C/legal.xml
 share/gnome/help/mailcheck/C/mailcheck.xml
 share/gnome/help/window-list/C/figures/window_list_applet.png
-share/gnome/help/window-list/C/figures/window_list_group.png
 share/gnome/help/window-list/C/figures/window_list_group_applet.png
 share/gnome/help/window-list/C/legal.xml
 share/gnome/help/window-list/C/window-list.xml
-share/gnome/help/workspace-switcher/C/figures/workspacelist_applet.png
 share/gnome/help/workspace-switcher/C/figures/workspace_switcher_applet.png
 share/gnome/help/workspace-switcher/C/legal.xml
 share/gnome/help/workspace-switcher/C/workspace-switcher.xml
@@ -132,6 +126,7 @@ share/gnome/pixmaps/mailcheck/email-tiny.png
 share/gnome/pixmaps/mailcheck/email.png
 share/gnome/pixmaps/mailcheck/tux-anim.png
 share/gnome/pixmaps/gnome-show-desktop.png
+share/locale/am/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/be/LC_MESSAGES/gnome-panel-2.0.mo
@@ -149,6 +144,7 @@ share/locale/fi/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/fr/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ga/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/gl/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/he/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/hu/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/it/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-panel-2.0.mo