[114398] users/mojca/ports/science
mojca at macports.org
mojca at macports.org
Sat Dec 7 02:03:19 PST 2013
Revision: 114398
https://trac.macports.org/changeset/114398
Author: mojca at macports.org
Date: 2013-12-07 02:03:19 -0800 (Sat, 07 Dec 2013)
Log Message:
-----------
mojca/root: use builtin_freetype, fix a typo in options
Modified Paths:
--------------
users/mojca/ports/science/root/Portfile
users/mojca/ports/science/root5/Portfile
Modified: users/mojca/ports/science/root/Portfile
===================================================================
--- users/mojca/ports/science/root/Portfile 2013-12-07 09:47:25 UTC (rev 114397)
+++ users/mojca/ports/science/root/Portfile 2013-12-07 10:03:19 UTC (rev 114398)
@@ -52,41 +52,11 @@
patchfiles patch-graf2d-asimage-src-libAfterImage-asfont.c.diff \
patch-cmake.diff
-# I somehow miss (some of) the following variables
-# CMAKE_INSTALL_BINDIR bin
-# CMAKE_INSTALL_DATADIR
-# CMAKE_INSTALL_DATAROOTDIR share
-# CMAKE_INSTALL_DOCDIR
-# CMAKE_INSTALL_INCLUDEDIR include
-# CMAKE_INSTALL_LIBDIR lib
-
-# TODO: double-check these
-# set(ROOT_INSTALL_DIR ${CMAKE_INSTALL_PREFIX})
-# set(BIN_INSTALL_DIR bin)
-# set(LIB_INSTALL_DIR lib/root)
-# set(INCLUDE_INSTALL_DIR include/root)
-# set(ETC_INSTALL_DIR /etc/root)
-# set(MAN_INSTALL_DIR share/man)
-# set(DATA_INSTALL_DIR share/root)
-# set(MACRO_INSTALL_DIR ${DATA_INSTALL_DIR}/macros)
-# set(CINTINC_INSTALL_DIR ${LIB_INSTALL_DIR}/cint)
-# set(ICON_INSTALL_DIR ${DATA_INSTALL_DIR}/icons)
-# set(SRC_INSTALL_DIR ${DATA_INSTALL_DIR}/src)
-# set(FONT_INSTALL_DIR ${DATA_INSTALL_DIR}/fonts)
-# set(DOC_INSTALL_DIR share/doc/root)
-# set(TEST_INSTALL_DIR ${DOC_INSTALL_DIR}/test)
-# set(TUT_INSTALL_DIR ${DOC_INSTALL_DIR}/tutorials)
-# set(ACLOCAL_INSTALL_DIR share/aclocal)
-# set(ELISP_INSTALL_DIR share/emacs/site-lisp)
-# set(CMAKE_INSTALL_DIR ${DATA_INSTALL_DIR}/cmake)
-
-#-DCMAKE_INSTALL_PREFIX=${prefix}
-
configure.args-append \
-Dgnuinstall=ON \
-DCMAKE_INSTALL_SYSCONFDIR="etc/root" \
-Dfortran=OFF \
- -Dbuiltin_freetype=OFF \
+ -Dbuiltin_freetype=ON \
-Dbuiltin_glew=OFF \
-Dbuiltin_pcre=OFF \
-Dbuiltin_zlib=OFF \
@@ -152,19 +122,21 @@
if {${cxx_stdlib} == "libc++"} {
configure.args-replace -Dc++11=OFF -Dc++11=ON
- configure.args-replace -Dlibcxx=OFF -dlibcxx=ON
+ configure.args-replace -Dlibcxx=OFF -Dlibcxx=ON
}
}
configure.post_args ${worksrcpath}
# TODO: carefully check the following list (and try to find a different way to specify paths for X11 libraries)
-configure.env-append \
- FREETYPE_DIR=${prefix}
+# configure.env-append \
+# FREETYPE_DIR=${prefix}
+# configure.args-append \
+# -DFREETYPE_INCLUDE_DIR_freetype2=${prefix}/include/freetype2 \
+# -DFREETYPE_INCLUDE_DIR_ft2build=${prefix}/include/freetype2 \
+# -DFREETYPE_LIBRARY=${prefix}/lib/libfreetype.dylib \
+
configure.args-append \
- -DFREETYPE_INCLUDE_DIR_freetype2=${prefix}/include/freetype2 \
- -DFREETYPE_INCLUDE_DIR_ft2build=${prefix}/include/freetype2 \
- -DFREETYPE_LIBRARY=${prefix}/lib/libfreetype.dylib \
-DX11_INCLUDE_DIR=${prefix}/include \
-DX11_X11_INCLUDE_PATH=${prefix}/include \
-DX11_X11_LIB=${prefix}/lib/libX11.dylib \
@@ -178,16 +150,6 @@
-DX11_Xft_INCLUDE_PATH=${prefix}/include \
-DX11_Xft_LIB=${prefix}/lib/libXft.dylib
-# missing CMAKE_INSTALL_DOCDIR
-# --docdir=${prefix}/share/doc/root \
-# missing CMAKE_INSTALL_LIBDIR
-# --libdir=${prefix}/lib/root \
-# missing
-# --testdir=${prefix}/share/root/test \
-# missing
-# --tutdir=${prefix}/share/root/tutorials \
-# missing
-# --etcdir=${prefix}/etc/root \
# -> builtin_freetype, builtin_glew, builtin_pcre, builtin_zlib, builtin_lzma
# (but there are some other variables: builtin_afterimage, builtin_cfitsio, builtin_llvm, builtin_xrootd)
# builtin_gsl: excluded with gsl_shared
@@ -339,11 +301,10 @@
configure.args-replace -Dminuit2=OFF -Dminuit2=ON
}
-# TODO: doesn't work properly yet and should not depend on /usr/X11R6
variant opengl description {Build with opengl support} {
configure.args-replace -Dopengl=OFF -Dopengl=ON
configure.args-append -DOPENGL_INCLUDE_DIR=${prefix}/include
- # TODO: no idea why builtin glew would be needed and it also fails to work
+ # TODO: no idea why builtin glew would be needed, but it also fails to work
# -Dbuiltin_glew=OFF -Dbuiltin_glew=ON
}
Modified: users/mojca/ports/science/root5/Portfile
===================================================================
--- users/mojca/ports/science/root5/Portfile 2013-12-07 09:47:25 UTC (rev 114397)
+++ users/mojca/ports/science/root5/Portfile 2013-12-07 10:03:19 UTC (rev 114398)
@@ -54,36 +54,6 @@
patchfiles patch-graf2d-asimage-src-libAfterImage-asfont.c.diff \
patch-cmake.diff
-# I somehow miss (some of) the following variables
-# CMAKE_INSTALL_BINDIR bin
-# CMAKE_INSTALL_DATADIR
-# CMAKE_INSTALL_DATAROOTDIR share
-# CMAKE_INSTALL_DOCDIR
-# CMAKE_INSTALL_INCLUDEDIR include
-# CMAKE_INSTALL_LIBDIR lib
-
-# TODO: double-check these
-# set(ROOT_INSTALL_DIR ${CMAKE_INSTALL_PREFIX})
-# set(BIN_INSTALL_DIR bin)
-# set(LIB_INSTALL_DIR lib/root)
-# set(INCLUDE_INSTALL_DIR include/root)
-# set(ETC_INSTALL_DIR /etc/root)
-# set(MAN_INSTALL_DIR share/man)
-# set(DATA_INSTALL_DIR share/root)
-# set(MACRO_INSTALL_DIR ${DATA_INSTALL_DIR}/macros)
-# set(CINTINC_INSTALL_DIR ${LIB_INSTALL_DIR}/cint)
-# set(ICON_INSTALL_DIR ${DATA_INSTALL_DIR}/icons)
-# set(SRC_INSTALL_DIR ${DATA_INSTALL_DIR}/src)
-# set(FONT_INSTALL_DIR ${DATA_INSTALL_DIR}/fonts)
-# set(DOC_INSTALL_DIR share/doc/root)
-# set(TEST_INSTALL_DIR ${DOC_INSTALL_DIR}/test)
-# set(TUT_INSTALL_DIR ${DOC_INSTALL_DIR}/tutorials)
-# set(ACLOCAL_INSTALL_DIR share/aclocal)
-# set(ELISP_INSTALL_DIR share/emacs/site-lisp)
-# set(CMAKE_INSTALL_DIR ${DATA_INSTALL_DIR}/cmake)
-
-#-DCMAKE_INSTALL_PREFIX=${prefix}
-
configure.args-append \
-Dgnuinstall=ON \
-DCMAKE_INSTALL_BINDIR="libexec/root/root${version_major}" \
@@ -94,7 +64,7 @@
-DCMAKE_INSTALL_DATADIR="share/root/root${version_major}" \
-DCMAKE_INSTALL_DOCDIR="share/doc/root/root${version_major}" \
-Dfortran=OFF \
- -Dbuiltin_freetype=OFF \
+ -Dbuiltin_freetype=ON \
-Dbuiltin_glew=OFF \
-Dbuiltin_pcre=OFF \
-Dbuiltin_zlib=OFF \
@@ -160,19 +130,21 @@
if {${cxx_stdlib} == "libc++"} {
configure.args-replace -Dc++11=OFF -Dc++11=ON
- configure.args-replace -Dlibcxx=OFF -dlibcxx=ON
+ configure.args-replace -Dlibcxx=OFF -Dlibcxx=ON
}
}
configure.post_args ${worksrcpath}
# TODO: carefully check the following list (and try to find a different way to specify paths for X11 libraries)
-configure.env-append \
- FREETYPE_DIR=${prefix}
+# configure.env-append \
+# FREETYPE_DIR=${prefix}
+# configure.args-append \
+# -DFREETYPE_INCLUDE_DIR_freetype2=${prefix}/include/freetype2 \
+# -DFREETYPE_INCLUDE_DIR_ft2build=${prefix}/include/freetype2 \
+# -DFREETYPE_LIBRARY=${prefix}/lib/libfreetype.dylib \
+
configure.args-append \
- -DFREETYPE_INCLUDE_DIR_freetype2=${prefix}/include/freetype2 \
- -DFREETYPE_INCLUDE_DIR_ft2build=${prefix}/include/freetype2 \
- -DFREETYPE_LIBRARY=${prefix}/lib/libfreetype.dylib \
-DX11_INCLUDE_DIR=${prefix}/include \
-DX11_X11_INCLUDE_PATH=${prefix}/include \
-DX11_X11_LIB=${prefix}/lib/libX11.dylib \
@@ -186,16 +158,6 @@
-DX11_Xft_INCLUDE_PATH=${prefix}/include \
-DX11_Xft_LIB=${prefix}/lib/libXft.dylib
-# missing CMAKE_INSTALL_DOCDIR
-# --docdir=${prefix}/share/doc/root \
-# missing CMAKE_INSTALL_LIBDIR
-# --libdir=${prefix}/lib/root \
-# missing
-# --testdir=${prefix}/share/root/test \
-# missing
-# --tutdir=${prefix}/share/root/tutorials \
-# missing
-# --etcdir=${prefix}/etc/root \
# -> builtin_freetype, builtin_glew, builtin_pcre, builtin_zlib, builtin_lzma
# (but there are some other variables: builtin_afterimage, builtin_cfitsio, builtin_llvm, builtin_xrootd)
# builtin_gsl: excluded with gsl_shared
@@ -347,11 +309,10 @@
configure.args-replace -Dminuit2=OFF -Dminuit2=ON
}
-# TODO: doesn't work properly yet and should not depend on /usr/X11R6
variant opengl description {Build with opengl support} {
configure.args-replace -Dopengl=OFF -Dopengl=ON
configure.args-append -DOPENGL_INCLUDE_DIR=${prefix}/include
- # TODO: no idea why builtin glew would be needed and it also fails to work
+ # TODO: no idea why builtin glew would be needed, but it also fails to work
# -Dbuiltin_glew=OFF -Dbuiltin_glew=ON
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131207/c12011ec/attachment.html>
More information about the macports-changes
mailing list