8 files changed, 73 insertions, 365 deletions

diff --git a/x11/gnomecore/Makefile b/x11/gnomecore/Makefile
index 5a9ce33009f4..e3c97ee59ef3 100644
--- a/x11/gnomecore/Makefile
+++ b/x11/gnomecore/Makefile
@@ -16,7 +16,8 @@ MAINTAINER=	ade@FreeBSD.org
 
 LIB_DEPENDS=	capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \
 		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
-		xml.5:${PORTSDIR}/textproc/libxml
+		xml.5:${PORTSDIR}/textproc/libxml \
+		bz2.1:${PORTSDIR}/archivers/bzip2
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
@@ -34,4 +35,11 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 MAN1=		gnome-session.1 gnome-wm.1 save-session.1
 MAN5=		default.session.5
 
+post-extract:
+	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
+		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
+		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
+
 .include <bsd.port.mk>
diff --git a/x11/gnomecore/files/patch-aa b/x11/gnomecore/files/patch-aa
index f4586c109eec..843f8a3c3371 100644
--- a/x11/gnomecore/files/patch-aa
+++ b/x11/gnomecore/files/patch-aa
@@ -1,14 +1,31 @@
---- configure.orig	Tue May 23 00:35:01 2000
-+++ configure	Fri May 26 14:29:09 2000
-@@ -4885,7 +4885,7 @@
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   CATOBJEXT=.mo
--		   DATADIRNAME=lib
-+		   DATADIRNAME=share
- fi
- rm -f conftest*
- 		INSTOBJEXT=.mo
+--- 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"
+-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 $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
+     builtin and then its argument prototype would still apply.  */
+-char bzopen();
++char BZ2_bzopen();
+ 
+ int main() {
+-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-ab b/x11/gnomecore/files/patch-ab
index 72fcc097dcd6..f756bd164ac2 100644
--- a/x11/gnomecore/files/patch-ab
+++ b/x11/gnomecore/files/patch-ab
@@ -39,27 +39,9 @@
 +    { "/usr/X11R6/share/gnome/help", TOC_GHELP_TYPE },
      { NULL, 0 }
  };
- 
+
 --- help-browser/Makefile.in.orig	Tue May 23 04:25:07 2000
 +++ help-browser/Makefile.in	Fri May 26 16:15:53 2000
-@@ -143,7 +143,7 @@
- 
- @HELP_USE_GTKHTML_TRUE@htmlcflags = -DHELP_USE_GTKHTML
- 
--INCLUDES =  	-I$(includedir)							-I$(top_srcdir)/intl -I$(top_builddir)/intl			$(GNOME_INCLUDEDIR)						-DGNOME_PREFIX=\""$(prefix)\"" 		-DGNOMELOCALEDIR=\""$(datadir)/locale\""		$(htmlcflags)
-+INCLUDES =  	-I$(includedir)							-I$(top_srcdir)/intl -I$(top_builddir)/intl			$(GNOME_INCLUDEDIR)						-DGNOME_PREFIX=\""$(prefix)\"" 		-DGNOMELOCALEDIR=\""$(prefix)/share/locale\""		$(htmlcflags)
- 
- @HELP_USE_GTKHTML_TRUE@htmllibs = $(GNOME_XML_LIB) @PIXBUF_LIBS@ 	$(GTK_HTML_PREFIX)/lib/libgtkhtml.a		$(GNOME_PRINT_PREFIX)/lib/libgnomeprint.a
- @HELP_USE_GTKHTML_FALSE@htmllibs = $(GTKXMHTML_LIBS)
-@@ -186,7 +186,7 @@
- gnorbadir = $(sysconfdir)/CORBA/servers
- gnorba_DATA = help-browser.gnorba
- 
--sysdir = $(datadir)/gnome/apps
-+sysdir = $(datadir)/apps
- sys_DATA = gnome-help.desktop
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
 @@ -558,7 +558,7 @@
  help-caller.o gnome-help-browser.o: help-browser.h
  
