Update to 1.4.1.

6 files changed, 32 insertions, 14 deletions

diff --git a/x11/gnomecore/Makefile b/x11/gnomecore/Makefile
index 90cc7037092e..f34ea21be9bb 100644
--- a/x11/gnomecore/Makefile
+++ b/x11/gnomecore/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomecore
-PORTVERSION=	1.4.0.8
-PORTREVISION=	1
+PORTVERSION=	1.4.1
 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 6af146239c40..119e51af275e 100644
--- a/x11/gnomecore/distinfo
+++ b/x11/gnomecore/distinfo
@@ -1 +1 @@
-MD5 (gnome/gnome-core-1.4.0.8.tar.bz2) = 2af1f21c3be07c7c475b8cc51e974156
+MD5 (gnome/gnome-core-1.4.1.tar.bz2) = fea00c24018057a6f04315bea8e4bdab
diff --git a/x11/gnomecore/files/patch-ah b/x11/gnomecore/files/patch-ah
index a5936e41690a..b64f4f45357f 100644
--- a/x11/gnomecore/files/patch-ah
+++ b/x11/gnomecore/files/patch-ah
@@ -38,13 +38,6 @@
  	append_desktop_menu (menu_bar);
  
  	gtk_box_pack_start (GTK_BOX (foo->hbox), menu_bar, FALSE, FALSE, 0);
---- panel/main.c.orig	Fri Jan 12 17:54:08 2001
-+++ panel/main.c	Mon Feb 26 19:55:27 2001
-@@ -153,3 +153,3 @@
- 
--	merge_main_dir = gnome_datadir_file("gnome/apps/");
-+	merge_main_dir = gnome_datadir_file("apps");
- 	merge_main_dir_len = merge_main_dir != NULL ? strlen (merge_main_dir) : 0;
 --- panel/menu.c.orig	Fri Apr 27 15:46:00 2001
 +++ panel/menu.c	Fri May  4 15:11:16 2001
 @@ -147,3 +147,3 @@
diff --git a/x11/gnomecore/files/patch-configure b/x11/gnomecore/files/patch-configure
index fa664525b3ed..e32f5044b0ad 100644
--- a/x11/gnomecore/files/patch-configure
+++ b/x11/gnomecore/files/patch-configure
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- configure.orig	Mon Apr 29 13:36:00 2002
-+++ configure	Mon Apr 29 13:36:41 2002
+--- configure.orig	Mon Jun 10 15:26:35 2002
++++ configure	Mon Jun 10 15:27:34 2002
 @@ -5723,6 +5723,7 @@
  
  # This can be used to rebuild libtool when needed
@@ -15,8 +15,17 @@ $FreeBSD$
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
--LIBS="-lXinerama $PANEL_LIBS $LIBS"
-+LIBS="-lXinerama -lXext $PANEL_LIBS $LIBS"
+-LIBS="-lXinerama $GTK_LIBS $LIBS"
++LIBS="-lXinerama -lXext $GTK_LIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
  #line 9305 "configure"
  #include "confdefs.h"
+@@ -9332,7 +9333,7 @@
+ #define HAVE_LIBXINERAMA 1
+ EOF
+ 
+-		     	XINERAMA_LIBS="-lXinerama"
++		     	XINERAMA_LIBS="-lXinerama -lXext"
+ 		     	XINERAMA_SUPPORT=yes
+ else
+   echo "$ac_t""no" 1>&6
diff --git a/x11/gnomecore/files/patch-panel::main.c b/x11/gnomecore/files/patch-panel::main.c
new file mode 100644
index 000000000000..ed3cda1cc6cb
--- /dev/null
+++ b/x11/gnomecore/files/patch-panel::main.c
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- panel/main.c.orig	Sat Jun  8 01:37:03 2002
++++ panel/main.c	Mon Jun 10 15:23:57 2002
+@@ -386,7 +386,7 @@
+ {
+ 	int len;
+ 
+-	merge_main_dir = gnome_datadir_file("gnome/apps");
++	merge_main_dir = gnome_datadir_file("apps");
+ 	merge_main_dir_len = merge_main_dir != NULL ? strlen (merge_main_dir) : 0;
+ 	merge_merge_dir = conditional_get_string ("/panel/Merge/Directory",
+ 						  "/etc/X11/applnk/",
diff --git a/x11/gnomecore/pkg-plist b/x11/gnomecore/pkg-plist
index 9be8f84e4190..dc0dff962afc 100644
--- a/x11/gnomecore/pkg-plist
+++ b/x11/gnomecore/pkg-plist
@@ -452,7 +452,9 @@ share/gnome/help/lgpl/C/GPL-LEGALNOTICE.html
 share/gnome/help/lgpl/C/lgpl.html
 share/gnome/help/lgpl/C/lgpl.sgml
 share/gnome/help/lgpl/C/ln7.html
+share/gnome/help/lgpl/C/t1.html
 share/gnome/help/lgpl/C/terms.html
+share/gnome/help/lgpl/C/x35.html
 share/gnome/help/mailcheck_applet/C/figures/mailcheck-applet.png
 share/gnome/help/mailcheck_applet/C/figures/mailcheck-properties-mailbox.png
 share/gnome/help/mailcheck_applet/C/figures/mailcheck-properties-mailcheck.png
@@ -1129,6 +1131,7 @@ share/locale/sv/LC_MESSAGES/gnome-core.mo
 share/locale/ta/LC_MESSAGES/gnome-core.mo
 share/locale/tr/LC_MESSAGES/gnome-core.mo
 share/locale/uk/LC_MESSAGES/gnome-core.mo
+share/locale/vi/LC_MESSAGES/gnome-core.mo
 share/locale/wa/LC_MESSAGES/gnome-core.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-core.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-core.mo