Use new gnome libs and set USE_LIBTOOL=yes.

PR:             11844
Submitted by:   Jeremy Lea <reg@shale.csir.co.za>

12 files changed, 120 insertions, 88 deletions

diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index cb7f6b440649..389fb83a011d 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -3,7 +3,7 @@
 # Date created:				29 Dec 1998
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.9 1999/04/08 18:08:37 steve Exp $
+# $Id: Makefile,v 1.10 1999/05/09 17:03:26 steve Exp $
 #
 
 DISTNAME=	control-center-1.0.5
@@ -17,19 +17,16 @@ MAINTAINER=	vanilla@FreeBSD.ORG
 BUILD_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
 RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
 
-USE_LIBTOOL=	yes
-LIBTOOL=	${LOCALBASE}/bin/libtool
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
-		--with-gnome=${X11BASE}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		GTK_CONFIG="${X11BASE}/bin/gtk12-config" \
-		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
-
-post-install:
-	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+		--with-gnome=${PREFIX}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		GTK_CONFIG="${GTK_CONFIG}" \
+		LIBS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/sysutils/gnome-control-center/files/patch-ce b/sysutils/gnome-control-center/files/patch-ce
new file mode 100644
index 000000000000..b2186ac89c4c
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-ce
@@ -0,0 +1,8 @@
+--- capplets/wm-properties/wm-desktops/WindowMaker.desktop.orig	Wed May 12 02:56:05 1999
++++ capplets/wm-properties/wm-desktops/WindowMaker.desktop	Wed May 12 02:56:22 1999
+@@ -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
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index f774ce748543..6a93bd2f79c5 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -3,6 +3,7 @@ bin/bell-properties-capplet
 bin/gnome-edit-properties-capplet
 bin/gnomecc
 bin/keyboard-properties
+bin/mime-type-capplet
 bin/mouse-properties-capplet
 bin/screensaver-properties-capplet
 bin/session-properties-capplet
@@ -15,7 +16,6 @@ etc/CORBA/servers/gnomecc.gnorba
 etc/cappletConf.sh
 include/capplet-widget.h
 lib/libcapplet.a
-lib/libcapplet.la
 lib/libcapplet.so
 lib/libcapplet.so.1.0
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
@@ -25,22 +25,19 @@ share/gnome/apps/Settings/Desktop/background-properties.desktop
 share/gnome/apps/Settings/Desktop/screensaver-properties.desktop
 share/gnome/apps/Settings/Desktop/theme-selector.desktop
 share/gnome/apps/Settings/Desktop/wm-properties.desktop
-@dirrm share/gnome/apps/Settings/Desktop
 share/gnome/apps/Settings/Multimedia/.directory
 share/gnome/apps/Settings/Multimedia/bell-properties.desktop
 share/gnome/apps/Settings/Multimedia/sound-properties.desktop
-@dirrm share/gnome/apps/Settings/Multimedia
 share/gnome/apps/Settings/Peripherals/.directory
 share/gnome/apps/Settings/Peripherals/keyboard-properties.desktop
 share/gnome/apps/Settings/Peripherals/mouse-properties.desktop
-@dirrm share/gnome/apps/Settings/Peripherals
 share/gnome/apps/Settings/UIOptions/.directory
 share/gnome/apps/Settings/UIOptions/application.desktop
 share/gnome/apps/Settings/UIOptions/dialogs.desktop
 share/gnome/apps/Settings/UIOptions/mdi.desktop
-@dirrm share/gnome/apps/Settings/UIOptions
 share/gnome/apps/Settings/gnome-edit-properties.desktop
 share/gnome/apps/Settings/gnomecc.desktop
+share/gnome/apps/Settings/mime-type.desktop
 share/gnome/apps/Settings/session-properties.desktop
 share/gnome/apps/Settings/url-properties.desktop
 share/gnome/control-center/.data/3d.desktop
@@ -149,31 +146,26 @@ share/gnome/control-center/.data/lisa.png
 share/gnome/control-center/.data/maze.png
 share/gnome/control-center/.data/qix.png
 share/gnome/control-center/.data/starfish.png
-@dirrm share/gnome/control-center/.data
 share/gnome/control-center/.directory
 share/gnome/control-center/Desktop/.directory
 share/gnome/control-center/Desktop/background-properties.desktop
 share/gnome/control-center/Desktop/screensaver-properties.desktop
 share/gnome/control-center/Desktop/theme-selector.desktop
 share/gnome/control-center/Desktop/wm-properties.desktop