@@ -69,190 +51,35 @@
  		$(top_srcdir)/help-browser/gnome-convert $(DESTDIR)$(bindir)/
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
---- help-browser/help/C/Makefile.in.orig	Tue May 23 04:25:10 2000
-+++ help-browser/help/C/Makefile.in	Fri May 26 15:36:46 2000
-@@ -142,7 +142,7 @@
- EXTRA_DIST = gnome-help-browser-help.html 	     gnome-help-browser-topic.dat 	     default-page.html gnome-logo-large.png sample-help.html sample-topic.dat
- 
- 
--help_browser_helpdir = $(datadir)/gnome/help/help-browser/C
-+help_browser_helpdir = $(datadir)/help/help-browser/C
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES = 
---- help-browser/help/ca/Makefile.in.orig	Tue May 23 04:25:11 2000
-+++ help-browser/help/ca/Makefile.in	Fri May 26 15:36:57 2000
-@@ -143,7 +143,7 @@
- 
- EXTRA_DIST = default-page.html
- 
--help_browser_helpdir = $(datadir)/gnome/help/help-browser/ca
-+help_browser_helpdir = $(datadir)/help/help-browser/ca
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES = 
---- help-browser/help/da/Makefile.in.orig	Tue May 23 04:25:12 2000
-+++ help-browser/help/da/Makefile.in	Fri May 26 15:37:09 2000
-@@ -142,7 +142,7 @@
- EXTRA_DIST = gnome-help-browser-help.html 	     gnome-help-browser-topic.dat 	     default-page.html
- 
- 
--help_browser_helpdir = $(datadir)/gnome/help/help-browser/da
-+help_browser_helpdir = $(datadir)/help/help-browser/da
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES = 
---- help-browser/help/el/Makefile.in.orig	Tue May 23 04:25:13 2000
-+++ help-browser/help/el/Makefile.in	Fri May 26 15:37:16 2000
-@@ -143,7 +143,7 @@
- 
- EXTRA_DIST = default-page.html
- 
--help_browser_helpdir = $(datadir)/gnome/help/help-browser/el
-+help_browser_helpdir = $(datadir)/help/help-browser/el
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES = 
---- help-browser/help/es/Makefile.in.orig	Tue May 23 04:25:14 2000
-+++ help-browser/help/es/Makefile.in	Fri May 26 15:37:46 2000
-@@ -142,7 +142,7 @@
- EXTRA_DIST = gnome-help-browser-help.html 	     gnome-help-browser-topic.dat 	     default-page.html 
- 
- 
--help_browser_helpdir = $(datadir)/gnome/help/help-browser/es
-+help_browser_helpdir = $(datadir)/help/help-browser/es
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES = 
---- help-browser/help/et/Makefile.in.orig	Tue May 23 04:25:15 2000
-+++ help-browser/help/et/Makefile.in	Fri May 26 15:37:53 2000
-@@ -143,7 +143,7 @@
- 
- EXTRA_DIST = default-page.html
- 
--help_browser_helpdir = $(datadir)/gnome/help/help-browser/et
-+help_browser_helpdir = $(datadir)/help/help-browser/et
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES = 
---- help-browser/help/eu/Makefile.in.orig	Tue May 23 04:25:16 2000
-+++ help-browser/help/eu/Makefile.in	Fri May 26 15:38:00 2000
-@@ -143,7 +143,7 @@
- 
- EXTRA_DIST = default-page.html
- 
--help_browser_helpdir = $(datadir)/gnome/help/help-browser/eu
-+help_browser_helpdir = $(datadir)/help/help-browser/eu
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES = 
---- help-browser/help/fr/Makefile.in.orig	Tue May 23 04:25:17 2000
-+++ help-browser/help/fr/Makefile.in	Fri May 26 15:38:09 2000
-@@ -142,7 +142,7 @@
- EXTRA_DIST = gnome-help-browser-help.html 	     gnome-help-browser-topic.dat 	     default-page.html 
- 
- 
--help_browser_helpdir = $(datadir)/gnome/help/help-browser/fr
-+help_browser_helpdir = $(datadir)/help/help-browser/fr
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES = 
---- help-browser/help/gl/Makefile.in.orig	Tue May 23 04:25:18 2000
-+++ help-browser/help/gl/Makefile.in	Fri May 26 15:38:16 2000
-@@ -142,7 +142,7 @@
- EXTRA_DIST = gnome-help-browser-help.html 	     gnome-help-browser-topic.dat 	     default-page.html
- 
- 
--help_browser_helpdir = $(datadir)/gnome/help/help-browser/gl
-+help_browser_helpdir = $(datadir)/help/help-browser/gl
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES = 
---- help-browser/help/hu/Makefile.in.orig	Tue May 23 04:25:18 2000
-+++ help-browser/help/hu/Makefile.in	Fri May 26 15:38:25 2000
-@@ -142,7 +142,7 @@
- EXTRA_DIST = gnome-help-browser-help.html 	     gnome-help-browser-topic.dat 	     default-page.html sample-help.html sample-topic.dat
- 
- 
--help_browser_helpdir = $(datadir)/gnome/help/help-browser/hu
-+help_browser_helpdir = $(datadir)/help/help-browser/hu
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES = 
---- help-browser/help/it/Makefile.in.orig	Tue May 23 04:25:19 2000
-+++ help-browser/help/it/Makefile.in	Fri May 26 15:38:37 2000
-@@ -142,7 +142,7 @@
- EXTRA_DIST = gnome-help-browser-help.html 	     gnome-help-browser-topic.dat 	     default-page.html 
- 
- 
--help_browser_helpdir = $(datadir)/gnome/help/help-browser/it
-+help_browser_helpdir = $(datadir)/help/help-browser/it
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES = 
---- help-browser/help/ja/Makefile.in.orig	Tue May 23 04:25:20 2000
-+++ help-browser/help/ja/Makefile.in	Fri May 26 15:38:47 2000
-@@ -142,7 +142,7 @@
- EXTRA_DIST = gnome-help-browser-help.html 	     gnome-help-browser-topic.dat 	     default-page.html sample-help.html sample-topic.dat
- 
- 
--help_browser_helpdir = $(datadir)/gnome/help/help-browser/ja
-+help_browser_helpdir = $(datadir)/help/help-browser/ja
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES = 
---- help-browser/help/ko/Makefile.in.orig	Tue May 23 04:25:21 2000
-+++ help-browser/help/ko/Makefile.in	Fri May 26 15:38:54 2000
-@@ -142,7 +142,7 @@
- EXTRA_DIST = gnome-help-browser-help.html 	     gnome-help-browser-topic.dat 	     default-page.html
- 
- 
--help_browser_helpdir = $(datadir)/gnome/help/help-browser/ko
-+help_browser_helpdir = $(datadir)/help/help-browser/ko
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES = 
---- help-browser/help/lt/Makefile.in.orig	Tue May 23 04:25:22 2000
-+++ help-browser/help/lt/Makefile.in	Fri May 26 15:39:03 2000
-@@ -142,7 +142,7 @@
- EXTRA_DIST = gnome-help-browser-help.html 	     gnome-help-browser-topic.dat 	     default-page.html 
- 
- 
--help_browser_helpdir = $(datadir)/gnome/help/help-browser/lt
-+help_browser_helpdir = $(datadir)/help/help-browser/lt
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES = 
---- help-browser/help/no/Makefile.in.orig	Tue May 23 04:25:24 2000
-+++ help-browser/help/no/Makefile.in	Fri May 26 15:39:12 2000
-@@ -142,7 +142,7 @@
- EXTRA_DIST = gnome-help-browser-help.html 	     gnome-help-browser-topic.dat 	     default-page.html
- 
- 
--help_browser_helpdir = $(datadir)/gnome/help/help-browser/no
-+help_browser_helpdir = $(datadir)/help/help-browser/no
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES = 
---- help-browser/help/uk/Makefile.in.orig	Tue May 23 04:25:25 2000
-+++ help-browser/help/uk/Makefile.in	Fri May 26 15:39:19 2000
-@@ -142,7 +142,7 @@
- EXTRA_DIST = gnome-help-browser-help.html 	     gnome-help-browser-topic.dat 	     default-page.html
- 
- 
--help_browser_helpdir = $(datadir)/gnome/help/help-browser/uk
-+help_browser_helpdir = $(datadir)/help/help-browser/uk
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES = 
---- help-browser/help/wa/Makefile.in.orig	Tue May 23 04:25:26 2000
-+++ help-browser/help/wa/Makefile.in	Fri May 26 15:39:27 2000
-@@ -142,7 +142,7 @@
- EXTRA_DIST = gnome-help-browser-help.html 	     gnome-help-browser-topic.dat 	     default-page.html 
- 
- 
--help_browser_helpdir = $(datadir)/gnome/help/help-browser/wa
-+help_browser_helpdir = $(datadir)/help/help-browser/wa
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES = 
+--- help-browser/misc.c.orig	Thu Apr 20 01:02:35 2000
++++ help-browser/misc.c	Wed Aug  2 00:24:41 2000
+@@ -162,10 +162,10 @@
+ 	switch (bz) {
+ 	case 1:
+ #ifdef HAVE_LIBBZ2 
+-		if ((bf=bzopen(file, "r"))==NULL)
++		if ((bf=BZ2_bzopen(file, "r"))==NULL)
+ 			return -1;
+ 
+-		bytes=bzread(bf, buf, 8192);
++		bytes=BZ2_bzread(bf, buf, 8192);
+ 		break;
+ #endif
+ 	default:
+@@ -186,14 +186,14 @@
+ 		len += bytes;
+ #ifdef HAVE_LIBBZ2
+ 		if (bz == 1)
+-			bytes=bzread(bf, buf, 8192);
++			bytes=BZ2_bzread(bf, buf, 8192);
+ 		else
+ #endif
+ 			bytes=gzread(f, buf, 8192);
+ 	}
+ #ifdef HAVE_LIBBZ2
+ 	if (bz == 1)
+-		bzclose(bf);
++		BZ2_bzclose(bf);
+ 	else
+ #endif
+ 		gzclose(f);
diff --git a/x11/gnomecore/files/patch-ae b/x11/gnomecore/files/patch-ae
index 797996b9e47a..fc502ff72910 100644
--- a/x11/gnomecore/files/patch-ae
+++ b/x11/gnomecore/files/patch-ae
@@ -9,28 +9,8 @@
  							 user);
  		} else
  			mc->mail_file = g_strdup (mc->mail_file);
