21 files changed, 721 insertions, 725 deletions

diff --git a/math/drgeo/Makefile b/math/drgeo/Makefile
index 31d31043d52e..e0c0313b1601 100644
--- a/math/drgeo/Makefile
+++ b/math/drgeo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	drgeo
 PORTVERSION=	1.1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ofset
diff --git a/math/drgeo/pkg-plist b/math/drgeo/pkg-plist
index ad409886016a..b7415ee86012 100644
--- a/math/drgeo/pkg-plist
+++ b/math/drgeo/pkg-plist
@@ -1,178 +1,178 @@
 bin/drgeo
 bin/tm_drgeo
-share/gnome/applications/drgeo.desktop
-share/gnome/drgeo/encode/latin1.ps
-share/gnome/drgeo/examples/figures/accel.big5.fgeo
-share/gnome/drgeo/examples/figures/accel.fgeo
-share/gnome/drgeo/examples/figures/angle-inscrit.fgeo
-share/gnome/drgeo/examples/figures/baballe.fgeo
-share/gnome/drgeo/examples/figures/braik_conic.fgeo
-share/gnome/drgeo/examples/figures/cercle-inscrit.fgeo
-share/gnome/drgeo/examples/figures/circle-locus.fgeo
-share/gnome/drgeo/examples/figures/conics.fgeo
-share/gnome/drgeo/examples/figures/duality.fgeo
-share/gnome/drgeo/examples/figures/euler-line.fgeo
-share/gnome/drgeo/examples/figures/fonctions_associees.fgeo
-share/gnome/drgeo/examples/figures/lens.fgeo
-share/gnome/drgeo/examples/figures/light6.fgeo
-share/gnome/drgeo/examples/figures/mercedes.fgeo
-share/gnome/drgeo/examples/figures/moyenne-prop.fgeo
-share/gnome/drgeo/examples/figures/orthocenter-locus.fgeo
-share/gnome/drgeo/examples/figures/orthocentre-symetique.fgeo
-share/gnome/drgeo/examples/figures/parallelogramme.fgeo
-share/gnome/drgeo/examples/figures/partage-segment.fgeo
-share/gnome/drgeo/examples/figures/polygon-7.fgeo
-share/gnome/drgeo/examples/figures/polygons.fgeo
-share/gnome/drgeo/examples/figures/problem1.fgeo
-share/gnome/drgeo/examples/figures/refraction.fgeo
-share/gnome/drgeo/examples/figures/saliera.fgeo
-share/gnome/drgeo/examples/figures/signed-distance.fgeo
-share/gnome/drgeo/examples/figures/sinusoide.fgeo
-share/gnome/drgeo/examples/figures/slope.fgeo
-share/gnome/drgeo/examples/figures/steiner_conic.fgeo
-share/gnome/drgeo/examples/figures/symmetry-axe-2.fgeo
-share/gnome/drgeo/examples/figures/symmetry-center.fgeo
-share/gnome/drgeo/examples/figures/triangle-scale.fgeo
-share/gnome/drgeo/examples/figures/triangle_rectangle1.fgeo
-share/gnome/drgeo/examples/figures/triangles-homothetiques.fgeo
-share/gnome/drgeo/examples/figures/trigo1.fgeo
-share/gnome/drgeo/examples/figures/varignon.fgeo
-share/gnome/drgeo/examples/figures/wheel.fgeo
-share/gnome/drgeo/examples/macros/bissectrice.mgeo
-share/gnome/drgeo/examples/macros/centre1.mgeo
-share/gnome/drgeo/examples/macros/orthocentre.mgeo
-share/gnome/drgeo/examples/macros/pentagone.mgeo
-share/gnome/drgeo/examples/macros/polygon-7.mgeo
-share/gnome/drgeo/examples/macros/segment.mgeo
-share/gnome/drgeo/examples/scheme/baravelle.scm
-share/gnome/drgeo/examples/scheme/baum.scm
-share/gnome/drgeo/examples/scheme/figure.scm
-share/gnome/drgeo/examples/scheme/fractale.scm
-share/gnome/drgeo/examples/scheme/koch.scm
-share/gnome/drgeo/examples/scheme/pappo.scm
-share/gnome/drgeo/examples/scheme/polygon.scm
-share/gnome/drgeo/examples/scheme/polygon2.scm
-share/gnome/drgeo/examples/scheme/premier.scm
-share/gnome/drgeo/examples/scheme/spiral.scm
-share/gnome/drgeo/examples/scheme/square.scm
-share/gnome/drgeo/examples/scheme/steiner.scm
-share/gnome/drgeo/examples/scheme/tilings.scm
-share/gnome/drgeo/glade/angle.png
-share/gnome/drgeo/glade/angle.xpm
-share/gnome/drgeo/glade/axial_symetry.png
-share/gnome/drgeo/glade/axial_symetry.xpm
-share/gnome/drgeo/glade/build_macro.png
-share/gnome/drgeo/glade/build_macro.xpm
-share/gnome/drgeo/glade/central_symetry.png
-share/gnome/drgeo/glade/central_symetry.xpm
-share/gnome/drgeo/glade/circle.png
-share/gnome/drgeo/glade/circle.xpm
-share/gnome/drgeo/glade/circle_arc.png
-share/gnome/drgeo/glade/circle_arc.xpm
-share/gnome/drgeo/glade/color-black.xpm
-share/gnome/drgeo/glade/color-blue.xpm
-share/gnome/drgeo/glade/color-bordeaux.xpm
-share/gnome/drgeo/glade/color-dark-blue.xpm
-share/gnome/drgeo/glade/color-dark-green.xpm
-share/gnome/drgeo/glade/color-dark-grey.xpm
-share/gnome/drgeo/glade/color-green.xpm
-share/gnome/drgeo/glade/color-grey.xpm
-share/gnome/drgeo/glade/color-orange.xpm
-share/gnome/drgeo/glade/color-red.xpm
-share/gnome/drgeo/glade/color-white.xpm
-share/gnome/drgeo/glade/color-yellow.xpm
-share/gnome/drgeo/glade/coordinates.png
-share/gnome/drgeo/glade/coordinates.xpm
-share/gnome/drgeo/glade/cross.xpm
-share/gnome/drgeo/glade/dashline.xpm
-share/gnome/drgeo/glade/distance.png
-share/gnome/drgeo/glade/distance.xpm
-share/gnome/drgeo/glade/drgenius2.glade
-share/gnome/drgeo/glade/drgenius_new_figure.xpm
-share/gnome/drgeo/glade/drgeo.png
-share/gnome/drgeo/glade/drgeo2.glade
-share/gnome/drgeo/glade/drgeoMDI.glade
-share/gnome/drgeo/glade/eraser.png
-share/gnome/drgeo/glade/eraser.xpm
-share/gnome/drgeo/glade/free_point.png
-share/gnome/drgeo/glade/free_point.xpm
-share/gnome/drgeo/glade/grid.png
-share/gnome/drgeo/glade/half_line.png
-share/gnome/drgeo/glade/half_line.xpm
-share/gnome/drgeo/glade/homothetie.png
-share/gnome/drgeo/glade/homothetie.xpm
-share/gnome/drgeo/glade/intersection_point.png
-share/gnome/drgeo/glade/intersection_point.xpm
-share/gnome/drgeo/glade/largeline.xpm
-share/gnome/drgeo/glade/line.png
-share/gnome/drgeo/glade/line.xpm
-share/gnome/drgeo/glade/line_menu.png
-share/gnome/drgeo/glade/line_menu.xpm
-share/gnome/drgeo/glade/load.xpm
-share/gnome/drgeo/glade/locus.png
-share/gnome/drgeo/glade/macro_menu.png
-share/gnome/drgeo/glade/macro_menu.xpm
-share/gnome/drgeo/glade/middle.png
-share/gnome/drgeo/glade/middle.xpm
-share/gnome/drgeo/glade/move.png
-share/gnome/drgeo/glade/move.xpm
-share/gnome/drgeo/glade/new_figure.xpm
-share/gnome/drgeo/glade/normalline.xpm
-share/gnome/drgeo/glade/numeric_menu.png
-share/gnome/drgeo/glade/numeric_menu.xpm
-share/gnome/drgeo/glade/parallel.png
-share/gnome/drgeo/glade/parallel.xpm
-share/gnome/drgeo/glade/perpendicular.png
-share/gnome/drgeo/glade/perpendicular.xpm
-share/gnome/drgeo/glade/point_coordinate.png
-share/gnome/drgeo/glade/point_coordinate.xpm
-share/gnome/drgeo/glade/point_menu.png
-share/gnome/drgeo/glade/point_menu.xpm
-share/gnome/drgeo/glade/polygon.png
-share/gnome/drgeo/glade/polygon.xpm
-share/gnome/drgeo/glade/preferences.xpm
-share/gnome/drgeo/glade/property.png
-share/gnome/drgeo/glade/property.xpm
-share/gnome/drgeo/glade/quit.xpm
-share/gnome/drgeo/glade/rename.png
-share/gnome/drgeo/glade/rotation.png
-share/gnome/drgeo/glade/rotation.xpm
-share/gnome/drgeo/glade/round-empty.xpm
-share/gnome/drgeo/glade/round.xpm
-share/gnome/drgeo/glade/run_macro.png
-share/gnome/drgeo/glade/run_macro.xpm
-share/gnome/drgeo/glade/save.xpm
-share/gnome/drgeo/glade/script.png
-share/gnome/drgeo/glade/script.xpm
-share/gnome/drgeo/glade/segment.png
-share/gnome/drgeo/glade/segment.xpm
-share/gnome/drgeo/glade/square-empty.xpm
-share/gnome/drgeo/glade/square.xpm
-share/gnome/drgeo/glade/styles.png
-share/gnome/drgeo/glade/styles.xpm
-share/gnome/drgeo/glade/tools_menu.png
-share/gnome/drgeo/glade/tools_menu.xpm
-share/gnome/drgeo/glade/transformation_menu.png
-share/gnome/drgeo/glade/transformation_menu.xpm
-share/gnome/drgeo/glade/translation.png
-share/gnome/drgeo/glade/translation.xpm
-share/gnome/drgeo/glade/triangle.xpm
-share/gnome/drgeo/glade/vectrex.png
-share/gnome/drgeo/glade/vectrex.xpm
-share/gnome/drgeo/glade/widget-script.png
-share/gnome/drgeo/glade/widget-script.xpm
-share/gnome/drgeo/scm/drgeo_config.scm
-share/gnome/drgeo/scm/drgeo_scm_interface.scm
-share/gnome/drgeo/scm/drgeo_scm_interface_constant.scm
-share/gnome/drgeo/scm/drgeo_scm_interface_constant_es.scm
-share/gnome/drgeo/scm/drgeo_scm_interface_constant_fr.scm
-share/gnome/drgeo/scm/drgeo_scm_interface_constant_nl.scm
-share/gnome/drgeo/scm/drgeo_scm_interface_constant_sr.scm
-share/gnome/drgeo/scm/preferences.scm
-share/gnome/pixmaps/drgeo-book.png
-share/gnome/pixmaps/drgeo-file.png
-share/gnome/pixmaps/ofset-logo.png
-share/gnome/texmacs/TeXmacs/plugins/drgeo/progs/init-drgeo.scm
+share/applications/drgeo.desktop
+share/drgeo/encode/latin1.ps
+share/drgeo/examples/figures/accel.big5.fgeo
+share/drgeo/examples/figures/accel.fgeo
+share/drgeo/examples/figures/angle-inscrit.fgeo
+share/drgeo/examples/figures/baballe.fgeo
+share/drgeo/examples/figures/braik_conic.fgeo
+share/drgeo/examples/figures/cercle-inscrit.fgeo
+share/drgeo/examples/figures/circle-locus.fgeo
+share/drgeo/examples/figures/conics.fgeo
+share/drgeo/examples/figures/duality.fgeo
+share/drgeo/examples/figures/euler-line.fgeo
+share/drgeo/examples/figures/fonctions_associees.fgeo
+share/drgeo/examples/figures/lens.fgeo
+share/drgeo/examples/figures/light6.fgeo
+share/drgeo/examples/figures/mercedes.fgeo
+share/drgeo/examples/figures/moyenne-prop.fgeo
+share/drgeo/examples/figures/orthocenter-locus.fgeo
+share/drgeo/examples/figures/orthocentre-symetique.fgeo
+share/drgeo/examples/figures/parallelogramme.fgeo
+share/drgeo/examples/figures/partage-segment.fgeo
+share/drgeo/examples/figures/polygon-7.fgeo
+share/drgeo/examples/figures/polygons.fgeo
+share/drgeo/examples/figures/problem1.fgeo
+share/drgeo/examples/figures/refraction.fgeo
+share/drgeo/examples/figures/saliera.fgeo
+share/drgeo/examples/figures/signed-distance.fgeo
+share/drgeo/examples/figures/sinusoide.fgeo
+share/drgeo/examples/figures/slope.fgeo
+share/drgeo/examples/figures/steiner_conic.fgeo
+share/drgeo/examples/figures/symmetry-axe-2.fgeo
+share/drgeo/examples/figures/symmetry-center.fgeo
+share/drgeo/examples/figures/triangle-scale.fgeo
+share/drgeo/examples/figures/triangle_rectangle1.fgeo
+share/drgeo/examples/figures/triangles-homothetiques.fgeo
+share/drgeo/examples/figures/trigo1.fgeo
+share/drgeo/examples/figures/varignon.fgeo
+share/drgeo/examples/figures/wheel.fgeo
+share/drgeo/examples/macros/bissectrice.mgeo
+share/drgeo/examples/macros/centre1.mgeo
+share/drgeo/examples/macros/orthocentre.mgeo
+share/drgeo/examples/macros/pentagone.mgeo
+share/drgeo/examples/macros/polygon-7.mgeo
+share/drgeo/examples/macros/segment.mgeo
+share/drgeo/examples/scheme/baravelle.scm
+share/drgeo/examples/scheme/baum.scm
+share/drgeo/examples/scheme/figure.scm
+share/drgeo/examples/scheme/fractale.scm
+share/drgeo/examples/scheme/koch.scm
+share/drgeo/examples/scheme/pappo.scm
+share/drgeo/examples/scheme/polygon.scm
+share/drgeo/examples/scheme/polygon2.scm
+share/drgeo/examples/scheme/premier.scm
+share/drgeo/examples/scheme/spiral.scm
+share/drgeo/examples/scheme/square.scm
+share/drgeo/examples/scheme/steiner.scm
+share/drgeo/examples/scheme/tilings.scm
+share/drgeo/glade/angle.png
+share/drgeo/glade/angle.xpm
+share/drgeo/glade/axial_symetry.png
+share/drgeo/glade/axial_symetry.xpm
+share/drgeo/glade/build_macro.png
+share/drgeo/glade/build_macro.xpm
+share/drgeo/glade/central_symetry.png
+share/drgeo/glade/central_symetry.xpm
+share/drgeo/glade/circle.png
+share/drgeo/glade/circle.xpm
+share/drgeo/glade/circle_arc.png
+share/drgeo/glade/circle_arc.xpm
+share/drgeo/glade/color-black.xpm
+share/drgeo/glade/color-blue.xpm
+share/drgeo/glade/color-bordeaux.xpm
+share/drgeo/glade/color-dark-blue.xpm
+share/drgeo/glade/color-dark-green.xpm
+share/drgeo/glade/color-dark-grey.xpm
+share/drgeo/glade/color-green.xpm
+share/drgeo/glade/color-grey.xpm
+share/drgeo/glade/color-orange.xpm
+share/drgeo/glade/color-red.xpm
+share/drgeo/glade/color-white.xpm
+share/drgeo/glade/color-yellow.xpm
+share/drgeo/glade/coordinates.png
+share/drgeo/glade/coordinates.xpm
+share/drgeo/glade/cross.xpm
+share/drgeo/glade/dashline.xpm
+share/drgeo/glade/distance.png
+share/drgeo/glade/distance.xpm
+share/drgeo/glade/drgenius2.glade
+share/drgeo/glade/drgenius_new_figure.xpm
+share/drgeo/glade/drgeo.png
+share/drgeo/glade/drgeo2.glade
+share/drgeo/glade/drgeoMDI.glade
+share/drgeo/glade/eraser.png
+share/drgeo/glade/eraser.xpm
+share/drgeo/glade/free_point.png
+share/drgeo/glade/free_point.xpm
+share/drgeo/glade/grid.png
+share/drgeo/glade/half_line.png
+share/drgeo/glade/half_line.xpm
+share/drgeo/glade/homothetie.png
+share/drgeo/glade/homothetie.xpm
+share/drgeo/glade/intersection_point.png
+share/drgeo/glade/intersection_point.xpm
+share/drgeo/glade/largeline.xpm
+share/drgeo/glade/line.png
+share/drgeo/glade/line.xpm
+share/drgeo/glade/line_menu.png
+share/drgeo/glade/line_menu.xpm
+share/drgeo/glade/load.xpm
+share/drgeo/glade/locus.png
+share/drgeo/glade/macro_menu.png
+share/drgeo/glade/macro_menu.xpm
+share/drgeo/glade/middle.png
+share/drgeo/glade/middle.xpm
+share/drgeo/glade/move.png
+share/drgeo/glade/move.xpm
+share/drgeo/glade/new_figure.xpm
+share/drgeo/glade/normalline.xpm
+share/drgeo/glade/numeric_menu.png
+share/drgeo/glade/numeric_menu.xpm
+share/drgeo/glade/parallel.png
+share/drgeo/glade/parallel.xpm
+share/drgeo/glade/perpendicular.png
+share/drgeo/glade/perpendicular.xpm
+share/drgeo/glade/point_coordinate.png
+share/drgeo/glade/point_coordinate.xpm
+share/drgeo/glade/point_menu.png
+share/drgeo/glade/point_menu.xpm
+share/drgeo/glade/polygon.png
+share/drgeo/glade/polygon.xpm
+share/drgeo/glade/preferences.xpm
+share/drgeo/glade/property.png
+share/drgeo/glade/property.xpm
+share/drgeo/glade/quit.xpm
+share/drgeo/glade/rename.png
+share/drgeo/glade/rotation.png
+share/drgeo/glade/rotation.xpm
+share/drgeo/glade/round-empty.xpm
+share/drgeo/glade/round.xpm
+share/drgeo/glade/run_macro.png
+share/drgeo/glade/run_macro.xpm
+share/drgeo/glade/save.xpm
+share/drgeo/glade/script.png
+share/drgeo/glade/script.xpm
+share/drgeo/glade/segment.png
+share/drgeo/glade/segment.xpm
+share/drgeo/glade/square-empty.xpm
+share/drgeo/glade/square.xpm
+share/drgeo/glade/styles.png
+share/drgeo/glade/styles.xpm
+share/drgeo/glade/tools_menu.png
+share/drgeo/glade/tools_menu.xpm
+share/drgeo/glade/transformation_menu.png
+share/drgeo/glade/transformation_menu.xpm
+share/drgeo/glade/translation.png
+share/drgeo/glade/translation.xpm
+share/drgeo/glade/triangle.xpm
+share/drgeo/glade/vectrex.png
+share/drgeo/glade/vectrex.xpm
+share/drgeo/glade/widget-script.png
+share/drgeo/glade/widget-script.xpm
+share/drgeo/scm/drgeo_config.scm
+share/drgeo/scm/drgeo_scm_interface.scm
+share/drgeo/scm/drgeo_scm_interface_constant.scm
+share/drgeo/scm/drgeo_scm_interface_constant_es.scm
+share/drgeo/scm/drgeo_scm_interface_constant_fr.scm
+share/drgeo/scm/drgeo_scm_interface_constant_nl.scm
+share/drgeo/scm/drgeo_scm_interface_constant_sr.scm
+share/drgeo/scm/preferences.scm
+share/pixmaps/drgeo-book.png
+share/pixmaps/drgeo-file.png
+share/pixmaps/ofset-logo.png
+share/texmacs/TeXmacs/plugins/drgeo/progs/init-drgeo.scm
 share/locale/az/LC_MESSAGES/drgeo.mo
 share/locale/ca/LC_MESSAGES/drgeo.mo
 share/locale/cs/LC_MESSAGES/drgeo.mo
