aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Montgomery-Smith <stephen@FreeBSD.org>2021-11-07 19:48:47 +0000
committerStephen Montgomery-Smith <stephen@FreeBSD.org>2021-11-07 19:48:47 +0000
commita277131e9bc3bfb58e537cd15c2e44ab66902562 (patch)
tree287d038abc44372f1f139d960c39d0dc2c478696
parentbea5fd858be051ba4d62d6d7c59202dd0da925d9 (diff)
downloadports-a277131e9bc3bfb58e537cd15c2e44ab66902562.tar.gz
ports-a277131e9bc3bfb58e537cd15c2e44ab66902562.zip
math/octave-forge-octproj: Do commit 50bbd9725a8b properly.
Edit Makefile instead of undefining ACCEPT_USE_OF_DEPRECATED_PROJ_API_H.
-rw-r--r--math/octave-forge-octproj/Makefile2
-rw-r--r--math/octave-forge-octproj/files/patch-projwrap.h10
2 files changed, 0 insertions, 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>
- /******************************************************************************/
- /******************************************************************************/