Date: Wed, 26 Sep 2012 02:26:14 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/172052: science/hdf: Update to version 4.2.8 Message-ID: <20120926022614.757ec0f4ec6afc5d8dccbb1a@yahoo.com> Resent-Message-ID: <201209251820.q8PIKEhS034634@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 172052 >Category: ports >Synopsis: science/hdf: Update to version 4.2.8 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Sep 25 18:20:14 UTC 2012 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 7.4-RELEASE-p10 i386 >Organization: >Environment: >Description: - Update to version 4.2.8 New file: files/patch-configure files/patch-hdf__src__Makefile.in files/patch-mfhdf__libsrc__Makefile.in Remove file: files/patch-compile-flags files/patch-lib-versions files/patch-shared-fortran >How-To-Repeat: >Fix: diff -urN /usr/ports/science/hdf/Makefile science/hdf/Makefile --- /usr/ports/science/hdf/Makefile 2012-09-08 16:49:05.000000000 +0900 +++ science/hdf/Makefile 2012-09-25 03:40:45.000000000 +0900 @@ -1,16 +1,12 @@ -# New ports collection makefile for: HDF_lib -# Date created: 17 November 1996 -# Whom: mi -# +# Created by: mi # $FreeBSD: ports/science/hdf/Makefile,v 1.52 2012/09/08 07:49:05 linimon Exp $ -# PORTNAME= hdf -DISTVERSION= 4.2.7-patch1 +PORTVERSION= 4.2.8 PORTEPOCH= 1 CATEGORIES= science archivers graphics -MASTER_SITES= ftp://ftp.hdfgroup.org/HDF/HDF_Current/src/ \ - ftp://ftp.hdfgroup.org/HDF/prev-releases/HDF${PORTVERSION:R}/src/ +MASTER_SITES= http://www.hdfgroup.org/ftp/HDF/releases/%SUBDIR%/ +MASTER_SITE_SUBDIR= ${PORTNAME:U}${PORTVERSION}/src MAINTAINER= ports@FreeBSD.org COMMENT= Hierarchical Data Format library (from NCSA) @@ -22,31 +18,15 @@ USE_BZIP2= yes USE_FORTRAN= 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}"\ +CONFIGURE_ARGS= --with-jpeg="${LOCALBASE}" \ + --with-szlib="${LOCALBASE}" \ --enable-shared +USE_LDCONFIG= yes +MAKE_JOBS_SAFE= yes MAN1= hdf.1 hdfunpac.1 ncdump.1 ncgen.1 MAN3= gr_chunk.3 -MANCOMPRESSED= no - -USE_LDCONFIG= yes - -check regression-test test: build - ${MAKE} ${_MAKE_JOBS} -C ${WRKSRC}/hdf/test check - -post-install: - # 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.pre.mk> @@ -54,4 +34,15 @@ BROKEN= Does not compile on powerpc .endif +post-patch: + @${REINPLACE_CMD} -e \ + '/PROD_/s|=.*|=""|' ${WRKSRC}/config/freebsd + +post-install: + ${INSTALL_MAN} ${WRKSRC}/man/hdfunpac.1 ${MAN1PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/man/gr_chunk.3 ${MAN3PREFIX}/man/man3 + +check regression-test test: build + ${MAKE} -C ${WRKSRC}/hdf/test check + .include <bsd.port.post.mk> diff -urN /usr/ports/science/hdf/distinfo science/hdf/distinfo --- /usr/ports/science/hdf/distinfo 2012-04-22 03:07:21.000000000 +0900 +++ science/hdf/distinfo 2012-08-14 20:46:59.000000000 +0900 @@ -1,2 +1,2 @@ -SHA256 (hdf-4.2.7-patch1.tar.bz2) = 3a7b5ba0ac47e5283bee3ec365e8027e88937cd1632d001ceec33af80947d1bd -SIZE (hdf-4.2.7-patch1.tar.bz2) = 3027309 +SHA256 (hdf-4.2.8.tar.bz2) = e8a94ae2c838007ccdd55bb3cd9684adba3ded367c09803ffc84a2704f83c00f +SIZE (hdf-4.2.8.tar.bz2) = 3027253 diff -urN /usr/ports/science/hdf/files/patch-compile-flags science/hdf/files/patch-compile-flags --- /usr/ports/science/hdf/files/patch-compile-flags 2012-04-22 03:07:21.000000000 +0900 +++ science/hdf/files/patch-compile-flags 1970-01-01 09:00:00.000000000 +0900 @@ -1,41 +0,0 @@ -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 -urN /usr/ports/science/hdf/files/patch-configure science/hdf/files/patch-configure --- /usr/ports/science/hdf/files/patch-configure 1970-01-01 09:00:00.000000000 +0900 +++ science/hdf/files/patch-configure 2012-08-14 21:09:24.000000000 +0900 @@ -0,0 +1,19 @@ +--- configure.orig 2012-08-07 13:11:45.000000000 +0900 ++++ configure 2012-08-14 21:08:48.000000000 +0900 +@@ -5837,11 +5837,11 @@ + enable_shared="no" + 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 ++#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 diff -urN /usr/ports/science/hdf/files/patch-hdf__src__Makefile.in science/hdf/files/patch-hdf__src__Makefile.in --- /usr/ports/science/hdf/files/patch-hdf__src__Makefile.in 1970-01-01 09:00:00.000000000 +0900 +++ science/hdf/files/patch-hdf__src__Makefile.in 2012-08-14 21:09:46.000000000 +0900 @@ -0,0 +1,20 @@ +--- hdf/src/Makefile.in.orig 2012-08-07 13:11:36.000000000 +0900 ++++ hdf/src/Makefile.in 2012-08-14 21:08:53.000000000 +0900 +@@ -187,7 +187,7 @@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + LD = @LD@ +-LDFLAGS = @LDFLAGS@ ++LDFLAGS = @LDFLAGS@ -version-number 2 + LEX = @LEX@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ +@@ -290,8 +290,6 @@ + CP = cp + 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 + FSOURCES = df24ff.f dfanf.c dfanff.f dff.c dfff.f dfpf.c dfpff.f dfr8f.c \ diff -urN /usr/ports/science/hdf/files/patch-lib-versions science/hdf/files/patch-lib-versions --- /usr/ports/science/hdf/files/patch-lib-versions 2012-04-22 03:07:21.000000000 +0900 +++ science/hdf/files/patch-lib-versions 1970-01-01 09:00:00.000000000 +0900 @@ -1,31 +0,0 @@ ---- 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 -urN /usr/ports/science/hdf/files/patch-mfhdf__libsrc__Makefile.in science/hdf/files/patch-mfhdf__libsrc__Makefile.in --- /usr/ports/science/hdf/files/patch-mfhdf__libsrc__Makefile.in 1970-01-01 09:00:00.000000000 +0900 +++ science/hdf/files/patch-mfhdf__libsrc__Makefile.in 2012-08-14 21:10:12.000000000 +0900 @@ -0,0 +1,20 @@ +--- mfhdf/libsrc/Makefile.in.orig 2012-08-07 13:11:12.000000000 +0900 ++++ mfhdf/libsrc/Makefile.in 2012-08-14 21:08:58.000000000 +0900 +@@ -161,7 +161,7 @@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + LD = @LD@ +-LDFLAGS = @LDFLAGS@ ++LDFLAGS = @LDFLAGS@ -version-number 3 + LEX = @LEX@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ +@@ -264,8 +264,6 @@ + CP = cp + 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" + INCLUDES = -I$(top_srcdir)/hdf/src \ + -I$(top_srcdir)/mfhdf/libsrc diff -urN /usr/ports/science/hdf/files/patch-shared-fortran science/hdf/files/patch-shared-fortran --- /usr/ports/science/hdf/files/patch-shared-fortran 2012-04-22 03:07:21.000000000 +0900 +++ science/hdf/files/patch-shared-fortran 1970-01-01 09:00:00.000000000 +0900 @@ -1,31 +0,0 @@ ---- 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 -urN /usr/ports/science/hdf/pkg-plist science/hdf/pkg-plist --- /usr/ports/science/hdf/pkg-plist 2012-04-24 06:09:10.000000000 +0900 +++ science/hdf/pkg-plist 2012-08-14 21:13:53.000000000 +0900 @@ -67,13 +67,13 @@ include/htags.h include/linklist.h include/local_nc.h +include/mfan.h include/mfdatainfo.h -include/mffunc.inc include/mffunc.f90 -include/mfhdfi.h -include/mfan.h +include/mffunc.inc include/mfgr.h include/mfhdf.h +include/mfhdfi.h include/mstdio.h include/netcdf.f90 include/netcdf.h @@ -82,9 +82,11 @@ include/vattr.h include/vg.h lib/libdf.a +lib/libdf.la lib/libdf.so lib/libdf.so.2 lib/libhdf4.settings lib/libmfhdf.a +lib/libmfhdf.la lib/libmfhdf.so lib/libmfhdf.so.3 >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120926022614.757ec0f4ec6afc5d8dccbb1a>