[97903] trunk/dports/science/OpenCSG

[michaelld at macports.org]

Revision: 97903
          http://trac.macports.org//changeset/97903
Author:   michaelld at macports.org
Date:     2012-09-19 05:04:06 -0700 (Wed, 19 Sep 2012)
Log Message:
-----------
OpenCSG : fix to build for the correct arch or +universal; tweak internals to play nicely with QMake.

Modified Paths:
--------------
    trunk/dports/science/OpenCSG/Portfile

Removed Paths:
-------------
    trunk/dports/science/OpenCSG/files/

Modified: trunk/dports/science/OpenCSG/Portfile
===================================================================
--- trunk/dports/science/OpenCSG/Portfile	2012-09-19 09:18:38 UTC (rev 97902)
+++ trunk/dports/science/OpenCSG/Portfile	2012-09-19 12:04:06 UTC (rev 97903)
@@ -1,3 +1,4 @@
+# -*- 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
 # $Id$
 
 PortSystem          1.0
@@ -5,6 +6,7 @@
 
 name                OpenCSG
 version             1.3.2
+revision            1
 license             GPL-2
 categories          science
 maintainers         macsforever2000 openmaintainer
@@ -23,26 +25,33 @@
 checksums           rmd160  4480778c310a3d5f84933c1b35508dd94adf2332 \
                     sha256  c790c92998f7113cb35cde825f81c5532755908a0a3f43c3c3c8df2326b3b925
 
-depends_build       port:qt4-mac
-# we only need qmake, don't care about it's arch
+# only need qmake, don't care about it's arch
+
+if {[file exists ${qt_frameworks_dir}/QtCore/QtCore]} {
+    depends_build-append path:Library/Frameworks/QtCore/QtCore:qt4-mac
+} else {
+    depends_build-append path:lib/libQtCore.4.dylib:qt4-mac
+}
 set depends_skip_archcheck {qt4-mac}
 
-patchfiles          patch-src__src.pro-use-system-glew.diff
-
 depends_lib         port:glew
 
 worksrcdir          ${distname}/src
 
+post-patch {
+    reinplace "s@\\.\\./glew/include@@" ${worksrcpath}/src.pro
+}
+
+pre-configure {
+    configure.post_args "CONFIG+=\"${qt_arch_types}\""
+}
+
 configure.cmd       ${qt_qmake_cmd}
 configure.pre_args
 configure.args      -o Makefile src.pro LIBS+="-lGLEW"
-configure.post_args
 configure.universal_args
+configure.args-append "CONFIG-=qt"
 
-post-configure {
-    reinplace "s/-lQtGui -lQtCore//g" ${worksrcpath}/Makefile
-}
-
 destroot {
     eval file copy [glob ${worksrcpath}/../lib/*] ${destroot}${prefix}/lib
     eval file copy [glob ${worksrcpath}/../include/*] ${destroot}${prefix}/include
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120919/6347bcdb/attachment.html>