@@ -211,20 +211,21 @@ share/locale/sv/LC_MESSAGES/drgeo.mo
 share/locale/uk/LC_MESSAGES/drgeo.mo
 share/locale/zh_CN/LC_MESSAGES/drgeo.mo
 share/locale/zh_TW/LC_MESSAGES/drgeo.mo
-@dirrmtry share/gnome/texmacs/TeXmacs/plugins/drgeo/progs
-@dirrmtry share/gnome/texmacs/TeXmacs/plugins/drgeo
-@dirrmtry share/gnome/texmacs/TeXmacs/plugins
-@dirrmtry share/gnome/texmacs/TeXmacs
-@dirrmtry share/gnome/texmacs
-@dirrm share/gnome/drgeo/scm
-@dirrm share/gnome/drgeo/glade
-@dirrm share/gnome/drgeo/examples/scheme
-@dirrm share/gnome/drgeo/examples/macros
-@dirrm share/gnome/drgeo/examples/figures
-@dirrm share/gnome/drgeo/examples
-@dirrm share/gnome/drgeo/encode
-@dirrm share/gnome/drgeo
+@dirrmtry share/texmacs/TeXmacs/plugins/drgeo/progs
+@dirrmtry share/texmacs/TeXmacs/plugins/drgeo
+@dirrmtry share/texmacs/TeXmacs/plugins
+@dirrmtry share/texmacs/TeXmacs
+@dirrmtry share/texmacs
+@dirrm share/drgeo/scm
+@dirrm share/drgeo/glade
+@dirrm share/drgeo/examples/scheme
+@dirrm share/drgeo/examples/macros
+@dirrm share/drgeo/examples/figures
+@dirrm share/drgeo/examples
+@dirrm share/drgeo/encode
+@dirrm share/drgeo
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/applications
diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index cedf6d0deb9c..d96b2299ae54 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/math/gcalctool/Makefile,v 1.65 2007/03/12 19:02:22 mezz Exp $
+#   $MCom: ports/math/gcalctool/Makefile,v 1.82 2007/10/17 21:36:12 mezz Exp $
 #
 
 PORTNAME=	gcalctool
-PORTVERSION=	5.9.14
-PORTREVISION=	2
+PORTVERSION=	5.20.2
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -25,7 +25,7 @@ USE_GETTEXT=	yes
 USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
-USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui gnomedocutils
+USE_GNOME=	gnomeprefix gnomehack intlhack gconf2 gnomedocutils
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/math/gcalctool/distinfo b/math/gcalctool/distinfo
index c5063e9ddd58..215b552f6d76 100644
--- a/math/gcalctool/distinfo
+++ b/math/gcalctool/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gcalctool-5.9.14.tar.bz2) = dd51bc2fa9e53a3b6d7b3264e1059296
-SHA256 (gnome2/gcalctool-5.9.14.tar.bz2) = f94a63f6860bfd3d868d8419de2a9d709381eeb44d8535565629525dbc9729c5
-SIZE (gnome2/gcalctool-5.9.14.tar.bz2) = 1189518
+MD5 (gnome2/gcalctool-5.20.2.tar.bz2) = bcde10b8029d3a513183e8aac9506c1f
+SHA256 (gnome2/gcalctool-5.20.2.tar.bz2) = b871c8b7fa2c4afa78b6a1708cffe04ae389ee20ff34e5fb2ddb4b78071edacd
+SIZE (gnome2/gcalctool-5.20.2.tar.bz2) = 1343757
diff --git a/math/gcalctool/pkg-plist b/math/gcalctool/pkg-plist
index 34d2f4c3c8c8..c0964e2f6542 100644
--- a/math/gcalctool/pkg-plist
+++ b/math/gcalctool/pkg-plist
@@ -1,6 +1,6 @@
 bin/gcalctool
 bin/gnome-calculator
-share/gnome/applications/gcalctool.desktop
+share/applications/gcalctool.desktop
 share/gnome/help/gcalctool/C/figures/gcalctool_basic_window.png
 share/gnome/help/gcalctool/C/figures/gcalctool_financial_window.png
 share/gnome/help/gcalctool/C/figures/gcalctool_menu_symbol.png
@@ -19,7 +19,6 @@ share/gnome/help/gcalctool/de/figures/gcalctool_financial_window.png
 share/gnome/help/gcalctool/de/figures/gcalctool_menu_symbol.png
 share/gnome/help/gcalctool/de/figures/gcalctool_scientific_window.png
 share/gnome/help/gcalctool/de/gcalctool.xml
-share/gnome/help/gcalctool/de/legal.xml
 share/gnome/help/gcalctool/es/figures/gcalctool_basic_window.png
 share/gnome/help/gcalctool/es/figures/gcalctool_financial_window.png
 share/gnome/help/gcalctool/es/figures/gcalctool_menu_symbol.png
@@ -47,7 +46,16 @@ share/gnome/help/gcalctool/ko/figures/gcalctool_financial_window.png
 share/gnome/help/gcalctool/ko/figures/gcalctool_menu_symbol.png
 share/gnome/help/gcalctool/ko/figures/gcalctool_scientific_window.png
 share/gnome/help/gcalctool/ko/gcalctool.xml
-share/gnome/help/gcalctool/ko/legal.xml
+share/gnome/help/gcalctool/oc/figures/gcalctool_basic_window.png
+share/gnome/help/gcalctool/oc/figures/gcalctool_financial_window.png
+share/gnome/help/gcalctool/oc/figures/gcalctool_menu_symbol.png
+share/gnome/help/gcalctool/oc/figures/gcalctool_scientific_window.png
+share/gnome/help/gcalctool/oc/gcalctool.xml
+share/gnome/help/gcalctool/pt_BR/figures/gcalctool_basic_window.png
+share/gnome/help/gcalctool/pt_BR/figures/gcalctool_financial_window.png
+share/gnome/help/gcalctool/pt_BR/figures/gcalctool_menu_symbol.png
+share/gnome/help/gcalctool/pt_BR/figures/gcalctool_scientific_window.png
+share/gnome/help/gcalctool/pt_BR/gcalctool.xml
 share/gnome/help/gcalctool/sv/figures/gcalctool_basic_window.png
 share/gnome/help/gcalctool/sv/figures/gcalctool_financial_window.png
 share/gnome/help/gcalctool/sv/figures/gcalctool_menu_symbol.png
@@ -71,18 +79,6 @@ share/gnome/help/gcalctool/zh_TW/figures/gcalctool_menu_symbol.png
 share/gnome/help/gcalctool/zh_TW/figures/gcalctool_scientific_window.png
 share/gnome/help/gcalctool/zh_TW/gcalctool.xml
 share/gnome/help/gcalctool/zh_TW/legal.xml
