Update to 2.7.3.

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

6 files changed, 10 insertions, 46 deletions

diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index 2d5d175e0..9228cbc0e 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnometerminal
-PORTVERSION=	2.7.2
+PORTVERSION=	2.7.3
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-terminal/2.7
diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo
index bda9c5677..bde397bd0 100644
--- a/x11/gnome-terminal/distinfo
+++ b/x11/gnome-terminal/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-terminal-2.7.2.tar.bz2) = 601212f5b55facd15ddf05fb8b89b917
-SIZE (gnome2/gnome-terminal-2.7.2.tar.bz2) = 2025182
+MD5 (gnome2/gnome-terminal-2.7.3.tar.bz2) = 2f99552c0b9f21ebe2e226b919b1d92d
+SIZE (gnome2/gnome-terminal-2.7.3.tar.bz2) = 2064481
diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist
index dbddceea7..b09f1e3a6 100644
--- a/x11/gnome-terminal/pkg-plist
+++ b/x11/gnome-terminal/pkg-plist
@@ -1,15 +1,7 @@
 bin/gnome-terminal
-etc/gconf/gconf.xml.defaults/apps/gnome-terminal/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-terminal/global/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-terminal/keybindings/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-terminal/profiles/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-terminal/profiles/Default/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/global/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/keybindings/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles/Default/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-terminal.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/gnome-terminal.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-terminal.schemas > /dev/null || /usr/bin/true
 libdata/bonobo/servers/gnome-terminal.server
 share/gnome/application-registry/gnome-terminal.applications
 share/gnome/applications/gnome-terminal.desktop
@@ -174,16 +166,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo
 @dirrm share/gnome/help/gnome-terminal/de/figures
 @dirrm share/gnome/help/gnome-terminal/de
 @dirrm share/gnome/help/gnome-terminal/C/figures
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles/Default
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/keybindings
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/global
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-terminal/profiles/Default
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-terminal/profiles
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-terminal/keybindings
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-terminal/global
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-terminal
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-C.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-de.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-es.omf 2>/dev/null || /usr/bin/true
diff --git a/x11/gnometerminal/Makefile b/x11/gnometerminal/Makefile
index 2d5d175e0..9228cbc0e 100644
--- a/x11/gnometerminal/Makefile
+++ b/x11/gnometerminal/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnometerminal
-PORTVERSION=	2.7.2
+PORTVERSION=	2.7.3
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-terminal/2.7
diff --git a/x11/gnometerminal/distinfo b/x11/gnometerminal/distinfo
index bda9c5677..bde397bd0 100644
--- a/x11/gnometerminal/distinfo
+++ b/x11/gnometerminal/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-terminal-2.7.2.tar.bz2) = 601212f5b55facd15ddf05fb8b89b917
-SIZE (gnome2/gnome-terminal-2.7.2.tar.bz2) = 2025182
+MD5 (gnome2/gnome-terminal-2.7.3.tar.bz2) = 2f99552c0b9f21ebe2e226b919b1d92d
+SIZE (gnome2/gnome-terminal-2.7.3.tar.bz2) = 2064481
diff --git a/x11/gnometerminal/pkg-plist b/x11/gnometerminal/pkg-plist
index dbddceea7..b09f1e3a6 100644
--- a/x11/gnometerminal/pkg-plist
+++ b/x11/gnometerminal/pkg-plist
@@ -1,15 +1,7 @@
 bin/gnome-terminal
-etc/gconf/gconf.xml.defaults/apps/gnome-terminal/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-terminal/global/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-terminal/keybindings/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-terminal/profiles/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-terminal/profiles/Default/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/global/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/keybindings/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles/Default/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-terminal.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/gnome-terminal.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-terminal.schemas > /dev/null || /usr/bin/true
 libdata/bonobo/servers/gnome-terminal.server
 share/gnome/application-registry/gnome-terminal.applications
 share/gnome/applications/gnome-terminal.desktop
@@ -174,16 +166,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo
 @dirrm share/gnome/help/gnome-terminal/de/figures
 @dirrm share/gnome/help/gnome-terminal/de
 @dirrm share/gnome/help/gnome-terminal/C/figures
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles/Default
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/keybindings
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/global
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-terminal/profiles/Default
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-terminal/profiles
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-terminal/keybindings
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-terminal/global
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-terminal
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-C.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-de.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-es.omf 2>/dev/null || /usr/bin/true