8 files changed, 27 insertions, 35 deletions
diff --git a/math/dislin/Makefile b/math/dislin/Makefile
index 051afcf1efcd..75cb70342ccf 100644
--- a/math/dislin/Makefile
+++ b/math/dislin/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	dislin
-PORTVERSION=	9.1
-PORTREVISION=	2
+PORTVERSION=	9.2
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.gwdg.de/pub/grafik/dislin/unix/
 DISTNAME=	${PORTNAME}-${PORTVERSION}.fbsd${BINVER}
@@ -15,14 +14,14 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}.fbsd${BINVER}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A scientific data plotting package
 
+LIB_DEPENDS=	f2c.2:${PORTSDIR}/lang/f2c
+
 RESTRICTED=	free for non-commercial use.
 ONLY_FOR_ARCHS=	i386
 USE_XLIB=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-BROKEN=		does not fetch
-
 MD5_FILE=	${MASTERDIR}/distinfo${BINVER}
 PLIST_SUB+=	VER=${PORTVERSION} MAJ=${MAJ}
 SUB_FILES=	dislin.sh pkg-message
@@ -43,9 +42,12 @@ BINVER=		-5.4
 .else
 BINVER=		-6.0
 .endif
+.if ${OSVERSION} >= 700000
+LIB_DEPENDS+=	z.3:${PORTSDIR}/misc/compat6x
+.endif
 
 do-install:
-	(cd ${WRKSRC} && ${ENV} DISLIN=${DISLIN_DIR} ${SH} INSTALL)
+	cd ${WRKSRC} && ${SETENV} DISLIN=${DISLIN_DIR} ${SH} INSTALL
 	${INSTALL_SCRIPT} ${WRKDIR}/dislin.sh ${DISLIN_DIR}/bin
 .for _program in ${PROGRAMS}
 	${LN} -s ${DISLIN_DIR}/bin/dislin.sh ${PREFIX}/bin/${_program}
@@ -56,11 +58,13 @@ do-install:
 	${LN} -s ${DISLIN_DIR}/lib/${_lib}-${PORTVERSION}.so	\
 		${PREFIX}/lib/lib${_lib}.so.${MAJ}
 .endfor
-	${LN} -s ${DISLIN_DIR}/java/disjava-${PORTVERSION}.so	\
-		${PREFIX}/lib/libdisjava.so
+	${LN} -s ${LOCALBASE}/lib/libf2c.so ${DISLIN_DIR}/libg2c.so
+	${LN} -s ${LOCALBASE}/lib/libf2c.so.2 ${DISLIN_DIR}/libg2c.so.2
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DISLIN_DIR}
 
 post-install:
+	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
+	@${ECHO_MSG}
 
 .include <bsd.port.post.mk>
diff --git a/math/dislin/distinfo b/math/dislin/distinfo
deleted file mode 100644
index 08ec644cb921..000000000000
--- a/math/dislin/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (dislin-9.1.fbsd.tar.gz) = 3ffc5f7ec5287efb49705183df7f8e6e
-SHA256 (dislin-9.1.fbsd.tar.gz) = 9d6219861bd0c64fd346604076eb0d62f1fb4712f6fdbed04a1977f99da35770
-SIZE (dislin-9.1.fbsd.tar.gz) = 10691889
diff --git a/math/dislin/distinfo-5.4 b/math/dislin/distinfo-5.4
index 1c894b6178f0..6bfee654d0e8 100644
--- a/math/dislin/distinfo-5.4
+++ b/math/dislin/distinfo-5.4
@@ -1,3 +1,3 @@
-MD5 (dislin-9.1.fbsd-5.4.tar.gz) = 3ec480c711324e466ce178e1cdb6fe65
-SHA256 (dislin-9.1.fbsd-5.4.tar.gz) = 4a8e7a80daa549bc283bf0d54bcc59534a342cdbda7c619ad083da37975870a1
-SIZE (dislin-9.1.fbsd-5.4.tar.gz) = 10704918
+MD5 (dislin-9.2.fbsd-5.4.tar.gz) = 2d491892185c55e5326fffb318617396
+SHA256 (dislin-9.2.fbsd-5.4.tar.gz) = 42fee6d08d7556d5238076a43e731c4ecd808577e90cdd330642bf841a1aee47
+SIZE (dislin-9.2.fbsd-5.4.tar.gz) = 14563717
diff --git a/math/dislin/distinfo-6.0 b/math/dislin/distinfo-6.0
index a4ce888f5192..bde3c851c5ac 100644
--- a/math/dislin/distinfo-6.0
+++ b/math/dislin/distinfo-6.0
@@ -1,3 +1,3 @@
-MD5 (dislin-9.1.fbsd-6.0.tar.gz) = 81828566b11e897090c8467768295b15
-SHA256 (dislin-9.1.fbsd-6.0.tar.gz) = c5df6cd5976448bd7ab509b3cc8bfa1d7cbacded538696a49755f905e5673e5f
-SIZE (dislin-9.1.fbsd-6.0.tar.gz) = 10712442
+MD5 (dislin-9.2.fbsd-6.0.tar.gz) = f0667892f641d6caf387926ab12dac66
+SHA256 (dislin-9.2.fbsd-6.0.tar.gz) = b349e7031348f5bd9a9506b6c6b2db20363f2a6560da7bbe386321120a6a4f00
+SIZE (dislin-9.2.fbsd-6.0.tar.gz) = 14467145
diff --git a/math/dislin/files/dislin.sh.in b/math/dislin/files/dislin.sh.in
index 3292b671be6a..b960f1eb9c4f 100644
--- a/math/dislin/files/dislin.sh.in
+++ b/math/dislin/files/dislin.sh.in
@@ -8,6 +8,9 @@
 DISLIN=%%DISLIN_DIR%%
 export DISLIN
 