-share/gnome/omf/gcalctool/gcalctool-C.omf
-share/gnome/omf/gcalctool/gcalctool-bg.omf
-share/gnome/omf/gcalctool/gcalctool-de.omf
-share/gnome/omf/gcalctool/gcalctool-es.omf
-share/gnome/omf/gcalctool/gcalctool-fr.omf
-share/gnome/omf/gcalctool/gcalctool-it.omf
-share/gnome/omf/gcalctool/gcalctool-ja.omf
-share/gnome/omf/gcalctool/gcalctool-ko.omf
-share/gnome/omf/gcalctool/gcalctool-sv.omf
-share/gnome/omf/gcalctool/gcalctool-zh_CN.omf
-share/gnome/omf/gcalctool/gcalctool-zh_HK.omf
-share/gnome/omf/gcalctool/gcalctool-zh_TW.omf
 share/locale/am/LC_MESSAGES/gcalctool.mo
 share/locale/ar/LC_MESSAGES/gcalctool.mo
 share/locale/az/LC_MESSAGES/gcalctool.mo
@@ -131,6 +127,7 @@ share/locale/ms/LC_MESSAGES/gcalctool.mo
 share/locale/nb/LC_MESSAGES/gcalctool.mo
 share/locale/ne/LC_MESSAGES/gcalctool.mo
 share/locale/nl/LC_MESSAGES/gcalctool.mo
+share/locale/oc/LC_MESSAGES/gcalctool.mo
 share/locale/or/LC_MESSAGES/gcalctool.mo
 share/locale/pa/LC_MESSAGES/gcalctool.mo
 share/locale/pl/LC_MESSAGES/gcalctool.mo
@@ -139,6 +136,7 @@ share/locale/pt_BR/LC_MESSAGES/gcalctool.mo
 share/locale/ro/LC_MESSAGES/gcalctool.mo
 share/locale/ru/LC_MESSAGES/gcalctool.mo
 share/locale/rw/LC_MESSAGES/gcalctool.mo
+share/locale/si/LC_MESSAGES/gcalctool.mo
 share/locale/sk/LC_MESSAGES/gcalctool.mo
 share/locale/sl/LC_MESSAGES/gcalctool.mo
 share/locale/sq/LC_MESSAGES/gcalctool.mo
@@ -156,7 +154,21 @@ share/locale/xh/LC_MESSAGES/gcalctool.mo
 share/locale/zh_CN/LC_MESSAGES/gcalctool.mo
 share/locale/zh_HK/LC_MESSAGES/gcalctool.mo
 share/locale/zh_TW/LC_MESSAGES/gcalctool.mo
-@dirrm share/gnome/omf/gcalctool
+share/omf/gcalctool/gcalctool-C.omf
+share/omf/gcalctool/gcalctool-bg.omf
+share/omf/gcalctool/gcalctool-de.omf
+share/omf/gcalctool/gcalctool-es.omf
+share/omf/gcalctool/gcalctool-fr.omf
+share/omf/gcalctool/gcalctool-it.omf
+share/omf/gcalctool/gcalctool-ja.omf
+share/omf/gcalctool/gcalctool-ko.omf
+share/omf/gcalctool/gcalctool-oc.omf
+share/omf/gcalctool/gcalctool-pt_BR.omf
+share/omf/gcalctool/gcalctool-sv.omf
+share/omf/gcalctool/gcalctool-zh_CN.omf
+share/omf/gcalctool/gcalctool-zh_HK.omf
+share/omf/gcalctool/gcalctool-zh_TW.omf
+@dirrm share/omf/gcalctool
 @dirrm share/gnome/help/gcalctool/zh_TW/figures
 @dirrm share/gnome/help/gcalctool/zh_TW
 @dirrm share/gnome/help/gcalctool/zh_HK/figures
@@ -165,6 +177,10 @@ share/locale/zh_TW/LC_MESSAGES/gcalctool.mo
 @dirrm share/gnome/help/gcalctool/zh_CN
 @dirrm share/gnome/help/gcalctool/sv/figures
 @dirrm share/gnome/help/gcalctool/sv
+@dirrm share/gnome/help/gcalctool/pt_BR/figures
+@dirrm share/gnome/help/gcalctool/pt_BR
+@dirrm share/gnome/help/gcalctool/oc/figures
+@dirrm share/gnome/help/gcalctool/oc
 @dirrm share/gnome/help/gcalctool/ko/figures
 @dirrm share/gnome/help/gcalctool/ko
 @dirrm share/gnome/help/gcalctool/ja/figures
@@ -188,8 +204,12 @@ share/locale/zh_TW/LC_MESSAGES/gcalctool.mo
 @dirrmtry share/locale/xh
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
@@ -202,3 +222,4 @@ share/locale/zh_TW/LC_MESSAGES/gcalctool.mo
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
+@dirrmtry share/applications
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 2e3aa9d1c96f..8a3c727f2e0b 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
 # $FreeBSD$
-#   $MCom: ports/math/gnumeric/Makefile,v 1.28 2007/03/06 17:06:53 marcus Exp $
+#   $MCom: ports/math/gnumeric/Makefile,v 1.39 2007/09/16 21:42:03 marcus Exp $
 #
 
 PORTNAME=	gnumeric
 PORTVERSION=	1.7.12
+PORTREVISION=	1
 CATEGORIES=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
@@ -59,10 +60,10 @@ post-patch:
 	@${RM} -f ${WRKSRC}/GNOME_Gnumeric.server.in
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/gnumeric.desktop ${PREFIX}/share/gnome/applications
-	${INSTALL_DATA} ${WRKSRC}/gnumeric.mime ${PREFIX}/share/gnome/mime-info
+	${INSTALL_DATA} ${WRKSRC}/gnumeric.desktop ${PREFIX}/share/applications
+	${INSTALL_DATA} ${WRKSRC}/gnumeric.mime ${PREFIX}/share/mime-info
 	@-update-desktop-database
-.for dir in share/gnome lib
+.for dir in share lib
 	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/${dir}/gnumeric
 .endfor
 
diff --git a/math/gnumeric/pkg-plist b/math/gnumeric/pkg-plist
index b563007e093f..4017e0434c2f 100644
--- a/math/gnumeric/pkg-plist
+++ b/math/gnumeric/pkg-plist
@@ -252,108 +252,108 @@ lib/libspreadsheet.la
 lib/libspreadsheet.so
 libdata/pkgconfig/libspreadsheet-1.7.pc
 @exec update-desktop-database > /dev/null || /usr/bin/true
