[113330] trunk/dports/gis/saga/Portfile

[mojca at macports.org]

Revision: 113330
          https://trac.macports.org/changeset/113330
Author:   mojca at macports.org
Date:     2013-11-13 08:59:52 -0800 (Wed, 13 Nov 2013)
Log Message:
-----------
saga: revbump after wxWidgets upgrade; use the wxWidgets PortGroup (#40768, #41353, maintainer timeout)

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

Modified: trunk/dports/gis/saga/Portfile
===================================================================
--- trunk/dports/gis/saga/Portfile	2013-11-13 16:53:30 UTC (rev 113329)
+++ trunk/dports/gis/saga/Portfile	2013-11-13 16:59:52 UTC (rev 113330)
@@ -2,12 +2,13 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup           wxWidgets 1.0
 
 name                saga
 categories          gis
 license             GPL
 version             2.1.0
-revision            2
+revision            3
 platforms           darwin
 maintainers         vince openmaintainer
 
@@ -27,26 +28,30 @@
 checksums           rmd160  558332c890049c8c05b802aa2e413be2314697df \
                     sha256  eb4cfd9e1028a52d272bc2fe878ba4971b70fb79e6f73234e4c1519586a58a6c
 
-patchfiles          patch-configure_in.diff\
+patchfiles          patch-configure_in.diff \
                     patch-saga_cmd_cpp.diff
 
+wxWidgets.use       wxWidgets-3.0
+
 depends_build       port:autoconf \
                     port:automake \
                     port:libtool
 
-depends_lib         port:wxWidgets-3.0\
-                    port:geos\
-                    port:gdal\
-                    port:proj47\
-                    port:jasper\
-                    port:fftw-3\
+depends_lib         port:${wxWidgets.port} \
+                    port:geos \
+                    port:gdal \
+                    port:proj47 \
+                    port:jasper \
+                    port:fftw-3 \
                     port:unixodbc
 
-set wxver     3.0
-set wx30frmwk ${frameworks_dir}/wxWidgets.framework/Versions/wxWidgets/${wxver}
-
 post-patch  {
-    reinplace -E "s|wx-config|${wx30frmwk}/bin/wx-config|" ${worksrcpath}/configure.in
+    reinplace -E "s|wx-config|${wxWidgets.wxconfig}|" ${worksrcpath}/configure.in
+
+    set mkfiles [exec find ${worksrcpath} -type f -name Makefile.am]
+    foreach makefile ${mkfiles} {
+        reinplace -E "s|wx-config|${wxWidgets.wxconfig}|" ${makefile}
+    }
 }
 
 use_autoreconf              yes
@@ -54,8 +59,6 @@
 
 configure.args              --disable-openmp
 configure.cppflags-append   -I${prefix}/lib/proj47/include
-configure.cppflags-append   -I${wx30frmwk}/include/wx-${wxver}
-configure.cppflags-append   -I${wx30frmwk}/lib/wx/include/osx_cocoa-unicode-${wxver}
 
 variant python27 {
     depends_lib-append      port:python27\
@@ -63,13 +66,6 @@
     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}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131113/1ddcca7e/attachment.html>