6 files changed, 36 insertions, 64 deletions

diff --git a/sysutils/gnome-control-center1/Makefile b/sysutils/gnome-control-center1/Makefile
index 74c2b5687627..00ef992ea785 100644
--- a/sysutils/gnome-control-center1/Makefile
+++ b/sysutils/gnome-control-center1/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/sysutils/gnome-control-center1/Makefile,v 1.3 2007/05/30 05:02:04 mezz Exp $
 #
 
 PORTNAME=	gnome-control-center
 PORTVERSION=	1.4.0.5
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/control-center/1.4
@@ -29,4 +30,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 LATEST_LINK=	gnome-control-center1
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
+		${WRKSRC}/capplets/wm-properties/wm-desktops/WindowMaker.desktop
+
 .include <bsd.port.mk>
diff --git a/sysutils/gnome-control-center1/files/patch-ad b/sysutils/gnome-control-center1/files/patch-ad
deleted file mode 100644
index c27189a35ee9..000000000000
--- a/sysutils/gnome-control-center1/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- capplets/wm-properties/wm-list.c.orig	Tue Mar  2 22:53:29 1999
-+++ capplets/wm-properties/wm-list.c	Tue Mar  2 22:53:52 1999
-@@ -210,7 +210,7 @@
-         gchar *tempdir;
-         gchar *name;
-         
--        tempdir = gnome_unconditional_datadir_file ("gnome/wm-properties/");
-+        tempdir = gnome_unconditional_datadir_file ("wm-properties/");
-         wm_list_read_dir (tempdir, FALSE);
-         g_free (tempdir);
-         
diff --git a/sysutils/gnome-control-center1/files/patch-capplets_file-types_file-types-icon-entry.c b/sysutils/gnome-control-center1/files/patch-capplets_file-types_file-types-icon-entry.c
deleted file mode 100644
index 5b48cd25cb94..000000000000
--- a/sysutils/gnome-control-center1/files/patch-capplets_file-types_file-types-icon-entry.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- capplets/file-types/file-types-icon-entry.c.orig	Sun May  5 16:33:51 2002
-+++ capplets/file-types/file-types-icon-entry.c	Sun May  5 16:34:02 2002
-@@ -424,7 +424,7 @@
- 	result = NULL;
- 	filename = nautilus_mime_type_icon_entry_get_full_filename (NAUTILUS_MIME_ICON_ENTRY (ientry));
- 	if (filename != NULL) {
--		path_parts = g_strsplit (filename, "/share/pixmaps/", 0);
-+		path_parts = g_strsplit (filename, "/share/gnome/pixmaps/", 0);
- 		g_free (filename);
- 
- 		if (path_parts[1] != NULL) {
diff --git a/sysutils/gnome-control-center1/files/patch-ce b/sysutils/gnome-control-center1/files/patch-ce
index b2186ac89c4c..8fbfc41ab86f 100644
--- a/sysutils/gnome-control-center1/files/patch-ce
+++ b/sysutils/gnome-control-center1/files/patch-ce
@@ -5,4 +5,4 @@
  [Window Manager]
  SessionManaged=false
 -ConfigExec=/usr/X11R6/lib/GNUstep/Apps/WPrefs.app/WPrefs
-+ConfigExec=/usr/X11R6/share/GNUstep/Apps/WPrefs.app/WPrefs
++ConfigExec=/usr/local/share/GNUstep/Apps/WPrefs.app/WPrefs
diff --git a/sysutils/gnome-control-center1/files/patch-configure b/sysutils/gnome-control-center1/files/patch-configure
deleted file mode 100644
index 53566354e4ac..000000000000
--- a/sysutils/gnome-control-center1/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Sun May  5 16:29:53 2002
-+++ configure	Sun May  5 16:30:05 2002
-@@ -9161,7 +9161,7 @@
- 
- 
- cat >> confdefs.h <<EOF
--#define GNOME_ICONDIR "${prefix}/share/pixmaps"
-+#define GNOME_ICONDIR "${datadir}/pixmaps"
- EOF
- 
- 
diff --git a/sysutils/gnome-control-center1/pkg-plist b/sysutils/gnome-control-center1/pkg-plist
index bea2205dc885..16333e629479 100644
--- a/sysutils/gnome-control-center1/pkg-plist
+++ b/sysutils/gnome-control-center1/pkg-plist
@@ -10,6 +10,25 @@ bin/ui-properties
 bin/url-properties
 bin/wm-properties-capplet
 etc/CORBA/servers/gnomecc.gnorba
+share/control-center/.directory
+share/control-center/Desktop/.directory
+share/control-center/Desktop/background-properties.desktop
+share/control-center/Desktop/theme-selector.desktop
+share/control-center/Desktop/wm-properties.desktop
+share/control-center/Documents/.directory
+share/control-center/Documents/default-application-properties.desktop
+share/control-center/Documents/file-types-capplet.desktop
+share/control-center/Documents/url-properties.desktop
+share/control-center/Multimedia/.directory
+share/control-center/Multimedia/sound-properties.desktop
+share/control-center/Peripherals/.directory
+share/control-center/Peripherals/keyboard-properties.desktop
+share/control-center/Peripherals/mouse-properties.desktop
+share/control-center/Session/.directory
+share/control-center/UIOptions/.directory
+share/control-center/UIOptions/application.desktop
+share/control-center/UIOptions/dialogs.desktop
+share/control-center/UIOptions/mdi.desktop
 share/gnome/apps/Settings/Desktop/.directory
 share/gnome/apps/Settings/Desktop/background-properties.desktop
 share/gnome/apps/Settings/Desktop/theme-selector.desktop
@@ -26,25 +45,6 @@ share/gnome/apps/Settings/Session/.directory
 share/gnome/apps/Settings/UIOptions/.directory
 share/gnome/apps/Settings/file-types-capplet.desktop
 share/gnome/apps/Settings/gnomecc.desktop
-share/gnome/control-center/.directory
-share/gnome/control-center/Desktop/.directory
-share/gnome/control-center/Desktop/background-properties.desktop
-share/gnome/control-center/Desktop/theme-selector.desktop
-share/gnome/control-center/Desktop/wm-properties.desktop
-share/gnome/control-center/Documents/.directory
-share/gnome/control-center/Documents/default-application-properties.desktop
-share/gnome/control-center/Documents/file-types-capplet.desktop
-share/gnome/control-center/Documents/url-properties.desktop
-share/gnome/control-center/Multimedia/.directory
-share/gnome/control-center/Multimedia/sound-properties.desktop
-share/gnome/control-center/Peripherals/.directory
-share/gnome/control-center/Peripherals/keyboard-properties.desktop
-share/gnome/control-center/Peripherals/mouse-properties.desktop
-share/gnome/control-center/Session/.directory
-share/gnome/control-center/UIOptions/.directory
-share/gnome/control-center/UIOptions/application.desktop
-share/gnome/control-center/UIOptions/dialogs.desktop
-share/gnome/control-center/UIOptions/mdi.desktop
 share/gnome/help/control-center/C/control-center.sgml
 share/gnome/help/control-center/C/desktop-intro.html
 share/gnome/help/control-center/C/doc-handlers.html
@@ -125,10 +125,6 @@ share/gnome/help/control-center/eu/stylesheet-images/up.gif
 share/gnome/help/control-center/eu/stylesheet-images/warning.gif
 share/gnome/help/control-center/eu/topic.dat
 share/gnome/help/control-center/eu/usage.html
-share/gnome/omf/control-center/control-center-C.omf
-share/gnome/omf/control-center/control-center-eu.omf
-share/gnome/pixmaps/ccsplash.png
-share/gnome/pixmaps/control-center.png
 share/gnome/wm-properties/Enlightenment.desktop
 share/gnome/wm-properties/IceWM.desktop
 share/gnome/wm-properties/Scwm.desktop
@@ -171,15 +167,19 @@ share/locale/uk/LC_MESSAGES/control-center.mo
 share/locale/wa/LC_MESSAGES/control-center.mo
 share/locale/zh_CN/LC_MESSAGES/control-center.mo
 share/locale/zh_TW/LC_MESSAGES/control-center.mo
-@dirrm share/gnome/omf/control-center
-@dirrm share/gnome/help/control-center/C/stylesheet-images
-@dirrm share/gnome/help/control-center/C/figures
-@dirrm share/gnome/help/control-center/C
+share/omf/control-center/control-center-C.omf
+share/omf/control-center/control-center-eu.omf
+share/pixmaps/ccsplash.png
+share/pixmaps/control-center.png
+@dirrm share/omf/control-center
 @dirrm share/gnome/help/control-center/eu/stylesheet-images
 @dirrm share/gnome/help/control-center/eu/figures
 @dirrm share/gnome/help/control-center/eu
+@dirrm share/gnome/help/control-center/C/stylesheet-images
+@dirrm share/gnome/help/control-center/C/figures
+@dirrm share/gnome/help/control-center/C
 @dirrm share/gnome/help/control-center
-@dirrm share/gnome/control-center/UIOptions
-@dirrm share/gnome/control-center/Multimedia
 @dirrm share/gnome/apps/Settings/UIOptions
 @dirrm share/gnome/apps/Settings/Multimedia
+@dirrm share/control-center/UIOptions
+@dirrm share/control-center/Multimedia