Linux binaries for version 8.2 are unfetchable, then switch to native

FreeBSD binaries for version 8.3 (i386 only).

Note: does not run on FreeBSD >= 6.0, because linked with libc.so.5.

PR:		84366
Submitted by:	thierry
Repocopied by:	marcus

9 files changed, 72 insertions, 252 deletions

diff --git a/math/dislin/Makefile b/math/dislin/Makefile
index 62382df2ed00..20cb2ee8b427 100644
--- a/math/dislin/Makefile
+++ b/math/dislin/Makefile
@@ -6,41 +6,40 @@
 #
 
 PORTNAME=	dislin
-PORTVERSION=	8.2
-PORTREVISION=	2
-CATEGORIES=	math linux
-MASTER_SITES=	ftp://ftp.gwdg.de/pub/grafik/dislin/linux/${MACHINE_ARCH}/
-PKGNAMEPREFIX=	linux-
-EXTRACT_SUFX=	.linux.tar.gz
-DIST_SUBDIR=	${MACHINE_ARCH}
+PORTVERSION=	8.3
+CATEGORIES=	math
+MASTER_SITES=	ftp://ftp.gwdg.de/pub/grafik/dislin/unix/
+DISTNAME=	${PORTNAME}-${PORTVERSION}.fbsd${BINVER}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A scientific data plotting package
 
-BROKEN=		Unfetchable
-DEPRECATED=	${BROKEN}
-EXPIRATION_DATE=2005-09-22
-
-ONLY_FOR_ARCHS=	i386 alpha
-USE_LINUX=	yes
-USE_X_PREFIX=	yes
+ONLY_FOR_ARCHS=	i386
+USE_XLIB=	yes
 NO_BUILD=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 LDCONFIG_DIRS=	${DISLIN_DIR}/lib
 
-MD5_FILE=	${MASTERDIR}/distinfo.${MACHINE_ARCH}
-PLIST=		${PKGDIR}/pkg-plist.${MACHINE_ARCH}
+MD5_FILE=	${MASTERDIR}/distinfo${BINVER}
+PLIST_SUB=	VER=${PORTVERSION}
+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 disgif dishlp dishpj \
-		disimg disman dismov disprv distif dlink f2clink g77link
+PROGRAMS=	clink disaps disdrv disdrv_nw disdrv_w disgcl disgif dishlp	\
+		dishpj disimg disman dismov disprv distif dlink f2clink gclhelp	\
+		gclhlp gclman
+
+.include <bsd.port.pre.mk>
 
-do-configure:
-	${SED} -e 's,%%DISLIN_DIR%%,${DISLIN_DIR},' \
-	    <${FILESDIR}/dislin-wrapper.sh >${WRKDIR}/dislin.sh
-	${SED} -e 's,%%DISLIN_DIR%%,${DISLIN_DIR},' \
-	    <${FILESDIR}/pkg-message >${WRKDIR}/pkg-message
+.if ${OSVERSION} >= 501000
+BINVER=		-5.1
+.endif
 
-# XXX: this is missing "${BRANDELF} -t Linux <executable>"
+.if ${OSVERSION} >= 600000
+BROKEN=		"uses libc.so.5"
+#LIB_DEPENDS+=      c.5:${PORTSDIR}/misc/compat5x
+.endif
 
 do-install:
 	(cd ${WRKSRC} && ${ENV} DISLIN=${DISLIN_DIR} ${SH} INSTALL)
@@ -50,6 +49,6 @@ do-install:
 .endfor
 
 post-install:
-	${CAT} ${PKGMESSAGE}
+	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/math/dislin/distinfo b/math/dislin/distinfo
new file mode 100644
index 000000000000..ad5537d6d7ff
--- /dev/null
+++ b/math/dislin/distinfo
@@ -0,0 +1,2 @@
+MD5 (dislin-8.3.fbsd.tar.gz) = 678a18f38a876a235e6e1bef1dc09405
+SIZE (dislin-8.3.fbsd.tar.gz) = 12516450
diff --git a/math/dislin/distinfo-5.1 b/math/dislin/distinfo-5.1
new file mode 100644
index 000000000000..2ac6a1847be2
--- /dev/null
+++ b/math/dislin/distinfo-5.1
@@ -0,0 +1,2 @@
+MD5 (dislin-8.3.fbsd-5.1.tar.gz) = c335f56ad470e5ca8a4c4a5bf3d8468e
+SIZE (dislin-8.3.fbsd-5.1.tar.gz) = 12392769
diff --git a/math/dislin/distinfo.alpha b/math/dislin/distinfo.alpha
deleted file mode 100644
index 4d9cdccaafa9..000000000000
--- a/math/dislin/distinfo.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (alpha/dislin-8.2.linux.tar.gz) = 10a402312288ef1e9450f1175ce4796e
-SIZE (alpha/dislin-8.2.linux.tar.gz) = 13544661
diff --git a/math/dislin/distinfo.i386 b/math/dislin/distinfo.i386
deleted file mode 100644
index 3d8512768e1d..000000000000
--- a/math/dislin/distinfo.i386
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (i386/dislin-8.2.linux.tar.gz) = eb45a9a0236f74096034fc6b3a1bad11
-SIZE (i386/dislin-8.2.linux.tar.gz) = 7477283
diff --git a/math/dislin/files/dislin-wrapper.sh b/math/dislin/files/dislin.sh.in
index 3292b671be6a..3292b671be6a 100644
--- a/math/dislin/files/dislin-wrapper.sh
+++ b/math/dislin/files/dislin.sh.in
diff --git a/math/dislin/files/pkg-message b/math/dislin/files/pkg-message.in
index 5f47813461ea..5f47813461ea 100644
--- a/math/dislin/files/pkg-message
+++ b/math/dislin/files/pkg-message.in
diff --git a/math/dislin/pkg-plist.i386 b/math/dislin/pkg-plist
index 2b73c8149c3f..302c9d9ce3c6 100644
--- a/math/dislin/pkg-plist.i386
+++ b/math/dislin/pkg-plist
@@ -3,6 +3,7 @@ bin/disaps
 bin/disdrv
 bin/disdrv_nw
 bin/disdrv_w
+bin/disgcl
 bin/disgif
 bin/dishlp
 bin/dishpj
@@ -13,7 +14,9 @@ bin/disprv
 bin/distif
 bin/dlink
 bin/f2clink
-bin/g77link
+bin/gclhelp
+bin/gclhlp
+bin/gclman
 dislin/DISLIN
 dislin/README
 dislin/bin/clink
@@ -21,6 +24,7 @@ dislin/bin/disaps
 dislin/bin/disdrv
 dislin/bin/disdrv_nw
 dislin/bin/disdrv_w
+dislin/bin/disgcl
 dislin/bin/disgif
 dislin/bin/dishlp
 dislin/bin/dishpj
@@ -32,7 +36,9 @@ dislin/bin/disprv
 dislin/bin/distif
 dislin/bin/dlink
 dislin/bin/f2clink
-dislin/bin/g77link
+dislin/bin/gclhelp
+dislin/bin/gclhlp
+dislin/bin/gclman
 dislin/device.dat
 dislin/dislin.h
 dislin/dislin.log
@@ -52,6 +58,29 @@ dislin/fonts/simplx10.bdf
 dislin/fonts/simplx12.bdf
 dislin/fonts/simplx14.bdf
 dislin/fonts/simplx8.bdf
+dislin/gcldir/bars.gcl
+dislin/gcldir/color3d.gcl
+dislin/gcldir/conshd.gcl
+dislin/gcldir/contour.gcl
+dislin/gcldir/curve.gcl
+dislin/gcldir/legend.gcl
+dislin/gcldir/pie.gcl
+dislin/gcldir/plot.gcl
+dislin/gcldir/plot.ini
+dislin/gcldir/plot3.gcl
+dislin/gcldir/plot3.ini
+dislin/gcldir/plot3cb.gcl
+dislin/gcldir/plot3r.gcl
+dislin/gcldir/plot3r.ini
+dislin/gcldir/plot3rcb.gcl
+dislin/gcldir/plotcb.gcl
+dislin/gcldir/scattr.gcl
+dislin/gcldir/scattr.ini
+dislin/gcldir/scattrcb.gcl
+dislin/gcldir/surface.gcl
+dislin/gcldir/surface2.gcl
+dislin/gcldir/widgets.gcl
+dislin/gcldir/world.gcl
 dislin/hlp/gclhlp0.txt
 dislin/hlp/gclhlp1.txt
 dislin/hlp/gclhlp2.txt
@@ -82,9 +111,8 @@ dislin/java/color3d.java
 dislin/java/conshd.java
 dislin/java/contour.java
 dislin/java/curve.java
-dislin/java/disjava-8.1.so
-dislin/java/disjava-8.2.so
-dislin/java/dislin-8.2.java.tar.gz
+dislin/java/disjava-%%VER%%.so
+dislin/java/dislin-%%VER%%.java.tar.gz
 dislin/java/dislin.jar
 dislin/java/intpol.java
 dislin/java/legend.java
@@ -98,12 +126,12 @@ dislin/java/surfcp.java
 dislin/java/symbols.java
 dislin/java/vectors.java
 dislin/java/world.java
