Upgrade from 4.2r3 to 4.2.7 (this neccessitated EPOCH bump).

Unbreak, untangle. Stop fetching/installing documents (other
than man-pages) -- these are available online.

Using standard libtool instead of the bundled one fails -- an
autotools expert should take a closer look.

6 files changed, 126 insertions, 85 deletions

diff --git a/science/hdf/Makefile b/science/hdf/Makefile
index f28ae62447ac..f085f7cc794e 100644
--- a/science/hdf/Makefile
+++ b/science/hdf/Makefile
@@ -6,94 +6,46 @@
 #
 
 PORTNAME=	hdf
-PORTVERSION=	4.2r3
-PORTREVISION=	6
+DISTVERSION=	4.2.7-patch1
+PORTEPOCH=	1
 CATEGORIES=	science archivers graphics
-MASTER_SITES=	ftp://ftp.hdfgroup.org/HDF/prev-releases/HDF4.2r3/src/:src \
-		ftp://ftp.hdfgroup.org/HDF/HDF_Current/src/:src \
-		ftp://ftp.hdfgroup.org/HDF/Documentation/${PORTVERSION}/: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 \
-		${SZIP_DOCFILE}:doc_szip \
-		${DOCFILES:C/$/:doc/g}
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+MASTER_SITES=	ftp://ftp.hdfgroup.org/HDF/HDF_Current/src/	\
+		ftp://ftp.hdfgroup.org/HDF/prev-releases/HDF${PORTVERSION:R}/src/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Hierarchical Data Format library (from NCSA)
 
-DEPRECATED=	BROKEN for more than 6 month
-EXPIRATION_DATE=	2012-05-10
-
-BROKEN=	Does not fetch
-
-LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
-		sz.2:${PORTSDIR}/science/szip
+LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
+		sz:${PORTSDIR}/science/szip
 
 CONFLICTS=	netcdf-*
 
+USE_BZIP2=	yes
 USE_FORTRAN=	yes
-MAKE_JOBS_UNSAFE=	yes
+MAKE_JOBS_SAFE=	yes
+# XXX Our libtool breaks, when building this:
+# XXX can't link libraries with fortran
+#USE_AUTOTOOLS=	libtool
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-jpeg="${LOCALBASE}" \
 		--with-szlib="${LOCALBASE}"\
-		--mandir=${MANPREFIX}/man
-DOCFILES=	RM-print42r3.pdf \
-		UG_print42r3.pdf
-SZIP_DOCFILE=	SZIP_HDF4_2r1.pdf
+		--enable-shared
 
 MAN1=		hdf.1 hdfunpac.1 ncdump.1 ncgen.1
+MAN3=		gr_chunk.3
 MANCOMPRESSED=	no
 
 USE_LDCONFIG=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} != "i386" && ${ARCH} != "alpha" && ${ARCH} != "amd64"
