Add gnomecontrolcenter2 after repo copy from gnomecontrolcenter. This

is the configuration frontend for the GNOME 2.0 desktop.

11 files changed, 44 insertions, 148 deletions

diff --git a/sysutils/gnome-control-center/files/patch-Makefile.in b/sysutils/gnome-control-center/files/patch-Makefile.in
deleted file mode 100644
index feb63528f70a..000000000000
--- a/sysutils/gnome-control-center/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/gnome-control-center/files/patch-ad b/sysutils/gnome-control-center/files/patch-ad
deleted file mode 100644
index c27189a35ee9..000000000000
--- a/sysutils/gnome-control-center/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-center/files/patch-bn b/sysutils/gnome-control-center/files/patch-bn
deleted file mode 100644
index 294e18fe95ed..000000000000
--- a/sysutils/gnome-control-center/files/patch-bn
+++ /dev/null
@@ -1,16 +0,0 @@
---- control-center/Makefile.in.orig	Tue Aug  1 22:42:01 2000
-+++ control-center/Makefile.in	Tue Aug  1 22:45:47 2000
-@@ -162,3 +162,3 @@
- 
--confexecdir = $(libdir)
-+confexecdir = $(sysconfdir)
- confexec_DATA = cappletConf.sh
-@@ -168,3 +168,3 @@
- 
--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)
-@@ -590,2 +590,3 @@
- 	    -e 's?\@ORB_LIBS\@?$(ORB_LIBS)?g' \
-+	    -e 's?\@VERSION\@?$(VERSION)?g' \
- 	    < $(srcdir)/cappletConf.sh.in > cappletConf.tmp \
diff --git a/sysutils/gnome-control-center/files/patch-capplets::Makefile.in.orig b/sysutils/gnome-control-center/files/patch-capplets::Makefile.in.orig
index c1c29de83cb1..e69de29bb2d1 100644
--- a/sysutils/gnome-control-center/files/patch-capplets::Makefile.in.orig
+++ b/sysutils/gnome-control-center/files/patch-capplets::Makefile.in.orig
@@ -1,7 +0,0 @@
---- capplets/Makefile.in.orig	Sun Feb 10 15:41:49 2002
-+++ capplets/Makefile.in	Wed Feb 13 09:34:28 2002
-@@ -154,3 +154,3 @@
- always_built_SUBDIRS = desktop-links mouse-properties \
--	screensaver-properties background-properties \
-+	background-properties \
-         theme-switcher sound-properties \
diff --git a/sysutils/gnome-control-center/files/patch-capplets::theme-switcher::lister.c b/sysutils/gnome-control-center/files/patch-capplets::theme-switcher::lister.c
deleted file mode 100644
index ce8170370123..000000000000
--- a/sysutils/gnome-control-center/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/gnome-control-center/files/patch-capplets_file-types_file-types-icon-entry.c b/sysutils/gnome-control-center/files/patch-capplets_file-types_file-types-icon-entry.c
deleted file mode 100644
index 5b48cd25cb94..000000000000
--- a/sysutils/gnome-control-center/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-center/files/patch-capplets_mouse_gnome-mouse-properties.c b/sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c
new file mode 100644
index 000000000000..d5ce54f8ce00
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c
@@ -0,0 +1,29 @@
+--- capplets/mouse/gnome-mouse-properties.c.orig	Sun May  5 01:04:48 2002
++++ capplets/mouse/gnome-mouse-properties.c	Sun May  5 01:05:10 2002
+@@ -532,7 +532,7 @@
+ 	filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-white.png", TRUE, NULL);
+ 	pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
+ 	g_free (filename);
+-	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-white.pcf.gz", FALSE, NULL);
++	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-white.pcf.gz", FALSE, NULL);
+ 
+ 	gtk_list_store_append (GTK_LIST_STORE (model), &iter);
+ 	if (cursor_font && ! strcmp (cursor_font, font_path)) {
+@@ -553,7 +553,7 @@
+ 	filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-normal-large.png", TRUE, NULL);
+ 	pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
+ 	g_free (filename);
+-	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-large.pcf.gz", FALSE, NULL);
++	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-large.pcf.gz", FALSE, NULL);
+ 
+ 	gtk_list_store_append (GTK_LIST_STORE (model), &iter);
+ 	if (cursor_font && ! strcmp (cursor_font, font_path)) {
+@@ -574,7 +574,7 @@
+ 	filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-white-large.png", TRUE, NULL);
+ 	pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
+ 	g_free (filename);
+-	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-large-white.pcf.gz", FALSE, NULL);
++	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-large-white.pcf.gz", FALSE, NULL);
+ 
+ 	gtk_list_store_append (GTK_LIST_STORE (model), &iter);
+ 	if (cursor_font && ! strcmp (cursor_font, font_path)) {
diff --git a/sysutils/gnome-control-center/files/patch-ce b/sysutils/gnome-control-center/files/patch-ce
deleted file mode 100644
index b2186ac89c4c..000000000000
--- a/sysutils/gnome-control-center/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/gnome-control-center/files/patch-configure b/sysutils/gnome-control-center/files/patch-configure
index 53566354e4ac..7e44bf49ffc1 100644
--- a/sysutils/gnome-control-center/files/patch-configure
+++ b/sysutils/gnome-control-center/files/patch-configure
@@ -1,11 +1,19 @@
---- configure.orig	Sun May  5 16:29:53 2002
-+++ configure	Sun May  5 16:30:05 2002
-@@ -9161,7 +9161,7 @@
+--- configure.orig	Mon May  6 01:33:23 2002
++++ configure	Mon May  6 01:33:51 2002
+@@ -7353,6 +7353,7 @@
  
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
  
- cat >> confdefs.h <<EOF
--#define GNOME_ICONDIR "${prefix}/share/pixmaps"
-+#define GNOME_ICONDIR "${datadir}/pixmaps"
- EOF
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -11337,7 +11338,7 @@
+ fi
  
+ cat >>confdefs.h <<EOF
+-#define GNOMECC_DATA_DIR "${real_prefix}/share/${GETTEXT_PACKAGE}"
++#define GNOMECC_DATA_DIR "${datadir}/${GETTEXT_PACKAGE}"
+ EOF
  
+ GNOMECC_ICONS_DIR='$(datadir)/'${GETTEXT_PACKAGE}'/icons'
diff --git a/sysutils/gnome-control-center/files/patch-ltmain.sh b/sysutils/gnome-control-center/files/patch-ltmain.sh
deleted file mode 100644
index 91713d2306f8..000000000000
--- a/sysutils/gnome-control-center/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/gnome-control-center/files/patch-po::Makefile.in.in b/sysutils/gnome-control-center/files/patch-po::Makefile.in.in
deleted file mode 100644
index 02994b404219..000000000000
--- a/sysutils/gnome-control-center/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 \