-share/gnome/applications/gnumeric.desktop
-share/gnome/gnumeric/%%VERSION%%/GNOME_Gnumeric-gtk.xml
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/3D/.category
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/3D/autoformat.3D.button.xml
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/3D/autoformat.3D.list.xml
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Classical/.category
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Classical/autoformat.Classical.cool.xml
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Classical/autoformat.Classical.simple.xml
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Classical/autoformat.Classical.trendy.xml
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Colourful/.category
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Colourful/autoformat.Colourful.banana.xml
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Colourful/autoformat.Colourful.black.xml
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Colourful/autoformat.Colourful.blue.xml
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Colourful/autoformat.Colourful.orange.xml
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Colourful/autoformat.Colourful.vanilla.xml
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Financial/.category
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Financial/autoformat.Financial.basic.xml
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Financial/autoformat.Financial.desert.xml
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Financial/autoformat.Financial.ice.xml
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Financial/autoformat.Financial.modern.xml
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Financial/autoformat.Financial.purple.xml
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/General/.category
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/General/autoformat.General.advanced.xml
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/General/autoformat.General.basic.xml
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/General/autoformat.General.empty.xml
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/General/autoformat.General.table.xml
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/List/.category
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/List/autoformat.List.basic.xml
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/List/autoformat.List.green.xml
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/List/autoformat.List.lila.xml
-share/gnome/gnumeric/%%VERSION%%/autoformat-templates/List/autoformat.List.simple.xml
-share/gnome/gnumeric/%%VERSION%%/glade/advanced-filter.glade
-share/gnome/gnumeric/%%VERSION%%/glade/anova-one.glade
-share/gnome/gnumeric/%%VERSION%%/glade/anova-two.glade
-share/gnome/gnumeric/%%VERSION%%/glade/autocorrect.glade
-share/gnome/gnumeric/%%VERSION%%/glade/autofilter-expression.glade
-share/gnome/gnumeric/%%VERSION%%/glade/autofilter-top10.glade
-share/gnome/gnumeric/%%VERSION%%/glade/autoformat.glade
-share/gnome/gnumeric/%%VERSION%%/glade/autosave.glade
-share/gnome/gnumeric/%%VERSION%%/glade/cell-comment.glade
-share/gnome/gnumeric/%%VERSION%%/glade/cell-format.glade
-share/gnome/gnumeric/%%VERSION%%/glade/cell-sort.glade
-share/gnome/gnumeric/%%VERSION%%/glade/col-width.glade
-share/gnome/gnumeric/%%VERSION%%/glade/colrow.glade
-share/gnome/gnumeric/%%VERSION%%/glade/consolidate.glade
-share/gnome/gnumeric/%%VERSION%%/glade/correlation.glade
-share/gnome/gnumeric/%%VERSION%%/glade/covariance.glade
-share/gnome/gnumeric/%%VERSION%%/glade/dao.glade
-share/gnome/gnumeric/%%VERSION%%/glade/data-table.glade
-share/gnome/gnumeric/%%VERSION%%/glade/define-name.glade
-share/gnome/gnumeric/%%VERSION%%/glade/delete-cells.glade
-share/gnome/gnumeric/%%VERSION%%/glade/descriptive-stats.glade
-share/gnome/gnumeric/%%VERSION%%/glade/dialog-stf-export.glade
-share/gnome/gnumeric/%%VERSION%%/glade/dialog-stf.glade
-share/gnome/gnumeric/%%VERSION%%/glade/dialog-zoom.glade
-share/gnome/gnumeric/%%VERSION%%/glade/doc-meta-data.glade
-share/gnome/gnumeric/%%VERSION%%/glade/exp-smoothing.glade
-share/gnome/gnumeric/%%VERSION%%/glade/fill-series.glade
-share/gnome/gnumeric/%%VERSION%%/glade/font-sel.glade
-share/gnome/gnumeric/%%VERSION%%/glade/formula-guru.glade
-share/gnome/gnumeric/%%VERSION%%/glade/fourier-analysis.glade
-share/gnome/gnumeric/%%VERSION%%/glade/function-select.glade
-share/gnome/gnumeric/%%VERSION%%/glade/goalseek.glade
-share/gnome/gnumeric/%%VERSION%%/glade/goto.glade
-share/gnome/gnumeric/%%VERSION%%/glade/hf-config.glade
-share/gnome/gnumeric/%%VERSION%%/glade/histogram.glade
-share/gnome/gnumeric/%%VERSION%%/glade/hyperlink.glade
-share/gnome/gnumeric/%%VERSION%%/glade/insert-cells.glade
-share/gnome/gnumeric/%%VERSION%%/glade/mean-tests.glade
-share/gnome/gnumeric/%%VERSION%%/glade/merge.glade
-share/gnome/gnumeric/%%VERSION%%/glade/moving-averages.glade
-share/gnome/gnumeric/%%VERSION%%/glade/paste-names.glade
-share/gnome/gnumeric/%%VERSION%%/glade/pivottable.glade
-share/gnome/gnumeric/%%VERSION%%/glade/plugin-manager.glade
-share/gnome/gnumeric/%%VERSION%%/glade/preferences.glade
-share/gnome/gnumeric/%%VERSION%%/glade/print.glade
-share/gnome/gnumeric/%%VERSION%%/glade/random-generation.glade
-share/gnome/gnumeric/%%VERSION%%/glade/rank.glade
-share/gnome/gnumeric/%%VERSION%%/glade/regression.glade
-share/gnome/gnumeric/%%VERSION%%/glade/row-height.glade
-share/gnome/gnumeric/%%VERSION%%/glade/sampling.glade
-share/gnome/gnumeric/%%VERSION%%/glade/scenario-add.glade
-share/gnome/gnumeric/%%VERSION%%/glade/scenario-manager.glade
-share/gnome/gnumeric/%%VERSION%%/glade/search-replace.glade
-share/gnome/gnumeric/%%VERSION%%/glade/search.glade
-share/gnome/gnumeric/%%VERSION%%/glade/sheet-order.glade
-share/gnome/gnumeric/%%VERSION%%/glade/shuffle.glade
-share/gnome/gnumeric/%%VERSION%%/glade/simulation.glade
-share/gnome/gnumeric/%%VERSION%%/glade/so-checkbox.glade
-share/gnome/gnumeric/%%VERSION%%/glade/so-frame.glade
-share/gnome/gnumeric/%%VERSION%%/glade/so-list.glade
-share/gnome/gnumeric/%%VERSION%%/glade/so-scrollbar.glade
-share/gnome/gnumeric/%%VERSION%%/glade/solver.glade
-share/gnome/gnumeric/%%VERSION%%/glade/tabulate.glade
-share/gnome/gnumeric/%%VERSION%%/glade/variance-tests.glade
-share/gnome/gnumeric/%%VERSION%%/glade/view.glade
-share/gnome/gnumeric/%%VERSION%%/glade/workbook-attr.glade
-share/gnome/gnumeric/%%VERSION%%/idl/GNOME_Gnumeric.idl
-share/gnome/gnumeric/%%VERSION%%/templates/invoice.gnumeric
-share/gnome/gnumeric/%%VERSION%%/templates/loan.gnumeric
-share/gnome/gnumeric/%%VERSION%%/templates/mileage.gnumeric
-share/gnome/gnumeric/%%VERSION%%/templates/purchase_order.gnumeric
+share/applications/gnumeric.desktop
+share/gnumeric/%%VERSION%%/GNOME_Gnumeric-gtk.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/3D/.category
+share/gnumeric/%%VERSION%%/autoformat-templates/3D/autoformat.3D.button.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/3D/autoformat.3D.list.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/Classical/.category
+share/gnumeric/%%VERSION%%/autoformat-templates/Classical/autoformat.Classical.cool.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/Classical/autoformat.Classical.simple.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/Classical/autoformat.Classical.trendy.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/Colourful/.category
+share/gnumeric/%%VERSION%%/autoformat-templates/Colourful/autoformat.Colourful.banana.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/Colourful/autoformat.Colourful.black.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/Colourful/autoformat.Colourful.blue.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/Colourful/autoformat.Colourful.orange.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/Colourful/autoformat.Colourful.vanilla.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/Financial/.category
+share/gnumeric/%%VERSION%%/autoformat-templates/Financial/autoformat.Financial.basic.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/Financial/autoformat.Financial.desert.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/Financial/autoformat.Financial.ice.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/Financial/autoformat.Financial.modern.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/Financial/autoformat.Financial.purple.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/General/.category
+share/gnumeric/%%VERSION%%/autoformat-templates/General/autoformat.General.advanced.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/General/autoformat.General.basic.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/General/autoformat.General.empty.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/General/autoformat.General.table.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/List/.category
+share/gnumeric/%%VERSION%%/autoformat-templates/List/autoformat.List.basic.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/List/autoformat.List.green.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/List/autoformat.List.lila.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/List/autoformat.List.simple.xml
+share/gnumeric/%%VERSION%%/glade/advanced-filter.glade
+share/gnumeric/%%VERSION%%/glade/anova-one.glade
+share/gnumeric/%%VERSION%%/glade/anova-two.glade
+share/gnumeric/%%VERSION%%/glade/autocorrect.glade
+share/gnumeric/%%VERSION%%/glade/autofilter-expression.glade
+share/gnumeric/%%VERSION%%/glade/autofilter-top10.glade
+share/gnumeric/%%VERSION%%/glade/autoformat.glade
+share/gnumeric/%%VERSION%%/glade/autosave.glade
+share/gnumeric/%%VERSION%%/glade/cell-comment.glade
+share/gnumeric/%%VERSION%%/glade/cell-format.glade
+share/gnumeric/%%VERSION%%/glade/cell-sort.glade
+share/gnumeric/%%VERSION%%/glade/col-width.glade
+share/gnumeric/%%VERSION%%/glade/colrow.glade
+share/gnumeric/%%VERSION%%/glade/consolidate.glade
+share/gnumeric/%%VERSION%%/glade/correlation.glade
+share/gnumeric/%%VERSION%%/glade/covariance.glade
+share/gnumeric/%%VERSION%%/glade/dao.glade
+share/gnumeric/%%VERSION%%/glade/data-table.glade
+share/gnumeric/%%VERSION%%/glade/define-name.glade
+share/gnumeric/%%VERSION%%/glade/delete-cells.glade
+share/gnumeric/%%VERSION%%/glade/descriptive-stats.glade
+share/gnumeric/%%VERSION%%/glade/dialog-stf-export.glade
+share/gnumeric/%%VERSION%%/glade/dialog-stf.glade
+share/gnumeric/%%VERSION%%/glade/dialog-zoom.glade
+share/gnumeric/%%VERSION%%/glade/doc-meta-data.glade
+share/gnumeric/%%VERSION%%/glade/exp-smoothing.glade
+share/gnumeric/%%VERSION%%/glade/fill-series.glade
+share/gnumeric/%%VERSION%%/glade/font-sel.glade
+share/gnumeric/%%VERSION%%/glade/formula-guru.glade
+share/gnumeric/%%VERSION%%/glade/fourier-analysis.glade
+share/gnumeric/%%VERSION%%/glade/function-select.glade
+share/gnumeric/%%VERSION%%/glade/goalseek.glade
+share/gnumeric/%%VERSION%%/glade/goto.glade
+share/gnumeric/%%VERSION%%/glade/hf-config.glade
+share/gnumeric/%%VERSION%%/glade/histogram.glade
+share/gnumeric/%%VERSION%%/glade/hyperlink.glade
+share/gnumeric/%%VERSION%%/glade/insert-cells.glade
+share/gnumeric/%%VERSION%%/glade/mean-tests.glade
+share/gnumeric/%%VERSION%%/glade/merge.glade
+share/gnumeric/%%VERSION%%/glade/moving-averages.glade
+share/gnumeric/%%VERSION%%/glade/paste-names.glade
+share/gnumeric/%%VERSION%%/glade/pivottable.glade
+share/gnumeric/%%VERSION%%/glade/plugin-manager.glade
+share/gnumeric/%%VERSION%%/glade/preferences.glade
+share/gnumeric/%%VERSION%%/glade/print.glade
+share/gnumeric/%%VERSION%%/glade/random-generation.glade
+share/gnumeric/%%VERSION%%/glade/rank.glade
+share/gnumeric/%%VERSION%%/glade/regression.glade
+share/gnumeric/%%VERSION%%/glade/row-height.glade
+share/gnumeric/%%VERSION%%/glade/sampling.glade
+share/gnumeric/%%VERSION%%/glade/scenario-add.glade
+share/gnumeric/%%VERSION%%/glade/scenario-manager.glade
+share/gnumeric/%%VERSION%%/glade/search-replace.glade
+share/gnumeric/%%VERSION%%/glade/search.glade
+share/gnumeric/%%VERSION%%/glade/sheet-order.glade
+share/gnumeric/%%VERSION%%/glade/shuffle.glade
+share/gnumeric/%%VERSION%%/glade/simulation.glade
+share/gnumeric/%%VERSION%%/glade/so-checkbox.glade
+share/gnumeric/%%VERSION%%/glade/so-frame.glade
+share/gnumeric/%%VERSION%%/glade/so-list.glade
+share/gnumeric/%%VERSION%%/glade/so-scrollbar.glade
+share/gnumeric/%%VERSION%%/glade/solver.glade
+share/gnumeric/%%VERSION%%/glade/tabulate.glade
+share/gnumeric/%%VERSION%%/glade/variance-tests.glade
+share/gnumeric/%%VERSION%%/glade/view.glade
+share/gnumeric/%%VERSION%%/glade/workbook-attr.glade
+share/gnumeric/%%VERSION%%/idl/GNOME_Gnumeric.idl
+share/gnumeric/%%VERSION%%/templates/invoice.gnumeric
+share/gnumeric/%%VERSION%%/templates/loan.gnumeric
+share/gnumeric/%%VERSION%%/templates/mileage.gnumeric
+share/gnumeric/%%VERSION%%/templates/purchase_order.gnumeric
 share/gnome/help/gnumeric/C/about-authors.xml
 share/gnome/help/gnumeric/C/about-history.xml
 share/gnome/help/gnumeric/C/about-license.xml
@@ -755,28 +755,28 @@ share/gnome/help/gnumeric/C/quick-start.xml
 share/gnome/help/gnumeric/C/welcome.xml
 share/gnome/help/gnumeric/C/workbooks.xml
 share/gnome/help/gnumeric/C/worksheets.xml
-share/gnome/mime-info/gnumeric.mime
-share/gnome/omf/gnumeric/gnumeric-C.omf
-share/gnome/pixmaps/gnome-application-vnd.lotus-1-2-3.png
-share/gnome/pixmaps/gnome-application-x-applix-spreadsheet.png
-share/gnome/pixmaps/gnome-application-x-generic-spreadsheet.png
-share/gnome/pixmaps/gnome-application-x-gnumeric.png
-share/gnome/pixmaps/gnome-application-x-xls.png
-share/gnome/pixmaps/gnome-gnumeric.png
-share/gnome/pixmaps/gnumeric/down-right.png
-share/gnome/pixmaps/gnumeric/gnome-application-vnd.lotus-1-2-3.png
-share/gnome/pixmaps/gnumeric/gnome-application-x-applix-spreadsheet.png
-share/gnome/pixmaps/gnumeric/gnome-application-x-generic-spreadsheet.png
-share/gnome/pixmaps/gnumeric/gnome-application-x-gnumeric.png
-share/gnome/pixmaps/gnumeric/gnome-application-x-xls.png
-share/gnome/pixmaps/gnumeric/gnome-gnumeric.png
-share/gnome/pixmaps/gnumeric/gnumeric-about.png
-share/gnome/pixmaps/gnumeric/orient-horizontal.png
-share/gnome/pixmaps/gnumeric/orient-vertical.png
-share/gnome/pixmaps/gnumeric/right-down.png
-share/gnome/pixmaps/gnumeric/stf-druid.png
-share/gnome/pixmaps/gnumeric/win32-gnumeric.ico
-share/gnome/pixmaps/win32-gnumeric.ico
+share/mime-info/gnumeric.mime
+share/omf/gnumeric/gnumeric-C.omf
+share/pixmaps/gnome-application-vnd.lotus-1-2-3.png
+share/pixmaps/gnome-application-x-applix-spreadsheet.png
+share/pixmaps/gnome-application-x-generic-spreadsheet.png
+share/pixmaps/gnome-application-x-gnumeric.png
+share/pixmaps/gnome-application-x-xls.png
+share/pixmaps/gnome-gnumeric.png
+share/pixmaps/gnumeric/down-right.png
+share/pixmaps/gnumeric/gnome-application-vnd.lotus-1-2-3.png
+share/pixmaps/gnumeric/gnome-application-x-applix-spreadsheet.png
+share/pixmaps/gnumeric/gnome-application-x-generic-spreadsheet.png
+share/pixmaps/gnumeric/gnome-application-x-gnumeric.png
+share/pixmaps/gnumeric/gnome-application-x-xls.png
+share/pixmaps/gnumeric/gnome-gnumeric.png
+share/pixmaps/gnumeric/gnumeric-about.png
+share/pixmaps/gnumeric/orient-horizontal.png
+share/pixmaps/gnumeric/orient-vertical.png
+share/pixmaps/gnumeric/right-down.png
+share/pixmaps/gnumeric/stf-druid.png
+share/pixmaps/gnumeric/win32-gnumeric.ico
+share/pixmaps/win32-gnumeric.ico
 share/locale/am/LC_MESSAGES/gnumeric-functions.mo
 share/locale/am/LC_MESSAGES/gnumeric.mo
 share/locale/ar/LC_MESSAGES/gnumeric-functions.mo
@@ -879,23 +879,23 @@ share/locale/zh_CN/LC_MESSAGES/gnumeric-functions.mo
 share/locale/zh_CN/LC_MESSAGES/gnumeric.mo
 share/locale/zh_TW/LC_MESSAGES/gnumeric-functions.mo
 share/locale/zh_TW/LC_MESSAGES/gnumeric.mo
-@dirrm share/gnome/pixmaps/gnumeric
-@dirrm share/gnome/omf/gnumeric
+@dirrm share/pixmaps/gnumeric
+@dirrm share/omf/gnumeric
 @dirrm share/gnome/help/gnumeric/C/figures
 @dirrm share/gnome/help/gnumeric/C
 @dirrm share/gnome/help/gnumeric
-@dirrm share/gnome/gnumeric/%%VERSION%%/templates
-@dirrm share/gnome/gnumeric/%%VERSION%%/idl
-@dirrm share/gnome/gnumeric/%%VERSION%%/glade
-@dirrm share/gnome/gnumeric/%%VERSION%%/autoformat-templates/List
-@dirrm share/gnome/gnumeric/%%VERSION%%/autoformat-templates/General
-@dirrm share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Financial
-@dirrm share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Colourful
-@dirrm share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Classical
-@dirrm share/gnome/gnumeric/%%VERSION%%/autoformat-templates/3D
-@dirrm share/gnome/gnumeric/%%VERSION%%/autoformat-templates
-@dirrm share/gnome/gnumeric/%%VERSION%%
-@dirrm share/gnome/gnumeric
+@dirrm share/gnumeric/%%VERSION%%/templates
+@dirrm share/gnumeric/%%VERSION%%/idl
+@dirrm share/gnumeric/%%VERSION%%/glade
+@dirrm share/gnumeric/%%VERSION%%/autoformat-templates/List
+@dirrm share/gnumeric/%%VERSION%%/autoformat-templates/General
+@dirrm share/gnumeric/%%VERSION%%/autoformat-templates/Financial
+@dirrm share/gnumeric/%%VERSION%%/autoformat-templates/Colourful
+@dirrm share/gnumeric/%%VERSION%%/autoformat-templates/Classical
+@dirrm share/gnumeric/%%VERSION%%/autoformat-templates/3D
+@dirrm share/gnumeric/%%VERSION%%/autoformat-templates
+@dirrm share/gnumeric/%%VERSION%%
+@dirrm share/gnumeric
 @dirrm lib/gnumeric/%%VERSION%%/plugins/xbase
 @dirrm lib/gnumeric/%%VERSION%%/plugins/uihello
 @dirrm lib/gnumeric/%%VERSION%%/plugins/sylk
