From nobody Mon Jul 18 12:51:57 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4LmhgL5nBwz4T4pq; Mon, 18 Jul 2022 12:51:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LmhgL0WbVz3mjp; Mon, 18 Jul 2022 12:51:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658148718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1rEXlsR9oeRUaCQ2jFA7xAvd13PORyN8u4UoDYY/OGc=; b=JXcfn3KH6KCQ8Y7QHqH3rjH0Odzi6XH3Sxw5gz0tUSGnPceuCp4ZuPoSMxOHJMoWTZ4AmE 1+6u/bqoVOCouVt4CG8VIS5GrJ957JZ6+eDRumDA73ttAkMOdrLXSIG1P6KCTxkn8UTJya RLl3lhtSNpnDdr4Q+3JHBtk6Xo6Karx/0YmCUry4yZFotq4JLoCAbOCOTxYjLP/XyBLnWw uTADSKjHnpfsxJE29q4C5rK2H/wZQrx48IrUhCcsUpBxqLBeLHwYrmWgUGz34pj7IZeLER lZePtJHdo2oWEiBt2BCUeG/njCMQV7JRbIuVaWkOLwMJ4AvsK4BETL8fkbfsZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4LmhgK3SJRzgBQ; Mon, 18 Jul 2022 12:51:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26ICpvOg092075; Mon, 18 Jul 2022 12:51:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26ICpvWd092074; Mon, 18 Jul 2022 12:51:57 GMT (envelope-from git) Date: Mon, 18 Jul 2022 12:51:57 GMT Message-Id: <202207181251.26ICpvWd092074@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 295de932a898 - main - french/med: Change LIB_DEPENDS from hdf5 to hdf5-110 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 295de932a89869837ab5e86854916c5e96b11342 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658148718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1rEXlsR9oeRUaCQ2jFA7xAvd13PORyN8u4UoDYY/OGc=; b=IdEsyqie0xx3TFD4Zd4xf0fI556/oTSLa4Y6hmpTDxrlJ72qaO2ZJAYyWRweGFGhLzfehU ojk7cNfe5nx2UPlyqIKINlHLZh3eYvwipRXC3ugQlotyJiI4eZ2H+RAljLVaTZNtCpy+wF 9snCiDGxGFR/o7/ZMuBAhDLWPuivtWsn88KrjjIOcqFRV3dYgkt5ECfdEu64MZmbXzHlnG Zauqh4QX2rwyUfwsJTWFSBl9uKKV+uFp0hl7C+Zy1FBte0lMc8xZ0NUl+P5DOldt9I4suq zDYwb58gfrX6SCaTNusJio59rDjM9kTvTnXSGSCxzPD5jz+n9UsiSvvB8UWqqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658148718; a=rsa-sha256; cv=none; b=h/Gwgmtv9wzZ3GJwWRTsyfgtw+HALcuLQ2FTLrqm2EgCEYetzRuiEBYhAVIM2OF8mwJ3ow DbTTyhQqCIhy/n/ugSa+xOV/hm2WzgXim6wiE5sGy7I2iWCVIZjrDYWvKrHP++gETsRClG Uiumr5zGJICDPNbI/U6PjvU2CEjmmQn7KdzD2kDF4fVuv2eX8tcbyAFelnP2ItQMyn/WGG stoEFzhSNKppLm4dpQzF/p1oxnfktxkQvznt7eMkVL6q9CMiB5mbmUJmb9iNNBSUcGXePb Mrq3q2gYCro6fLMHo9HGr0UGOMTnHYHc6Qhxdaqw96xkpQvsYbwPh5RmSbBZlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=295de932a89869837ab5e86854916c5e96b11342 commit 295de932a89869837ab5e86854916c5e96b11342 Author: Po-Chuan Hsieh AuthorDate: 2022-07-18 12:50:19 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-07-18 12:50:19 +0000 french/med: Change LIB_DEPENDS from hdf5 to hdf5-110 - Bump PORTREVISION for dependency change --- french/med/Makefile | 7 +++-- french/med/files/patch-hdf5 | 68 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 2 deletions(-) diff --git a/french/med/Makefile b/french/med/Makefile index 6e392fc0eb53..48be0ed79f52 100644 --- a/french/med/Makefile +++ b/french/med/Makefile @@ -2,6 +2,7 @@ PORTNAME= med DISTVERSION= 4.0.0 +PORTREVISION= 1 CATEGORIES= french science MAINTAINER= thierry@FreeBSD.org @@ -9,7 +10,7 @@ COMMENT= Modelisation et Echanges de Donnees LICENSE= GPLv3 -LIB_DEPENDS= libhdf5.so:science/hdf5 +LIB_DEPENDS= libhdf5-110.so:science/hdf5-110 USES= fortran gmake libtool tk @@ -17,7 +18,9 @@ OPTIONS_DEFINE= DOCS EXAMPLES USE_CXXSTD= gnu++98 CFLAGS+= -fPIC -CONFIGURE_ARGS= --disable-python --with-hdf5=${LOCALBASE} +CONFIGURE_ARGS= --disable-python \ + --with-hdf5=${LOCALBASE} \ + --with-hdf5-include=${LOCALBASE}/include/hdf5-110 CONFIGURE_ENV= WISH=${WISH} GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/french/med/files/patch-hdf5 b/french/med/files/patch-hdf5 new file mode 100644 index 000000000000..84ed5da873be --- /dev/null +++ b/french/med/files/patch-hdf5 @@ -0,0 +1,68 @@ +--- configure.orig 2018-12-10 10:32:28 UTC ++++ configure +@@ -7633,13 +7633,13 @@ _ACEOF + + # AC_CHECK_LIB([m],[sin],[],[AC_MSG_ERROR([Can't find C math library.])],[]) + # AC_CHECK_LIB([z],[compress],[],[AC_MSG_ERROR([Can't find z library.])],[]) +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for H5open in -lhdf5" >&5 +-$as_echo_n "checking for H5open in -lhdf5... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for H5open in -lhdf5-110" >&5 ++$as_echo_n "checking for H5open in -lhdf5-110... " >&6; } + if ${ac_cv_lib_hdf5_H5open+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lhdf5 -lm -lz $LIBS" ++LIBS="-lhdf5-110 -lm -lz $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -7674,10 +7674,10 @@ if test "x$ac_cv_lib_hdf5_H5open" = xyes; then : + #define HAVE_LIBHDF5 1 + _ACEOF + +- LIBS="-lhdf5 $LIBS" ++ LIBS="-lhdf5-110 $LIBS" + + else +- as_fn_error $? "Can't find hdf5 library, either use HDF5HOME env. var. , --with-hdf5= or --with-hdf5-lib=" "$LINENO" 5 ++ as_fn_error $? "Can't find hdf5-110 library, either use HDF5HOME env. var. , --with-hdf5= or --with-hdf5-lib=" "$LINENO" 5 + fi + + test "x$mpi_wanted_test" = "xyes" && for ac_func in H5Pset_fapl_mpio +@@ -7696,7 +7696,7 @@ done + + if test "x$with_hdf5_include" = "xno"; then + # Extract the first word of "h5dump", so it can be a program name with args. +-set dummy h5dump; ac_word=$2 ++set dummy h5dump-110; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } + if ${ac_cv_path_H5DUMP+:} false; then : +@@ -7738,7 +7738,7 @@ fi + + else + # Extract the first word of "h5dump", so it can be a program name with args. +-set dummy h5dump; ac_word=$2 ++set dummy h5dump-110; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } + if ${ac_cv_path_H5DUMP+:} false; then : +@@ -7780,7 +7780,7 @@ fi + + fi + if test "X$H5DUMP" = "Xno"; then +- as_fn_error $? "Can't find h5dump, please verify your env. var. PATH or use of --with-hdf5bin=." "$LINENO" 5 ++ as_fn_error $? "Can't find h5dump-110, please verify your env. var. PATH or use of --with-hdf5bin=." "$LINENO" 5 + fi + + +@@ -7797,7 +7797,7 @@ fi + #La ligne suivante est inutile car effectuée par AC_CHECK_PROG + # AC_SUBST(H5DUMP) + +- HDF5_LIBS="-lhdf5" ++ HDF5_LIBS="-lhdf5-110" + + +