aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CVSROOT/modules4
-rw-r--r--MOVED2
-rw-r--r--Mk/bsd.gnome.mk2
-rw-r--r--sysutils/Makefile4
-rw-r--r--sysutils/gnome-control-center/Makefile3
-rw-r--r--sysutils/gnome-control-center1/Makefile4
-rw-r--r--sysutils/gnomecontrolcenter/Makefile30
-rw-r--r--sysutils/gnomecontrolcenter/distinfo3
-rw-r--r--sysutils/gnomecontrolcenter/files/patch-Makefile.in14
-rw-r--r--sysutils/gnomecontrolcenter/files/patch-ad11
-rw-r--r--sysutils/gnomecontrolcenter/files/patch-bn54
-rw-r--r--sysutils/gnomecontrolcenter/files/patch-capplets::theme-switcher::lister.c15
-rw-r--r--sysutils/gnomecontrolcenter/files/patch-capplets_file-types_file-types-icon-entry.c11
-rw-r--r--sysutils/gnomecontrolcenter/files/patch-ce8
-rw-r--r--sysutils/gnomecontrolcenter/files/patch-configure11
-rw-r--r--sysutils/gnomecontrolcenter/files/patch-idl::Makefile.in14
-rw-r--r--sysutils/gnomecontrolcenter/files/patch-ltmain.sh45
-rw-r--r--sysutils/gnomecontrolcenter/files/patch-po::Makefile.in.in14
-rw-r--r--sysutils/gnomecontrolcenter/pkg-descr1
-rw-r--r--sysutils/gnomecontrolcenter/pkg-plist185
-rw-r--r--sysutils/gnomecontrolcenter2/Makefile74
-rw-r--r--sysutils/gnomecontrolcenter2/distinfo3
-rw-r--r--sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me-password.c25
-rw-r--r--sysutils/gnomecontrolcenter2/files/patch-capplets_gnome-keyboard-properties-xkbot.c17
-rw-r--r--sysutils/gnomecontrolcenter2/files/patch-configure19
-rw-r--r--sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_actions_acme-volume-gstreamer.c10
-rw-r--r--sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c11
-rw-r--r--sysutils/gnomecontrolcenter2/files/patch-libwindow-settings_gnome-wm-manager.c11
-rw-r--r--sysutils/gnomecontrolcenter2/pkg-descr1
-rw-r--r--sysutils/gnomecontrolcenter2/pkg-plist261
-rw-r--r--x11/gnome2-lite/Makefile2
-rw-r--r--x11/gnome2/Makefile2
32 files changed, 13 insertions, 858 deletions
diff --git a/CVSROOT/modules b/CVSROOT/modules
index 343f1a5902ee..d5e06752a87a 100644
--- a/CVSROOT/modules
+++ b/CVSROOT/modules
@@ -3222,6 +3222,8 @@ gnome-colorscheme ports/graphics/gnome-colorscheme
gnome-commander ports/x11-fm/gnome-commander
gnome-commander2 ports/x11-fm/gnome-commander2
gnome-common ports/devel/gnome-common
+gnome-control-center ports/sysutils/gnome-control-center
+gnome-control-center1 ports/sysutils/gnome-control-center1
gnome-crash ports/devel/gnome-crash
gnome-cups-manager ports/print/gnome-cups-manager
gnome-db ports/databases/gnome-db
@@ -3296,8 +3298,6 @@ gnomebasic ports/lang/gnomebasic
gnomebreakout ports/games/gnomebreakout
gnomecanvas ports/graphics/gnomecanvas
gnomechess ports/games/gnomechess
-gnomecontrolcenter ports/sysutils/gnomecontrolcenter
-gnomecontrolcenter2 ports/sysutils/gnomecontrolcenter2
gnomedesktop ports/x11/gnomedesktop
gnomedesktop-reference ports/x11/gnomedesktop-reference
gnomedocutils ports/textproc/gnomedocutils
diff --git a/MOVED b/MOVED
index c8686c2cbc19..cd25323251c3 100644
--- a/MOVED
+++ b/MOVED
@@ -2327,3 +2327,5 @@ net/gnomenetstatus|net/gnome-netstatus|2006-05-28|Renamed to use real vendor pac
net/gnomenettool|net/gnome-nettool|2006-05-28|Renamed to use real vendor package name
security/gnomekeyring|security/gnome-keyring|2006-05-28|Renamed to use real vendor package name
security/gnomekeyringmanager|security/gnome-keyring-manager|2006-05-28|Renamed to use real vendor package name
+sysutils/gnomecontrolcenter|sysutils/gnome-control-center1|2006-05-28|Renamed to use real vendor package name
+sysutils/gnomecontrolcenter2|sysutils/gnome-control-center|2006-05-28|Renamed to use real vendor package name
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk
index 18d3ec17ed07..691f3c88cffb 100644
--- a/Mk/bsd.gnome.mk
+++ b/Mk/bsd.gnome.mk
@@ -401,7 +401,7 @@ gal2_LIB_DEPENDS= gal-2.4.0:${PORTSDIR}/x11-toolkits/gal2
gal2_DETECT= ${X11BASE}/libdata/pkgconfig/gal-2.4.pc
gal2_USE_GNOME_IMPL=gnomeui libgnomeprintui
-gnomecontrolcenter2_LIB_DEPENDS=gnome-window-settings.1:${PORTSDIR}/sysutils/gnomecontrolcenter2
+gnomecontrolcenter2_LIB_DEPENDS=gnome-window-settings.1:${PORTSDIR}/sysutils/gnome-control-center
gnomecontrolcenter2_DETECT=${X11BASE}/libdata/pkgconfig/gnome-window-settings-2.0.pc
gnomecontrolcenter2_USE_GNOME_IMPL=desktopfileutils gnomedesktop gnomemenus metacity nautilus2 desktopfileutils
diff --git a/sysutils/Makefile b/sysutils/Makefile
index 1a3b8c347dad..a8021cba1fe1 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -205,11 +205,11 @@
SUBDIR += gkrelltop
SUBDIR += gksu
SUBDIR += glload
+ SUBDIR += gnome-control-center
+ SUBDIR += gnome-control-center1
SUBDIR += gnome-pkgview
SUBDIR += gnome-schedule
SUBDIR += gnomebaker
- SUBDIR += gnomecontrolcenter
- SUBDIR += gnomecontrolcenter2
SUBDIR += gnomefind
SUBDIR += gnomesu
SUBDIR += gnomesystemmonitor
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 10adbe119774..0f1f106d3c78 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -3,10 +3,9 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnomecontrolcenter2/Makefile,v 1.109 2006/04/18 02:28:56 marcus Exp $
#
-PORTNAME= gnomecontrolcenter2
+PORTNAME= gnome-control-center
PORTVERSION= 2.14.1
PORTREVISION= 2
CATEGORIES= sysutils gnome
diff --git a/sysutils/gnome-control-center1/Makefile b/sysutils/gnome-control-center1/Makefile
index eeb6bff1f9ce..f611d3b6b129 100644
--- a/sysutils/gnome-control-center1/Makefile
+++ b/sysutils/gnome-control-center1/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTNAME= gnomecontrolcenter
+PORTNAME= gnome-control-center
PORTVERSION= 1.4.0.5
PORTREVISION= 4
CATEGORIES= sysutils gnome
@@ -27,4 +27,6 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
+LATEST_LINK= gnome-control-center1
+
.include <bsd.port.mk>
diff --git a/sysutils/gnomecontrolcenter/Makefile b/sysutils/gnomecontrolcenter/Makefile
deleted file mode 100644
index eeb6bff1f9ce..000000000000
--- a/sysutils/gnomecontrolcenter/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# New ports collection makefile for: control-center
-# Date created: 29 Dec 1998
-# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME= gnomecontrolcenter
-PORTVERSION= 1.4.0.5
-PORTREVISION= 4
-CATEGORIES= sysutils gnome
-MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/control-center/1.4
-DISTNAME= control-center-${PORTVERSION}
-DIST_SUBDIR= gnome
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= Control center for GNOME project
-
-USE_BZIP2= yes
-USE_X_PREFIX= yes
-USE_GMAKE= yes
-USE_GNOME= gnomeprefix gnomehack gnomecanvas gnomevfs libcapplet
-USE_GETTEXT= yes
-INSTALLS_OMF= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
-
-.include <bsd.port.mk>
diff --git a/sysutils/gnomecontrolcenter/distinfo b/sysutils/gnomecontrolcenter/distinfo
deleted file mode 100644
index 14895bd81cbf..000000000000
--- a/sysutils/gnomecontrolcenter/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome/control-center-1.4.0.5.tar.bz2) = 63e731f7c9f5fca354de5de4f881e952
-SHA256 (gnome/control-center-1.4.0.5.tar.bz2) = bfefec4042b0bc64463f07c4486c5af65b20c07974b184f8a547f77ea20ced06
-SIZE (gnome/control-center-1.4.0.5.tar.bz2) = 3382798
diff --git a/sysutils/gnomecontrolcenter/files/patch-Makefile.in b/sysutils/gnomecontrolcenter/files/patch-Makefile.in
deleted file mode 100644
index feb63528f70a..000000000000
--- a/sysutils/gnomecontrolcenter/files/patch-Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.in 2002/02/05 09:46:12 1.1
-+++ Makefile.in 2002/02/05 09:46:25
-@@ -151,7 +151,7 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
-
--always_built_SUBDIRS = control-center capplets idl doc omf-install man
-+always_built_SUBDIRS = control-center capplets idl doc omf-install
-
- SUBDIRS = intl po macros \
- $(always_built_SUBDIRS)
diff --git a/sysutils/gnomecontrolcenter/files/patch-ad b/sysutils/gnomecontrolcenter/files/patch-ad
deleted file mode 100644
index c27189a35ee9..000000000000
--- a/sysutils/gnomecontrolcenter/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/gnomecontrolcenter/files/patch-bn b/sysutils/gnomecontrolcenter/files/patch-bn
deleted file mode 100644
index 737c98cab630..000000000000
--- a/sysutils/gnomecontrolcenter/files/patch-bn
+++ /dev/null
@@ -1,54 +0,0 @@
-
-$FreeBSD$
-
---- control-center/Makefile.in.orig Wed Jul 10 16:48:34 2002
-+++ control-center/Makefile.in Wed Jul 10 16:51:37 2002
-@@ -208,7 +208,7 @@
- sys_in_files = gnomecc.desktop.in
- sys_DATA = $(sys_in_files:.desktop.in=.desktop)
-
--confexecdir = $(libdir)
-+confexecdir = $(sysconfdir)
- confexec_DATA = cappletConf.sh
-
- libcapplet_la_SOURCES = \
-@@ -218,7 +218,7 @@
- $(CORBA_SRCLIST)
-
-
--libcapplet_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
-+libcapplet_la_LDFLAGS = -version-info 5:0:0
- libcapplet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB) $(GNORBA_LIBS)
-
- libcappletincludedir = $(includedir)/libcapplet1
-@@ -522,12 +522,10 @@
- check: check-am
- installcheck-am:
- installcheck: installcheck-am
--install-exec-am: install-libLTLIBRARIES install-binPROGRAMS \
-- install-confexecDATA
-+install-exec-am: install-binPROGRAMS
- install-exec: install-exec-am
-
--install-data-am: install-appiconDATA install-splashDATA install-sysDATA \
-- install-libcappletincludeHEADERS
-+install-data-am: install-appiconDATA install-splashDATA install-sysDATA
- install-data: install-data-am
-
- install-am: all-am
-@@ -546,7 +544,6 @@
- $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \
- $(DESTDIR)$(appicondir) $(DESTDIR)$(confexecdir) \
- $(DESTDIR)$(splashdir) $(DESTDIR)$(sysdir) \
-- $(DESTDIR)$(libcappletincludedir)
-
-
- mostlyclean-generic:
-@@ -592,6 +589,7 @@
- clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \
- uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \
- distclean-compile clean-compile maintainer-clean-compile \
-+ -e 's?\@VERSION\@?$(VERSION)?g' \
- mostlyclean-libtool distclean-libtool clean-libtool \
- maintainer-clean-libtool mostlyclean-binPROGRAMS distclean-binPROGRAMS \
- clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \
diff --git a/sysutils/gnomecontrolcenter/files/patch-capplets::theme-switcher::lister.c b/sysutils/gnomecontrolcenter/files/patch-capplets::theme-switcher::lister.c
deleted file mode 100644
index ce8170370123..000000000000
--- a/sysutils/gnomecontrolcenter/files/patch-capplets::theme-switcher::lister.c
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- capplets/theme-switcher/lister.c 2002/03/29 12:43:59 1.1
-+++ capplets/theme-switcher/lister.c 2002/03/29 12:45:18
-@@ -115,8 +115,7 @@
- char *errstring = NULL;
- int out_fd;
- #ifndef HAVE_GETLINE
-- char line[1024];
-- char *lineptr = line;
-+ char *lineptr = (char *)malloc(1024);
- #else
- char *lineptr = NULL;
- #endif
diff --git a/sysutils/gnomecontrolcenter/files/patch-capplets_file-types_file-types-icon-entry.c b/sysutils/gnomecontrolcenter/files/patch-capplets_file-types_file-types-icon-entry.c
deleted file mode 100644
index 5b48cd25cb94..000000000000
--- a/sysutils/gnomecontrolcenter/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/gnomecontrolcenter/files/patch-ce b/sysutils/gnomecontrolcenter/files/patch-ce
deleted file mode 100644
index b2186ac89c4c..000000000000
--- a/sysutils/gnomecontrolcenter/files/patch-ce
+++ /dev/null
@@ -1,8 +0,0 @@
---- 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/files/patch-configure b/sysutils/gnomecontrolcenter/files/patch-configure
deleted file mode 100644
index 53566354e4ac..000000000000
--- a/sysutils/gnomecontrolcenter/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/gnomecontrolcenter/files/patch-idl::Makefile.in b/sysutils/gnomecontrolcenter/files/patch-idl::Makefile.in
deleted file mode 100644
index 8bc65dc999aa..000000000000
--- a/sysutils/gnomecontrolcenter/files/patch-idl::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- idl/Makefile.in 2002/07/10 13:49:41 1.1
-+++ idl/Makefile.in 2002/07/10 13:50:18
-@@ -251,7 +251,7 @@
- install-exec-am:
- install-exec: install-exec-am
-
--install-data-am: install-gnomeccgnorbaDATA install-idlDATA
-+install-data-am: install-gnomeccgnorbaDATA
- install-data: install-data-am
-
- install-am: all-am
diff --git a/sysutils/gnomecontrolcenter/files/patch-ltmain.sh b/sysutils/gnomecontrolcenter/files/patch-ltmain.sh
deleted file mode 100644
index 91713d2306f8..000000000000
--- a/sysutils/gnomecontrolcenter/files/patch-ltmain.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh.orig Wed Jan 23 11:38:40 2002
-+++ ltmain.sh Sun Feb 3 01:44:17 2002
-@@ -1037,8 +1037,16 @@
- continue
- ;;
-
-+ -pthread)
-+ compile_command="$compile_command -pthread"
-+ finalize_command="$finalize_command -pthread"
-+ compiler_flags="$compiler_flags -pthread"
-+ continue
-+ ;;
-+
- -module)
- module=yes
-+ build_old_libs=no
- continue
- ;;
-
-@@ -2412,6 +2420,9 @@
- *-*-netbsd*)
- # Don't link with libc until the a.out ld.so is fixed.
- ;;
-+ *-*-freebsd*)
-+ # FreeBSD doesn't need this...
-+ ;;
- *)
- # Add libc to deplibs on all other systems if necessary.
- if test "$build_libtool_need_lc" = "yes"; then
-@@ -4179,10 +4190,12 @@
- fi
-
- # Install the pseudo-library for information purposes.
-+ if /usr/bin/false; then
- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- instname="$dir/$name"i
- $show "$install_prog $instname $destdir/$name"
- $run eval "$install_prog $instname $destdir/$name" || exit $?
-+ fi
-
- # Maybe install the static library, too.
- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/sysutils/gnomecontrolcenter/files/patch-po::Makefile.in.in b/sysutils/gnomecontrolcenter/files/patch-po::Makefile.in.in
deleted file mode 100644
index 02994b404219..000000000000
--- a/sysutils/gnomecontrolcenter/files/patch-po::Makefile.in.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- po/Makefile.in.in 2002/02/05 08:03:55 1.1
-+++ po/Makefile.in.in 2002/02/05 08:04:08
-@@ -106,7 +106,7 @@
- @catalogs='$(CATALOGS)'; \
- for cat in $$catalogs; do \
- cat=`basename $$cat`; \
-- lang=`echo $$cat | sed 's/\.gmo$$//'`; \
-+ lang=`echo $$cat | sed 's/\.mo$$//'`; \
- dir=$(localedir)/$$lang/LC_MESSAGES; \
- $(mkinstalldirs) $(DESTDIR)$$dir; \
- if test -r $$cat; then \
diff --git a/sysutils/gnomecontrolcenter/pkg-descr b/sysutils/gnomecontrolcenter/pkg-descr
deleted file mode 100644
index b9ead6394b73..000000000000
--- a/sysutils/gnomecontrolcenter/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-control center for GNOME project.
diff --git a/sysutils/gnomecontrolcenter/pkg-plist b/sysutils/gnomecontrolcenter/pkg-plist
deleted file mode 100644
index bea2205dc885..000000000000
--- a/sysutils/gnomecontrolcenter/pkg-plist
+++ /dev/null
@@ -1,185 +0,0 @@
-bin/background-properties-capplet
-bin/default-application-properties-capplet
-bin/file-types-capplet
-bin/gnomecc
-bin/keyboard-properties
-bin/mouse-properties-capplet
-bin/sound-properties
-bin/theme-selector-capplet
-bin/ui-properties
-bin/url-properties
-bin/wm-properties-capplet
-etc/CORBA/servers/gnomecc.gnorba
-share/gnome/apps/Settings/Desktop/.directory
-share/gnome/apps/Settings/Desktop/background-properties.desktop
-share/gnome/apps/Settings/Desktop/theme-selector.desktop
-share/gnome/apps/Settings/Desktop/wm-properties.desktop
-share/gnome/apps/Settings/Documents/.directory
-share/gnome/apps/Settings/Documents/default-applicaiton-properties.desktop
-share/gnome/apps/Settings/Documents/url-properties.desktop
-share/gnome/apps/Settings/Multimedia/.directory
-share/gnome/apps/Settings/Multimedia/sound-properties.desktop
-share/gnome/apps/Settings/Peripherals/.directory
-share/gnome/apps/Settings/Peripherals/keyboard-properties.desktop
-share/gnome/apps/Settings/Peripherals/mouse-properties.desktop
-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
-share/gnome/help/control-center/C/figures/bg-capplet.png
-share/gnome/help/control-center/C/figures/gccalf.png
-share/gnome/help/control-center/C/figures/gccappdef.png
-share/gnome/help/control-center/C/figures/gccdialog.png
-share/gnome/help/control-center/C/figures/gccedit.png
-share/gnome/help/control-center/C/figures/gcchints.png
-share/gnome/help/control-center/C/figures/gccmdi.png
-share/gnome/help/control-center/C/figures/gccmime.png
-share/gnome/help/control-center/C/figures/gccsession-props.png
-share/gnome/help/control-center/C/figures/gccsessopt.png
-share/gnome/help/control-center/C/figures/gccsound1.png
-share/gnome/help/control-center/C/figures/gccsound2.png
-share/gnome/help/control-center/C/figures/gccstartup.png
-share/gnome/help/control-center/C/figures/gccurl.png
-share/gnome/help/control-center/C/figures/glob_pref_anim.png
-share/gnome/help/control-center/C/figures/keyboard-capplet.png
-share/gnome/help/control-center/C/figures/mouse-capplet.png
-share/gnome/help/control-center/C/figures/screensave-capplet.png
-share/gnome/help/control-center/C/figures/theme-select.png
-share/gnome/help/control-center/C/figures/wm-add.png
-share/gnome/help/control-center/C/figures/wm-main.png
-share/gnome/help/control-center/C/index.html
-share/gnome/help/control-center/C/ln7.html
-share/gnome/help/control-center/C/stylesheet-images/caution.gif
-share/gnome/help/control-center/C/stylesheet-images/home.gif
-share/gnome/help/control-center/C/stylesheet-images/important.gif
-share/gnome/help/control-center/C/stylesheet-images/next.gif
-share/gnome/help/control-center/C/stylesheet-images/note.gif
-share/gnome/help/control-center/C/stylesheet-images/prev.gif
-share/gnome/help/control-center/C/stylesheet-images/tip.gif
-share/gnome/help/control-center/C/stylesheet-images/toc-blank.gif
-share/gnome/help/control-center/C/stylesheet-images/toc-minus.gif
-share/gnome/help/control-center/C/stylesheet-images/toc-plus.gif
-share/gnome/help/control-center/C/stylesheet-images/up.gif
-share/gnome/help/control-center/C/stylesheet-images/warning.gif
-share/gnome/help/control-center/C/topic.dat
-share/gnome/help/control-center/C/usage.html
-share/gnome/help/control-center/eu/control-center.sgml
-share/gnome/help/control-center/eu/desktop-intro.html
-share/gnome/help/control-center/eu/doc-handlers.html
-share/gnome/help/control-center/eu/figures/bg-capplet.png
-share/gnome/help/control-center/eu/figures/gccalf.png
-share/gnome/help/control-center/eu/figures/gccappdef.png
-share/gnome/help/control-center/eu/figures/gccdialog.png
-share/gnome/help/control-center/eu/figures/gccedit.png
-share/gnome/help/control-center/eu/figures/gcchints.png
-share/gnome/help/control-center/eu/figures/gccmdi.png
-share/gnome/help/control-center/eu/figures/gccmime.png
-share/gnome/help/control-center/eu/figures/gccsession-props.png
-share/gnome/help/control-center/eu/figures/gccsessopt.png
-share/gnome/help/control-center/eu/figures/gccsound1.png
-share/gnome/help/control-center/eu/figures/gccsound2.png
-share/gnome/help/control-center/eu/figures/gccstartup.png
-share/gnome/help/control-center/eu/figures/gccurl.png
-share/gnome/help/control-center/eu/figures/glob_pref_anim.png
-share/gnome/help/control-center/eu/figures/keyboard-capplet.png
-share/gnome/help/control-center/eu/figures/mouse-capplet.png
-share/gnome/help/control-center/eu/figures/screensave-capplet.png
-share/gnome/help/control-center/eu/figures/theme-select.png
-share/gnome/help/control-center/eu/figures/wm-add.png
-share/gnome/help/control-center/eu/figures/wm-main.png
-share/gnome/help/control-center/eu/index.html
-share/gnome/help/control-center/eu/ln7.html
-share/gnome/help/control-center/eu/stylesheet-images/caution.gif
-share/gnome/help/control-center/eu/stylesheet-images/home.gif
-share/gnome/help/control-center/eu/stylesheet-images/important.gif
-share/gnome/help/control-center/eu/stylesheet-images/next.gif
-share/gnome/help/control-center/eu/stylesheet-images/note.gif
-share/gnome/help/control-center/eu/stylesheet-images/prev.gif
-share/gnome/help/control-center/eu/stylesheet-images/tip.gif
-share/gnome/help/control-center/eu/stylesheet-images/toc-blank.gif
-share/gnome/help/control-center/eu/stylesheet-images/toc-minus.gif
-share/gnome/help/control-center/eu/stylesheet-images/toc-plus.gif
-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
-share/gnome/wm-properties/WindowMaker.desktop
-share/gnome/wm-properties/twm.desktop
-share/locale/az/LC_MESSAGES/control-center.mo
-share/locale/bg/LC_MESSAGES/control-center.mo
-share/locale/ca/LC_MESSAGES/control-center.mo
-share/locale/cs/LC_MESSAGES/control-center.mo
-share/locale/da/LC_MESSAGES/control-center.mo
-share/locale/de/LC_MESSAGES/control-center.mo
-share/locale/el/LC_MESSAGES/control-center.mo
-share/locale/en_GB/LC_MESSAGES/control-center.mo
-share/locale/es/LC_MESSAGES/control-center.mo
-share/locale/et/LC_MESSAGES/control-center.mo
-share/locale/eu/LC_MESSAGES/control-center.mo
-share/locale/fi/LC_MESSAGES/control-center.mo
-share/locale/fr/LC_MESSAGES/control-center.mo
-share/locale/ga/LC_MESSAGES/control-center.mo
-share/locale/gl/LC_MESSAGES/control-center.mo
-share/locale/hr/LC_MESSAGES/control-center.mo
-share/locale/hu/LC_MESSAGES/control-center.mo
-share/locale/it/LC_MESSAGES/control-center.mo
-share/locale/ja/LC_MESSAGES/control-center.mo
-share/locale/ko/LC_MESSAGES/control-center.mo
-share/locale/lt/LC_MESSAGES/control-center.mo
-share/locale/nl/LC_MESSAGES/control-center.mo
-share/locale/nn/LC_MESSAGES/control-center.mo
-share/locale/no/LC_MESSAGES/control-center.mo
-share/locale/pl/LC_MESSAGES/control-center.mo
-share/locale/pt/LC_MESSAGES/control-center.mo
-share/locale/pt_BR/LC_MESSAGES/control-center.mo
-share/locale/ro/LC_MESSAGES/control-center.mo
-share/locale/ru/LC_MESSAGES/control-center.mo
-share/locale/sk/LC_MESSAGES/control-center.mo
-share/locale/sl/LC_MESSAGES/control-center.mo
-share/locale/sv/LC_MESSAGES/control-center.mo
-share/locale/tr/LC_MESSAGES/control-center.mo
-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
-@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
-@dirrm share/gnome/control-center/UIOptions
-@dirrm share/gnome/control-center/Multimedia
-@dirrm share/gnome/apps/Settings/UIOptions
-@dirrm share/gnome/apps/Settings/Multimedia
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
deleted file mode 100644
index 10adbe119774..000000000000
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ /dev/null
@@ -1,74 +0,0 @@
-# New ports collection makefile for: gnomecontrolcenter2
-# Date created: 04 May 2002
-# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-# $MCom: ports/sysutils/gnomecontrolcenter2/Makefile,v 1.109 2006/04/18 02:28:56 marcus Exp $
-#
-
-PORTNAME= gnomecontrolcenter2
-PORTVERSION= 2.14.1
-PORTREVISION= 2
-CATEGORIES= sysutils gnome
-MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/control-center/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-DISTNAME= control-center-${PORTVERSION}
-DIST_SUBDIR= gnome2
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= Control center for GNOME 2 project
-
-LIB_DEPENDS= xklavier.10:${PORTSDIR}/x11/libxklavier
-
-USE_BZIP2= yes
-USE_GETTEXT= yes
-USE_X_PREFIX= yes
-USE_GMAKE= yes
-GNOME_DESKTOP_VERSION=2
-USE_GSTREAMER= good
-WANT_GNOME= yes
-USE_GNOME= gnomeprefix gnomehack intlhack metacity nautilus2 \
- gnomemenus desktopfileutils nautilus2
-GNU_CONFIGURE= yes
-INSTALLS_OMF= yes
-INSTALLS_ICONS= yes
-INSTALLS_SHLIB= yes
-CONFIGURE_ARGS= --enable-gstreamer=0.10 \
- --disable-hal
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-
-GCONF_SCHEMAS= apps_gnome_settings_daemon_default_editor.schemas \
- apps_gnome_settings_daemon_keybindings.schemas \
- apps_gnome_settings_daemon_screensaver.schemas \
- desktop_gnome_font_rendering.schemas \
- desktop_gnome_peripherals_keyboard_xkb.schemas \
- fontilus.schemas themus.schemas
-
-.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
-.undef WITHOUT_GNOME
-WITH_GNOME= yes
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ${HAVE_GNOME:Mevolutiondataserver}!=""
-USE_GNOME+= evolutiondataserver
-CONFIGURE_ARGS+=--enable-aboutme
-PLIST_SUB+= ABOUTME=""
-.else
-CONFIGURE_ARGS+=--disable-aboutme
-PLIST_SUB+= ABOUTME="@comment "
-.endif
-
-post-patch:
- @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
- 's|[{]prefix[}]/share/pixmaps|{datadir}/pixmaps|g'
- @${REINPLACE_CMD} -e 's|/bin/tar|/usr/bin/tar|g ; \
- s|/bin/gzip|/usr/bin/gzip|g' \
- ${WRKSRC}/capplets/theme-switcher/gnome-theme-installer.c
-
-post-install:
- @-update-desktop-database
-
-.include <bsd.port.post.mk>
diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo
deleted file mode 100644
index 02add5cb6a2f..000000000000
--- a/sysutils/gnomecontrolcenter2/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome2/control-center-2.14.1.tar.bz2) = d673df12692ee08b9fc3d69739f8779e
-SHA256 (gnome2/control-center-2.14.1.tar.bz2) = c55cc800a6d636b8a98885a68685eff32db158fe1b638ff02ff89394ee6e6163
-SIZE (gnome2/control-center-2.14.1.tar.bz2) = 1869223
diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me-password.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me-password.c
deleted file mode 100644
index 49727c882a89..000000000000
--- a/sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me-password.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- capplets/about-me/gnome-about-me-password.c.orig Mon Nov 28 10:02:57 2005
-+++ capplets/about-me/gnome-about-me-password.c Wed Dec 14 13:56:42 2005
-@@ -25,7 +25,9 @@
- # include <config.h>
- #endif
-
-+#ifndef __FreeBSD__
- #include <stropts.h>
-+#endif
- #include <gnome.h>
- #include <pwd.h>
- #include <stdlib.h>
-@@ -45,6 +47,12 @@
-
- #if __sun
- #include <sys/types.h>
-+#include <signal.h>
-+#endif
-+
-+#if __FreeBSD__
-+#include <sys/types.h>
-+#include <libutil.h>
- #include <signal.h>
- #endif
-
diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_gnome-keyboard-properties-xkbot.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_gnome-keyboard-properties-xkbot.c
deleted file mode 100644
index ab7180f75c17..000000000000
--- a/sysutils/gnomecontrolcenter2/files/patch-capplets_gnome-keyboard-properties-xkbot.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- capplets/keyboard/gnome-keyboard-properties-xkbot.c.orig Wed Jul 27 13:48:58 2005
-+++ capplets/keyboard/gnome-keyboard-properties-xkbot.c Wed Jul 27 13:49:37 2005
-@@ -265,11 +265,12 @@
- GladeXML * dialog)
- {
- GtkWidget *expander, *align, *vbox;
-+ gchar *utfGroupName, *titlemarkup;
-
- GSList * expanders_list = g_object_get_data (G_OBJECT (dialog), EXPANDERS_PROP);
-
-- gchar *utfGroupName = xci_desc_to_utf8 (configItem);
-- gchar *titlemarkup = g_strconcat ("<span>", utfGroupName, "</span>", NULL);
-+ utfGroupName = xci_desc_to_utf8 (configItem);
-+ titlemarkup = g_strconcat ("<span>", utfGroupName, "</span>", NULL);
-
- expander = gtk_expander_new (titlemarkup);
- g_object_set_data_full (G_OBJECT (expander), "utfGroupName", utfGroupName, g_free);
diff --git a/sysutils/gnomecontrolcenter2/files/patch-configure b/sysutils/gnomecontrolcenter2/files/patch-configure
deleted file mode 100644
index d8e861724bd3..000000000000
--- a/sysutils/gnomecontrolcenter2/files/patch-configure
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.orig Thu Jan 13 02:39:28 2005
-+++ configure Thu Jan 13 02:39:28 2005
-@@ -22221,6 +22221,7 @@
- if eval "test \"\${$as_ac_var+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-+ LIBS="-lintl $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -27490,7 +27491,7 @@
-
-
- cat >>confdefs.h <<_ACEOF
--#define GNOMECC_DATA_DIR "${real_prefix}/share/${GETTEXT_PACKAGE}"
-+#define GNOMECC_DATA_DIR "${datadir}/${GETTEXT_PACKAGE}"
- _ACEOF
-
-
diff --git a/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_actions_acme-volume-gstreamer.c b/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_actions_acme-volume-gstreamer.c
deleted file mode 100644
index 3362406ddcc0..000000000000
--- a/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_actions_acme-volume-gstreamer.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- gnome-settings-daemon/actions/acme-volume-gstreamer.c.orig Mon Apr 17 22:23:18 2006
-+++ gnome-settings-daemon/actions/acme-volume-gstreamer.c Mon Apr 17 22:25:17 2006
-@@ -29,6 +29,7 @@
-
- #ifdef HAVE_GST10
- #include <gst/gst.h>
-+#include <gst/audio/mixerutils.h>
- #include <gst/interfaces/mixer.h>
- #include <gst/interfaces/propertyprobe.h>
- #else
diff --git a/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c b/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c
deleted file mode 100644
index ed30cddab65a..000000000000
--- a/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-settings-daemon/gnome-settings-multimedia-keys.c.orig Wed Jul 27 13:52:13 2005
-+++ gnome-settings-daemon/gnome-settings-multimedia-keys.c Wed Jul 27 13:52:32 2005
-@@ -828,7 +828,7 @@
- do_mail_action (acme);
- break;
- case SLEEP_KEY:
-- do_sleep_action ("apm", "xset dpms force off");
-+ do_sleep_action ("zzz", "xset dpms force off");
- break;
- case SCREENSAVER_KEY:
- if ((cmd = g_find_program_in_path ("gnome-screensaver-command")))
diff --git a/sysutils/gnomecontrolcenter2/files/patch-libwindow-settings_gnome-wm-manager.c b/sysutils/gnomecontrolcenter2/files/patch-libwindow-settings_gnome-wm-manager.c
deleted file mode 100644
index 95bbf2ea4dab..000000000000
--- a/sysutils/gnomecontrolcenter2/files/patch-libwindow-settings_gnome-wm-manager.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libwindow-settings/gnome-wm-manager.c.orig Mon Nov 11 00:42:08 2002
-+++ libwindow-settings/gnome-wm-manager.c Mon Nov 11 00:43:26 2002
-@@ -227,7 +227,7 @@
-
- done_scan = TRUE;
-
-- tempdir = gnome_unconditional_datadir_file ("gnome/wm-properties/");
-+ tempdir = gnome_unconditional_datadir_file ("wm-properties/");
- scan_wm_directory (tempdir, FALSE);
- g_free (tempdir);
-
diff --git a/sysutils/gnomecontrolcenter2/pkg-descr b/sysutils/gnomecontrolcenter2/pkg-descr
deleted file mode 100644
index 26d4dbe929b2..000000000000
--- a/sysutils/gnomecontrolcenter2/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-Configuration tools tightly integrated within the GNOME 2 desktop.
diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist
deleted file mode 100644
index faafe835eab5..000000000000
--- a/sysutils/gnomecontrolcenter2/pkg-plist
+++ /dev/null
@@ -1,261 +0,0 @@
-%%ABOUTME%%bin/gnome-about-me
-bin/gnome-accessibility-keyboard-properties
-bin/gnome-at-properties
-bin/gnome-background-properties
-bin/gnome-control-center
-bin/gnome-default-applications-properties
-bin/gnome-display-properties
-bin/gnome-font-properties
-bin/gnome-font-viewer
-bin/gnome-keybinding-properties
-bin/gnome-keyboard-properties
-bin/gnome-mouse-properties
-bin/gnome-network-preferences
-bin/gnome-sound-properties
-bin/gnome-theme-manager
-bin/gnome-theme-thumbnailer
-bin/gnome-thumbnail-font
-bin/gnome-typing-monitor
-bin/gnome-ui-properties
-bin/gnome-window-properties
-bin/themus-theme-applier
-etc/gnome-vfs-2.0/modules/font-method.conf
-etc/gnome-vfs-2.0/modules/theme-method.conf
-include/gnome-window-settings-2.0/gnome-window-manager.h
-include/gnome-window-settings-2.0/gnome-wm-manager.h
-lib/gnome-vfs-2.0/modules/libfont-method.a
-lib/gnome-vfs-2.0/modules/libfont-method.la
-lib/gnome-vfs-2.0/modules/libfont-method.so
-lib/gnome-vfs-2.0/modules/libtheme-method.a
-lib/gnome-vfs-2.0/modules/libtheme-method.la
-lib/gnome-vfs-2.0/modules/libtheme-method.so
-lib/libgnome-window-settings.a
-lib/libgnome-window-settings.la
-lib/libgnome-window-settings.so
-lib/libgnome-window-settings.so.1
-lib/nautilus/extensions-1.0/libnautilus-fontilus.a
-lib/nautilus/extensions-1.0/libnautilus-fontilus.la
-lib/nautilus/extensions-1.0/libnautilus-fontilus.so
-lib/nautilus/extensions-1.0/libnautilus-themus.a
-lib/nautilus/extensions-1.0/libnautilus-themus.la
-lib/nautilus/extensions-1.0/libnautilus-themus.so
-lib/window-manager-settings/libmetacity.a
-lib/window-manager-settings/libmetacity.la
-lib/window-manager-settings/libmetacity.so
-libdata/bonobo/servers/GNOME_SettingsDaemon.server
-libdata/pkgconfig/gnome-window-settings-2.0.pc
-libexec/gnome-settings-daemon
-share/gnome/applications/accessibility-keyboard.desktop
-share/gnome/applications/at-properties.desktop
-share/gnome/applications/background.desktop
-share/gnome/applications/default-applications.desktop
-share/gnome/applications/display-properties.desktop
-share/gnome/applications/font-properties.desktop
-%%ABOUTME%%share/gnome/applications/gnome-about-me.desktop
-share/gnome/applications/gnome-font-viewer.desktop
-share/gnome/applications/gnome-network-preferences.desktop
-share/gnome/applications/gnome-settings-mouse.desktop
-share/gnome/applications/gnome-settings-sound.desktop
-share/gnome/applications/gnome-ui-properties.desktop
-share/gnome/applications/gnomecc.desktop
-share/gnome/applications/gtk-theme-selector.desktop
-share/gnome/applications/keybinding.desktop
-share/gnome/applications/keyboard.desktop
-share/gnome/applications/themus-theme-applier.desktop
-share/gnome/applications/window-properties.desktop
-share/gnome/control-center-2.0/icons/display-capplet.png
-share/gnome/control-center-2.0/interfaces/acme.glade
-share/gnome/control-center-2.0/interfaces/apply-font.glade
-share/gnome/control-center-2.0/interfaces/at-enable-dialog.glade
-share/gnome/control-center-2.0/interfaces/font-properties.glade
-%%ABOUTME%%share/gnome/control-center-2.0/interfaces/gnome-about-me.glade
-share/gnome/control-center-2.0/interfaces/gnome-accessibility-keyboard-properties.glade
-share/gnome/control-center-2.0/interfaces/gnome-background-properties.glade
-share/gnome/control-center-2.0/interfaces/gnome-default-applications-properties.glade
-share/gnome/control-center-2.0/interfaces/gnome-keybinding-properties.glade
-share/gnome/control-center-2.0/interfaces/gnome-keyboard-properties.glade
-share/gnome/control-center-2.0/interfaces/gnome-mouse-properties.glade
-share/gnome/control-center-2.0/interfaces/gnome-network-preferences.glade
-share/gnome/control-center-2.0/interfaces/gnome-ui-properties.glade
-share/gnome/control-center-2.0/interfaces/gnome-window-properties.glade
-share/gnome/control-center-2.0/interfaces/modmap-dialog.glade
-share/gnome/control-center-2.0/interfaces/sound-properties.glade
-share/gnome/control-center-2.0/interfaces/theme-install.glade
-share/gnome/control-center-2.0/interfaces/theme-properties.glade
-share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-bouncekey.png
-share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-mousekey.png
-share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-slowkey.png
-share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-stickykey.png
-share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-togglekey.png
-share/gnome/control-center-2.0/pixmaps/acme-brightness.png
-share/gnome/control-center-2.0/pixmaps/acme-eject.png
-share/gnome/control-center-2.0/pixmaps/at-startup.png
-share/gnome/control-center-2.0/pixmaps/at-support.png
-share/gnome/control-center-2.0/pixmaps/bar-disabled.png
-share/gnome/control-center-2.0/pixmaps/bar-green.png
-share/gnome/control-center-2.0/pixmaps/bar-red.png
-share/gnome/control-center-2.0/pixmaps/bar.png
-share/gnome/control-center-2.0/pixmaps/double-click-maybe.png
-share/gnome/control-center-2.0/pixmaps/double-click-off.png
-share/gnome/control-center-2.0/pixmaps/double-click-on.png
-%%ABOUTME%%share/gnome/control-center-2.0/pixmaps/gnome-about-me-bulb-off.png
-%%ABOUTME%%share/gnome/control-center-2.0/pixmaps/gnome-about-me-bulb-on.png
-share/gnome/control-center-2.0/pixmaps/gnome-speakernotes-muted.png
-share/gnome/control-center-2.0/pixmaps/gnome-speakernotes.png
-share/gnome/control-center-2.0/pixmaps/keyboard-bell.png
-share/gnome/control-center-2.0/pixmaps/keyboard-cursor.png
-share/gnome/control-center-2.0/pixmaps/keyboard-repeat.png
-share/gnome/control-center-2.0/pixmaps/keyboard-volume.png
-share/gnome/control-center-2.0/pixmaps/mouse-cursor-normal-large.png
-share/gnome/control-center-2.0/pixmaps/mouse-cursor-normal.png
-share/gnome/control-center-2.0/pixmaps/mouse-cursor-white-large.png
-share/gnome/control-center-2.0/pixmaps/mouse-cursor-white.png
-share/gnome/control-center-2.0/pixmaps/mouse-left.png
-share/gnome/control-center-2.0/pixmaps/mouse-right.png
-share/gnome/control-center-2.0/pixmaps/ocean-stripes.png
-share/gnome/control-center-2.0/pixmaps/stop.png
-share/gnome/control-center-2.0/pixmaps/subpixel-bgr.png
-share/gnome/control-center-2.0/pixmaps/subpixel-rgb.png
-share/gnome/control-center-2.0/pixmaps/subpixel-vbgr.png
-share/gnome/control-center-2.0/pixmaps/subpixel-vrgb.png
-share/gnome/control-center-2.0/pixmaps/theme-thumbnailing.png
-share/gnome/control-center-2.0/pixmaps/visual-bell.png
-share/gnome/control-center-2.0/xrdb/Editres.ad
-share/gnome/control-center-2.0/xrdb/Emacs.ad
-share/gnome/control-center-2.0/xrdb/General.ad
-share/gnome/control-center-2.0/xrdb/Motif.ad
-share/gnome/control-center-2.0/xrdb/Tk.ad
-share/gnome/control-center-2.0/xrdb/Xaw.ad
-share/gnome/cursor-fonts/cursor-large-white.pcf
-share/gnome/cursor-fonts/cursor-large.pcf
-share/gnome/cursor-fonts/cursor-white.pcf
-share/gnome/desktop-directories/font-method.directory
-share/gnome/desktop-directories/theme-method.directory
-share/gnome/gnome-default-applications/gnome-default-applications.xml
-share/gnome/help/control-center/C/config-accessibility-keyboard.xml
-share/gnome/help/control-center/C/config-background.xml
-share/gnome/help/control-center/C/config-behavior.xml
-share/gnome/help/control-center/C/config-cds.xml
-share/gnome/help/control-center/C/config-default-apps.xml
-share/gnome/help/control-center/C/config-file-type.xml
-share/gnome/help/control-center/C/config-hints.xml
-share/gnome/help/control-center/C/config-html.xml
-share/gnome/help/control-center/C/config-kbd.xml
-share/gnome/help/control-center/C/config-keybindings.xml
-share/gnome/help/control-center/C/config-mouse.xml
-share/gnome/help/control-center/C/config-screensaver.xml
-share/gnome/help/control-center/C/config-sound.xml
-share/gnome/help/control-center/C/config-themes.xml
-share/gnome/help/control-center/C/control-center.xml
-share/gnome/help/control-center/es/control-center.xml
-share/gnome/idl/ConfigArchiver.idl
-share/gnome/idl/GNOME_SettingsDaemon.idl
-share/gnome/omf/control-center/control-center-C.omf
-share/gnome/omf/control-center/control-center-es.omf
-share/gnome/pixmaps/display-capplet.png
-share/icons/hicolor/48x48/apps/gnome-control-center.png
-share/locale/af/LC_MESSAGES/control-center-2.0.mo
-share/locale/am/LC_MESSAGES/control-center-2.0.mo
-share/locale/ar/LC_MESSAGES/control-center-2.0.mo
-share/locale/az/LC_MESSAGES/control-center-2.0.mo
-share/locale/be/LC_MESSAGES/control-center-2.0.mo
-share/locale/bg/LC_MESSAGES/control-center-2.0.mo
-share/locale/bn/LC_MESSAGES/control-center-2.0.mo
-share/locale/br/LC_MESSAGES/control-center-2.0.mo
-share/locale/bs/LC_MESSAGES/control-center-2.0.mo
-share/locale/ca/LC_MESSAGES/control-center-2.0.mo
-share/locale/cs/LC_MESSAGES/control-center-2.0.mo
-share/locale/cy/LC_MESSAGES/control-center-2.0.mo
-share/locale/da/LC_MESSAGES/control-center-2.0.mo
-share/locale/de/LC_MESSAGES/control-center-2.0.mo
-share/locale/dz/LC_MESSAGES/control-center-2.0.mo
-share/locale/el/LC_MESSAGES/control-center-2.0.mo
-share/locale/en_CA/LC_MESSAGES/control-center-2.0.mo
-share/locale/en_GB/LC_MESSAGES/control-center-2.0.mo
-share/locale/es/LC_MESSAGES/control-center-2.0.mo
-share/locale/et/LC_MESSAGES/control-center-2.0.mo
-share/locale/eu/LC_MESSAGES/control-center-2.0.mo
-share/locale/fa/LC_MESSAGES/control-center-2.0.mo
-share/locale/fi/LC_MESSAGES/control-center-2.0.mo
-share/locale/fr/LC_MESSAGES/control-center-2.0.mo
-share/locale/ga/LC_MESSAGES/control-center-2.0.mo
-share/locale/gl/LC_MESSAGES/control-center-2.0.mo
-share/locale/gu/LC_MESSAGES/control-center-2.0.mo
-share/locale/he/LC_MESSAGES/control-center-2.0.mo
-share/locale/hi/LC_MESSAGES/control-center-2.0.mo
-share/locale/hr/LC_MESSAGES/control-center-2.0.mo
-share/locale/hu/LC_MESSAGES/control-center-2.0.mo
-share/locale/id/LC_MESSAGES/control-center-2.0.mo
-share/locale/is/LC_MESSAGES/control-center-2.0.mo
-share/locale/it/LC_MESSAGES/control-center-2.0.mo
-share/locale/ja/LC_MESSAGES/control-center-2.0.mo
-share/locale/ka/LC_MESSAGES/control-center-2.0.mo
-share/locale/ko/LC_MESSAGES/control-center-2.0.mo
-share/locale/ku/LC_MESSAGES/control-center-2.0.mo
-share/locale/lt/LC_MESSAGES/control-center-2.0.mo
-share/locale/lv/LC_MESSAGES/control-center-2.0.mo
-share/locale/mk/LC_MESSAGES/control-center-2.0.mo
-share/locale/ml/LC_MESSAGES/control-center-2.0.mo
-share/locale/mn/LC_MESSAGES/control-center-2.0.mo
-share/locale/ms/LC_MESSAGES/control-center-2.0.mo
-share/locale/nb/LC_MESSAGES/control-center-2.0.mo
-share/locale/ne/LC_MESSAGES/control-center-2.0.mo
-share/locale/nl/LC_MESSAGES/control-center-2.0.mo
-share/locale/nn/LC_MESSAGES/control-center-2.0.mo
-share/locale/no/LC_MESSAGES/control-center-2.0.mo
-share/locale/nso/LC_MESSAGES/control-center-2.0.mo
-share/locale/pa/LC_MESSAGES/control-center-2.0.mo
-share/locale/pl/LC_MESSAGES/control-center-2.0.mo
-share/locale/pt/LC_MESSAGES/control-center-2.0.mo
-share/locale/pt_BR/LC_MESSAGES/control-center-2.0.mo
-share/locale/ro/LC_MESSAGES/control-center-2.0.mo
-share/locale/ru/LC_MESSAGES/control-center-2.0.mo
-share/locale/rw/LC_MESSAGES/control-center-2.0.mo
-share/locale/sk/LC_MESSAGES/control-center-2.0.mo
-share/locale/sl/LC_MESSAGES/control-center-2.0.mo
-share/locale/sq/LC_MESSAGES/control-center-2.0.mo
-share/locale/sr/LC_MESSAGES/control-center-2.0.mo
-share/locale/sr@Latn/LC_MESSAGES/control-center-2.0.mo
-share/locale/sv/LC_MESSAGES/control-center-2.0.mo
-share/locale/ta/LC_MESSAGES/control-center-2.0.mo
-share/locale/te/LC_MESSAGES/control-center-2.0.mo
-share/locale/th/LC_MESSAGES/control-center-2.0.mo
-share/locale/tr/LC_MESSAGES/control-center-2.0.mo
-share/locale/uk/LC_MESSAGES/control-center-2.0.mo
-share/locale/vi/LC_MESSAGES/control-center-2.0.mo
-share/locale/wa/LC_MESSAGES/control-center-2.0.mo
-share/locale/xh/LC_MESSAGES/control-center-2.0.mo
-share/locale/zh_CN/LC_MESSAGES/control-center-2.0.mo
-share/locale/zh_HK/LC_MESSAGES/control-center-2.0.mo
-share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo
-share/locale/zu/LC_MESSAGES/control-center-2.0.mo
-@dirrmtry share/locale/zu/LC_MESSAGES
-@dirrmtry share/locale/zu
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/nso/LC_MESSAGES
-@dirrmtry share/locale/nso
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/br/LC_MESSAGES
-@dirrmtry share/locale/br
-@dirrm share/gnome/omf/control-center
-@dirrm share/gnome/help/control-center/es
-@dirrm share/gnome/help/control-center/C
-@dirrm share/gnome/help/control-center
-@dirrm share/gnome/gnome-default-applications
-@dirrm share/gnome/gnome-background-properties
-@dirrm share/gnome/desktop-directories
-@dirrm share/gnome/cursor-fonts
-@dirrm share/gnome/control-center-2.0/xrdb
-@dirrm share/gnome/control-center-2.0/pixmaps
-@dirrm share/gnome/control-center-2.0/interfaces
-@dirrmtry share/gnome/control-center-2.0/icons
-@dirrm lib/window-manager-settings
-@dirrm include/gnome-window-settings-2.0
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile
index 39a88524f033..d443991c0d79 100644
--- a/x11/gnome2-lite/Makefile
+++ b/x11/gnome2-lite/Makefile
@@ -31,7 +31,7 @@ RUN_DEPENDS= ${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2
gucharmap:${PORTSDIR}/deskutils/gucharmap \
${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
gconf-editor:${PORTSDIR}/sysutils/gconf-editor \
- gnome-control-center:${PORTSDIR}/sysutils/gnomecontrolcenter2 \
+ gnome-control-center:${PORTSDIR}/sysutils/gnome-control-center \
totem:${PORTSDIR}/multimedia/totem-gstreamer
MASTERDIR= ${.CURDIR}/../gnome2
diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile
index e585466c048b..6b2df95adfd6 100644
--- a/x11/gnome2/Makefile
+++ b/x11/gnome2/Makefile
@@ -54,7 +54,7 @@ RUN_DEPENDS?= ${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2
${X11BASE}/lib/gstreamer-0.10/.gstreamer-plugins-core.keep:${PORTSDIR}/multimedia/gstreamer-plugins-core \
${X11BASE}/lib/gstreamer-0.10/libgstgconfelements.so:${PORTSDIR}/devel/gstreamer-plugins-gconf \
totem:${PORTSDIR}/multimedia/totem-gstreamer \
- gnome-control-center:${PORTSDIR}/sysutils/gnomecontrolcenter2 \
+ gnome-control-center:${PORTSDIR}/sysutils/gnome-control-center \
${X11BASE}/share/gnome/gnome-background-properties/gnome-branded.xml:${PORTSDIR}/x11-themes/gnome-backgrounds \
sound-juicer:${PORTSDIR}/audio/sound-juicer \
gnome-keyring-manager:${PORTSDIR}/security/gnome-keyring-manager \