10 files changed, 272 insertions, 412 deletions

diff --git a/math/drgenius/Makefile b/math/drgenius/Makefile
index 5765a2673192..2f706bb3f440 100644
--- a/math/drgenius/Makefile
+++ b/math/drgenius/Makefile
@@ -5,20 +5,21 @@
 # $FreeBSD$
 #
 
-PORTNAME=	drgeo
-PORTVERSION=	0.9.9
+PORTNAME=	drgenius
+PORTVERSION=	0.8.4
+PORTREVISION=	1
 CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	ofset
+MASTER_SITES=	http://www.ofset.org/drgenius/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A GTK interactive geometry sofware
+COMMENT=	The Gnome Interactive Geometry Sofware
 
+BUILD_DEPENDS=	gob:${PORTSDIR}/x11-toolkits/gob
 LIB_DEPENDS=	guile.15:${PORTSDIR}/lang/guile
 
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomehack gnomeprefix gnometarget libglade2
 USE_GMAKE=	yes
+USE_GNOME=	gnomehack gnomeprefix gnometarget libglade
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/math/drgenius/distinfo b/math/drgenius/distinfo
index b46b03a6121c..c7b567721ae9 100644
--- a/math/drgenius/distinfo
+++ b/math/drgenius/distinfo
@@ -1 +1 @@
-MD5 (drgeo-0.9.9.tar.gz) = 06c2267278a88e2d8168e0556544ac00
+MD5 (drgenius-0.8.4.tar.gz) = e679bba132a90962ad4de1457374416e
diff --git a/math/drgenius/files/patch-po_Makefile.in.in b/math/drgenius/files/patch-po_Makefile.in.in
deleted file mode 100644
index 14515a44a3be..000000000000
--- a/math/drgenius/files/patch-po_Makefile.in.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- po/Makefile.in.in.orig	Wed Sep 24 09:31:34 2003
-+++ po/Makefile.in.in	Wed Sep 24 09:57:50 2003
-@@ -106,7 +106,7 @@
- 	@catalogs='$(CATALOGS)'; \
- 	for cat in $$catalogs; do \
- 	  cat=`basename $$cat`; \
--	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
-+	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
- 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
- 	  $(mkinstalldirs) $(DESTDIR)$$dir; \
- 	  if test -r $$cat; then \
diff --git a/math/drgenius/pkg-descr b/math/drgenius/pkg-descr
index 6d56f8dbb7dd..44ef0ee50b63 100644
--- a/math/drgenius/pkg-descr
+++ b/math/drgenius/pkg-descr
@@ -1,6 +1,6 @@
-Dr. Geo is a GTK interactive geometry software. It allows one to create 
+Dr. Genius is the Gnome interactive geometry software. It allows one to create 
 geometric figure plus the interactive manipulation of such figure in respect 
 with their geometric constraints. It is useable in teaching situation with 
 students from primary or secondary level.
 
