Changeset 97903

Timestamp:

Sep 19, 2012, 12:04:06 PM (12 years ago)

Author:

michaelld@…

Message:

OpenCSG : fix to build for the correct arch or +universal; tweak internals to play nicely with QMake.

Location:

trunk/dports/science/OpenCSG

Files:

• Portfile (modified) (4 diffs)
• files (deleted)

trunk/dports/science/OpenCSG/Portfile

@@ +1 @@
+# -*- 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$
 
@@ -6 +7 @@
 name                OpenCSG
 version             1.3.2
+revision            1
 license             GPL-2
 categories          science
@@ -24 +26 @@
                     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
@@ -34 +39 @@
 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
-
-post-configure {
-    reinplace "s/-lQtGui -lQtCore//g" ${worksrcpath}/Makefile
-}
+configure.args-append "CONFIG-=qt"
 
 destroot {