git: a277131e9bc3 - main - math/octave-forge-octproj: Do commit 50bbd9725a8b properly.

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Stephen Montgomery-Smith <stephen_at_FreeBSD.org>
Date: Sun, 07 Nov 2021 19:51:02 UTC

The branch main has been updated by stephen:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a277131e9bc3bfb58e537cd15c2e44ab66902562

commit a277131e9bc3bfb58e537cd15c2e44ab66902562
Author:     Stephen Montgomery-Smith <stephen@FreeBSD.org>
AuthorDate: 2021-11-07 19:48:47 +0000
Commit:     Stephen Montgomery-Smith <stephen@FreeBSD.org>
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<stdio.h>
- #include<stdlib.h>
- #include<math.h>
-+#undef ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
- #include<proj.h>
- /******************************************************************************/
- /******************************************************************************/