[73529] trunk/dports/aqua/qtoctave-mac
and.damore at macports.org
and.damore at macports.org
Tue Nov 16 13:06:12 PST 2010
Revision: 73529
http://trac.macports.org/changeset/73529
Author: and.damore at macports.org
Date: 2010-11-16 13:06:07 -0800 (Tue, 16 Nov 2010)
Log Message:
-----------
fixed files conflict with libquicktime, cf. https://bugzilla.redhat.com/show_bug.cgi?id=590357
Modified Paths:
--------------
trunk/dports/aqua/qtoctave-mac/Portfile
Added Paths:
-----------
trunk/dports/aqua/qtoctave-mac/files/patch-qtinfo.diff
Modified: trunk/dports/aqua/qtoctave-mac/Portfile
===================================================================
--- trunk/dports/aqua/qtoctave-mac/Portfile 2010-11-16 20:25:49 UTC (rev 73528)
+++ trunk/dports/aqua/qtoctave-mac/Portfile 2010-11-16 21:06:07 UTC (rev 73529)
@@ -21,12 +21,14 @@
depends_lib-append path:bin/octave:octave
depends_build-append port:cmake
+depends_skip_archcheck octave
checksums md5 a15edc82c6780dc3764052b04bf902f0 \
sha1 1d18058c7549a3f25cd648183db3d99ef755257e \
rmd160 9e4725cc2a52cfe9b7ec1e1b74becba8146b74f0
-patchfiles patch-cmakelists_txt.diff
+patchfiles patch-cmakelists_txt.diff \
+ patch-qtinfo.diff
configure.cmd cmake
configure.pre_args -DCMAKE_INSTALL_PREFIX=${prefix}
Added: trunk/dports/aqua/qtoctave-mac/files/patch-qtinfo.diff
===================================================================
--- trunk/dports/aqua/qtoctave-mac/files/patch-qtinfo.diff (rev 0)
+++ trunk/dports/aqua/qtoctave-mac/files/patch-qtinfo.diff 2010-11-16 21:06:07 UTC (rev 73529)
@@ -0,0 +1,20 @@
+--- qtinfo/CMakeLists.txt.orig 2010-01-25 15:19:51.000000000 +0200
++++ qtinfo/CMakeLists.txt 2010-05-09 16:02:41.000000000 +0300
+@@ -33,6 +33,7 @@
+ PROPERTIES INSTALL_RPATH ":usr/lib"
+ BUILD_WITH_INSTALL_RPATH true
+ INSTALL_RPATH_USE_LINK_PATH true
++ OUTPUT_NAME qtoctave-info
+ )
+
+ TARGET_LINK_LIBRARIES(qtinfo
+--- qtoctave/src/scripts_octave/qtinfo.m.orig 2010-01-25 15:19:50.000000000 +0200
++++ qtoctave/src/scripts_octave/qtinfo.m 2010-05-09 16:02:19.000000000 +0300
+@@ -1,5 +1,5 @@
+ function qtinfo()
+- command=sprintf("qtinfo %s > /dev/null", info_file);
++ command=sprintf("qtoctave-info %s > /dev/null", info_file);
+ printf("Starting info: %s\n", command);
+ system(command, 1, "async");
+ endfunction
+\ No newline at end of file
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101116/7bd92089/attachment.html>
More information about the macports-changes
mailing list