7 files changed, 21 insertions, 657 deletions

diff --git a/science/hdf/Makefile b/science/hdf/Makefile
index 928244dd9117..04d62377fa56 100644
--- a/science/hdf/Makefile
+++ b/science/hdf/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	hdf
-PORTVERSION=	4.2r1
-PORTREVISION=	3
+PORTVERSION=	4.2r3
 CATEGORIES=	science archivers graphics
 MASTER_SITES=	ftp://ftp.hdfgroup.org/HDF/HDF_Current/src/:src \
 		ftp://ftp.hdfgroup.org/HDF/Documentation/${PORTVERSION}/:doc \
-		ftp://ftp.hdfgroup.org/HDF/Documentation/HDF4.2r0/:doc \
+		ftp://ftp.hdfgroup.org/HDF/Documentation/HDF4.2r3/:doc \
 		http://hdf.ncsa.uiuc.edu/doc_resource/SZIP/:doc_szip
 DISTNAME=	HDF${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:src \
@@ -19,7 +18,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:src \
 		${DOCFILES:C/$/:doc/g}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-MAINTAINER=	maho@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Hierarchical Data Format library (from NCSA)
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
@@ -34,9 +33,8 @@ CONFIGURE_ARGS+=--with-jpeg="${LOCALBASE}" \
 		--with-szlib="${LOCALBASE}"
 #wiredness of F77, FC in hdf/src/Makefile
 MAKE_ENV+=	PATH="${WRKSRC}/bin:${PATH}"
-DOCFILES=	HDF41r5_SpecDG.pdf \
-		HDF42r0_RefMan.pdf \
-		HDF42r0_UserGd.pdf
+DOCFILES=	RM-print42r3.pdf \
+		UG_print42r3.pdf
 SZIP_DOCFILE=	SZIP_HDF4_2r1.pdf
 
 MAN1=		hdf.1 hdfunpac.1 ncdump.1 ncgen.1
@@ -50,18 +48,10 @@ USE_LDCONFIG=	yes
 BROKEN=		Does not compile on !i386, !amd64 and !alpha
 .endif
 
-.if ${OSVERSION} >= 700042
-BROKEN=		Does not compile with GCC 4.2
-.endif
-
 post-patch:
 	${REINPLACE_CMD} -e "s:%%LOCALBASE%%:${LOCALBASE}:" \
 		${WRKSRC}/hdf/src/Makefile.in ${WRKSRC}/mfhdf/libsrc/Makefile.in
 
-#wiredness of F77, FC in hdf/src/Makefile
-pre-configure:
-	${LN} -s `${WHICH} ${FC}` ${WRKSRC}/bin/f77
-
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/science/hdf/distinfo b/science/hdf/distinfo
index 001651c1f1dc..c533d26e7a9e 100644
--- a/science/hdf/distinfo
+++ b/science/hdf/distinfo
@@ -1,15 +1,12 @@
-MD5 (HDF4.2r1.tar.gz) = 9082c6fa913b9188452fa6c5217e1573
-SHA256 (HDF4.2r1.tar.gz) = 321ed4fbf316e4296abc8829ca12019e1b13edf949b81cb7baaa9779a6ec9c91
-SIZE (HDF4.2r1.tar.gz) = 3911745
+MD5 (HDF4.2r3.tar.gz) = 767382a31470e795f4c4217e33a689e8
+SHA256 (HDF4.2r3.tar.gz) = ed4e0bef8177242b4dc419628c421caca383f468eab3e6500f86231c46e6d8e9
+SIZE (HDF4.2r3.tar.gz) = 3898572
 MD5 (SZIP_HDF4_2r1.pdf) = 6bdd671db7338f14098d69b0976ac0e6
 SHA256 (SZIP_HDF4_2r1.pdf) = 6ad1282b858800ad987c3d84f1e70cbb00cd9fc52fabefb27bc465ead70dde60
 SIZE (SZIP_HDF4_2r1.pdf) = 222497
-MD5 (HDF41r5_SpecDG.pdf) = 1bf877e11dac1351ca773647e0d0f7d8
-SHA256 (HDF41r5_SpecDG.pdf) = 3e06a25c9e0be80b96108007fd67850db338b5a3c67a0aa9b142733b365d4f56
-SIZE (HDF41r5_SpecDG.pdf) = 930454
-MD5 (HDF42r0_RefMan.pdf) = 6d618535b9cfc08f3bfcdd81124a867b
-SHA256 (HDF42r0_RefMan.pdf) = 946895a6f372673e455a039a55281e1c3d02b4012992d514f1e00c11aa79a3a0
-SIZE (HDF42r0_RefMan.pdf) = 1057224
-MD5 (HDF42r0_UserGd.pdf) = 781cc73f6b96b84bdf93aa9128cda513
-SHA256 (HDF42r0_UserGd.pdf) = 18cc497989110dedf680a0c061149e425375fbfcd45880bcf512622d6566a72a
-SIZE (HDF42r0_UserGd.pdf) = 2103166
+MD5 (RM-print42r3.pdf) = 90123fa77aa7b7025b0ace33fdc700e2
+SHA256 (RM-print42r3.pdf) = 98d245f5c4d4ca2ba5580a73ef358917c756ee1a347b76ba2929ab7763c6adab
+SIZE (RM-print42r3.pdf) = 3083401
+MD5 (UG_print42r3.pdf) = 44c592e61455d5c5ee01c7e79875721f
+SHA256 (UG_print42r3.pdf) = cb525f47d25f3799df08a2ff883e7c54dd166f2219f9621afa4d87d231998292
+SIZE (UG_print42r3.pdf) = 6348290
diff --git a/science/hdf/files/patch-hdf-src-Makefile.in b/science/hdf/files/patch-hdf-src-Makefile.in
deleted file mode 100644
index dd34959fd6ad..000000000000
--- a/science/hdf/files/patch-hdf-src-Makefile.in
+++ /dev/null
@@ -1,264 +0,0 @@
---- hdf/src/Makefile.in.orig	Wed Dec 10 14:13:16 2003
-+++ hdf/src/Makefile.in	Tue Mar 15 16:30:15 2005
-@@ -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
deleted file mode 100644
index c0e88e6a699f..000000000000
--- a/science/hdf/files/patch-hdf-src-cszip.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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-hdiff-Makefile.in b/science/hdf/files/patch-mfhdf-hdiff-Makefile.in
deleted file mode 100644
index 56838295ad3c..000000000000
--- a/science/hdf/files/patch-mfhdf-hdiff-Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-$FreeBSD$
-
---- mfhdf/hdiff/Makefile.in.orig	Sat Mar 19 15:02:26 2005
-+++ mfhdf/hdiff/Makefile.in	Sat Mar 19 15:03:32 2005
-@@ -250,7 +250,7 @@
- 	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
- hdiff$(EXEEXT): $(hdiff_OBJECTS) $(hdiff_DEPENDENCIES) 
- 	@rm -f hdiff$(EXEEXT)
--	$(LINK) $(hdiff_LDFLAGS) $(hdiff_OBJECTS) $(hdiff_LDADD) $(LIBS)
-+	$(LINK) $(hdiff_LDFLAGS) $(hdiff_OBJECTS) $(hdiff_LDADD) $(LIBS) -lm
- hdifftst$(EXEEXT): $(hdifftst_OBJECTS) $(hdifftst_DEPENDENCIES) 
- 	@rm -f hdifftst$(EXEEXT)
- 	$(LINK) $(hdifftst_LDFLAGS) $(hdifftst_OBJECTS) $(hdifftst_LDADD) $(LIBS)
diff --git a/science/hdf/files/patch-mfhdf-libsrc-Makefile.in b/science/hdf/files/patch-mfhdf-libsrc-Makefile.in
deleted file mode 100644
index eb77876886da..000000000000
--- a/science/hdf/files/patch-mfhdf-libsrc-Makefile.in
+++ /dev/null
@@ -1,322 +0,0 @@
---- mfhdf/libsrc/Makefile.in.orig	Wed Feb  9 18:35:08 2005
-+++ mfhdf/libsrc/Makefile.in	Wed Mar 16 12:05:19 2005
-@@ -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 ddcb0986f58f..bc0b68efb99f 100644
--- a/science/hdf/pkg-plist
+++ b/science/hdf/pkg-plist
@@ -61,9 +61,13 @@ include/hkit.h
 include/hlimits.h
 include/hntdefs.h
 include/hproto.h
+include/hproto_fortran.h
 include/htags.h
 include/linklist.h
 include/local_nc.h
+include/mffunc.inc
+include/mffunc.f90
+include/mfhdfi.h
 include/mfan.h
 include/mfgr.h
 include/mfhdf.h
@@ -75,16 +79,10 @@ include/tbbt.h
 include/vattr.h
 include/vg.h
 lib/libdf.a
-lib/libdf.la
-lib/libdf.so
-lib/libdf.so.1
+lib/libhdf4.settings
 lib/libmfhdf.a
-lib/libmfhdf.la
-lib/libmfhdf.so
-lib/libmfhdf.so.2
-%%PORTDOCS%%%%DOCSDIR%%/HDF41r5_SpecDG.pdf
-%%PORTDOCS%%%%DOCSDIR%%/HDF42r0_RefMan.pdf
-%%PORTDOCS%%%%DOCSDIR%%/HDF42r0_UserGd.pdf
+%%PORTDOCS%%%%DOCSDIR%%/RM-print42r3.pdf
+%%PORTDOCS%%%%DOCSDIR%%/UG_print42r3.pdf
 %%PORTDOCS%%%%DOCSDIR%%/HISTORY.txt
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE.txt
 %%PORTDOCS%%%%DOCSDIR%%/SZIP_HDF4_2r1.pdf