[142928] trunk/dports/science/scidavis

[nicos at macports.org]

Revision: 142928
          https://trac.macports.org/changeset/142928
Author:   nicos at macports.org
Date:     2015-11-28 06:35:54 -0800 (Sat, 28 Nov 2015)
Log Message:
-----------
scidavis: update to 1.D9

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

Removed Paths:
-------------
    trunk/dports/science/scidavis/files/patch-noQtAssistant.diff

Modified: trunk/dports/science/scidavis/Portfile
===================================================================
--- trunk/dports/science/scidavis/Portfile	2015-11-28 14:34:00 UTC (rev 142927)
+++ trunk/dports/science/scidavis/Portfile	2015-11-28 14:35:54 UTC (rev 142928)
@@ -5,8 +5,7 @@
 PortGroup           qmake 1.0
 
 name                scidavis
-version             1.D8
-revision            1
+version             1.D9
 categories          science
 license             GPL-2+
 maintainers         nicos openmaintainer
@@ -29,15 +28,16 @@
                     port:muparser \
                     port:zlib
 
-checksums           rmd160  05517e0bf730078706eaabf948c1ab91117f49a3 \
-                    sha256  452b6fbd7f869e38c0dedae36fa0d2c4daddbf6b24c1b497d2ecbbedf16ebd46
+checksums           rmd160  ecd99befd493e54e3bd599f174f291ddb2c92d2b \
+                    sha256  484089713cec7824f9557ac345ec2693f24e074999d6d1d7d00c10b1e2f37eb8
 
 universal_variant   no
 
-patchfiles          patch-noQtAssistant.diff \
-                    patch-OriginObj.diff \
+patchfiles          patch-OriginObj.diff \
                     patch-liborigin.diff
 
+configure.pre_args-append   "'CONFIG+=osx_dist noassistant'"
+
 pre-configure {
     reinplace "s|/usr|${prefix}|g" ${worksrcpath}/config.pri
     reinplace "s|/usr|${prefix}|g" ${worksrcpath}/fitPlugins/exp_saturation/exp_saturation.pro
@@ -48,16 +48,9 @@
 
     reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/3rdparty/liborigin/CMakeLists.txt
 
-    reinplace "s|PRESET = linux_package|PRESET = mac_dist|g" \
-        ${worksrcpath}/config.pri
-
-    if {[variant_isset python27]} {
-        reinplace "s|system\(python|system\(${prefix}/bin/python2.7|g" \
-            ${worksrcpath}/scidavis/python.pri
-    } else {
-        reinplace "s|include( ../scidavis/python.pri )|#include( ../scidavis/python.pri )|g" \
+    if {![variant_isset python27]} {
+        reinplace "s|CONFIG+=python| |g" \
             ${worksrcpath}/config.pri
-        reinplace "s|-lpython2.7||g" ${worksrcpath}/config.pri
     }
 }
 

Deleted: trunk/dports/science/scidavis/files/patch-noQtAssistant.diff
===================================================================
--- trunk/dports/science/scidavis/files/patch-noQtAssistant.diff	2015-11-28 14:34:00 UTC (rev 142927)
+++ trunk/dports/science/scidavis/files/patch-noQtAssistant.diff	2015-11-28 14:35:54 UTC (rev 142928)
@@ -1,11 +0,0 @@
---- config.pri.orig	2014-07-23 14:01:09.000000000 +0900
-+++ config.pri	2014-08-16 18:39:18.000000000 +0900
-@@ -242,6 +242,8 @@
- #		INCLUDEPATH += ../3rdparty/liborigin2
- #	}
- 
-+        DEFINES += NOASSISTANT
-+
-         QMAKE_EXTRA_TARGETS += mac-dist
-         mac-dist.commands = sh mkMacDist.sh
- 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/dbdbf8d1/attachment-0001.html>