-@dirrm share/gnome/control-center/Desktop
 share/gnome/control-center/Multimedia/.directory
 share/gnome/control-center/Multimedia/bell-properties.desktop
 share/gnome/control-center/Multimedia/sound-properties.desktop
-@dirrm share/gnome/control-center/Multimedia
 share/gnome/control-center/Peripherals/.directory
 share/gnome/control-center/Peripherals/keyboard-properties.desktop
 share/gnome/control-center/Peripherals/mouse-properties.desktop
-@dirrm share/gnome/control-center/Peripherals
 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
-@dirrm share/gnome/control-center/UIOptions
 share/gnome/control-center/gnome-edit-properties.desktop
+share/gnome/control-center/mime-type.desktop
 share/gnome/control-center/session-properties.desktop
 share/gnome/control-center/url-properties.desktop
-@dirrm share/gnome/control-center
 share/gnome/idl/control-center.idl
 share/gnome/pixmaps/control-center.png
 share/gnome/wm-properties/Enlightenment.desktop
@@ -195,3 +187,14 @@ share/locale/pl/LC_MESSAGES/control-center.mo
 share/locale/pt/LC_MESSAGES/control-center.mo
 share/locale/ru/LC_MESSAGES/control-center.mo
 share/locale/sv/LC_MESSAGES/control-center.mo
+@dirrm share/gnome/wm-properties
+@dirrm share/gnome/control-center/UIOptions
+@dirrm share/gnome/control-center/Peripherals
+@dirrm share/gnome/control-center/Multimedia
+@dirrm share/gnome/control-center/Desktop
+@dirrm share/gnome/control-center/.data
+@dirrm share/gnome/control-center
+@dirrm share/gnome/apps/Settings/UIOptions
+@dirrm share/gnome/apps/Settings/Peripherals
+@dirrm share/gnome/apps/Settings/Multimedia
+@dirrm share/gnome/apps/Settings/Desktop
diff --git a/sysutils/gnome-control-center1/Makefile b/sysutils/gnome-control-center1/Makefile
index cb7f6b440649..389fb83a011d 100644
--- a/sysutils/gnome-control-center1/Makefile
+++ b/sysutils/gnome-control-center1/Makefile
@@ -3,7 +3,7 @@
 # Date created:				29 Dec 1998
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.9 1999/04/08 18:08:37 steve Exp $
+# $Id: Makefile,v 1.10 1999/05/09 17:03:26 steve Exp $
 #
 
 DISTNAME=	control-center-1.0.5
@@ -17,19 +17,16 @@ MAINTAINER=	vanilla@FreeBSD.ORG
 BUILD_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
 RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
 
-USE_LIBTOOL=	yes
-LIBTOOL=	${LOCALBASE}/bin/libtool
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
-		--with-gnome=${X11BASE}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		GTK_CONFIG="${X11BASE}/bin/gtk12-config" \
-		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
-
-post-install:
-	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+		--with-gnome=${PREFIX}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		GTK_CONFIG="${GTK_CONFIG}" \
+		LIBS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/sysutils/gnome-control-center1/files/patch-ce b/sysutils/gnome-control-center1/files/patch-ce
new file mode 100644
index 000000000000..b2186ac89c4c
--- /dev/null
+++ b/sysutils/gnome-control-center1/files/patch-ce
@@ -0,0 +1,8 @@
+--- capplets/wm-properties/wm-desktops/WindowMaker.desktop.orig	Wed May 12 02:56:05 1999
++++ capplets/wm-properties/wm-desktops/WindowMaker.desktop	Wed May 12 02:56:22 1999
+@@ -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
diff --git a/sysutils/gnome-control-center1/pkg-plist b/sysutils/gnome-control-center1/pkg-plist
index f774ce748543..6a93bd2f79c5 100644
--- a/sysutils/gnome-control-center1/pkg-plist
+++ b/sysutils/gnome-control-center1/pkg-plist
@@ -3,6 +3,7 @@ bin/bell-properties-capplet
 bin/gnome-edit-properties-capplet
 bin/gnomecc
 bin/keyboard-properties
+bin/mime-type-capplet
 bin/mouse-properties-capplet
 bin/screensaver-properties-capplet
 bin/session-properties-capplet
@@ -15,7 +16,6 @@ etc/CORBA/servers/gnomecc.gnorba
 etc/cappletConf.sh
 include/capplet-widget.h
 lib/libcapplet.a
