Update to version 4.1r2.

PR:		6784
Submitted by:	maintainer

6 files changed, 20 insertions, 44 deletions

diff --git a/graphics/hdf/Makefile b/graphics/hdf/Makefile
index 107cc1ab2477..a27f3eca57f5 100644
--- a/graphics/hdf/Makefile
+++ b/graphics/hdf/Makefile
@@ -1,22 +1,23 @@
 # New ports collection makefile for:	HDF_lib
-# Version required:	4.1r1
+# Version required:	4.1r2
 # Date created:		17 November 1996
 # Whom:			mi
 #
-# $Id: Makefile,v 1.2 1998/04/01 02:04:04 asami Exp $
+# $Id: Makefile,v 1.3 1998/04/08 12:53:43 tg Exp $
 #
 
-DISTNAME=	HDF4.1r1
-PKGNAME=	hdf-4.1r1
+DISTNAME=	HDF4.1r2
+PKGNAME=	hdf-4.1r2
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.ncsa.uiuc.edu/HDF/HDF4.1r1/tar/
+MASTER_SITES=	ftp://ftp.ncsa.uiuc.edu/HDF/HDF4.1r2/tar/
 
 MAINTAINER=	mi@aldan.ziplink.net
 
 LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg
 
 GNU_CONFIGURE=	yes
-MAKE_FLAGS=	CC="$(CC)" -f
+FC?=		f77 # Can also be g77 for the newer one
+MAKE_FLAGS=	CC="$(CC)" FC="${FC}" -f
 
 # This will create dummy Makefiles and some links in the jpeg and libz
 # subdirectories. This way, we do not need to hunt all the dependencies
@@ -49,7 +50,7 @@ pre-build:
 	printf '\nclean:\n\ttrue\n' >> ${WRKSRC}/hdf/zlib/Makefile
 	printf '\ninstall-lib:\n\ttrue\n' >> ${WRKSRC}/hdf/zlib/Makefile
 	printf '\ninstall:\n\ttrue\n' >> ${WRKSRC}/hdf/zlib/Makefile
-	-ln -s /usr/lib/libz* ${WRKSRC}/hdf/zlib/
+	-ln -s /usr/lib/${BINFORMAT}/libz* ${WRKSRC}/hdf/zlib/
 	-ln -s /usr/include/zconf.h /usr/include/zlib.h ${WRKSRC}/hdf/zlib/
 
 post-install:
@@ -63,6 +64,6 @@ post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
 
 test:
-	cd ${WRKSRC}; make $@
+	cd ${WRKSRC}; make ${MAKE_FLAGS} ${MAKEFILE} test
 
 .include <bsd.port.mk>
diff --git a/graphics/hdf/distinfo b/graphics/hdf/distinfo
index cb7643c276d2..da49d2737e3e 100644
--- a/graphics/hdf/distinfo
+++ b/graphics/hdf/distinfo
@@ -1 +1 @@
-MD5 (HDF4.1r1.tar.gz) = d9a759acc62d8d290b84d3ca7a0a6a2c
+MD5 (HDF4.1r2.tar.gz) = 52814865529791e3a39637fd851a7143
diff --git a/graphics/hdf/pkg-plist b/graphics/hdf/pkg-plist
index 78c422777698..358107e75ad5 100644
--- a/graphics/hdf/pkg-plist
+++ b/graphics/hdf/pkg-plist
@@ -71,19 +71,6 @@ include/tbbt.h
 include/vattr.h
 include/vg.h
 man/man1/hdf.1.gz
-man/man1/hdfls.1.gz
-man/man1/hdfpack.1.gz
 man/man1/hdfunpac.1.gz
-man/man1/hdp.1.gz
 man/man1/ncdump.1.gz
 man/man1/ncgen.1.gz
-man/man1/ristosds.1.gz
-man/man3/hxsetcreatedir.3.gz
-man/man3/hxsetdir.3.gz
-man/man3/mfan.3.gz
-man/man3/netcdf.3.gz
-man/man3/netcdf.3f.gz
-man/man3/sdisdimval_bwcomp.3.gz
-man/man3/sdsetaccesstype.3.gz
-man/man3/sdsetdimval_comp.3.gz
-man/man3/vssetexternalfile.3.gz
diff --git a/graphics/hdf5/Makefile b/graphics/hdf5/Makefile
index 107cc1ab2477..a27f3eca57f5 100644
--- a/graphics/hdf5/Makefile
+++ b/graphics/hdf5/Makefile
@@ -1,22 +1,23 @@
 # New ports collection makefile for:	HDF_lib
