Update to 2.7.0.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2570 df743ca5-7f9a-e211-a948-0013205c9059

10 files changed, 12 insertions, 140 deletions

diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index e1a7a6f24..f9b4c415d 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	2.6.1
-PORTREVISION=	2
+PORTVERSION=	2.7.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/control-center/2.6
+MASTER_SITE_SUBDIR=	sources/control-center/2.7
 DISTNAME=	control-center-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -26,7 +25,7 @@ USE_GMAKE=	yes
 GNOME_DESKTOP_VERSION=2
 USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack metacity nautilus2 \
 		gstreamerplugins
-GNU_CONFIGURE=	yes
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index 32f5ad009..0483b046c 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/control-center-2.6.1.tar.bz2) = da02f983fbf2e94cd5f09fc8f9d1d143
-SIZE (gnome2/control-center-2.6.1.tar.bz2) = 2487807
+MD5 (gnome2/control-center-2.7.0.tar.bz2) = d7490644ba6564a2efe8281b9444a915
+SIZE (gnome2/control-center-2.7.0.tar.bz2) = 2495839
diff --git a/sysutils/gnome-control-center/files/patch-capplets_Makefile.in b/sysutils/gnome-control-center/files/patch-capplets_Makefile.in
deleted file mode 100644
index fcb0fa20c..000000000
--- a/sysutils/gnome-control-center/files/patch-capplets_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- capplets/Makefile.in.orig	Sun Jul 25 18:35:45 2004
-+++ capplets/Makefile.in	Sun Jul 25 18:36:12 2004
-@@ -193,7 +193,7 @@
- WARN_CXXFLAGS = @WARN_CXXFLAGS@
- XF86MISC_LIBS = @XF86MISC_LIBS@
- 
--always_built_SUBDIRS =  	common accessibility					default-applications desktop-links font			background keyboard mouse sound				file-types theme-switcher ui-properties			keybindings network windows
-+always_built_SUBDIRS =  	common accessibility					default-applications desktop-links font			background keyboard mouse sound				theme-switcher ui-properties			keybindings network windows
- 
- @HAVE_RANDR_TRUE@randr_SUBDIRS = display
- @HAVE_RANDR_FALSE@randr_SUBDIRS = 
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 49efbb5de..000000000
--- a/sysutils/gnome-control-center/files/patch-ltmain.sh
+++ /dev/null
@@ -1,51 +0,0 @@
---- ltmain.sh.orig	Thu May  1 11:30:14 2003
-+++ ltmain.sh	Mon Aug 11 14:38:46 2003
-@@ -1280,7 +1280,7 @@
- 	  esac
- 	elif test "X$arg" = "X-lc_r"; then
- 	 case $host in
--	 *-*-openbsd* | *-*-freebsd*)
-+	 *-*-openbsd* | *-*-freebsd4*)
- 	   # Do not include libc_r directly, use -pthread flag.
- 	   continue
- 	   ;;
-@@ -1290,8 +1290,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
- 	;;
- 
-@@ -3000,6 +3008,9 @@
- 	    # problems, so we reset it completely
- 	    verstring=
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    verstring="0.0"
- 	    ;;
-@@ -5428,10 +5439,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/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index 579874fdf..b6515fa75 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -11,13 +11,13 @@ bin/gnome-keyboard-properties
 bin/gnome-mouse-properties
 bin/gnome-network-preferences
 bin/gnome-sound-properties
-bin/themus-theme-applier
 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
 @unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas
 @exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas > /dev/null || /usr/bin/true
@@ -222,6 +222,5 @@ share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo
 @dirrm share/gnome/control-center-2.0/pixmaps
 @dirrm share/gnome/control-center-2.0/interfaces
 @dirrm share/gnome/control-center-2.0/icons