---- applets/desk-guide/Makefile.in.orig	Tue May 23 04:25:59 2000
-+++ applets/desk-guide/Makefile.in	Fri May 26 15:21:53 2000
-@@ -141,7 +141,7 @@
- 
- SUBDIRS = help
- 
--INCLUDES = -I. -I$(srcdir) 					-I$(top_srcdir)/intl -I$(top_builddir)/intl		-I$(srcdir)/../../panel					-I$(top_builddir)/panel 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I$(includedir) $(GNOME_INCLUDEDIR)			-DVERSION=\""$(VERSION)"\"
-+INCLUDES = -I. -I$(srcdir) 					-I$(top_srcdir)/intl -I$(top_builddir)/intl		-I$(srcdir)/../../panel					-I$(top_builddir)/panel 	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-I$(includedir) $(GNOME_INCLUDEDIR)			-DVERSION=\""$(VERSION)"\"
- 
- 
- bin_PROGRAMS = deskguide_applet
 --- applets/fish/Makefile.in.orig	Tue May 23 04:26:04 2000
 +++ applets/fish/Makefile.in	Fri May 26 16:23:15 2000
-@@ -139,7 +139,7 @@
- gnomelocaledir = @gnomelocaledir@
- l = @l@
- 
--INCLUDES = -I. -I$(srcdir) 					-I$(top_srcdir)/intl -I$(top_builddir)/intl		-I$(srcdir)/../../panel					-I$(top_builddir)/panel					-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I$(includedir) $(GNOME_INCLUDEDIR)			@PIXBUF_CFLAGS@
-+INCLUDES = -I. -I$(srcdir) 					-I$(top_srcdir)/intl -I$(top_builddir)/intl		-I$(srcdir)/../../panel					-I$(top_builddir)/panel					-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-I$(includedir) $(GNOME_INCLUDEDIR)			@PIXBUF_CFLAGS@
- 
- 
- SUBDIRS = help
 @@ -187,7 +187,7 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