-WWW: http://www.ofset.org/drgeo/
+WWW: http://www.ofset.org/drgenius/
diff --git a/math/drgenius/pkg-plist b/math/drgenius/pkg-plist
index e7c636d95ed8..6f3a678cf3b4 100644
--- a/math/drgenius/pkg-plist
+++ b/math/drgenius/pkg-plist
@@ -1,189 +1,129 @@
-bin/drgeo
-share/gnome/applications/drgeo.desktop
-share/gnome/drgeo/examples/figures/angle-inscrit.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/euler-line.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/polygons.fgeo
-share/gnome/drgeo/examples/figures/saliera.fgeo
-share/gnome/drgeo/examples/figures/sinusoide.fgeo
-share/gnome/drgeo/examples/figures/slope.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/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/segment.mgeo
-share/gnome/drgeo/examples/scheme/figure.scm
-share/gnome/drgeo/examples/scheme/polygon.scm
-share/gnome/drgeo/examples/scheme/polygon2.scm
-share/gnome/drgeo/examples/scheme/square.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/drgenius.png
-share/gnome/drgeo/glade/drgenius2.glade
-share/gnome/drgeo/glade/drgenius_new_figure.xpm
-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/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/locus.xpm
-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/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_fr.scm
-share/gnome/drgeo/scm/drgeo_scm_interface_constant_sr.scm
-share/gnome/drgeo/scm/preferences.scm
+bin/drgenius
+share/gnome/apps/Utilities/drgenius.desktop
+share/gnome/drgenius/examples/figures/angle-inscrit.drgenius
+share/gnome/drgenius/examples/figures/cercle-inscrit.xml
+share/gnome/drgenius/examples/figures/circle-locus.xml
+share/gnome/drgenius/examples/figures/conics.xml
+share/gnome/drgenius/examples/figures/diamconj.drgenius
+share/gnome/drgenius/examples/figures/ellipsis-locus.xml
+share/gnome/drgenius/examples/figures/euler-line.xml
+share/gnome/drgenius/examples/figures/hyperbola-locus.xml
+share/gnome/drgenius/examples/figures/mercedes.drgenius
+share/gnome/drgenius/examples/figures/moyenne-prop.drgenius
+share/gnome/drgenius/examples/figures/orthocenter-locus.xml
+share/gnome/drgenius/examples/figures/orthocentre-symetique.drgenius
+share/gnome/drgenius/examples/figures/parabola-locus.xml
+share/gnome/drgenius/examples/figures/parabola2-locus.xml
+share/gnome/drgenius/examples/figures/parallelogramme.xml
+share/gnome/drgenius/examples/figures/partage-segment.drgenius
+share/gnome/drgenius/examples/figures/polygons.drgenius
+share/gnome/drgenius/examples/figures/script1.xml
+share/gnome/drgenius/examples/figures/sinusoide.drgenius
+share/gnome/drgenius/examples/figures/slope.drgenius
+share/gnome/drgenius/examples/figures/symmetry-axe-2.drgenius
+share/gnome/drgenius/examples/figures/symmetry-center.drgenius
+share/gnome/drgenius/examples/figures/triangle-scale.drgenius
+share/gnome/drgenius/examples/figures/triangle_rectangle1.drgenius
+share/gnome/drgenius/examples/figures/triangles-homothetiques.drgenius
+share/gnome/drgenius/examples/figures/trigo1.drgenius
+share/gnome/drgenius/examples/figures/varignon.drgenius
+share/gnome/drgenius/examples/macros/bissectrice.mac
+share/gnome/drgenius/examples/macros/centre1.mac
+share/gnome/drgenius/examples/macros/orthocentre.mac
+share/gnome/drgenius/examples/macros/segment.mac
+share/gnome/drgenius/glade/angle.xpm
+share/gnome/drgenius/glade/axial_symetry.xpm
+share/gnome/drgenius/glade/build_macro.xpm
+share/gnome/drgenius/glade/central_symetry.xpm
+share/gnome/drgenius/glade/circle.xpm
+share/gnome/drgenius/glade/circle_arc.xpm
+share/gnome/drgenius/glade/color-black.xpm
+share/gnome/drgenius/glade/color-blue.xpm
+share/gnome/drgenius/glade/color-bordeaux.xpm
+share/gnome/drgenius/glade/color-dark-blue.xpm
+share/gnome/drgenius/glade/color-dark-green.xpm
+share/gnome/drgenius/glade/color-dark-grey.xpm
+share/gnome/drgenius/glade/color-green.xpm
+share/gnome/drgenius/glade/color-grey.xpm
+share/gnome/drgenius/glade/color-orange.xpm
+share/gnome/drgenius/glade/color-red.xpm
+share/gnome/drgenius/glade/color-white.xpm
+share/gnome/drgenius/glade/color-yellow.xpm
+share/gnome/drgenius/glade/coordinates.xpm
+share/gnome/drgenius/glade/cross.xpm
+share/gnome/drgenius/glade/dashline.xpm
+share/gnome/drgenius/glade/distance.xpm
+share/gnome/drgenius/glade/drgenius.glade
+share/gnome/drgenius/glade/drgeo.glade
+share/gnome/drgenius/glade/eraser.xpm
+share/gnome/drgenius/glade/free_point.xpm
+share/gnome/drgenius/glade/half_line.xpm
+share/gnome/drgenius/glade/homothetie.xpm
+share/gnome/drgenius/glade/intersection_point.xpm
+share/gnome/drgenius/glade/largeline.xpm
+share/gnome/drgenius/glade/line.xpm
+share/gnome/drgenius/glade/line_menu.xpm
+share/gnome/drgenius/glade/load.xpm
+share/gnome/drgenius/glade/locus.xpm
+share/gnome/drgenius/glade/macro_menu.xpm
+share/gnome/drgenius/glade/middle.xpm
+share/gnome/drgenius/glade/move.xpm
+share/gnome/drgenius/glade/new_figure.xpm
+share/gnome/drgenius/glade/normalline.xpm
+share/gnome/drgenius/glade/numeric_menu.xpm
+share/gnome/drgenius/glade/parallel.xpm
+share/gnome/drgenius/glade/perpendicular.xpm
+share/gnome/drgenius/glade/point_coordinate.xpm
+share/gnome/drgenius/glade/point_menu.xpm
+share/gnome/drgenius/glade/polygon.xpm
+share/gnome/drgenius/glade/preferences.xpm
+share/gnome/drgenius/glade/property.xpm
+share/gnome/drgenius/glade/quit.xpm
+share/gnome/drgenius/glade/rotation.xpm
+share/gnome/drgenius/glade/round-empty.xpm
+share/gnome/drgenius/glade/round.xpm
+share/gnome/drgenius/glade/run_macro.xpm
+share/gnome/drgenius/glade/save.xpm
+share/gnome/drgenius/glade/script.xpm
+share/gnome/drgenius/glade/segment.xpm
+share/gnome/drgenius/glade/square-empty.xpm
+share/gnome/drgenius/glade/square.xpm
+share/gnome/drgenius/glade/styles.xpm
+share/gnome/drgenius/glade/tools_menu.xpm
+share/gnome/drgenius/glade/transformation_menu.xpm
+share/gnome/drgenius/glade/translation.xpm
+share/gnome/drgenius/glade/triangle.xpm
+share/gnome/drgenius/glade/vectrex.xpm
+share/gnome/drgenius/glade/widget-script.xpm
 share/gnome/pixmaps/drgenius.png
 share/gnome/pixmaps/gnome-drgenius-geo.png
 share/gnome/pixmaps/gnome-drgenius.png
