From nobody Thu Jun 16 15:14:14 2022 X-Original-To: dev-commits-ports-main@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 E3916835DAD; Thu, 16 Jun 2022 15:14:15 +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 4LP5LH37jHz4WNr; Thu, 16 Jun 2022 15:14:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655392455; 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=NDqVg1hn8A/vwyW8njXboV0cdHUZBx1WprlKgZWZGNo=; b=qf68PfdEpQrLVGfLfiwTuaEzg9DsxO5sZwj0xeWZkNA9IzRo2gWVg3pjdFb8S6NY0ys/iD xbyS+9WXYYt1CI5fv0oFx9EfCBg8opaBACmIDTyXnijt3B/23k1GMsOKB9xchwMDMEjGPJ +VVDNyfuTzT472nXl7ZNoEe06Sb1wiJSESCE+zgQ6jSYZ6+SPgO5gh/mMHgstbbZDPbNZL 5QqBnt9k5s39VasP56TGMDxCAx6qmavORW/sx1MQfw811Z9rVIXLJ9nvj6dLy4OzVRGERU ybCIx0aGQU83Ot7rfcRzfx0h0D+vo4Bzucy3FqjtdXqzQnru3FjwwuClqnYC7w== 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 D2A405A1B; Thu, 16 Jun 2022 15:14:14 +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 25GFEEBO011301; Thu, 16 Jun 2022 15:14:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25GFEEjv011300; Thu, 16 Jun 2022 15:14:14 GMT (envelope-from git) Date: Thu, 16 Jun 2022 15:14:14 GMT Message-Id: <202206161514.25GFEEjv011300@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: 014002e7d288 - main - french/med: Fix build with HDF5 1.10.8+ List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 014002e7d2886644b9d040402e7c885552c5a90f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655392455; 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=NDqVg1hn8A/vwyW8njXboV0cdHUZBx1WprlKgZWZGNo=; b=QwJHj0HtbZQpBJ3gEeQFCFZIdJuWmB3cJVEBi4d1mF3a79GKqhpfL1PlQDnfCKFNLlZt8b VxmOQk8g4iMOuWBTM7Ft81mZOtmC7IIXJzKDaq+hg8OwUOSjQtswezwZcjEq56gXaH+VYu +gXkSXQF7FsfqfmXeHVtlpFwX0bk2NIq13W8lalpa0JTYGwrxqcH9CH/FEx3bxtZrla5ba jUdUDA8PRCrfxMGsenzSdddPjB2lY2fQZNHK8fCvAWYTZ/cNt/Khf2xAWJxASOBlk7HE08 mdJRVppyJ04qMlavJ4tYaG55T69vAWyuPWbkNmKsh8q+vIm6SVa3ff+ETqJRSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655392455; a=rsa-sha256; cv=none; b=JnnjTU/AtW2fv4nOAJBSY74sTKayii9Ngw8IMWDE/PSc3Tr7bZ/spL4yZdLmLy5zA850rq EpAZ2W8zB3sG9qLhaDasX5UE+d7T2Vg9x7eMcqVWC02tQ7daXjn4uI+ZF6NfRlFG9j3/gQ h8MPYrfaf4clhFU3vlDvBHcXjIuqnJtkbuqfhGelWF9GXTPu3ek94vsfKt+JijejbIdPeq WgRSelUwevCZQq2jyRndQhPIjffd86c+QVP8NrDBX30C6xNUJPruN8ls0PLdbvAg8DGtWO 017HoHRXAfACM6ijdFqK9fvUwhmTbyQd1U+5zDZ5jEkpmw/2BpXegcYeXztOlw== 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=014002e7d2886644b9d040402e7c885552c5a90f commit 014002e7d2886644b9d040402e7c885552c5a90f Author: Po-Chuan Hsieh AuthorDate: 2022-06-16 15:11:43 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-06-16 15:13:02 +0000 french/med: Fix build with HDF5 1.10.8+ - While I'm here, use sed from basd system instead of gesed from ports --- french/med/Makefile | 1 - french/med/files/patch-configure | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/french/med/Makefile b/french/med/Makefile index 8d4a513f607c..6e392fc0eb53 100644 --- a/french/med/Makefile +++ b/french/med/Makefile @@ -9,7 +9,6 @@ COMMENT= Modelisation et Echanges de Donnees LICENSE= GPLv3 -BUILD_DEPENDS= gsed:textproc/gsed LIB_DEPENDS= libhdf5.so:science/hdf5 USES= fortran gmake libtool tk diff --git a/french/med/files/patch-configure b/french/med/files/patch-configure index 6c299c940364..c4c17d44daca 100644 --- a/french/med/files/patch-configure +++ b/french/med/files/patch-configure @@ -20,9 +20,9 @@ - H5_VER_MAJOR=` grep '#define *H5_VERS_MAJOR' $HDF5_ABS_PATH | sed 's/^.*H5_VERS_MAJOR[[ \t]]*\([0-9]*\)[[ \t]]*.*$/\1/g' ` - H5_VER_MINOR=` grep '#define *H5_VERS_MINOR' $HDF5_ABS_PATH | sed 's/^.*H5_VERS_MINOR[[ \t]]*\([0-9]*\)[[ \t]]*.*$/\1/g' ` - H5_VER_RELEASE=`grep '#define *H5_VERS_RELEASE' $HDF5_ABS_PATH | sed 's/^.*H5_VERS_RELEASE[[ \t]]*\([0-9]*\)[[ \t]]*.*$/\1/g' ` -+ H5_VER_MAJOR=` grep '#define *H5_VERS_MAJOR' $HDF5_ABS_PATH | gsed 's/^.*H5_VERS_MAJOR[[ \t]]*\([0-9]*\)[[ \t]]*.*$/\1/g' ` -+ H5_VER_MINOR=` grep '#define *H5_VERS_MINOR' $HDF5_ABS_PATH | gsed 's/^.*H5_VERS_MINOR[[ \t]]*\([0-9]*\)[[ \t]]*.*$/\1/g' ` -+ H5_VER_RELEASE=`grep '#define *H5_VERS_RELEASE' $HDF5_ABS_PATH | gsed 's/^.*H5_VERS_RELEASE[[ \t]]*\([0-9]*\)[[ \t]]*.*$/\1/g' ` ++ H5_VER_MAJOR=` grep '#define *H5_VERS_MAJOR' $HDF5_ABS_PATH | sed 's/^.*H5_VERS_MAJOR *\([0-9]*\).*$/\1/' ` ++ H5_VER_MINOR=` grep '#define *H5_VERS_MINOR' $HDF5_ABS_PATH | sed 's/^.*H5_VERS_MINOR *\([0-9]*\).*$/\1/' ` ++ H5_VER_RELEASE=`grep '#define *H5_VERS_RELEASE' $HDF5_ABS_PATH | sed 's/^.*H5_VERS_RELEASE *\([0-9]*\).*$/\1/' ` HDF5_VERSION=` expr 10000 \* ${H5_VER_MAJOR} + 100 \* ${H5_VER_MINOR} + ${H5_VER_RELEASE} ` test "0${HDF5_VERSION}" -gt "11100" || test "0${HDF5_VERSION}" -lt "11002" && as_fn_error $? " This HDF5 version ${H5_VER_MAJOR}.${H5_VER_MINOR}.${H5_VER_RELEASE} must not be used with med-fichier${MED_NUM_MAJEUR}.${MED_NUM_MINEUR}.${MED_NUM_RELEASE}.