Update to 2.3.5.

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

5 files changed, 23 insertions, 30 deletions

diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index 2ca01180d..683f2c991 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	2.3.4
+PORTVERSION=	2.3.5
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/control-center/2.3
diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo
index 6770c7543..19fec808e 100644
--- a/sysutils/gnomecontrolcenter2/distinfo
+++ b/sysutils/gnomecontrolcenter2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/control-center-2.3.4.tar.bz2) = b334c9a657d947754e6020bd0ccdb5c6
+MD5 (gnome2/control-center-2.3.5.tar.bz2) = d2bdaedcb5c9b4e94cb6f3dc07bec834
diff --git a/sysutils/gnomecontrolcenter2/files/patch-ltmain.sh b/sysutils/gnomecontrolcenter2/files/patch-ltmain.sh
index 8afc42e39..49efbb5de 100644
--- a/sysutils/gnomecontrolcenter2/files/patch-ltmain.sh
+++ b/sysutils/gnomecontrolcenter2/files/patch-ltmain.sh
@@ -1,15 +1,15 @@
---- ltmain.sh.orig	Fri Apr 25 15:18:44 2003
-+++ ltmain.sh	Sun May 11 02:27:13 2003
-@@ -1061,7 +1061,7 @@
+--- 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
+ 	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
- 	    ;;
-@@ -1071,8 +1071,16 @@
+ 	   # Do not include libc_r directly, use -pthread flag.
+ 	   continue
+ 	   ;;
+@@ -1290,8 +1290,16 @@
  	continue
  	;;
  
@@ -26,17 +26,17 @@
  	continue
  	;;
  
-@@ -2471,6 +2479,9 @@
- 	  *-*-openbsd* | *-*-freebsd*)
- 	    # Do not include libc due to us having libc/libc_r.
+@@ -3000,6 +3008,9 @@
+ 	    # problems, so we reset it completely
+ 	    verstring=
  	    ;;
 +	  *-*-freebsd*)
 +	    # FreeBSD doesn't need this...
 +	    ;;
  	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test $build_libtool_need_lc = "yes"; then
-@@ -4280,10 +4291,12 @@
+ 	    verstring="0.0"
+ 	    ;;
+@@ -5428,10 +5439,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/sysutils/gnomecontrolcenter2/files/patch-typing-break_drw-monitor.c b/sysutils/gnomecontrolcenter2/files/patch-typing-break_drw-monitor.c
deleted file mode 100644
index aef21305d..000000000
--- a/sysutils/gnomecontrolcenter2/files/patch-typing-break_drw-monitor.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- typing-break/drw-monitor.c.orig	Mon Jul  7 17:56:01 2003
-+++ typing-break/drw-monitor.c	Mon Jul  7 17:55:20 2003
-@@ -26,7 +26,7 @@
- #include <math.h>
- #include <unistd.h>
- #include <sys/ioctl.h>
--#include <sys/vt.h>
-+/*#include <sys/vt.h>*/
- #include <fcntl.h>
- #include <stdio.h>
- #include <sys/types.h>
diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist
index 276485c75..a0614398b 100644
--- a/sysutils/gnomecontrolcenter2/pkg-plist
+++ b/sysutils/gnomecontrolcenter2/pkg-plist
@@ -13,6 +13,7 @@ bin/gnome-mouse-properties
 bin/gnome-network-preferences
 bin/gnome-settings-daemon
 bin/gnome-sound-properties
+bin/themus-theme-applier
 bin/gnome-theme-manager
 bin/gnome-theme-thumbnailer
 bin/gnome-thumbnail-font
@@ -48,7 +49,6 @@ 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/bonobo/libthemus-component.so
 lib/bonobo/libthemus-theme-properties-view.so
 lib/gnome-vfs-2.0/modules/libfont-method.so
 lib/gnome-vfs-2.0/modules/libtheme-method.so
@@ -58,12 +58,12 @@ lib/libgnome-window-settings.so.1
 lib/window-manager-settings/libmetacity.a
 lib/window-manager-settings/libmetacity.so
 libdata/bonobo/servers/GNOME_SettingsDaemon.server
-libdata/bonobo/servers/Themus_Component.server
 libdata/bonobo/servers/Themus_Properties_View.server
 libdata/bonobo/servers/fontilus.server
 libdata/pkgconfig/gnome-window-settings-2.0.pc
 libexec/fontilus-context-menu
 share/gnome/application-registry/fontilus.applications
+share/gnome/application-registry/themus.applications
 share/gnome/applications/gnomecc.desktop
 share/gnome/control-center-2.0/capplets/accessibility-keyboard.desktop
 share/gnome/control-center-2.0/capplets/at-properties.desktop
@@ -88,6 +88,7 @@ share/gnome/control-center-2.0/icons/behavior-capplet.png
 share/gnome/control-center-2.0/icons/default-applications-capplet.png
 share/gnome/control-center-2.0/icons/display-capplet.png
 share/gnome/control-center-2.0/icons/font-capplet.png
+share/gnome/control-center-2.0/icons/gnome-network-capplet.png
 share/gnome/control-center-2.0/icons/mouse-capplet.png
 share/gnome/control-center-2.0/icons/sound-capplet.png
 share/gnome/control-center-2.0/icons/window-capplet.png
@@ -147,6 +148,7 @@ 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/control-center/apply-font.glade
 share/gnome/cursor-fonts/cursor-large-white.pcf
 share/gnome/cursor-fonts/cursor-large.pcf
 share/gnome/cursor-fonts/cursor-white.pcf
@@ -155,6 +157,7 @@ share/gnome/idl/ConfigArchiver.idl
 share/gnome/idl/GNOME_SettingsDaemon.idl
 share/gnome/mime-info/fontilus.keys
 share/gnome/mime-info/fontilus.mime
+share/gnome/mime-info/themus.keys
 share/gnome/pixmaps/accessibility-keyboard-capplet.png
 share/gnome/pixmaps/at-enable-capplet.png
 share/gnome/pixmaps/background-capplet.png
@@ -184,6 +187,7 @@ share/locale/bg/LC_MESSAGES/control-center-2.0.mo
 share/locale/bn/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/el/LC_MESSAGES/control-center-2.0.mo