[rkward-cvs] SF.net SVN: rkward-code:[4785] trunk/rkward/macports/kde
m-eik at users.sf.net
m-eik at users.sf.net
Mon Apr 28 14:21:33 UTC 2014
Revision: 4785
http://sourceforge.net/p/rkward/code/4785
Author: m-eik
Date: 2014-04-28 14:21:32 +0000 (Mon, 28 Apr 2014)
Log Message:
-----------
MacPorts: trying to implement most of the suggestions to our portfiles (regarding rev119488 to MacPorts). needs testing in a clean environment.
Revision Links:
--------------
http://sourceforge.net/p/rkward/code/119488
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-23 07:44:45 UTC (rev 4784)
+++ trunk/rkward/macports/kde/rkward/Portfile 2014-04-28 14:21:32 UTC (rev 4785)
@@ -2,14 +2,15 @@
# $Id$
PortSystem 1.0
+PortGroup cmake 1.0
fetch.type svn
-svn.url http://svn.code.sf.net/p/rkward/code/branches/release_branches/rkward_0.6.1
+name rkward
+version 0.6.1
+svn.url http://svn.code.sf.net/p/rkward/code/branches/release_branches/rkward_${version}
svn.revision 4635
-worksrcdir ${workpath}/rkward_0.6.1
+worksrcdir ${name}_${version}
-name rkward
conflicts rkward-devel
-version 0.6.1
categories kde kde4 math science
maintainers hhu.de:meik.michalke
license GPL-2
@@ -25,8 +26,6 @@
master_sites https://sourceforge.net/projects/rkward/files/Current_Stable_Releases
-PortGroup cmake 1.0
-
depends_lib port:kdelibs4 \
port:kate \
port:R
@@ -39,56 +38,53 @@
}
if {${configure.compiler} == "clang"} {
- # force the use of gcc 4.7 to be able to link with R-framework
- depends_lib-append port:gcc47
- configure.compiler macports-gcc-4.7
+ # force the use of gcc 4.8 to be able to link with R-framework
+ depends_lib-append port:gcc48
+# configure.compiler macports-gcc-4.8
configure.objc /usr/bin/gcc
configure.env-append "OBJCXX=${configure.objc}"
}
post-extract {
- # creates the build dir if it doesn't exist
- # this won't return errors if directory is already there
- file mkdir ${worksrcdir}/build
+ file mkdir ${worksrcpath}/build
}
-configure.dir ${worksrcdir}/build
+configure.dir ${worksrcpath}/build
configure.args-append \
-DNO_R_XML=1 \
-DRKVERSION_NUMBER=${version} \
-DBUNDLE_INSTALL_DIR=${applications_dir} \
- -DR_EXECUTABLE=${prefix}/Library/Frameworks/R.framework/Resources/R
+ -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.cmd cmake ..
# 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 rkward-devel-debug rkward-debug
- depends_lib-delete port:gcc47 port:R
- configure.compiler llvm-gcc-4.2
+ conflicts-append rkward rkward-devel-binary
+ depends_lib-delete port:gcc48 port:R
+# configure.compiler llvm-gcc-4.2
configure.args-delete \
- -DR_EXECUTABLE=${prefix}/Library/Frameworks/R.framework/Resources/R
+ -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=${prefix}/Library/Frameworks/R.framework/Resources/library
- # create libdir if it doesn't exist
- file mkdir ${prefix}/Library/Frameworks/R.framework/Resources/library
+ -DR_LIBDIR=${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
-subport rkward-debug {
- conflicts-append rkward rkward-devel-binary rkward-devel-debug rkward-binary
+variant rkward-debug {
depends_lib-append port:valgrind
- configure.args-append -DCMAKE_BUILD_TYPE=debugfull
}
-build.dir ${worksrcdir}/build
+configure.post_args ..
+build.dir ${worksrcpath}/build
+
pre-pkg {
file copy -force -- ${worksrcdir}/macports/postinstall ${package.scripts}/postinstall
file attributes ${package.scripts}/postinstall -permissions 0755
Modified: trunk/rkward/macports/kde/rkward-devel/Portfile
===================================================================
--- trunk/rkward/macports/kde/rkward-devel/Portfile 2014-04-23 07:44:45 UTC (rev 4784)
+++ trunk/rkward/macports/kde/rkward-devel/Portfile 2014-04-28 14:21:32 UTC (rev 4785)
@@ -39,9 +39,9 @@
}
if {${configure.compiler} == "clang"} {
- # force the use of gcc 4.7 to be able to link with R-framework
- depends_lib-append port:gcc47
- configure.compiler macports-gcc-4.7
+ # force the use of gcc 4.8 to be able to link with R-framework
+ depends_lib-append port:gcc48
+ configure.compiler macports-gcc-4.8
configure.objc /usr/bin/gcc
configure.env-append "OBJCXX=${configure.objc}"
}
@@ -68,7 +68,7 @@
# 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
- depends_lib-delete port:gcc47 port:R
+ depends_lib-delete port:gcc48 port:R
configure.compiler llvm-gcc-4.2
configure.args-delete \
-DR_EXECUTABLE=${prefix}/Library/Frameworks/R.framework/Resources/R
More information about the rkward-tracker
mailing list