55 files changed, 340 insertions, 1899 deletions

diff --git a/graphics/Makefile b/graphics/Makefile
index 968089b5756b..bc64263abdd4 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -119,6 +119,7 @@
     SUBDIR += gview
     SUBDIR += gxanim
     SUBDIR += hdf
+    SUBDIR += hdf5
     SUBDIR += hgl
     SUBDIR += hobbes-icons-xpm
     SUBDIR += hppsmtools
diff --git a/graphics/hdf5/Makefile b/graphics/hdf5/Makefile
index d2be7566329f..42a21b0b35dc 100644
--- a/graphics/hdf5/Makefile
+++ b/graphics/hdf5/Makefile
@@ -1,37 +1,30 @@
-# New ports collection makefile for:	HDF_lib
-# Date created:		17 November 1996
-# Whom:			mi
+# ex:ts=8
+# New ports collection makefile for:	HDF5
+# Date created:			Jul 7, 2002
+# Whom:				ijliao
 #
 # $FreeBSD$
 #
 
-PORTNAME=	hdf
-PORTVERSION=	4.1r5
+PORTNAME=	hdf5
+PORTVERSION=	1.4.4
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.ncsa.uiuc.edu/HDF/HDF/HDF${PORTVERSION}/tar/
-DISTNAME=	HDF${PORTVERSION}
+MASTER_SITES=	ftp://hdf.ncsa.uiuc.edu/HDF5/hdf5-${PORTVERSION}/src/
 
-MAINTAINER=	mi@aldan.algebra.com
+MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
-
-MAN1=		hdf.1 hdfunpac.1 ncdump.1 ncgen.1
-MAN3=		gr_chunk.3
-MANCOMPRESSED=	maybe
-
-MAKE_ARGS=	PREFIX="${PREFIX}" -j 2
+USE_REINPLACE=	yes
+USE_PERL5=	yes
+USE_OPENSSL=	yes
+USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS}"
+CONFIGURE_ARGS=	--enable-cxx --enable-production \
+		--enable-threadsafe --disable-debug \
+		--with-ssl --with-pthread
+INSTALLS_SHLIB=	yes
 
 post-patch:
-	${RM} -rf ${WRKSRC}/hdf/jpeg
-	${RM} -rf ${WRKSRC}/hdf/zlib
-
-do-configure:
-	${CP} -rp ${FILESDIR}/Makefile ${FILESDIR}/hdf \
-		${FILESDIR}/mfhdf ${FILESDIR}/man ${WRKSRC}
-	${LN} -s config/netcdf-fbsd.h ${WRKSRC}/mfhdf/libsrc/netcdf.h
-	${LN} -s netcdf-fbsd.inc ${WRKSRC}/mfhdf/fortran/config/netcdf.inc
-
-test: build
-	cd ${WRKSRC}; ${MAKE} test
+	@${REINPLACE_CMD} -e "s/-lpthread/${PTHREAD_LIBS}/g" ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/graphics/hdf5/distinfo b/graphics/hdf5/distinfo
index 3ce910a4ad52..cde821405088 100644
--- a/graphics/hdf5/distinfo
+++ b/graphics/hdf5/distinfo
@@ -1 +1 @@
-MD5 (HDF4.1r5.tar.gz) = f90de772dac93195def4a585da176db2
+MD5 (hdf5-1.4.4.tar.gz) = 327fe5a67118b78f0d032065ab4ccb12
diff --git a/graphics/hdf5/files/Makefile b/graphics/hdf5/files/Makefile
deleted file mode 100644
index 0dc23c19cf80..000000000000
--- a/graphics/hdf5/files/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-SUBDIR	 = hdf mfhdf man
-#PREFIX	?= /usr/local
-LIBDIR	?= ${PREFIX}/lib
-BINDIR	?= ${PREFIX}/bin
-
-.MAKEFLAGS: PREFIX=${PREFIX} LIBDIR=${LIBDIR} BINDIR=${BINDIR}
-
-test: all
-	# testing in hdf
-	@cd hdf && ${MAKE} hdf-test
-	# testing in mfhdf
-	@cd mfhdf && ${MAKE} test
-
-.include <bsd.subdir.mk>
diff --git a/graphics/hdf5/files/hdf/Makefile b/graphics/hdf5/files/hdf/Makefile
deleted file mode 100644
index 1f9663c03246..000000000000
--- a/graphics/hdf5/files/hdf/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-SUBDIR	 = src util test
-
-hdf-test: all
-	cd util && ${MAKE} test
-	cd test && ${MAKE} test
-
-.include <bsd.subdir.mk>
diff --git a/graphics/hdf5/files/hdf/src/Makefile b/graphics/hdf5/files/hdf/src/Makefile
deleted file mode 100644
index 45c20b492030..000000000000
--- a/graphics/hdf5/files/hdf/src/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-# $FreeBSD$
-
-LIB=df
-
-# uncomment the line below to avoid building static libraries
-#INTERNALLIB=YES
-LIBDIR=${PREFIX}/lib
-# comment out the line below to build the profile libs
-NOPROFILE=yes
-
-SHLIB_MAJOR=1
-SHLIB_MINOR=0
-
-SRCS=atom.c  bitvect.c  cdeflate.c  cnbit.c  cnone.c  crle.c  cskphuff.c \
-	df24.c  df24f.c dfan.c  dfanf.c dfcomp.c  dfconv.c dff.c  dfgr.c \
-	dfgroup.c  dfimcomp.c  dfjpeg.c  dfkconv.c  dfkcray.c  dfkfuji.c \
-	dfknat.c dfkswap.c dfkvms.c dfp.c  dfpf.c dfr8.c dfr8f.c dfrle.c \
-	dfsd.c dfsdf.c dfstubs.c dfufp2i.c dfunjpeg.c dfutil.c dfutilf.c \
-	dir_mac.c  dynarray.c   glist.c  hbitio.c   hblocks.c  hbuffer.c \
-	hchunks.c hcomp.c hcompri.c  hdfalloc.c herr.c herrf.c hextelt.c \
-	hfile.c hfiledd.c hfilef.c hkit.c linklist.c mcache.c \
-	mfan.c mfanf.c  mfgr.c mfgrf.c mstdio.c tbbt.c  vattr.c vattrf.c \
-	vconv.c  vg.c vgf.c  vgp.c  vhi.c vio.c  vparse.c vrw.c  vsfld.c \
-	df24ff.f  dfanff.f dfff.f  dfpff.f dfr8ff.f  dfsdff.f dfufp2if.f \
-	hfileff.f mfgrff.f vattrff.f vgff.f
-
-CFLAGS	+= -I${PREFIX}/include
-FFLAGS	+= ${CFLAGS}
-
-.if !defined(OSVERSION)
-.if exists(/sbin/sysctl)
-OSVERSION!=	/sbin/sysctl -n kern.osreldate
-.else
-OSVERSION!=	/usr/sbin/sysctl -n kern.osreldate
-.endif
-.endif
-
-.if ${OSVERSION} >= 400004
-LDADD	+= -L${PREFIX}/lib -ljpeg -lg2c -lz -lm
-.else
-LDADD	+= -L${PREFIX}/lib -ljpeg -lf2c -lz
-.endif
-
-afterinstall:
-	install -c -o root -g wheel -m 444 \
-		atom.h  bitvect.h  cdeflate.h   cnbit.h  cnone.h  crle.h \
-		cskphuff.h df.h dfan.h  dfconvrt.h dfgr.h dfi.h dfivms.h \
-		dfrig.h dfsd.h dfstubs.h  dfufp2i.h dir_mac.h dynarray.h \
-		glist.h  hbitio.h  hchunks.h  hcomp.h  hcompi.h  hconv.h \
-		hdf.h hdfi.h  herr.h hfile.h hkit.h  hlimits.h hntdefs.h \
-		hproto.h hqueue.h htags.h linklist.h maldebug.h mcache.h \
-		mfan.h mfgr.h mstdio.h sys_dir_mac.h tbbt.h trace.h \
-		vattr.h vg.h vgint.h hdf.inc dffunc.inc \
-			${PREFIX}/include
-
-.include <bsd.lib.mk>
diff --git a/graphics/hdf5/files/hdf/test/Makefile b/graphics/hdf5/files/hdf/test/Makefile
deleted file mode 100644
index 3a3c8ca98524..000000000000
--- a/graphics/hdf5/files/hdf/test/Makefile
+++ /dev/null
@@ -1,68 +0,0 @@
-# $FreeBSD$
-
-CSRCS= 	rig.c sdstr.c blocks.c an.c anfile.c extelt.c file.c file1.c vers.c \
-	sdmms.c sdnmms.c slab.c litend.c tvset.c comp.c bitio.c tree.c macros.c \
-	conv.c nbit.c man.c mgr.c testhdf.c tbv.c tvsfpack.c chunks.c tvattr.c \
-    buffer.c
-
-COBJS=	${CSRCS:S/.c/.o/g}
-
-FSRCS= fortest.c fortestF.f forsupff.f forsupf.c \
-	manf.f mgrf.f slabwf.f t24f.f tanf.f tanfilef.f tpf.f tr8f.f \
-	tsdmmsf.f tsdnmmsf.f tsdnntf.f tsdntf.f tsdstrf.f tstubsf.f \
-        tvsetf.f, tvattrf.f
-
-FOBJS = fortestF.o forsupff.o forsupf.o \
-	manf.o mgrf.o slabwf.o t24f.o tanf.o tanfilef.o tpf.o tr8f.o \
-	tsdmmsf.o tsdnmmsf.o tsdnntf.o tsdntf.o tsdstrf.o tstubsf.o  \
-        tvsetf.o tvattrf.o
-
-#CFORSUPSRCS = forsupf.c
-
-HDFLIB	 = ${.CURDIR}/../src
-CFLAGS	+= -I${HDFLIB}
-FFLAGS	+= ${CFLAGS} -Nn802 -Nx400
-
-FTESTS = fortest fortestF
-
-all: testhdf $(FTESTS) gentest
-
-#CFORSUPOBJS = forsupf.o
-
-TESTF = fortest.o
-
-# directory used by extelt test.
-TESTDIR = testdir
-
-$(FOBJS): fortest.inc
-
-test: atest-hdf
-
-atest-hdf: testhdf $(FTESTS)
-	-rm -f *.hdf 
-	env LD_LIBRARY_PATH=${.CURDIR}/../src ./testhdf
-	-rm -f *.hdf 
-	env LD_LIBRARY_PATH=${.CURDIR}/../src ./fortest
-
-testhdf: $(COBJS) $(HDFLIB)/libdf.so
-	$(CC) -o testhdf $(COBJS) $(HDFLIB)/libdf.so -lm
-	test -d $(TESTDIR) || mkdir $(TESTDIR)
-
-fortestF: $(FOBJS) $(HDFLIB)/libdf.so
-	$(FC) $(FFLAGS) -o $@ $(FOBJS) $(HDFLIB)/libdf.so -lm
-
-fortest: $(HDFLIB)/libdf.so fortest.c $(CHDRS)
-	$(CC) $(CFLAGS) -o fortest fortest.c $(HDFLIB)/libdf.so -lm
-
-gentest: gentest.c $(HDFLIB)/libdf.so
-	$(CC) $(CFLAGS) gentest.c -o gentest $(HDFLIB)/libdf.so -lm
-
-clean: 
-	-rm -f $(COBJS) testhdf $(FOBJS) $(FTESTS) \
-	core *.hdf ptesthdf qtesthdf gentest *.o fortest.arg $(TESTDIR)/* \
-	.depend
-
-depend: 
-	mkdep ${CFLAGS} ${CSRCS}
-
-install:
diff --git a/graphics/hdf5/files/hdf/util/Makefile b/graphics/hdf5/files/hdf/util/Makefile
deleted file mode 100644
index 6d4ccae200d4..000000000000
--- a/graphics/hdf5/files/hdf/util/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $FreeBSD$
-
-UTILS	 = hdf24to8 hdfcomp hdfls hdfpack hdftopal hdftor8 paltohdf \
-        r8tohdf ristosds  vmake vshow hdf8to24 hdf2jpeg jpeg2hdf fp2hdf \
-	hdfunpac vcompat
-
-all: ${UTILS} hdfed
-
-HEOBJ = he_main.o he_cntrl.o he_disp.o he_file.o
-
-#CFLAGS	+= -I${PREFIX}/include -I${.CURDIR}/../src/
-CFLAGS	+=  -I${.CURDIR}/../src/
-#LDFLAGS	+= -L${PREFIX}/lib -ljpeg -L${.CURDIR}/../src/ -ldf -lz
-LDFLAGS	+= -L${.CURDIR}/../src/ -ldf
-
-hdfed: he.h he_proto.h $(HEOBJ)
-	$(CC) $(HEOBJ) $(LDFLAGS) -o hdfed
-
-test: all fptest
-	env LD_LIBRARY_PATH=${.CURDIR}/../src ./testutil.sh
-
-clean:
-	-rm -f *.o $(UTILS) hdfed fptest
-	-rm -f o* ctx* cb* fptestf .depend
-
-depend:
-	mkdep ${CFLAGS} ${UTILS:S/$/.c/g} ${HEOBJ:S/.o/.c/g}
-
-install: all
-	install -c -s -o root -g wheel -m 555 ${UTILS} hdfed ${BINDIR}
diff --git a/graphics/hdf5/files/man/Makefile b/graphics/hdf5/files/man/Makefile
deleted file mode 100644
index eeea6c1997f7..000000000000
--- a/graphics/hdf5/files/man/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-MANDIR	=	${PREFIX}/man/man
-
-MAN1	=	hdf.1 hdfunpac.1
-MAN3	=	gr_chunk.3
-
-.include <bsd.man.mk>
-
-install: all-man maninstall
-
-clean:
-	-rm -f *.gz
-
-all: all-man
-
-depend:
diff --git a/graphics/hdf5/files/mfhdf/Makefile b/graphics/hdf5/files/mfhdf/Makefile
deleted file mode 100644
index 202766e54f67..000000000000
--- a/graphics/hdf5/files/mfhdf/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $FreeBSD$
-
-SUBDIR		= fortran libsrc ncgen ncdump nctest dumper
-
-.include <bsd.subdir.mk>
-
-test: all
-	@for d in ${SUBDIR} ; do \
-		echo "===> testing in $$d"; \
-		cd $$d; \
-		${MAKE} test; \
-		cd ..; \
-	done
diff --git a/graphics/hdf5/files/mfhdf/dumper/Makefile b/graphics/hdf5/files/mfhdf/dumper/Makefile
deleted file mode 100644
index 1bd8b3dfa744..000000000000
--- a/graphics/hdf5/files/mfhdf/dumper/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $FreeBSD$
-
-PROG		 = hdp
-NOMAN		 = 1
-LDFLAGS		+= -L${.CURDIR}/../libsrc -L${.CURDIR}/../../hdf/src -lmfhdf -ldf
-CFLAGS		+= -I${.CURDIR}/../libsrc -I${.CURDIR}/../../hdf/src
-
-SRCS		=  hdp.c hdp_list.c hdp_sds.c hdp_util.c hdp_vd.c hdp_vg.c hdp_rig.c show.c hdp_dump.c hdp_gr.c
-
-.include <bsd.prog.mk>
-
-test: ${PROG}
-	env LD_LIBRARY_PATH=${.CURDIR}/../libsrc:${.CURDIR}/../../hdf/src sh testhdp.sh
diff --git a/graphics/hdf5/files/mfhdf/fortran/Makefile b/graphics/hdf5/files/mfhdf/fortran/Makefile
deleted file mode 100644
index 03571382ccc3..000000000000
--- a/graphics/hdf5/files/mfhdf/fortran/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# $FreeBSD$
-
-.PATH:	${.CURDIR} ${.CURDIR}/config
-
-all:
-
-NOMAN	 =	1
-
-FFLAGS	+=	${CFLAGS} -DNDEBUG -Nn802 -Nx400
-
-LDFLAGS	+=	-L${.CURDIR}/../libsrc -L${.CURDIR}/../../hdf/src -lmfhdf -ldf
-
-afterinstall:
-	install -c -o root -g wheel -m 444 config/netcdf-fbsd.inc \
-		${PREFIX}/include/netcdf.inc
-
-.include <bsd.prog.mk>
-
-ENVIR	 =	env LD_LIBRARY_PATH=${.CURDIR}/../libsrc:${.CURDIR}/../../hdf/src
-
-CLEANFILES+=	hdftest hdftest.o ftest ftest-fbsd.o
-
-config/netcdf.inc:
-	ln -s netcdf-fbsd.inc config/netcdf.inc
-
-ftest:	ftest-fbsd.f config/netcdf.inc
-	${MAKE} PROG=$@ SRCS=ftest-fbsd.f $@
-
-hdftest: hdftest.f
-	${MAKE} PROG=$@ SRCS=hdftest.f $@
-
-test: ftest hdftest
-	mkdir -p testdir
-	# ================================
-	#  netCDF Fortran interface tests
-	# ================================
-	${ENVIR} ./ftest
-	${ENVIR} ./hdftest > hdfout.new
-	@diff -Bb hdfout.new hdftst.sav && \
-		echo "*** HDF-SD Fortran interface tests passed ***" || \
-		(echo "*** HDF-SD Fortran interface tests failed ***"; \
-		echo "The above differences are OK if small")
diff --git a/graphics/hdf5/files/mfhdf/libsrc/Makefile b/graphics/hdf5/files/mfhdf/libsrc/Makefile
deleted file mode 100644
index 092102faa53c..000000000000
--- a/graphics/hdf5/files/mfhdf/libsrc/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# $FreeBSD$
-
-.PATH:  ${.CURDIR} ${.CURDIR}/../fortran/config ${.CURDIR}/../fortran
-
-SRCS		= array.c attr.c cdf.c dim.c file.c iarray.c error.c \
-		  globdef.c putget.c putgetg.c sharray.c string.c var.c \
-		  hdfsds.c mfsd.c nssdc.c xdrposix.c \
-		  jackets-fbsd.c mfsdf.c mfsdff.f
-
-LIB		= mfhdf
-SHLIB_MAJOR	= 2
-SHLIB_MINOR	= 3
-
-LIBDIR		= ${PREFIX}/lib
-
-# uncomment the line below to avoid building static libraries
-#INTERNALLIB	= Yes
-# comment out the line below to build the profile libs
-NOPROFILE=yes
-
-CFLAGS	+=	-DNDEBUG -DHDF -I${.CURDIR}/../../hdf/src -I${.CURDIR}
-.if ${MACHINE_ARCH} == "i386"
-CFLAGS	+=	-DSWAP
-.endif
-
-LDADD	+=	-L${.CURDIR}/../../hdf/src -ldf
-LDFLAGS	+=	-L. -l${LIB} ${LDADD}
-
-afterinstall:
-	install -c -o root -g wheel -m 444 hdf2netcdf.h local_nc.h \
-		mfhdf.h netcdf.h ${PREFIX}/include
-
-.include <bsd.lib.mk>
-
-test: ${SHLIB_NAME} cdftest hdftest
-	env LD_LIBRARY_PATH=${.CURDIR}:${.CURDIR}/../../hdf/src ./cdftest > cdfout.new
-	@diff cdfout.new testout.sav && \
-		echo "*** netCDF passes formatted test ***" || \
-                (echo "*** netCDF fails formatted test ***" ; \
-                echo "The above differences are OK if small")
-	env LD_LIBRARY_PATH=${.CURDIR}:${.CURDIR}/../../hdf/src ./hdftest > hdfout.new
-	@diff hdfout.new hdfout.sav && \
-		echo "*** HDF passes formatted test ***" || \
-                (echo "*** HDF fails formatted test ***" ; \
-                echo "The above differences are OK if small")
diff --git a/graphics/hdf5/files/mfhdf/ncdump/Makefile b/graphics/hdf5/files/mfhdf/ncdump/Makefile
deleted file mode 100644
index 727b1de60b32..000000000000
--- a/graphics/hdf5/files/mfhdf/ncdump/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $FreeBSD$
-
-PROG		 = ncdump
-MANDIR		 = ${PREFIX}/man/man
-
-LDFLAGS		+= -L${.CURDIR}/../libsrc -L${.CURDIR}/../../hdf/src -lmfhdf -ldf
-CFLAGS		+= -I${.CURDIR}/../libsrc
-SRCS		=  ncdump.c vardata.c dumplib.c
-
-.include <bsd.prog.mk>
-
-ENVIR		= env LD_LIBRARY_PATH=${.CURDIR}/../../hdf/src:${.CURDIR}/../libsrc
-NCGEN		= ${.CURDIR}/../ncgen/ncgen
-
-test:		$(PROG) test0.cdl
-	${ENVIR} $(NCGEN) -o test0.nc -n test0.cdl
-	${ENVIR} ./$(PROG) test0.nc > test1.cdl
-	${ENVIR} $(NCGEN) -o test1.nc -n test1.cdl
-	${ENVIR} ./$(PROG) -n test0 test1.nc > test2.cdl
-	@cmp test1.cdl test2.cdl && \
-	    echo "*** $(PROGRAM) test successful ***" ; \
-	    rm test1.cdl test1.nc test2.cdl
diff --git a/graphics/hdf5/files/mfhdf/ncgen/Makefile b/graphics/hdf5/files/mfhdf/ncgen/Makefile
deleted file mode 100644
index d954137cffa8..000000000000
--- a/graphics/hdf5/files/mfhdf/ncgen/Makefile
+++ /dev/null
@@ -1,72 +0,0 @@
-# $FreeBSD$
-
-PROG		 = ncgen
-MANDIR		 = ${PREFIX}/man/man
-LDFLAGS		+= -L${.CURDIR}/../libsrc -L${.CURDIR}/../../hdf/src -lmfhdf -ldf
-CFLAGS		+= -I${.CURDIR}/../libsrc -I${.CURDIR}/../../hdf/src -DNDEBUG
-SRCS		 = main.c generate.c load.c ncgentab.c escapes.c \
-		  getfill.c init.c close.c genlib.c
-
-ENVIR		 = env LD_LIBRARY_PATH=${.CURDIR}/../libsrc:${.CURDIR}/../../hdf/src
-NCDUMP		 = ${.CURDIR}/../ncdump/ncdump
-
-test:           $(PROG) test0.cdl btest ctest ftest
-
-ncgenyy.c: ncgen.l
-	${LEX} ${LFLAGS} ncgen.l
-	mv lex.yy.c ncgenyy.c
-	
-ncgentab.c: ncgenyy.c ncgen.y
-	${YACC} ${YFLAGS} ncgen.y
-	mv y.tab.c ncgentab.c
-	mv y.tab.h ncgentab.h
-
-.include <bsd.prog.mk>
-
-#
-# test "-b" option of ncgen
-#
-btest:		$(PROG) test0.cdl test1.cdl
-	${ENVIR} ./$(PROG) -b test1.cdl
-	${ENVIR} $(NCDUMP) test1.nc > test2.cdl
-	@diff test1.cdl test2.cdl && \
-	    echo "*** $(PROG) -b test successful ***"
-
-#
-# test "-c" option of ncgen
-#
-ctest:		test1.cdl ctest0
-	${ENVIR} ./ctest0		# tests `-c' option, creates ctest0.nc
-	${ENVIR} $(NCDUMP) -n test1 ctest0.nc > ctest1.cdl
-	@diff test1.cdl ctest1.cdl && \
-	    echo "*** $(PROG) -c test successful ***"
-
-ctest0:		ncgen test0.cdl
-	${ENVIR} ./$(PROG) -c -o ctest0.nc test0.cdl > test0.c
-	$(CC) $(CFLAGS) -o $@ test0.c ${LDFLAGS}
-
-#
-# test "-f" option of ncgen
-#
-ftest:	test1.cdl ftest0
-	${ENVIR} ./ftest0
-	${ENVIR} $(NCDUMP) -n test1 ftest0.nc > ftest1.cdl
-	@if diff test1.cdl ftest1.cdl; then \
-		echo "*** ncgen -f test successful ***"; \
-	else \
-		echo "*** ncgen -f test failed " \
-		    "(but roundoff differences are OK) ***"; \
-	fi
-
-ftest0:	$(PROG) test0.cdl netcdf.inc
-	${ENVIR} ./$(PROG) -f -o ftest0.nc test0.cdl > test0.f; \
-	$(FC) $(FFLAGS) ${CFLAGS} -o $@ test0.f ${LDFLAGS}
-
-test1.cdl:	test0.nc
-	${ENVIR} $(NCDUMP) -n test1 test0.nc > $@
-
-test0.nc:	$(PROG) test0.cdl
-	${ENVIR} ./$(PROG) -b -o test0.nc test0.cdl
-
-netcdf.inc:
-	ln -s ../fortran/config/netcdf-fbsd.inc $@
diff --git a/graphics/hdf5/files/mfhdf/nctest/Makefile b/graphics/hdf5/files/mfhdf/nctest/Makefile
deleted file mode 100644
index 722d3524a482..000000000000
--- a/graphics/hdf5/files/mfhdf/nctest/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $FreeBSD$
-
-PROG		 = nctest
-NOMAN		 = 1
-CFLAGS		+= -I${.CURDIR}/../libsrc
-LDFLAGS		+= -L${.CURDIR}/../libsrc -L${.CURDIR}/../../hdf/src -lmfhdf -ldf
-SRCS		= varget.c vargetg.c varput.c varputg.c vardef.c vartests.c \
-		  vputget.c vputgetg.c driver.c cdftests.c dimtests.c rec.c \
-		  atttests.c misctest.c add.c error.c emalloc.c val.c slabs.c
-
-install:
-
-.include <bsd.prog.mk>
-
-test:		$(PROG)
-	@ echo "==========================="
-	@ echo "netCDF C interface tests"
-	@ echo "==========================="
-	env LD_LIBRARY_PATH=${.CURDIR}/../libsrc:${.CURDIR}/../../hdf/src ./$(PROG)
diff --git a/graphics/hdf5/pkg-descr b/graphics/hdf5/pkg-descr
index 222d6e8bf354..35a0fc9e23cf 100644
--- a/graphics/hdf5/pkg-descr
+++ b/graphics/hdf5/pkg-descr
@@ -1,22 +1,17 @@
-From HDF's manpage:
+HDF5 is a completely new Hierarchical Data Format product consisting of a
+data format specification and a supporting library implementation. HDF5 is
+designed to address some of the limitations of the older HDF product and to
+address current and anticipated requirements of modern systems and
+applications.
 
-       hdf - Hierarchical Data Format library
+HDF5 includes the following improvements.
+   - A new file format designed to address some of the deficiencies of HDF4.x,
+     particularly the need to store larger files and more objects per file.
+   - A simpler, more comprehensive data model that includes only two basic
+     structures: a multidimensional array of record structures, and a grouping
+     structure.
+   - A simpler, better-engineered library and API, with improved support for
+     parallel I/O, threads, and other requirements imposed by modern systems
+     and applications.
 
-Description:
-       HDF  is	a  multi-object  file format that facilitates the
-       transfer of  various  types  of	scientific  data  between
-       machines  and  operating systems.  Machines currently sup-
-       ported  include	the  Cray,  Convex,  HP,  Vax,	Sun,  IBM
-       RS/6000,  Silicon  Graphics, Macintosh, and IBM PC comput-
-       ers.  HDF allows self-definitions of data content and easy
-       extensibility  for  future  enhancements  or compatibility
-       with other standard formats. HDF includes  Fortran  and	C
-       calling	interfaces,and	utilities to prepare raw image of
-       data files or for use with other NCSA software.	 The  HDF
-       library	contains  interfaces  for  storing and retrieving
-       compressed or uncompressed 8-bit and 24-bit raster  images
-       with   palettes,  n-Dimensional	scientific  datasets  and
-       binary tables. An interface is also included  that  allows
-       arbitray grouping of other HDF objects.
-
-WWW: http://hdf.ncsa.uiuc.edu/
+WWW: http://hdf.ncsa.uiuc.edu/HDF5/
diff --git a/graphics/hdf5/pkg-plist b/graphics/hdf5/pkg-plist
index a0ca0c5f4e40..4e37599a505c 100644
--- a/graphics/hdf5/pkg-plist
+++ b/graphics/hdf5/pkg-plist
@@ -1,81 +1,78 @@
-bin/fp2hdf
-bin/hdf24to8
-bin/hdf2jpeg
-bin/hdf8to24
-bin/hdfcomp
-bin/hdfed
-bin/hdfls
-bin/hdfpack
-bin/hdftopal
-bin/hdftor8
-bin/hdfunpac
-bin/hdp
-bin/jpeg2hdf
-bin/ncdump
-bin/ncgen
-bin/paltohdf
-bin/r8tohdf
-bin/ristosds
-bin/vcompat
-bin/vmake
-bin/vshow
-include/atom.h
-include/bitvect.h
-include/cdeflate.h
-include/cnbit.h
-include/cnone.h
-include/crle.h
-include/cskphuff.h
-include/df.h
-include/dfan.h
-include/dfconvrt.h
-include/dffunc.inc
-include/dfgr.h
-include/dfi.h
-include/dfivms.h
-include/dfrig.h
-include/dfsd.h
-include/dfstubs.h
-include/dfufp2i.h
-include/dir_mac.h
-include/dynarray.h
-include/glist.h
-include/hbitio.h
-include/hchunks.h
-include/hcomp.h
-include/hcompi.h
-include/hconv.h
-include/hdf.h
-include/hdf.inc
-include/hdf2netcdf.h
-include/hdfi.h
-include/herr.h
-include/hfile.h
-include/hkit.h
-include/hlimits.h
-include/hntdefs.h
-include/hproto.h
-include/hqueue.h
-include/htags.h
-include/linklist.h
-include/local_nc.h
-include/maldebug.h
-include/mcache.h
-include/mfan.h
-include/mfgr.h
-include/mfhdf.h
-include/mstdio.h
-include/netcdf.h
-include/netcdf.inc
-include/sys_dir_mac.h
-include/tbbt.h
-include/trace.h
-include/vattr.h
-include/vg.h
-include/vgint.h
-lib/libdf.a
-lib/libdf.so
-lib/libdf.so.1
-lib/libmfhdf.a
-lib/libmfhdf.so
-lib/libmfhdf.so.2
+bin/gif2h5
+bin/h52gif
+bin/h5cc
+bin/h5debug
+bin/h5dump
+bin/h5import
+bin/h5ls
+bin/h5perf
+bin/h5redeploy
+bin/h5repart
+include/H5ACpublic.h
+include/H5AbstractDs.h
+include/H5Alltypes.h
+include/H5Apublic.h
+include/H5AtomType.h
+include/H5Attribute.h
+include/H5Bpublic.h
+include/H5Classes.h
+include/H5CommonFG.h
+include/H5CompType.h
+include/H5Cpp.h
+include/H5DataSet.h
+include/H5DataSpace.h
+include/H5DataType.h
+include/H5DcreatProp.h
+include/H5Dpublic.h
+include/H5DxferProp.h
+include/H5EnumType.h
+include/H5Epublic.h
+include/H5Exception.h
+include/H5FDcore.h
+include/H5FDfamily.h
+include/H5FDgass.h
+include/H5FDlog.h
+include/H5FDmpio.h
+include/H5FDmulti.h
+include/H5FDpublic.h
+include/H5FDsec2.h
+include/H5FDsrb.h
+include/H5FDstdio.h
+include/H5FDstream.h
+include/H5FaccProp.h
+include/H5FcreatProp.h
+include/H5File.h
+include/H5FloatType.h
+include/H5Fpublic.h
+include/H5Gpublic.h
+include/H5Group.h
+include/H5HGpublic.h
+include/H5HLpublic.h
+include/H5IdComponent.h
+include/H5Idtemplates.h
+include/H5Include.h
+include/H5IntType.h
+include/H5Ipublic.h
+include/H5Library.h
+include/H5MMpublic.h
+include/H5Object.h
+include/H5Opublic.h
+include/H5Ppublic.h
+include/H5PredType.h
+include/H5PropList.h
+include/H5RefCounter.h
+include/H5Rpublic.h
+include/H5Spublic.h
+include/H5StrType.h
+include/H5Tpublic.h
+include/H5Zpublic.h
+include/H5api_adpt.h
+include/H5pubconf.h
+include/H5public.h
+include/hdf5.h
+lib/libhdf5.a
+lib/libhdf5.la
+lib/libhdf5.settings
+lib/libhdf5.so.0
+lib/libhdf5_cpp.a
+lib/libhdf5_cpp.la
diff --git a/graphics/hdf5/scripts/post-patch b/graphics/hdf5/scripts/post-patch
deleted file mode 100644
index abb1fc2ea1fb..000000000000
--- a/graphics/hdf5/scripts/post-patch
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/sh
-
-for f in `find ${WRKSRC} -type f -name Makefile.in -print | xargs grep -l "^CFLAGS = -ansi -O"`
-do
-patch -p << END_OF_PATCH
---- $f.orig
-+++ $f
-@@ -72,1 +72,1 @@
--CFLAGS = -ansi -O
-+#CFLAGS = -ansi -O
-END_OF_PATCH
-done
-for f in `find ${WRKSRC} -type f -name Makefile.in -print | xargs grep -l "^ZLIB_LIB = "`
-do
-patch -p << END_OF_PATCH
---- $f.orig
-+++ $f
-@@ -72,1 +72,1 @@
--ZLIB_LIB = \$(TOP_SRCDIR)/hdf/zlib/libz.a
-+#ZLIB_LIB = \$(TOP_SRCDIR)/hdf/zlib/libz.a
-END_OF_PATCH
-done
-for f in `find ${WRKSRC} -type f -name Makefile.in -print | xargs grep -l "^JPEG_LIB = "`
-do
-patch -p << END_OF_PATCH
---- $f.orig
-+++ $f
-@@ -72,1 +72,1 @@
--JPEG_LIB = \$(TOP_SRCDIR)/hdf/jpeg/libjpeg.a
-+#JPEG_LIB = \$(TOP_SRCDIR)/hdf/jpeg/libjpeg.a
-END_OF_PATCH
-done
-for f in `find ${WRKSRC} -type f -name Makefile.in -print | xargs grep -l "^ZLIBLIB="`
-do
-patch -p << END_OF_PATCH
---- $f.orig
-+++ $f
-@@ -72,2 +72,2 @@
--ZLIBINC=\$(srcdir)/../zlib
--ZLIBLIB=\$(srcdir)/../zlib
-+ZLIBINC=/usr/include
-+ZLIBLIB=-lz \$(pwrkdir)
-END_OF_PATCH
-done
-
-for f in `find ${WRKSRC} -type f -name Makefile.in -print | xargs grep -l "^ZLIBLIB="`
-do
-patch -p << END_OF_PATCH
---- $f.orig
-+++ $f
-@@ -72,2 +72,2 @@
--ZLIBLIB=\$(srcdir)/../zlib
--ZLIBINC=\$(srcdir)/../zlib
-+ZLIBLIB=-lz
-+ZLIBINC=/usr/include
-END_OF_PATCH
-done
-
-for f in `find ${WRKSRC} -type f -name Makefile.in -print | xargs grep -l "^JPEGLIB="`
-do
-patch -p << END_OF_PATCH
---- $f.orig
-+++ $f
-@@ -72,2 +72,2 @@
--JPEGINC=\$(srcdir)/../jpeg
--JPEGLIB=\$(srcdir)/../jpeg
-+JPEGINC=\$(prefix)/include
-+JPEGLIB=\$(prefix)/lib
-END_OF_PATCH
-done
-
-for f in `find ${WRKSRC} -type f -name Makefile.in -print | xargs grep -l "^JPEGLIB="`
-do
-patch -p << END_OF_PATCH
---- $f.orig
-+++ $f
-@@ -72,2 +72,2 @@
--JPEGLIB=\$(srcdir)/../jpeg
--JPEGINC=\$(srcdir)/../jpeg
-+JPEGLIB=\$(prefix)/lib
-+JPEGINC=\$(prefix)/include
-END_OF_PATCH
-done
diff --git a/science/hdf5-18/Makefile b/science/hdf5-18/Makefile
index d2be7566329f..42a21b0b35dc 100644
--- a/science/hdf5-18/Makefile
+++ b/science/hdf5-18/Makefile
@@ -1,37 +1,30 @@
-# New ports collection makefile for:	HDF_lib
-# Date created:		17 November 1996
-# Whom:			mi
+# ex:ts=8
+# New ports collection makefile for:	HDF5
+# Date created:			Jul 7, 2002
+# Whom:				ijliao
 #
 # $FreeBSD$
 #
 
-PORTNAME=	hdf
-PORTVERSION=	4.1r5
+PORTNAME=	hdf5
+PORTVERSION=	1.4.4
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.ncsa.uiuc.edu/HDF/HDF/HDF${PORTVERSION}/tar/
-DISTNAME=	HDF${PORTVERSION}
+MASTER_SITES=	ftp://hdf.ncsa.uiuc.edu/HDF5/hdf5-${PORTVERSION}/src/
 
-MAINTAINER=	mi@aldan.algebra.com
+MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
-
-MAN1=		hdf.1 hdfunpac.1 ncdump.1 ncgen.1
-MAN3=		gr_chunk.3
-MANCOMPRESSED=	maybe
-
-MAKE_ARGS=	PREFIX="${PREFIX}" -j 2
+USE_REINPLACE=	yes
+USE_PERL5=	yes
+USE_OPENSSL=	yes
+USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS}"
+CONFIGURE_ARGS=	--enable-cxx --enable-production \
+		--enable-threadsafe --disable-debug \
+		--with-ssl --with-pthread
+INSTALLS_SHLIB=	yes
 
 post-patch:
-	${RM} -rf ${WRKSRC}/hdf/jpeg
-	${RM} -rf ${WRKSRC}/hdf/zlib
-
-do-configure:
-	${CP} -rp ${FILESDIR}/Makefile ${FILESDIR}/hdf \
-		${FILESDIR}/mfhdf ${FILESDIR}/man ${WRKSRC}
-	${LN} -s config/netcdf-fbsd.h ${WRKSRC}/mfhdf/libsrc/netcdf.h
-	${LN} -s netcdf-fbsd.inc ${WRKSRC}/mfhdf/fortran/config/netcdf.inc
-
-test: build
-	cd ${WRKSRC}; ${MAKE} test
+	@${REINPLACE_CMD} -e "s/-lpthread/${PTHREAD_LIBS}/g" ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/science/hdf5-18/distinfo b/science/hdf5-18/distinfo
index 3ce910a4ad52..cde821405088 100644
--- a/science/hdf5-18/distinfo
+++ b/science/hdf5-18/distinfo
@@ -1 +1 @@
-MD5 (HDF4.1r5.tar.gz) = f90de772dac93195def4a585da176db2
+MD5 (hdf5-1.4.4.tar.gz) = 327fe5a67118b78f0d032065ab4ccb12
diff --git a/science/hdf5-18/files/Makefile b/science/hdf5-18/files/Makefile
deleted file mode 100644
index 0dc23c19cf80..000000000000
--- a/science/hdf5-18/files/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-SUBDIR	 = hdf mfhdf man
-#PREFIX	?= /usr/local
-LIBDIR	?= ${PREFIX}/lib
-BINDIR	?= ${PREFIX}/bin
-
-.MAKEFLAGS: PREFIX=${PREFIX} LIBDIR=${LIBDIR} BINDIR=${BINDIR}
-
-test: all
-	# testing in hdf
-	@cd hdf && ${MAKE} hdf-test
-	# testing in mfhdf
-	@cd mfhdf && ${MAKE} test
-
-.include <bsd.subdir.mk>
diff --git a/science/hdf5-18/files/hdf/Makefile b/science/hdf5-18/files/hdf/Makefile
deleted file mode 100644
index 1f9663c03246..000000000000
--- a/science/hdf5-18/files/hdf/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-SUBDIR	 = src util test
-
-hdf-test: all
-	cd util && ${MAKE} test
-	cd test && ${MAKE} test
-
-.include <bsd.subdir.mk>
diff --git a/science/hdf5-18/files/hdf/src/Makefile b/science/hdf5-18/files/hdf/src/Makefile
deleted file mode 100644
index 45c20b492030..000000000000
--- a/science/hdf5-18/files/hdf/src/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-# $FreeBSD$
-
-LIB=df
-
-# uncomment the line below to avoid building static libraries
-#INTERNALLIB=YES
-LIBDIR=${PREFIX}/lib
-# comment out the line below to build the profile libs
-NOPROFILE=yes
-
-SHLIB_MAJOR=1
-SHLIB_MINOR=0
-
-SRCS=atom.c  bitvect.c  cdeflate.c  cnbit.c  cnone.c  crle.c  cskphuff.c \
-	df24.c  df24f.c dfan.c  dfanf.c dfcomp.c  dfconv.c dff.c  dfgr.c \
-	dfgroup.c  dfimcomp.c  dfjpeg.c  dfkconv.c  dfkcray.c  dfkfuji.c \
-	dfknat.c dfkswap.c dfkvms.c dfp.c  dfpf.c dfr8.c dfr8f.c dfrle.c \
-	dfsd.c dfsdf.c dfstubs.c dfufp2i.c dfunjpeg.c dfutil.c dfutilf.c \
-	dir_mac.c  dynarray.c   glist.c  hbitio.c   hblocks.c  hbuffer.c \
-	hchunks.c hcomp.c hcompri.c  hdfalloc.c herr.c herrf.c hextelt.c \
-	hfile.c hfiledd.c hfilef.c hkit.c linklist.c mcache.c \
-	mfan.c mfanf.c  mfgr.c mfgrf.c mstdio.c tbbt.c  vattr.c vattrf.c \
-	vconv.c  vg.c vgf.c  vgp.c  vhi.c vio.c  vparse.c vrw.c  vsfld.c \
-	df24ff.f  dfanff.f dfff.f  dfpff.f dfr8ff.f  dfsdff.f dfufp2if.f \
-	hfileff.f mfgrff.f vattrff.f vgff.f
-
-CFLAGS	+= -I${PREFIX}/include
-FFLAGS	+= ${CFLAGS}
-
-.if !defined(OSVERSION)
-.if exists(/sbin/sysctl)
-OSVERSION!=	/sbin/sysctl -n kern.osreldate
-.else
-OSVERSION!=	/usr/sbin/sysctl -n kern.osreldate
-.endif
-.endif
-
-.if ${OSVERSION} >= 400004
-LDADD	+= -L${PREFIX}/lib -ljpeg -lg2c -lz -lm
-.else
-LDADD	+= -L${PREFIX}/lib -ljpeg -lf2c -lz
-.endif
-
-afterinstall:
-	install -c -o root -g wheel -m 444 \
-		atom.h  bitvect.h  cdeflate.h   cnbit.h  cnone.h  crle.h \
-		cskphuff.h df.h dfan.h  dfconvrt.h dfgr.h dfi.h dfivms.h \
-		dfrig.h dfsd.h dfstubs.h  dfufp2i.h dir_mac.h dynarray.h \
-		glist.h  hbitio.h  hchunks.h  hcomp.h  hcompi.h  hconv.h \
-		hdf.h hdfi.h  herr.h hfile.h hkit.h  hlimits.h hntdefs.h \
-		hproto.h hqueue.h htags.h linklist.h maldebug.h mcache.h \
-		mfan.h mfgr.h mstdio.h sys_dir_mac.h tbbt.h trace.h \
-		vattr.h vg.h vgint.h hdf.inc dffunc.inc \
-			${PREFIX}/include
-
-.include <bsd.lib.mk>
diff --git a/science/hdf5-18/files/hdf/test/Makefile b/science/hdf5-18/files/hdf/test/Makefile
deleted file mode 100644
index 3a3c8ca98524..000000000000
--- a/science/hdf5-18/files/hdf/test/Makefile
+++ /dev/null
@@ -1,68 +0,0 @@
-# $FreeBSD$
-
-CSRCS= 	rig.c sdstr.c blocks.c an.c anfile.c extelt.c file.c file1.c vers.c \
-	sdmms.c sdnmms.c slab.c litend.c tvset.c comp.c bitio.c tree.c macros.c \
-	conv.c nbit.c man.c mgr.c testhdf.c tbv.c tvsfpack.c chunks.c tvattr.c \
-    buffer.c
-
-COBJS=	${CSRCS:S/.c/.o/g}
-
-FSRCS= fortest.c fortestF.f forsupff.f forsupf.c \
-	manf.f mgrf.f slabwf.f t24f.f tanf.f tanfilef.f tpf.f tr8f.f \
-	tsdmmsf.f tsdnmmsf.f tsdnntf.f tsdntf.f tsdstrf.f tstubsf.f \
-        tvsetf.f, tvattrf.f
-
-FOBJS = fortestF.o forsupff.o forsupf.o \
-	manf.o mgrf.o slabwf.o t24f.o tanf.o tanfilef.o tpf.o tr8f.o \
-	tsdmmsf.o tsdnmmsf.o tsdnntf.o tsdntf.o tsdstrf.o tstubsf.o  \
-        tvsetf.o tvattrf.o
-
-#CFORSUPSRCS = forsupf.c
-
-HDFLIB	 = ${.CURDIR}/../src
-CFLAGS	+= -I${HDFLIB}
-FFLAGS	+= ${CFLAGS} -Nn802 -Nx400
-
-FTESTS = fortest fortestF
-
-all: testhdf $(FTESTS) gentest
-
-#CFORSUPOBJS = forsupf.o
-
-TESTF = fortest.o
-
-# directory used by extelt test.
-TESTDIR = testdir
-
-$(FOBJS): fortest.inc
-
-test: atest-hdf
-
-atest-hdf: testhdf $(FTESTS)
-	-rm -f *.hdf 
-	env LD_LIBRARY_PATH=${.CURDIR}/../src ./testhdf
-	-rm -f *.hdf 
-	env LD_LIBRARY_PATH=${.CURDIR}/../src ./fortest
-
-testhdf: $(COBJS) $(HDFLIB)/libdf.so
-	$(CC) -o testhdf $(COBJS) $(HDFLIB)/libdf.so -lm
-	test -d $(TESTDIR) || mkdir $(TESTDIR)
-
-fortestF: $(FOBJS) $(HDFLIB)/libdf.so
-	$(FC) $(FFLAGS) -o $@ $(FOBJS) $(HDFLIB)/libdf.so -lm
-
-fortest: $(HDFLIB)/libdf.so fortest.c $(CHDRS)
-	$(CC) $(CFLAGS) -o fortest fortest.c $(HDFLIB)/libdf.so -lm
-
-gentest: gentest.c $(HDFLIB)/libdf.so
-	$(CC) $(CFLAGS) gentest.c -o gentest $(HDFLIB)/libdf.so -lm
-
-clean: 
-	-rm -f $(COBJS) testhdf $(FOBJS) $(FTESTS) \
-	core *.hdf ptesthdf qtesthdf gentest *.o fortest.arg $(TESTDIR)/* \
-	.depend
-
-depend: 
-	mkdep ${CFLAGS} ${CSRCS}
-
-install:
diff --git a/science/hdf5-18/files/hdf/util/Makefile b/science/hdf5-18/files/hdf/util/Makefile
deleted file mode 100644
index 6d4ccae200d4..000000000000
--- a/science/hdf5-18/files/hdf/util/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $FreeBSD$
-
-UTILS	 = hdf24to8 hdfcomp hdfls hdfpack hdftopal hdftor8 paltohdf \
-        r8tohdf ristosds  vmake vshow hdf8to24 hdf2jpeg jpeg2hdf fp2hdf \
-	hdfunpac vcompat
-
-all: ${UTILS} hdfed
-
-HEOBJ = he_main.o he_cntrl.o he_disp.o he_file.o
-
-#CFLAGS	+= -I${PREFIX}/include -I${.CURDIR}/../src/
-CFLAGS	+=  -I${.CURDIR}/../src/
-#LDFLAGS	+= -L${PREFIX}/lib -ljpeg -L${.CURDIR}/../src/ -ldf -lz
-LDFLAGS	+= -L${.CURDIR}/../src/ -ldf
-
-hdfed: he.h he_proto.h $(HEOBJ)
-	$(CC) $(HEOBJ) $(LDFLAGS) -o hdfed
-
-test: all fptest
-	env LD_LIBRARY_PATH=${.CURDIR}/../src ./testutil.sh
-
-clean:
-	-rm -f *.o $(UTILS) hdfed fptest
-	-rm -f o* ctx* cb* fptestf .depend
-
-depend:
-	mkdep ${CFLAGS} ${UTILS:S/$/.c/g} ${HEOBJ:S/.o/.c/g}
-
-install: all
-	install -c -s -o root -g wheel -m 555 ${UTILS} hdfed ${BINDIR}
diff --git a/science/hdf5-18/files/man/Makefile b/science/hdf5-18/files/man/Makefile
deleted file mode 100644
index eeea6c1997f7..000000000000
--- a/science/hdf5-18/files/man/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-MANDIR	=	${PREFIX}/man/man
-
-MAN1	=	hdf.1 hdfunpac.1
-MAN3	=	gr_chunk.3
-
-.include <bsd.man.mk>
-
-install: all-man maninstall
-
-clean:
-	-rm -f *.gz
-
-all: all-man
-
-depend:
diff --git a/science/hdf5-18/files/mfhdf/Makefile b/science/hdf5-18/files/mfhdf/Makefile
deleted file mode 100644
index 202766e54f67..000000000000
--- a/science/hdf5-18/files/mfhdf/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $FreeBSD$
-
-SUBDIR		= fortran libsrc ncgen ncdump nctest dumper
-
-.include <bsd.subdir.mk>
-
-test: all
-	@for d in ${SUBDIR} ; do \
-		echo "===> testing in $$d"; \
-		cd $$d; \
-		${MAKE} test; \
-		cd ..; \
-	done
diff --git a/science/hdf5-18/files/mfhdf/dumper/Makefile b/science/hdf5-18/files/mfhdf/dumper/Makefile
deleted file mode 100644
index 1bd8b3dfa744..000000000000
--- a/science/hdf5-18/files/mfhdf/dumper/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $FreeBSD$
-
-PROG		 = hdp
-NOMAN		 = 1
-LDFLAGS		+= -L${.CURDIR}/../libsrc -L${.CURDIR}/../../hdf/src -lmfhdf -ldf
-CFLAGS		+= -I${.CURDIR}/../libsrc -I${.CURDIR}/../../hdf/src
-
-SRCS		=  hdp.c hdp_list.c hdp_sds.c hdp_util.c hdp_vd.c hdp_vg.c hdp_rig.c show.c hdp_dump.c hdp_gr.c
-
-.include <bsd.prog.mk>
-
-test: ${PROG}
-	env LD_LIBRARY_PATH=${.CURDIR}/../libsrc:${.CURDIR}/../../hdf/src sh testhdp.sh
diff --git a/science/hdf5-18/files/mfhdf/fortran/Makefile b/science/hdf5-18/files/mfhdf/fortran/Makefile
deleted file mode 100644
index 03571382ccc3..000000000000
--- a/science/hdf5-18/files/mfhdf/fortran/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# $FreeBSD$
-
-.PATH:	${.CURDIR} ${.CURDIR}/config
-
-all:
-
-NOMAN	 =	1
-
-FFLAGS	+=	${CFLAGS} -DNDEBUG -Nn802 -Nx400
-
-LDFLAGS	+=	-L${.CURDIR}/../libsrc -L${.CURDIR}/../../hdf/src -lmfhdf -ldf
-
-afterinstall:
-	install -c -o root -g wheel -m 444 config/netcdf-fbsd.inc \
-		${PREFIX}/include/netcdf.inc
-
-.include <bsd.prog.mk>
-
-ENVIR	 =	env LD_LIBRARY_PATH=${.CURDIR}/../libsrc:${.CURDIR}/../../hdf/src
-
-CLEANFILES+=	hdftest hdftest.o ftest ftest-fbsd.o
-
-config/netcdf.inc:
-	ln -s netcdf-fbsd.inc config/netcdf.inc
-
-ftest:	ftest-fbsd.f config/netcdf.inc
-	${MAKE} PROG=$@ SRCS=ftest-fbsd.f $@
-
-hdftest: hdftest.f
-	${MAKE} PROG=$@ SRCS=hdftest.f $@
-
-test: ftest hdftest
-	mkdir -p testdir
-	# ================================
-	#  netCDF Fortran interface tests
-	# ================================
-	${ENVIR} ./ftest
-	${ENVIR} ./hdftest > hdfout.new
-	@diff -Bb hdfout.new hdftst.sav && \
-		echo "*** HDF-SD Fortran interface tests passed ***" || \
-		(echo "*** HDF-SD Fortran interface tests failed ***"; \
-		echo "The above differences are OK if small")
diff --git a/science/hdf5-18/files/mfhdf/libsrc/Makefile b/science/hdf5-18/files/mfhdf/libsrc/Makefile
deleted file mode 100644
index 092102faa53c..000000000000
--- a/science/hdf5-18/files/mfhdf/libsrc/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# $FreeBSD$
-
-.PATH:  ${.CURDIR} ${.CURDIR}/../fortran/config ${.CURDIR}/../fortran
-
-SRCS		= array.c attr.c cdf.c dim.c file.c iarray.c error.c \
-		  globdef.c putget.c putgetg.c sharray.c string.c var.c \
-		  hdfsds.c mfsd.c nssdc.c xdrposix.c \
-		  jackets-fbsd.c mfsdf.c mfsdff.f
-
-LIB		= mfhdf
-SHLIB_MAJOR	= 2
-SHLIB_MINOR	= 3
-
-LIBDIR		= ${PREFIX}/lib
-
-# uncomment the line below to avoid building static libraries
-#INTERNALLIB	= Yes
-# comment out the line below to build the profile libs
-NOPROFILE=yes
-
-CFLAGS	+=	-DNDEBUG -DHDF -I${.CURDIR}/../../hdf/src -I${.CURDIR}
-.if ${MACHINE_ARCH} == "i386"
-CFLAGS	+=	-DSWAP
-.endif
-
-LDADD	+=	-L${.CURDIR}/../../hdf/src -ldf
-LDFLAGS	+=	-L. -l${LIB} ${LDADD}
-
-afterinstall:
-	install -c -o root -g wheel -m 444 hdf2netcdf.h local_nc.h \
-		mfhdf.h netcdf.h ${PREFIX}/include
-
-.include <bsd.lib.mk>
-
-test: ${SHLIB_NAME} cdftest hdftest
-	env LD_LIBRARY_PATH=${.CURDIR}:${.CURDIR}/../../hdf/src ./cdftest > cdfout.new
-	@diff cdfout.new testout.sav && \
-		echo "*** netCDF passes formatted test ***" || \
-                (echo "*** netCDF fails formatted test ***" ; \
-                echo "The above differences are OK if small")
-	env LD_LIBRARY_PATH=${.CURDIR}:${.CURDIR}/../../hdf/src ./hdftest > hdfout.new
-	@diff hdfout.new hdfout.sav && \
-		echo "*** HDF passes formatted test ***" || \
-                (echo "*** HDF fails formatted test ***" ; \
-                echo "The above differences are OK if small")
diff --git a/science/hdf5-18/files/mfhdf/ncdump/Makefile b/science/hdf5-18/files/mfhdf/ncdump/Makefile
deleted file mode 100644
index 727b1de60b32..000000000000
--- a/science/hdf5-18/files/mfhdf/ncdump/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $FreeBSD$
-
-PROG		 = ncdump
-MANDIR		 = ${PREFIX}/man/man
-
-LDFLAGS		+= -L${.CURDIR}/../libsrc -L${.CURDIR}/../../hdf/src -lmfhdf -ldf
-CFLAGS		+= -I${.CURDIR}/../libsrc
-SRCS		=  ncdump.c vardata.c dumplib.c
-
-.include <bsd.prog.mk>
-
-ENVIR		= env LD_LIBRARY_PATH=${.CURDIR}/../../hdf/src:${.CURDIR}/../libsrc
-NCGEN		= ${.CURDIR}/../ncgen/ncgen
-
-test:		$(PROG) test0.cdl
-	${ENVIR} $(NCGEN) -o test0.nc -n test0.cdl
-	${ENVIR} ./$(PROG) test0.nc > test1.cdl
-	${ENVIR} $(NCGEN) -o test1.nc -n test1.cdl
-	${ENVIR} ./$(PROG) -n test0 test1.nc > test2.cdl
-	@cmp test1.cdl test2.cdl && \
-	    echo "*** $(PROGRAM) test successful ***" ; \
-	    rm test1.cdl test1.nc test2.cdl
diff --git a/science/hdf5-18/files/mfhdf/ncgen/Makefile b/science/hdf5-18/files/mfhdf/ncgen/Makefile
deleted file mode 100644
index d954137cffa8..000000000000
--- a/science/hdf5-18/files/mfhdf/ncgen/Makefile
+++ /dev/null
@@ -1,72 +0,0 @@
-# $FreeBSD$
-
-PROG		 = ncgen
-MANDIR		 = ${PREFIX}/man/man
-LDFLAGS		+= -L${.CURDIR}/../libsrc -L${.CURDIR}/../../hdf/src -lmfhdf -ldf
-CFLAGS		+= -I${.CURDIR}/../libsrc -I${.CURDIR}/../../hdf/src -DNDEBUG
-SRCS		 = main.c generate.c load.c ncgentab.c escapes.c \
-		  getfill.c init.c close.c genlib.c
-
-ENVIR		 = env LD_LIBRARY_PATH=${.CURDIR}/../libsrc:${.CURDIR}/../../hdf/src
-NCDUMP		 = ${.CURDIR}/../ncdump/ncdump
-
-test:           $(PROG) test0.cdl btest ctest ftest
-
-ncgenyy.c: ncgen.l
-	${LEX} ${LFLAGS} ncgen.l
-	mv lex.yy.c ncgenyy.c
-	
-ncgentab.c: ncgenyy.c ncgen.y
-	${YACC} ${YFLAGS} ncgen.y
-	mv y.tab.c ncgentab.c
-	mv y.tab.h ncgentab.h
-
-.include <bsd.prog.mk>
-
-#
-# test "-b" option of ncgen
-#
-btest:		$(PROG) test0.cdl test1.cdl
-	${ENVIR} ./$(PROG) -b test1.cdl
-	${ENVIR} $(NCDUMP) test1.nc > test2.cdl
-	@diff test1.cdl test2.cdl && \
-	    echo "*** $(PROG) -b test successful ***"
-
-#
-# test "-c" option of ncgen
-#
-ctest:		test1.cdl ctest0
-	${ENVIR} ./ctest0		# tests `-c' option, creates ctest0.nc
-	${ENVIR} $(NCDUMP) -n test1 ctest0.nc > ctest1.cdl
-	@diff test1.cdl ctest1.cdl && \
-	    echo "*** $(PROG) -c test successful ***"
-
-ctest0:		ncgen test0.cdl
-	${ENVIR} ./$(PROG) -c -o ctest0.nc test0.cdl > test0.c
-	$(CC) $(CFLAGS) -o $@ test0.c ${LDFLAGS}
-
-#
-# test "-f" option of ncgen
-#
-ftest:	test1.cdl ftest0
-	${ENVIR} ./ftest0
-	${ENVIR} $(NCDUMP) -n test1 ftest0.nc > ftest1.cdl
-	@if diff test1.cdl ftest1.cdl; then \
-		echo "*** ncgen -f test successful ***"; \
-	else \
-		echo "*** ncgen -f test failed " \
-		    "(but roundoff differences are OK) ***"; \
-	fi
-
-ftest0:	$(PROG) test0.cdl netcdf.inc
-	${ENVIR} ./$(PROG) -f -o ftest0.nc test0.cdl > test0.f; \
-	$(FC) $(FFLAGS) ${CFLAGS} -o $@ test0.f ${LDFLAGS}
-
-test1.cdl:	test0.nc
-	${ENVIR} $(NCDUMP) -n test1 test0.nc > $@
-
-test0.nc:	$(PROG) test0.cdl
-	${ENVIR} ./$(PROG) -b -o test0.nc test0.cdl
-
-netcdf.inc:
-	ln -s ../fortran/config/netcdf-fbsd.inc $@
diff --git a/science/hdf5-18/files/mfhdf/nctest/Makefile b/science/hdf5-18/files/mfhdf/nctest/Makefile
deleted file mode 100644
index 722d3524a482..000000000000
--- a/science/hdf5-18/files/mfhdf/nctest/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $FreeBSD$
-
-PROG		 = nctest
-NOMAN		 = 1
-CFLAGS		+= -I${.CURDIR}/../libsrc
-LDFLAGS		+= -L${.CURDIR}/../libsrc -L${.CURDIR}/../../hdf/src -lmfhdf -ldf
-SRCS		= varget.c vargetg.c varput.c varputg.c vardef.c vartests.c \
-		  vputget.c vputgetg.c driver.c cdftests.c dimtests.c rec.c \
-		  atttests.c misctest.c add.c error.c emalloc.c val.c slabs.c
-
-install:
-
-.include <bsd.prog.mk>
-
-test:		$(PROG)
-	@ echo "==========================="
-	@ echo "netCDF C interface tests"
-	@ echo "==========================="
-	env LD_LIBRARY_PATH=${.CURDIR}/../libsrc:${.CURDIR}/../../hdf/src ./$(PROG)
diff --git a/science/hdf5-18/pkg-descr b/science/hdf5-18/pkg-descr
index 222d6e8bf354..35a0fc9e23cf 100644
--- a/science/hdf5-18/pkg-descr
+++ b/science/hdf5-18/pkg-descr
@@ -1,22 +1,17 @@
-From HDF's manpage:
+HDF5 is a completely new Hierarchical Data Format product consisting of a
+data format specification and a supporting library implementation. HDF5 is
+designed to address some of the limitations of the older HDF product and to
+address current and anticipated requirements of modern systems and
+applications.
 
-       hdf - Hierarchical Data Format library
+HDF5 includes the following improvements.
+   - A new file format designed to address some of the deficiencies of HDF4.x,
+     particularly the need to store larger files and more objects per file.
+   - A simpler, more comprehensive data model that includes only two basic
+     structures: a multidimensional array of record structures, and a grouping
+     structure.
+   - A simpler, better-engineered library and API, with improved support for
+     parallel I/O, threads, and other requirements imposed by modern systems
+     and applications.
 
-Description:
-       HDF  is	a  multi-object  file format that facilitates the
-       transfer of  various  types  of	scientific  data  between
-       machines  and  operating systems.  Machines currently sup-
-       ported  include	the  Cray,  Convex,  HP,  Vax,	Sun,  IBM
-       RS/6000,  Silicon  Graphics, Macintosh, and IBM PC comput-
-       ers.  HDF allows self-definitions of data content and easy
-       extensibility  for  future  enhancements  or compatibility
-       with other standard formats. HDF includes  Fortran  and	C
-       calling	interfaces,and	utilities to prepare raw image of
-       data files or for use with other NCSA software.	 The  HDF
-       library	contains  interfaces  for  storing and retrieving
-       compressed or uncompressed 8-bit and 24-bit raster  images
-       with   palettes,  n-Dimensional	scientific  datasets  and
-       binary tables. An interface is also included  that  allows
-       arbitray grouping of other HDF objects.
-
-WWW: http://hdf.ncsa.uiuc.edu/
+WWW: http://hdf.ncsa.uiuc.edu/HDF5/
diff --git a/science/hdf5-18/pkg-plist b/science/hdf5-18/pkg-plist
index a0ca0c5f4e40..4e37599a505c 100644
--- a/science/hdf5-18/pkg-plist
+++ b/science/hdf5-18/pkg-plist
@@ -1,81 +1,78 @@
-bin/fp2hdf
-bin/hdf24to8
-bin/hdf2jpeg
-bin/hdf8to24
-bin/hdfcomp
-bin/hdfed
-bin/hdfls
-bin/hdfpack
-bin/hdftopal
-bin/hdftor8
-bin/hdfunpac
-bin/hdp
-bin/jpeg2hdf
-bin/ncdump
-bin/ncgen
-bin/paltohdf
-bin/r8tohdf
-bin/ristosds
-bin/vcompat
-bin/vmake
-bin/vshow
-include/atom.h
-include/bitvect.h
-include/cdeflate.h
-include/cnbit.h
-include/cnone.h
-include/crle.h
-include/cskphuff.h
-include/df.h
-include/dfan.h
-include/dfconvrt.h
-include/dffunc.inc
-include/dfgr.h
-include/dfi.h
-include/dfivms.h
-include/dfrig.h
-include/dfsd.h
-include/dfstubs.h
-include/dfufp2i.h
-include/dir_mac.h
-include/dynarray.h
-include/glist.h
-include/hbitio.h
-include/hchunks.h
-include/hcomp.h
-include/hcompi.h
-include/hconv.h
-include/hdf.h
-include/hdf.inc
-include/hdf2netcdf.h
-include/hdfi.h
-include/herr.h
-include/hfile.h
-include/hkit.h
-include/hlimits.h
-include/hntdefs.h
-include/hproto.h
-include/hqueue.h
-include/htags.h
-include/linklist.h
-include/local_nc.h
-include/maldebug.h
-include/mcache.h
-include/mfan.h
-include/mfgr.h
-include/mfhdf.h
-include/mstdio.h
-include/netcdf.h
-include/netcdf.inc
-include/sys_dir_mac.h
-include/tbbt.h
-include/trace.h
-include/vattr.h
-include/vg.h
-include/vgint.h
-lib/libdf.a
-lib/libdf.so
-lib/libdf.so.1
-lib/libmfhdf.a
-lib/libmfhdf.so
-lib/libmfhdf.so.2
+bin/gif2h5
+bin/h52gif
+bin/h5cc
+bin/h5debug
+bin/h5dump
+bin/h5import
+bin/h5ls
+bin/h5perf
+bin/h5redeploy
+bin/h5repart
+include/H5ACpublic.h
+include/H5AbstractDs.h
+include/H5Alltypes.h
+include/H5Apublic.h
+include/H5AtomType.h
+include/H5Attribute.h
+include/H5Bpublic.h
+include/H5Classes.h
+include/H5CommonFG.h
+include/H5CompType.h
+include/H5Cpp.h
+include/H5DataSet.h
+include/H5DataSpace.h
+include/H5DataType.h
+include/H5DcreatProp.h
+include/H5Dpublic.h
+include/H5DxferProp.h
+include/H5EnumType.h
+include/H5Epublic.h
+include/H5Exception.h
+include/H5FDcore.h
+include/H5FDfamily.h
+include/H5FDgass.h
+include/H5FDlog.h
+include/H5FDmpio.h
+include/H5FDmulti.h
+include/H5FDpublic.h
+include/H5FDsec2.h
+include/H5FDsrb.h
+include/H5FDstdio.h
+include/H5FDstream.h
+include/H5FaccProp.h
+include/H5FcreatProp.h
+include/H5File.h
+include/H5FloatType.h
+include/H5Fpublic.h
+include/H5Gpublic.h
+include/H5Group.h
+include/H5HGpublic.h
+include/H5HLpublic.h
+include/H5IdComponent.h
+include/H5Idtemplates.h
+include/H5Include.h
+include/H5IntType.h
+include/H5Ipublic.h
+include/H5Library.h
+include/H5MMpublic.h
+include/H5Object.h
+include/H5Opublic.h
+include/H5Ppublic.h
+include/H5PredType.h
+include/H5PropList.h
+include/H5RefCounter.h
+include/H5Rpublic.h
+include/H5Spublic.h
+include/H5StrType.h
+include/H5Tpublic.h
+include/H5Zpublic.h
+include/H5api_adpt.h
+include/H5pubconf.h
+include/H5public.h
+include/hdf5.h
+lib/libhdf5.a
+lib/libhdf5.la
+lib/libhdf5.settings
+lib/libhdf5.so.0
+lib/libhdf5_cpp.a
+lib/libhdf5_cpp.la
diff --git a/science/hdf5-18/scripts/post-patch b/science/hdf5-18/scripts/post-patch
deleted file mode 100644
index abb1fc2ea1fb..000000000000
--- a/science/hdf5-18/scripts/post-patch
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/sh
-
-for f in `find ${WRKSRC} -type f -name Makefile.in -print | xargs grep -l "^CFLAGS = -ansi -O"`
-do
-patch -p << END_OF_PATCH
---- $f.orig
-+++ $f
-@@ -72,1 +72,1 @@
--CFLAGS = -ansi -O
-+#CFLAGS = -ansi -O
-END_OF_PATCH
-done
-for f in `find ${WRKSRC} -type f -name Makefile.in -print | xargs grep -l "^ZLIB_LIB = "`
-do
-patch -p << END_OF_PATCH
---- $f.orig
-+++ $f
-@@ -72,1 +72,1 @@
--ZLIB_LIB = \$(TOP_SRCDIR)/hdf/zlib/libz.a
-+#ZLIB_LIB = \$(TOP_SRCDIR)/hdf/zlib/libz.a
-END_OF_PATCH
-done
-for f in `find ${WRKSRC} -type f -name Makefile.in -print | xargs grep -l "^JPEG_LIB = "`
-do
-patch -p << END_OF_PATCH
---- $f.orig
-+++ $f
-@@ -72,1 +72,1 @@
--JPEG_LIB = \$(TOP_SRCDIR)/hdf/jpeg/libjpeg.a
-+#JPEG_LIB = \$(TOP_SRCDIR)/hdf/jpeg/libjpeg.a
-END_OF_PATCH
-done
-for f in `find ${WRKSRC} -type f -name Makefile.in -print | xargs grep -l "^ZLIBLIB="`
-do
-patch -p << END_OF_PATCH
---- $f.orig
-+++ $f
-@@ -72,2 +72,2 @@
--ZLIBINC=\$(srcdir)/../zlib
--ZLIBLIB=\$(srcdir)/../zlib
-+ZLIBINC=/usr/include
-+ZLIBLIB=-lz \$(pwrkdir)
-END_OF_PATCH
-done
-
-for f in `find ${WRKSRC} -type f -name Makefile.in -print | xargs grep -l "^ZLIBLIB="`
-do
-patch -p << END_OF_PATCH
---- $f.orig
-+++ $f
-@@ -72,2 +72,2 @@
--ZLIBLIB=\$(srcdir)/../zlib
--ZLIBINC=\$(srcdir)/../zlib
-+ZLIBLIB=-lz
-+ZLIBINC=/usr/include
-END_OF_PATCH
-done
-
-for f in `find ${WRKSRC} -type f -name Makefile.in -print | xargs grep -l "^JPEGLIB="`
-do
-patch -p << END_OF_PATCH
---- $f.orig
-+++ $f
-@@ -72,2 +72,2 @@
--JPEGINC=\$(srcdir)/../jpeg
--JPEGLIB=\$(srcdir)/../jpeg
-+JPEGINC=\$(prefix)/include
-+JPEGLIB=\$(prefix)/lib
-END_OF_PATCH
-done
-
-for f in `find ${WRKSRC} -type f -name Makefile.in -print | xargs grep -l "^JPEGLIB="`
-do
-patch -p << END_OF_PATCH
---- $f.orig
-+++ $f
-@@ -72,2 +72,2 @@
--JPEGLIB=\$(srcdir)/../jpeg
--JPEGINC=\$(srcdir)/../jpeg
-+JPEGLIB=\$(prefix)/lib
-+JPEGINC=\$(prefix)/include
-END_OF_PATCH
-done
diff --git a/science/hdf5/Makefile b/science/hdf5/Makefile
index d2be7566329f..42a21b0b35dc 100644
--- a/science/hdf5/Makefile
+++ b/science/hdf5/Makefile
@@ -1,37 +1,30 @@
-# New ports collection makefile for:	HDF_lib
-# Date created:		17 November 1996
-# Whom:			mi
+# ex:ts=8
+# New ports collection makefile for:	HDF5
+# Date created:			Jul 7, 2002
+# Whom:				ijliao
 #
 # $FreeBSD$
 #
 
-PORTNAME=	hdf
-PORTVERSION=	4.1r5
+PORTNAME=	hdf5
+PORTVERSION=	1.4.4
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.ncsa.uiuc.edu/HDF/HDF/HDF${PORTVERSION}/tar/
-DISTNAME=	HDF${PORTVERSION}
+MASTER_SITES=	ftp://hdf.ncsa.uiuc.edu/HDF5/hdf5-${PORTVERSION}/src/
 
-MAINTAINER=	mi@aldan.algebra.com
+MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
-
-MAN1=		hdf.1 hdfunpac.1 ncdump.1 ncgen.1
-MAN3=		gr_chunk.3
-MANCOMPRESSED=	maybe
-
-MAKE_ARGS=	PREFIX="${PREFIX}" -j 2
+USE_REINPLACE=	yes
+USE_PERL5=	yes
+USE_OPENSSL=	yes
+USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS}"
+CONFIGURE_ARGS=	--enable-cxx --enable-production \
+		--enable-threadsafe --disable-debug \
+		--with-ssl --with-pthread
+INSTALLS_SHLIB=	yes
 
 post-patch:
-	${RM} -rf ${WRKSRC}/hdf/jpeg
-	${RM} -rf ${WRKSRC}/hdf/zlib
-
-do-configure:
-	${CP} -rp ${FILESDIR}/Makefile ${FILESDIR}/hdf \
-		${FILESDIR}/mfhdf ${FILESDIR}/man ${WRKSRC}
-	${LN} -s config/netcdf-fbsd.h ${WRKSRC}/mfhdf/libsrc/netcdf.h
-	${LN} -s netcdf-fbsd.inc ${WRKSRC}/mfhdf/fortran/config/netcdf.inc
-
-test: build
-	cd ${WRKSRC}; ${MAKE} test
+	@${REINPLACE_CMD} -e "s/-lpthread/${PTHREAD_LIBS}/g" ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/science/hdf5/distinfo b/science/hdf5/distinfo
index 3ce910a4ad52..cde821405088 100644
--- a/science/hdf5/distinfo
+++ b/science/hdf5/distinfo
@@ -1 +1 @@
-MD5 (HDF4.1r5.tar.gz) = f90de772dac93195def4a585da176db2
+MD5 (hdf5-1.4.4.tar.gz) = 327fe5a67118b78f0d032065ab4ccb12
diff --git a/science/hdf5/files/Makefile b/science/hdf5/files/Makefile
deleted file mode 100644
index 0dc23c19cf80..000000000000
--- a/science/hdf5/files/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-SUBDIR	 = hdf mfhdf man
-#PREFIX	?= /usr/local
-LIBDIR	?= ${PREFIX}/lib
-BINDIR	?= ${PREFIX}/bin
-
-.MAKEFLAGS: PREFIX=${PREFIX} LIBDIR=${LIBDIR} BINDIR=${BINDIR}
-
-test: all
-	# testing in hdf
-	@cd hdf && ${MAKE} hdf-test
-	# testing in mfhdf
-	@cd mfhdf && ${MAKE} test
-
-.include <bsd.subdir.mk>
diff --git a/science/hdf5/files/hdf/Makefile b/science/hdf5/files/hdf/Makefile
deleted file mode 100644
index 1f9663c03246..000000000000
--- a/science/hdf5/files/hdf/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-SUBDIR	 = src util test
-
-hdf-test: all
-	cd util && ${MAKE} test
-	cd test && ${MAKE} test
-
-.include <bsd.subdir.mk>
diff --git a/science/hdf5/files/hdf/src/Makefile b/science/hdf5/files/hdf/src/Makefile
deleted file mode 100644
index 45c20b492030..000000000000
--- a/science/hdf5/files/hdf/src/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-# $FreeBSD$
-
-LIB=df
-
-# uncomment the line below to avoid building static libraries
-#INTERNALLIB=YES
-LIBDIR=${PREFIX}/lib
-# comment out the line below to build the profile libs
-NOPROFILE=yes
-
-SHLIB_MAJOR=1
-SHLIB_MINOR=0
-
-SRCS=atom.c  bitvect.c  cdeflate.c  cnbit.c  cnone.c  crle.c  cskphuff.c \
-	df24.c  df24f.c dfan.c  dfanf.c dfcomp.c  dfconv.c dff.c  dfgr.c \
-	dfgroup.c  dfimcomp.c  dfjpeg.c  dfkconv.c  dfkcray.c  dfkfuji.c \
-	dfknat.c dfkswap.c dfkvms.c dfp.c  dfpf.c dfr8.c dfr8f.c dfrle.c \
-	dfsd.c dfsdf.c dfstubs.c dfufp2i.c dfunjpeg.c dfutil.c dfutilf.c \
-	dir_mac.c  dynarray.c   glist.c  hbitio.c   hblocks.c  hbuffer.c \
-	hchunks.c hcomp.c hcompri.c  hdfalloc.c herr.c herrf.c hextelt.c \
-	hfile.c hfiledd.c hfilef.c hkit.c linklist.c mcache.c \
-	mfan.c mfanf.c  mfgr.c mfgrf.c mstdio.c tbbt.c  vattr.c vattrf.c \
-	vconv.c  vg.c vgf.c  vgp.c  vhi.c vio.c  vparse.c vrw.c  vsfld.c \
-	df24ff.f  dfanff.f dfff.f  dfpff.f dfr8ff.f  dfsdff.f dfufp2if.f \
-	hfileff.f mfgrff.f vattrff.f vgff.f
-
-CFLAGS	+= -I${PREFIX}/include
-FFLAGS	+= ${CFLAGS}
-
-.if !defined(OSVERSION)
-.if exists(/sbin/sysctl)
-OSVERSION!=	/sbin/sysctl -n kern.osreldate
-.else
-OSVERSION!=	/usr/sbin/sysctl -n kern.osreldate
-.endif
-.endif
-
-.if ${OSVERSION} >= 400004
-LDADD	+= -L${PREFIX}/lib -ljpeg -lg2c -lz -lm
-.else
-LDADD	+= -L${PREFIX}/lib -ljpeg -lf2c -lz
-.endif
-
-afterinstall:
-	install -c -o root -g wheel -m 444 \
-		atom.h  bitvect.h  cdeflate.h   cnbit.h  cnone.h  crle.h \
-		cskphuff.h df.h dfan.h  dfconvrt.h dfgr.h dfi.h dfivms.h \
-		dfrig.h dfsd.h dfstubs.h  dfufp2i.h dir_mac.h dynarray.h \
-		glist.h  hbitio.h  hchunks.h  hcomp.h  hcompi.h  hconv.h \
-		hdf.h hdfi.h  herr.h hfile.h hkit.h  hlimits.h hntdefs.h \
-		hproto.h hqueue.h htags.h linklist.h maldebug.h mcache.h \
-		mfan.h mfgr.h mstdio.h sys_dir_mac.h tbbt.h trace.h \
-		vattr.h vg.h vgint.h hdf.inc dffunc.inc \
-			${PREFIX}/include
-
-.include <bsd.lib.mk>
diff --git a/science/hdf5/files/hdf/test/Makefile b/science/hdf5/files/hdf/test/Makefile
deleted file mode 100644
index 3a3c8ca98524..000000000000
--- a/science/hdf5/files/hdf/test/Makefile
+++ /dev/null
@@ -1,68 +0,0 @@
-# $FreeBSD$
-
-CSRCS= 	rig.c sdstr.c blocks.c an.c anfile.c extelt.c file.c file1.c vers.c \
-	sdmms.c sdnmms.c slab.c litend.c tvset.c comp.c bitio.c tree.c macros.c \
-	conv.c nbit.c man.c mgr.c testhdf.c tbv.c tvsfpack.c chunks.c tvattr.c \
-    buffer.c
-
-COBJS=	${CSRCS:S/.c/.o/g}
-
-FSRCS= fortest.c fortestF.f forsupff.f forsupf.c \
-	manf.f mgrf.f slabwf.f t24f.f tanf.f tanfilef.f tpf.f tr8f.f \
-	tsdmmsf.f tsdnmmsf.f tsdnntf.f tsdntf.f tsdstrf.f tstubsf.f \
-        tvsetf.f, tvattrf.f
-
-FOBJS = fortestF.o forsupff.o forsupf.o \
-	manf.o mgrf.o slabwf.o t24f.o tanf.o tanfilef.o tpf.o tr8f.o \
-	tsdmmsf.o tsdnmmsf.o tsdnntf.o tsdntf.o tsdstrf.o tstubsf.o  \
-        tvsetf.o tvattrf.o
-
-#CFORSUPSRCS = forsupf.c
-
-HDFLIB	 = ${.CURDIR}/../src
-CFLAGS	+= -I${HDFLIB}
-FFLAGS	+= ${CFLAGS} -Nn802 -Nx400
-
-FTESTS = fortest fortestF
-
-all: testhdf $(FTESTS) gentest
-
-#CFORSUPOBJS = forsupf.o
-
-TESTF = fortest.o
-
-# directory used by extelt test.
-TESTDIR = testdir
-
-$(FOBJS): fortest.inc
-
-test: atest-hdf
-
-atest-hdf: testhdf $(FTESTS)
-	-rm -f *.hdf 
-	env LD_LIBRARY_PATH=${.CURDIR}/../src ./testhdf
-	-rm -f *.hdf 
-	env LD_LIBRARY_PATH=${.CURDIR}/../src ./fortest
-
-testhdf: $(COBJS) $(HDFLIB)/libdf.so
-	$(CC) -o testhdf $(COBJS) $(HDFLIB)/libdf.so -lm
-	test -d $(TESTDIR) || mkdir $(TESTDIR)
-
-fortestF: $(FOBJS) $(HDFLIB)/libdf.so
-	$(FC) $(FFLAGS) -o $@ $(FOBJS) $(HDFLIB)/libdf.so -lm
-
-fortest: $(HDFLIB)/libdf.so fortest.c $(CHDRS)
-	$(CC) $(CFLAGS) -o fortest fortest.c $(HDFLIB)/libdf.so -lm
-
-gentest: gentest.c $(HDFLIB)/libdf.so
-	$(CC) $(CFLAGS) gentest.c -o gentest $(HDFLIB)/libdf.so -lm
-
-clean: 
-	-rm -f $(COBJS) testhdf $(FOBJS) $(FTESTS) \
-	core *.hdf ptesthdf qtesthdf gentest *.o fortest.arg $(TESTDIR)/* \
-	.depend
-
-depend: 
-	mkdep ${CFLAGS} ${CSRCS}
-
-install:
diff --git a/science/hdf5/files/hdf/util/Makefile b/science/hdf5/files/hdf/util/Makefile
deleted file mode 100644
index 6d4ccae200d4..000000000000
--- a/science/hdf5/files/hdf/util/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $FreeBSD$
-
-UTILS	 = hdf24to8 hdfcomp hdfls hdfpack hdftopal hdftor8 paltohdf \
-        r8tohdf ristosds  vmake vshow hdf8to24 hdf2jpeg jpeg2hdf fp2hdf \
-	hdfunpac vcompat
-
-all: ${UTILS} hdfed
-
-HEOBJ = he_main.o he_cntrl.o he_disp.o he_file.o
-
-#CFLAGS	+= -I${PREFIX}/include -I${.CURDIR}/../src/
-CFLAGS	+=  -I${.CURDIR}/../src/
-#LDFLAGS	+= -L${PREFIX}/lib -ljpeg -L${.CURDIR}/../src/ -ldf -lz
-LDFLAGS	+= -L${.CURDIR}/../src/ -ldf
-
-hdfed: he.h he_proto.h $(HEOBJ)
-	$(CC) $(HEOBJ) $(LDFLAGS) -o hdfed
-
-test: all fptest
-	env LD_LIBRARY_PATH=${.CURDIR}/../src ./testutil.sh
-
-clean:
-	-rm -f *.o $(UTILS) hdfed fptest
-	-rm -f o* ctx* cb* fptestf .depend
-
-depend:
-	mkdep ${CFLAGS} ${UTILS:S/$/.c/g} ${HEOBJ:S/.o/.c/g}
-
-install: all
-	install -c -s -o root -g wheel -m 555 ${UTILS} hdfed ${BINDIR}
diff --git a/science/hdf5/files/man/Makefile b/science/hdf5/files/man/Makefile
deleted file mode 100644
index eeea6c1997f7..000000000000
--- a/science/hdf5/files/man/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-MANDIR	=	${PREFIX}/man/man
-
-MAN1	=	hdf.1 hdfunpac.1
-MAN3	=	gr_chunk.3
-
-.include <bsd.man.mk>
-
-install: all-man maninstall
-
-clean:
-	-rm -f *.gz
-
-all: all-man
-
-depend:
diff --git a/science/hdf5/files/mfhdf/Makefile b/science/hdf5/files/mfhdf/Makefile
deleted file mode 100644
index 202766e54f67..000000000000
--- a/science/hdf5/files/mfhdf/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $FreeBSD$
-
-SUBDIR		= fortran libsrc ncgen ncdump nctest dumper
-
-.include <bsd.subdir.mk>
-
-test: all
-	@for d in ${SUBDIR} ; do \
-		echo "===> testing in $$d"; \
-		cd $$d; \
-		${MAKE} test; \
-		cd ..; \
-	done
diff --git a/science/hdf5/files/mfhdf/dumper/Makefile b/science/hdf5/files/mfhdf/dumper/Makefile
deleted file mode 100644
index 1bd8b3dfa744..000000000000
--- a/science/hdf5/files/mfhdf/dumper/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $FreeBSD$
-
-PROG		 = hdp
-NOMAN		 = 1
-LDFLAGS		+= -L${.CURDIR}/../libsrc -L${.CURDIR}/../../hdf/src -lmfhdf -ldf
-CFLAGS		+= -I${.CURDIR}/../libsrc -I${.CURDIR}/../../hdf/src
-
-SRCS		=  hdp.c hdp_list.c hdp_sds.c hdp_util.c hdp_vd.c hdp_vg.c hdp_rig.c show.c hdp_dump.c hdp_gr.c
-
-.include <bsd.prog.mk>
-
-test: ${PROG}
-	env LD_LIBRARY_PATH=${.CURDIR}/../libsrc:${.CURDIR}/../../hdf/src sh testhdp.sh
diff --git a/science/hdf5/files/mfhdf/fortran/Makefile b/science/hdf5/files/mfhdf/fortran/Makefile
deleted file mode 100644
index 03571382ccc3..000000000000
--- a/science/hdf5/files/mfhdf/fortran/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# $FreeBSD$
-
-.PATH:	${.CURDIR} ${.CURDIR}/config
-
-all:
-
-NOMAN	 =	1
-
-FFLAGS	+=	${CFLAGS} -DNDEBUG -Nn802 -Nx400
-
-LDFLAGS	+=	-L${.CURDIR}/../libsrc -L${.CURDIR}/../../hdf/src -lmfhdf -ldf
-
-afterinstall:
-	install -c -o root -g wheel -m 444 config/netcdf-fbsd.inc \
-		${PREFIX}/include/netcdf.inc
-
-.include <bsd.prog.mk>
-
-ENVIR	 =	env LD_LIBRARY_PATH=${.CURDIR}/../libsrc:${.CURDIR}/../../hdf/src
-
-CLEANFILES+=	hdftest hdftest.o ftest ftest-fbsd.o
-
-config/netcdf.inc:
-	ln -s netcdf-fbsd.inc config/netcdf.inc
-
-ftest:	ftest-fbsd.f config/netcdf.inc
-	${MAKE} PROG=$@ SRCS=ftest-fbsd.f $@
-
-hdftest: hdftest.f
-	${MAKE} PROG=$@ SRCS=hdftest.f $@
-
-test: ftest hdftest
-	mkdir -p testdir
-	# ================================
-	#  netCDF Fortran interface tests
-	# ================================
-	${ENVIR} ./ftest
-	${ENVIR} ./hdftest > hdfout.new
-	@diff -Bb hdfout.new hdftst.sav && \
-		echo "*** HDF-SD Fortran interface tests passed ***" || \
-		(echo "*** HDF-SD Fortran interface tests failed ***"; \
-		echo "The above differences are OK if small")
diff --git a/science/hdf5/files/mfhdf/libsrc/Makefile b/science/hdf5/files/mfhdf/libsrc/Makefile
deleted file mode 100644
index 092102faa53c..000000000000
--- a/science/hdf5/files/mfhdf/libsrc/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# $FreeBSD$
-
-.PATH:  ${.CURDIR} ${.CURDIR}/../fortran/config ${.CURDIR}/../fortran
-
-SRCS		= array.c attr.c cdf.c dim.c file.c iarray.c error.c \
-		  globdef.c putget.c putgetg.c sharray.c string.c var.c \
-		  hdfsds.c mfsd.c nssdc.c xdrposix.c \
-		  jackets-fbsd.c mfsdf.c mfsdff.f
-
-LIB		= mfhdf
-SHLIB_MAJOR	= 2
-SHLIB_MINOR	= 3
-
-LIBDIR		= ${PREFIX}/lib
-
-# uncomment the line below to avoid building static libraries
-#INTERNALLIB	= Yes
-# comment out the line below to build the profile libs
-NOPROFILE=yes
-
-CFLAGS	+=	-DNDEBUG -DHDF -I${.CURDIR}/../../hdf/src -I${.CURDIR}
-.if ${MACHINE_ARCH} == "i386"
-CFLAGS	+=	-DSWAP
-.endif
-
-LDADD	+=	-L${.CURDIR}/../../hdf/src -ldf
-LDFLAGS	+=	-L. -l${LIB} ${LDADD}
-
-afterinstall:
-	install -c -o root -g wheel -m 444 hdf2netcdf.h local_nc.h \
-		mfhdf.h netcdf.h ${PREFIX}/include
-
-.include <bsd.lib.mk>
-
-test: ${SHLIB_NAME} cdftest hdftest
-	env LD_LIBRARY_PATH=${.CURDIR}:${.CURDIR}/../../hdf/src ./cdftest > cdfout.new
-	@diff cdfout.new testout.sav && \
-		echo "*** netCDF passes formatted test ***" || \
-                (echo "*** netCDF fails formatted test ***" ; \
-                echo "The above differences are OK if small")
-	env LD_LIBRARY_PATH=${.CURDIR}:${.CURDIR}/../../hdf/src ./hdftest > hdfout.new
-	@diff hdfout.new hdfout.sav && \
-		echo "*** HDF passes formatted test ***" || \
-                (echo "*** HDF fails formatted test ***" ; \
-                echo "The above differences are OK if small")
diff --git a/science/hdf5/files/mfhdf/ncdump/Makefile b/science/hdf5/files/mfhdf/ncdump/Makefile
deleted file mode 100644
index 727b1de60b32..000000000000
--- a/science/hdf5/files/mfhdf/ncdump/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $FreeBSD$
-
-PROG		 = ncdump
-MANDIR		 = ${PREFIX}/man/man
-
-LDFLAGS		+= -L${.CURDIR}/../libsrc -L${.CURDIR}/../../hdf/src -lmfhdf -ldf
-CFLAGS		+= -I${.CURDIR}/../libsrc
-SRCS		=  ncdump.c vardata.c dumplib.c
-
-.include <bsd.prog.mk>
-
-ENVIR		= env LD_LIBRARY_PATH=${.CURDIR}/../../hdf/src:${.CURDIR}/../libsrc
-NCGEN		= ${.CURDIR}/../ncgen/ncgen
-
-test:		$(PROG) test0.cdl
-	${ENVIR} $(NCGEN) -o test0.nc -n test0.cdl
-	${ENVIR} ./$(PROG) test0.nc > test1.cdl
-	${ENVIR} $(NCGEN) -o test1.nc -n test1.cdl
-	${ENVIR} ./$(PROG) -n test0 test1.nc > test2.cdl
-	@cmp test1.cdl test2.cdl && \
-	    echo "*** $(PROGRAM) test successful ***" ; \
-	    rm test1.cdl test1.nc test2.cdl
diff --git a/science/hdf5/files/mfhdf/ncgen/Makefile b/science/hdf5/files/mfhdf/ncgen/Makefile
deleted file mode 100644
index d954137cffa8..000000000000
--- a/science/hdf5/files/mfhdf/ncgen/Makefile
+++ /dev/null
@@ -1,72 +0,0 @@
-# $FreeBSD$
-
-PROG		 = ncgen
-MANDIR		 = ${PREFIX}/man/man
-LDFLAGS		+= -L${.CURDIR}/../libsrc -L${.CURDIR}/../../hdf/src -lmfhdf -ldf
-CFLAGS		+= -I${.CURDIR}/../libsrc -I${.CURDIR}/../../hdf/src -DNDEBUG
-SRCS		 = main.c generate.c load.c ncgentab.c escapes.c \
-		  getfill.c init.c close.c genlib.c
-
-ENVIR		 = env LD_LIBRARY_PATH=${.CURDIR}/../libsrc:${.CURDIR}/../../hdf/src
-NCDUMP		 = ${.CURDIR}/../ncdump/ncdump
-
-test:           $(PROG) test0.cdl btest ctest ftest
-
-ncgenyy.c: ncgen.l
-	${LEX} ${LFLAGS} ncgen.l
-	mv lex.yy.c ncgenyy.c
-	
-ncgentab.c: ncgenyy.c ncgen.y
-	${YACC} ${YFLAGS} ncgen.y
-	mv y.tab.c ncgentab.c
-	mv y.tab.h ncgentab.h
-
-.include <bsd.prog.mk>
-
-#
-# test "-b" option of ncgen
-#
-btest:		$(PROG) test0.cdl test1.cdl
-	${ENVIR} ./$(PROG) -b test1.cdl
-	${ENVIR} $(NCDUMP) test1.nc > test2.cdl
-	@diff test1.cdl test2.cdl && \
-	    echo "*** $(PROG) -b test successful ***"
-
-#
-# test "-c" option of ncgen
-#
-ctest:		test1.cdl ctest0
-	${ENVIR} ./ctest0		# tests `-c' option, creates ctest0.nc
-	${ENVIR} $(NCDUMP) -n test1 ctest0.nc > ctest1.cdl
-	@diff test1.cdl ctest1.cdl && \
-	    echo "*** $(PROG) -c test successful ***"
-
-ctest0:		ncgen test0.cdl
-	${ENVIR} ./$(PROG) -c -o ctest0.nc test0.cdl > test0.c
-	$(CC) $(CFLAGS) -o $@ test0.c ${LDFLAGS}
-
-#
-# test "-f" option of ncgen
-#
-ftest:	test1.cdl ftest0
-	${ENVIR} ./ftest0
-	${ENVIR} $(NCDUMP) -n test1 ftest0.nc > ftest1.cdl
-	@if diff test1.cdl ftest1.cdl; then \
-		echo "*** ncgen -f test successful ***"; \
-	else \
-		echo "*** ncgen -f test failed " \
-		    "(but roundoff differences are OK) ***"; \
-	fi
-
-ftest0:	$(PROG) test0.cdl netcdf.inc
-	${ENVIR} ./$(PROG) -f -o ftest0.nc test0.cdl > test0.f; \
-	$(FC) $(FFLAGS) ${CFLAGS} -o $@ test0.f ${LDFLAGS}
-
-test1.cdl:	test0.nc
-	${ENVIR} $(NCDUMP) -n test1 test0.nc > $@
-
-test0.nc:	$(PROG) test0.cdl
-	${ENVIR} ./$(PROG) -b -o test0.nc test0.cdl
-
-netcdf.inc:
-	ln -s ../fortran/config/netcdf-fbsd.inc $@
diff --git a/science/hdf5/files/mfhdf/nctest/Makefile b/science/hdf5/files/mfhdf/nctest/Makefile
deleted file mode 100644
index 722d3524a482..000000000000
--- a/science/hdf5/files/mfhdf/nctest/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $FreeBSD$
-
-PROG		 = nctest
-NOMAN		 = 1
-CFLAGS		+= -I${.CURDIR}/../libsrc
-LDFLAGS		+= -L${.CURDIR}/../libsrc -L${.CURDIR}/../../hdf/src -lmfhdf -ldf
-SRCS		= varget.c vargetg.c varput.c varputg.c vardef.c vartests.c \
-		  vputget.c vputgetg.c driver.c cdftests.c dimtests.c rec.c \
-		  atttests.c misctest.c add.c error.c emalloc.c val.c slabs.c
-
-install:
-
-.include <bsd.prog.mk>
-
-test:		$(PROG)
-	@ echo "==========================="
-	@ echo "netCDF C interface tests"
-	@ echo "==========================="
-	env LD_LIBRARY_PATH=${.CURDIR}/../libsrc:${.CURDIR}/../../hdf/src ./$(PROG)
diff --git a/science/hdf5/pkg-descr b/science/hdf5/pkg-descr
index 222d6e8bf354..35a0fc9e23cf 100644
--- a/science/hdf5/pkg-descr
+++ b/science/hdf5/pkg-descr
@@ -1,22 +1,17 @@
-From HDF's manpage:
+HDF5 is a completely new Hierarchical Data Format product consisting of a
+data format specification and a supporting library implementation. HDF5 is
+designed to address some of the limitations of the older HDF product and to
+address current and anticipated requirements of modern systems and
+applications.
 
-       hdf - Hierarchical Data Format library
+HDF5 includes the following improvements.
+   - A new file format designed to address some of the deficiencies of HDF4.x,
+     particularly the need to store larger files and more objects per file.
+   - A simpler, more comprehensive data model that includes only two basic
+     structures: a multidimensional array of record structures, and a grouping
+     structure.
+   - A simpler, better-engineered library and API, with improved support for
+     parallel I/O, threads, and other requirements imposed by modern systems
+     and applications.
 
-Description:
-       HDF  is	a  multi-object  file format that facilitates the
-       transfer of  various  types  of	scientific  data  between
-       machines  and  operating systems.  Machines currently sup-
-       ported  include	the  Cray,  Convex,  HP,  Vax,	Sun,  IBM
-       RS/6000,  Silicon  Graphics, Macintosh, and IBM PC comput-
-       ers.  HDF allows self-definitions of data content and easy
-       extensibility  for  future  enhancements  or compatibility
-       with other standard formats. HDF includes  Fortran  and	C
-       calling	interfaces,and	utilities to prepare raw image of
-       data files or for use with other NCSA software.	 The  HDF
-       library	contains  interfaces  for  storing and retrieving
-       compressed or uncompressed 8-bit and 24-bit raster  images
-       with   palettes,  n-Dimensional	scientific  datasets  and
-       binary tables. An interface is also included  that  allows
-       arbitray grouping of other HDF objects.
-
-WWW: http://hdf.ncsa.uiuc.edu/
+WWW: http://hdf.ncsa.uiuc.edu/HDF5/
diff --git a/science/hdf5/pkg-plist b/science/hdf5/pkg-plist
index a0ca0c5f4e40..4e37599a505c 100644
--- a/science/hdf5/pkg-plist
+++ b/science/hdf5/pkg-plist
@@ -1,81 +1,78 @@
-bin/fp2hdf
-bin/hdf24to8
-bin/hdf2jpeg
-bin/hdf8to24
-bin/hdfcomp
-bin/hdfed
-bin/hdfls
-bin/hdfpack
-bin/hdftopal
-bin/hdftor8
-bin/hdfunpac
-bin/hdp
-bin/jpeg2hdf
-bin/ncdump
-bin/ncgen
-bin/paltohdf
-bin/r8tohdf
-bin/ristosds
-bin/vcompat
-bin/vmake
-bin/vshow
-include/atom.h
-include/bitvect.h
-include/cdeflate.h
-include/cnbit.h
-include/cnone.h
-include/crle.h
-include/cskphuff.h
-include/df.h
-include/dfan.h
-include/dfconvrt.h
-include/dffunc.inc
-include/dfgr.h
-include/dfi.h
-include/dfivms.h
-include/dfrig.h
-include/dfsd.h
-include/dfstubs.h
-include/dfufp2i.h
-include/dir_mac.h
-include/dynarray.h
-include/glist.h
-include/hbitio.h
-include/hchunks.h
-include/hcomp.h
-include/hcompi.h
-include/hconv.h
-include/hdf.h
-include/hdf.inc
-include/hdf2netcdf.h
-include/hdfi.h
-include/herr.h
-include/hfile.h
-include/hkit.h
-include/hlimits.h
-include/hntdefs.h
-include/hproto.h
-include/hqueue.h
-include/htags.h
-include/linklist.h
-include/local_nc.h
-include/maldebug.h
-include/mcache.h
-include/mfan.h
-include/mfgr.h
-include/mfhdf.h
-include/mstdio.h
-include/netcdf.h
-include/netcdf.inc
-include/sys_dir_mac.h
-include/tbbt.h
-include/trace.h
-include/vattr.h
-include/vg.h
-include/vgint.h
-lib/libdf.a
-lib/libdf.so
-lib/libdf.so.1
-lib/libmfhdf.a
-lib/libmfhdf.so
-lib/libmfhdf.so.2
+bin/gif2h5
+bin/h52gif
+bin/h5cc
+bin/h5debug
+bin/h5dump
+bin/h5import
+bin/h5ls
+bin/h5perf
+bin/h5redeploy
+bin/h5repart
+include/H5ACpublic.h
+include/H5AbstractDs.h
+include/H5Alltypes.h
+include/H5Apublic.h
+include/H5AtomType.h
+include/H5Attribute.h
+include/H5Bpublic.h
+include/H5Classes.h
+include/H5CommonFG.h
+include/H5CompType.h
+include/H5Cpp.h
+include/H5DataSet.h
+include/H5DataSpace.h
+include/H5DataType.h
+include/H5DcreatProp.h
+include/H5Dpublic.h
+include/H5DxferProp.h
+include/H5EnumType.h
+include/H5Epublic.h
+include/H5Exception.h
+include/H5FDcore.h
+include/H5FDfamily.h
+include/H5FDgass.h
+include/H5FDlog.h
+include/H5FDmpio.h
+include/H5FDmulti.h
+include/H5FDpublic.h
+include/H5FDsec2.h
+include/H5FDsrb.h
+include/H5FDstdio.h
+include/H5FDstream.h
+include/H5FaccProp.h
+include/H5FcreatProp.h
+include/H5File.h
+include/H5FloatType.h
+include/H5Fpublic.h
+include/H5Gpublic.h
+include/H5Group.h
+include/H5HGpublic.h
+include/H5HLpublic.h
+include/H5IdComponent.h
+include/H5Idtemplates.h
+include/H5Include.h
+include/H5IntType.h
+include/H5Ipublic.h
+include/H5Library.h
+include/H5MMpublic.h
+include/H5Object.h
+include/H5Opublic.h
+include/H5Ppublic.h
+include/H5PredType.h
+include/H5PropList.h
+include/H5RefCounter.h
+include/H5Rpublic.h
+include/H5Spublic.h
+include/H5StrType.h
+include/H5Tpublic.h
+include/H5Zpublic.h
+include/H5api_adpt.h
+include/H5pubconf.h
+include/H5public.h
+include/hdf5.h
+lib/libhdf5.a
+lib/libhdf5.la
+lib/libhdf5.settings
+lib/libhdf5.so.0
+lib/libhdf5_cpp.a
+lib/libhdf5_cpp.la
diff --git a/science/hdf5/scripts/post-patch b/science/hdf5/scripts/post-patch
deleted file mode 100644
index abb1fc2ea1fb..000000000000
--- a/science/hdf5/scripts/post-patch
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/sh
-
-for f in `find ${WRKSRC} -type f -name Makefile.in -print | xargs grep -l "^CFLAGS = -ansi -O"`
-do
-patch -p << END_OF_PATCH
---- $f.orig
-+++ $f
-@@ -72,1 +72,1 @@
--CFLAGS = -ansi -O
-+#CFLAGS = -ansi -O
-END_OF_PATCH
-done
-for f in `find ${WRKSRC} -type f -name Makefile.in -print | xargs grep -l "^ZLIB_LIB = "`
-do
-patch -p << END_OF_PATCH
---- $f.orig
-+++ $f
-@@ -72,1 +72,1 @@
--ZLIB_LIB = \$(TOP_SRCDIR)/hdf/zlib/libz.a
-+#ZLIB_LIB = \$(TOP_SRCDIR)/hdf/zlib/libz.a
-END_OF_PATCH
-done
-for f in `find ${WRKSRC} -type f -name Makefile.in -print | xargs grep -l "^JPEG_LIB = "`
-do
-patch -p << END_OF_PATCH
---- $f.orig
-+++ $f
-@@ -72,1 +72,1 @@
--JPEG_LIB = \$(TOP_SRCDIR)/hdf/jpeg/libjpeg.a
-+#JPEG_LIB = \$(TOP_SRCDIR)/hdf/jpeg/libjpeg.a
-END_OF_PATCH
-done
-for f in `find ${WRKSRC} -type f -name Makefile.in -print | xargs grep -l "^ZLIBLIB="`
-do
-patch -p << END_OF_PATCH
---- $f.orig
-+++ $f
-@@ -72,2 +72,2 @@
--ZLIBINC=\$(srcdir)/../zlib
--ZLIBLIB=\$(srcdir)/../zlib
-+ZLIBINC=/usr/include
-+ZLIBLIB=-lz \$(pwrkdir)
-END_OF_PATCH
-done
-
-for f in `find ${WRKSRC} -type f -name Makefile.in -print | xargs grep -l "^ZLIBLIB="`
-do
-patch -p << END_OF_PATCH
---- $f.orig
-+++ $f
-@@ -72,2 +72,2 @@
--ZLIBLIB=\$(srcdir)/../zlib
--ZLIBINC=\$(srcdir)/../zlib
-+ZLIBLIB=-lz
-+ZLIBINC=/usr/include
-END_OF_PATCH
-done
-
-for f in `find ${WRKSRC} -type f -name Makefile.in -print | xargs grep -l "^JPEGLIB="`
-do
-patch -p << END_OF_PATCH
---- $f.orig
-+++ $f
-@@ -72,2 +72,2 @@
--JPEGINC=\$(srcdir)/../jpeg
--JPEGLIB=\$(srcdir)/../jpeg
-+JPEGINC=\$(prefix)/include
-+JPEGLIB=\$(prefix)/lib
-END_OF_PATCH
-done
-
-for f in `find ${WRKSRC} -type f -name Makefile.in -print | xargs grep -l "^JPEGLIB="`
-do
-patch -p << END_OF_PATCH
---- $f.orig
-+++ $f
-@@ -72,2 +72,2 @@
--JPEGLIB=\$(srcdir)/../jpeg
--JPEGINC=\$(srcdir)/../jpeg
-+JPEGLIB=\$(prefix)/lib
-+JPEGINC=\$(prefix)/include
-END_OF_PATCH
-done