[138041] trunk/dports/devel/gwenhywfar4

[mk at macports.org]

Revision: 138041
          https://trac.macports.org/changeset/138041
Author:   mk at macports.org
Date:     2015-06-26 14:13:49 -0700 (Fri, 26 Jun 2015)
Log Message:
-----------
gwenhywfar4: closes #47661 (Thanks, René)

Modified Paths:
--------------
    trunk/dports/devel/gwenhywfar4/Portfile

Added Paths:
-----------
    trunk/dports/devel/gwenhywfar4/files/
    trunk/dports/devel/gwenhywfar4/files/patch-shlib-extensions.diff

Modified: trunk/dports/devel/gwenhywfar4/Portfile
===================================================================
--- trunk/dports/devel/gwenhywfar4/Portfile	2015-06-26 18:38:55 UTC (rev 138040)
+++ trunk/dports/devel/gwenhywfar4/Portfile	2015-06-26 21:13:49 UTC (rev 138041)
@@ -1,9 +1,11 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+# kate: backspace-indents true; indent-pasted-text true; indent-width 4; keep-extra-spaces true; remove-trailing-spaces modified; replace-tabs true; replace-tabs-save true; syntax Tcl/Tk; tab-indents true; tab-width 4;
 # $Id$
 
 PortSystem        1.0
 
 name              gwenhywfar4
+revision          1
 # This port offers the latest stable version (also as a gtk subport)
 # as well as the latest beta version as gwenhywfar4-devel!
 
@@ -48,6 +50,8 @@
 subport gwenhywfar4-devel {}
 subport gwenhywfar4-gtk-devel {}
 
+patchfiles      patch-shlib-extensions.diff
+
 if {[string match "*-devel" $subport]} {
     version                 4.13.1
     # this is specific to this port and *version* for downloading it
@@ -59,12 +63,13 @@
 }
 
 if {$subport eq $name || $subport eq "gwenhywfar4-devel"} {
-    configure.args-append   --with-qt4-libs=${prefix}/lib \
-                            --with-qt4-includes=${prefix}/include \
-                            --with-qt4-moc=${prefix}/bin/moc \
-                            --with-qt4-uic=${prefix}/bin/uic \
-                            --with-guis=qt4
-    depends_lib-append      path:bin/qmake:qt4-mac
+    # the correct way to depend on Qt4:
+    PortGroup               qt4 1.0
+    configure.args-append   --with-qt4-libs=${qt_libs_dir} \
+                            --with-qt4-includes=${qt_includes_dir} \
+                            --with-qt4-moc=${qt_moc_cmd} \
+                            --with-qt4-uic=${qt_uic_cmd} \
+                            --with-guis="qt4 cpp cocoa"
 }
 
 master_sites      http://www2.aquamaniac.de/sites/download/download.php?package=01&release=${release}&file=01&dummy=
@@ -72,7 +77,7 @@
 
 if {[string match "gwenhywfar4-gtk*" $subport]} {
     depends_lib-append      port:gtk2
-    configure.args-append   --with-guis=gtk2 --disable-qt4
+    configure.args-append   --with-guis="gtk2 cpp" --disable-qt4
 
     # Allow gwenhywfar4-gtk and aqbanking5-gtk to replace the old
     # gwenhywfar and aqbanking by deactivating them if installed. This
@@ -103,6 +108,8 @@
     configure.args-append --enable-debug
 }
 
+configure.args-append   --disable-dependency-tracking --disable-silent-rules
+
 livecheck.type    regex
 livecheck.url     http://www2.aquamaniac.de/sites/download/packages.php?package=01&showall=1
 if {[string match "*-devel" $subport]} {

Added: trunk/dports/devel/gwenhywfar4/files/patch-shlib-extensions.diff
===================================================================
--- trunk/dports/devel/gwenhywfar4/files/patch-shlib-extensions.diff	                        (rev 0)
+++ trunk/dports/devel/gwenhywfar4/files/patch-shlib-extensions.diff	2015-06-26 21:13:49 UTC (rev 138041)
@@ -0,0 +1,37 @@
+diff --git gui/qt4/gwengui-qt4-config.cmake.in gui/qt4/gwengui-qt4-config.cmake.in
+index 8b2b0fb..8225914 100644
+--- gui/qt4/gwengui-qt4-config.cmake.in
++++ gui/qt4/gwengui-qt4-config.cmake.in
+@@ -22,8 +22,13 @@ if(NOT EXISTS "${_file}")
+       set_and_check(exec_prefix "@exec_prefix@")
+       set_and_check(includedir "@includedir@")
+       set_and_check(GWENGUI_QT4_INCLUDE_DIRS "@gwenhywfar_headerdir@")
+-      set_and_check(GWENGUI_QT4_LIBRARIES "@libdir@/libgwengui-qt4.so")
+-      set_and_check(GWENHYWFAR_CPP_LIBRARIES "@libdir@/libgwengui-cpp.so")
++      if(APPLE)
++        set_and_check(GWENGUI_QT4_LIBRARIES "@libdir@/libgwengui-qt4.dylib")
++        set_and_check(GWENHYWFAR_CPP_LIBRARIES "@libdir@/libgwengui-cpp.dylib")
++      else()
++        set_and_check(GWENGUI_QT4_LIBRARIES "@libdir@/libgwengui-qt4.so")
++        set_and_check(GWENHYWFAR_CPP_LIBRARIES "@libdir@/libgwengui-cpp.so")
++      endif(APPLE)
+ 
+       set(GWENGUI_QT4_LIBRARIES ${GWENGUI_QT4_LIBRARIES} ${GWENHYWFAR_CPP_LIBRARIES})
+ 
+diff --git gwenhywfar-config.cmake.in gwenhywfar-config.cmake.in
+index 82955da..fabef61 100644
+--- gwenhywfar-config.cmake.in
++++ gwenhywfar-config.cmake.in
+@@ -23,7 +23,11 @@ set_and_check(prefix "@prefix@")
+ set_and_check(exec_prefix "@exec_prefix@")
+ set_and_check(includedir "@includedir@")
+ set_and_check(GWENHYWFAR_INCLUDE_DIRS "@gwenhywfar_headerdir@")
+-set_and_check(GWENHYWFAR_LIBRARIES "@libdir@/libgwenhywfar.so. at GWENHYWFAR_SO_EFFECTIVE@")
++if(APPLE)
++  set_and_check(GWENHYWFAR_LIBRARIES "@libdir@/libgwenhywfar. at GWENHYWFAR_SO_EFFECTIVE@.dylib")
++else()
++  set_and_check(GWENHYWFAR_LIBRARIES "@libdir@/libgwenhywfar.so. at GWENHYWFAR_SO_EFFECTIVE@")
++endif(APPLE)
+ 
+ # find components
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150626/2c8a1f41/attachment.html>