@@ -950,3 +950,4 @@ share/locale/zh_TW/LC_MESSAGES/gnumeric.mo
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
+@dirrmtry share/applications
diff --git a/math/gretl/Makefile b/math/gretl/Makefile
index c6b9e1be41d3..c36ad83fcf25 100644
--- a/math/gretl/Makefile
+++ b/math/gretl/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gretl
 PORTVERSION=	1.6.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math finance
 MASTER_SITES=	SF
 
@@ -49,7 +49,6 @@ BROKEN=		math/lapack appears to be broken on alpha
 PKGNAMESUFFIX=	-gnome
 USE_GNOME+=	gnomeprefix gtksourceview libgnomeui
 GCONF_SCHEMAS=	gretl.schemas
-DATADIR=	${PREFIX}/share/gnome/${PORTNAME}
 .else
 CONFIGURE_ARGS+=	--without-gnome --without-gtksourceview
 .endif
diff --git a/math/gretl/files/patch-gui2::omf-install::Makefile.in b/math/gretl/files/patch-gui2::omf-install::Makefile.in
index c365f12bc2c0..c5cfa1532451 100644
--- a/math/gretl/files/patch-gui2::omf-install::Makefile.in
+++ b/math/gretl/files/patch-gui2::omf-install::Makefile.in
@@ -14,7 +14,7 @@
  
 -docdir = $(gnome_prefix)/share/gnome/help/gretl/C
 -omfdir = $(gnome_prefix)/share/omf/gretl
-+docdir = $(datadir)/help/gretl/C
++docdir = $(gnome_prefix)/share/gnome/help/gretl/C
 +omfdir = $(datadir)/omf/gretl
  
  gretl-C.omf: gretl-C.omf.in
diff --git a/math/gretl/files/patch-po::Makefile.in.in b/math/gretl/files/patch-po::Makefile.in.in
deleted file mode 100644
index 53fa2d5ede09..000000000000
--- a/math/gretl/files/patch-po::Makefile.in.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- po/Makefile.in.in.orig	Fri May 24 05:03:49 2002
-+++ po/Makefile.in.in	Mon Oct 21 08:10:04 2002
-@@ -21,7 +21,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = @datadir@
--localedir = $(datadir)/locale
-+localedir = $(prefix)/share/locale
- gettextsrcdir = $(datadir)/gettext/po
- 
- INSTALL = @INSTALL@
diff --git a/math/gretl/pkg-plist b/math/gretl/pkg-plist
index 29d406f2ee05..7ccc034ae345 100644
--- a/math/gretl/pkg-plist
+++ b/math/gretl/pkg-plist
@@ -155,7 +155,7 @@ lib/libgretl-1.0.la
 lib/libgretl-1.0.so
 lib/libgretl-1.0.so.0
 libdata/pkgconfig/gretl.pc
-%%GNOME:%%share/gnome/applications/gretl.desktop
+%%GNOME:%%share/applications/gretl.desktop
 %%DATADIR%%/COPYING
 %%DATADIR%%/data/data10-1.gdt
 %%DATADIR%%/data/data10-2.gdt
@@ -470,14 +470,14 @@ libdata/pkgconfig/gretl.pc
 %%DATADIR%%/scripts/ps_descriptions
 %%DATADIR%%/scripts/testinp
 %%DATADIR%%/scripts/wg_ps_descriptions
-%%GNOME:%%share/gnome/gtksourceview-1.0/language-specs/gnuplot.lang
-%%GNOME:%%share/gnome/gtksourceview-1.0/language-specs/gretl.lang
-%%GNOME:%%share/gnome/mime-info/gretl.keys
-%%GNOME:%%share/gnome/mime-info/gretl.mime
-%%GNOME:%%share/gnome/pixmaps/gnome-application-x-gretldata.png
-%%GNOME:%%share/gnome/pixmaps/gnome-application-x-gretlsession.png
-%%GNOME:%%share/gnome/pixmaps/gretl-logo.xpm
-%%GNOME:%%share/gnome/pixmaps/gretl.xpm
+%%GNOME:%%share/gtksourceview-1.0/language-specs/gnuplot.lang
+%%GNOME:%%share/gtksourceview-1.0/language-specs/gretl.lang
+%%GNOME:%%share/mime-info/gretl.keys
+%%GNOME:%%share/mime-info/gretl.mime
+%%GNOME:%%share/pixmaps/gnome-application-x-gretldata.png
+%%GNOME:%%share/pixmaps/gnome-application-x-gretlsession.png
+%%GNOME:%%share/pixmaps/gretl-logo.xpm
+%%GNOME:%%share/pixmaps/gretl.xpm
 share/locale/de/LC_MESSAGES/gretl.mo
 share/locale/es/LC_MESSAGES/gretl.mo
 share/locale/eu/LC_MESSAGES/gretl.mo
@@ -507,3 +507,4 @@ share/locale/tr/LC_MESSAGES/gretl.mo
 @dirrm include/gretl
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/applications
diff --git a/math/guppi/Makefile b/math/guppi/Makefile
index 62c1f86705e4..5b172bbe9c1c 100644
--- a/math/guppi/Makefile
+++ b/math/guppi/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	guppi
 PORTVERSION=	0.40.3
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/Guppi/0.40
diff --git a/math/guppi/pkg-plist b/math/guppi/pkg-plist
index a69ce37d6014..b01f3cbfb0c1 100644
--- a/math/guppi/pkg-plist
+++ b/math/guppi/pkg-plist
@@ -174,94 +174,14 @@ lib/libguppi.so.16
 lib/libguppitank.so
 lib/libguppitank.so.16
 share/aclocal/libguppi.m4
-share/gnome/guppi/glade/guppi-gnumeric-format-guru.glade
-share/gnome/guppi/glade/view-properties.glade
-share/gnome/guppi/scripts/guppi-gnumeric-plots.xml
 share/gnome/help/guppi/C/c20.html
 share/gnome/help/guppi/C/docbook.css
 share/gnome/help/guppi/C/guppi.html
 share/gnome/help/guppi/C/ln14.html
 share/gnome/help/guppi/C/topic.dat
-share/gnome/oaf/GNOME_Guppi_Gnumeric.oaf
-share/gnome/pixmaps/gnome-guppi.png
-share/gnome/pixmaps/guppi/area.xpm
-share/gnome/pixmaps/guppi/bar.xpm
-share/gnome/pixmaps/guppi/basic-home.png
-share/gnome/pixmaps/guppi/basic-move.png
-share/gnome/pixmaps/guppi/basic-reframe.png
-share/gnome/pixmaps/guppi/basic-zoom.png
-share/gnome/pixmaps/guppi/bubble.xpm
-share/gnome/pixmaps/guppi/chart_bar_1_1.png
-share/gnome/pixmaps/guppi/chart_bar_1_2.png
-share/gnome/pixmaps/guppi/chart_bar_1_3.png
-share/gnome/pixmaps/guppi/chart_bar_2_1.png
-share/gnome/pixmaps/guppi/chart_bar_2_2.png
-share/gnome/pixmaps/guppi/chart_bar_2_3.png
-share/gnome/pixmaps/guppi/chart_bubble_1_1.png
-share/gnome/pixmaps/guppi/chart_column_1_1.png
-share/gnome/pixmaps/guppi/chart_column_1_2.png
-share/gnome/pixmaps/guppi/chart_column_1_3.png
-share/gnome/pixmaps/guppi/chart_column_2_1.png
-share/gnome/pixmaps/guppi/chart_column_2_2.png
-share/gnome/pixmaps/guppi/chart_column_2_3.png
-share/gnome/pixmaps/guppi/chart_column_3_1.png
-share/gnome/pixmaps/guppi/chart_cone_1_1.png
-share/gnome/pixmaps/guppi/chart_cone_1_2.png
-share/gnome/pixmaps/guppi/chart_cone_1_3.png
-share/gnome/pixmaps/guppi/chart_cone_2_1.png
-share/gnome/pixmaps/guppi/chart_cone_2_2.png
-share/gnome/pixmaps/guppi/chart_cone_2_3.png
-share/gnome/pixmaps/guppi/chart_cone_3_1.png
-share/gnome/pixmaps/guppi/chart_cylinder_1_1.png
-share/gnome/pixmaps/guppi/chart_cylinder_1_2.png
-share/gnome/pixmaps/guppi/chart_cylinder_1_3.png
-share/gnome/pixmaps/guppi/chart_cylinder_2_1.png
-share/gnome/pixmaps/guppi/chart_cylinder_2_2.png
-share/gnome/pixmaps/guppi/chart_cylinder_2_3.png
-share/gnome/pixmaps/guppi/chart_cylinder_3_1.png
-share/gnome/pixmaps/guppi/chart_line_1_1.png
-share/gnome/pixmaps/guppi/chart_line_1_2.png
-share/gnome/pixmaps/guppi/chart_line_1_3.png
-share/gnome/pixmaps/guppi/chart_line_2_1.png
-share/gnome/pixmaps/guppi/chart_line_2_2.png
-share/gnome/pixmaps/guppi/chart_line_2_3.png
-share/gnome/pixmaps/guppi/chart_line_3_1.png
-share/gnome/pixmaps/guppi/chart_pie_1_1.png
-share/gnome/pixmaps/guppi/chart_pie_1_2.png
-share/gnome/pixmaps/guppi/chart_pie_1_3.png
-share/gnome/pixmaps/guppi/chart_pie_2_1.png
-share/gnome/pixmaps/guppi/chart_pie_2_2.png
-share/gnome/pixmaps/guppi/chart_pie_2_3.png
-share/gnome/pixmaps/guppi/chart_pyramid_1_1.png
-share/gnome/pixmaps/guppi/chart_pyramid_1_2.png
-share/gnome/pixmaps/guppi/chart_pyramid_1_3.png
-share/gnome/pixmaps/guppi/chart_pyramid_2_1.png
-share/gnome/pixmaps/guppi/chart_pyramid_2_2.png
-share/gnome/pixmaps/guppi/chart_pyramid_2_3.png
-share/gnome/pixmaps/guppi/chart_pyramid_3_1.png
-share/gnome/pixmaps/guppi/chart_scatter_1_1.png
-share/gnome/pixmaps/guppi/chart_scatter_2_1.png
-share/gnome/pixmaps/guppi/chart_scatter_2_2.png
-share/gnome/pixmaps/guppi/chart_scatter_3_1.png
-share/gnome/pixmaps/guppi/chart_scatter_3_2.png
-share/gnome/pixmaps/guppi/chart_stock_1_1.png
-share/gnome/pixmaps/guppi/chart_stock_1_2.png
-share/gnome/pixmaps/guppi/chart_stock_2_1.png
-share/gnome/pixmaps/guppi/chart_stock_2_2.png
-share/gnome/pixmaps/guppi/column.xpm
-share/gnome/pixmaps/guppi/doughnut.xpm
-share/gnome/pixmaps/guppi/fill-best.png
-share/gnome/pixmaps/guppi/fill-horiz.png
-share/gnome/pixmaps/guppi/fill-vert.png
-share/gnome/pixmaps/guppi/guppi-splash.png
-share/gnome/pixmaps/guppi/linegraph.xpm
-share/gnome/pixmaps/guppi/lock.png
-share/gnome/pixmaps/guppi/pie.xpm
-share/gnome/pixmaps/guppi/radar.xpm
-share/gnome/pixmaps/guppi/resize-to-win.png
-share/gnome/pixmaps/guppi/scatter.xpm
-share/gnome/pixmaps/guppi/stock.xpm
-share/gnome/pixmaps/guppi/surface.xpm
+%%DATADIR%%/glade/guppi-gnumeric-format-guru.glade
+%%DATADIR%%/glade/view-properties.glade
+%%DATADIR%%/scripts/guppi-gnumeric-plots.xml
 share/locale/az/LC_MESSAGES/Guppi.mo
 share/locale/da/LC_MESSAGES/Guppi.mo
 share/locale/de/LC_MESSAGES/Guppi.mo
@@ -281,13 +201,93 @@ share/locale/sv/LC_MESSAGES/Guppi.mo
 share/locale/tr/LC_MESSAGES/Guppi.mo
 share/locale/uk/LC_MESSAGES/Guppi.mo
 share/locale/zh_CN/LC_MESSAGES/Guppi.mo
