3 files changed, 9 insertions, 120 deletions

diff --git a/math/gnumeric2/Makefile b/math/gnumeric2/Makefile
index 4d20f217129b..38cc55034d38 100644
--- a/math/gnumeric2/Makefile
+++ b/math/gnumeric2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnumeric2
-PORTVERSION=	1.2.12
-PORTREVISION=	1
+PORTVERSION=	1.2.13
 CATEGORIES=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:R}
diff --git a/math/gnumeric2/distinfo b/math/gnumeric2/distinfo
index 342a8370ec21..b040b3afbbc2 100644
--- a/math/gnumeric2/distinfo
+++ b/math/gnumeric2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnumeric-1.2.12.tar.bz2) = ef9285d53c9eec2c1f20d10420c2bcf8
-SIZE (gnome2/gnumeric-1.2.12.tar.bz2) = 14284997
+MD5 (gnome2/gnumeric-1.2.13.tar.bz2) = 367ec0d4a1a0b8898a03a70a05052698
+SIZE (gnome2/gnumeric-1.2.13.tar.bz2) = 14319675
diff --git a/math/gnumeric2/pkg-plist b/math/gnumeric2/pkg-plist
index 7a0c419b2dba..8d443180167f 100644
--- a/math/gnumeric2/pkg-plist
+++ b/math/gnumeric2/pkg-plist
@@ -1,66 +1,14 @@
 bin/gnumeric
 bin/ssconvert
-etc/gconf/gconf.xml.defaults/apps/gnome-settings/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-settings/gnumeric/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnumeric/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnumeric/autocorrect/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnumeric/autoformat/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnumeric/core/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnumeric/core/defaultfont/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnumeric/core/file/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnumeric/core/file/history/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnumeric/core/file/save/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnumeric/core/gui/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnumeric/core/gui/editing/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnumeric/core/gui/screen/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnumeric/core/gui/window/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnumeric/core/sort/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnumeric/core/sort/default/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnumeric/core/sort/dialog/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnumeric/core/workbook/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnumeric/core/xml/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnumeric/cut-and-paste/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnumeric/dialogs/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnumeric/dialogs/rs/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnumeric/file/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnumeric/file/history/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnumeric/functionselector/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnumeric/plugin/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnumeric/plugin/latex/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnumeric/plugins/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnumeric/printsetup/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnumeric/undo/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-settings/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-settings/gnumeric/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/autocorrect/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/autoformat/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/defaultfont/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/file/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/file/history/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/file/save/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/gui/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/gui/editing/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/gui/screen/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/gui/window/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/sort/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/sort/default/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/sort/dialog/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/workbook/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/xml/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/cut-and-paste/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/dialogs/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/dialogs/rs/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/functionselector/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/plugin/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/plugin/latex/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/plugins/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/printsetup/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/undo/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnumeric-dialogs.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/gnumeric-dialogs.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnumeric-dialogs.schemas > /dev/null || /usr/bin/true
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnumeric-general.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/gnumeric-general.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnumeric-general.schemas > /dev/null || /usr/bin/true
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnumeric-plugins.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/gnumeric-plugins.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnumeric-plugins.schemas > /dev/null || /usr/bin/true
 lib/gnumeric/%%VERSION%%/plugins/applix/applix.so
 lib/gnumeric/%%VERSION%%/plugins/applix/plugin.xml
 lib/gnumeric/%%VERSION%%/plugins/corba/corba.so
@@ -797,62 +745,4 @@ share/locale/zh_TW/LC_MESSAGES/gnumeric.mo
 @dirrm lib/gnumeric/%%VERSION%%/plugins
 @dirrm lib/gnumeric/%%VERSION%%
 @dirrm lib/gnumeric
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/undo
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/printsetup
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/plugins
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/plugin/latex
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/plugin
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/functionselector
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/dialogs/rs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/dialogs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/cut-and-paste
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/xml
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/workbook
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/sort/dialog
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/sort/default
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/sort
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/gui/window
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/gui/screen
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/gui/editing
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/gui
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/file/save
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/file/history
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/file
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/defaultfont
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/autoformat
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/autocorrect
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-settings/gnumeric
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-settings
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/undo
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/printsetup
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/plugins
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/plugin/latex
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/plugin
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/functionselector
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/file/history
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/file
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/dialogs/rs
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/dialogs
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/cut-and-paste
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/core/xml
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/core/workbook
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/core/sort/dialog
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/core/sort/default
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/core/sort
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/core/gui/window
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/core/gui/screen
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/core/gui/editing
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/core/gui
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/core/file/save
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/core/file/history
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/core/file
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/core/defaultfont
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/core
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/autoformat
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/autocorrect
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-settings/gnumeric
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-settings
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnumeric/gnumeric-C.omf 2>/dev/null || /usr/bin/true