-BROKEN=		Does not compile on !i386, !amd64 and !alpha
-.endif
-
-.if ${ARCH} == "sparc64"
-PICFLAG?=	-fPIC
-.else
-PICFLAG?=	-fpic
-.endif
-
-SHLIBVER_LIBMFHDF=	3
-SHLIBVER_MDF=	2
-
-post-extract:
-	${MKDIR} ${WRKSRC}_SHARED ; ${CP} -r ${WRKSRC}/* ${WRKSRC}_SHARED
-
-do-configure:
-	@(cd ${WRKSRC} && ${SETENV} ./configure \
-		${MAKE_ENV} ${CONFIGURE_ENV} ${CONFIGURE_ARGS})
-	@(cd ${WRKSRC}_SHARED && ${SETENV} ./configure \
-		${MAKE_ENV} ${CONFIGURE_ENV} ${CONFIGURE_ARGS} CFLAGS="${PICFLAG}" FFLAGS="${PICFLAG}")
-
-do-build:
-	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE})
-	@(cd ${WRKSRC}_SHARED; ${SETENV} ${MAKE_ENV} ${MAKE})
-	@(cd ${WRKSRC}_SHARED/mfhdf/libsrc; ld -Bshareable -o libmfhdf.so.${SHLIBVER_LIBMFHDF} -x -soname libmfhdf.so.${SHLIBVER_LIBMFHDF} --whole-archive libmfhdf.a )
-	@(cd ${WRKSRC}_SHARED/hdf/src; ld -Bshareable -o libdf.so.${SHLIBVER_MDF} -x -soname libdf.so.${SHLIBVER_MDF} --whole-archive libdf.a )
+check regression-test test: build
+	${MAKE} ${_MAKE_JOBS} -C ${WRKSRC}/hdf/test check
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}_SHARED/mfhdf/libsrc/libmfhdf.so.${SHLIBVER_LIBMFHDF} ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}_SHARED/hdf/src/libdf.so.${SHLIBVER_MDF} ${PREFIX}/lib
-	${LN} -sf libmfhdf.so.${SHLIBVER_LIBMFHDF} ${PREFIX}/lib/libmfhdf.so
-	${LN} -sf libdf.so.${SHLIBVER_MDF} ${PREFIX}/lib/libdf.so
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for file in ${DOCFILES} ${SZIP_DOCFILE}
-	@${INSTALL_DATA} ${DISTDIR}/${file} ${DOCSDIR}
-.endfor
-	@cd ${WRKSRC}/release_notes && ${FIND} . \
-		| ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
-.endif
-
-test: build
-	cd ${WRKSRC}/hdf/test && ${MAKE} check
+	# Install man-pages omitted by HDF's own install process
+	${INSTALL_MAN} ${WRKSRC}/man/hdfunpac.1 ${MAN1PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/man/gr_chunk.3 ${MAN1PREFIX}/man/man3/
+	# Removing useless .la files from ${PREFIX}/lib
+	${RM} -f ${PREFIX}/lib/libdf.la ${PREFIX}/lib/libmfhdf.la
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/science/hdf/distinfo b/science/hdf/distinfo
index ec50e4ee0705..34aaa90e4dc0 100644
--- a/science/hdf/distinfo
+++ b/science/hdf/distinfo
@@ -1,8 +1,2 @@
-SHA256 (HDF4.2r3.tar.gz) = ed4e0bef8177242b4dc419628c421caca383f468eab3e6500f86231c46e6d8e9
-SIZE (HDF4.2r3.tar.gz) = 3898572
-SHA256 (SZIP_HDF4_2r1.pdf) = 6ad1282b858800ad987c3d84f1e70cbb00cd9fc52fabefb27bc465ead70dde60
-SIZE (SZIP_HDF4_2r1.pdf) = 222497
-SHA256 (RM-print42r3.pdf) = 98d245f5c4d4ca2ba5580a73ef358917c756ee1a347b76ba2929ab7763c6adab
-SIZE (RM-print42r3.pdf) = 3083401
-SHA256 (UG_print42r3.pdf) = cb525f47d25f3799df08a2ff883e7c54dd166f2219f9621afa4d87d231998292
-SIZE (UG_print42r3.pdf) = 6348290
+SHA256 (hdf-4.2.7-patch1.tar.bz2) = 3a7b5ba0ac47e5283bee3ec365e8027e88937cd1632d001ceec33af80947d1bd
+SIZE (hdf-4.2.7-patch1.tar.bz2) = 3027309
diff --git a/science/hdf/files/patch-compile-flags b/science/hdf/files/patch-compile-flags
new file mode 100644
index 000000000000..de3bb33cbf5f
--- /dev/null
+++ b/science/hdf/files/patch-compile-flags
@@ -0,0 +1,41 @@
+Don't append optimization flags -- rely on what the building
+machine has set.
+--- config/freebsd	2012-03-17 23:44:05.000000000 -0400
++++ config/freebsd	2012-04-21 10:30:43.000000000 -0400
+@@ -102,5 +102,5 @@
+     DEBUG_CFLAGS="-g -ansi -Wall -pedantic "
+     DEBUG_CPPFLAGS=
+-    PROD_CFLAGS="-ansi -Wall -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Wmissing-prototypes -Wnested-externs -pedantic -O2"
++    PROD_CFLAGS="-ansi -Wall -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Wmissing-prototypes -Wnested-externs -pedantic"
+     PROD_CPPFLAGS=
+     PROFILE_CFLAGS="-pg"
+@@ -112,5 +112,4 @@
+     DEBUG_CFLAGS="-g"
+     DEBUG_CPPFLAGS=
+-    PROD_CFLAGS="-O"
+     PROD_CPPFLAGS=
+     PROFILE_CFLAGS="-pg"
+@@ -123,5 +122,4 @@
+     FFLAGS="$FFLAGS"
+     DEBUG_FFLAGS="-g"
+-    PROD_FFLAGS="-O"
+     PROFILE_FFLAGS="-pg"
+     ;;
+@@ -130,5 +128,4 @@
+     FFLAGS="$FFLAGS"
+     DEBUG_FFLAGS="-g"
+-    PROD_FFLAGS="-O"
+     PROFILE_FFLAGS="-pg"
+     ;;
+@@ -139,5 +136,4 @@
+     CXXFLAGS="$CXXFLAGS"
+     DEBUG_CXXFLAGS="-g -fverbose-asm"
+-    PROD_CXXFLAGS="-O3 -fomit-frame-pointer"
+     PROFILE_CXXFLAGS="-pg"
+     ;;
+@@ -146,5 +142,4 @@
+     CXXFLAGS="$CXXFLAGS -ansi"
+     DEBUG_CXXFLAGS="-g"
+-    PROD_CXXFLAGS="-O"
+     PROFILE_CXXFLAGS="-pg"
+     ;;
diff --git a/science/hdf/files/patch-lib-versions b/science/hdf/files/patch-lib-versions
new file mode 100644
index 000000000000..2cd9010049dd
--- /dev/null
+++ b/science/hdf/files/patch-lib-versions
@@ -0,0 +1,31 @@
+--- hdf/src/Makefile.in	2012-03-17 23:45:49.000000000 -0400
++++ hdf/src/Makefile.in	2012-04-21 13:33:36.000000000 -0400
+@@ -188,5 +188,5 @@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LD = @LD@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = @LDFLAGS@ -version-number 2
+ LEX = @LEX@
+ LIBOBJS = @LIBOBJS@
+@@ -291,6 +291,4 @@
+ H4CC = $(bindir)/h4cc
+ H4FC = $(bindir)/h4fc
+-@HDF_BUILD_XDR_TRUE@XDR_ADD = -R$(abs_top_builddir)/mfhdf/xdr/.libs
+-@HDF_BUILD_SHARED_TRUE@AM_LDFLAGS = -R$(abs_top_builddir)/mfhdf/libsrc/.libs -R$(abs_top_builddir)/hdf/src/.libs $(XDR_ADD)
+ ACLOCAL_AMFLAGS = "-I m4"
+ lib_LTLIBRARIES = libdf.la
++++ mfhdf/libsrc/Makefile.in	2012-04-21 13:33:36.000000000 -0400
+@@ -188,5 +188,5 @@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LD = @LD@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = @LDFLAGS@ -version-number 3
+ LEX = @LEX@
+ LIBOBJS = @LIBOBJS@
+@@ -291,6 +291,4 @@
+ H4CC = $(bindir)/h4cc
+ H4FC = $(bindir)/h4fc
+-@HDF_BUILD_XDR_TRUE@XDR_ADD = -R$(abs_top_builddir)/mfhdf/xdr/.libs
+-@HDF_BUILD_SHARED_TRUE@AM_LDFLAGS = -R$(abs_top_builddir)/mfhdf/libsrc/.libs -R$(abs_top_builddir)/hdf/src/.libs $(XDR_ADD)
+ ACLOCAL_AMFLAGS = "-I m4"
+ lib_LTLIBRARIES = libdf.la
diff --git a/science/hdf/files/patch-shared-fortran b/science/hdf/files/patch-shared-fortran
new file mode 100644
index 000000000000..c353819946de
--- /dev/null
+++ b/science/hdf/files/patch-shared-fortran
@@ -0,0 +1,31 @@
+--- configure.ac	2012-03-17 23:45:46.000000000 -0400
++++ configure.ac	2012-04-21 10:01:41.000000000 -0400
+@@ -199,6 +199,5 @@
+ dnl -------------------------------------------------------------------------
+ dnl Build static libraries by default. Furthermore, fortran shared libraries
+-dnl are unsupported. Disallow a user from enabling both shared libraries and
+-dnl fortran.
++dnl are unsupported.
+ if test "X${enable_shared}" != "Xyes"; then
+     enable_shared="no"
+@@ -207,5 +206,5 @@
+ if test "X${enable_shared}" = "Xyes"; then
+     if test "X${BUILD_FORTRAN}" = "Xyes"; then
+-        AC_MSG_ERROR([Cannot build shared fortran libraries. Please configure with --disable-fortran flag.])
++        AC_MSG_WARN([Fortran shared libraries aren't supported.])
+     fi
+ fi
+--- configure	2012-03-17 23:45:51.000000000 -0400
++++ configure	2012-04-21 09:51:08.000000000 -0400
+@@ -5838,11 +5838,4 @@
+ fi
+ 
+-if test "X${enable_shared}" = "Xyes"; then
+-    if test "X${BUILD_FORTRAN}" = "Xyes"; then
+-        as_fn_error $? "Cannot build shared fortran libraries. Please configure with --disable-fortran flag." "$LINENO" 5
+-    fi
+-fi
+-
+-
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+ $as_echo_n "checking whether ln -s works... " >&6; }
diff --git a/science/hdf/pkg-plist b/science/hdf/pkg-plist
index 5bce5b5e5357..0a25270ae253 100644
--- a/science/hdf/pkg-plist
+++ b/science/hdf/pkg-plist
@@ -85,11 +85,3 @@ lib/libhdf4.settings
 lib/libmfhdf.a
 lib/libmfhdf.so
 lib/libmfhdf.so.3
-%%PORTDOCS%%%%DOCSDIR%%/RM-print42r3.pdf
-%%PORTDOCS%%%%DOCSDIR%%/UG_print42r3.pdf
-%%PORTDOCS%%%%DOCSDIR%%/HISTORY.txt
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE.txt
-%%PORTDOCS%%%%DOCSDIR%%/SZIP_HDF4_2r1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/bugs_fixed.txt
-%%PORTDOCS%%%%DOCSDIR%%/misc_docs.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%