From nobody Mon Jan 15 03:44:08 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 4TCygD5lWXz57WYB; Mon, 15 Jan 2024 03:44:08 +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 4TCygD4DRrz4Cw0; Mon, 15 Jan 2024 03:44:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705290248; 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=+czcZ5wtYuihTcnL9OFjzVLDw+FdGOsUXDN6YCNtgFw=; b=XSr62B8yQoUBOKwRPnXZXnwmKcVSsNnCanKZZfwfJk3lJxGnGSmN7P9hXk+q4D8DppxE59 l4xdMY7AqHsys4rFIOhTtInZrmODVkktm2F3IbFWjCtF/sfDAyG0i5xzqJhzfu5apwJiES fMECIGS77tVzZ5UdFV/3CHUh/5uJA6mo0mxOkgYReaJ8XLHmfB+Km3FBW+RyCpVh66JxOY UJoxClm8aYE05BktgF6R4xtAmW6lmz3PUP8vAuKosIeef9PO7x1XIpfNQBFXOOkW/LtY9T VkoFUewUOZzJYmgATGcyPX6aX8RaxPBKMkU1q8Bfz8ikz5yEhMQe97a5bxF8AQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705290248; 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=+czcZ5wtYuihTcnL9OFjzVLDw+FdGOsUXDN6YCNtgFw=; b=FocB9kB5aGV4WdF0Q6tyhT+pfOTwlaX6C5TRCaBHVIhUJknAjLqRZ4u6ArJI7EBgV1d4n8 j2BIq83rrOQo/PneJ033RiXUj5YQBmBDMjoEv22i2LGWXYslL21LorAxy+LUWyndcY32WN izGivHyKcPrQcHF2vEFS6ouyFk1Dh5GSo82Zp9vY00NNZgjFqQG35OVqdk57uCQMSZCn4v Nt85dGxmH2cl5yJYaaAFehcLfQeHzFKymM62Kh+We/Sxd3MJ/ZO1IlU0CJz/aJhvpijazl aeHhlacwINUNd9qN6dDCTNHZAOFBQSAbYxkNMiR1RZOuYxS+MxFRCPfYeMTFOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705290248; a=rsa-sha256; cv=none; b=Hw9c2MBjxonBAI/FMeuqeG1iLnc65TWuZczWzoeS3ib3hK9s3WCvmCx1jC0a2Cy8SSUYaH FaelIbBTBj/DjrhASdPlwN1l8TD4ZVDVcDlmwqcrubpox/IZf54qYVLhIWnK+bOKAMfNb4 J0qKnWHuTW2gOkRjju/Hc+hZBgXtUclYfsPW42fjYFNwy9E2sbXel/XZIw1Toag6iFw+7M 2a07To3FpZ0Q5sP1RFxkuaLF0ee4ztjfsVB1rWDGYOS9r+B1yNeeCypmA2rNWYVxxlzr/0 tEpv7/RuGGgSLx1mHsC/W2RNYgzu20hEoyw5CfJbosdHxO4DuvODLnoE2xMhcA== 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 4TCygD3Jkzzh3b; Mon, 15 Jan 2024 03:44:08 +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 40F3i8ow028633; Mon, 15 Jan 2024 03:44:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40F3i8KG028630; Mon, 15 Jan 2024 03:44:08 GMT (envelope-from git) Date: Mon, 15 Jan 2024 03:44:08 GMT Message-Id: <202401150344.40F3i8KG028630@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Stephen Montgomery-Smith Subject: git: a052b3a8aa32 - main - math/octave-forge-control: Tidy up build. 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: stephen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a052b3a8aa3290e51a8e2d0dcb7ed769881079cd Auto-Submitted: auto-generated The branch main has been updated by stephen: URL: https://cgit.FreeBSD.org/ports/commit/?id=a052b3a8aa3290e51a8e2d0dcb7ed769881079cd commit a052b3a8aa3290e51a8e2d0dcb7ed769881079cd Author: Stephen Montgomery-Smith AuthorDate: 2024-01-15 03:43:22 +0000 Commit: Stephen Montgomery-Smith CommitDate: 2024-01-15 03:43:22 +0000 math/octave-forge-control: Tidy up build. --- math/octave-forge-control/Makefile | 3 +++ math/octave-forge-control/files/patch-Makefile | 10 ---------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/math/octave-forge-control/Makefile b/math/octave-forge-control/Makefile index 6511331aa477..a892cb65e261 100644 --- a/math/octave-forge-control/Makefile +++ b/math/octave-forge-control/Makefile @@ -21,6 +21,9 @@ OCTAVE_SRC= ${GH_PROJECT}-control-${DISTVERSION} GNU_CONFIGURE= yes +post-patch: + ${MV} ${WRKSRC}/TG04BX.f ${WRKSRC_slicot}/src + pre-configure: ${REINPLACE_CMD} -e '/SC_SRC.*\:\=/s+slicot+${WRKSRC_slicot}'+ ${WRKSRC}/Makefile diff --git a/math/octave-forge-control/files/patch-Makefile b/math/octave-forge-control/files/patch-Makefile deleted file mode 100644 index 2320098580c2..000000000000 --- a/math/octave-forge-control/files/patch-Makefile +++ /dev/null @@ -1,10 +0,0 @@ ---- Makefile.orig 2024-01-11 01:31:30 UTC -+++ Makefile -@@ -30,6 +30,7 @@ all: __control_slicot_functions__.oct \ - # uppressing warnings on indexing errors - # - slicotlibrary.a: slicot -+ cp TG04BX.f $(SC_SRC) - cd $(SC_SRC) && $(MKOCTFILE) -w -c MA02ID.f; mv MA02ID.f x && $(MKOCTFILE) -c *.f && mv x MA02ID.f - $(AR) -rc slicotlibrary.a $(SC_SRC)/*.o -