Upgrade to Dislin 9.1.

Changelog at <http://www.mps.mpg.de/dislin/news.html>.

6 files changed, 35 insertions, 16 deletions

diff --git a/math/dislin/Makefile b/math/dislin/Makefile
index 4e5d76ca67f4..0e4b468b0b1c 100644
--- a/math/dislin/Makefile
+++ b/math/dislin/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	dislin
-PORTVERSION=	9.0
-PORTREVISION=	2
+PORTVERSION=	9.1
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.gwdg.de/pub/grafik/dislin/unix/
 DISTNAME=	${PORTNAME}-${PORTVERSION}.fbsd${BINVER}
@@ -22,13 +21,17 @@ NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 MD5_FILE=	${MASTERDIR}/distinfo${BINVER}
-PLIST_SUB+=	VER=${PORTVERSION}
+PLIST_SUB+=	VER=${PORTVERSION} MAJ=${MAJ}
 SUB_FILES=	dislin.sh pkg-message
 SUB_LIST+=	DISLIN_DIR=${DISLIN_DIR}
 PKGMESSAGE=	${WRKDIR}/pkg-message
 DISLIN_DIR=	${PREFIX}/dislin
 PROGRAMS=	clink disaps disdrv disdrv_nw disdrv_w disgcl disgif dishlp	\
 		disimg disman dismov distif dlink f2clink gclhelp gclhlp gclman
+LIBS=		dislin dislin_d
+MAJ=		${PORTVERSION:R}
+
+USE_LDCONFIG=	yes
 
 .include <bsd.port.pre.mk>
 
@@ -46,6 +49,15 @@ do-install:
 .for _program in ${PROGRAMS}
 	${LN} -s ${DISLIN_DIR}/bin/dislin.sh ${PREFIX}/bin/${_program}
 .endfor
+.for _lib in ${LIBS}
+	${LN} -s ${DISLIN_DIR}/lib/${_lib}-${PORTVERSION}.a	\
+		${PREFIX}/lib/lib${_lib}.a
+	${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
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DISLIN_DIR}
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/math/dislin/distinfo b/math/dislin/distinfo
index 5f068133a203..abd9b462dda3 100644
--- a/math/dislin/distinfo
+++ b/math/dislin/distinfo
@@ -1,3 +1,3 @@
-MD5 (dislin-9.0.fbsd.tar.gz) = cc5cc9a75b1aef8c6f1edb5fc3c018ae
-SHA256 (dislin-9.0.fbsd.tar.gz) = c4730d05e3b43af3882e0133026aa4f0343ead32d137333cd5a3d6a4ce99e702
-SIZE (dislin-9.0.fbsd.tar.gz) = 13387329
+MD5 (dislin-9.1.fbsd.tar.gz) = 8639e9e35c6f514e43c59d309053f518
+SHA256 (dislin-9.1.fbsd.tar.gz) = 52b508602c15312d2e8610a4ae8e24a71ba43a408bda7fc34967a92c1be5a17d
+SIZE (dislin-9.1.fbsd.tar.gz) = 10684403
diff --git a/math/dislin/distinfo-5.4 b/math/dislin/distinfo-5.4
index 622723a41c62..7630fa3174c4 100644
--- a/math/dislin/distinfo-5.4
+++ b/math/dislin/distinfo-5.4
@@ -1,3 +1,3 @@
-MD5 (dislin-9.0.fbsd-5.4.tar.gz) = 510baaa075d501e92ac8fbada5902910
-SHA256 (dislin-9.0.fbsd-5.4.tar.gz) = 7947646ca1c4e49ba1915f9698cce5ddcd53ae0bd96b103ab93ef08a3216f3a3
-SIZE (dislin-9.0.fbsd-5.4.tar.gz) = 13445401
+MD5 (dislin-9.1.fbsd-5.4.tar.gz) = 172ba86390267f315941410e3ff19e1b
+SHA256 (dislin-9.1.fbsd-5.4.tar.gz) = 8ab03502e098361131d089363ecef0b04225a05849f46a015bee84ac531be9f9
+SIZE (dislin-9.1.fbsd-5.4.tar.gz) = 10700898
diff --git a/math/dislin/distinfo-6.0 b/math/dislin/distinfo-6.0
index 2bcac0d13108..090924c58cf1 100644
--- a/math/dislin/distinfo-6.0
+++ b/math/dislin/distinfo-6.0
@@ -1,3 +1,3 @@
-MD5 (dislin-9.0.fbsd-6.0.tar.gz) = ef2f76b77c3976d60756b497bba38c3c
-SHA256 (dislin-9.0.fbsd-6.0.tar.gz) = 53a6a95e6459d4bc2e89c1edca7a2b6dea29c334d7196750f003d89bca45b788
-SIZE (dislin-9.0.fbsd-6.0.tar.gz) = 13446773
+MD5 (dislin-9.1.fbsd-6.0.tar.gz) = 37c0d9a2cb72a0f15869c24f76c00533
+SHA256 (dislin-9.1.fbsd-6.0.tar.gz) = c2a0f1f06025f64f6e0451abae02ae38c7c53f7e92ea620098495920c3ab728d
+SIZE (dislin-9.1.fbsd-6.0.tar.gz) = 10712314
diff --git a/math/dislin/files/pkg-message.in b/math/dislin/files/pkg-message.in
index 5f47813461ea..1c3367f235ff 100644
--- a/math/dislin/files/pkg-message.in
+++ b/math/dislin/files/pkg-message.in
@@ -1,3 +1,9 @@
+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
diff --git a/math/dislin/pkg-plist b/math/dislin/pkg-plist
index da18e80993ef..da2e9a05163d 100644
--- a/math/dislin/pkg-plist
+++ b/math/dislin/pkg-plist
@@ -126,10 +126,6 @@ dislin/lib/dislin-%%VER%%.a
 dislin/lib/dislin-%%VER%%.so
 dislin/lib/dislin_d-%%VER%%.a
 dislin/lib/dislin_d-%%VER%%.so
-dislin/lib/dislnc-%%VER%%.a
-dislin/lib/dislnc-%%VER%%.so
-dislin/lib/dislnc_d-%%VER%%.a
-dislin/lib/dislnc_d-%%VER%%.so
 dislin/libdisjava.so
 dislin/libdisjava.so.8
 dislin/libdisjava.so.9
@@ -231,6 +227,11 @@ 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
+lib/libdislin_d.so.%%MAJ%%
 @dirrm dislin/real64
 @dirrm dislin/python
 @dirrm dislin/perl