-# Version required:	4.1r1
+# Version required:	4.1r2
 # Date created:		17 November 1996
 # Whom:			mi
 #
-# $Id: Makefile,v 1.2 1998/04/01 02:04:04 asami Exp $
+# $Id: Makefile,v 1.3 1998/04/08 12:53:43 tg Exp $
 #
 
-DISTNAME=	HDF4.1r1
-PKGNAME=	hdf-4.1r1
+DISTNAME=	HDF4.1r2
+PKGNAME=	hdf-4.1r2
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.ncsa.uiuc.edu/HDF/HDF4.1r1/tar/
+MASTER_SITES=	ftp://ftp.ncsa.uiuc.edu/HDF/HDF4.1r2/tar/
 
 MAINTAINER=	mi@aldan.ziplink.net
 
 LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg
 
 GNU_CONFIGURE=	yes
-MAKE_FLAGS=	CC="$(CC)" -f
+FC?=		f77 # Can also be g77 for the newer one
+MAKE_FLAGS=	CC="$(CC)" FC="${FC}" -f
 
 # This will create dummy Makefiles and some links in the jpeg and libz
 # subdirectories. This way, we do not need to hunt all the dependencies
@@ -49,7 +50,7 @@ pre-build:
 	printf '\nclean:\n\ttrue\n' >> ${WRKSRC}/hdf/zlib/Makefile
 	printf '\ninstall-lib:\n\ttrue\n' >> ${WRKSRC}/hdf/zlib/Makefile
 	printf '\ninstall:\n\ttrue\n' >> ${WRKSRC}/hdf/zlib/Makefile
-	-ln -s /usr/lib/libz* ${WRKSRC}/hdf/zlib/
+	-ln -s /usr/lib/${BINFORMAT}/libz* ${WRKSRC}/hdf/zlib/
 	-ln -s /usr/include/zconf.h /usr/include/zlib.h ${WRKSRC}/hdf/zlib/
 
 post-install:
@@ -63,6 +64,6 @@ post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
 
 test:
-	cd ${WRKSRC}; make $@
+	cd ${WRKSRC}; make ${MAKE_FLAGS} ${MAKEFILE} test
 
 .include <bsd.port.mk>
diff --git a/graphics/hdf5/distinfo b/graphics/hdf5/distinfo
index cb7643c276d2..da49d2737e3e 100644
--- a/graphics/hdf5/distinfo
+++ b/graphics/hdf5/distinfo
@@ -1 +1 @@
-MD5 (HDF4.1r1.tar.gz) = d9a759acc62d8d290b84d3ca7a0a6a2c
+MD5 (HDF4.1r2.tar.gz) = 52814865529791e3a39637fd851a7143
diff --git a/graphics/hdf5/pkg-plist b/graphics/hdf5/pkg-plist
index 78c422777698..358107e75ad5 100644
--- a/graphics/hdf5/pkg-plist
+++ b/graphics/hdf5/pkg-plist
@@ -71,19 +71,6 @@ include/tbbt.h
 include/vattr.h
 include/vg.h
 man/man1/hdf.1.gz
-man/man1/hdfls.1.gz
-man/man1/hdfpack.1.gz
 man/man1/hdfunpac.1.gz
-man/man1/hdp.1.gz
 man/man1/ncdump.1.gz
 man/man1/ncgen.1.gz
-man/man1/ristosds.1.gz
-man/man3/hxsetcreatedir.3.gz
-man/man3/hxsetdir.3.gz
-man/man3/mfan.3.gz
-man/man3/netcdf.3.gz
-man/man3/netcdf.3f.gz
-man/man3/sdisdimval_bwcomp.3.gz
-man/man3/sdsetaccesstype.3.gz
-man/man3/sdsetdimval_comp.3.gz
-man/man3/vssetexternalfile.3.gz