Date: Sun, 13 Feb 2011 15:08:43 +0100 (CET) From: Thierry Thomas <thierry@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: devel@stasyan.com Subject: ports/154736: science/cgnslib: chase upgrade & swith from science/hdf5 to science/hdf5-18 Message-ID: <20110213140843.8B16911467@graf.pompo.net> Resent-Message-ID: <201102131420.p1DEK7Zv088470@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 154736 >Category: ports >Synopsis: science/cgnslib: chase upgrade & swith from science/hdf5 to science/hdf5-18 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Feb 13 14:20:07 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Thierry Thomas >Release: FreeBSD 8.1-STABLE i386 >Organization: Kabbale Eros >Environment: System: FreeBSD graf.pompo.net 8.1-STABLE FreeBSD 8.1-STABLE #0: Sat Nov 6 10:40:04 CET 2010 thierry@graf.pompo.net:/usr/obj/usr/src/sys/GRAF100821 i386 >Description: Chase the upgrade of science/cgnslib to 2.5-5; this implies to switch some dependencies from science/hdf5 to science/hdf5-18. See PR ports/154735 . As a side note: I think that all ports depending on science/hdf5 could be switched to science/hdf5-18, by defining H5_USE_16_API when necessary, and then science/hdf5 could be deprecated. >How-To-Repeat: N/A. >Fix: Apply the hereunder patches: --- med.diff begins here --- diff -urN french/med.orig/Makefile french/med/Makefile --- french/med.orig/Makefile 2010-12-27 23:19:21.000000000 +0100 +++ french/med/Makefile 2011-02-12 17:43:27.000000000 +0100 @@ -7,14 +7,14 @@ PORTNAME= med DISTVERSION= 2.3.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= french science MAINTAINER= ports@FreeBSD.org COMMENT= Modelisation et Echanges de Donnees BUILD_DEPENDS= wish${TK_VER}:${PORTSDIR}/x11-toolkits/tk${SHORT_TK_VER} -LIB_DEPENDS= hdf5.0:${PORTSDIR}/science/hdf5 +LIB_DEPENDS= hdf5.6:${PORTSDIR}/science/hdf5-18 RUN_DEPENDS= wish${TK_VER}:${PORTSDIR}/x11-toolkits/tk${SHORT_TK_VER} LICENSE= GPLv3 --- med.diff ends here --- --- fvm.diff2 begins here --- diff -urN science/fvm.orig/Makefile science/fvm/Makefile --- science/fvm.orig/Makefile 2010-11-15 22:20:57.000000000 +0100 +++ science/fvm/Makefile 2011-02-12 17:39:33.000000000 +0100 @@ -7,7 +7,7 @@ PORTNAME= fvm PORTVERSION= 0.12.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= science parallel MASTER_SITES= http://rd.edf.com/fichiers/fckeditor/File/EDF%20RD/Code_Saturne/Fichiers/ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//g} @@ -18,7 +18,7 @@ LIB_DEPENDS= med.2:${PORTSDIR}/french/med \ bft.1:${PORTSDIR}/science/bft \ - hdf5.0:${PORTSDIR}/science/hdf5 \ + hdf5.6:${PORTSDIR}/science/hdf5 \ cgns.0:${PORTSDIR}/science/cgnslib WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} --- fvm.diff2 ends here --- --- ecs.diff begins here --- diff -urN science/ecs.orig/Makefile science/ecs/Makefile --- science/ecs.orig/Makefile 2011-02-12 18:37:19.000000000 +0100 +++ science/ecs/Makefile 2011-02-12 18:20:52.000000000 +0100 @@ -7,7 +7,7 @@ PORTNAME= ecs PORTVERSION= 1.3.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= science MASTER_SITES= http://rd.edf.com/fichiers/fckeditor/File/EDF%20RD/Code_Saturne/Fichiers/ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//g} @@ -18,7 +18,7 @@ LIB_DEPENDS= med.2:${PORTSDIR}/french/med \ bft.1:${PORTSDIR}/science/bft \ - hdf5.0:${PORTSDIR}/science/hdf5 \ + hdf5.6:${PORTSDIR}/science/hdf5-18 \ cgns.0:${PORTSDIR}/science/cgnslib WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff -urN science/ecs.orig/distinfo science/ecs/distinfo --- science/ecs.orig/distinfo 2009-01-26 18:47:54.000000000 +0100 +++ science/ecs/distinfo 2011-02-12 18:21:21.000000000 +0100 @@ -1,3 +1,2 @@ -MD5 (ecs-133.tgz) = 0a80c156afb541115855f3aeb9f1d83d SHA256 (ecs-133.tgz) = 60c3519cc7b9fdd80f41844e3c5a04be88459493e6abd82ed960304822d1bf13 SIZE (ecs-133.tgz) = 1263592 --- ecs.diff ends here --- --- aster.diff2 begins here --- diff -urN french/aster.orig/Makefile french/aster/Makefile --- french/aster.orig/Makefile 2010-12-29 23:02:09.000000000 +0100 +++ french/aster/Makefile 2011-02-12 21:30:42.000000000 +0100 @@ -7,6 +7,7 @@ PORTNAME= aster DISTVERSION= ${ASTER_DISTVERSION} +PORTREVISION= 1 CATEGORIES= french cad MAINTAINER= thierry@FreeBSD.org @@ -38,7 +39,7 @@ ${PYNUMPY} LIB_DEPENDS+= tcl${SHORT_TCL_VER}:${PORTSDIR}/lang/tcl${SHORT_TCL_VER} \ tk${SHORT_TK_VER}:${PORTSDIR}/x11-toolkits/tk${SHORT_TK_VER} \ - hdf5.0:${PORTSDIR}/science/hdf5 \ + hdf5.6:${PORTSDIR}/science/hdf5-18 \ med.2:${PORTSDIR}/french/med RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/Gnuplot:${PORTSDIR}/math/py-gnuplot \ ${LOCALBASE}/bin/onmetis.exe:${PORTSDIR}/math/metis-edf \ @@ -302,18 +303,18 @@ >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "F90FLAGS_DBG='-c -g -O ${FLAGARCH} ${FFLAGARCH} -I${LOCALBASE}/include -I${HOME_MPI}/include'" \ >> ${WRKSRC}/setup.cfg - ${ECHO_CMD} "CFLAGS='-c ${CFLAGS} -fno-stack-protector ${PTHREAD_CFLAGS} ${FLAGARCH} -I${LOCALBASE}/include -I${HOME_MPI}/include'" \ + ${ECHO_CMD} "CFLAGS='-c ${CFLAGS} -fno-stack-protector -DH5_USE_16_API ${PTHREAD_CFLAGS} ${FLAGARCH} -I${LOCALBASE}/include -I${HOME_MPI}/include'" \ >> ${WRKSRC}/setup.cfg - ${ECHO_CMD} "CFLAGS_DBG='-c -g -O -pipe -fno-stack-protector ${PTHREAD_CFLAGS} ${FLAGARCH} -I${LOCALBASE}/include -I${HOME_MPI}/include'" \ + ${ECHO_CMD} "CFLAGS_DBG='-c -g -O -pipe -fno-stack-protector -DH5_USE_16_API ${PTHREAD_CFLAGS} ${FLAGARCH} -I${LOCALBASE}/include -I${HOME_MPI}/include'" \ >> ${WRKSRC}/setup.cfg .else ${ECHO_CMD} "F90FLAGS='-c ${FFLAGS} ${FLAGARCH} ${FFLAGARCH} -I${LOCALBASE}/include'" \ >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "F90FLAGS_DBG='-c -g -O ${FLAGARCH} ${FFLAGARCH} -I${LOCALBASE}/include'" \ >> ${WRKSRC}/setup.cfg - ${ECHO_CMD} "CFLAGS='-c ${CFLAGS} -fno-stack-protector ${PTHREAD_CFLAGS} ${FLAGARCH} -I${LOCALBASE}/include'" \ + ${ECHO_CMD} "CFLAGS='-c ${CFLAGS} -fno-stack-protector -DH5_USE_16_API ${PTHREAD_CFLAGS} ${FLAGARCH} -I${LOCALBASE}/include'" \ >> ${WRKSRC}/setup.cfg - ${ECHO_CMD} "CFLAGS_DBG='-c -g -O -pipe -fno-stack-protector ${PTHREAD_CFLAGS} ${FLAGARCH} -I${LOCALBASE}/include'" \ + ${ECHO_CMD} "CFLAGS_DBG='-c -g -O -pipe -fno-stack-protector -DH5_USE_16_API ${PTHREAD_CFLAGS} ${FLAGARCH} -I${LOCALBASE}/include'" \ >> ${WRKSRC}/setup.cfg .endif .for is in ${INTERACTIVE_SCRIPTS} --- aster.diff2 ends here --- --- salome.diff begins here --- diff -urN cad/salome.orig/Makefile.ext cad/salome/Makefile.ext --- cad/salome.orig/Makefile.ext 2011-01-03 21:29:41.000000000 +0100 +++ cad/salome/Makefile.ext 2011-02-12 23:36:00.000000000 +0100 @@ -133,7 +133,7 @@ #Dependency from HDF5 .if !${SAL_MODULE} == "randomizer" && !${SAL_MODULE} == "yacs" && !${SAL_MODULE} == "hello" && !${SAL_MODULE} == "pyhello" -LIB_DEPENDS+= hdf5.0:${PORTSDIR}/science/hdf5 +LIB_DEPENDS+= hdf5.6:${PORTSDIR}/science/hdf5-18 CONFIGURE_ARGS+= --with-hdf5=${LOCALBASE} AUTOTOOLS_ENV+= HDF5HOME=${LOCALBASE} .endif diff -urN cad/salome-kernel.orig/Makefile cad/salome-kernel/Makefile --- cad/salome-kernel.orig/Makefile 2011-01-04 22:13:42.000000000 +0100 +++ cad/salome-kernel/Makefile 2011-02-13 11:52:09.000000000 +0100 @@ -10,6 +10,7 @@ PORTNAME= salome PKGNAMESUFFIX= -kernel +PORTREVISION= 1 SAL_MODULE_UPPER= KERNEL .include "${MASTERDIR}/Makefile" diff -urN cad/salome-med.orig/Makefile cad/salome-med/Makefile --- cad/salome-med.orig/Makefile 2011-01-04 22:13:43.000000000 +0100 +++ cad/salome-med/Makefile 2011-02-13 11:54:46.000000000 +0100 @@ -10,6 +10,7 @@ PORTNAME= salome PKGNAMESUFFIX= -med +PORTREVISION= 1 SAL_MODULE_UPPER= MED .include "${MASTERDIR}/Makefile" --- salome.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110213140843.8B16911467>