-lib/libcapplet.la
 lib/libcapplet.so
 lib/libcapplet.so.1.0
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
@@ -25,22 +25,19 @@ share/gnome/apps/Settings/Desktop/background-properties.desktop
 share/gnome/apps/Settings/Desktop/screensaver-properties.desktop
 share/gnome/apps/Settings/Desktop/theme-selector.desktop
 share/gnome/apps/Settings/Desktop/wm-properties.desktop
-@dirrm share/gnome/apps/Settings/Desktop
 share/gnome/apps/Settings/Multimedia/.directory
 share/gnome/apps/Settings/Multimedia/bell-properties.desktop
 share/gnome/apps/Settings/Multimedia/sound-properties.desktop
-@dirrm share/gnome/apps/Settings/Multimedia
 share/gnome/apps/Settings/Peripherals/.directory
 share/gnome/apps/Settings/Peripherals/keyboard-properties.desktop
 share/gnome/apps/Settings/Peripherals/mouse-properties.desktop
-@dirrm share/gnome/apps/Settings/Peripherals
 share/gnome/apps/Settings/UIOptions/.directory
 share/gnome/apps/Settings/UIOptions/application.desktop
 share/gnome/apps/Settings/UIOptions/dialogs.desktop
 share/gnome/apps/Settings/UIOptions/mdi.desktop
-@dirrm share/gnome/apps/Settings/UIOptions
 share/gnome/apps/Settings/gnome-edit-properties.desktop
 share/gnome/apps/Settings/gnomecc.desktop
+share/gnome/apps/Settings/mime-type.desktop
 share/gnome/apps/Settings/session-properties.desktop
 share/gnome/apps/Settings/url-properties.desktop
 share/gnome/control-center/.data/3d.desktop
@@ -149,31 +146,26 @@ share/gnome/control-center/.data/lisa.png
 share/gnome/control-center/.data/maze.png
 share/gnome/control-center/.data/qix.png
 share/gnome/control-center/.data/starfish.png
-@dirrm share/gnome/control-center/.data
 share/gnome/control-center/.directory
 share/gnome/control-center/Desktop/.directory
 share/gnome/control-center/Desktop/background-properties.desktop
 share/gnome/control-center/Desktop/screensaver-properties.desktop
 share/gnome/control-center/Desktop/theme-selector.desktop
 share/gnome/control-center/Desktop/wm-properties.desktop
-@dirrm share/gnome/control-center/Desktop
 share/gnome/control-center/Multimedia/.directory
 share/gnome/control-center/Multimedia/bell-properties.desktop
 share/gnome/control-center/Multimedia/sound-properties.desktop
-@dirrm share/gnome/control-center/Multimedia
 share/gnome/control-center/Peripherals/.directory
 share/gnome/control-center/Peripherals/keyboard-properties.desktop
 share/gnome/control-center/Peripherals/mouse-properties.desktop
-@dirrm share/gnome/control-center/Peripherals
 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
-@dirrm share/gnome/control-center/UIOptions
 share/gnome/control-center/gnome-edit-properties.desktop
+share/gnome/control-center/mime-type.desktop
 share/gnome/control-center/session-properties.desktop
 share/gnome/control-center/url-properties.desktop
-@dirrm share/gnome/control-center
 share/gnome/idl/control-center.idl
 share/gnome/pixmaps/control-center.png
 share/gnome/wm-properties/Enlightenment.desktop
@@ -195,3 +187,14 @@ share/locale/pl/LC_MESSAGES/control-center.mo
 share/locale/pt/LC_MESSAGES/control-center.mo
 share/locale/ru/LC_MESSAGES/control-center.mo
 share/locale/sv/LC_MESSAGES/control-center.mo
+@dirrm share/gnome/wm-properties
+@dirrm share/gnome/control-center/UIOptions
+@dirrm share/gnome/control-center/Peripherals
+@dirrm share/gnome/control-center/Multimedia
+@dirrm share/gnome/control-center/Desktop
+@dirrm share/gnome/control-center/.data
+@dirrm share/gnome/control-center
+@dirrm share/gnome/apps/Settings/UIOptions
+@dirrm share/gnome/apps/Settings/Peripherals
+@dirrm share/gnome/apps/Settings/Multimedia
+@dirrm share/gnome/apps/Settings/Desktop
diff --git a/sysutils/gnomecontrolcenter/Makefile b/sysutils/gnomecontrolcenter/Makefile
index cb7f6b440649..389fb83a011d 100644
--- a/sysutils/gnomecontrolcenter/Makefile
+++ b/sysutils/gnomecontrolcenter/Makefile
@@ -3,7 +3,7 @@
 # Date created:				29 Dec 1998
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.9 1999/04/08 18:08:37 steve Exp $
+# $Id: Makefile,v 1.10 1999/05/09 17:03:26 steve Exp $
 #
 
 DISTNAME=	control-center-1.0.5
