Gnome Core files.

PR:		ports/7656
Submitted by:	Nakai@technologist.com

8 files changed, 777 insertions, 0 deletions

diff --git a/x11/gnomecore/Makefile b/x11/gnomecore/Makefile
new file mode 100644
index 000000000000..5e4030523b66
--- /dev/null
+++ b/x11/gnomecore/Makefile
@@ -0,0 +1,32 @@
+# New ports collection makefile for:   gnomecore
+# Version required:    0.28.1
+# Date created:        17 March 1998
+# Whom:                Yukihiro Nakai <Nakai@technologist.com>
+#
+# $Id$
+#
+
+DISTNAME=	gnome-core-0.28.1
+PKGNAME=	gnomecore-0.28.1
+CATEGORIES=	x11
+MASTER_SITES=	ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/ \
+		ftp://ftp.gnome.org/pub/GNOME/sources/
+
+MAINTAINER=	Nakai@technologist.com
+
+BUILD_DEPENDS=	${LOCALBASE}/bin/orbit-config:${PORTSDIR}/devel/ORBit
+LIB_DEPENDS=	gnome\\.0:${PORTSDIR}/x11/gnomelibs
+
+USE_X_PREFIX=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=	--localstatedir=${PREFIX}/share/gnome \
+		--datadir=${PREFIX}/share/gnome \
+		--with-gnome=${X11BASE}
+CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include -I../intl \
+		-I../../intl" CXXFLAGS="${CFLAGS}" \
+		LIBS="-L${LOCALBASE}/lib -lxpg4"
+
+post-install:
+	${LDCONFIG} -m ${PREFIX}/lib
+
+.include <bsd.port.mk>
diff --git a/x11/gnomecore/distinfo b/x11/gnomecore/distinfo
new file mode 100644
index 000000000000..9fc4094cdb7d
--- /dev/null
+++ b/x11/gnomecore/distinfo
@@ -0,0 +1 @@
+MD5 (gnome-core-0.28.1.tar.gz) = 094aeeb2e21219246eb44e81c9086232
diff --git a/x11/gnomecore/files/patch-aa b/x11/gnomecore/files/patch-aa
new file mode 100644
index 000000000000..669f6f6c49d7
--- /dev/null
+++ b/x11/gnomecore/files/patch-aa
@@ -0,0 +1,99 @@
+--- configure.orig	Wed Aug 19 18:31:34 1998
++++ configure	Tue Sep  1 11:57:41 1998
+@@ -935,12 +935,12 @@
+ 
+ 
+ 	if test "$no_gnome_config" = "yes"; then
+-          echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6
+-echo "configure:940: checking for gnomeConf.sh file in $gnome_prefix" >&5
+-	  if test -f $gnome_prefix/gnomeConf.sh; then
++          echo $ac_n "checking for gnomeConf.sh file in $prefix/share/gnome""... $ac_c" 1>&6
++echo "configure:940: checking for gnomeConf.sh file in $prefix/share/gnome" >&5
++	  if test -f $prefix/share/gnome/gnomeConf.sh; then
+ 	    echo "$ac_t""found" 1>&6
+-	    echo "loading gnome configuration from $gnome_prefix/gnomeConf.sh"
+-	    . $gnome_prefix/gnomeConf.sh
++	    echo "loading gnome configuration from $prefix/share/gnome/gnomeConf.sh"
++	    . $prefix/share/gnome/gnomeConf.sh
+ 	    
+ 	  else
+ 	    echo "$ac_t""not found" 1>&6
+@@ -2243,18 +2243,18 @@
+   if test x$gtk_config_exec_prefix != x ; then
+      gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
+      if test x${GTK_CONFIG+set} != xset ; then
+-        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
++        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk11-config
+      fi
+   fi
+   if test x$gtk_config_prefix != x ; then
+      gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
+      if test x${GTK_CONFIG+set} != xset ; then
+-        GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
++        GTK_CONFIG=$gtk_config_prefix/bin/gtk11-config
+      fi
+   fi
+ 
+-  # Extract the first word of "gtk-config", so it can be a program name with args.
+-set dummy gtk-config; ac_word=$2
++  # Extract the first word of "gtk11-config", so it can be a program name with args.
++set dummy gtk11-config; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+ echo "configure:2260: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
+@@ -2336,16 +2336,16 @@
+       (gtk_minor_version != $gtk_config_minor_version) ||
+       (gtk_micro_version != $gtk_config_micro_version))
+     {
+-      printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
++      printf("\n*** 'gtk11-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
+              $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
+              gtk_major_version, gtk_minor_version, gtk_micro_version);
+-      printf ("*** was found! If gtk-config was correct, then it is best\n");
++      printf ("*** was found! If gtk11-config was correct, then it is best\n");
+       printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
+       printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+       printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+       printf("*** required on your system.\n");
+-      printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
+-      printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
++      printf("*** If gtk11-config was wrong, set the environment variable GTK_CONFIG\n");
++      printf("*** to point to the correct copy of gtk11-config, and remove the file config.cache\n");
+       printf("*** before re-running configure\n");
+     } 
+   else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
+@@ -2374,10 +2374,10 @@
+         printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
+         printf("***\n");
+         printf("*** If you have already installed a sufficiently new version, this error\n");
+-        printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
++        printf("*** probably means that the wrong copy of the gtk11-config shell script is\n");
+         printf("*** being found. The easiest way to fix this is to remove the old version\n");
+         printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
+-        printf("*** correct copy of gtk-config. (In this case, you will have to\n");
++        printf("*** correct copy of gtk11-config. (In this case, you will have to\n");
+         printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+         printf("*** so that the correct libraries are found at run-time))\n");
+       }
+@@ -2408,10 +2408,10 @@
+   else
+      echo "$ac_t""no" 1>&6
+      if test "$GTK_CONFIG" = "no" ; then
+-       echo "*** The gtk-config script installed by GTK could not be found"
++       echo "*** The gtk11-config script installed by GTK could not be found"
+        echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
+        echo "*** your path, or set the GTK_CONFIG environment variable to the"
+-       echo "*** full path to gtk-config."
++       echo "*** full path to gtk11-config."
+      else
+        if test -f conf.gtktest ; then
+         :
+@@ -2453,7 +2453,7 @@
+    echo "*** The test program failed to compile or link. See the file config.log for the"
+           echo "*** exact error that occured. This usually means GTK was incorrectly installed"
+           echo "*** or that you have moved GTK since it was installed. In the latter case, you"
+-          echo "*** may want to edit the gtk-config script: $GTK_CONFIG" 
++          echo "*** may want to edit the gtk11-config script: $GTK_CONFIG" 
+ fi
+ rm -f conftest*
+           CFLAGS="$ac_save_CFLAGS"
diff --git a/x11/gnomecore/files/patch-ab b/x11/gnomecore/files/patch-ab
new file mode 100644
index 000000000000..6e6ffb8620f0
--- /dev/null
+++ b/x11/gnomecore/files/patch-ab
@@ -0,0 +1,52 @@
+--- help-browser/gnome-info2html/utils.c.orig	Tue Mar 17 17:17:28 1998
++++ help-browser/gnome-info2html/utils.c	Tue Mar 17 17:17:34 1998
+@@ -2,7 +2,7 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
+-#include <regex.h>
++#include <gnuregex.h>
+ 
+ #include <glib.h>
+ 
+--- help-browser/gnome-help-browser.c.orig	Tue Sep  1 11:36:24 1998
++++ help-browser/gnome-help-browser.c	Tue Sep  1 11:37:39 1998
+@@ -65,13 +65,10 @@
+ static int configCancel(GtkWidget *w, GtkWidget *window);
+ 
+ /* MANPATH should probably come from somewhere */
+-#define DEFAULT_MANPATH "/usr/man:/usr/local/man:/usr/X11R6/man"
+-#define DEFAULT_INFOPATH "/usr/info:/usr/local/info"
++#define DEFAULT_MANPATH "/usr/share/man:/usr/local/man:/usr/X11R6/man"
++#define DEFAULT_INFOPATH "/usr/share/info:/usr/local/info:/usr/X11R6/info"
+ /* GHELPPATH probably needs some automatic additions inside toc */
+-#define DEFAULT_GHELPPATH GNOMEHELPPATH ":/opt/gnome/share/gnome/help:" \
+-                          "/usr/local/share/gnome/help:" \
+-			  "/usr/local/gnome/share/gnome/help:" \
+-			  "/usr/share/gnome/help:" 
++#define DEFAULT_GHELPPATH GNOMEHELPPATH
+ #define DEFAULT_MEMCACHESIZE "1000000"
+ #define DEFAULT_HISTORYLENGTH "1000"
+ #define HELP_BROWSER_RC_DIR ".gnome-help-browser"
+--- help-browser/toc.c.orig	Tue Sep  1 13:08:09 1998
++++ help-browser/toc.c	Tue Sep  1 13:08:51 1998
+@@ -18,14 +18,13 @@
+ static int hideTocInt(GtkWidget *window);
+ 
+ struct _toc_config toc_config[] = {
+-    { "/usr/man",              TOC_MAN_TYPE   },
++    { "/usr/share/man",              TOC_MAN_TYPE   },
+     { "/usr/local/man",        TOC_MAN_TYPE   },
+     { "/usr/X11R6/man",        TOC_MAN_TYPE   },
+-    { "/usr/info",             TOC_INFO_TYPE  },
+-    { "/opt/gnome/share/gnome/help",       TOC_GHELP_TYPE },
+-    { "/usr/local/share/gnome/help",       TOC_GHELP_TYPE },
+-    { "/usr/local/gnome/share/gnome/help", TOC_GHELP_TYPE },
+-    { "/usr/share/gnome/help",             TOC_GHELP_TYPE },
++    { "/usr/share/info",             TOC_INFO_TYPE  },
++    { "/usr/local/info",             TOC_INFO_TYPE  },
++    { "/usr/X11R6/info",             TOC_INFO_TYPE  },
++    { "/usr/X11R6/share/gnome/help",       TOC_GHELP_TYPE },
+     { NULL, 0 }
+ };
+ 
diff --git a/x11/gnomecore/files/patch-ae b/x11/gnomecore/files/patch-ae
new file mode 100644
index 000000000000..befa10184b9f
--- /dev/null
+++ b/x11/gnomecore/files/patch-ae
@@ -0,0 +1,337 @@
+--- applets/batmon/Makefile.in.orig	Tue Sep  1 11:09:50 1998
++++ applets/batmon/Makefile.in	Tue Sep  1 11:17:15 1998
+@@ -127,7 +127,7 @@
+ INCLUDES = -I. -I$(srcdir) 				\
+ 	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
+ 	-I$(srcdir)/../../panel				\
+-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
++	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
+ 	-I$(includedir) $(GNOME_INCLUDEDIR)
+ 
+ bin_PROGRAMS = batmon_applet
+--- applets/battery/Makefile.in.orig	Tue Sep  1 11:17:22 1998
++++ applets/battery/Makefile.in	Tue Sep  1 11:17:35 1998
+@@ -125,7 +125,7 @@
+ INCLUDES = -I. -I$(srcdir) 				\
+ 	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
+ 	-I$(srcdir)/../../panel				\
+-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
++	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
+ 	-I$(includedir) $(GNOME_INCLUDEDIR)
+ 
+ bin_PROGRAMS = battery_applet
+--- applets/bussign/Makefile.in.orig	Tue Sep  1 11:17:42 1998
++++ applets/bussign/Makefile.in	Tue Sep  1 11:17:58 1998
+@@ -125,7 +125,7 @@
+ INCLUDES = -I. -I$(srcdir) 				\
+ 	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
+ 	-I$(srcdir)/../../panel				\
+-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
++	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
+ 	-I$(includedir) $(GNOME_INCLUDEDIR)
+ 
+ bin_PROGRAMS = bussign_applet
+--- applets/cdplayer/Makefile.in.orig	Tue Sep  1 11:18:05 1998
++++ applets/cdplayer/Makefile.in	Tue Sep  1 11:18:16 1998
+@@ -125,7 +125,7 @@
+ INCLUDES = -I. -I$(srcdir) 				\
+ 	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
+ 	-I$(srcdir)/../../panel				\
+-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
++	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
+ 	-I$(includedir) $(GNOME_INCLUDEDIR)
+ 
+ bin_PROGRAMS = cdplayer_applet
+--- applets/clockmail/Makefile.in.orig	Tue Sep  1 11:18:24 1998
++++ applets/clockmail/Makefile.in	Tue Sep  1 11:18:35 1998
+@@ -125,7 +125,7 @@
+ INCLUDES = -I. -I$(srcdir) 				\
+ 	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
+ 	-I$(srcdir)/../../panel				\
+-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
++	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
+ 	-I$(includedir) $(GNOME_INCLUDEDIR)
+ 
+ bin_PROGRAMS = clockmail_applet
+--- applets/cpuload/Makefile.in.orig	Tue Sep  1 11:18:42 1998
++++ applets/cpuload/Makefile.in	Tue Sep  1 11:18:51 1998
+@@ -125,7 +125,7 @@
+ INCLUDES = -I. -I$(srcdir) 				\
+ 	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
+ 	-I$(srcdir)/../../panel				\
+-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
++	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
+ 	-I$(includedir) $(GNOME_INCLUDEDIR)
+ 
+ bin_PROGRAMS = cpuload_applet
+--- applets/cpumemusage/Makefile.in.orig	Tue Sep  1 11:19:00 1998
++++ applets/cpumemusage/Makefile.in	Tue Sep  1 11:19:10 1998
+@@ -125,7 +125,7 @@
+ INCLUDES = -I. -I$(srcdir) 				\
+ 	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
+ 	-I$(srcdir)/../../panel				\
+-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
++	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
+ 	-I$(includedir) $(GNOME_INCLUDEDIR)
+ 
+ bin_PROGRAMS = cpumemusage_applet
+--- applets/dialer/Makefile.in.orig	Tue Sep  1 11:19:15 1998
++++ applets/dialer/Makefile.in	Tue Sep  1 11:19:26 1998
+@@ -125,7 +125,7 @@
+ INCLUDES = -I. -I$(srcdir) 				\
+ 	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
+ 	-I$(srcdir)/../../panel				\
+-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
++	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
+ 	-I$(includedir) $(GNOME_INCLUDEDIR)
+ 
+ bin_PROGRAMS = dialer_applet
+--- applets/diskusage/Makefile.in.orig	Tue Sep  1 11:19:33 1998
++++ applets/diskusage/Makefile.in	Tue Sep  1 11:19:45 1998
+@@ -125,7 +125,7 @@
+ INCLUDES = -I. -I$(srcdir) 				\
+ 	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
+ 	-I$(srcdir)/../../panel				\
+-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
++	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
+ 	-I$(includedir) $(GNOME_INCLUDEDIR)
+ 
+ bin_PROGRAMS = diskusage_applet
+--- applets/drivemount/Makefile.in.orig	Tue Sep  1 11:19:52 1998
++++ applets/drivemount/Makefile.in	Tue Sep  1 11:20:06 1998
+@@ -125,7 +125,7 @@
+ INCLUDES = -I. -I$(srcdir) 				\
+ 	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
+ 	-I$(srcdir)/../../panel				\
+-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
++	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
+ 	-I$(includedir) $(GNOME_INCLUDEDIR)
+ 
+ bin_PROGRAMS = drivemount_applet
+--- applets/fifteen/Makefile.in.orig	Tue Sep  1 11:20:11 1998
++++ applets/fifteen/Makefile.in	Tue Sep  1 11:20:25 1998
+@@ -125,7 +125,7 @@
+ INCLUDES = -I. -I$(srcdir) 				\
+ 	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
+ 	-I$(srcdir)/../../panel				\
+-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
++	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
+ 	-I$(includedir) $(GNOME_INCLUDEDIR)
+ 
+ bin_PROGRAMS = fifteen_applet
+--- applets/fish/Makefile.in.orig	Tue Sep  1 11:20:32 1998
++++ applets/fish/Makefile.in	Tue Sep  1 11:20:43 1998
+@@ -125,7 +125,7 @@
+ INCLUDES = -I. -I$(srcdir) 				\
+ 	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
+ 	-I$(srcdir)/../../panel				\
+-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
++	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
+ 	-I$(includedir) $(GNOME_INCLUDEDIR)
+ 
+ bin_PROGRAMS = fish_applet
+--- applets/gen_util/Makefile.in.orig	Tue Sep  1 11:20:49 1998
++++ applets/gen_util/Makefile.in	Tue Sep  1 11:21:05 1998
+@@ -125,7 +125,7 @@
+ INCLUDES = -I. -I$(srcdir) 				\
+ 	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
+ 	-I$(srcdir)/../../panel				\
+-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
++	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
+ 	-I$(includedir) $(GNOME_INCLUDEDIR)
+ 
+ bin_PROGRAMS = gen_util_applet
+--- applets/icewm-pager/Makefile.in.orig	Tue Sep  1 11:21:11 1998
++++ applets/icewm-pager/Makefile.in	Tue Sep  1 11:21:21 1998
+@@ -125,7 +125,7 @@
+ INCLUDES = -I. -I$(srcdir) 				\
+ 	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
+ 	-I$(srcdir)/../../panel				\
+-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
++	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
+ 	-I$(includedir) $(GNOME_INCLUDEDIR)
+ 
+ bin_PROGRAMS = wmpager_applet
+--- applets/mixer/Makefile.in.orig	Tue Sep  1 11:21:27 1998
++++ applets/mixer/Makefile.in	Tue Sep  1 11:21:36 1998
+@@ -125,7 +125,7 @@
+ INCLUDES = -I. -I$(srcdir) 				\
+ 	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
+ 	-I$(srcdir)/../../panel				\
+-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
++	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
+ 	-I$(includedir) $(GNOME_INCLUDEDIR)
+ 
+ bin_PROGRAMS = mixer_applet
+--- applets/modemlights/Makefile.in.orig	Tue Sep  1 11:21:41 1998
++++ applets/modemlights/Makefile.in	Tue Sep  1 11:21:51 1998
+@@ -125,7 +125,7 @@
+ INCLUDES = -I. -I$(srcdir) 				\
+ 	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
+ 	-I$(srcdir)/../../panel				\
+-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
++	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
+ 	-I$(includedir) $(GNOME_INCLUDEDIR)
+ 
+ bin_PROGRAMS = modemlights_applet
+--- applets/netload/Makefile.in.orig	Tue Sep  1 11:22:00 1998
++++ applets/netload/Makefile.in	Tue Sep  1 11:22:15 1998
+@@ -125,7 +125,7 @@
+ INCLUDES = -I. -I$(srcdir) 				\
+ 	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
+ 	-I$(srcdir)/../../panel				\
+-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
++	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
+ 	-I$(includedir) $(GNOME_INCLUDEDIR)
+ 
+ bin_PROGRAMS = netload_applet
+--- applets/webcontrol/Makefile.in.orig	Tue Sep  1 11:22:20 1998
++++ applets/webcontrol/Makefile.in	Tue Sep  1 11:22:36 1998
+@@ -125,7 +125,7 @@
+ INCLUDES = -I. -I$(srcdir) 				\
+ 	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
+ 	-I$(srcdir)/../../panel				\
+-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
++	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
+ 	-I$(includedir) $(GNOME_INCLUDEDIR)
+ 
+ bin_PROGRAMS = webcontrol_applet
+--- applets/winlist/Makefile.in.orig	Tue Sep  1 11:22:42 1998
++++ applets/winlist/Makefile.in	Tue Sep  1 11:22:52 1998
+@@ -125,7 +125,7 @@
+ INCLUDES = -I. -I$(srcdir) 				\
+ 	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
+ 	-I$(srcdir)/../../panel				\
+-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
++	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
+ 	-I$(includedir) $(GNOME_INCLUDEDIR)
+ 
+ bin_PROGRAMS = winlist_applet
+--- control-center/Makefile.in.orig	Tue Sep  1 11:29:55 1998
++++ control-center/Makefile.in	Tue Sep  1 11:30:07 1998
+@@ -119,7 +119,7 @@
+ l = @l@
+ 
+ INCLUDES = 			\
+-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
++	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
+ 	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
+ 	-I$(includedir) $(GNOME_INCLUDEDIR)
+ 
+--- desktop-properties/Makefile.in.orig	Tue Sep  1 11:30:33 1998
++++ desktop-properties/Makefile.in	Tue Sep  1 11:30:45 1998
+@@ -119,7 +119,7 @@
+ l = @l@
+ 
+ INCLUDES = 			\
+-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
++	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
+ 	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
+ 	-I$(includedir) $(X_CFLAGS) $(GNOME_INCLUDEDIR)
+ 
+--- gmenu/Makefile.in.orig	Thu Aug 20 02:46:44 1998
++++ gmenu/Makefile.in	Sun Sep  6 03:21:25 1998
+@@ -119,7 +119,7 @@
+ l = @l@
+ 
+ INCLUDES = 			\
+-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
++	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
+ 	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
+ 	-I$(includedir) $(GNOME_INCLUDEDIR)
+ 
+--- gnome-terminal/Makefile.in.orig	Tue Sep  1 11:31:53 1998
++++ gnome-terminal/Makefile.in	Tue Sep  1 11:32:04 1998
+@@ -123,7 +123,7 @@
+ 	-I$(top_srcdir)/intl	\
+ 	-I$(top_builddir)/intl	\
+ 	$(GNOME_INCLUDEDIR)	\
+-	-DGNOMELOCALEDIR=\""$(datadir)/locale\""
++	-DGNOMELOCALEDIR=\""$(prefix)/share/locale\""
+ 
+ LDADD = \
+ 	$(GNOME_LIBDIR)					\
+--- gsm/Makefile.in.orig	Tue Sep  1 11:32:20 1998
++++ gsm/Makefile.in	Tue Sep  1 11:32:33 1998
+@@ -120,7 +120,7 @@
+ 
+ INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) \
+ 	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
+-	-DGNOMELOCALEDIR=\""$(datadir)/locale\"" \
++	-DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" \
+ 	-DDEFAULTDIR="\"$(datadir)\""
+ 
+ LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS)
+--- panel/Makefile.in.orig	Thu Aug 20 02:45:47 1998
++++ panel/Makefile.in	Sun Sep  6 03:22:52 1998
+@@ -126,7 +126,7 @@
+ 
+ INCLUDES = -I. -I$(srcdir) \
+ 	-I$(top_srcdir)/intl -I$(top_builddir)/intl \
+-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
++	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
+ 	-I$(includedir) $(GNOME_INCLUDEDIR) $(ORB_CFLAGS)
+ 
+ bin_PROGRAMS = panel #launcher_applet
+@@ -162,7 +162,7 @@
+ 	applet-lib.h \
+ 	applet-widget.h
+ 
+-libpanel_applet_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
++libpanel_applet_la_LDFLAGS = -version-info 0:27:0 -rpath $(libdir)
+ libpanel_applet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB)
+ 
+ BUILT_SOURCES = $(CORBA_SRCLIST)
+@@ -228,7 +228,7 @@
+ 
+ EXTRA_DIST = panelrc.in panel.in gnome-panel.idl appletsConf.sh.in
+ 
+-confexecdir = $(libdir)
++confexecdir = $(datadir)
+ confexec_DATA = appletsConf.sh
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+--- smproxy/Makefile.in.orig	Tue Sep  1 11:34:30 1998
++++ smproxy/Makefile.in	Tue Sep  1 11:34:41 1998
+@@ -119,7 +119,7 @@
+ l = @l@
+ 
+ INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) \
+-	-DGNOMELOCALEDIR=\""$(datadir)/locale\"" \
++	-DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" \
+ 	-DHAS_MKSTEMP $(SMPROXY_DEFS)
+ 
+ LDADD = -lXt -lXmu $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS)
+--- core-docs/Makefile.in.orig	Tue Sep  1 12:32:02 1998
++++ core-docs/Makefile.in	Tue Sep  1 12:32:20 1998
+@@ -126,7 +126,7 @@
+ YACC = @YACC@
+ l = @l@
+ 
+-gnome_intro_helpdir = $(datadir)/gnome/help/gnome-intro/C
++gnome_intro_helpdir = $(datadir)/help/gnome-intro/C
+ 
+ GNOME_INTRO_HTML_FILES = \
+ 	gnome-intro/c93191.html \
+--- help-browser/Makefile.in.orig	Thu Aug 20 02:46:36 1998
++++ help-browser/Makefile.in	Tue Sep  1 12:35:49 1998
+@@ -124,8 +124,8 @@
+ 	-I$(includedir)						\
+ 	-I$(top_srcdir)/intl -I$(top_builddir)/intl		\
+ 	$(GNOME_INCLUDEDIR)					\
+-	-DGNOMEHELPPATH=\""$(datadir)/gnome/help\"" 	\
+-	-DGNOMELOCALEDIR=\""$(datadir)/locale\""
++	-DGNOMEHELPPATH=\""$(datadir)/help\"" 	\
++	-DGNOMELOCALEDIR=\""$(prefix)/share/locale\""
+ 
+ LDADD = \
+ 	$(GNOME_LIBDIR)					\
+@@ -159,7 +159,7 @@
+ 	     toc.h toc-man.h toc-ghelp.h toc-info.h \
+ 	     $(PIXMAPS) gnome-help.desktop
+ 
+-help_browser_helpdir = $(datadir)/gnome/help/help-browser/C
++help_browser_helpdir = $(datadir)/help/help-browser/C
+ 
+ sysdir = $(datadir)/apps
+ sys_DATA = gnome-help.desktop
diff --git a/x11/gnomecore/pkg-comment b/x11/gnomecore/pkg-comment
new file mode 100644
index 000000000000..a63dac587093
--- /dev/null
+++ b/x11/gnomecore/pkg-comment
@@ -0,0 +1 @@
+core component for the Gnome Desktop Environment
diff --git a/x11/gnomecore/pkg-descr b/x11/gnomecore/pkg-descr
new file mode 100644
index 000000000000..7a657e74b6af
--- /dev/null
+++ b/x11/gnomecore/pkg-descr
@@ -0,0 +1,4 @@
+core component for the Gnome Desktop Environment
+
+For more information about the Gnome on FreeBSD,
+please refer to ${PORTSDIR}/x11/gnome/pkg/DESCR.
diff --git a/x11/gnomecore/pkg-plist b/x11/gnomecore/pkg-plist
new file mode 100644
index 000000000000..7ae50979db60
--- /dev/null
+++ b/x11/gnomecore/pkg-plist
@@ -0,0 +1,251 @@
+bin/background-properties
+bin/batmon_applet
+bin/battery_applet
+bin/bell-properties
+bin/bussign_applet
+bin/clockmail_applet
+bin/cpuload_applet
+bin/cpumemusage_applet
+bin/dialer_applet
+bin/diskusage_applet
+bin/drivemount_applet
+bin/fifteen_applet
+bin/fish_applet
+bin/gen_util_applet
+bin/gmenu
+bin/gnome-help-browser
+bin/gnome-info2html
+bin/gnome-man2html
+bin/gnome-session
+bin/gnome-smproxy
+bin/gnome-terminal
+bin/gnomecc
+bin/keyboard-properties
+bin/mixer_applet
+bin/modemlights_applet
+bin/mouse-properties
+bin/netload_applet
+bin/panel
+bin/save-session
+bin/session-properties
+bin/ui-properties
+bin/webcontrol_applet
+bin/wmpager_applet
+include/applet-lib.h
+include/applet-widget.h
+lib/libpanel_applet.a
+lib/libpanel_applet.la
+lib/libpanel_applet.so
+lib/libpanel_applet.so.0.27
+@exec /sbin/ldconfig -m %B
+@unexec /sbin/ldconfig -R
+share/gnome/appletsConf.sh
+share/gnome/applets/Amusements/.directory
+share/gnome/applets/Amusements/bussign_applet.desktop
+share/gnome/applets/Amusements/fifteen_applet.desktop
+share/gnome/applets/Amusements/fish_applet.desktop
+share/gnome/applets/Monitors/.directory
+share/gnome/applets/Monitors/batmon_applet.desktop
+share/gnome/applets/Monitors/battery_applet.desktop
+share/gnome/applets/Monitors/cpuload_applet.desktop
+share/gnome/applets/Monitors/cpumemusage_applet.desktop
+share/gnome/applets/Monitors/diskusage_applet.desktop
+share/gnome/applets/Multimedia/.directory
+share/gnome/applets/Multimedia/mixer_applet.desktop
+share/gnome/applets/Network/.directory
+share/gnome/applets/Network/dialer_applet.desktop
+share/gnome/applets/Network/mailcheck_applet.desktop
+share/gnome/applets/Network/modemlights_applet.desktop
+share/gnome/applets/Network/netload_applet.desktop
+share/gnome/applets/Network/webcontrol_applet.desktop
+share/gnome/applets/Utility/.directory
+share/gnome/applets/Utility/clock_applet.desktop
+share/gnome/applets/Utility/clockmail_applet.desktop
+share/gnome/applets/Utility/drivemount_applet.desktop
+share/gnome/applets/Utility/printer.desktop
+share/gnome/applets/Utility/wmpager_applet.desktop
+share/gnome/apps/.order
+share/gnome/apps/Administration/.directory
+share/gnome/apps/Applications/.directory
+share/gnome/apps/Applications/Emacs.desktop
+share/gnome/apps/Applications/Netscape.desktop
+share/gnome/apps/Audio/.directory
+share/gnome/apps/Games/.directory
+share/gnome/apps/Gmc.desktop
+share/gnome/apps/Graphics/.directory
+share/gnome/apps/Graphics/GIMP.desktop
+share/gnome/apps/Network/.directory
+share/gnome/apps/Network/Balsa.desktop
+share/gnome/apps/Network/Tkrat.desktop
+share/gnome/apps/Productivity/.directory
+share/gnome/apps/System/.directory
+share/gnome/apps/System/Imlib_config.desktop
+share/gnome/apps/System/background.desktop
+share/gnome/apps/System/bell.desktop
+share/gnome/apps/System/gmenu.desktop
+share/gnome/apps/System/gnomecc.desktop
+share/gnome/apps/System/keyboard.desktop
+share/gnome/apps/System/mouse.desktop
+share/gnome/apps/System/session.desktop
+share/gnome/apps/System/ui.desktop
+share/gnome/apps/Utilities/.directory
+share/gnome/apps/Utilities/Eterm.desktop
+share/gnome/apps/Utilities/Kterm.desktop
+share/gnome/apps/Utilities/UNIX-regular.desktop
+share/gnome/apps/Utilities/UNIX.desktop
+share/gnome/apps/Utilities/gnome-terminal.desktop
+share/gnome/apps/gnome-help.desktop
+share/gnome/default.session
+share/gnome/help/gnome-intro/C/a-sample-session.html
+share/gnome/help/gnome-intro/C/a-sample-session75.html
+share/gnome/help/gnome-intro/C/c93.html
+share/gnome/help/gnome-intro/C/c93127.html
+share/gnome/help/gnome-intro/C/c93175.html
+share/gnome/help/gnome-intro/C/c93191.html
+share/gnome/help/gnome-intro/C/c93230.html
+share/gnome/help/gnome-intro/C/c93302.html
+share/gnome/help/gnome-intro/C/c93372.html
+share/gnome/help/gnome-intro/C/c93412.html
+share/gnome/help/gnome-intro/C/docbook.css
+share/gnome/help/gnome-intro/C/f13.html
+share/gnome/help/gnome-intro/C/f1346.html
+share/gnome/help/gnome-intro/C/gnome-intro.html
+share/gnome/help/gnome-intro/C/index.html
+share/gnome/help/gnome-intro/C/pix/background-properties.gif
+share/gnome/help/gnome-intro/C/pix/calendar.gif
+share/gnome/help/gnome-intro/C/pix/ee-menu.gif
+share/gnome/help/gnome-intro/C/pix/freecell.gif
+share/gnome/help/gnome-intro/C/pix/gcalc.gif
+share/gnome/help/gnome-intro/C/pix/gedit-2files.gif
+share/gnome/help/gnome-intro/C/pix/ghex-2files.gif
+share/gnome/help/gnome-intro/C/pix/ghex-basic.gif
+share/gnome/help/gnome-intro/C/pix/gmc-basic.gif
+share/gnome/help/gnome-intro/C/pix/gmix.gif
+share/gnome/help/gnome-intro/C/pix/gnomine.gif
+share/gnome/help/gnome-intro/C/pix/gtcd-cddb.gif
+share/gnome/help/gnome-intro/C/pix/gtcd-track-list.gif
+share/gnome/help/gnome-intro/C/pix/gtcd.gif
+share/gnome/help/gnome-intro/C/pix/gtop-kill.gif
+share/gnome/help/gnome-intro/C/pix/gtop-mem.gif
+share/gnome/help/gnome-intro/C/pix/gtop-procs.gif
+share/gnome/help/gnome-intro/C/pix/gtt-2proj.gif
+share/gnome/help/gnome-intro/C/pix/gtt-basic.gif
+share/gnome/help/gnome-intro/C/pix/gtt-new.gif
+share/gnome/help/gnome-intro/C/pix/gulp.gif
+share/gnome/help/gnome-intro/C/pix/help-browser-initial.gif
+share/gnome/help/gnome-intro/C/pix/help-browser-sample.gif
+share/gnome/help/gnome-intro/C/pix/help-icon.gif
+share/gnome/help/gnome-intro/C/pix/mahjongg.gif
+share/gnome/help/gnome-intro/C/pix/panel-add-icon.gif
+share/gnome/help/gnome-intro/C/pix/panel-basic.gif
+share/gnome/help/gnome-intro/C/pix/panel-icons.gif
+share/gnome/help/gnome-intro/C/pix/panel-menu-select.gif
+share/gnome/help/gnome-intro/C/pix/panel-menu.gif
+share/gnome/help/gnome-intro/C/pix/same-gnome.gif
+share/gnome/help/gnome-intro/C/pix/terminal.gif
+share/gnome/help/gnome-intro/C/topic.dat
+share/gnome/help/help-browser/C/bg.xpm
+share/gnome/help/help-browser/C/default-page.html
+share/gnome/help/help-browser/C/gnome-logo2.xpm
+share/gnome/help/help-browser/C/help-browser.html
+share/gnome/help/help-browser/C/index.html
+share/gnome/help/help-browser/C/topic.dat
+share/locale/de/LC_MESSAGES/gnome-core.mo
+share/locale/es/LC_MESSAGES/gnome-core.mo
+share/locale/fi/LC_MESSAGES/gnome-core.mo
+share/locale/fr/LC_MESSAGES/gnome-core.mo
+share/locale/ga/LC_MESSAGES/gnome-core.mo
+share/locale/it/LC_MESSAGES/gnome-core.mo
+share/locale/ja/LC_MESSAGES/gnome-core.mo
+share/locale/ko/LC_MESSAGES/gnome-core.mo
+share/locale/no/LC_MESSAGES/gnome-core.mo
+share/locale/pt/LC_MESSAGES/gnome-core.mo
+share/locale/sv/LC_MESSAGES/gnome-core.mo
+share/gnome/panelrc
+share/gnome/pixmaps/batmon-ac.xpm
+share/gnome/pixmaps/batmon-bat.xpm
+share/gnome/pixmaps/emacs.png
+share/gnome/pixmaps/gnome-aorta.png
+share/gnome/pixmaps/gnome-audio2.png
+share/gnome/pixmaps/gnome-background.png
+share/gnome/pixmaps/gnome-balsa2.png
+share/gnome/pixmaps/gnome-calc2.png
+share/gnome/pixmaps/gnome-calendar.png
+share/gnome/pixmaps/gnome-cromagnon.png
+share/gnome/pixmaps/gnome-default.png
+share/gnome/pixmaps/gnome-ee.png
+share/gnome/pixmaps/gnome-file-c.png
+share/gnome/pixmaps/gnome-file-h.png
+share/gnome/pixmaps/gnome-folder.png
+share/gnome/pixmaps/gnome-gegl.png
+share/gnome/pixmaps/gnome-gemvt.png
+share/gnome/pixmaps/gnome-gimp.png
+share/gnome/pixmaps/gnome-globe.png
+share/gnome/pixmaps/gnome-gmenu.png
+share/gnome/pixmaps/gnome-gmush.png
+share/gnome/pixmaps/gnome-gnomine.png
+share/gnome/pixmaps/gnome-gsame.png
+share/gnome/pixmaps/gnome-help.png
+share/gnome/pixmaps/gnome-html.png
+share/gnome/pixmaps/gnome-image-gif.png
+share/gnome/pixmaps/gnome-image-jpeg.png
+share/gnome/pixmaps/gnome-irc.png
+share/gnome/pixmaps/gnome-lockscreen.png
+share/gnome/pixmaps/gnome-log.png
+share/gnome/pixmaps/gnome-menu-down.png
+share/gnome/pixmaps/gnome-menu-left.png
+share/gnome/pixmaps/gnome-menu-right.png
+share/gnome/pixmaps/gnome-menu-up.png
+share/gnome/pixmaps/gnome-mnemonic.png
+share/gnome/pixmaps/gnome-money.png
+share/gnome/pixmaps/gnome-mouse.png
+share/gnome/pixmaps/gnome-networktool.png
+share/gnome/pixmaps/gnome-note.png
+share/gnome/pixmaps/gnome-qeye.png
+share/gnome/pixmaps/gnome-talk.png
+share/gnome/pixmaps/gnome-term-linux.png
+share/gnome/pixmaps/gnome-term-linux2.png
+share/gnome/pixmaps/gnome-term-night.png
+share/gnome/pixmaps/gnome-term-tiger.png
+share/gnome/pixmaps/gnome-term.png
+share/gnome/pixmaps/gnome-tigert.png
+share/gnome/pixmaps/gnome-unknown.png
+share/gnome/pixmaps/gnome-word.png
+share/gnome/pixmaps/kterm.xpm
+share/gnome/pixmaps/launcher-program.xpm
+share/gnome/pixmaps/mailcheck/email-e.xpm
+share/gnome/pixmaps/mailcheck/email.xpm
+share/gnome/pixmaps/mailcheck/tux-anim.xpm
+share/gnome/pixmaps/monitor.xpm
+share/gnome/pixmaps/netscape.png
+share/gnome/pixmaps/panel-arrow-down.xpm
+share/gnome/pixmaps/panel-arrow-left.xpm
+share/gnome/pixmaps/panel-arrow-right.xpm
+share/gnome/pixmaps/panel-arrow-up.xpm
+share/gnome/pixmaps/panel-drawer.png
+share/gnome/pixmaps/panel-folder.xpm
+share/gnome/pixmaps/panel-knob.png
+share/gnome/pixmaps/panel-menu-main.xpm
+@dirrm share/gnome/applets/Amusements
+@dirrm share/gnome/applets/Monitors
+@dirrm share/gnome/applets/Multimedia
+@dirrm share/gnome/applets/Network
+@dirrm share/gnome/applets/Utility
+@dirrm share/gnome/applets
+@dirrm share/gnome/apps/Administration
+@dirrm share/gnome/apps/Applications
+@dirrm share/gnome/apps/Audio
+@dirrm share/gnome/apps/Games
+@dirrm share/gnome/apps/Graphics
+@dirrm share/gnome/apps/Network
+@dirrm share/gnome/apps/Productivity
+@dirrm share/gnome/apps/System
+@dirrm share/gnome/apps/Utilities
+@dirrm share/gnome/apps
+@dirrm share/gnome/help/gnome-intro/C/pix
+@dirrm share/gnome/help/gnome-intro/C
+@dirrm share/gnome/help/gnome-intro
+@dirrm share/gnome/help/help-browser/C
+@dirrm share/gnome/help/help-browser
+@dirrm share/gnome/help
+@dirrm share/gnome/pixmaps/mailcheck