From nobody Sat Apr 09 03:46:34 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 D89FE1A99107; Sat, 9 Apr 2022 03:46:35 +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 4Kb1JB6xz4z3hpr; Sat, 9 Apr 2022 03:46:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649475995; 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=CoklJuxNbkDGBw3dd5RK9HlLGbolyackYlw8xMU0JRg=; b=wp5DqDvFAnR28xjJv/aVOmlFpGs006U6IPWSQrMcYIWzLEc1CP6PbpfMCoOrf6N+lM3saR JacCHHoXbvWOKkncRlTmrDeabd6qWFY6KylGs1Lo/TMYFvHAnHE0s8DYWjXmtEUWayFchS NB5T6tr2vSgJP9BjoBiNgUTjJrXdLl8LBD6TwZSKDSRPub879gG/BUD6908W/WcYVzJAlp CAYFK3R0sRWpahyQDmIOCXmZhHWMy/w8V/byf9uznhq3Xd/EUHRmaNOaSAcLgb5IfuN+xG W3tM+FPCPD9EpdhVB4iiJkCXqTZWqP1RovbgRfZuaT5pgOaYxpe+C8vBQ4ZVWQ== 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 68D4C125EA; Sat, 9 Apr 2022 03:46:34 +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 2393kYSG029087; Sat, 9 Apr 2022 03:46:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2393kY4B029086; Sat, 9 Apr 2022 03:46:34 GMT (envelope-from git) Date: Sat, 9 Apr 2022 03:46:34 GMT Message-Id: <202204090346.2393kY4B029086@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: a82c4b24af9c - main - math/octave-forge-optim: Fix install error. 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: a82c4b24af9c3e54f0e21ace202b88746986f828 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649475995; 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=CoklJuxNbkDGBw3dd5RK9HlLGbolyackYlw8xMU0JRg=; b=xSr9x94L+XROMTDWLyIXI5t74//POSAclbZa1TD/LIdS3QuqT/q+i5Zpwrb1ekCgmBuC+t zYIE/B+0dae5EQRDEnE5chsEmYire3OY0Vuuv4cXr735EapRfuYEM6LZVf6YWDRL6yvpTa DZ3fWPM/iX+nseKm73QrF+cAagnCnUYUrvbtvDbfzKGTrDscfPH5eTVIjzF3XofvVLJ7u4 vIH8OQa1LksaHoPIVgKD8r4+pH100g48L7qNmguyqaEBC2IvoJJudWsmjLX5fHbWOlMvkm cLHC+E4vbF6zz6FneW8dYGi5Wo+6mws82C5WBw2m1WlCI/uF9gcmNQQJhyL7fg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649475995; a=rsa-sha256; cv=none; b=i3rIC2SfxQAZtAeRMXraq1X3WjS03MXVsOD1rqgmijIk2MpKMwDbry5788gp+3YIMeMOCY 6deZeEh5Uv+CREz/4VJj5NPrexgduSYJt6/o/EQe5st4f1RREqVfvUAlKRdbJM7FbgOgpu X+xYuMTj9Ulc+B5MuLsWFW0Wmjx4SDQ+xl9Cwj0DqO9hoEf3yATUrbxZCUSvqDLiLcca6U Ll4fA4pn3XrNOPAzkB8bB9dDlukO1oAUfWJTKvqboP8x6b7rM0QPm04n4VQt8R15CD48+S MwVXqoJlydl9X9L/7g3E6yVuoo6aEyeWY1KWbj/wG9aKpdubJn53c5g5ANM6Vg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by stephen: URL: https://cgit.FreeBSD.org/ports/commit/?id=a82c4b24af9c3e54f0e21ace202b88746986f828 commit a82c4b24af9c3e54f0e21ace202b88746986f828 Author: Stephen Montgomery-Smith AuthorDate: 2022-04-09 03:46:05 +0000 Commit: Stephen Montgomery-Smith CommitDate: 2022-04-09 03:46:05 +0000 math/octave-forge-optim: Fix install error. --- math/octave-forge-optim/Makefile | 5 ++++- math/octave-forge-optim/files/patch-lsqlin.m | 11 +++++++++++ math/octave-forge-optim/files/patch-vfzero.m | 11 +++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/math/octave-forge-optim/Makefile b/math/octave-forge-optim/Makefile index 7d94d4ce2a32..4a269411d58c 100644 --- a/math/octave-forge-optim/Makefile +++ b/math/octave-forge-optim/Makefile @@ -2,7 +2,7 @@ PORTNAME= octave-forge-optim PORTVERSION= 1.6.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= math MAINTAINER= stephen@FreeBSD.org @@ -26,6 +26,9 @@ GNU_CONFIGURE= yes .include "${.CURDIR}/../../Mk/bsd.octave.mk" +USES+= shebangfix +SHEBANG_FILES= *.pl + post-build: ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} diff --git a/math/octave-forge-optim/files/patch-lsqlin.m b/math/octave-forge-optim/files/patch-lsqlin.m new file mode 100644 index 000000000000..55e191b75906 --- /dev/null +++ b/math/octave-forge-optim/files/patch-lsqlin.m @@ -0,0 +1,11 @@ +--- ../inst/lsqlin.m.orig 2022-04-08 22:29:29.290901000 -0500 ++++ ../inst/lsqlin.m 2022-04-08 22:29:41.495111000 -0500 +@@ -115,7 +115,7 @@ + + if (n_out > 2) + ## We don't need to know if original n_out was 3 or 2. +- n_out --; ++ n_out--; + endif + + quadprog_out = cell (1, max (n_out, 1)); diff --git a/math/octave-forge-optim/files/patch-vfzero.m b/math/octave-forge-optim/files/patch-vfzero.m new file mode 100644 index 000000000000..c08712576fc1 --- /dev/null +++ b/math/octave-forge-optim/files/patch-vfzero.m @@ -0,0 +1,11 @@ +--- ../inst/vfzero.m.orig 2022-04-08 22:30:39.255870000 -0500 ++++ ../inst/vfzero.m 2022-04-08 22:30:55.406374000 -0500 +@@ -282,7 +282,7 @@ + # fun() might expect full-length + # argument + fval(idx, 1) = fc(idx, 1) = fun (c)(:)(idx, 1); +- niter ++; nfev ++; ++ niter++; nfev++; + endif + + ## Modification 2: skip inverse cubic interpolation if