@@ -17,19 +17,16 @@ MAINTAINER=	vanilla@FreeBSD.ORG
 BUILD_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
 RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
 
-USE_LIBTOOL=	yes
-LIBTOOL=	${LOCALBASE}/bin/libtool
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
-		--with-gnome=${X11BASE}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		GTK_CONFIG="${X11BASE}/bin/gtk12-config" \
-		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
-
-post-install:
-	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+		--with-gnome=${PREFIX}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		GTK_CONFIG="${GTK_CONFIG}" \
+		LIBS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/sysutils/gnomecontrolcenter/files/patch-ce b/sysutils/gnomecontrolcenter/files/patch-ce
new file mode 100644
index 000000000000..b2186ac89c4c
--- /dev/null
+++ b/sysutils/gnomecontrolcenter/files/patch-ce
@@ -0,0 +1,8 @@
+--- capplets/wm-properties/wm-desktops/WindowMaker.desktop.orig	Wed May 12 02:56:05 1999
++++ capplets/wm-properties/wm-desktops/WindowMaker.desktop	Wed May 12 02:56:22 1999
+@@ -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
diff --git a/sysutils/gnomecontrolcenter/pkg-plist b/sysutils/gnomecontrolcenter/pkg-plist
index f774ce748543..6a93bd2f79c5 100644
--- a/sysutils/gnomecontrolcenter/pkg-plist
+++ b/sysutils/gnomecontrolcenter/pkg-plist
@@ -3,6 +3,7 @@ bin/bell-properties-capplet
 bin/gnome-edit-properties-capplet
 bin/gnomecc
 bin/keyboard-properties
+bin/mime-type-capplet
 bin/mouse-properties-capplet
 bin/screensaver-properties-capplet
 bin/session-properties-capplet
@@ -15,7 +16,6 @@ etc/CORBA/servers/gnomecc.gnorba
 etc/cappletConf.sh
 include/capplet-widget.h
 lib/libcapplet.a
-lib/libcapplet.la
 lib/libcapplet.so
 lib/libcapplet.so.1.0
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
@@ -25,22 +25,19 @@ share/gnome/apps/Settings/Desktop/background-properties.desktop
 share/gnome/apps/Settings/Desktop/screensaver-properties.desktop
 share/gnome/apps/Settings/Desktop/theme-selector.desktop
 share/gnome/apps/Settings/Desktop/wm-properties.desktop
-@dirrm share/gnome/apps/Settings/Desktop
 share/gnome/apps/Settings/Multimedia/.directory
 share/gnome/apps/Settings/Multimedia/bell-properties.desktop
 share/gnome/apps/Settings/Multimedia/sound-properties.desktop
-@dirrm share/gnome/apps/Settings/Multimedia
 share/gnome/apps/Settings/Peripherals/.directory
 share/gnome/apps/Settings/Peripherals/keyboard-properties.desktop
 share/gnome/apps/Settings/Peripherals/mouse-properties.desktop
-@dirrm share/gnome/apps/Settings/Peripherals
 share/gnome/apps/Settings/UIOptions/.directory
 share/gnome/apps/Settings/UIOptions/application.desktop
 share/gnome/apps/Settings/UIOptions/dialogs.desktop
 share/gnome/apps/Settings/UIOptions/mdi.desktop
-@dirrm share/gnome/apps/Settings/UIOptions
 share/gnome/apps/Settings/gnome-edit-properties.desktop
 share/gnome/apps/Settings/gnomecc.desktop
+share/gnome/apps/Settings/mime-type.desktop
 share/gnome/apps/Settings/session-properties.desktop
 share/gnome/apps/Settings/url-properties.desktop
 share/gnome/control-center/.data/3d.desktop
@@ -149,31 +146,26 @@ share/gnome/control-center/.data/lisa.png
 share/gnome/control-center/.data/maze.png
 share/gnome/control-center/.data/qix.png
 share/gnome/control-center/.data/starfish.png