-@dirrm share/gnome/pixmaps/guppi
+share/oaf/GNOME_Guppi_Gnumeric.oaf
+share/pixmaps/gnome-guppi.png
+share/pixmaps/guppi/area.xpm
+share/pixmaps/guppi/bar.xpm
+share/pixmaps/guppi/basic-home.png
+share/pixmaps/guppi/basic-move.png
+share/pixmaps/guppi/basic-reframe.png
+share/pixmaps/guppi/basic-zoom.png
+share/pixmaps/guppi/bubble.xpm
+share/pixmaps/guppi/chart_bar_1_1.png
+share/pixmaps/guppi/chart_bar_1_2.png
+share/pixmaps/guppi/chart_bar_1_3.png
+share/pixmaps/guppi/chart_bar_2_1.png
+share/pixmaps/guppi/chart_bar_2_2.png
+share/pixmaps/guppi/chart_bar_2_3.png
+share/pixmaps/guppi/chart_bubble_1_1.png
+share/pixmaps/guppi/chart_column_1_1.png
+share/pixmaps/guppi/chart_column_1_2.png
+share/pixmaps/guppi/chart_column_1_3.png
+share/pixmaps/guppi/chart_column_2_1.png
+share/pixmaps/guppi/chart_column_2_2.png
+share/pixmaps/guppi/chart_column_2_3.png
+share/pixmaps/guppi/chart_column_3_1.png
+share/pixmaps/guppi/chart_cone_1_1.png
+share/pixmaps/guppi/chart_cone_1_2.png
+share/pixmaps/guppi/chart_cone_1_3.png
+share/pixmaps/guppi/chart_cone_2_1.png
+share/pixmaps/guppi/chart_cone_2_2.png
+share/pixmaps/guppi/chart_cone_2_3.png
+share/pixmaps/guppi/chart_cone_3_1.png
+share/pixmaps/guppi/chart_cylinder_1_1.png
+share/pixmaps/guppi/chart_cylinder_1_2.png
+share/pixmaps/guppi/chart_cylinder_1_3.png
+share/pixmaps/guppi/chart_cylinder_2_1.png
+share/pixmaps/guppi/chart_cylinder_2_2.png
+share/pixmaps/guppi/chart_cylinder_2_3.png
+share/pixmaps/guppi/chart_cylinder_3_1.png
+share/pixmaps/guppi/chart_line_1_1.png
+share/pixmaps/guppi/chart_line_1_2.png
+share/pixmaps/guppi/chart_line_1_3.png
+share/pixmaps/guppi/chart_line_2_1.png
+share/pixmaps/guppi/chart_line_2_2.png
+share/pixmaps/guppi/chart_line_2_3.png
+share/pixmaps/guppi/chart_line_3_1.png
+share/pixmaps/guppi/chart_pie_1_1.png
+share/pixmaps/guppi/chart_pie_1_2.png
+share/pixmaps/guppi/chart_pie_1_3.png
+share/pixmaps/guppi/chart_pie_2_1.png
+share/pixmaps/guppi/chart_pie_2_2.png
+share/pixmaps/guppi/chart_pie_2_3.png
+share/pixmaps/guppi/chart_pyramid_1_1.png
+share/pixmaps/guppi/chart_pyramid_1_2.png
+share/pixmaps/guppi/chart_pyramid_1_3.png
+share/pixmaps/guppi/chart_pyramid_2_1.png
+share/pixmaps/guppi/chart_pyramid_2_2.png
+share/pixmaps/guppi/chart_pyramid_2_3.png
+share/pixmaps/guppi/chart_pyramid_3_1.png
+share/pixmaps/guppi/chart_scatter_1_1.png
+share/pixmaps/guppi/chart_scatter_2_1.png
+share/pixmaps/guppi/chart_scatter_2_2.png
+share/pixmaps/guppi/chart_scatter_3_1.png
+share/pixmaps/guppi/chart_scatter_3_2.png
+share/pixmaps/guppi/chart_stock_1_1.png
+share/pixmaps/guppi/chart_stock_1_2.png
+share/pixmaps/guppi/chart_stock_2_1.png
+share/pixmaps/guppi/chart_stock_2_2.png
+share/pixmaps/guppi/column.xpm
+share/pixmaps/guppi/doughnut.xpm
+share/pixmaps/guppi/fill-best.png
+share/pixmaps/guppi/fill-horiz.png
+share/pixmaps/guppi/fill-vert.png
+share/pixmaps/guppi/guppi-splash.png
+share/pixmaps/guppi/linegraph.xpm
+share/pixmaps/guppi/lock.png
+share/pixmaps/guppi/pie.xpm
+share/pixmaps/guppi/radar.xpm
+share/pixmaps/guppi/resize-to-win.png
+share/pixmaps/guppi/scatter.xpm
+share/pixmaps/guppi/stock.xpm
+share/pixmaps/guppi/surface.xpm
+@dirrm share/pixmaps/guppi
+@dirrm %%DATADIR%%/scripts
+@dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%
 @dirrm share/gnome/help/guppi/C/images
 @dirrm share/gnome/help/guppi/C
 @dirrm share/gnome/help/guppi
-@dirrm share/gnome/guppi/scripts
-@dirrm share/gnome/guppi/glade
-@dirrm share/gnome/guppi
 @dirrm lib/guppi/plug-ins/%%VERSION%%/plot/xybox
 @dirrm lib/guppi/plug-ins/%%VERSION%%/plot/text
 @dirrm lib/guppi/plug-ins/%%VERSION%%/plot/scatter
diff --git a/math/proofgeneral/Makefile b/math/proofgeneral/Makefile
index 6d91c0373f74..7edca40e8921 100644
--- a/math/proofgeneral/Makefile
+++ b/math/proofgeneral/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	proofgeneral
 PORTVERSION=	3.6
-PORTREVISION=	3
+PORTREVISION=	6
 CATEGORIES=	math elisp
 MASTER_SITES=	http://proofgeneral.inf.ed.ac.uk/releases/
 DISTNAME=	ProofGeneral-3.6pre061107
diff --git a/math/proofgeneral/files/patch-Makefile b/math/proofgeneral/files/patch-Makefile
index 2de740aac490..94175219e19c 100644
--- a/math/proofgeneral/files/patch-Makefile
+++ b/math/proofgeneral/files/patch-Makefile
@@ -77,18 +77,18 @@
 +	  ${BSD_INSTALL_DATA} etc/desktop/icons/48x48/proofgeneral.png ${DESKTOP}/icons/hicolor/48x48; \
 +	fi
 +
-+	if [ -d ${DESKTOP}/gnome ]; then \
-+	  ${BSD_INSTALL_DATA} etc/desktop/icons/48x48/proofgeneral.png ${DESKTOP}/gnome/pixmaps; \
-+	  ${BSD_INSTALL_DATA} etc/desktop/proofgeneral.desktop ${DESKTOP}/gnome/applications; \
-+	  ${BSD_INSTALL_DATA} etc/desktop/mime-info/proofgeneral.mime ${DESKTOP}/gnome/mime-info; \
-+	  ${BSD_INSTALL_DATA} etc/desktop/mime-info/proofgeneral.keys ${DESKTOP}/gnome/mime-info; \
++	if [ -d ${DESKTOP} ]; then \
++	  ${BSD_INSTALL_DATA} etc/desktop/icons/48x48/proofgeneral.png ${DESKTOP}/pixmaps; \
++	  ${BSD_INSTALL_DATA} etc/desktop/proofgeneral.desktop ${DESKTOP}/applications; \
++	  ${BSD_INSTALL_DATA} etc/desktop/mime-info/proofgeneral.mime ${DESKTOP}/mime-info; \
++	  ${BSD_INSTALL_DATA} etc/desktop/mime-info/proofgeneral.keys ${DESKTOP}/mime-info; \
 +	fi
 +
  # backwards compatibility with old linuxes
 -	mkdir -p ${DESKTOP}/application-registry
 -	cp etc/desktop/application-registry/proofgeneral.applications ${DESKTOP}/application-registry
-+	mkdir -p ${DESKTOP}/gnome/application-registry
-+	cp etc/desktop/application-registry/proofgeneral.applications ${DESKTOP}/gnome/application-registry
++	mkdir -p ${DESKTOP}/application-registry
++	cp etc/desktop/application-registry/proofgeneral.applications ${DESKTOP}/application-registry
  
  # NB: .el files are not strictly necessary, but we package/install them
  # for the time being to help with debugging, or for users to recompile.
diff --git a/math/proofgeneral/pkg-plist b/math/proofgeneral/pkg-plist
index 8cdc907e872e..9ed9b231f670 100644
--- a/math/proofgeneral/pkg-plist
+++ b/math/proofgeneral/pkg-plist
@@ -418,11 +418,11 @@ bin/isartags
 %%EMACS_SITE_LISPDIR%%/proofgeneral/x-symbol/info/x-symbol.info
 %%EMACS_SITE_LISPDIR%%/proofgeneral/x-symbol/README.x-symbol-for-ProofGeneral
 %%EMACS_SITE_LISPDIR%%/site-start.d/pg-init.el
-share/gnome/application-registry/proofgeneral.applications
-share/gnome/applications/proofgeneral.desktop
-share/gnome/mime-info/proofgeneral.keys
-share/gnome/mime-info/proofgeneral.mime
-share/gnome/pixmaps/proofgeneral.png
+share/application-registry/proofgeneral.applications
+share/applications/proofgeneral.desktop
+share/mime-info/proofgeneral.keys
+share/mime-info/proofgeneral.mime
+share/pixmaps/proofgeneral.png
 share/icons/hicolor/16x16/proofgeneral.png
 share/icons/hicolor/32x32/proofgeneral.png
 share/icons/hicolor/48x48/proofgeneral.png
@@ -548,3 +548,4 @@ share/icons/hicolor/48x48/proofgeneral.png
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/ProofGeneral
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/PG-adapting
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry share/applications
diff --git a/math/qalculate/Makefile b/math/qalculate/Makefile
index 19fc8bb09400..a383f5a41fb1 100644
--- a/math/qalculate/Makefile
+++ b/math/qalculate/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qalculate
 PORTVERSION=	0.9.6
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-gtk-${PORTVERSION}
diff --git a/math/qalculate/pkg-plist b/math/qalculate/pkg-plist
index 936d357abd48..b7f21dd77a3b 100644
--- a/math/qalculate/pkg-plist
+++ b/math/qalculate/pkg-plist
@@ -1,6 +1,6 @@
 bin/qalculate
 bin/qalculate-gtk
-share/gnome/applications/qalculate-gtk.desktop
+share/applications/qalculate-gtk.desktop
 share/gnome/help/qalculate-gtk/C/appendixa.xml
 share/gnome/help/qalculate-gtk/C/appendixb.xml
 share/gnome/help/qalculate-gtk/C/appendixc.xml
@@ -30,38 +30,39 @@ share/gnome/help/qalculate-gtk/C/figures/unit-manager.png
 share/gnome/help/qalculate-gtk/C/figures/variable-manager.png
 share/gnome/help/qalculate-gtk/C/legal.xml
 share/gnome/help/qalculate-gtk/C/qalculate-gtk.xml
-share/gnome/omf/qalculate-gtk/qalculate-gtk-C.omf
-share/gnome/pixmaps/qalculate.png
-share/gnome/qalculate-gtk/glade/about.glade
-share/gnome/qalculate-gtk/glade/argumentrules.glade
-share/gnome/qalculate-gtk/glade/csvexport.glade
-share/gnome/qalculate-gtk/glade/csvimport.glade
-share/gnome/qalculate-gtk/glade/datasetedit.glade
-share/gnome/qalculate-gtk/glade/datasets.glade
-share/gnome/qalculate-gtk/glade/decimals.glade
-share/gnome/qalculate-gtk/glade/functionedit.glade
-share/gnome/qalculate-gtk/glade/functions.glade
-share/gnome/qalculate-gtk/glade/main.glade
-share/gnome/qalculate-gtk/glade/matrix.glade
-share/gnome/qalculate-gtk/glade/matrixedit.glade
-share/gnome/qalculate-gtk/glade/namesedit.glade
-share/gnome/qalculate-gtk/glade/nbases.glade
-share/gnome/qalculate-gtk/glade/periodictable.glade
-share/gnome/qalculate-gtk/glade/plot.glade
-share/gnome/qalculate-gtk/glade/precision.glade
-share/gnome/qalculate-gtk/glade/preferences.glade
-share/gnome/qalculate-gtk/glade/setbase.glade
-share/gnome/qalculate-gtk/glade/unit.glade
-share/gnome/qalculate-gtk/glade/unitedit.glade
-share/gnome/qalculate-gtk/glade/units.glade
-share/gnome/qalculate-gtk/glade/unknownedit.glade
-share/gnome/qalculate-gtk/glade/variableedit.glade
-share/gnome/qalculate-gtk/glade/variables.glade
+share/omf/qalculate-gtk/qalculate-gtk-C.omf
+share/pixmaps/qalculate.png
+share/qalculate-gtk/glade/about.glade
+share/qalculate-gtk/glade/argumentrules.glade
+share/qalculate-gtk/glade/csvexport.glade
+share/qalculate-gtk/glade/csvimport.glade
+share/qalculate-gtk/glade/datasetedit.glade
+share/qalculate-gtk/glade/datasets.glade
+share/qalculate-gtk/glade/decimals.glade
+share/qalculate-gtk/glade/functionedit.glade
+share/qalculate-gtk/glade/functions.glade
+share/qalculate-gtk/glade/main.glade
+share/qalculate-gtk/glade/matrix.glade
+share/qalculate-gtk/glade/matrixedit.glade
+share/qalculate-gtk/glade/namesedit.glade
+share/qalculate-gtk/glade/nbases.glade
+share/qalculate-gtk/glade/periodictable.glade
+share/qalculate-gtk/glade/plot.glade
+share/qalculate-gtk/glade/precision.glade
+share/qalculate-gtk/glade/preferences.glade
+share/qalculate-gtk/glade/setbase.glade
+share/qalculate-gtk/glade/unit.glade
+share/qalculate-gtk/glade/unitedit.glade
+share/qalculate-gtk/glade/units.glade
+share/qalculate-gtk/glade/unknownedit.glade
+share/qalculate-gtk/glade/variableedit.glade
+share/qalculate-gtk/glade/variables.glade
 share/locale/nl/LC_MESSAGES/qalculate-gtk.mo
 share/locale/sv/LC_MESSAGES/qalculate-gtk.mo
