4 files changed, 40 insertions, 38 deletions

diff --git a/french/geonext/Makefile b/french/geonext/Makefile
index cc361b38078a..5b1d044ac970 100644
--- a/french/geonext/Makefile
+++ b/french/geonext/Makefile
@@ -6,36 +6,40 @@
 #
 
 PORTNAME=	geonext
-PORTVERSION=	1.0
-CATEGORIES=	french math
-MASTER_SITES=	http://geonext.uni-bayreuth.de/content/fr/download/ \
-		http://btmdx8.mat.uni-bayreuth.de/~andi/geonext/fr/
-DISTNAME=	geonext_fr
+PORTVERSION=	1.11
+CATEGORIES=	french
+MASTER_SITES=	http://geonext.uni-bayreuth.de/data/download/
+DISTNAME=	geonext.${PORTVERSION}
+EXTRACT_SUFX=	.zip
 
 MAINTAINER=	fehlner@gmx.de
 COMMENT=	Interactive (dynamic) elementary Geometry Software
 
+WRKSRC=		${WRKDIR}/geonext_install
 NO_BUILD=	yes
 USE_ZIP=	yes
-WRKSRC=		${WRKDIR}
 USE_JAVA=	1.4
 JAVA=		${JAVA_HOME}/bin/java
 GNAME=		geonext-fr
-GLOCATE=	${PREFIX}/share/${PKGNAMEPREFIX}${PORTNAME}
-DATA=		cacerts didmat.crt geonext.html geonext.jar license.txt
-GIF=		pixel.gif gx.gif gni.gif gn.gif g.gif x.ico
+GLOCATE=	${PREFIX}/share/${GNAME}
+DATA=	cacerts didmat.crt geonext.html geonext.jar license.txt index.html
+IMG=	g.gif gn.gif gni.gif geoint.png pixel.gif gx.gif gxt.gif ubt.gif x.ico
 
 do-install:
-	${MKDIR} ${GLOCATE}
+	${MKDIR} ${PREFIX}/share/${GNAME}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DATA} ${GLOCATE}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${IMG} ${GLOCATE}
 	@${ECHO_MSG} '#!/bin/sh' > ${GLOCATE}/${GNAME}
-	@${ECHO_MSG} '${JAVA} -cp ${GLOCATE}/geonext.jar geonext/Geonext&'\
+	@${ECHO_MSG} '${JAVA} -cp ${GLOCATE}/geonext.jar geonext/Geonext language=fr&'\
 	>>${GLOCATE}/${GNAME}
 	${CHMOD} a+x ${GLOCATE}/${GNAME}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DATA} ${GLOCATE}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${GIF} ${GLOCATE}
+	${LN} ${GLOCATE}/${GNAME} ${GLOCATE}/geonext
 	${INSTALL_SCRIPT} ${GLOCATE}/${GNAME} ${PREFIX}/bin
-
-post-install:
-	${CAT} ${PKGMESSAGE}
+	@${ECHO_MSG} "---------------------------------------------------------"
+	@${ECHO_MSG} "Application:	${GLOCATE}/geonext or ${GNAME}"
+	@${ECHO_MSG} "Browser-Applet:	${GLOCATE}/geonext.html"
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} " WWW: http://www.geonext.de"
+	@${ECHO_MSG} "------------------------------------------------------"
 
 .include <bsd.port.mk>
diff --git a/french/geonext/distinfo b/french/geonext/distinfo
index 33756051dd53..29082962312c 100644
--- a/french/geonext/distinfo
+++ b/french/geonext/distinfo
@@ -1,2 +1,2 @@
-MD5 (geonext_fr.zip) = 67dadda8a2143fb8dcf41c84ea3d44f0
-SIZE (geonext_fr.zip) = 1045171
+MD5 (geonext.1.11.zip) = fb506cfe96f5d172345b2edda3ac0871
+SIZE (geonext.1.11.zip) = 1157656
diff --git a/french/geonext/pkg-message b/french/geonext/pkg-message
deleted file mode 100644
index 39f78d760b4d..000000000000
--- a/french/geonext/pkg-message
+++ /dev/null
@@ -1,7 +0,0 @@
-***************************************************************************
-
-Application:		/usr/local/share/geonext-fr/geonext-fr
-Browser-Applet:		/usr/local/share/geonext-fr/geonext.html
-
- WWW: http://geonext.uni-bayreuth.de/index?LANG=fr"
-***************************************************************************
diff --git a/french/geonext/pkg-plist b/french/geonext/pkg-plist
index de4766500a4b..b6f286da8d38 100644
--- a/french/geonext/pkg-plist
+++ b/french/geonext/pkg-plist
@@ -1,14 +1,19 @@
 bin/geonext-fr
-share/fr-geonext/geonext-fr
-share/fr-geonext/cacerts
-share/fr-geonext/didmat.crt
-share/fr-geonext/g.gif
-share/fr-geonext/geonext.html
-share/fr-geonext/geonext.jar
-share/fr-geonext/gn.gif
-share/fr-geonext/gni.gif
-share/fr-geonext/gx.gif
-share/fr-geonext/license.txt
-share/fr-geonext/pixel.gif
-share/fr-geonext/x.ico
-@dirrm share/fr-geonext
+share/geonext-fr/geonext-fr
+share/geonext-fr/geonext
+share/geonext-fr/cacerts
+share/geonext-fr/didmat.crt
+share/geonext-fr/g.gif
+share/geonext-fr/geonext.html
+share/geonext-fr/geonext.jar
+share/geonext-fr/gn.gif
+share/geonext-fr/gni.gif
+share/geonext-fr/geoint.png
+share/geonext-fr/gx.gif
+share/geonext-fr/gxt.gif
+share/geonext-fr/index.html
+share/geonext-fr/license.txt
+share/geonext-fr/pixel.gif
+share/geonext-fr/x.ico
+share/geonext-fr/ubt.gif
+@dirrm share/geonext-fr