3 files changed, 5 insertions, 61 deletions

diff --git a/x11/libgnome/files/patch-libgnome::Makefile.in b/x11/libgnome/files/patch-libgnome::Makefile.in
index 5a240a06a94c..efac650ba5a4 100644
--- a/x11/libgnome/files/patch-libgnome::Makefile.in
+++ b/x11/libgnome/files/patch-libgnome::Makefile.in
@@ -1,12 +1,11 @@
---- libgnome/Makefile.in.orig	Mon May 31 16:33:14 2004
-+++ libgnome/Makefile.in	Mon May 31 16:33:45 2004
-@@ -211,6 +211,9 @@
+--- libgnome/Makefile.in.orig	Tue May 29 22:16:13 2007
++++ libgnome/Makefile.in	Tue May 29 22:16:58 2007
+@@ -280,6 +280,8 @@
+ LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
  libgnomeincludedir = $(includedir)/libgnome-2.0/libgnome
- 
  INCLUDES = \
 +	-DPREFIX=\""$(PREFIX)"\"				\
 +	-DLOCALBASE=\""$(LOCALBASE)"\"				\
-+	-DX11BASE=\""$(X11BASE)"\"				\
  	-I..							\
  	-I$(srcdir)/..						\
  	$(WARN_CFLAGS)						\
diff --git a/x11/libgnome/files/patch-libgnome_gnome-program.c b/x11/libgnome/files/patch-libgnome_gnome-program.c
deleted file mode 100644
index 70ecbfd8fce0..000000000000
--- a/x11/libgnome/files/patch-libgnome_gnome-program.c
+++ /dev/null
@@ -1,55 +0,0 @@
---- libgnome/gnome-program.c.orig	Tue Apr  4 06:55:12 2006
-+++ libgnome/gnome-program.c	Mon Apr 10 21:07:02 2006
-@@ -936,17 +936,17 @@ gnome_program_locate_file (GnomeProgram 
- 	attr_rel = "";
- 	break;
-     case GNOME_FILE_DOMAIN_DATADIR:
--	prefix_rel = "/share";
-+	prefix_rel = "/share/gnome";
- 	attr_name = GNOME_PARAM_GNOME_DATADIR;
- 	attr_rel = "";
- 	break;
-     case GNOME_FILE_DOMAIN_SOUND:
--	prefix_rel = "/share/sounds";
-+	prefix_rel = "/share/gnome/sounds";
- 	attr_name = GNOME_PARAM_GNOME_DATADIR;
- 	attr_rel = "/sounds";
- 	break;
-     case GNOME_FILE_DOMAIN_PIXMAP:
--	prefix_rel = "/share/pixmaps";
-+	prefix_rel = "/share/gnome/pixmaps";
- 	attr_name = GNOME_PARAM_GNOME_DATADIR;
- 	attr_rel = "/pixmaps";
- 	break;
-@@ -958,7 +958,7 @@ gnome_program_locate_file (GnomeProgram 
-     case GNOME_FILE_DOMAIN_HELP:
- 	prefix_rel = "/share/gnome/help";
- 	attr_name = GNOME_PARAM_GNOME_DATADIR;
--	attr_rel = "/gnome/help";
-+	attr_rel = "/help";
- 	break;
-     case GNOME_FILE_DOMAIN_APP_LIBDIR:
- 	prefix_rel = "/lib";
-@@ -967,19 +967,19 @@ gnome_program_locate_file (GnomeProgram 
- 	search_path = FALSE;
- 	break;
-     case GNOME_FILE_DOMAIN_APP_DATADIR:
--	prefix_rel = "/share";
-+	prefix_rel = "/share/gnome";
- 	attr_name = GNOME_PARAM_APP_DATADIR;
- 	attr_rel = "";
- 	search_path = FALSE;
- 	break;
-     case GNOME_FILE_DOMAIN_APP_SOUND:
--	prefix_rel = "/share/sounds";
-+	prefix_rel = "/share/gnome/sounds";
- 	attr_name = GNOME_PARAM_APP_DATADIR;
- 	attr_rel = "/sounds";
- 	search_path = FALSE;
- 	break;
-     case GNOME_FILE_DOMAIN_APP_PIXMAP:
--	prefix_rel = "/share/pixmaps";
-+	prefix_rel = "/share/gnome/pixmaps";
- 	attr_name = GNOME_PARAM_APP_DATADIR;
- 	attr_rel = "/pixmaps";
- 	search_path = FALSE;
diff --git a/x11/libgnome/files/pkg-deinstall.in b/x11/libgnome/files/pkg-deinstall.in
index 3cfaf607920c..37c981693b8b 100644
--- a/x11/libgnome/files/pkg-deinstall.in
+++ b/x11/libgnome/files/pkg-deinstall.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $FreeBSD$
-#   $MCom: ports/x11/libgnome/files/pkg-deinstall.in,v 1.10 2007/02/16 18:14:27 mezz Exp $
+#   $MCom: ports/x11/libgnome/files/pkg-deinstall.in,v 1.12 2007/04/26 14:17:52 ahze Exp $
 #
 # Restore gconf keys of gnomevfs2.