From 77ea2fb4cfe60ff0add1be3fbbb320052a75dd02 Mon Sep 17 00:00:00 2001
From: Marius Schamschula <mps@macports.org>
Date: Tue, 27 Mar 2018 09:41:08 -0500
Subject: [PATCH] octave-octproj: fix for proj4, take two

---
 math/octave-octproj/Portfile                  |  6 ++--
 math/octave-octproj/files/patch-flags.diff    |  7 ++--
 .../files/patch-proj_api.h.diff               | 33 -------------------
 3 files changed, 6 insertions(+), 40 deletions(-)
 delete mode 100644 math/octave-octproj/files/patch-proj_api.h.diff

diff --git a/math/octave-octproj/Portfile b/math/octave-octproj/Portfile
index 2bec34374d20f..987009df0de20 100644
--- a/math/octave-octproj/Portfile
+++ b/math/octave-octproj/Portfile
@@ -4,7 +4,7 @@ PortSystem          1.0
 PortGroup           octave 1.0
 
 octave.setup        octproj 1.1.5
-revision            7
+revision            8
 platforms           darwin
 license             GPL-2+
 maintainers         {mps @Schamschula} openmaintainer
@@ -17,10 +17,8 @@ checksums           rmd160 f47e7addc3ced4f2373a5ab0e726186af0aa6644 \
 
 depends_lib-append  port:proj4
 
-patchfiles-append   patch-flags.diff \
-                    patch-proj_api.h.diff
+patchfiles-append   patch-flags.diff
 
 post-patch {
     reinplace "s|%PREFIX%|${prefix}|" ${worksrcpath}/src/Makefile
-    copy ${prefix}/lib/proj49/include/proj_api.h ${worksrcpath}/src/
 }
diff --git a/math/octave-octproj/files/patch-flags.diff b/math/octave-octproj/files/patch-flags.diff
index 16880f5ed55cc..345016e72b96f 100644
--- a/math/octave-octproj/files/patch-flags.diff
+++ b/math/octave-octproj/files/patch-flags.diff
@@ -1,6 +1,6 @@
---- src/Makefile.orig	2015-06-16 06:23:41.000000000 -0700
-+++ src/Makefile	2016-11-26 10:58:21.000000000 -0700
-@@ -1,19 +1,19 @@
+--- src/Makefile.orig	2015-06-16 08:23:41.000000000 -0500
++++ src/Makefile	2018-03-27 09:33:06.000000000 -0500
+@@ -1,19 +1,20 @@
  # -*- coding: utf-8 -*-
  #Compiler
 -MKOCTFILE=mkoctfile
@@ -25,6 +25,7 @@
  #Export flags for compilers and linker
 -export CFLAGS CXXFLAGS
 +#export CFLAGS CXXFLAGS
++CPPFLAGS+=-I%PREFIX%/lib/proj49/include
  
  .PHONY: all
  all: compile
diff --git a/math/octave-octproj/files/patch-proj_api.h.diff b/math/octave-octproj/files/patch-proj_api.h.diff
deleted file mode 100644
index 2a3927979f4e5..0000000000000
--- a/math/octave-octproj/files/patch-proj_api.h.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/projwrap.h.orig	2015-06-16 08:23:41.000000000 -0500
-+++ src/projwrap.h	2018-03-27 08:06:45.000000000 -0500
-@@ -23,7 +23,7 @@
- #include<stdio.h>
- #include<stdlib.h>
- #include<math.h>
--#include<proj_api.h>
-+#include "proj_api.h"
- /******************************************************************************/
- /******************************************************************************/
- #ifdef __cplusplus
- --- src/_op_geoc2geod.cc.orig	2015-06-16 08:23:41.000000000 -0500
-+++ src/_op_geoc2geod.cc	2018-03-27 08:27:33.000000000 -0500
-@@ -49,7 +49,7 @@
- /******************************************************************************/
- /******************************************************************************/
- #include<octave/oct.h>
--#include<proj_api.h>
-+#include "proj_api.h"
- #include<cstring>
- #include<cstdlib>
- /******************************************************************************/
---- src/_op_geod2geoc.cc.orig	2015-06-16 08:23:41.000000000 -0500
-+++ src/_op_geod2geoc.cc	2018-03-27 08:25:44.000000000 -0500
-@@ -51,7 +51,7 @@
- /******************************************************************************/
- /******************************************************************************/
- #include<octave/oct.h>
--#include<proj_api.h>
-+#include "proj_api.h"
- #include<cstring>
- #include<cstdlib>
- /******************************************************************************/