20 files changed, 651 insertions, 531 deletions

diff --git a/science/hdf/Makefile b/science/hdf/Makefile
index 1002a5f48cd1..f648d4e7fb03 100644
--- a/science/hdf/Makefile
+++ b/science/hdf/Makefile
@@ -6,26 +6,28 @@
 #
 
 PORTNAME=	hdf
-PORTVERSION=	4.1r5
+PORTVERSION=	4.2r1
 CATEGORIES=	science archivers graphics
-MASTER_SITES=	ftp://ftp.ncsa.uiuc.edu/HDF/HDF/HDF${PORTVERSION}/tar/
+MASTER_SITES=	ftp://ftp.ncsa.uiuc.edu/HDF/HDF/HDF${PORTVERSION}/src/
 DISTNAME=	HDF${PORTVERSION}
 
-MAINTAINER=	mi@aldan.algebra.com
+MAINTAINER=	glewis@FreeBSD.org
 COMMENT=	Hierarchical Data Format library (from NCSA)
 
+BUILD_DEPENDS=	${LOCALBASE}/bin/libtool15:${PORTSDIR}/devel/libtool15
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 
 CONFLICTS=	netcdf-*
 
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=--with-jpeg="${LOCALBASE}"
+USE_REINPLACE=	yes
+
 MAN1=		hdf.1 hdfunpac.1 ncdump.1 ncgen.1
-MAN3=		gr_chunk.3
-MANCOMPRESSED=	maybe
+MANCOMPRESSED=	no
 
 INSTALLS_SHLIB=	yes
 
-MAKE_ARGS=	PREFIX="${PREFIX}" -j 2
-
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} != "i386" && ${ARCH} != "alpha"
@@ -33,16 +35,10 @@ BROKEN=		"Does not compile on !i386 and !alpha"
 .endif
 
 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
+	${REINPLACE_CMD} -e "s:%%LOCALBASE%%:${LOCALBASE}:" \
+		${WRKSRC}/hdf/src/Makefile.in ${WRKSRC}/mfhdf/libsrc/Makefile.in
 
 test: build
-	cd ${WRKSRC}; ${MAKE} test
+	cd ${WRKSRC}/hdf/test && ${MAKE} check
 
 .include <bsd.port.post.mk>