-@dirrm share/gnome/control-center/.data
 share/gnome/control-center/.directory
 share/gnome/control-center/Desktop/.directory
 share/gnome/control-center/Desktop/background-properties.desktop
 share/gnome/control-center/Desktop/screensaver-properties.desktop
 share/gnome/control-center/Desktop/theme-selector.desktop
 share/gnome/control-center/Desktop/wm-properties.desktop
-@dirrm share/gnome/control-center/Desktop
 share/gnome/control-center/Multimedia/.directory
 share/gnome/control-center/Multimedia/bell-properties.desktop
 share/gnome/control-center/Multimedia/sound-properties.desktop
-@dirrm share/gnome/control-center/Multimedia
 share/gnome/control-center/Peripherals/.directory
 share/gnome/control-center/Peripherals/keyboard-properties.desktop
 share/gnome/control-center/Peripherals/mouse-properties.desktop
-@dirrm share/gnome/control-center/Peripherals
 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
-@dirrm share/gnome/control-center/UIOptions
 share/gnome/control-center/gnome-edit-properties.desktop
+share/gnome/control-center/mime-type.desktop
 share/gnome/control-center/session-properties.desktop
 share/gnome/control-center/url-properties.desktop
-@dirrm share/gnome/control-center
 share/gnome/idl/control-center.idl
 share/gnome/pixmaps/control-center.png
 share/gnome/wm-properties/Enlightenment.desktop
@@ -195,3 +187,14 @@ share/locale/pl/LC_MESSAGES/control-center.mo
 share/locale/pt/LC_MESSAGES/control-center.mo
 share/locale/ru/LC_MESSAGES/control-center.mo
 share/locale/sv/LC_MESSAGES/control-center.mo
+@dirrm share/gnome/wm-properties
+@dirrm share/gnome/control-center/UIOptions
+@dirrm share/gnome/control-center/Peripherals
+@dirrm share/gnome/control-center/Multimedia
+@dirrm share/gnome/control-center/Desktop
+@dirrm share/gnome/control-center/.data
+@dirrm share/gnome/control-center
+@dirrm share/gnome/apps/Settings/UIOptions
+@dirrm share/gnome/apps/Settings/Peripherals
+@dirrm share/gnome/apps/Settings/Multimedia
+@dirrm share/gnome/apps/Settings/Desktop
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index cb7f6b440649..389fb83a011d 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -3,7 +3,7 @@
 # Date created:				29 Dec 1998
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.9 1999/04/08 18:08:37 steve Exp $
+# $Id: Makefile,v 1.10 1999/05/09 17:03:26 steve Exp $
 #
 
 DISTNAME=	control-center-1.0.5
@@ -17,19 +17,16 @@ MAINTAINER=	vanilla@FreeBSD.ORG
 BUILD_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
 RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
 
-USE_LIBTOOL=	yes
-LIBTOOL=	${LOCALBASE}/bin/libtool
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
-		--with-gnome=${X11BASE}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		GTK_CONFIG="${X11BASE}/bin/gtk12-config" \
-		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
-
-post-install:
-	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+		--with-gnome=${PREFIX}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		GTK_CONFIG="${GTK_CONFIG}" \
+		LIBS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/sysutils/gnomecontrolcenter2/files/patch-ce b/sysutils/gnomecontrolcenter2/files/patch-ce
new file mode 100644
index 000000000000..b2186ac89c4c
--- /dev/null
+++ b/sysutils/gnomecontrolcenter2/files/patch-ce
@@ -0,0 +1,8 @@
+--- capplets/wm-properties/wm-desktops/WindowMaker.desktop.orig	Wed May 12 02:56:05 1999
++++ capplets/wm-properties/wm-desktops/WindowMaker.desktop	Wed May 12 02:56:22 1999
+@@ -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
diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist
index f774ce748543..6a93bd2f79c5 100644
--- a/sysutils/gnomecontrolcenter2/pkg-plist
+++ b/sysutils/gnomecontrolcenter2/pkg-plist
@@ -3,6 +3,7 @@ bin/bell-properties-capplet
 bin/gnome-edit-properties-capplet
 bin/gnomecc
 bin/keyboard-properties
+bin/mime-type-capplet
 bin/mouse-properties-capplet
 bin/screensaver-properties-capplet
 bin/session-properties-capplet
