From nobody Sun Nov 7 19:51:02 2021 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 937341839A97; Sun, 7 Nov 2021 19:51:02 +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 4HnPxf3mPYz4cBw; Sun, 7 Nov 2021 19:51:02 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 62C7523FD4; Sun, 7 Nov 2021 19:51:02 +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 1A7Jp2iW002743; Sun, 7 Nov 2021 19:51:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1A7Jp2qH002742; Sun, 7 Nov 2021 19:51:02 GMT (envelope-from git) Date: Sun, 7 Nov 2021 19:51:02 GMT Message-Id: <202111071951.1A7Jp2qH002742@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: a277131e9bc3 - main - math/octave-forge-octproj: Do commit 50bbd9725a8b properly. 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: a277131e9bc3bfb58e537cd15c2e44ab66902562 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by stephen: URL: https://cgit.FreeBSD.org/ports/commit/?id=a277131e9bc3bfb58e537cd15c2e44ab66902562 commit a277131e9bc3bfb58e537cd15c2e44ab66902562 Author: Stephen Montgomery-Smith AuthorDate: 2021-11-07 19:48:47 +0000 Commit: Stephen Montgomery-Smith CommitDate: 2021-11-07 19:48:47 +0000 math/octave-forge-octproj: Do commit 50bbd9725a8b properly. Edit Makefile instead of undefining ACCEPT_USE_OF_DEPRECATED_PROJ_API_H. --- math/octave-forge-octproj/Makefile | 2 -- math/octave-forge-octproj/files/patch-projwrap.h | 10 ---------- 2 files changed, 12 deletions(-) diff --git a/math/octave-forge-octproj/Makefile b/math/octave-forge-octproj/Makefile index 29bd722d88d0..2868adcb3383 100644 --- a/math/octave-forge-octproj/Makefile +++ b/math/octave-forge-octproj/Makefile @@ -21,8 +21,6 @@ WRKSRC= ${WRKDIR}/${OCTSRC}/src USES+= compiler:gcc-c++11-lib -CPPFLAGS+= -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1 - .include "${.CURDIR}/../../Mk/bsd.octave.mk" post-patch: diff --git a/math/octave-forge-octproj/files/patch-projwrap.h b/math/octave-forge-octproj/files/patch-projwrap.h deleted file mode 100644 index c56dc1f24c25..000000000000 --- a/math/octave-forge-octproj/files/patch-projwrap.h +++ /dev/null @@ -1,10 +0,0 @@ ---- projwrap.h.orig 2020-05-07 16:41:54 UTC -+++ projwrap.h -@@ -24,6 +24,7 @@ or http://www.gnu.org - #include - #include - #include -+#undef ACCEPT_USE_OF_DEPRECATED_PROJ_API_H - #include - /******************************************************************************/ - /******************************************************************************/