diff --git a/science/hdf/distinfo b/science/hdf/distinfo
index 1b704522754a..3a5119eb970a 100644
--- a/science/hdf/distinfo
+++ b/science/hdf/distinfo
@@ -1,2 +1,2 @@
-MD5 (HDF4.1r5.tar.gz) = f90de772dac93195def4a585da176db2
-SIZE (HDF4.1r5.tar.gz) = 4423795
+MD5 (HDF4.2r1.tar.gz) = 9082c6fa913b9188452fa6c5217e1573
+SIZE (HDF4.2r1.tar.gz) = 3911745
diff --git a/science/hdf/files/Makefile b/science/hdf/files/Makefile
deleted file mode 100644
index 01e4c2032943..000000000000
--- a/science/hdf/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/hdf/files/hdf/Makefile b/science/hdf/files/hdf/Makefile
deleted file mode 100644
index 1f9663c03246..000000000000
--- a/science/hdf/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/hdf/files/hdf/src/Makefile b/science/hdf/files/hdf/src/Makefile
deleted file mode 100644
index d486e4956b82..000000000000
--- a/science/hdf/files/hdf/src/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-# $FreeBSD$
-
-LIB=df
-
-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/hdf/files/hdf/test/Makefile b/science/hdf/files/hdf/test/Makefile
deleted file mode 100644
index 3a3c8ca98524..000000000000
--- a/science/hdf/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/hdf/files/hdf/util/Makefile b/science/hdf/files/hdf/util/Makefile
deleted file mode 100644
index 6d4ccae200d4..000000000000
--- a/science/hdf/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/hdf/files/man/Makefile b/science/hdf/files/man/Makefile
deleted file mode 100644
index 6c63417f56be..000000000000
--- a/science/hdf/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.prog.mk>
-
-install: all-man maninstall
-
-clean:
-	-rm -f *.gz
-
-all: all-man
-
-depend:
diff --git a/science/hdf/files/mfhdf/Makefile b/science/hdf/files/mfhdf/Makefile
deleted file mode 100644
index 202766e54f67..000000000000
--- a/science/hdf/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/hdf/files/mfhdf/dumper/Makefile b/science/hdf/files/mfhdf/dumper/Makefile
deleted file mode 100644
index 1bd8b3dfa744..000000000000
--- a/science/hdf/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/hdf/files/mfhdf/fortran/Makefile b/science/hdf/files/mfhdf/fortran/Makefile
deleted file mode 100644
index 03571382ccc3..000000000000
--- a/science/hdf/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/hdf/files/mfhdf/libsrc/Makefile b/science/hdf/files/mfhdf/libsrc/Makefile
deleted file mode 100644
index 6b1c2137bc76..000000000000
--- a/science/hdf/files/mfhdf/libsrc/Makefile
+++ /dev/null
@@ -1,43 +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
-
-# 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. ${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/hdf/files/mfhdf/ncdump/Makefile b/science/hdf/files/mfhdf/ncdump/Makefile
deleted file mode 100644
index 727b1de60b32..000000000000
--- a/science/hdf/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/hdf/files/mfhdf/ncgen/Makefile b/science/hdf/files/mfhdf/ncgen/Makefile
deleted file mode 100644
index d954137cffa8..000000000000
--- a/science/hdf/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/hdf/files/mfhdf/nctest/Makefile b/science/hdf/files/mfhdf/nctest/Makefile
deleted file mode 100644
index 722d3524a482..000000000000
--- a/science/hdf/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/hdf/files/patch-hdf-src-Makefile.in b/science/hdf/files/patch-hdf-src-Makefile.in
new file mode 100644
index 000000000000..cb12f0cf0c28
--- /dev/null
+++ b/science/hdf/files/patch-hdf-src-Makefile.in
@@ -0,0 +1,272 @@
+--- hdf/src/Makefile.in.orig	Wed Dec 10 14:13:16 2003
++++ hdf/src/Makefile.in	Tue Mar 15 16:30:15 2005
+@@ -82,6 +82,7 @@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
++LIBTOOL = %%LOCALBASE%%/bin/libtool15
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+@@ -89,7 +90,7 @@
+ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ NEQN = @NEQN@
+-OBJEXT = @OBJEXT@
++OBJEXT = lo
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -104,6 +105,7 @@
+ TBL = @TBL@
+ VERSION = @VERSION@
+ YACC = @YACC@
++ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+@@ -144,11 +146,11 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ 
+-lib_LIBRARIES = libdf.a
++lib_LTLIBRARIES = libdf.la
+ 
+ FSOURCES = df24ff.f dfanf.c dfanff.f dff.c dfff.f dfpf.c dfpff.f dfr8f.c    \
+            dfr8ff.f dfsdf.c dfsdff.f dfufp2if.f dfutilf.c herrf.c hfilef.c  \
+-           hfileff.f mfanf.c mfgrf.c mfgrff.f vattrf.c vattrff.f vgf.c vgff.f 
++           hfileff.f mfanf.c mfgrf.c mfgrff.f vattrf.c vattrff.f vgf.c vgff.f
+ 
+ CSOURCES = atom.c bitvect.c cdeflate.c cnbit.c cnone.c crle.c cskphuff.c    \
+            cszip.c df24.c df24f.c dfan.c dfcomp.c dfconv.c dfgr.c dfgroup.c \
+@@ -170,8 +172,9 @@
+ 
+ FHEADERS = dffunc.f90 hdf.f90 dffunc.inc hdf.inc
+ 
+-@HDF_BUILD_FORTRAN_TRUE@libdf_a_SOURCES = $(CSOURCES) $(FSOURCES)
+-@HDF_BUILD_FORTRAN_FALSE@libdf_a_SOURCES = $(CSOURCES)
++@HDF_BUILD_FORTRAN_TRUE@libdf_la_SOURCES = $(CSOURCES) $(FSOURCES)
++@HDF_BUILD_FORTRAN_FALSE@libdf_la_SOURCES = $(CSOURCES)
++libdf_la_LDFLAGS = -version-info 1:0:0
+ @HDF_BUILD_FORTRAN_TRUE@include_HEADERS = $(CHEADERS) $(FHEADERS)
+ @HDF_BUILD_FORTRAN_FALSE@include_HEADERS = $(CHEADERS)
+ 
+@@ -186,11 +189,11 @@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
+ CONFIG_HEADER = h4config.h
+ CONFIG_CLEAN_FILES =
+-LIBRARIES = $(lib_LIBRARIES)
++LTLIBRARIES = $(lib_LTLIBRARIES)
+ 
+-libdf_a_AR = $(AR) cru
+-libdf_a_LIBADD =
+-am__libdf_a_SOURCES_DIST = atom.c bitvect.c cdeflate.c cnbit.c cnone.c \
++libdf_la_AR = $(AR) cru
++libdf_la_LIBADD =
++am__libdf_la_SOURCES_DIST = atom.c bitvect.c cdeflate.c cnbit.c cnone.c \
+ 	crle.c cskphuff.c cszip.c df24.c df24f.c dfan.c dfcomp.c \
+ 	dfconv.c dfgr.c dfgroup.c dfimcomp.c dfjpeg.c dfkconv.c \
+ 	dfkcray.c dfkfuji.c dfknat.c dfkswap.c dfkvms.c dfp.c dfr8.c \
+@@ -229,10 +232,10 @@
+ 	herrf.$(OBJEXT) hfilef.$(OBJEXT) hfileff.$(OBJEXT) \
+ 	mfanf.$(OBJEXT) mfgrf.$(OBJEXT) mfgrff.$(OBJEXT) \
+ 	vattrf.$(OBJEXT) vattrff.$(OBJEXT) vgf.$(OBJEXT) vgff.$(OBJEXT)
+-@HDF_BUILD_FORTRAN_TRUE@am_libdf_a_OBJECTS = $(am__objects_1) \
++@HDF_BUILD_FORTRAN_TRUE@am_libdf_la_OBJECTS = $(am__objects_1) \
+ @HDF_BUILD_FORTRAN_TRUE@	$(am__objects_2)
+-@HDF_BUILD_FORTRAN_FALSE@am_libdf_a_OBJECTS = $(am__objects_1)
+-libdf_a_OBJECTS = $(am_libdf_a_OBJECTS)
++@HDF_BUILD_FORTRAN_FALSE@am_libdf_la_OBJECTS = $(am__objects_1)
++libdf_la_OBJECTS = $(am_libdf_la_OBJECTS)
+ 
+ DEFAULT_INCLUDES =  -I. -I$(srcdir) -I.
+ depcomp = $(SHELL) $(top_srcdir)/bin/depcomp
+@@ -275,23 +278,28 @@
+ @AMDEP_TRUE@	./$(DEPDIR)/vrw.Po ./$(DEPDIR)/vsfld.Po
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ F77COMPILE = $(F77) $(AM_FFLAGS) $(FFLAGS)
++LTF77COMPILE = $(LIBTOOL) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS)
+ F77LD = $(F77)
+-F77LINK = $(F77LD) $(AM_FFLAGS) $(FFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-DIST_SOURCES = $(am__libdf_a_SOURCES_DIST)
++F77LINK = $(LIBTOOL) --mode=link $(F77LD) $(AM_FFLAGS) $(FFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = $(am__libdf_la_SOURCES_DIST)
+ HEADERS = $(include_HEADERS)
+ 
+ DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.in INSTALL \
+ 	Makefile.am h4config.h.in
+-SOURCES = $(libdf_a_SOURCES)
++SOURCES = $(libdf_la_SOURCES)
+ 
+ all: h4config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-am
+ 
+ .SUFFIXES:
+-.SUFFIXES: .inc .f90 .c .f .o .obj
++.SUFFIXES: .inc .f90 .c .f .lo .o .obj
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+ 	  $(AUTOMAKE) --foreign  hdf/src/Makefile
+@@ -314,40 +322,37 @@
+ 
+ distclean-hdr:
+ 	-rm -f h4config.h stamp-h1
+-libLIBRARIES_INSTALL = $(INSTALL_DATA)
+-install-libLIBRARIES: $(lib_LIBRARIES)
++libLTLIBRARIES_INSTALL = $(INSTALL)
++install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+ 	$(mkinstalldirs) $(DESTDIR)$(libdir)
+-	@list='$(lib_LIBRARIES)'; for p in $$list; do \
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    echo " $(libLIBRARIES_INSTALL) $$p $(DESTDIR)$(libdir)/$$f"; \
+-	    $(libLIBRARIES_INSTALL) $$p $(DESTDIR)$(libdir)/$$f; \
+-	  else :; fi; \
+-	done
+-	@$(POST_INSTALL)
+-	@list='$(lib_LIBRARIES)'; for p in $$list; do \
+-	  if test -f $$p; then \
+-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
+-	    $(RANLIB) $(DESTDIR)$(libdir)/$$p; \
++	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ 	  else :; fi; \
+ 	done
+ 
+-uninstall-libLIBRARIES:
++uninstall-libLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@list='$(lib_LIBRARIES)'; for p in $$list; do \
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  p="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f $(DESTDIR)$(libdir)/$$p"; \
+-	  rm -f $(DESTDIR)$(libdir)/$$p; \
++	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ 	done
+ 
+-clean-libLIBRARIES:
++clean-libLTLIBRARIES:
+ 	-test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES)
+-libdf.a: $(libdf_a_OBJECTS) $(libdf_a_DEPENDENCIES) 
+-	-rm -f libdf.a
+-	$(libdf_a_AR) libdf.a $(libdf_a_OBJECTS) $(libdf_a_LIBADD)
+-	$(RANLIB) libdf.a
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
++	  test "$$dir" = "$$p" && dir=.; \
++	  echo "rm -f \"$${dir}/so_locations\""; \
++	  rm -f "$${dir}/so_locations"; \
++	done
++libdf.la: $(libdf_la_OBJECTS) $(libdf_la_DEPENDENCIES)
++	$(LINK) -rpath $(libdir) $(libdf_la_LDFLAGS) $(libdf_la_OBJECTS) $(libdf_la_LIBADD) $(LIBS)
++	$(LN_S) .libs/libdf.a libdf.a
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT) core *.core
+@@ -450,11 +455,32 @@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ 
++.c.lo:
++@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
++@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
++@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
++@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
++@am__fastdepCC_TRUE@	fi
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++
+ .f.o:
+ 	$(F77COMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .f.obj:
+ 	$(F77COMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
++
++.f.lo:
++	$(LTF77COMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
++
++mostlyclean-libtool:
++	-rm -f *.lo
++
++clean-libtool:
++	-rm -rf .libs _libs
++
+ uninstall-info-am:
+ includeHEADERS_INSTALL = $(INSTALL_HEADER)
+ install-includeHEADERS: $(include_HEADERS)
+@@ -562,7 +588,7 @@
+ 	done
+ check-am: all-am
+ check: check-am
+-all-am: Makefile $(LIBRARIES) $(HEADERS) h4config.h
++all-am: Makefile $(LTLIBRARIES) $(HEADERS) h4config.h
+ 
+ installdirs:
+ 	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
+@@ -593,7 +619,7 @@
+ 	@echo "it deletes files that may require special tools to rebuild."
+ clean: clean-am
+ 
+-clean-am: clean-generic clean-libLIBRARIES mostlyclean-am
++clean-am: clean-generic clean-libLTLIBRARIES clean-libtool mostlyclean-am
+ 
+ distclean: distclean-am
+ 	-rm -rf ./$(DEPDIR)
+@@ -612,7 +638,7 @@
+ 
+ install-data-am: install-includeHEADERS
+ 
+-install-exec-am: install-libLIBRARIES
++install-exec-am: install-libLTLIBRARIES
+ 
+ install-info: install-info-am
+ 
+@@ -628,7 +654,7 @@
+ 
+ mostlyclean: mostlyclean-am
+ 
+-mostlyclean-am: mostlyclean-compile mostlyclean-generic
++mostlyclean-am: mostlyclean-compile mostlyclean-generic mostlyclean-libtool
+ 
+ pdf: pdf-am
+ 
+@@ -639,20 +665,20 @@
+ ps-am:
+ 
+ uninstall-am: uninstall-includeHEADERS uninstall-info-am \
+-	uninstall-libLIBRARIES
++	uninstall-libLTLIBRARIES
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+-	clean-libLIBRARIES ctags distclean distclean-compile \
++	clean-libLTLIBRARIES clean-libtool ctags distclean distclean-compile \
+ 	distclean-generic distclean-hdr distclean-tags distdir dvi \
+ 	dvi-am info info-am install install-am install-data \
+ 	install-data-am install-exec install-exec-am \
+ 	install-includeHEADERS install-info install-info-am \
+-	install-libLIBRARIES install-man install-strip installcheck \
++	install-libLTLIBRARIES install-man install-strip installcheck \
+ 	installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+-	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+ 	uninstall-am uninstall-includeHEADERS uninstall-info-am \
+-	uninstall-libLIBRARIES
++	uninstall-libLTLIBRARIES
+ 
+ .inc.f90:
+ 	if test -f $<; then                                             \
diff --git a/science/hdf/files/patch-hdf-src-cszip.c b/science/hdf/files/patch-hdf-src-cszip.c
new file mode 100644
index 000000000000..c0e88e6a699f
--- /dev/null
+++ b/science/hdf/files/patch-hdf-src-cszip.c
@@ -0,0 +1,22 @@
+--- hdf/src/cszip.c.orig	Wed Mar 16 14:27:46 2005
++++ hdf/src/cszip.c	Wed Mar 16 14:27:49 2005
+@@ -865,6 +865,7 @@
+     compinfo_t *info;           /* special element information */
+     comp_coder_szip_info_t *szip_info;    /* ptr to SZIP info */
+ 
++#ifdef H4_HAVE_LIBSZ
+     if (SZ_encoder_enabled() == 0) 
+ 	HRETURN_ERROR(DFE_NOENCODER, FAIL);
+     info = (compinfo_t *) access_rec->special_info;
+@@ -881,6 +882,11 @@
+         HRETURN_ERROR(DFE_CENCODE, FAIL);
+ 
+     return (length);
++#else /* ifdef H4_HAVE_LIBSZ */
++
++    HRETURN_ERROR(DFE_CANTDECOMP, FAIL);
++
++#endif /* H4_HAVE_LIBSZ */
+ }   /* HCPcszip_write() */
+ 
+ /*--------------------------------------------------------------------------
diff --git a/science/hdf/files/patch-mfhdf-libsrc-Makefile.in b/science/hdf/files/patch-mfhdf-libsrc-Makefile.in
new file mode 100644
index 000000000000..590b6785a1be
--- /dev/null
+++ b/science/hdf/files/patch-mfhdf-libsrc-Makefile.in
@@ -0,0 +1,330 @@
+--- mfhdf/libsrc/Makefile.in.orig	Wed Feb  9 18:35:08 2005
++++ mfhdf/libsrc/Makefile.in	Wed Mar 16 12:05:19 2005
+@@ -82,6 +82,7 @@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
++LIBTOOL = %%LOCALBASE%%/bin/libtool15
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+@@ -89,7 +90,7 @@
+ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ NEQN = @NEQN@
+-OBJEXT = @OBJEXT@
++OBJEXT = lo
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -104,6 +105,7 @@
+ TBL = @TBL@
+ VERSION = @VERSION@
+ YACC = @YACC@
++ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+@@ -154,7 +156,7 @@
+ 
+ #############################################################################
+ #############################################################################
+-lib_LIBRARIES = libmfhdf.a
++lib_LTLIBRARIES = libmfhdf.la
+ 
+ CSOURCES = array.c attr.c cdf.c dim.c file.c hdfsds.c iarray.c error.c    \
+          globdef.c mfsd.c nssdc.c putget.c putgetg.c sharray.c string.c \
+@@ -162,14 +164,15 @@
+ 
+ FSOURCES = ../fortran/jackets.c ../fortran/mfsdf.c ../fortran/mfsdff.f
+ XDRSOURCES = ../xdr/xdr.c ../xdr/xdrfloat.c ../xdr/xdrstdio.c ../xdr/xdrarray.c
+-@HDF_BUILD_FORTRAN_FALSE@@HDF_BUILD_XDR_FALSE@libmfhdf_a_SOURCES = $(CSOURCES)
+-@HDF_BUILD_FORTRAN_TRUE@@HDF_BUILD_XDR_FALSE@libmfhdf_a_SOURCES = $(CSOURCES) $(FSOURCES)
++@HDF_BUILD_FORTRAN_FALSE@@HDF_BUILD_XDR_FALSE@libmfhdf_la_SOURCES = $(CSOURCES)
++@HDF_BUILD_FORTRAN_TRUE@@HDF_BUILD_XDR_FALSE@libmfhdf_la_SOURCES = $(CSOURCES) $(FSOURCES)
+ 
+-@HDF_BUILD_FORTRAN_TRUE@@HDF_BUILD_XDR_TRUE@libmfhdf_a_SOURCES = $(CSOURCES) $(FSOURCES) $(XDRSOURCES)
++@HDF_BUILD_FORTRAN_TRUE@@HDF_BUILD_XDR_TRUE@libmfhdf_la_SOURCES = $(CSOURCES) $(FSOURCES) $(XDRSOURCES)
+ 
+-@HDF_BUILD_FORTRAN_FALSE@@HDF_BUILD_XDR_TRUE@libmfhdf_a_SOURCES = $(CSOURCES) $(XDRSOURCES)
++@HDF_BUILD_FORTRAN_FALSE@@HDF_BUILD_XDR_TRUE@libmfhdf_la_SOURCES = $(CSOURCES) $(XDRSOURCES)
++libmfhdf_la_LDFLAGS = -version-info 2:0:0
+ 
+-include_HEADERS = hdf2netcdf.h local_nc.h mfhdf.h netcdf.h 
++include_HEADERS = hdf2netcdf.h local_nc.h mfhdf.h netcdf.h
+ 
+ 
+ #############################################################################
+@@ -193,11 +196,11 @@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/hdf/src/h4config.h
+ CONFIG_CLEAN_FILES =
+-LIBRARIES = $(lib_LIBRARIES)
++LTLIBRARIES = $(lib_LTLIBRARIES)
+ 
+-libmfhdf_a_AR = $(AR) cru
+-libmfhdf_a_LIBADD =
+-am__libmfhdf_a_SOURCES_DIST = array.c attr.c cdf.c dim.c file.c hdfsds.c \
++libmfhdf_la_AR = $(AR) cru
++libmfhdf_la_LIBADD =
++am__libmfhdf_la_SOURCES_DIST = array.c attr.c cdf.c dim.c file.c hdfsds.c \
+ 	iarray.c error.c globdef.c mfsd.c nssdc.c putget.c putgetg.c \
+ 	sharray.c string.c var.c xdrposix.c ../fortran/jackets.c \
+ 	../fortran/mfsdf.c ../fortran/mfsdff.f ../xdr/xdr.c \
+@@ -211,19 +214,19 @@
+ am__objects_2 = xdr.$(OBJEXT) xdrfloat.$(OBJEXT) xdrstdio.$(OBJEXT) \
+ 	xdrarray.$(OBJEXT)
+ am__objects_3 = jackets.$(OBJEXT) mfsdf.$(OBJEXT) mfsdff.$(OBJEXT)
+-@HDF_BUILD_FORTRAN_FALSE@@HDF_BUILD_XDR_TRUE@am_libmfhdf_a_OBJECTS = \
++@HDF_BUILD_FORTRAN_FALSE@@HDF_BUILD_XDR_TRUE@am_libmfhdf_la_OBJECTS = \
+ @HDF_BUILD_FORTRAN_FALSE@@HDF_BUILD_XDR_TRUE@	$(am__objects_1) \
+ @HDF_BUILD_FORTRAN_FALSE@@HDF_BUILD_XDR_TRUE@	$(am__objects_2)
+-@HDF_BUILD_FORTRAN_FALSE@@HDF_BUILD_XDR_FALSE@am_libmfhdf_a_OBJECTS = \
++@HDF_BUILD_FORTRAN_FALSE@@HDF_BUILD_XDR_FALSE@am_libmfhdf_la_OBJECTS = \
+ @HDF_BUILD_FORTRAN_FALSE@@HDF_BUILD_XDR_FALSE@	$(am__objects_1)
+-@HDF_BUILD_FORTRAN_TRUE@@HDF_BUILD_XDR_TRUE@am_libmfhdf_a_OBJECTS = \
++@HDF_BUILD_FORTRAN_TRUE@@HDF_BUILD_XDR_TRUE@am_libmfhdf_la_OBJECTS = \
+ @HDF_BUILD_FORTRAN_TRUE@@HDF_BUILD_XDR_TRUE@	$(am__objects_1) \
+ @HDF_BUILD_FORTRAN_TRUE@@HDF_BUILD_XDR_TRUE@	$(am__objects_3) \
+ @HDF_BUILD_FORTRAN_TRUE@@HDF_BUILD_XDR_TRUE@	$(am__objects_2)
+-@HDF_BUILD_FORTRAN_TRUE@@HDF_BUILD_XDR_FALSE@am_libmfhdf_a_OBJECTS = \
++@HDF_BUILD_FORTRAN_TRUE@@HDF_BUILD_XDR_FALSE@am_libmfhdf_la_OBJECTS = \
+ @HDF_BUILD_FORTRAN_TRUE@@HDF_BUILD_XDR_FALSE@	$(am__objects_1) \
+ @HDF_BUILD_FORTRAN_TRUE@@HDF_BUILD_XDR_FALSE@	$(am__objects_3)
+-libmfhdf_a_OBJECTS = $(am_libmfhdf_a_OBJECTS)
++libmfhdf_la_OBJECTS = $(am_libmfhdf_la_OBJECTS)
+ check_PROGRAMS = cdftest$(EXEEXT) hdftest$(EXEEXT)
+ am_cdftest_OBJECTS = cdftest.$(OBJEXT)
+ cdftest_OBJECTS = $(am_cdftest_OBJECTS)
+@@ -256,62 +259,64 @@
+ @AMDEP_TRUE@	./$(DEPDIR)/xdrposix.Po ./$(DEPDIR)/xdrstdio.Po
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ F77COMPILE = $(F77) $(AM_FFLAGS) $(FFLAGS)
++LTF77COMPILE = $(LIBTOOL) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS)
+ F77LD = $(F77)
+-F77LINK = $(F77LD) $(AM_FFLAGS) $(FFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-DIST_SOURCES = $(am__libmfhdf_a_SOURCES_DIST) $(cdftest_SOURCES) \
++F77LINK = $(LIBTOOL) --mode=link $(F77LD) $(AM_FFLAGS) $(FFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = $(am__libmfhdf_la_SOURCES_DIST) $(cdftest_SOURCES) \
+ 	$(hdftest_SOURCES)
+ HEADERS = $(include_HEADERS)
+ 
+ DIST_COMMON = README $(include_HEADERS) $(srcdir)/Makefile.in \
+ 	Makefile.am
+-SOURCES = $(libmfhdf_a_SOURCES) $(cdftest_SOURCES) $(hdftest_SOURCES)
++SOURCES = $(libmfhdf_la_SOURCES) $(cdftest_SOURCES) $(hdftest_SOURCES)
+ 
+ all: all-am
+ 
+ .SUFFIXES:
+-.SUFFIXES: .c .f .o .obj
++.SUFFIXES: .c .f .lo .o .obj
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+ 	  $(AUTOMAKE) --foreign  mfhdf/libsrc/Makefile
+ Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
+ 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+-libLIBRARIES_INSTALL = $(INSTALL_DATA)
+-install-libLIBRARIES: $(lib_LIBRARIES)
++libLTLIBRARIES_INSTALL = $(INSTALL)
++install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+ 	$(mkinstalldirs) $(DESTDIR)$(libdir)
+-	@list='$(lib_LIBRARIES)'; for p in $$list; do \
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    echo " $(libLIBRARIES_INSTALL) $$p $(DESTDIR)$(libdir)/$$f"; \
+-	    $(libLIBRARIES_INSTALL) $$p $(DESTDIR)$(libdir)/$$f; \
+-	  else :; fi; \
+-	done
+-	@$(POST_INSTALL)
+-	@list='$(lib_LIBRARIES)'; for p in $$list; do \
+-	  if test -f $$p; then \
+-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
+-	    $(RANLIB) $(DESTDIR)$(libdir)/$$p; \
++	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ 	  else :; fi; \
+ 	done
+ 
+-uninstall-libLIBRARIES:
++uninstall-libLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@list='$(lib_LIBRARIES)'; for p in $$list; do \
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  p="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f $(DESTDIR)$(libdir)/$$p"; \
+-	  rm -f $(DESTDIR)$(libdir)/$$p; \
++	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ 	done
+ 
+-clean-libLIBRARIES:
++clean-libLTLIBRARIES:
+ 	-test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES)
+-libmfhdf.a: $(libmfhdf_a_OBJECTS) $(libmfhdf_a_DEPENDENCIES) 
+-	-rm -f libmfhdf.a
+-	$(libmfhdf_a_AR) libmfhdf.a $(libmfhdf_a_OBJECTS) $(libmfhdf_a_LIBADD)
+-	$(RANLIB) libmfhdf.a
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
++	  test "$$dir" = "$$p" && dir=.; \
++	  echo "rm -f \"$${dir}/so_locations\""; \
++	  rm -f "$${dir}/so_locations"; \
++	done
++libmfhdf.la: $(libmfhdf_la_OBJECTS) $(libmfhdf_la_DEPENDENCIES)
++	$(LINK) -rpath $(libdir) $(libmfhdf_la_LDFLAGS) $(libmfhdf_la_OBJECTS) $(libmfhdf_la_LIBADD) $(LIBS)
++	$(LN_S) .libs/libmfhdf.a libmfhdf.a
+ 
+ clean-checkPROGRAMS:
+ 	-test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS)
+@@ -381,6 +386,17 @@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ 
++.c.lo:
++@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
++@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
++@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
++@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
++@am__fastdepCC_TRUE@	fi
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++
+ xdr.o: ../xdr/xdr.c
+ @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdr.o -MD -MP -MF "$(DEPDIR)/xdr.Tpo" \
+ @am__fastdepCC_TRUE@	  -c -o xdr.o `test -f '../xdr/xdr.c' || echo '$(srcdir)/'`../xdr/xdr.c; \
+@@ -491,6 +507,17 @@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o jackets.obj `if test -f '../fortran/jackets.c'; then $(CYGPATH_W) '../fortran/jackets.c'; else $(CYGPATH_W) '$(srcdir)/../fortran/jackets.c'; fi`
+ 
++jackets.lo: ../fortran/jackets.c
++@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT jackets.lo -MD -MP -MF "$(DEPDIR)/jackets.Tpo" \
++@am__fastdepCC_TRUE@	  -c -o jackets.lo `test -f '../fortran/jackets.c' || echo '$(srcdir)/'`../fortran/jackets.c; \
++@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/jackets.Tpo" "$(DEPDIR)/jackets.Po"; \
++@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/jackets.Tpo"; exit 1; \
++@am__fastdepCC_TRUE@	fi
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../fortran/jackets.c' object='jackets.lo' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/jackets.Po' tmpdepfile='$(DEPDIR)/jackets.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o jackets.lo `test -f '../fortran/jackets.c' || echo '$(srcdir)/'`../fortran/jackets.c
++
+ mfsdf.o: ../fortran/mfsdf.c
+ @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mfsdf.o -MD -MP -MF "$(DEPDIR)/mfsdf.Tpo" \
+ @am__fastdepCC_TRUE@	  -c -o mfsdf.o `test -f '../fortran/mfsdf.c' || echo '$(srcdir)/'`../fortran/mfsdf.c; \
+@@ -513,17 +540,41 @@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mfsdf.obj `if test -f '../fortran/mfsdf.c'; then $(CYGPATH_W) '../fortran/mfsdf.c'; else $(CYGPATH_W) '$(srcdir)/../fortran/mfsdf.c'; fi`
+ 
++mfsdf.lo: ../fortran/mfsdf.c
++@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT mfsdf.lo -MD -MP -MF "$(DEPDIR)/mfsdf.Tpo" \
++@am__fastdepCC_TRUE@	  -c -o mfsdf.lo `test -f '../fortran/mfsdf.c' || echo '$(srcdir)/'`../fortran/mfsdf.c; \
++@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mfsdf.Tpo" "$(DEPDIR)/mfsdf.Po"; \
++@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/mfsdf.Tpo"; exit 1; \
++@am__fastdepCC_TRUE@	fi
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../fortran/mfsdf.c' object='mfsdf.lo' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/mfsdf.Po' tmpdepfile='$(DEPDIR)/mfsdf.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o mfsdf.lo `test -f '../fortran/mfsdf.c' || echo '$(srcdir)/'`../fortran/mfsdf.c
++
+ .f.o:
+ 	$(F77COMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .f.obj:
+ 	$(F77COMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ 
++.f.lo:
++	$(LTF77COMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
++
+ mfsdff.o: ../fortran/mfsdff.f
+ 	$(F77) $(AM_FFLAGS) $(FFLAGS) -c -o mfsdff.o `test -f '../fortran/mfsdff.f' || echo '$(srcdir)/'`../fortran/mfsdff.f
+ 
+ mfsdff.obj: ../fortran/mfsdff.f
+ 	$(F77) $(AM_FFLAGS) $(FFLAGS) -c -o mfsdff.obj `if test -f '../fortran/mfsdff.f'; then $(CYGPATH_W) '../fortran/mfsdff.f'; else $(CYGPATH_W) '$(srcdir)/../fortran/mfsdff.f'; fi`
++
++mfsdff.lo: ../fortran/mfsdff.f
++	$(LTF77COMPILE) -c -o mfsdff.lo `test -f '../fortran/mfsdff.f' || echo '$(srcdir)/'`../fortran/mfsdff.f
++
++mostlyclean-libtool:
++	-rm -f *.lo
++
++clean-libtool:
++	-rm -rf .libs _libs
++
+ uninstall-info-am:
+ includeHEADERS_INSTALL = $(INSTALL_HEADER)
+ install-includeHEADERS: $(include_HEADERS)
+@@ -632,7 +683,7 @@
+ check-am: all-am
+ 	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
+ check: check-am
+-all-am: Makefile $(LIBRARIES) $(HEADERS)
++all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+ 
+ installdirs:
+ 	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
+@@ -663,7 +714,7 @@
+ 	@echo "it deletes files that may require special tools to rebuild."
+ clean: clean-am
+ 
+-clean-am: clean-checkPROGRAMS clean-generic clean-libLIBRARIES \
++clean-am: clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES clean-libtool \
+ 	mostlyclean-am
+ 
+ distclean: distclean-am
+@@ -683,7 +734,7 @@
+ 
+ install-data-am: install-includeHEADERS
+ 
+-install-exec-am: install-libLIBRARIES
++install-exec-am: install-libLTLIBRARIES
+ 
+ install-info: install-info-am
+ 
+@@ -699,7 +750,7 @@
+ 
+ mostlyclean: mostlyclean-am
+ 
+-mostlyclean-am: mostlyclean-compile mostlyclean-generic
++mostlyclean-am: mostlyclean-compile mostlyclean-generic mostlyclean-libtool
+ 
+ pdf: pdf-am
+ 
+@@ -710,20 +761,20 @@
+ ps-am:
+ 
+ uninstall-am: uninstall-includeHEADERS uninstall-info-am \
+-	uninstall-libLIBRARIES
++	uninstall-libLTLIBRARIES
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-checkPROGRAMS \
+-	clean-generic clean-libLIBRARIES ctags distclean \
++	clean-generic clean-libLTLIBRARIES clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-tags distdir dvi \
+ 	dvi-am info info-am install install-am install-data \
+ 	install-data-am install-exec install-exec-am \
+ 	install-includeHEADERS install-info install-info-am \
+-	install-libLIBRARIES install-man install-strip installcheck \
++	install-libLTLIBRARIES install-man install-strip installcheck \
+ 	installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+-	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+ 	uninstall-am uninstall-includeHEADERS uninstall-info-am \
+-	uninstall-libLIBRARIES
++	uninstall-libLTLIBRARIES
+ 
+ 
+ check:
diff --git a/science/hdf/pkg-plist b/science/hdf/pkg-plist
index a0ca0c5f4e40..99b9d5183caa 100644
--- a/science/hdf/pkg-plist
+++ b/science/hdf/pkg-plist
@@ -1,22 +1,28 @@
-bin/fp2hdf
+bin/gif2hdf
+bin/h4cc
+bin/h4fc
+bin/h4redeploy
 bin/hdf24to8
+bin/hdf2gif
 bin/hdf2jpeg
 bin/hdf8to24
 bin/hdfcomp
 bin/hdfed
+bin/hdfimport
 bin/hdfls
 bin/hdfpack
 bin/hdftopal
 bin/hdftor8
 bin/hdfunpac
+bin/hdiff
 bin/hdp
+bin/hrepack
 bin/jpeg2hdf
 bin/ncdump
 bin/ncgen
 bin/paltohdf
 bin/r8tohdf
 bin/ristosds
-bin/vcompat
 bin/vmake
 bin/vshow
 include/atom.h
@@ -26,25 +32,25 @@ include/cnbit.h
 include/cnone.h
 include/crle.h
 include/cskphuff.h
+include/cszip.h
 include/df.h
 include/dfan.h
-include/dfconvrt.h
+include/dffunc.f90
 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/h4config.h
 include/hbitio.h
 include/hchunks.h
 include/hcomp.h
 include/hcompi.h
 include/hconv.h
+include/hdf.f90
 include/hdf.h
 include/hdf.inc
 include/hdf2netcdf.h
@@ -55,24 +61,19 @@ 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.f90
 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
diff --git a/science/hdf/scripts/post-patch b/science/hdf/scripts/post-patch
deleted file mode 100644
index abb1fc2ea1fb..000000000000
--- a/science/hdf/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