octave-octproj: fix for proj4, take two

macports · Mar 27, 2018 · 77ea2fb · 77ea2fb
1 parent 495152d
commit 77ea2fb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 40 deletions.
diff --git 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
@@ -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