From nobody Mon May 6 19:51:54 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 4VYBrB4Cn7z5JBZG; Mon, 06 May 2024 19:51:54 +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 4VYBrB2HvGz47tr; Mon, 6 May 2024 19:51:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715025114; 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=kC5Ai4R+sw017G0pX1YJ5l1nJg0l9dUULH7acAcU9/M=; b=jU2tHCSfNSXnAVRUr13K6+hN5Yg6RDe8s9w16/ae6k5Hu3uor6oY1WmZaQT12pd/sQD4pG STvW30or7r2+dsCL+lROan1e1bAIvZtA7+qiqcbUQpEE93KyZSt/6anfkcMU/cL/CzNdKA xKPZ3vpmU/qTT0AMYXfikl1ea1DAuemZbZxKfRTdn1/MzMFA9nzTsLwTli4d7u33WW1uvM K/ul3CdcCgrKvYx+YVbUL9kLOEDf5PoaQZG0gr0HibVGBjGnYjF7EUODhi2KVgTIinxAvD cujMuumzFfDG9Xlqm+TgE2Kk5iZKeeGw8ktgcY8WdQfjd7K25fZ6mDxaDt2d7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715025114; a=rsa-sha256; cv=none; b=uGXCRe4mtzysM99v0mJukpDim4TNcRybfsIXa01HBvNHsvazMMJfkE3VGJfQjdYDolVQIo D/DumcIO5G02cfmJ3VGw5ZRhTE9CV5zY0X21/cg939lvnqiX6A7efev9AwFA0NYImukrif P8HyOIXCGA2tN7hj4UqmXDbTycT4PZtY4mMFx+s47DGSn0O3tf3OD1E/2r2b7vQ6d0nxRH jm1YSmH94+Pw5sEJojPVxpeoyz9ICuG+foK7uHrvTAL0VKMS89JSG0jz0zHEfDOVnAhLvL 24sPeXlczV6L1ChGb/zpB3SftCwt6RTYUThw0hxajom/pbONel7xzgrAqY5CoA== 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=1715025114; 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=kC5Ai4R+sw017G0pX1YJ5l1nJg0l9dUULH7acAcU9/M=; b=RTu+NbG+0kQcXicxILFa3ACPeuqOpPLxVCsghlk1gDcFwPcQKMsl16KSZqQsCmjxP0Bn1U A4PmspanZcyfIEuOzb/T1s5gNtKjAIWoduYu28tlUiW66DL5fys0xbXpVFKhNRurQaoNHX +6kgRoLKndcb21CffMPDh/EG16m9UqrbFR1mxZmsfdmEb8jlkVBHTiszo7CzErQKPGnOd4 Q6d5DMV6RdEbHMVKbk9cgBT304/ha5qM6xCwlVd9vyNabuN4jL/MFlHBnitHe4amjVETpv OOh+XkD0g8FFrIjK6VlJTDmyNrzF49ovqCl2ADXQfzXKvLt1Dx4mWyY+dL/aZA== 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 4VYBrB1v8Yz19pC; Mon, 6 May 2024 19:51:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 446Jpsg2093730; Mon, 6 May 2024 19:51:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 446JpsH3093727; Mon, 6 May 2024 19:51:54 GMT (envelope-from git) Date: Mon, 6 May 2024 19:51:54 GMT Message-Id: <202405061951.446JpsH3093727@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yuri Victorovich Subject: git: f3fc760b6a1b - 2024Q2 - science/multiwfn: Fix build failure due to missing makefile dependency 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q2 X-Git-Reftype: branch X-Git-Commit: f3fc760b6a1b4706563fa3a77a7ad503b79fed33 Auto-Submitted: auto-generated The branch 2024Q2 has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=f3fc760b6a1b4706563fa3a77a7ad503b79fed33 commit f3fc760b6a1b4706563fa3a77a7ad503b79fed33 Author: Yuri Victorovich AuthorDate: 2024-05-06 14:44:28 +0000 Commit: Yuri Victorovich CommitDate: 2024-05-06 19:51:49 +0000 science/multiwfn: Fix build failure due to missing makefile dependency Reported by: fallout (cherry picked from commit d02d0110f1d133f703f8b5649b7a0d11d7eb24f8) --- science/multiwfn/Makefile | 2 -- science/multiwfn/files/patch-Makefile | 17 +++++++++++++---- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/science/multiwfn/Makefile b/science/multiwfn/Makefile index c7e0470a16a4..35630a783446 100644 --- a/science/multiwfn/Makefile +++ b/science/multiwfn/Makefile @@ -39,8 +39,6 @@ ALL_TARGET= default DISLIN_VERSION= 11.5 -MAKE_JOBS_UNSAFE= yes # fix build on quarterly (not latest) when mod_2f2.mod isn't found due to commands mis-order - BINARY_ALIAS= ifort=gfortran${GCC_DEFAULT} \ gcc=${CC} diff --git a/science/multiwfn/files/patch-Makefile b/science/multiwfn/files/patch-Makefile index 00ff10bae181..9c38fc1f94f2 100644 --- a/science/multiwfn/files/patch-Makefile +++ b/science/multiwfn/files/patch-Makefile @@ -1,6 +1,6 @@ --- Makefile.orig 2023-02-06 10:17:38 UTC +++ Makefile -@@ -1,6 +1,6 @@ +@@ -1,6 +1,6 @@ SIMD = -msse3 SIMD = -msse3 -OPT = -O2 -qopenmp -qopenmp-link=static -threads -qopt-matmul $(SIMD) -diag-disable 8290,8291,6371,10316,6178 -fpp -mkl -static-intel -DINTEL_MKL -OPT1 = -O1 -qopenmp -qopenmp-link=static -threads $(SIMD) -diag-disable 8290,8291,6371,10316,6178 -fpp -mkl -static-intel -DINTEL_MKL @@ -9,7 +9,7 @@ #Options in the next line is for debugging purpose #OPTDBG = -O0 -qopenmp -diag-disable 8290,8291,6371 -threads -qopenmp-link=static -debug all -g -traceback -check all -fstack-protector -fpp -mkl -static-intel -@@ -43,10 +43,10 @@ default : $(objects) +@@ -43,10 +43,10 @@ GUI: $(objects) @echo " ------------------------------------------------------ " GUI: $(objects) @@ -22,7 +22,16 @@ clean: rm -f $(EXE) *.o *.mod -@@ -230,7 +230,7 @@ cp2kmate.o : cp2kmate.f90 $(modules) +@@ -80,7 +80,7 @@ util.o : util.f90 define.o + util.o : util.f90 define.o + $(FC) $(OPT) -c util.f90 + +-function.o : function.f90 define.o util.o Bspline.o libreta.o ++function.o : function.f90 define.o util.o Bspline.o libreta.o 2F2.f90.o # add 2F2.f90.o to fix dependency problem when mod_2f2.mod isn't found + $(FC) $(OPT) -c function.f90 + + plot.o : plot.f90 define.o util.o +@@ -230,7 +230,7 @@ noGUI/dislin_d_empty.o : noGUI/dislin_d_empty.f90 noGUI/dislin_d_empty.o : noGUI/dislin_d_empty.f90 @@ -31,7 +40,7 @@ # Interfaces of libreta-ESP to Multiwfn -@@ -241,10 +241,10 @@ libreta.o: ${LIBRETAPATH}/libreta.f90 hrr_012345.o blo +@@ -241,10 +241,10 @@ hrr_012345.o: ${LIBRETAPATH}/hrr_012345.f90 # Pure libreta files for ESP hrr_012345.o: ${LIBRETAPATH}/hrr_012345.f90