-dislin/lib/dislin-8.2.a
-dislin/lib/dislin-8.2.so
-dislin/lib/dislin_d-8.2.so
-dislin/lib/dislnc-8.2.a
-dislin/lib/dislnc-8.2.so
-dislin/lib/dislnc_d-8.2.so
+dislin/lib/dislin-%%VER%%.a
+dislin/lib/dislin-%%VER%%.so
+dislin/lib/dislin_d-%%VER%%.so
+dislin/lib/dislnc-%%VER%%.a
+dislin/lib/dislnc-%%VER%%.so
+dislin/lib/dislnc_d-%%VER%%.so
 dislin/libdisjava.so
 dislin/libdisjava.so.7
 dislin/libdisjava.so.8
@@ -158,6 +186,7 @@ dislin/man/kap9.txt
 dislin/map/map1.dat
 dislin/map/map2.dat
 dislin/map/map3.dat
+dislin/map/map4.dat
 dislin/perl/Dislin.pm
 dislin/perl/Dislin.so
 dislin/perl/areaf.pl
@@ -165,7 +194,7 @@ dislin/perl/color3d.pl
 dislin/perl/conshd.pl
 dislin/perl/contour.pl
 dislin/perl/curve.pl
-dislin/perl/dislin-8.2.perl.tar.gz
+dislin/perl/dislin-%%VER%%.perl.tar.gz
 dislin/perl/intpol.pl
 dislin/perl/legend.pl
 dislin/perl/logscl.pl
@@ -184,7 +213,7 @@ dislin/python/color3d.py
 dislin/python/conshd.py
 dislin/python/contour.py
 dislin/python/curve.py
-dislin/python/dislin-8.2.python.tar.gz
+dislin/python/dislin-%%VER%%.python.tar.gz
 dislin/python/dislinmodule.so
 dislin/python/intpol.py
 dislin/python/legend.py
@@ -208,6 +237,7 @@ dislin/real64/dislin.h
 @dirrm dislin/lib
 @dirrm dislin/java
 @dirrm dislin/hlp
+@dirrm dislin/gcldir
 @dirrm dislin/fonts
 @dirrm dislin/examples
 @dirrm dislin/bin
