3 files changed, 16 insertions, 180 deletions

diff --git a/math/drgeo/Makefile b/math/drgeo/Makefile
index 02d9f0e4f97b..e96508b5e93a 100644
--- a/math/drgeo/Makefile
+++ b/math/drgeo/Makefile
@@ -10,16 +10,17 @@ MASTER_SITES=	SF/ofset/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	GTK interactive geometry software
 
-LIB_DEPENDS=	guile:${PORTSDIR}/lang/guile
+LIB_DEPENDS=	libguile.so:${PORTSDIR}/lang/guile
 
+GNU_CONFIGURE=	yes
 USES=		gettext gmake pkgconfig
 USE_GNOME=	gnomehack gnomeprefix intlhack libglade2
-GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-USE_GCC=	any # doesn't link otherwise
+USE_GCC=	yes # segfaults when built with clang
+
+PORTDATA=	*
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|#!/bin/bash|#!/bin/sh|g' \
 		${WRKSRC}/plugin/drgeo/progs/tm_drgeo
diff --git a/math/drgeo/files/patch-geo-drgeo__dialog.cc b/math/drgeo/files/patch-geo-drgeo__dialog.cc
new file mode 100644
index 000000000000..3bd36b53911b
--- /dev/null
+++ b/math/drgeo/files/patch-geo-drgeo__dialog.cc
@@ -0,0 +1,11 @@
+--- geo/drgeo_dialog.cc.orig	2003-10-27 13:17:25.000000000 +0300
++++ geo/drgeo_dialog.cc	2013-09-27 21:58:19.018800682 +0400
+@@ -38,7 +38,7 @@
+ // Used in the style dialod callback, I know it's ugly, but so easy
+ static drgeoFigure *selected_figure;
+ 
+-struct
++struct drgeoDialogDataStruct
+ {
+   drgeoPoint mouse;
+   drgeoFigure *figure;
diff --git a/math/drgeo/pkg-plist b/math/drgeo/pkg-plist
index 003cbf76d39d..639e50adc5ed 100644
--- a/math/drgeo/pkg-plist
+++ b/math/drgeo/pkg-plist
@@ -1,174 +1,6 @@
 bin/drgeo
 bin/tm_drgeo
 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
@@ -216,14 +48,6 @@ share/locale/zh_TW/LC_MESSAGES/drgeo.mo
 @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