[rkward-cvs] SF.net SVN: rkward-code:[4787] trunk/rkward/macports/kde

[m-eik at users.sf.net]

Revision: 4787
          http://sourceforge.net/p/rkward/code/4787
Author:   m-eik
Date:     2014-04-29 20:05:19 +0000 (Tue, 29 Apr 2014)
Log Message:
-----------
MacPorts: the rkward-devel portfile now builds fine, but stable rkward (bound to rev 4635) doesn't:

<snip>
:info:build In file included from /opt/rkward/var/macports/build/_opt_ports_kde_rkward/rkward/work/rkward_0.6.1/rkward/windows/rkworkplace.cpp:37:
:info:build In file included from /opt/rkward/var/macports/build/_opt_ports_kde_rkward/rkward/work/rkward_0.6.1/rkward/windows/rkhtmlwindow.h:22:
:info:build In file included from /opt/rkward/include/kparts/browserextension.h:27:
:info:build In file included from /opt/rkward/include/kparts/event.h:23:
:info:build In file included from /opt/rkward/include/QtGui/QKeyEvent:1:
:info:build In file included from /opt/rkward/include/QtGui/qevent.h:52:
:info:build /opt/rkward/include/QtGui/qmime.h:119:10: warning: private field 'type' is not used [-Wunused-private-field]
:info:build     char type;
:info:build          ^
:info:build Undefined symbols for architecture x86_64:
:info:build   "R_data_class(SEXPREC*, Rboolean)", referenced from:
:info:build       RKStructureGetter::getStructureWorker(SEXPREC*, QString const&, int, RData*, int) in rkstructuregetter.o
:info:build ld: symbol(s) not found for architecture x86_64
:info:build clang: error: linker command failed with exit code 1 (use -v to see invocation)
:info:build make[2]: *** [rkward/rbackend/rkward.rbackend] Error 1
:info:build make[2]: Leaving directory `/opt/rkward/var/macports/build/_opt_ports_kde_rkward/rkward/work/rkward_0.6.1/build'
:info:build make[1]: *** [rkward/rbackend/CMakeFiles/rkward.rbackend.dir/all] Error 2
:info:build make[1]: *** Waiting for unfinished jobs....
</snip>

move ahead to 0.6.2?

Revision Links:
--------------
    http://sourceforge.net/p/rkward/code/4635

Modified Paths:
--------------
    trunk/rkward/macports/kde/rkward/Portfile
    trunk/rkward/macports/kde/rkward-devel/Portfile

Modified: trunk/rkward/macports/kde/rkward/Portfile
===================================================================
--- trunk/rkward/macports/kde/rkward/Portfile	2014-04-29 14:03:01 UTC (rev 4786)
+++ trunk/rkward/macports/kde/rkward/Portfile	2014-04-29 20:05:19 UTC (rev 4787)
@@ -41,25 +41,21 @@
         -DRKVERSION_NUMBER=${version} \
         -DBUNDLE_INSTALL_DIR=${applications_dir} \
         -DR_EXECUTABLE=${frameworks_dir}/R.framework/Resources/R
-# work around moved Qt include dir
-if { ![file exists ${prefix}/include/Qt/qglobal.h] && [file exists ${prefix}/include/QtCore/qglobal.h] } {
-        configure.args-append -DQT_QT_INCLUDE_DIR=${prefix}/include/QtCore
-}
 
 # configure R to use Mac binaries by default
 # you must first install the OS X packages of CRAN R, as we'll link against them
 subport rkward-binary {
         conflicts-append rkward rkward-devel-binary
         depends_lib-delete   port:gcc48 port:R
-#        configure.compiler   llvm-gcc-4.2
+        configure.compiler   llvm-gcc-4.2
         configure.args-delete \
                -DR_EXECUTABLE=${frameworks_dir}/R.framework/Resources/R
         configure.args-append \
                -DUSE_BINARY_PACKAGES=1 \
                -DR_EXECUTABLE=/Library/Frameworks/R.framework/Resources/R \
                -DR_LIBDIR=${frameworks_dir}/R.framework/Resources/library
-#        # create libdir if it doesn't exist
-#        file mkdir ${frameworks_dir}/R.framework/Resources/library
+        # create libdir if it doesn't exist
+        file mkdir ${frameworks_dir}/R.framework/Resources/library
 }
 
 # compile with full debugging support

Modified: trunk/rkward/macports/kde/rkward-devel/Portfile
===================================================================
--- trunk/rkward/macports/kde/rkward-devel/Portfile	2014-04-29 14:03:01 UTC (rev 4786)
+++ trunk/rkward/macports/kde/rkward-devel/Portfile	2014-04-29 20:05:19 UTC (rev 4787)
@@ -45,7 +45,7 @@
 # configure R to use Mac binaries by default
 # you must first install the OS X packages of CRAN R, as we'll link against them
 subport rkward-devel-binary {
-        conflicts-append rkward-devel rkward-binary rkward-devel-debug rkward-debug
+        conflicts-append rkward-devel rkward-binary
         depends_lib-delete   port:gcc48 port:R
         configure.compiler   llvm-gcc-4.2
         configure.args-delete \
@@ -60,9 +60,7 @@
 
 # compile with full debugging support
 variant rkward-devel-debug {
-        conflicts-append rkward-devel rkward-devel-binary rkward-binary
         depends_lib-append port:valgrind
-        configure.args-append -DCMAKE_BUILD_TYPE=debugfull
 }
 
 configure.post_args ..