From nobody Sun Jun 30 07:45:03 2024 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 4WBh680Rd7z5P3d0; Sun, 30 Jun 2024 07:45:04 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WBh675SBWz4Lkp; Sun, 30 Jun 2024 07:45:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719733503; 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=xYurZJlm/uQO0COH/6/wPZaUgcZodYypZol2oPZ0SF0=; b=k7zxJhcaN0MjaHWaYBrmrWhRrN9uofSFthko/8Ji/lOfiBt/pC64Fv5aPh76sM/7IPmLm4 0BGZf610ymccpFztkcveTky3OwsJEKlzTqANq9me6s3WjxN3KMjOEbr/Yg9FfJEtHeOBR8 gtUITiL+0TjHQSrDVRDkFplIGUE1CBsy3iESYUqnuoVIRkf5AdREOsAkByliy2se7VPtxi RIZ/f2FYGijP+QMQttLV1JvFgMFuP6zJYBAv+j2sWrS4Eid8lWQtHuLmBcuXkKaU+dZRHn +Dz504HysnUoW2A7GodZvmjaaoCOBG1Mps7bvseteYWGiJw+Y5Ao5B/smglaGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719733503; a=rsa-sha256; cv=none; b=oj8iINzINTFdu4Ww+85u9F0nJy+j8jPTD2aeTiw08g1XFG6GT5XjK0PkN/kkV9iCmeZO+M F4iOPURzmOZ7UUelIujwMoaCGTfSZCTx8Zo4r8mEwMNBWkl4G58mLvvm1OAfE4Z5+TOI8d wBJmKqj/ipJpojiVp7BesELRP4iSWUyL3RdWBI6HNWdcbaFkNnL9t+bXO3NWvbh2OrKZpj 9zfkBKMnYt2oNXMeUVPyJEmcHEAiFfYgWS+efDbC1pVzUTKcKzODjTjbVVbQ00JDIlT9oX 38FY8fj2Ks/l7IqABoOli1ac4G1oVkzDDDDpQxSHBO4lTiq4lGRrI2pn4OJexA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719733503; 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=xYurZJlm/uQO0COH/6/wPZaUgcZodYypZol2oPZ0SF0=; b=TftJsKfd8mJfvi7mODqKPJd2ZF8BtuqIz4QGOfJRdY/g4sN+tWOmz4J3HjXycoageg5tcJ G8RtcyNvX+Wxh4lCK0UsFnanqbFfiMZhPdnE6G7GMgBs11wDQIVBNmBVEArmCAgFOQ7X1u yHX4fPwNixKYIE2MuDl4tPFFpaMrJUVG3TYTmdHf09nTvT0KHQS68VExR6D0oC1CT8NWs6 S+eLkNwqJ2dhcxOcbYupEkqmBYjHe2evjj3H2xFXT8X6TIy3XnxUXc4mldC+9d9zb5XKSW 1hg1VJ9uM/XEEUbVGa9IsGrjImTiAT+ZBAiiiilxyCmikjoG5UTUwIdhjq4FrQ== 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 4WBh674yK9z1CxT; Sun, 30 Jun 2024 07:45:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 45U7j3fw080917; Sun, 30 Jun 2024 07:45:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 45U7j37T080914; Sun, 30 Jun 2024 07:45:03 GMT (envelope-from git) Date: Sun, 30 Jun 2024 07:45:03 GMT Message-Id: <202406300745.45U7j37T080914@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: c222dbace702 - main - science/mmg: Improve port 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c222dbace702197660e280c3fe0fa76ecb3c69f0 Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=c222dbace702197660e280c3fe0fa76ecb3c69f0 commit c222dbace702197660e280c3fe0fa76ecb3c69f0 Author: Daniel Engberg AuthorDate: 2024-06-30 07:40:15 +0000 Commit: Daniel Engberg CommitDate: 2024-06-30 07:40:20 +0000 science/mmg: Improve port * Add patches to remove git build dependency * Remove "make test" target, test files aren't bundled and also also remove bash dependency * Patch perl script(s) using USES= shebangfix * Adjust Makefile to more closely follow Porters Handbook PR: 279935 --- science/mmg/Makefile | 12 +++++------- science/mmg/files/patch-CMakeLists.txt | 14 ++++++++++++++ science/mmg/files/patch-git__log__mmg.h | 9 +++++++++ 3 files changed, 28 insertions(+), 7 deletions(-) diff --git a/science/mmg/Makefile b/science/mmg/Makefile index 66c4c5d53670..20acba012afe 100644 --- a/science/mmg/Makefile +++ b/science/mmg/Makefile @@ -1,6 +1,6 @@ PORTNAME= mmg -PORTVERSION= 5.7.3 DISTVERSIONPREFIX= v +DISTVERSION= 5.7.3 CATEGORIES= science MAINTAINER= ports@FreeBSD.org @@ -10,21 +10,19 @@ WWW= https://www.mmgtools.org/ LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= git:devel/git \ - bash:shells/bash LIB_DEPENDS= libscotch.so:cad/scotch \ - libElas.so:science/linearelasticity \ + libElas.so:science/linearelasticity \ libvtksys-${VTK_VER}.so:math/vtk${VTK_VER:R} -USES= cmake:testing perl5 shebangfix +USES= cmake perl5 shebangfix USE_PERL5= build -SHEBANG_FILES= scripts/*.sh +SHEBANG_FILES= scripts/*.pl +USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= MmgTools CMAKE_ON= BUILD_SHARED_LIBS -USE_LDCONFIG= yes .include <../../math/vtk9/Makefile.version> .include diff --git a/science/mmg/files/patch-CMakeLists.txt b/science/mmg/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..c7cb99ce1840 --- /dev/null +++ b/science/mmg/files/patch-CMakeLists.txt @@ -0,0 +1,14 @@ +--- CMakeLists.txt.orig 2024-04-25 08:15:24 UTC ++++ CMakeLists.txt +@@ -124,10 +124,7 @@ IF (NOT WIN32 OR MINGW) + IF (NOT WIN32 OR MINGW) + + ADD_CUSTOM_TARGET(GenerateGitHashMmg +- COMMAND ./git_log_mmg.sh ${PROJECT_SOURCE_DIR} ${MMGCOMMON_BINARY_DIR} +- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/scripts/ +- COMMENT "Getting git commit hash" +- BYPRODUCTS ${MMGCOMMON_BINARY_DIR}/git_log_mmg.h ++ COMMAND cp ${PROJECT_SOURCE_DIR}/git_log_mmg.h ${MMGCOMMON_BINARY_DIR}/git_log_mmg.h + ) + ENDIF () + diff --git a/science/mmg/files/patch-git__log__mmg.h b/science/mmg/files/patch-git__log__mmg.h new file mode 100644 index 000000000000..4a8ec0ac0b8a --- /dev/null +++ b/science/mmg/files/patch-git__log__mmg.h @@ -0,0 +1,9 @@ +--- git_log_mmg.h.orig 2024-06-23 16:47:08 UTC ++++ git_log_mmg.h +@@ -0,0 +1,6 @@ ++#ifndef _GIT_LOG_MMG_H ++#define _GIT_LOG_MMG_H ++#define MMG_GIT_BRANCH "No git branch found" ++#define MMG_GIT_COMMIT "No git commit found" ++#define MMG_GIT_DATE "No git commit found" ++#endif