-share/gnome/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
-share/locale/da/LC_MESSAGES/drgeo.mo
-share/locale/de/LC_MESSAGES/drgeo.mo
-share/locale/el/LC_MESSAGES/drgeo.mo
-share/locale/en_GB/LC_MESSAGES/drgeo.mo
-share/locale/es/LC_MESSAGES/drgeo.mo
-share/locale/fr/LC_MESSAGES/drgeo.mo
-share/locale/ga/LC_MESSAGES/drgeo.mo
-share/locale/gl/LC_MESSAGES/drgeo.mo
-share/locale/gu/LC_MESSAGES/drgeo.mo
-share/locale/hi/LC_MESSAGES/drgeo.mo
-share/locale/hu/LC_MESSAGES/drgeo.mo
-share/locale/it/LC_MESSAGES/drgeo.mo
-share/locale/ja/LC_MESSAGES/drgeo.mo
-share/locale/ml/LC_MESSAGES/drgeo.mo
-share/locale/mr/LC_MESSAGES/drgeo.mo
-share/locale/nl/LC_MESSAGES/drgeo.mo
-share/locale/no/LC_MESSAGES/drgeo.mo
-share/locale/pl/LC_MESSAGES/drgeo.mo
-share/locale/pt/LC_MESSAGES/drgeo.mo
-share/locale/pt_BR/LC_MESSAGES/drgeo.mo
-share/locale/ru/LC_MESSAGES/drgeo.mo
-share/locale/sl/LC_MESSAGES/drgeo.mo
-share/locale/sr/LC_MESSAGES/drgeo.mo
-share/locale/sr@Latn/LC_MESSAGES/drgeo.mo
-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
-@unexec rmdir %D/share/gnome/texmacs/TeXmacs/plugins/drgeo/progs 2>/dev/null || true
-@unexec rmdir %D/share/gnome/texmacs/TeXmacs/plugins/drgeo 2>/dev/null || true
-@unexec rmdir %D/share/gnome/texmacs/TeXmacs/plugins 2>/dev/null || true
-@unexec rmdir %D/share/gnome/texmacs/TeXmacs 2>/dev/null || true
-@unexec rmdir %D/share/gnome/texmacs 2>/dev/null || true
-@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
+share/locale/ca/LC_MESSAGES/drgenius.mo
+share/locale/cs/LC_MESSAGES/drgenius.mo
+share/locale/da/LC_MESSAGES/drgenius.mo
+share/locale/de/LC_MESSAGES/drgenius.mo
+share/locale/el/LC_MESSAGES/drgenius.mo
+share/locale/en_GB/LC_MESSAGES/drgenius.mo
+share/locale/es/LC_MESSAGES/drgenius.mo
+share/locale/fr/LC_MESSAGES/drgenius.mo
+share/locale/ga/LC_MESSAGES/drgenius.mo
+share/locale/gl/LC_MESSAGES/drgenius.mo
+share/locale/hi/LC_MESSAGES/drgenius.mo
+share/locale/hu/LC_MESSAGES/drgenius.mo
+share/locale/it/LC_MESSAGES/drgenius.mo
+share/locale/ja/LC_MESSAGES/drgenius.mo
+share/locale/ko/LC_MESSAGES/drgenius.mo
+share/locale/nl/LC_MESSAGES/drgenius.mo
+share/locale/no/LC_MESSAGES/drgenius.mo
+share/locale/pl/LC_MESSAGES/drgenius.mo
+share/locale/pt/LC_MESSAGES/drgenius.mo
+share/locale/pt_BR/LC_MESSAGES/drgenius.mo
+share/locale/ru/LC_MESSAGES/drgenius.mo
+share/locale/sl/LC_MESSAGES/drgenius.mo
+share/locale/sv/LC_MESSAGES/drgenius.mo
+share/locale/uk/LC_MESSAGES/drgenius.mo
+@dirrm share/gnome/drgenius/glade
+@dirrm share/gnome/drgenius/examples/macros
+@dirrm share/gnome/drgenius/examples/figures
+@dirrm share/gnome/drgenius/examples
+@dirrm share/gnome/drgenius
diff --git a/math/drgeo/Makefile b/math/drgeo/Makefile
index 5765a2673192..2f706bb3f440 100644
--- a/math/drgeo/Makefile
+++ b/math/drgeo/Makefile
@@ -5,20 +5,21 @@
 # $FreeBSD$
 #
 