-@dirrm share/gnome/qalculate-gtk/glade
-@dirrm share/gnome/qalculate-gtk
-@dirrm share/gnome/omf/qalculate-gtk
+@dirrm share/qalculate-gtk/glade
+@dirrm share/qalculate-gtk
+@dirrm share/omf/qalculate-gtk
 @dirrm share/gnome/help/qalculate-gtk/C/figures
 @dirrm share/gnome/help/qalculate-gtk/C
 @dirrm share/gnome/help/qalculate-gtk
+@dirrmtry share/applications
diff --git a/math/scigraphica/Makefile b/math/scigraphica/Makefile
index 4f97f2da6949..9d8c69aad7cf 100644
--- a/math/scigraphica/Makefile
+++ b/math/scigraphica/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scigraphica
 PORTVERSION=	0.8.0
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	math gnome
 MASTER_SITES=	http://scigraphica.sourceforge.net/src/ \
 		${MASTER_SITE_SOURCEFORGE} \
@@ -37,12 +37,9 @@ MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${PERL} -pi -e \
-		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
-		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
 post-install:
-	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/share/gnome/scigraphica
-	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/share/gnome/scigraphica
+	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/share/scigraphica
+	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/share/scigraphica
 
 .include <bsd.port.post.mk>
diff --git a/math/scigraphica/files/patch-src::sg_project_menu.c b/math/scigraphica/files/patch-src::sg_project_menu.c
deleted file mode 100644
index f6401d2dafcd..000000000000
--- a/math/scigraphica/files/patch-src::sg_project_menu.c
+++ /dev/null
@@ -1,17 +0,0 @@
-
-$FreeBSD$
-
---- src/sg_project_menu.c	2001/07/04 14:27:49	1.1
-+++ src/sg_project_menu.c	2001/07/04 14:28:27
-@@ -554,9 +554,9 @@
-  }
- 
-  if ( getenv("SG_ROOT") )
--    g_snprintf(path, 250, "%s/share/scigraphica/examples/%s", getenv("SG_ROOT"), (gchar*)data);
-+    g_snprintf(path, 250, "%s/share/gnome/scigraphica/examples/%s", getenv("SG_ROOT"), (gchar*)data);
-  else
--    g_snprintf(path, 250, SG_ROOT "/share/scigraphica/examples/%s", (gchar*)data);
-+    g_snprintf(path, 250, SG_ROOT "/share/gnome/scigraphica/examples/%s", (gchar*)data);
- 
-  sg_project_close();
-  sg_project_new();
diff --git a/math/scigraphica/pkg-plist b/math/scigraphica/pkg-plist
index 5219f9091b72..24ac6877b27d 100644
--- a/math/scigraphica/pkg-plist
+++ b/math/scigraphica/pkg-plist
@@ -8,200 +8,200 @@ share/gnome/help/scigraphica/C/Modules.html
 share/gnome/help/scigraphica/C/Tutorial.html
 share/gnome/help/scigraphica/C/UserGuide.html
 share/gnome/help/scigraphica/C/topic.dat
