4 files changed, 34 insertions, 39 deletions

diff --git a/math/ggobi/Makefile b/math/ggobi/Makefile
index caf9c34e637b..0a18bc7dcfdd 100644
--- a/math/ggobi/Makefile
+++ b/math/ggobi/Makefile
@@ -2,41 +2,31 @@
 # $FreeBSD$
 
 PORTNAME=	ggobi
-PORTVERSION=	2.1.9
-PORTREVISION=	3
+PORTVERSION=	2.1.11
 CATEGORIES=	math graphics
 MASTER_SITES=	http://www.ggobi.org/downloads/
 
 MAINTAINER=	rhurlin@gwdg.de
 COMMENT=	Data visualization system
 
-USES=		libtool pathfix pkgconfig tar:bzip2
+LICENSE=	EPL
+
+LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
+
+USES=		pkgconfig tar:bzip2 libtool pathfix desktop-file-utils
 USE_GNOME=	gtk20 libxml2
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=	--with-all-plugins
 
+SUB_FILES=	pkg-message
+
 ALL_TARGET=	all ggobirc
+INSTALL_TARGET=	install-strip
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|ND_coord_i|ND_coord|' \
-		${WRKSRC}/plugins/GraphLayout/graphviz.c
-	@${REINPLACE_CMD} '/ltdl/d' ${WRKSRC}/src/plugin.h
-	@${REINPLACE_CMD} -e 's|#line 0|#line 1|' \
-		${WRKSRC}/src/ggobi-data.c \
-		${WRKSRC}/src/ggobi-renderer-cairo.c \
-		${WRKSRC}/src/ggobi-renderer-factory.c \
-		${WRKSRC}/src/ggobi-renderer.c
-
-post-configure:
-# build gets irritated by the presence of an external graphviz version
-	@${REINPLACE_CMD} -e 's|#define HAVE_LIBGVC 1|/* #define HAVE_LIBGVC 1 */|' \
-		${WRKSRC}/plugins/GraphLayout/config.h
-	@${REINPLACE_CMD} -e 's|LIBGVC_CFLAGS = -I${LOCALBASE}/include/graphviz|LIBGVC_CFLAGS =|' \
-		${WRKSRC}/plugins/GraphLayout/Makefile
-	@${REINPLACE_CMD} -e 's|LIBGVC_LIBS = -L${LOCALBASE}/lib/graphviz -lgvc -lgraph -lcdt|LIBGVC_LIBS =|' \
-		${WRKSRC}/plugins/GraphLayout/Makefile
+post-build:
+	@${REINPLACE_CMD} -e 's|plugin.la|plugin.so|g' ${WRKSRC}/ggobirc
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/xdg/ggobi
diff --git a/math/ggobi/distinfo b/math/ggobi/distinfo
index 43f49b32528e..7d14aac87d70 100644
--- a/math/ggobi/distinfo
+++ b/math/ggobi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ggobi-2.1.9.tar.bz2) = 9f47ccfdbae7ae22c0096e9a171a523505e031f68dfaf705799cb87d42d73dcc
-SIZE (ggobi-2.1.9.tar.bz2) = 2778042
+SHA256 (ggobi-2.1.11.tar.bz2) = 2c4ddc3ab71877ba184523e47b0637526e6f3701bd9afb6472e6dfc25646aed7
+SIZE (ggobi-2.1.11.tar.bz2) = 2787709
diff --git a/math/ggobi/files/pkg-message.in b/math/ggobi/files/pkg-message.in
new file mode 100644
index 000000000000..608ee0696c25
--- /dev/null
+++ b/math/ggobi/files/pkg-message.in
@@ -0,0 +1,8 @@
+===============================================================================
+
+If GGobi does not find its plugin files, start with a copy of
+
+%%PREFIX%%/etc/xdc/ggobi/ggobirc.sample 
+
+===============================================================================
+
diff --git a/math/ggobi/pkg-plist b/math/ggobi/pkg-plist
index 6cf5c56666d1..62c3900e37c3 100644
--- a/math/ggobi/pkg-plist
+++ b/math/ggobi/pkg-plist
@@ -1,4 +1,5 @@
 bin/ggobi
+@sample etc/xdg/ggobi/ggobirc.sample
 include/ggobi/GGStructSizes.c
 include/ggobi/GGobiAPI.h
 include/ggobi/GGobiApp.h
@@ -50,6 +51,8 @@ lib/libggobi.so.0
 lib/libggobi.so.0.0.0
 libdata/pkgconfig/ggobi.pc
 share/applications/ggobi.desktop
+%%PORTDOCS%%%%DOCSDIR%%/XML.pdf
+%%PORTDOCS%%%%DOCSDIR%%/manual.pdf
 %%DATADIR%%/data/Shipman.csv
 %%DATADIR%%/data/Shipman.xml
 %%DATADIR%%/data/adhoc.xml
@@ -114,22 +117,16 @@ share/applications/ggobi.desktop
 %%DATADIR%%/plugins/ggvis/plugin.so.0.0.0
 %%DATADIR%%/share/colorschemes.xml
 share/pixmaps/ggobi.png
-@dirrm %%DATADIR%%/share
-@dirrm %%DATADIR%%/plugins/ggvis
-@dirrm %%DATADIR%%/plugins/VarCloud
-@dirrm %%DATADIR%%/plugins/GraphLayout
-@dirrm %%DATADIR%%/plugins/GraphAction
-@dirrm %%DATADIR%%/plugins/DescribeDisplay
+@dirrm etc/xdg/ggobi
+@dirrm include/ggobi
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%/data
 @dirrm %%DATADIR%%/plugins/DataViewer
+@dirrm %%DATADIR%%/plugins/DescribeDisplay
+@dirrm %%DATADIR%%/plugins/GraphAction
+@dirrm %%DATADIR%%/plugins/GraphLayout
+@dirrm %%DATADIR%%/plugins/VarCloud
+@dirrm %%DATADIR%%/plugins/ggvis
 @dirrm %%DATADIR%%/plugins
-@dirrm %%DATADIR%%/data
+@dirrm %%DATADIR%%/share
 @dirrm %%DATADIR%%
-@dirrm include/ggobi
-@unexec if cmp -s %D/etc/xdg/ggobi/ggobirc.sample %D/etc/xdg/ggobi/ggobirc; then rm -f %D/etc/xdg/ggobi/ggobirc; fi
-etc/xdg/ggobi/ggobirc.sample
-@exec if [ ! -f %B/ggobirc ]; then cp -p %D/%F %B/ggobirc; fi
-%%DOCSDIR%%/XML.pdf
-%%DOCSDIR%%/manual.pdf
-@dirrm %%DOCSDIR%%
-@dirrmtry etc/xdg/ggobi
-@dirrmtry etc/xdg