@@ -42,15 +22,6 @@
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 --- applets/gen_util/Makefile.in.orig	Tue May 23 04:26:11 2000
 +++ applets/gen_util/Makefile.in	Fri May 26 16:23:39 2000
-@@ -141,7 +141,7 @@
- 
- SUBDIRS = help
- 
--INCLUDES = -I. -I$(srcdir) 					-I$(top_srcdir)/intl -I$(top_builddir)/intl		-I$(srcdir)/../../panel					-I$(top_builddir)/panel					-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I$(includedir) $(GNOME_INCLUDEDIR)
-+INCLUDES = -I. -I$(srcdir) 					-I$(top_srcdir)/intl -I$(top_builddir)/intl		-I$(srcdir)/../../panel					-I$(top_builddir)/panel					-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-I$(includedir) $(GNOME_INCLUDEDIR)
- 
- 
- lib_LTLIBRARIES = libgen_util_applet.la
 @@ -181,7 +181,7 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
@@ -60,14 +31,3 @@
  libgen_util_applet_la_LIBADD = 
  libgen_util_applet_la_OBJECTS =  main.lo mailcheck.lo popcheck.lo \
  printer.lo clock.lo
---- applets/tasklist/Makefile.in.orig	Tue May 23 04:26:26 2000
-+++ applets/tasklist/Makefile.in	Fri May 26 15:24:07 2000
-@@ -141,7 +141,7 @@
- 
- SUBDIRS = help
- 
--INCLUDES = -I. -I$(srcdir) 					-I$(top_srcdir)/intl -I$(top_builddir)/intl		-I$(srcdir)/../../panel					-I$(srcdir)/../desk-guide				-I$(top_builddir)/panel 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I$(includedir) $(GNOME_INCLUDEDIR)			-DVERSION=\""$(VERSION)"\" 	@PIXBUF_CFLAGS@
-+INCLUDES = -I. -I$(srcdir) 					-I$(top_srcdir)/intl -I$(top_builddir)/intl		-I$(srcdir)/../../panel					-I$(srcdir)/../desk-guide				-I$(top_builddir)/panel 	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-I$(includedir) $(GNOME_INCLUDEDIR)			-DVERSION=\""$(VERSION)"\" 	@PIXBUF_CFLAGS@
- 
- 
- bin_PROGRAMS = tasklist_applet
diff --git a/x11/gnomecore/files/patch-ah b/x11/gnomecore/files/patch-ah
index afe5c26501d2..30c07e734189 100644
--- a/x11/gnomecore/files/patch-ah
+++ b/x11/gnomecore/files/patch-ah
@@ -1,14 +1,5 @@
 --- panel/Makefile.in.orig	Tue May 23 04:25:47 2000
 +++ panel/Makefile.in	Fri May 26 15:30:48 2000
