4 files changed, 71 insertions, 24 deletions

diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index 5ad347088d19..4b0ef4a6e5ec 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -3,11 +3,11 @@
 # Date created:				29 Dec 1998
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.5 1999/01/31 20:48:01 vanilla Exp $
+# $Id: Makefile,v 1.6 1999/03/09 01:09:01 nectar Exp $
 #
 
-DISTNAME=	control-center-1.0.1
-PKGNAME=	gnomecontrolcenter-1.0.1
+DISTNAME=	control-center-1.0.2
+PKGNAME=	gnomecontrolcenter-1.0.2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	gnome-1.0/sources
diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo
index a3cdd5cebb34..cede5593940a 100644
--- a/sysutils/gnomecontrolcenter2/distinfo
+++ b/sysutils/gnomecontrolcenter2/distinfo
@@ -1 +1 @@
-MD5 (control-center-1.0.1.tar.gz) = 8a95c168ed351ae2f14c18a0256e2ffb
+MD5 (control-center-1.0.2.tar.gz) = fa1f6f939def478d0ec5b75e260e90b9
diff --git a/sysutils/gnomecontrolcenter2/files/patch-bn b/sysutils/gnomecontrolcenter2/files/patch-bn
new file mode 100644
index 000000000000..ae5c2bce9813
--- /dev/null
+++ b/sysutils/gnomecontrolcenter2/files/patch-bn
@@ -0,0 +1,31 @@
+--- control-center/Makefile.in.orig	Mon Mar  1 00:10:13 1999
++++ control-center/Makefile.in	Tue Mar  2 22:17:32 1999
+@@ -130,7 +130,7 @@
+ cxxflags_set = @cxxflags_set@
+ l = @l@
+ 
+-INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(top_srcdir)/intl -I$(top_builddir)/intl		-I$(includedir) $(GNOME_INCLUDEDIR)			-DVERSION=\""$(VERSION)"\"
++INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(top_srcdir)/intl -I$(top_builddir)/intl		-I$(includedir) $(GNOME_INCLUDEDIR)			-DVERSION=\""$(VERSION)"\"
+ 
+ 
+ bin_PROGRAMS = gnomecc
+@@ -150,16 +150,16 @@
+ 
+ EXTRA_DIST = gnomecc.desktop cappletConf.sh.in $(appicon_DATA)
+ 
+-sysdir = $(datadir)/gnome/apps/Settings
++sysdir = $(datadir)/apps/Settings
+ sys_DATA = gnomecc.desktop
+ 
+-confexecdir = $(libdir)
++confexecdir = $(sysconfdir)
+ confexec_DATA = cappletConf.sh
+ 
+ libcapplet_la_SOURCES =  	capplet-widget.c		capplet-widget-libs.c		capplet-widget-libs.h		$(CORBA_SRCLIST)
+ 
+ 
+-libcapplet_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
++libcapplet_la_LDFLAGS = -version-info 1:0:0
+ libcapplet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB) $(GNORBA_LIBS)
+ 
+ include_HEADERS = capplet-widget.h
diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist
index fe491fb06b90..a60d8287d84b 100644
--- a/sysutils/gnomecontrolcenter2/pkg-plist
+++ b/sysutils/gnomecontrolcenter2/pkg-plist
@@ -12,29 +12,41 @@ bin/ui-properties
 bin/url-properties
 bin/wm-properties-capplet
 etc/CORBA/servers/gnomecc.gnorba
+etc/CORBA/servers
+@dirrm etc/CORBA/servers
+@dirrm etc/CORBA
 etc/cappletConf.sh
-include/capplet-widget.h
 lib/libcapplet.a
 lib/libcapplet.la
 lib/libcapplet.so
-lib/libcapplet.so.1
+lib/libcapplet.so.1.0
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-share/gnome/apps/Settings/application.desktop
-share/gnome/apps/Settings/background-properties.desktop
-share/gnome/apps/Settings/bell-properties.desktop
-share/gnome/apps/Settings/dialogs.desktop
+share/gnome/apps/Settings/Desktop/.directory
+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/keyboard-properties.desktop
-share/gnome/apps/Settings/mdi.desktop
-share/gnome/apps/Settings/mouse-properties.desktop
-share/gnome/apps/Settings/screensaver-properties.desktop
 share/gnome/apps/Settings/session-properties.desktop
-share/gnome/apps/Settings/sound-properties.desktop
-share/gnome/apps/Settings/theme-selector.desktop
 share/gnome/apps/Settings/url-properties.desktop
-share/gnome/apps/Settings/wm-properties.desktop
+@dirrm share/gnome/apps/Settings
+@dirrm share/gnome/apps
 share/gnome/control-center/.data/Ant.desktop
 share/gnome/control-center/.data/Attraction.desktop
 share/gnome/control-center/.data/Blitspin.desktop
@@ -138,30 +150,40 @@ share/gnome/control-center/.data/lightning.png
 share/gnome/control-center/.data/lisa.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/session-properties.desktop
 share/gnome/control-center/url-properties.desktop
+@dirrm share/gnome/control-center
 share/gnome/idl/control-center.idl
+@dirrm share/gnome/idl
 share/gnome/pixmaps/control-center.png
+@dirrm share/gnome/pixmaps
 share/gnome/wm-properties/Enlightenment.desktop
 share/gnome/wm-properties/IceWM.desktop
 share/gnome/wm-properties/WindowMaker.desktop
+@dirrm share/gnome/wm-properties
+@dirrm share/gnome
 share/locale/cs/LC_MESSAGES/control-center.mo
 share/locale/da/LC_MESSAGES/control-center.mo
 share/locale/de/LC_MESSAGES/control-center.mo
@@ -178,10 +200,4 @@ 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
+