- Upgrade to 9.0, and add a distribution for FreeBSD-5.4 and 6.0.

- Define RESTRICTED.

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

Notified by:	Helmut Michels <michels (at) mps.mpg.de> (Author)

6 files changed, 24 insertions, 22 deletions

diff --git a/math/dislin/Makefile b/math/dislin/Makefile
index 258ea20061aa..94aa88442c20 100644
--- a/math/dislin/Makefile
+++ b/math/dislin/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	dislin
-PORTVERSION=	8.4
-PORTREVISION=	1
+PORTVERSION=	9.0
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.gwdg.de/pub/grafik/dislin/unix/
 DISTNAME=	${PORTNAME}-${PORTVERSION}.fbsd${BINVER}
@@ -15,6 +14,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}.fbsd${BINVER}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A scientific data plotting package
 
+RESTRICTED=	"free for non-commercial use."
 ONLY_FOR_ARCHS=	i386
 USE_XLIB=	yes
 NO_BUILD=	yes
@@ -27,21 +27,16 @@ 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	\
-		dishpj disimg disman dismov disprv distif dlink f2clink gclhelp	\
-		gclhlp gclman
+		disimg disman dismov distif dlink f2clink gclhelp gclhlp gclman
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 501000
-BINVER=		-5.1
-.endif
-
-.if ${OSVERSION} >= 501111
-LIB_DEPENDS+=	m.2:${PORTSDIR}/misc/compat4x
+.if ${OSVERSION} > 500000 && ${OSVERSION} < 600000
+BINVER=		-5.4
 .endif
 
 .if ${OSVERSION} >= 600000
-LIB_DEPENDS+=	c.5:${PORTSDIR}/misc/compat5x
+BINVER=		-6.0
 .endif
 
 do-install:
diff --git a/math/dislin/distinfo b/math/dislin/distinfo
index e413bc6d5e38..f55751bc0db1 100644
--- a/math/dislin/distinfo
+++ b/math/dislin/distinfo
@@ -1,2 +1,3 @@
-MD5 (dislin-8.4.fbsd.tar.gz) = 80cfe47e125a0e716a63191542b3e851
-SIZE (dislin-8.4.fbsd.tar.gz) = 12577491
+MD5 (dislin-9.0.fbsd.tar.gz) = 0b7d30ff4f2d40abc0edc3b849b6804a
+SHA256 (dislin-9.0.fbsd.tar.gz) = 80afdfea667e930fcee11ec3feeaea119ea6b3eb8bf7f7825a475a27e66a678e
+SIZE (dislin-9.0.fbsd.tar.gz) = 13422774
diff --git a/math/dislin/distinfo-5.1 b/math/dislin/distinfo-5.1
deleted file mode 100644
index 008a203bbca2..000000000000
--- a/math/dislin/distinfo-5.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (dislin-8.4.fbsd-5.1.tar.gz) = 73ac79673d2aa3e05f9ff6d99f47ad79
-SIZE (dislin-8.4.fbsd-5.1.tar.gz) = 12411041
diff --git a/math/dislin/distinfo-5.4 b/math/dislin/distinfo-5.4
new file mode 100644
index 000000000000..0e242334bdab
--- /dev/null
+++ b/math/dislin/distinfo-5.4
@@ -0,0 +1,3 @@
+MD5 (dislin-9.0.fbsd-5.4.tar.gz) = 701455db44e5eed26961060d0cbf6e7c
+SHA256 (dislin-9.0.fbsd-5.4.tar.gz) = db900b83fb4485de032130b962b2fcc427314b2a607be1ff15d037f177bdb90e
+SIZE (dislin-9.0.fbsd-5.4.tar.gz) = 13425328
diff --git a/math/dislin/distinfo-6.0 b/math/dislin/distinfo-6.0
new file mode 100644
index 000000000000..5aae6d625016
--- /dev/null
+++ b/math/dislin/distinfo-6.0
@@ -0,0 +1,3 @@
+MD5 (dislin-9.0.fbsd-6.0.tar.gz) = 1c6646beb8076e43b43fcb9b4b7104ee
+SHA256 (dislin-9.0.fbsd-6.0.tar.gz) = faf378bf503fdf66d79c07400cf4ca69d7e200386cd605745b95970a0c65c654
+SIZE (dislin-9.0.fbsd-6.0.tar.gz) = 13425061
diff --git a/math/dislin/pkg-plist b/math/dislin/pkg-plist
index 302c9d9ce3c6..da18e80993ef 100644
--- a/math/dislin/pkg-plist
+++ b/math/dislin/pkg-plist
@@ -6,11 +6,9 @@ bin/disdrv_w
 bin/disgcl
 bin/disgif
 bin/dishlp
-bin/dishpj
 bin/disimg
 bin/disman
 bin/dismov
-bin/disprv
 bin/distif
 bin/dlink
 bin/f2clink
@@ -27,12 +25,10 @@ dislin/bin/disdrv_w
 dislin/bin/disgcl
 dislin/bin/disgif
 dislin/bin/dishlp
-dislin/bin/dishpj
 dislin/bin/disimg
 dislin/bin/dislin.sh
 dislin/bin/disman
 dislin/bin/dismov
-dislin/bin/disprv
 dislin/bin/distif
 dislin/bin/dlink
 dislin/bin/f2clink
@@ -128,25 +124,31 @@ dislin/java/vectors.java
 dislin/java/world.java
 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.7
 dislin/libdisjava.so.8
+dislin/libdisjava.so.9
 dislin/libdislin.a
 dislin/libdislin.so
-dislin/libdislin.so.7
 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.7
 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/man/appa.txt
 dislin/man/appb.txt
 dislin/man/appc.txt