+LD_LIBRARY_PATH=$DISLIN:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH
+
 self="${0##*/}"
 program="${DISLIN}/bin/${self}"
 
diff --git a/math/dislin/files/pkg-message.in b/math/dislin/files/pkg-message.in
index 1c3367f235ff..b6469b6a68cb 100644
--- a/math/dislin/files/pkg-message.in
+++ b/math/dislin/files/pkg-message.in
@@ -1,12 +1,4 @@
-Note:	libdisjava.so is linked against libm.so.2, you might have to
-	add the following entry in your /etc/libmap.conf:
-
-libm.so.2		libm.so.4
-
-	-------------------------------------------------------------
-
 	DISLIN is free for non-commercial use on Linux and FreeBSD
 	only.  You are advised to familiarize yourself with the terms
 	of license listed in %%DISLIN_DIR%%/DISLIN and on the DISLIN
-	website, http://www.linmpi.mpg.de/dislin/.
-
+	website, http://www.mps.mpg.de/dislin/ .
diff --git a/math/dislin/pkg-descr b/math/dislin/pkg-descr
index 52111e5ec086..25ef7863b218 100644
--- a/math/dislin/pkg-descr
+++ b/math/dislin/pkg-descr
@@ -11,4 +11,4 @@ HPGL, PostScript, Prescribe, WMF, PNG, BMP and TIFF. DISLIN metafiles  can
 either be printed on various devices using the  DISLIN driver program DIS-
 DRV or imported into third party products such as TeX and MS Word.
 
-WWW: http://www.linmpi.mpg.de/dislin/
+WWW: http://www.mps.mpg.de/dislin/
diff --git a/math/dislin/pkg-plist b/math/dislin/pkg-plist
index da2e9a05163d..aa4daf94cca1 100644
--- a/math/dislin/pkg-plist
+++ b/math/dislin/pkg-plist
@@ -107,7 +107,6 @@ dislin/java/color3d.java
 dislin/java/conshd.java
 dislin/java/contour.java
 dislin/java/curve.java
-dislin/java/disjava-%%VER%%.so
 dislin/java/dislin-%%VER%%.java.tar.gz
 dislin/java/dislin.jar
 dislin/java/intpol.java
@@ -126,25 +125,20 @@ dislin/lib/dislin-%%VER%%.a
 dislin/lib/dislin-%%VER%%.so
 dislin/lib/dislin_d-%%VER%%.a
 dislin/lib/dislin_d-%%VER%%.so
-dislin/libdisjava.so
-dislin/libdisjava.so.8
-dislin/libdisjava.so.9
 dislin/libdislin.a
 dislin/libdislin.so
-dislin/libdislin.so.8
 dislin/libdislin.so.9
 dislin/libdislin_d.a
 dislin/libdislin_d.so
-dislin/libdislin_d.so.8
 dislin/libdislin_d.so.9
 dislin/libdislnc.a
 dislin/libdislnc.so
-dislin/libdislnc.so.8
 dislin/libdislnc.so.9
 dislin/libdislnc_d.a
 dislin/libdislnc_d.so
-dislin/libdislnc_d.so.8
 dislin/libdislnc_d.so.9
+dislin/libg2c.so
+dislin/libg2c.so.2
 dislin/man/appa.txt
 dislin/man/appb.txt
 dislin/man/appc.txt
@@ -181,10 +175,13 @@ dislin/man/kap6_3.txt
 dislin/man/kap7.txt
 dislin/man/kap8.txt
 dislin/man/kap9.txt
+dislin/map/map0.dat
 dislin/map/map1.dat
 dislin/map/map2.dat
 dislin/map/map3.dat
 dislin/map/map4.dat
+dislin/map/map5.dat
+dislin/map/map6.dat
 dislin/perl/Dislin.pm
 dislin/perl/Dislin.so
 dislin/perl/areaf.pl
@@ -227,7 +224,6 @@ dislin/python/vectors.py
 dislin/python/widgets.py
 dislin/python/world.py
 dislin/real64/dislin.h
-lib/libdisjava.so
 lib/libdislin.a
 lib/libdislin.so.%%MAJ%%
 lib/libdislin_d.a