-@@ -147,7 +147,7 @@
- 
- SUBDIRS = doc help
- 
--INCLUDES = -I. -I$(srcdir) 	-I$(top_srcdir)/intl 	-I$(top_builddir)/intl 	-I$(top_builddir)/panel 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir) $(GNOME_INCLUDEDIR) $(ORB_CFLAGS) 	@PIXBUF_CFLAGS@
-+INCLUDES = -I. -I$(srcdir) 	-I$(top_srcdir)/intl 	-I$(top_builddir)/intl 	-I$(top_builddir)/panel 	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir) $(GNOME_INCLUDEDIR) $(ORB_CFLAGS) 	@PIXBUF_CFLAGS@
- 
- 
- bin_PROGRAMS = panel gnome-panel-properties-capplet
 @@ -169,7 +169,7 @@
  libpanel_appletinclude_HEADERS =  	applet-widget.h			gnome-panel.h
  
@@ -36,23 +27,6 @@
  confexec_DATA = appletsConf.sh dockletsConf.sh
  
  panelgnorbadir = $(sysconfdir)/CORBA/servers
-@@ -219,13 +219,13 @@
- soundlistdir = $(sysconfdir)/sound/events
- soundlist_DATA = panel.soundlist
- 
--hintsdir = $(datadir)/gnome/hints
-+hintsdir = $(datadir)/hints
- hints_DATA = panel.hints
- 
- sysdir = $(datadir)/control-center/Desktop/
- sys_DATA = gnome-panel-properties.desktop
- 
--deskdir = $(datadir)/gnome/apps/Settings/Desktop/
-+deskdir = $(datadir)/apps/Settings/Desktop/
- desk_DATA = gnome-panel-properties.desktop
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
-
 --- 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 @@
@@ -123,14 +97,3 @@
  		NULL };
  	int i;
  	char *p;
