Update to 1.2.2

5 files changed, 26 insertions, 32 deletions

diff --git a/x11/gnomecore/Makefile b/x11/gnomecore/Makefile
index 7d98a2c..182a851 100644
--- a/x11/gnomecore/Makefile
+++ b/x11/gnomecore/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomecore
-PORTVERSION= 	1.2.1
+PORTVERSION= 	1.2.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gnome-core
diff --git a/x11/gnomecore/distinfo b/x11/gnomecore/distinfo
index 963df90..0338062 100644
--- a/x11/gnomecore/distinfo
+++ b/x11/gnomecore/distinfo
@@ -1 +1 @@
-MD5 (gnome-core-1.2.1.tar.gz) = d8ac9408991bad4f2177c9a426b3c33b
+MD5 (gnome-core-1.2.2.tar.gz) = 950f75caf1af45bd76446cb1ae465793
diff --git a/x11/gnomecore/files/patch-aa b/x11/gnomecore/files/patch-aa
index 843f8a3..ae893fa 100644
--- a/x11/gnomecore/files/patch-aa
+++ b/x11/gnomecore/files/patch-aa
@@ -1,21 +1,13 @@
---- configure.orig	Wed Aug  2 00:21:00 2000
-+++ configure	Wed Aug  2 00:22:18 2000
-@@ -6074,9 +6074,9 @@
- LIBS="$oLIBS"
- 
- oLIBS="$LIBS"
+--- configure.orig	Wed Sep 20 00:25:30 2000
++++ configure	Mon Sep 25 14:24:15 2000
+@@ -6095,4 +6095,4 @@
+ BZ_LIBS=""
 -echo $ac_n "checking for bzopen in -lbz2""... $ac_c" 1>&6
--echo "configure:6079: checking for bzopen in -lbz2" >&5
--ac_lib_var=`echo bz2'_'bzopen | sed 'y%./+-%__p_%'`
+-echo "configure:6098: checking for bzopen in -lbz2" >&5
 +echo $ac_n "checking for BZ2_bzopen in -lbz2""... $ac_c" 1>&6
-+echo "configure:6079: checking for BZ2_bzopen in -lbz2" >&5
-+ac_lib_var=`echo bz'_'bzopen | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -6088,10 +6088,10 @@
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
++echo "configure:6098: checking for BZ2_bzopen in -lbz2" >&5
+ ac_lib_var=`echo bz2'_'bzopen | sed 'y%./+-%__p_%'`
+@@ -6109,6 +6109,6 @@
      builtin and then its argument prototype would still apply.  */
 -char bzopen();
 +char BZ2_bzopen();
@@ -24,8 +16,6 @@
 -bzopen()
 +BZ2_bzopen()
  ; return 0; }
- EOF
- if { (eval echo configure:6098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 --- app-docs.make.orig	Thu Apr 20 02:25:57 2000
 +++ app-docs.make	Fri May 26 16:31:01 2000
 @@ -1,4 +1,4 @@
diff --git a/x11/gnomecore/files/patch-ah b/x11/gnomecore/files/patch-ah
index 30c07e7..096778d 100644
--- a/x11/gnomecore/files/patch-ah
+++ b/x11/gnomecore/files/patch-ah
@@ -27,14 +27,14 @@
  confexec_DATA = appletsConf.sh dockletsConf.sh
  
  panelgnorbadir = $(sysconfdir)/CORBA/servers
---- panel/foobar-widget.c.orig	Sat May  6 20:48:27 2000
-+++ panel/foobar-widget.c	Wed May 31 12:51:56 2000
-@@ -557,7 +557,7 @@
- 
- 	append_folder_menu  (menu_bar, _("Favorites"), NULL, FALSE, "apps/.");
- 	append_folder_menu  (menu_bar, _("Settings"),  NULL, TRUE,
--			     "gnome/apps/Settings/.");
-+			     "apps/Settings/.");
+--- panel/foobar-widget.c.orig	Wed Sep 20 00:03:43 2000
++++ panel/foobar-widget.c	Mon Sep 25 14:26:18 2000
+@@ -602,7 +602,7 @@
+ 				   FALSE, "apps");
+ 	foo->settings =
+ 		append_folder_menu(menu_bar, _("Settings"),  NULL, TRUE,
+-			           "gnome/apps/Settings");
++			           "apps/Settings");
  	append_desktop_menu (menu_bar);
  
  	gtk_box_pack_start (GTK_BOX (foo->hbox), menu_bar, FALSE, FALSE, 0);
@@ -69,12 +69,12 @@
  
  	submenuitem = gtk_menu_item_new ();
  	gtk_widget_lock_accelerators (menuitem);
---- panel/menu-properties.c.orig	Mon Apr  3 18:03:29 2000
-+++ panel/menu-properties.c	Wed May 31 12:50:41 2000
+--- panel/menu-properties.c.orig	Sat Sep  9 19:52:26 2000
++++ panel/menu-properties.c	Mon Sep 25 14:28:44 2000
 @@ -40,7 +40,7 @@
  		arguments = ".";
  
- 	if(strcmp(arguments,".")==0)
+ 	if(strcmp(arguments, ".") == 0)
 -		this_menu = gnome_unconditional_datadir_file ("gnome/apps");
 +		this_menu = gnome_unconditional_datadir_file ("apps");
  	else if (*arguments == '/')
diff --git a/x11/gnomecore/pkg-plist b/x11/gnomecore/pkg-plist
index a101326..da08758 100644
--- a/x11/gnomecore/pkg-plist
+++ b/x11/gnomecore/pkg-plist
@@ -202,7 +202,7 @@ share/gnome/help/gnome-terminal/C/docbook.css
 share/gnome/help/gnome-terminal/C/environment.html
 share/gnome/help/gnome-terminal/C/index.html
 share/gnome/help/gnome-terminal/C/license.html
-share/gnome/help/gnome-terminal/C/ln11.html
+share/gnome/help/gnome-terminal/C/ln7.html
 share/gnome/help/gnome-terminal/C/menus.html
 share/gnome/help/gnome-terminal/C/options.html
 share/gnome/help/gnome-terminal/C/pointerusage.html
@@ -705,6 +705,7 @@ share/gnome/pixmaps/gnome-xterm.png
 share/gnome/pixmaps/gtkvim.png
 share/gnome/pixmaps/kterm.xpm
 share/gnome/pixmaps/launcher-program.png
+share/gnome/pixmaps/mailcheck/eclouds.png
 share/gnome/pixmaps/mailcheck/email-e.png
 share/gnome/pixmaps/mailcheck/email-eclouds.png
 share/gnome/pixmaps/mailcheck/email-tiny.png
@@ -768,6 +769,9 @@ share/locale/pt/LC_MESSAGES/gnome-core.mo
 share/locale/pt_BR/LC_MESSAGES/gnome-core.mo
 share/locale/ru/LC_MESSAGES/gnome-core.mo
 share/locale/sk/LC_MESSAGES/gnome-core.mo
+share/locale/sl/LC_MESSAGES/gnome-core.mo
+share/locale/sp/LC_MESSAGES/gnome-core.mo
+share/locale/sr/LC_MESSAGES/gnome-core.mo
 share/locale/sv/LC_MESSAGES/gnome-core.mo
 share/locale/tr/LC_MESSAGES/gnome-core.mo
 share/locale/uk/LC_MESSAGES/gnome-core.mo