[111638] trunk/dports/gis/saga

[vince at macports.org]

Revision: 111638
          https://trac.macports.org/changeset/111638
Author:   vince at macports.org
Date:     2013-09-27 10:00:07 -0700 (Fri, 27 Sep 2013)
Log Message:
-----------
Rework the port file to be compatible with the framework installation of wxpython 3.0

Modified Paths:
--------------
    trunk/dports/gis/saga/Portfile

Added Paths:
-----------
    trunk/dports/gis/saga/files/patch-saga_cmd_cpp.diff

Modified: trunk/dports/gis/saga/Portfile
===================================================================
--- trunk/dports/gis/saga/Portfile	2013-09-27 16:41:52 UTC (rev 111637)
+++ trunk/dports/gis/saga/Portfile	2013-09-27 17:00:07 UTC (rev 111638)
@@ -42,12 +42,19 @@
                     port:fftw-3\
                     port:unixodbc
 
+set wx30frmwk ${frameworks_dir}/wxWidgets.framework/Versions/wxWidgets/2.9
 
+post-patch  {
+    reinplace -E "s|wx-config|${wx30frmwk}/bin/wx-config|" ${worksrcpath}/configure.in
+}
+
 use_autoreconf              yes
 autoreconf.args             -i
 
 configure.args              --disable-openmp
 configure.cppflags-append   -I${prefix}/lib/proj47/include
+configure.cppflags-append   -I${wx30frmwk}/include/wx-2.9
+configure.cppflags-append   -I${wx30frmwk}/lib/wx/include/osx_cocoa-unicode-2.9
 
 variant python27 {
     depends_lib-append      port:python27\
@@ -55,6 +62,14 @@
     configure.args-append   --enable-python
 }
 
+pre-build {
+    set mkfiles [exec find ${worksrcpath} -type f -name Makefile]
+    foreach makefile ${mkfiles} {
+        reinplace -E "s|wx-config|${wx30frmwk}/bin/wx-config|" ${makefile}
+    }
+}
+    
+
 livecheck.type              regex
 livecheck.url               ${master_sites}
 livecheck.regex             ${name}-(\\d+(?:\\.\\d+)*)\\.tar

Added: trunk/dports/gis/saga/files/patch-saga_cmd_cpp.diff
===================================================================
--- trunk/dports/gis/saga/files/patch-saga_cmd_cpp.diff	                        (rev 0)
+++ trunk/dports/gis/saga/files/patch-saga_cmd_cpp.diff	2013-09-27 17:00:07 UTC (rev 111638)
@@ -0,0 +1,10 @@
+--- src/saga_core/saga_cmd/saga_cmd.cpp.orig	2013-07-27 12:43:30.000000000 +0200
++++ src/saga_core/saga_cmd/saga_cmd.cpp	2013-07-27 12:43:44.000000000 +0200
+@@ -63,6 +63,7 @@
+ //---------------------------------------------------------
+ #include <wx/app.h>
+ #include <wx/utils.h>
++#include <locale.h>
+ 
+ #include "callback.h"
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130927/6db9000d/attachment.html>