-@dirrm share/gnome/applications
 @dirrm lib/window-manager-settings
 @dirrm include/gnome-window-settings-2.0
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index e1a7a6f24..f9b4c415d 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	2.6.1
-PORTREVISION=	2
+PORTVERSION=	2.7.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/control-center/2.6
+MASTER_SITE_SUBDIR=	sources/control-center/2.7
 DISTNAME=	control-center-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -26,7 +25,7 @@ USE_GMAKE=	yes
 GNOME_DESKTOP_VERSION=2
 USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack metacity nautilus2 \
 		gstreamerplugins
-GNU_CONFIGURE=	yes
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo
index 32f5ad009..0483b046c 100644
--- a/sysutils/gnomecontrolcenter2/distinfo
+++ b/sysutils/gnomecontrolcenter2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/control-center-2.6.1.tar.bz2) = da02f983fbf2e94cd5f09fc8f9d1d143
-SIZE (gnome2/control-center-2.6.1.tar.bz2) = 2487807
+MD5 (gnome2/control-center-2.7.0.tar.bz2) = d7490644ba6564a2efe8281b9444a915
+SIZE (gnome2/control-center-2.7.0.tar.bz2) = 2495839
diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_Makefile.in b/sysutils/gnomecontrolcenter2/files/patch-capplets_Makefile.in
deleted file mode 100644
index fcb0fa20c..000000000
--- a/sysutils/gnomecontrolcenter2/files/patch-capplets_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- capplets/Makefile.in.orig	Sun Jul 25 18:35:45 2004
-+++ capplets/Makefile.in	Sun Jul 25 18:36:12 2004
-@@ -193,7 +193,7 @@
- WARN_CXXFLAGS = @WARN_CXXFLAGS@
- XF86MISC_LIBS = @XF86MISC_LIBS@
- 
--always_built_SUBDIRS =  	common accessibility					default-applications desktop-links font			background keyboard mouse sound				file-types theme-switcher ui-properties			keybindings network windows
-+always_built_SUBDIRS =  	common accessibility					default-applications desktop-links font			background keyboard mouse sound				theme-switcher ui-properties			keybindings network windows
- 
- @HAVE_RANDR_TRUE@randr_SUBDIRS = display
- @HAVE_RANDR_FALSE@randr_SUBDIRS = 
diff --git a/sysutils/gnomecontrolcenter2/files/patch-ltmain.sh b/sysutils/gnomecontrolcenter2/files/patch-ltmain.sh
deleted file mode 100644
index 49efbb5de..000000000
--- a/sysutils/gnomecontrolcenter2/files/patch-ltmain.sh
+++ /dev/null
@@ -1,51 +0,0 @@
---- ltmain.sh.orig	Thu May  1 11:30:14 2003
-+++ ltmain.sh	Mon Aug 11 14:38:46 2003
-@@ -1280,7 +1280,7 @@
- 	  esac
- 	elif test "X$arg" = "X-lc_r"; then
- 	 case $host in
--	 *-*-openbsd* | *-*-freebsd*)
-+	 *-*-openbsd* | *-*-freebsd4*)
- 	   # Do not include libc_r directly, use -pthread flag.
- 	   continue
- 	   ;;
-@@ -1290,8 +1290,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
- 	;;
- 
-@@ -3000,6 +3008,9 @@
- 	    # problems, so we reset it completely
- 	    verstring=
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    verstring="0.0"
- 	    ;;
-@@ -5428,10 +5439,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/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist
index 579874fdf..b6515fa75 100644
--- a/sysutils/gnomecontrolcenter2/pkg-plist
+++ b/sysutils/gnomecontrolcenter2/pkg-plist
@@ -11,13 +11,13 @@ bin/gnome-keyboard-properties
 bin/gnome-mouse-properties
 bin/gnome-network-preferences
 bin/gnome-sound-properties
-bin/themus-theme-applier
 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
 @unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas
 @exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas > /dev/null || /usr/bin/true
@@ -222,6 +222,5 @@ share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo
 @dirrm share/gnome/control-center-2.0/pixmaps
 @dirrm share/gnome/control-center-2.0/interfaces
 @dirrm share/gnome/control-center-2.0/icons
-@dirrm share/gnome/applications
 @dirrm lib/window-manager-settings
 @dirrm include/gnome-window-settings-2.0