diff --git a/math/dislin/pkg-plist.alpha b/math/dislin/pkg-plist.alpha
deleted file mode 100644
index 72ce9d115766..000000000000
--- a/math/dislin/pkg-plist.alpha
+++ /dev/null
@@ -1,209 +0,0 @@
-bin/clink
-bin/disaps
-bin/disdrv
-bin/disdrv_nw
-bin/disdrv_w
-bin/disgif
-bin/dishlp
-bin/dishpj
-bin/disimg
-bin/disman
-bin/dismov
-bin/disprv
-bin/distif
-bin/dlink
-bin/f2clink
-bin/g77link
-dislin/DISLIN
-dislin/README
-dislin/bin/clink
-dislin/bin/disaps
-dislin/bin/disdrv
-dislin/bin/disdrv_nw
-dislin/bin/disdrv_w
-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
-dislin/bin/g77link
-dislin/device.dat
-dislin/dislin.h
-dislin/dislin.log
-dislin/examples/exa_c.c
-dislin/examples/exa_f77.f
-dislin/examples/map_c.c
-dislin/examples/map_f77.f
-dislin/fonts/complx10.bdf
-dislin/fonts/complx12.bdf
-dislin/fonts/complx14.bdf
-dislin/fonts/complx18.bdf
-dislin/fonts/helve10.bdf
-dislin/fonts/helve12.bdf
-dislin/fonts/helve14.bdf
-dislin/fonts/helve18.bdf
-dislin/fonts/simplx10.bdf
-dislin/fonts/simplx12.bdf
-dislin/fonts/simplx14.bdf
-dislin/fonts/simplx8.bdf
-dislin/hlp/gclhlp0.txt
-dislin/hlp/gclhlp1.txt
-dislin/hlp/gclhlp2.txt
-dislin/hlp/gclhlp3.txt
-dislin/hlp/gclhlp4.txt
-dislin/hlp/gclhlp5.txt
-dislin/hlp/gclhlp6.txt
-dislin/hlp/gclhlp7.txt
-dislin/hlp/hlp0.txt
-dislin/hlp/hlp10.txt
-dislin/hlp/hlp11.txt
-dislin/hlp/hlp12.txt
-dislin/hlp/hlp13.txt
-dislin/hlp/hlp14.txt
-dislin/hlp/hlp15.txt
-dislin/hlp/hlp16.txt
-dislin/hlp/hlp3.txt
-dislin/hlp/hlp4.txt
-dislin/hlp/hlp5.txt
-dislin/hlp/hlp6.txt
-dislin/hlp/hlp6_1.txt
-dislin/hlp/hlp6_2.txt
-dislin/hlp/hlp7.txt
-dislin/hlp/hlp8.txt
-dislin/hlp/hlp9.txt
-dislin/java/areaf.java
-dislin/java/color3d.java
-dislin/java/conshd.java
-dislin/java/contour.java
-dislin/java/curve.java
-dislin/java/dislin-8.2.java.tar.gz
-dislin/java/dislin.jar
-dislin/java/intpol.java
-dislin/java/legend.java
-dislin/java/logscl.java
-dislin/java/map.java
-dislin/java/piegrf.java
-dislin/java/polar.java
-dislin/java/styles.java
-dislin/java/surface.java
-dislin/java/surfcp.java
-dislin/java/symbols.java
-dislin/java/vectors.java
-dislin/java/world.java
-dislin/lib/dislin-8.2.a
-dislin/lib/dislin-8.2.so
-dislin/lib/dislin_d-8.2.so
-dislin/lib/dislnc-8.2.a
-dislin/lib/dislnc-8.2.so
-dislin/lib/dislnc_d-8.2.so
-dislin/libdislin.a
-dislin/libdislin.so
-dislin/libdislin.so.7
-dislin/libdislin.so.8
-dislin/libdislin_d.so
-dislin/libdislin_d.so.8
-dislin/libdislnc.a
-dislin/libdislnc.so
-dislin/libdislnc.so.7
-dislin/libdislnc.so.8
-dislin/libdislnc_d.so
-dislin/libdislnc_d.so.8
-dislin/man/appa.txt
-dislin/man/appb.txt
-dislin/man/appc.txt
-dislin/man/contents.txt
-dislin/man/gclman0.txt
-dislin/man/gclman1.txt
-dislin/man/gclman10.txt
-dislin/man/gclman11.txt
-dislin/man/gclman2.txt
-dislin/man/gclman3.txt
-dislin/man/gclman4.txt
-dislin/man/gclman5.txt
-dislin/man/gclman6.txt
-dislin/man/gclman7.txt
-dislin/man/gclman8.txt
-dislin/man/gclman9.txt
-dislin/man/kap0.txt
-dislin/man/kap1.txt
-dislin/man/kap10.txt
-dislin/man/kap11.txt
-dislin/man/kap12.txt
-dislin/man/kap13.txt
-dislin/man/kap14.txt
-dislin/man/kap15.txt
-dislin/man/kap16.txt
-dislin/man/kap2.txt
-dislin/man/kap3.txt
-dislin/man/kap4.txt
-dislin/man/kap5.txt
-dislin/man/kap6.txt
-dislin/man/kap6_1.txt
-dislin/man/kap6_2.txt
-dislin/man/kap6_3.txt
-dislin/man/kap7.txt
-dislin/man/kap8.txt
-dislin/man/kap9.txt
-dislin/map/map1.dat
-dislin/map/map2.dat
-dislin/map/map3.dat
-dislin/perl/Dislin.pm
-dislin/perl/Dislin.so
-dislin/perl/areaf.pl
-dislin/perl/color3d.pl
-dislin/perl/conshd.pl
-dislin/perl/contour.pl
-dislin/perl/curve.pl
-dislin/perl/dislin-8.2.perl.tar.gz
-dislin/perl/intpol.pl
-dislin/perl/legend.pl
-dislin/perl/logscl.pl
-dislin/perl/map.pl
-dislin/perl/piegrf.pl
-dislin/perl/polar.pl
-dislin/perl/styles.pl
-dislin/perl/surface.pl
-dislin/perl/surfcp.pl
-dislin/perl/symbols.pl
-dislin/perl/vectors.pl
-dislin/perl/widgets.pl
-dislin/perl/world.pl
-dislin/python/areaf.py
-dislin/python/color3d.py
-dislin/python/conshd.py
-dislin/python/contour.py
-dislin/python/curve.py
-dislin/python/dislin-8.2.python.tar.gz
-dislin/python/dislinmodule.so
-dislin/python/intpol.py
-dislin/python/legend.py
-dislin/python/logscl.py
-dislin/python/map.py
-dislin/python/piegrf.py
-dislin/python/polar.py
-dislin/python/styles.py
-dislin/python/surface.py
-dislin/python/surfcp.py
-dislin/python/symbols.py
-dislin/python/vectors.py
-dislin/python/widgets.py
-dislin/python/world.py
-dislin/real64/dislin.h
-@dirrm dislin/real64
-@dirrm dislin/python
-@dirrm dislin/perl
-@dirrm dislin/map
-@dirrm dislin/man
-@dirrm dislin/lib
-@dirrm dislin/java
-@dirrm dislin/hlp
-@dirrm dislin/fonts
-@dirrm dislin/examples
-@dirrm dislin/bin
-@dirrm dislin