-PORTNAME=	drgeo
-PORTVERSION=	0.9.9
+PORTNAME=	drgenius
+PORTVERSION=	0.8.4
+PORTREVISION=	1
 CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	ofset
+MASTER_SITES=	http://www.ofset.org/drgenius/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A GTK interactive geometry sofware
+COMMENT=	The Gnome Interactive Geometry Sofware
 
+BUILD_DEPENDS=	gob:${PORTSDIR}/x11-toolkits/gob
 LIB_DEPENDS=	guile.15:${PORTSDIR}/lang/guile
 
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomehack gnomeprefix gnometarget libglade2
 USE_GMAKE=	yes
+USE_GNOME=	gnomehack gnomeprefix gnometarget libglade
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/math/drgeo/distinfo b/math/drgeo/distinfo
index b46b03a6121c..c7b567721ae9 100644
--- a/math/drgeo/distinfo
+++ b/math/drgeo/distinfo
@@ -1 +1 @@
-MD5 (drgeo-0.9.9.tar.gz) = 06c2267278a88e2d8168e0556544ac00
+MD5 (drgenius-0.8.4.tar.gz) = e679bba132a90962ad4de1457374416e
diff --git a/math/drgeo/files/patch-po_Makefile.in.in b/math/drgeo/files/patch-po_Makefile.in.in
deleted file mode 100644
index 14515a44a3be..000000000000
--- a/math/drgeo/files/patch-po_Makefile.in.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- po/Makefile.in.in.orig	Wed Sep 24 09:31:34 2003
-+++ po/Makefile.in.in	Wed Sep 24 09:57:50 2003
-@@ -106,7 +106,7 @@
- 	@catalogs='$(CATALOGS)'; \
- 	for cat in $$catalogs; do \
- 	  cat=`basename $$cat`; \
--	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
-+	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
- 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
- 	  $(mkinstalldirs) $(DESTDIR)$$dir; \
- 	  if test -r $$cat; then \
diff --git a/math/drgeo/pkg-descr b/math/drgeo/pkg-descr
index 6d56f8dbb7dd..44ef0ee50b63 100644
--- a/math/drgeo/pkg-descr
+++ b/math/drgeo/pkg-descr
@@ -1,6 +1,6 @@
-Dr. Geo is a GTK interactive geometry software. It allows one to create 
+Dr. Genius is the Gnome interactive geometry software. It allows one to create 
 geometric figure plus the interactive manipulation of such figure in respect 
 with their geometric constraints. It is useable in teaching situation with 
 students from primary or secondary level.
 