@@ -15,7 +16,6 @@ etc/CORBA/servers/gnomecc.gnorba
 etc/cappletConf.sh
 include/capplet-widget.h
 lib/libcapplet.a
-lib/libcapplet.la
 lib/libcapplet.so
 lib/libcapplet.so.1.0
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
@@ -25,22 +25,19 @@ share/gnome/apps/Settings/Desktop/background-properties.desktop
 share/gnome/apps/Settings/Desktop/screensaver-properties.desktop
 share/gnome/apps/Settings/Desktop/theme-selector.desktop
 share/gnome/apps/Settings/Desktop/wm-properties.desktop
-@dirrm share/gnome/apps/Settings/Desktop
 share/gnome/apps/Settings/Multimedia/.directory
 share/gnome/apps/Settings/Multimedia/bell-properties.desktop
 share/gnome/apps/Settings/Multimedia/sound-properties.desktop
-@dirrm share/gnome/apps/Settings/Multimedia
 share/gnome/apps/Settings/Peripherals/.directory
 share/gnome/apps/Settings/Peripherals/keyboard-properties.desktop
 share/gnome/apps/Settings/Peripherals/mouse-properties.desktop
-@dirrm share/gnome/apps/Settings/Peripherals
 share/gnome/apps/Settings/UIOptions/.directory
 share/gnome/apps/Settings/UIOptions/application.desktop
 share/gnome/apps/Settings/UIOptions/dialogs.desktop
 share/gnome/apps/Settings/UIOptions/mdi.desktop
-@dirrm share/gnome/apps/Settings/UIOptions
 share/gnome/apps/Settings/gnome-edit-properties.desktop
 share/gnome/apps/Settings/gnomecc.desktop
+share/gnome/apps/Settings/mime-type.desktop
 share/gnome/apps/Settings/session-properties.desktop
 share/gnome/apps/Settings/url-properties.desktop
 share/gnome/control-center/.data/3d.desktop
@@ -149,31 +146,26 @@ share/gnome/control-center/.data/lisa.png
 share/gnome/control-center/.data/maze.png
 share/gnome/control-center/.data/qix.png
 share/gnome/control-center/.data/starfish.png
-@dirrm share/gnome/control-center/.data
 share/gnome/control-center/.directory
 share/gnome/control-center/Desktop/.directory
 share/gnome/control-center/Desktop/background-properties.desktop
 share/gnome/control-center/Desktop/screensaver-properties.desktop
 share/gnome/control-center/Desktop/theme-selector.desktop
 share/gnome/control-center/Desktop/wm-properties.desktop
-@dirrm share/gnome/control-center/Desktop
 share/gnome/control-center/Multimedia/.directory
 share/gnome/control-center/Multimedia/bell-properties.desktop
 share/gnome/control-center/Multimedia/sound-properties.desktop
-@dirrm share/gnome/control-center/Multimedia
 share/gnome/control-center/Peripherals/.directory
 share/gnome/control-center/Peripherals/keyboard-properties.desktop
 share/gnome/control-center/Peripherals/mouse-properties.desktop
-@dirrm share/gnome/control-center/Peripherals
 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
-@dirrm share/gnome/control-center/UIOptions
 share/gnome/control-center/gnome-edit-properties.desktop
+share/gnome/control-center/mime-type.desktop
 share/gnome/control-center/session-properties.desktop
 share/gnome/control-center/url-properties.desktop
-@dirrm share/gnome/control-center
 share/gnome/idl/control-center.idl
 share/gnome/pixmaps/control-center.png
 share/gnome/wm-properties/Enlightenment.desktop
@@ -195,3 +187,14 @@ share/locale/pl/LC_MESSAGES/control-center.mo
 share/locale/pt/LC_MESSAGES/control-center.mo
 share/locale/ru/LC_MESSAGES/control-center.mo
 share/locale/sv/LC_MESSAGES/control-center.mo
+@dirrm share/gnome/wm-properties
+@dirrm share/gnome/control-center/UIOptions
+@dirrm share/gnome/control-center/Peripherals
+@dirrm share/gnome/control-center/Multimedia
+@dirrm share/gnome/control-center/Desktop
+@dirrm share/gnome/control-center/.data
+@dirrm share/gnome/control-center
+@dirrm share/gnome/apps/Settings/UIOptions
+@dirrm share/gnome/apps/Settings/Peripherals
+@dirrm share/gnome/apps/Settings/Multimedia
+@dirrm share/gnome/apps/Settings/Desktop