---- panel/doc/Makefile.in.orig	Tue May 23 04:25:49 2000
-+++ panel/doc/Makefile.in	Fri May 26 16:45:35 2000
-@@ -150,7 +150,7 @@
- CFLAGS = "`gnome-config --cflags gnomeui applets docklets`"
- LDFLAGS = "`gnome-config --libs gnomeui applets docklets`"
- 
--HTML_DIR = $(datadir)/gnome/html
-+HTML_DIR = $(datadir)/html
- 
- TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
- 
diff --git a/x11/gnomecore/files/patch-am b/x11/gnomecore/files/patch-am
index 63410295e912..c3586feca65e 100644
--- a/x11/gnomecore/files/patch-am
+++ b/x11/gnomecore/files/patch-am
@@ -36,34 +36,3 @@
  };
  
  static struct poptOption cb_options [] = {
---- gnome-terminal/Makefile.in.orig	Tue May 23 04:25:29 2000
-+++ gnome-terminal/Makefile.in	Fri May 26 15:46:43 2000
-@@ -143,7 +143,7 @@
- 
- SUBDIRS = C de da es it no
- 
--INCLUDES =  	-I$(includedir)			-I$(top_srcdir)/intl		-I$(top_builddir)/intl		$(GNOME_INCLUDEDIR)		-DGNOMELOCALEDIR=\""$(datadir)/locale\""
-+INCLUDES =  	-I$(includedir)			-I$(top_srcdir)/intl		-I$(top_builddir)/intl		$(GNOME_INCLUDEDIR)		-DGNOMELOCALEDIR=\""$(prefix)/share/locale\""
- 
- 
- LDADD =  	$(GNOME_LIBDIR)						$(GNORBA_LIBS)						$(ORB_LIBS)						$(GNOMEUI_LIBS)						$(ZVT_LIBS)						$(INTLLIBS)
-@@ -167,7 +167,7 @@
- gnorbadir = $(sysconfdir)/CORBA/servers
- gnorba_DATA = gnome-terminal.gnorba
- 
--utildir = $(datadir)/gnome/apps/System
-+utildir = $(datadir)/apps/System
- util_DATA = gnome-terminal.desktop
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
---- gnome-terminal/de/Makefile.in.orig	Tue May 23 04:25:31 2000
-+++ gnome-terminal/de/Makefile.in	Fri May 26 15:53:04 2000
-@@ -139,7 +139,7 @@
- gnomelocaledir = @gnomelocaledir@
- l = @l@
- 
--gnome_terminal_helpdir = $(datadir)/gnome/help/gnome-terminal/de
-+gnome_terminal_helpdir = $(datadir)/help/gnome-terminal/de
- 
- gnome_terminal_help_DATA =  	index.html			topic.dat
- 
diff --git a/x11/gnomecore/files/patch-an b/x11/gnomecore/files/patch-an
index 79a9c69d2695..521114be767a 100644
--- a/x11/gnomecore/files/patch-an
+++ b/x11/gnomecore/files/patch-an
@@ -1,23 +1,3 @@
---- gmenu/Makefile.in.orig	Tue May 23 04:25:39 2000
-+++ gmenu/Makefile.in	Fri May 26 15:25:26 2000
-@@ -139,7 +139,7 @@
- gnomelocaledir = @gnomelocaledir@
- l = @l@
- 
--INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(top_srcdir)/intl -I$(top_builddir)/intl		-I$(includedir) $(GNOME_INCLUDEDIR)
-+INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(top_srcdir)/intl -I$(top_builddir)/intl		-I$(includedir) $(GNOME_INCLUDEDIR)
- 
- 
- bin_PROGRAMS = gmenu
-@@ -152,7 +152,7 @@
- 
- EXTRA_DIST = gmenu.desktop top.xpm unknown.xpm
- 
--sysdir = $(datadir)/gnome/apps/Settings
-+sysdir = $(datadir)/apps/Settings
- sys_DATA = gmenu.desktop
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
 --- gmenu/main.c.orig	Wed May 10 01:36:16 2000
 +++ gmenu/main.c	Fri May 26 15:09:49 2000
 @@ -276,7 +276,7 @@
diff --git a/x11/gnomecore/files/patch-ap b/x11/gnomecore/files/patch-ap
index a1e81ad131bd..09b57026b387 100644
--- a/x11/gnomecore/files/patch-ap
+++ b/x11/gnomecore/files/patch-ap
@@ -1,23 +1,7 @@
---- gsm/Makefile.in.orig	Tue May 23 04:24:59 2000
-+++ gsm/Makefile.in	Fri May 26 15:28:56 2000
-@@ -141,9 +141,9 @@
- 
- SUBDIRS = help
+--- gsm/Makefile.in.orig	Tue Aug  1 23:56:19 2000
++++ gsm/Makefile.in	Tue Aug  1 23:59:25 2000
+@@ -143,3 +143,3 @@
  
 -defaultdir = $(datadir)/gnome
 +defaultdir = $(datadir)
  
--INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) 	-I$(top_srcdir)/intl -I$(top_builddir)/intl		-DGNOMELOCALEDIR=\""$(datadir)/locale\"" 	-DDEFAULTDIR="\"$(defaultdir)\""
-+INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) 	-I$(top_srcdir)/intl -I$(top_builddir)/intl		-DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" 	-DDEFAULTDIR="\"$(defaultdir)\""
- 
- 
- LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS)
-@@ -169,7 +169,7 @@
- 
- default_DATA = default.session default.wm
- 
--desktopdir = $(datadir)/gnome/apps/Settings/Session/
-+desktopdir = $(datadir)/apps/Settings/Session/
- desktop_DATA = save-session.desktop session.desktop
- 
- man_MANS = gnome-wm.1 save-session.1 default.session.5 gnome-session.1