-WWW: http://www.ofset.org/drgeo/
+WWW: http://www.ofset.org/drgenius/
diff --git a/math/drgeo/pkg-plist b/math/drgeo/pkg-plist
index e7c636d95ed8..6f3a678cf3b4 100644
--- a/math/drgeo/pkg-plist
+++ b/math/drgeo/pkg-plist
@@ -1,189 +1,129 @@
-bin/drgeo
-share/gnome/applications/drgeo.desktop
-share/gnome/drgeo/examples/figures/angle-inscrit.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/euler-line.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/polygons.fgeo
-share/gnome/drgeo/examples/figures/saliera.fgeo
-share/gnome/drgeo/examples/figures/sinusoide.fgeo
-share/gnome/drgeo/examples/figures/slope.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/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/segment.mgeo
-share/gnome/drgeo/examples/scheme/figure.scm
-share/gnome/drgeo/examples/scheme/polygon.scm
-share/gnome/drgeo/examples/scheme/polygon2.scm
-share/gnome/drgeo/examples/scheme/square.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/drgenius.png
-share/gnome/drgeo/glade/drgenius2.glade
-share/gnome/drgeo/glade/drgenius_new_figure.xpm
-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/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/locus.xpm
-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/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_fr.scm
-share/gnome/drgeo/scm/drgeo_scm_interface_constant_sr.scm
-share/gnome/drgeo/scm/preferences.scm
+bin/drgenius
+share/gnome/apps/Utilities/drgenius.desktop
+share/gnome/drgenius/examples/figures/angle-inscrit.drgenius
+share/gnome/drgenius/examples/figures/cercle-inscrit.xml
+share/gnome/drgenius/examples/figures/circle-locus.xml
+share/gnome/drgenius/examples/figures/conics.xml
+share/gnome/drgenius/examples/figures/diamconj.drgenius
+share/gnome/drgenius/examples/figures/ellipsis-locus.xml
+share/gnome/drgenius/examples/figures/euler-line.xml
+share/gnome/drgenius/examples/figures/hyperbola-locus.xml
+share/gnome/drgenius/examples/figures/mercedes.drgenius
+share/gnome/drgenius/examples/figures/moyenne-prop.drgenius
+share/gnome/drgenius/examples/figures/orthocenter-locus.xml
+share/gnome/drgenius/examples/figures/orthocentre-symetique.drgenius
+share/gnome/drgenius/examples/figures/parabola-locus.xml
+share/gnome/drgenius/examples/figures/parabola2-locus.xml
+share/gnome/drgenius/examples/figures/parallelogramme.xml
+share/gnome/drgenius/examples/figures/partage-segment.drgenius
+share/gnome/drgenius/examples/figures/polygons.drgenius
+share/gnome/drgenius/examples/figures/script1.xml
+share/gnome/drgenius/examples/figures/sinusoide.drgenius
+share/gnome/drgenius/examples/figures/slope.drgenius
+share/gnome/drgenius/examples/figures/symmetry-axe-2.drgenius
+share/gnome/drgenius/examples/figures/symmetry-center.drgenius
+share/gnome/drgenius/examples/figures/triangle-scale.drgenius
+share/gnome/drgenius/examples/figures/triangle_rectangle1.drgenius
+share/gnome/drgenius/examples/figures/triangles-homothetiques.drgenius
+share/gnome/drgenius/examples/figures/trigo1.drgenius
+share/gnome/drgenius/examples/figures/varignon.drgenius
+share/gnome/drgenius/examples/macros/bissectrice.mac
+share/gnome/drgenius/examples/macros/centre1.mac
+share/gnome/drgenius/examples/macros/orthocentre.mac
+share/gnome/drgenius/examples/macros/segment.mac
+share/gnome/drgenius/glade/angle.xpm
+share/gnome/drgenius/glade/axial_symetry.xpm
+share/gnome/drgenius/glade/build_macro.xpm
+share/gnome/drgenius/glade/central_symetry.xpm
+share/gnome/drgenius/glade/circle.xpm
+share/gnome/drgenius/glade/circle_arc.xpm
+share/gnome/drgenius/glade/color-black.xpm
+share/gnome/drgenius/glade/color-blue.xpm
+share/gnome/drgenius/glade/color-bordeaux.xpm
+share/gnome/drgenius/glade/color-dark-blue.xpm
+share/gnome/drgenius/glade/color-dark-green.xpm
+share/gnome/drgenius/glade/color-dark-grey.xpm
+share/gnome/drgenius/glade/color-green.xpm
+share/gnome/drgenius/glade/color-grey.xpm
+share/gnome/drgenius/glade/color-orange.xpm
+share/gnome/drgenius/glade/color-red.xpm
+share/gnome/drgenius/glade/color-white.xpm
+share/gnome/drgenius/glade/color-yellow.xpm
+share/gnome/drgenius/glade/coordinates.xpm
+share/gnome/drgenius/glade/cross.xpm
+share/gnome/drgenius/glade/dashline.xpm
+share/gnome/drgenius/glade/distance.xpm
+share/gnome/drgenius/glade/drgenius.glade
+share/gnome/drgenius/glade/drgeo.glade
+share/gnome/drgenius/glade/eraser.xpm
+share/gnome/drgenius/glade/free_point.xpm
+share/gnome/drgenius/glade/half_line.xpm
+share/gnome/drgenius/glade/homothetie.xpm
+share/gnome/drgenius/glade/intersection_point.xpm
+share/gnome/drgenius/glade/largeline.xpm
+share/gnome/drgenius/glade/line.xpm
+share/gnome/drgenius/glade/line_menu.xpm
+share/gnome/drgenius/glade/load.xpm
+share/gnome/drgenius/glade/locus.xpm
+share/gnome/drgenius/glade/macro_menu.xpm
+share/gnome/drgenius/glade/middle.xpm
+share/gnome/drgenius/glade/move.xpm
+share/gnome/drgenius/glade/new_figure.xpm
+share/gnome/drgenius/glade/normalline.xpm
+share/gnome/drgenius/glade/numeric_menu.xpm
+share/gnome/drgenius/glade/parallel.xpm
+share/gnome/drgenius/glade/perpendicular.xpm
+share/gnome/drgenius/glade/point_coordinate.xpm
+share/gnome/drgenius/glade/point_menu.xpm
+share/gnome/drgenius/glade/polygon.xpm
+share/gnome/drgenius/glade/preferences.xpm
+share/gnome/drgenius/glade/property.xpm
+share/gnome/drgenius/glade/quit.xpm
+share/gnome/drgenius/glade/rotation.xpm
+share/gnome/drgenius/glade/round-empty.xpm
+share/gnome/drgenius/glade/round.xpm
+share/gnome/drgenius/glade/run_macro.xpm
+share/gnome/drgenius/glade/save.xpm
+share/gnome/drgenius/glade/script.xpm
+share/gnome/drgenius/glade/segment.xpm
+share/gnome/drgenius/glade/square-empty.xpm
+share/gnome/drgenius/glade/square.xpm
+share/gnome/drgenius/glade/styles.xpm
+share/gnome/drgenius/glade/tools_menu.xpm
+share/gnome/drgenius/glade/transformation_menu.xpm
+share/gnome/drgenius/glade/translation.xpm
+share/gnome/drgenius/glade/triangle.xpm
+share/gnome/drgenius/glade/vectrex.xpm
+share/gnome/drgenius/glade/widget-script.xpm
 share/gnome/pixmaps/drgenius.png
 share/gnome/pixmaps/gnome-drgenius-geo.png
 share/gnome/pixmaps/gnome-drgenius.png