-share/gnome/pixmaps/scigraphica/2d_small.xpm
-share/gnome/pixmaps/scigraphica/3d_small.xpm
-share/gnome/pixmaps/scigraphica/about_small.xpm
-share/gnome/pixmaps/scigraphica/add_column.xpm
-share/gnome/pixmaps/scigraphica/arrange.xpm
-share/gnome/pixmaps/scigraphica/arrow.xpm
-share/gnome/pixmaps/scigraphica/arrow2.xpm
-share/gnome/pixmaps/scigraphica/arrow_down.xpm
-share/gnome/pixmaps/scigraphica/arrow_left.xpm
-share/gnome/pixmaps/scigraphica/arrow_right.xpm
-share/gnome/pixmaps/scigraphica/arrow_up.xpm
-share/gnome/pixmaps/scigraphica/as.xpm
-share/gnome/pixmaps/scigraphica/autoscale.xpm
-share/gnome/pixmaps/scigraphica/bold.xpm
-share/gnome/pixmaps/scigraphica/book_small.xpm
-share/gnome/pixmaps/scigraphica/bullet.xpm
-share/gnome/pixmaps/scigraphica/button_ok.xpm
-share/gnome/pixmaps/scigraphica/color.xpm
-share/gnome/pixmaps/scigraphica/control.xpm
-share/gnome/pixmaps/scigraphica/copy.xpm
-share/gnome/pixmaps/scigraphica/cut.xpm
-share/gnome/pixmaps/scigraphica/dennied.xpm
-share/gnome/pixmaps/scigraphica/empty.xpm
-share/gnome/pixmaps/scigraphica/error.xpm
-share/gnome/pixmaps/scigraphica/exec_small.xpm
-share/gnome/pixmaps/scigraphica/exit_small.xpm
-share/gnome/pixmaps/scigraphica/eye.xpm
-share/gnome/pixmaps/scigraphica/fit5.xpm
-share/gnome/pixmaps/scigraphica/fit_page.xpm
-share/gnome/pixmaps/scigraphica/fitpage.xpm
-share/gnome/pixmaps/scigraphica/folder.xpm
-share/gnome/pixmaps/scigraphica/font.xpm
-share/gnome/pixmaps/scigraphica/function_small.xpm
-share/gnome/pixmaps/scigraphica/g_2dlayer.xpm
-share/gnome/pixmaps/scigraphica/g_3dcontour.xpm
-share/gnome/pixmaps/scigraphica/g_3dlayer.xpm
-share/gnome/pixmaps/scigraphica/g_bars.xpm
-share/gnome/pixmaps/scigraphica/g_boxes.xpm
-share/gnome/pixmaps/scigraphica/g_bubbles.xpm
-share/gnome/pixmaps/scigraphica/g_bubbles3d.xpm
-share/gnome/pixmaps/scigraphica/g_colors.xpm
-share/gnome/pixmaps/scigraphica/g_colors3d.xpm
-share/gnome/pixmaps/scigraphica/g_contour.xpm
-share/gnome/pixmaps/scigraphica/g_csurface.xpm
-share/gnome/pixmaps/scigraphica/g_density.xpm
-share/gnome/pixmaps/scigraphica/g_flux3d.xpm
-share/gnome/pixmaps/scigraphica/g_function.xpm
-share/gnome/pixmaps/scigraphica/g_hbars.xpm
-share/gnome/pixmaps/scigraphica/g_hbox.xpm
-share/gnome/pixmaps/scigraphica/g_impulses.xpm
-share/gnome/pixmaps/scigraphica/g_lines.xpm
-share/gnome/pixmaps/scigraphica/g_lpoints.xpm
-share/gnome/pixmaps/scigraphica/g_python.xpm
-share/gnome/pixmaps/scigraphica/g_scatter.xpm
-share/gnome/pixmaps/scigraphica/g_scatter3d.xpm
-share/gnome/pixmaps/scigraphica/g_surface.xpm
-share/gnome/pixmaps/scigraphica/g_vectors.xpm
-share/gnome/pixmaps/scigraphica/italic.xpm
-share/gnome/pixmaps/scigraphica/layer.xpm
-share/gnome/pixmaps/scigraphica/layer_control.xpm
-share/gnome/pixmaps/scigraphica/logo.xpm
-share/gnome/pixmaps/scigraphica/markers.xpm
-share/gnome/pixmaps/scigraphica/matrix_icon.xpm
-share/gnome/pixmaps/scigraphica/new.xpm
-share/gnome/pixmaps/scigraphica/new_2d.xpm
-share/gnome/pixmaps/scigraphica/new_2d_small.xpm
-share/gnome/pixmaps/scigraphica/new_3d.xpm
-share/gnome/pixmaps/scigraphica/new_3d_small.xpm
-share/gnome/pixmaps/scigraphica/new_function.xpm
-share/gnome/pixmaps/scigraphica/new_plot.xpm
-share/gnome/pixmaps/scigraphica/new_polar.xpm
-share/gnome/pixmaps/scigraphica/new_polar_small.xpm
-share/gnome/pixmaps/scigraphica/new_sheet.xpm
-share/gnome/pixmaps/scigraphica/new_small.xpm
-share/gnome/pixmaps/scigraphica/open.xpm
-share/gnome/pixmaps/scigraphica/open_small.xpm
-share/gnome/pixmaps/scigraphica/paint.xpm
-share/gnome/pixmaps/scigraphica/paste.xpm
-share/gnome/pixmaps/scigraphica/pixmaps.h
-share/gnome/pixmaps/scigraphica/plot_icon.xpm
-share/gnome/pixmaps/scigraphica/plot_icon2.xpm
-share/gnome/pixmaps/scigraphica/plot_small.xpm
-share/gnome/pixmaps/scigraphica/point.xpm
-share/gnome/pixmaps/scigraphica/pointers.xpm
-share/gnome/pixmaps/scigraphica/polar_small.xpm
-share/gnome/pixmaps/scigraphica/preferences_small.xpm
-share/gnome/pixmaps/scigraphica/print.xpm
-share/gnome/pixmaps/scigraphica/python_small.xpm
-share/gnome/pixmaps/scigraphica/reload.xpm
-share/gnome/pixmaps/scigraphica/reset.xpm
-share/gnome/pixmaps/scigraphica/rotate_x.xpm
-share/gnome/pixmaps/scigraphica/rotate_y.xpm
-share/gnome/pixmaps/scigraphica/rotate_z.xpm
-share/gnome/pixmaps/scigraphica/save.xpm
-share/gnome/pixmaps/scigraphica/save_as.xpm
-share/gnome/pixmaps/scigraphica/save_as_small.xpm
-share/gnome/pixmaps/scigraphica/save_small.xpm
-share/gnome/pixmaps/scigraphica/set_column.xpm
-share/gnome/pixmaps/scigraphica/sg.xpm
-share/gnome/pixmaps/scigraphica/sg_icon.xpm
-share/gnome/pixmaps/scigraphica/sg_small.xpm
-share/gnome/pixmaps/scigraphica/sheet_icon.xpm
-share/gnome/pixmaps/scigraphica/sheet_icon2.xpm
-share/gnome/pixmaps/scigraphica/sheet_small.xpm
-share/gnome/pixmaps/scigraphica/sorry.xpm
-share/gnome/pixmaps/scigraphica/stock_button_apply.xpm
-share/gnome/pixmaps/scigraphica/stock_button_cancel.xpm
-share/gnome/pixmaps/scigraphica/stock_button_close.xpm
-share/gnome/pixmaps/scigraphica/stock_button_no.xpm
-share/gnome/pixmaps/scigraphica/stock_button_ok.xpm
-share/gnome/pixmaps/scigraphica/stock_button_yes.xpm
-share/gnome/pixmaps/scigraphica/stock_down_arrow.xpm
-share/gnome/pixmaps/scigraphica/stock_font.xpm
-share/gnome/pixmaps/scigraphica/stock_help.xpm
-share/gnome/pixmaps/scigraphica/stock_left_arrow.xpm
-share/gnome/pixmaps/scigraphica/stock_open.xpm
-share/gnome/pixmaps/scigraphica/stock_pixmaps.h
-share/gnome/pixmaps/scigraphica/stock_right_arrow.xpm
-share/gnome/pixmaps/scigraphica/stock_up_arrow.xpm
-share/gnome/pixmaps/scigraphica/symbol_circle.xpm
-share/gnome/pixmaps/scigraphica/symbol_cross.xpm
-share/gnome/pixmaps/scigraphica/symbol_diamond.xpm
-share/gnome/pixmaps/scigraphica/symbol_dntriangle.xpm
-share/gnome/pixmaps/scigraphica/symbol_dot.xpm
-share/gnome/pixmaps/scigraphica/symbol_impulse.xpm
-share/gnome/pixmaps/scigraphica/symbol_ltriangle.xpm
-share/gnome/pixmaps/scigraphica/symbol_none.xpm
-share/gnome/pixmaps/scigraphica/symbol_plus.xpm
-share/gnome/pixmaps/scigraphica/symbol_rtriangle.xpm
-share/gnome/pixmaps/scigraphica/symbol_square.xpm
-share/gnome/pixmaps/scigraphica/symbol_star.xpm
-share/gnome/pixmaps/scigraphica/symbol_uptriangle.xpm
-share/gnome/pixmaps/scigraphica/target.xpm
-share/gnome/pixmaps/scigraphica/text.xpm
-share/gnome/pixmaps/scigraphica/tools.xpm
-share/gnome/pixmaps/scigraphica/warning.xpm
-share/gnome/pixmaps/scigraphica/zoom.xpm
-share/gnome/pixmaps/scigraphica/zoom_minus.xpm
-share/gnome/pixmaps/scigraphica/zoom_plus.xpm
-share/gnome/pixmaps/scigraphica/zoomin.xpm
-share/gnome/pixmaps/scigraphica/zoomout.xpm
-share/gnome/pixmaps/sg_icon.xpm
-share/gnome/scigraphica/examples/3d.sg
-share/gnome/scigraphica/examples/image.sg
-share/gnome/scigraphica/examples/matrix.sg
-share/gnome/scigraphica/examples/multicolumn.sg
-share/gnome/scigraphica/examples/polar.sg
-share/gnome/scigraphica/examples/py_example1.py
-share/gnome/scigraphica/examples/py_example1.pyc
-share/gnome/scigraphica/examples/py_example1.pyo
-share/gnome/scigraphica/examples/py_example2.py
-share/gnome/scigraphica/examples/py_example2.pyc
-share/gnome/scigraphica/examples/py_example2.pyo
-share/gnome/scigraphica/examples/simpletest.sg
-share/gnome/scigraphica/examples/test.dat
-share/gnome/scigraphica/examples/ticks.sg
-share/gnome/scigraphica/examples/trigonometric.sg
-share/gnome/scigraphica/examples/vectors.sg
-share/gnome/scigraphica/python/FitWizard.py
-share/gnome/scigraphica/python/FitWizard.pyc
-share/gnome/scigraphica/python/FitWizard.pyo
-share/gnome/scigraphica/python/SimpleStats.py
-share/gnome/scigraphica/python/SimpleStats.pyc
-share/gnome/scigraphica/python/SimpleStats.pyo
-share/gnome/scigraphica/python/clarens.py
-share/gnome/scigraphica/python/clarens.pyc
-share/gnome/scigraphica/python/clarens.pyo
-share/gnome/scigraphica/python/clarens_histograms.py
-share/gnome/scigraphica/python/clarens_histograms.pyc
-share/gnome/scigraphica/python/clarens_histograms.pyo
-share/gnome/scigraphica/python/gtkLeastSquares.py
-share/gnome/scigraphica/python/gtkLeastSquares.pyc
-share/gnome/scigraphica/python/gtkLeastSquares.pyo
-share/gnome/scigraphica/python/pstat.py
-share/gnome/scigraphica/python/pstat.pyc
-share/gnome/scigraphica/python/pstat.pyo
-share/gnome/scigraphica/python/pysga.py
-share/gnome/scigraphica/python/pysga.pyc
-share/gnome/scigraphica/python/pysga.pyo
-share/gnome/scigraphica/python/sgagtk.py
-share/gnome/scigraphica/python/sgagtk.pyc
-share/gnome/scigraphica/python/sgagtk.pyo
-share/gnome/scigraphica/python/stats.py
-share/gnome/scigraphica/python/stats.pyc
-share/gnome/scigraphica/python/stats.pyo
-share/gnome/scigraphica/python/test_plugin.py
-share/gnome/scigraphica/python/test_plugin.pyc
-share/gnome/scigraphica/python/test_plugin.pyo
-share/gnome/scigraphica/python/unpickler.py
-share/gnome/scigraphica/python/unpickler.pyc
-share/gnome/scigraphica/python/unpickler.pyo
-@dirrm share/gnome/scigraphica/python
-@dirrm share/gnome/scigraphica/examples
-@dirrm share/gnome/scigraphica
-@dirrm share/gnome/pixmaps/scigraphica
+share/pixmaps/scigraphica/2d_small.xpm
+share/pixmaps/scigraphica/3d_small.xpm
+share/pixmaps/scigraphica/about_small.xpm
+share/pixmaps/scigraphica/add_column.xpm
+share/pixmaps/scigraphica/arrange.xpm
+share/pixmaps/scigraphica/arrow.xpm
+share/pixmaps/scigraphica/arrow2.xpm
+share/pixmaps/scigraphica/arrow_down.xpm
+share/pixmaps/scigraphica/arrow_left.xpm
+share/pixmaps/scigraphica/arrow_right.xpm
+share/pixmaps/scigraphica/arrow_up.xpm
+share/pixmaps/scigraphica/as.xpm
+share/pixmaps/scigraphica/autoscale.xpm
+share/pixmaps/scigraphica/bold.xpm
+share/pixmaps/scigraphica/book_small.xpm
+share/pixmaps/scigraphica/bullet.xpm
+share/pixmaps/scigraphica/button_ok.xpm
+share/pixmaps/scigraphica/color.xpm
+share/pixmaps/scigraphica/control.xpm
+share/pixmaps/scigraphica/copy.xpm
+share/pixmaps/scigraphica/cut.xpm
+share/pixmaps/scigraphica/dennied.xpm
+share/pixmaps/scigraphica/empty.xpm
+share/pixmaps/scigraphica/error.xpm
+share/pixmaps/scigraphica/exec_small.xpm
+share/pixmaps/scigraphica/exit_small.xpm
+share/pixmaps/scigraphica/eye.xpm
+share/pixmaps/scigraphica/fit5.xpm
+share/pixmaps/scigraphica/fit_page.xpm
+share/pixmaps/scigraphica/fitpage.xpm
+share/pixmaps/scigraphica/folder.xpm
+share/pixmaps/scigraphica/font.xpm
+share/pixmaps/scigraphica/function_small.xpm
+share/pixmaps/scigraphica/g_2dlayer.xpm
+share/pixmaps/scigraphica/g_3dcontour.xpm
+share/pixmaps/scigraphica/g_3dlayer.xpm
+share/pixmaps/scigraphica/g_bars.xpm
+share/pixmaps/scigraphica/g_boxes.xpm
+share/pixmaps/scigraphica/g_bubbles.xpm
+share/pixmaps/scigraphica/g_bubbles3d.xpm
+share/pixmaps/scigraphica/g_colors.xpm
+share/pixmaps/scigraphica/g_colors3d.xpm
+share/pixmaps/scigraphica/g_contour.xpm
+share/pixmaps/scigraphica/g_csurface.xpm
+share/pixmaps/scigraphica/g_density.xpm
+share/pixmaps/scigraphica/g_flux3d.xpm
+share/pixmaps/scigraphica/g_function.xpm
+share/pixmaps/scigraphica/g_hbars.xpm
+share/pixmaps/scigraphica/g_hbox.xpm
+share/pixmaps/scigraphica/g_impulses.xpm
+share/pixmaps/scigraphica/g_lines.xpm
+share/pixmaps/scigraphica/g_lpoints.xpm
+share/pixmaps/scigraphica/g_python.xpm
+share/pixmaps/scigraphica/g_scatter.xpm
+share/pixmaps/scigraphica/g_scatter3d.xpm
+share/pixmaps/scigraphica/g_surface.xpm
+share/pixmaps/scigraphica/g_vectors.xpm
+share/pixmaps/scigraphica/italic.xpm
+share/pixmaps/scigraphica/layer.xpm
+share/pixmaps/scigraphica/layer_control.xpm
+share/pixmaps/scigraphica/logo.xpm
+share/pixmaps/scigraphica/markers.xpm
+share/pixmaps/scigraphica/matrix_icon.xpm
+share/pixmaps/scigraphica/new.xpm
+share/pixmaps/scigraphica/new_2d.xpm
+share/pixmaps/scigraphica/new_2d_small.xpm
+share/pixmaps/scigraphica/new_3d.xpm
+share/pixmaps/scigraphica/new_3d_small.xpm
+share/pixmaps/scigraphica/new_function.xpm
+share/pixmaps/scigraphica/new_plot.xpm
+share/pixmaps/scigraphica/new_polar.xpm
+share/pixmaps/scigraphica/new_polar_small.xpm
+share/pixmaps/scigraphica/new_sheet.xpm
+share/pixmaps/scigraphica/new_small.xpm
+share/pixmaps/scigraphica/open.xpm
+share/pixmaps/scigraphica/open_small.xpm
+share/pixmaps/scigraphica/paint.xpm
+share/pixmaps/scigraphica/paste.xpm
+share/pixmaps/scigraphica/pixmaps.h
+share/pixmaps/scigraphica/plot_icon.xpm
+share/pixmaps/scigraphica/plot_icon2.xpm
+share/pixmaps/scigraphica/plot_small.xpm
+share/pixmaps/scigraphica/point.xpm
+share/pixmaps/scigraphica/pointers.xpm
+share/pixmaps/scigraphica/polar_small.xpm
+share/pixmaps/scigraphica/preferences_small.xpm
+share/pixmaps/scigraphica/print.xpm
+share/pixmaps/scigraphica/python_small.xpm
+share/pixmaps/scigraphica/reload.xpm
+share/pixmaps/scigraphica/reset.xpm
+share/pixmaps/scigraphica/rotate_x.xpm
+share/pixmaps/scigraphica/rotate_y.xpm
+share/pixmaps/scigraphica/rotate_z.xpm
+share/pixmaps/scigraphica/save.xpm
+share/pixmaps/scigraphica/save_as.xpm
+share/pixmaps/scigraphica/save_as_small.xpm
+share/pixmaps/scigraphica/save_small.xpm
+share/pixmaps/scigraphica/set_column.xpm
+share/pixmaps/scigraphica/sg.xpm
+share/pixmaps/scigraphica/sg_icon.xpm
+share/pixmaps/scigraphica/sg_small.xpm
+share/pixmaps/scigraphica/sheet_icon.xpm
+share/pixmaps/scigraphica/sheet_icon2.xpm
+share/pixmaps/scigraphica/sheet_small.xpm
+share/pixmaps/scigraphica/sorry.xpm
+share/pixmaps/scigraphica/stock_button_apply.xpm
+share/pixmaps/scigraphica/stock_button_cancel.xpm
+share/pixmaps/scigraphica/stock_button_close.xpm
+share/pixmaps/scigraphica/stock_button_no.xpm
+share/pixmaps/scigraphica/stock_button_ok.xpm
+share/pixmaps/scigraphica/stock_button_yes.xpm
+share/pixmaps/scigraphica/stock_down_arrow.xpm
+share/pixmaps/scigraphica/stock_font.xpm
+share/pixmaps/scigraphica/stock_help.xpm
+share/pixmaps/scigraphica/stock_left_arrow.xpm
+share/pixmaps/scigraphica/stock_open.xpm
+share/pixmaps/scigraphica/stock_pixmaps.h
+share/pixmaps/scigraphica/stock_right_arrow.xpm
+share/pixmaps/scigraphica/stock_up_arrow.xpm
+share/pixmaps/scigraphica/symbol_circle.xpm
+share/pixmaps/scigraphica/symbol_cross.xpm
+share/pixmaps/scigraphica/symbol_diamond.xpm
+share/pixmaps/scigraphica/symbol_dntriangle.xpm
+share/pixmaps/scigraphica/symbol_dot.xpm
+share/pixmaps/scigraphica/symbol_impulse.xpm
+share/pixmaps/scigraphica/symbol_ltriangle.xpm
+share/pixmaps/scigraphica/symbol_none.xpm
+share/pixmaps/scigraphica/symbol_plus.xpm
+share/pixmaps/scigraphica/symbol_rtriangle.xpm
+share/pixmaps/scigraphica/symbol_square.xpm
+share/pixmaps/scigraphica/symbol_star.xpm
+share/pixmaps/scigraphica/symbol_uptriangle.xpm
+share/pixmaps/scigraphica/target.xpm
+share/pixmaps/scigraphica/text.xpm
+share/pixmaps/scigraphica/tools.xpm
+share/pixmaps/scigraphica/warning.xpm
+share/pixmaps/scigraphica/zoom.xpm
+share/pixmaps/scigraphica/zoom_minus.xpm
+share/pixmaps/scigraphica/zoom_plus.xpm
+share/pixmaps/scigraphica/zoomin.xpm
+share/pixmaps/scigraphica/zoomout.xpm
+share/pixmaps/sg_icon.xpm
+share/scigraphica/examples/3d.sg
+share/scigraphica/examples/image.sg
+share/scigraphica/examples/matrix.sg
+share/scigraphica/examples/multicolumn.sg
+share/scigraphica/examples/polar.sg
+share/scigraphica/examples/py_example1.py
+share/scigraphica/examples/py_example1.pyc
+share/scigraphica/examples/py_example1.pyo
+share/scigraphica/examples/py_example2.py
+share/scigraphica/examples/py_example2.pyc
+share/scigraphica/examples/py_example2.pyo
+share/scigraphica/examples/simpletest.sg
+share/scigraphica/examples/test.dat
+share/scigraphica/examples/ticks.sg
+share/scigraphica/examples/trigonometric.sg
+share/scigraphica/examples/vectors.sg
+share/scigraphica/python/FitWizard.py
+share/scigraphica/python/FitWizard.pyc
+share/scigraphica/python/FitWizard.pyo
+share/scigraphica/python/SimpleStats.py
+share/scigraphica/python/SimpleStats.pyc
+share/scigraphica/python/SimpleStats.pyo
+share/scigraphica/python/clarens.py
+share/scigraphica/python/clarens.pyc
+share/scigraphica/python/clarens.pyo
+share/scigraphica/python/clarens_histograms.py
+share/scigraphica/python/clarens_histograms.pyc
+share/scigraphica/python/clarens_histograms.pyo
+share/scigraphica/python/gtkLeastSquares.py
+share/scigraphica/python/gtkLeastSquares.pyc
+share/scigraphica/python/gtkLeastSquares.pyo
+share/scigraphica/python/pstat.py
+share/scigraphica/python/pstat.pyc
+share/scigraphica/python/pstat.pyo
+share/scigraphica/python/pysga.py
+share/scigraphica/python/pysga.pyc
+share/scigraphica/python/pysga.pyo
+share/scigraphica/python/sgagtk.py
+share/scigraphica/python/sgagtk.pyc
+share/scigraphica/python/sgagtk.pyo
+share/scigraphica/python/stats.py
+share/scigraphica/python/stats.pyc
+share/scigraphica/python/stats.pyo
+share/scigraphica/python/test_plugin.py
+share/scigraphica/python/test_plugin.pyc
+share/scigraphica/python/test_plugin.pyo
+share/scigraphica/python/unpickler.py
+share/scigraphica/python/unpickler.pyc
+share/scigraphica/python/unpickler.pyo
+@dirrm share/scigraphica/python
+@dirrm share/scigraphica/examples
+@dirrm share/scigraphica
+@dirrm share/pixmaps/scigraphica
 @dirrm share/gnome/help/scigraphica/C
 @dirrm share/gnome/help/scigraphica