-share/gnome/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
-share/locale/da/LC_MESSAGES/drgeo.mo
-share/locale/de/LC_MESSAGES/drgeo.mo
-share/locale/el/LC_MESSAGES/drgeo.mo
-share/locale/en_GB/LC_MESSAGES/drgeo.mo
-share/locale/es/LC_MESSAGES/drgeo.mo
-share/locale/fr/LC_MESSAGES/drgeo.mo
-share/locale/ga/LC_MESSAGES/drgeo.mo
-share/locale/gl/LC_MESSAGES/drgeo.mo
-share/locale/gu/LC_MESSAGES/drgeo.mo
-share/locale/hi/LC_MESSAGES/drgeo.mo
-share/locale/hu/LC_MESSAGES/drgeo.mo
-share/locale/it/LC_MESSAGES/drgeo.mo
-share/locale/ja/LC_MESSAGES/drgeo.mo
-share/locale/ml/LC_MESSAGES/drgeo.mo
-share/locale/mr/LC_MESSAGES/drgeo.mo
-share/locale/nl/LC_MESSAGES/drgeo.mo
-share/locale/no/LC_MESSAGES/drgeo.mo
-share/locale/pl/LC_MESSAGES/drgeo.mo
-share/locale/pt/LC_MESSAGES/drgeo.mo
-share/locale/pt_BR/LC_MESSAGES/drgeo.mo
-share/locale/ru/LC_MESSAGES/drgeo.mo
-share/locale/sl/LC_MESSAGES/drgeo.mo
-share/locale/sr/LC_MESSAGES/drgeo.mo
-share/locale/sr@Latn/LC_MESSAGES/drgeo.mo
-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
-@unexec rmdir %D/share/gnome/texmacs/TeXmacs/plugins/drgeo/progs 2>/dev/null || true
-@unexec rmdir %D/share/gnome/texmacs/TeXmacs/plugins/drgeo 2>/dev/null || true
-@unexec rmdir %D/share/gnome/texmacs/TeXmacs/plugins 2>/dev/null || true
-@unexec rmdir %D/share/gnome/texmacs/TeXmacs 2>/dev/null || true
-@unexec rmdir %D/share/gnome/texmacs 2>/dev/null || true
-@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
+share/locale/ca/LC_MESSAGES/drgenius.mo
+share/locale/cs/LC_MESSAGES/drgenius.mo
+share/locale/da/LC_MESSAGES/drgenius.mo
+share/locale/de/LC_MESSAGES/drgenius.mo
+share/locale/el/LC_MESSAGES/drgenius.mo
+share/locale/en_GB/LC_MESSAGES/drgenius.mo
+share/locale/es/LC_MESSAGES/drgenius.mo
+share/locale/fr/LC_MESSAGES/drgenius.mo
+share/locale/ga/LC_MESSAGES/drgenius.mo
+share/locale/gl/LC_MESSAGES/drgenius.mo
+share/locale/hi/LC_MESSAGES/drgenius.mo
+share/locale/hu/LC_MESSAGES/drgenius.mo
+share/locale/it/LC_MESSAGES/drgenius.mo
+share/locale/ja/LC_MESSAGES/drgenius.mo
+share/locale/ko/LC_MESSAGES/drgenius.mo
+share/locale/nl/LC_MESSAGES/drgenius.mo
+share/locale/no/LC_MESSAGES/drgenius.mo
+share/locale/pl/LC_MESSAGES/drgenius.mo
+share/locale/pt/LC_MESSAGES/drgenius.mo
+share/locale/pt_BR/LC_MESSAGES/drgenius.mo
+share/locale/ru/LC_MESSAGES/drgenius.mo
+share/locale/sl/LC_MESSAGES/drgenius.mo
+share/locale/sv/LC_MESSAGES/drgenius.mo
+share/locale/uk/LC_MESSAGES/drgenius.mo
+@dirrm share/gnome/drgenius/glade
+@dirrm share/gnome/drgenius/examples/macros
+@dirrm share/gnome/drgenius/examples/figures
+@dirrm share/gnome/drgenius/examples
+@dirrm share/gnome/drgenius