<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[119109] users/mojca/ports</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/119109">119109</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2014-04-17 09:26:03 -0700 (Thu, 17 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>mojca/root: updates by Chris</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersmojcaportsscienceroot5Portfile">users/mojca/ports/science/root5/Portfile</a></li>
<li><a href="#usersmojcaportsscienceroot5filesroot5">users/mojca/ports/science/root5/files/root5</a></li>
<li><a href="#usersmojcaportsscienceroot6Portfile">users/mojca/ports/science/root6/Portfile</a></li>
<li><a href="#usersmojcaportsscienceroot6filesroot6">users/mojca/ports/science/root6/files/root6</a></li>
<li><a href="#usersmojcaportssysutilsroot_selectPortfile">users/mojca/ports/sysutils/root_select/Portfile</a></li>
<li><a href="#usersmojcaportssysutilsroot_selectfilesbase">users/mojca/ports/sysutils/root_select/files/base</a></li>
<li><a href="#usersmojcaportssysutilsroot_selectfilesnone">users/mojca/ports/sysutils/root_select/files/none</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersmojcaportsscienceroot5Portfile"></a>
<div class="modfile"><h4>Modified: users/mojca/ports/science/root5/Portfile (119108 => 119109)</h4>
<pre class="diff"><span>
<span class="info">--- users/mojca/ports/science/root5/Portfile 2014-04-17 16:25:59 UTC (rev 119108)
+++ users/mojca/ports/science/root5/Portfile 2014-04-17 16:26:03 UTC (rev 119109)
</span><span class="lines">@@ -54,6 +54,9 @@
</span><span class="cx"> reinplace "s|\"/usr/lib\"|\"${prefix}/lib /usr/lib\"|g" ${worksrcpath}/configure
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+# port specific location
+set install_prefix ${prefix}/libexec/root${version_major}
+
</ins><span class="cx"> pre-configure {
</span><span class="cx"> configure.args-append \
</span><span class="cx"> --with-cc=${configure.cc} \
</span><span class="lines">@@ -62,25 +65,13 @@
</span><span class="cx"> --with-f77=${configure.f77}
</span><span class="cx"> # the build type (32 or 64 bit) -must- be for first argument
</span><span class="cx"> if {${build_arch} eq "i386" || ${build_arch} eq "ppc"} {
</span><del>- configure.pre_args macosx --prefix=${prefix}
</del><ins>+ configure.pre_args macosx --prefix=${install_prefix}
</ins><span class="cx"> } else {
</span><del>- configure.pre_args macosx64 --prefix=${prefix}
</del><ins>+ configure.pre_args macosx64 --prefix=${install_prefix}
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-# port specific location. For 'port select'
-set install_bindir "libexec/root${version_major}/bin"
-set install_mandir "libexec/root${version_major}/share/man"
-
-configure.args --bindir=${prefix}/${install_bindir}\
- --incdir=${prefix}/include/root${version_major}\
- --docdir=${prefix}/share/doc/root${version_major}\
- --libdir=${prefix}/lib/root${version_major} \
- --testdir=${prefix}/share/root${version_major}/test \
- --tutdir=${prefix}/share/root${version_major}/tutorials \
- --etcdir=${prefix}/etc/root${version_major} \
- --datadir=${prefix}/share/root${version_major} \
- --mandir=${prefix}/${install_mandir} \
</del><ins>+configure.args --etcdir=${install_prefix}/etc/root \
</ins><span class="cx"> --disable-builtin-glew \
</span><span class="cx"> --disable-builtin-pcre \
</span><span class="cx"> --disable-builtin-zlib \
</span><span class="lines">@@ -114,6 +105,7 @@
</span><span class="cx"> --disable-soversion \
</span><span class="cx"> --disable-c++11 \
</span><span class="cx"> --disable-xrootd \
</span><ins>+ --disable-oracle \
</ins><span class="cx"> --enable-builtin-ftgl \
</span><span class="cx"> --enable-mathmore \
</span><span class="cx"> --enable-genvector \
</span><span class="lines">@@ -147,18 +139,64 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-destroot {
</span><del>- # create versioned symlinks for the content of libexec's bin dir.
- foreach f [glob -directory ${destroot}${prefix}/${install_bindir} *] {
</del><ins>+ # create versioned symlinks for the content of libexec
+ # bin dir
+ foreach f [glob -directory ${destroot}${install_prefix}/bin *] {
</ins><span class="cx"> set filename [file tail $f]
</span><span class="cx"> set extension [file extension $filename]
</span><span class="cx"> set base [file rootname $filename]
</span><span class="cx"> set versioned_filename ${base}${version_major}${extension}
</span><del>- ln -s ${prefix}/${install_bindir}/${filename} ${destroot}${prefix}/bin/${versioned_filename}
</del><ins>+ ln -s ${install_prefix}/bin/${filename} ${destroot}${prefix}/bin/${versioned_filename}
</ins><span class="cx"> }
</span><ins>+ # lib dir
+ ln -s ${install_prefix}/lib/root ${destroot}${prefix}/lib/root${version_major}
+ # include dir
+ ln -s ${install_prefix}/include/root ${destroot}${prefix}/include/root${version_major}
+ # etc dir
+ ln -s ${install_prefix}/etc/root ${destroot}${prefix}/etc/root${version_major}
+ # share dir
+ ln -s ${install_prefix}/share ${destroot}${prefix}/share/root${version_major}
</ins><span class="cx"> # 'Fix' genreflex
</span><del>- reinplace "s|lib/python/genreflex|lib/root${version_major}/python/genreflex|g" ${destroot}${prefix}/${install_bindir}/genreflex
</del><ins>+ reinplace "s|lib/python/genreflex|lib/root${version_major}/python/genreflex|g" ${destroot}${install_prefix}/bin/genreflex
+ # Compress manpages in custom location (borrowed from mariadb)
+ set manpath ${install_prefix}/share/man
+ set gzip [findBinary gzip ${portutil::autoconf::gzip_path}]
+ foreach manpage [glob -type f ${destroot}${manpath}/man1/*] {
+ # Zip the man file
+ system "$gzip -9vf ${manpage}"
+ # Create man pages for versioned files
+ set filename [file tail $manpage]
+ set extension [file extension $filename]
+ set base [file rootname $filename]
+ set versioned_filename ${base}${version_major}${extension}.gz
+ set d [file tail $manpage]
+ ln -s ${manpath}/man1/${d}.gz ${destroot}${prefix}/share/man/man1/${versioned_filename}
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+set run_port_select "No"
+pre-activate {
+ if { ![file exists ${prefix}/bin/root] &&
+ ![file exists ${prefix}/bin/root5] &&
+ ![file exists ${prefix}/bin/root6] } {
+ set run_port_select "Yes"
+ if { [file exists ${prefix}/etc/select/root/current] } {
+ delete ${prefix}/etc/select/root/current
+ }
+ }
+}
+
+post-activate {
+ ui_msg "======================================================================================"
+ if { ${run_port_select} == "Yes" } {
+ ui_msg " Making root${version_major} your default root version. To change this run 'sudo port select root'"
+ catch { system "port select root root${version_major}" }
+ } else {
+ ui_msg " To make root${version_major} your default root version, run 'sudo port select root root${version_major}'"
+ }
+ ui_msg "======================================================================================"
+}
+
</ins><span class="cx"> universal_variant no
</span><span class="cx">
</span><span class="cx"> default_variants +ssl +xml +gsl +minuit2 +tmva +roofit +graphviz +opengl +soversion
</span><span class="lines">@@ -253,7 +291,7 @@
</span><span class="cx"> configure.args-delete --disable-tmva
</span><span class="cx"> configure.args-append --enable-tmva
</span><span class="cx"> post-destroot {
</span><del>- set tmvaTuts ${destroot}${prefix}/share/root${version_major}/tutorials/tmva
</del><ins>+ set tmvaTuts ${destroot}${install_prefix}/share/root/tutorial/tmva
</ins><span class="cx"> file mkdir ${tmvaTuts}
</span><span class="cx"> foreach f [glob ${worksrcpath}/tmva/test/*] { file copy $f ${tmvaTuts}/ }
</span><span class="cx"> }
</span><span class="lines">@@ -318,19 +356,13 @@
</span><span class="cx"> set mypylibdir ${prefix}/Library/Frameworks/Python.framework/Versions/${active_python_variant}/lib/python${active_python_variant}
</span><span class="cx"> set mypysitedir ${mypylibdir}/site-packages/
</span><span class="cx"> file mkdir ${destroot}${mypysitedir}
</span><del>- foreach pyfile [glob ${destroot}${prefix}/lib/root${version_major}/*.py*] { move $pyfile ${destroot}${mypysitedir} }
- ln -sf ${prefix}/lib/root${version_major}/libPyROOT.so ${destroot}${mypylibdir}/
</del><ins>+ foreach pyfile [glob ${destroot}${install_prefix}/lib/root/*.py*] { move $pyfile ${destroot}${mypysitedir}/ }
+ ln -sf ${install_prefix}/lib/root/libPyROOT.so ${destroot}${mypylibdir}/
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # ========================================================================================
</span><span class="cx">
</span><del>-variant ruby description {Build with ruby support} {
- configure.args-delete --disable-ruby
- configure.args-append --enable-ruby
- depends_lib-append port:ruby
-}
-
</del><span class="cx"> variant ssl description {Build with ssl support} {
</span><span class="cx"> configure.args-delete --disable-ssl
</span><span class="cx"> configure.args-append --enable-ssl \
</span><span class="lines">@@ -412,6 +444,13 @@
</span><span class="cx"> depends_lib-append port:libpqxx port:postgresql92
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+# variant oracle description {Build with Oracle support} {
+# configure.args-replace --disable-oracle --enable-oracle
+# configure.args-append --with-oracle-incdir="${prefix}/lib/oracle/sdk/include" \
+# --with-oracle-libdir="${prefix}/lib/oracle"
+# depends_lib-append port:oracle-instantclient
+# }
+
</ins><span class="cx"> variant pythia description {Pythia 8 support for root} {
</span><span class="cx"> configure.args-delete --disable-pythia8
</span><span class="cx"> configure.args-append --enable-pythia8 \
</span><span class="lines">@@ -524,7 +563,7 @@
</span><span class="cx"> # Note that g95 does not work here, so that variant is removed
</span><span class="cx"> # ========================================================================================
</span><span class="cx">
</span><del>-set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
</del><ins>+set gcc_versions { 4.3 4.4 4.5 4.6 4.7 4.8 4.9 }
</ins><span class="cx"> set default_fortran_variant +gcc48
</span><span class="cx">
</span><span class="cx"> foreach ver ${gcc_versions} {
</span><span class="lines">@@ -578,6 +617,15 @@
</span><span class="cx"> # The following have build issues, are obsolete or experimental.
</span><span class="cx"> # ========================================================================================
</span><span class="cx">
</span><ins>+# Problems finding includes ...
+# variant ruby description {Build with ruby support} {
+# configure.args-delete --disable-ruby
+# configure.args-append --enable-ruby \
+# --with-ruby-incdir="${prefix}/include/ruby-1.9.1" \
+# --with-ruby-libdir="${prefix}/lib"
+# depends_lib-append port:ruby19
+# }
+
</ins><span class="cx"> # Intefers with builtin freetype build (enforced by cocoa variant)
</span><span class="cx"> # Also do not seem to be actually needed any more
</span><span class="cx"> #pre-build {
</span></span></pre></div>
<a id="usersmojcaportsscienceroot5filesroot5"></a>
<div class="modfile"><h4>Modified: users/mojca/ports/science/root5/files/root5 (119108 => 119109)</h4>
<pre class="diff"><span>
<span class="info">--- users/mojca/ports/science/root5/files/root5 2014-04-17 16:25:59 UTC (rev 119108)
+++ users/mojca/ports/science/root5/files/root5 2014-04-17 16:26:03 UTC (rev 119109)
</span><span class="lines">@@ -1,2 +1,72 @@
</span><ins>+libexec/root5/bin/g2root
+libexec/root5/bin/genmap
+libexec/root5/bin/genreflex
+libexec/root5/bin/genreflex-rootcint
+libexec/root5/bin/h2root
+libexec/root5/bin/hadd
+libexec/root5/bin/hist2workspace
+libexec/root5/bin/memprobe
+libexec/root5/bin/pq2
+libexec/root5/bin/prepareHistFactory
+libexec/root5/bin/proofd
+libexec/root5/bin/proofserv
+libexec/root5/bin/proofserv.exe
+libexec/root5/bin/rlibmap
+libexec/root5/bin/rmkdepend
</ins><span class="cx"> libexec/root5/bin/root
</span><span class="cx"> libexec/root5/bin/root-config
</span><ins>+libexec/root5/bin/root.exe
+libexec/root5/bin/rootcint
+libexec/root5/bin/rootd
+libexec/root5/bin/rootn.exe
+libexec/root5/bin/roots
+libexec/root5/bin/roots.exe
+libexec/root5/bin/setxrd.csh
+libexec/root5/bin/setxrd.sh
+libexec/root5/bin/ssh2rpd
+libexec/root5/bin/thisroot.csh
+libexec/root5/bin/thisroot.sh
+libexec/root5/bin/xpdtest
+-
+libexec/root5/share/man/man1/cint.1.gz
+libexec/root5/share/man/man1/g2root.1.gz
+libexec/root5/share/man/man1/g2rootold.1.gz
+libexec/root5/share/man/man1/genmap.1.gz
+libexec/root5/share/man/man1/genreflex-rootcint.1.gz
+libexec/root5/share/man/man1/genreflex.1.gz
+libexec/root5/share/man/man1/h2root.1.gz
+libexec/root5/share/man/man1/hadd.1.gz
+libexec/root5/share/man/man1/hist2workspace.1.gz
+libexec/root5/share/man/man1/makecint.1.gz
+libexec/root5/share/man/man1/memprobe.1.gz
+libexec/root5/share/man/man1/pq2-ana-dist.1.gz
+libexec/root5/share/man/man1/pq2-cache.1.gz
+libexec/root5/share/man/man1/pq2-info-server.1.gz
+libexec/root5/share/man/man1/pq2-ls-files-server.1.gz
+libexec/root5/share/man/man1/pq2-ls-files.1.gz
+libexec/root5/share/man/man1/pq2-ls.1.gz
+libexec/root5/share/man/man1/pq2-put.1.gz
+libexec/root5/share/man/man1/pq2-redistribute.1.gz
+libexec/root5/share/man/man1/pq2-rm.1.gz
+libexec/root5/share/man/man1/pq2-verify.1.gz
+libexec/root5/share/man/man1/pq2.1.gz
+libexec/root5/share/man/man1/prepareHistFactory.1.gz
+libexec/root5/share/man/man1/proofd.1.gz
+libexec/root5/share/man/man1/proofserv.1.gz
+libexec/root5/share/man/man1/proofserva.1.gz
+libexec/root5/share/man/man1/rlibmap.1.gz
+libexec/root5/share/man/man1/rmkdepend.1.gz
+libexec/root5/share/man/man1/root-config.1.gz
+libexec/root5/share/man/man1/root.1.gz
+libexec/root5/share/man/man1/root.exe.1.gz
+libexec/root5/share/man/man1/roota.1.gz
+libexec/root5/share/man/man1/rootcint.1.gz
+libexec/root5/share/man/man1/rootd.1.gz
+libexec/root5/share/man/man1/rootn.exe.1.gz
+libexec/root5/share/man/man1/roots.exe.1.gz
+libexec/root5/share/man/man1/setup-pq2.1.gz
+libexec/root5/share/man/man1/ssh2rpd.1.gz
+libexec/root5/share/man/man1/system.rootdaemonrc.1.gz
+libexec/root5/share/man/man1/xpdtest.1.gz
+libexec/root5/share/man/man1/xproofd.1.gz
+-
</ins></span></pre></div>
<a id="usersmojcaportsscienceroot6Portfile"></a>
<div class="modfile"><h4>Modified: users/mojca/ports/science/root6/Portfile (119108 => 119109)</h4>
<pre class="diff"><span>
<span class="info">--- users/mojca/ports/science/root6/Portfile 2014-04-17 16:25:59 UTC (rev 119108)
+++ users/mojca/ports/science/root6/Portfile 2014-04-17 16:26:03 UTC (rev 119109)
</span><span class="lines">@@ -9,19 +9,20 @@
</span><span class="cx"> PortGroup github 1.0
</span><span class="cx"> PortGroup select 1.0
</span><span class="cx">
</span><del>-# TODO: try to figure out if one could also build root6 on < 10.9
-# if {(${os.major} < 13 && ! [info exists configure.cxx_stdlib]) || (! [file exists /usr/lib/libc++.dylib])} {
-if {${os.major} < 13 } {
- github.setup root-mirror root e3dec6e203
- version 5.99.05-beta
- checksums rmd160 69f6a99413908eed7789bc30939a621f45eac7a2 \
</del><ins>+# TODO:
+# - try to figure out if one could also build root6 on < 10.9
+# - version 5.99.06-beta is broken also on 10.9
+#if {${os.major} < 13 } {
+github.setup root-mirror root e3dec6e203
+version 5.99.05-beta
+checksums rmd160 69f6a99413908eed7789bc30939a621f45eac7a2 \
</ins><span class="cx"> sha256 10f2956cd821471477a351c01355c2eb802c01e046764d18865e7416dfa810f8
</span><del>-} else {
- github.setup root-mirror root 5-99-06 v
- version 5.99.06-beta
- checksums rmd160 b8b5ae705aae185c0d6ed097a5efa6fbeb961bfb \
- sha256 c873d536769ff06616c0a9981e7f1db2414eaca0a1bcab045d4073b36644981a
-}
</del><ins>+#} else {
+# github.setup root-mirror root 5-99-06 v
+# version 5.99.06-beta
+# checksums rmd160 b8b5ae705aae185c0d6ed097a5efa6fbeb961bfb \
+# sha256 c873d536769ff06616c0a9981e7f1db2414eaca0a1bcab045d4073b36644981a
+#}
</ins><span class="cx">
</span><span class="cx"> name root6
</span><span class="cx"> set version_major 6
</span><span class="lines">@@ -69,19 +70,13 @@
</span><span class="cx"> compiler.blacklist-append {clang < 425} macports-clang-2.9
</span><span class="cx"> compiler.fallback-append macports-clang-3.5 macports-clang-3.4 macports-clang-3.3
</span><span class="cx">
</span><del>-set install_bindir "libexec/root${version_major}/bin"
-set install_mandir "libexec/root${version_major}/share/man"
</del><ins>+# port specific location
+set install_prefix ${prefix}/libexec/root${version_major}
</ins><span class="cx">
</span><span class="cx"> configure.args-append \
</span><span class="cx"> -Dgnuinstall=ON \
</span><del>- -DCMAKE_INSTALL_BINDIR="${install_bindir}" \
- -DCMAKE_INSTALL_LIBDIR="lib/root${version_major}" \
- -DCMAKE_INSTALL_INCLUDEDIR="include/root${version_major}" \
- -DCMAKE_INSTALL_SYSCONFDIR="etc/root${version_major}" \
- -DCMAKE_INSTALL_DATAROOTDIR="share/root${version_major}" \
- -DCMAKE_INSTALL_DATADIR="share/root${version_major}" \
- -DCMAKE_INSTALL_DOCDIR="share/doc/root${version_major}" \
- -DCMAKE_INSTALL_MANDIR="${install_mandir}" \
</del><ins>+ -DCMAKE_INSTALL_PREFIX="${install_prefix}" \
+ -DCMAKE_INSTALL_SYSCONFDIR="${install_prefix}/etc/root" \
</ins><span class="cx"> -Dfortran=OFF \
</span><span class="cx"> -Dbuiltin_freetype=ON \
</span><span class="cx"> -Dbuiltin_glew=OFF \
</span><span class="lines">@@ -130,8 +125,13 @@
</span><span class="cx"> configure.post_args ${worksrcpath}
</span><span class="cx">
</span><span class="cx"> # TODO: temporary:
</span><ins>+configure.args-append -DCMAKE_INCLUDE_PATH=${install_prefix}/include
+configure.cppflags-delete -I${install_prefix}/include
+
</ins><span class="cx"> configure.args-append -DCMAKE_INCLUDE_PATH=${prefix}/include
</span><span class="cx"> configure.cppflags-delete -I${prefix}/include
</span><ins>++configure.args-append -DCMAKE_INCLUDE_PATH=${install_prefix}/include
++configure.cppflags-delete -I${install_prefix}/include
</ins><span class="cx">
</span><span class="cx"> # TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
</span><span class="cx"> platform darwin {
</span><span class="lines">@@ -153,18 +153,64 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-destroot {
</span><del>- # create versioned symlinks for the content of libexec's bin dir.
- foreach f [glob -directory ${destroot}${prefix}/${install_bindir} *] {
</del><ins>+ # create versioned symlinks for the content of libexec
+ # bin dir
+ foreach f [glob -directory ${destroot}${install_prefix}/bin *] {
</ins><span class="cx"> set filename [file tail $f]
</span><span class="cx"> set extension [file extension $filename]
</span><span class="cx"> set base [file rootname $filename]
</span><span class="cx"> set versioned_filename ${base}${version_major}${extension}
</span><del>- ln -s ${prefix}/${install_bindir}/${filename} ${destroot}${prefix}/bin/${versioned_filename}
</del><ins>+ ln -s ${install_prefix}/bin/${filename} ${destroot}${prefix}/bin/${versioned_filename}
</ins><span class="cx"> }
</span><ins>+ # lib dir
+ ln -s ${install_prefix}/lib/root ${destroot}${prefix}/lib/root${version_major}
+ # include dir
+ ln -s ${install_prefix}/include/root ${destroot}${prefix}/include/root${version_major}
+ # etc dir
+ ln -s ${install_prefix}/etc/root ${destroot}${prefix}/etc/root${version_major}
+ # share dir
+ ln -s ${install_prefix}/share ${destroot}${prefix}/share/root${version_major}
</ins><span class="cx"> # 'Fix' genreflex
</span><del>- #reinplace "s|lib/python/genreflex|lib/root${version_major}/python/genreflex|g" ${destroot}${prefix}/${install_bindir}/genreflex
</del><ins>+ #reinplace "s|lib/python/genreflex|lib/root${version_major}/python/genreflex|g" ${destroot}${install_prefix}/bin/genreflex
+ # Compress manpages in custom location (borrowed from mariadb)
+ set manpath ${install_prefix}/share/man
+ set gzip [findBinary gzip ${portutil::autoconf::gzip_path}]
+ foreach manpage [glob -type f ${destroot}${manpath}/man1/*] {
+ # Zip the man file
+ system "$gzip -9vf ${manpage}"
+ # Create man pages for versioned files
+ set filename [file tail $manpage]
+ set extension [file extension $filename]
+ set base [file rootname $filename]
+ set versioned_filename ${base}${version_major}${extension}.gz
+ set d [file tail $manpage]
+ ln -s ${manpath}/man1/${d}.gz ${destroot}${prefix}/share/man/man1/${versioned_filename}
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+set run_port_select "No"
+pre-activate {
+ if { ![file exists ${prefix}/bin/root] &&
+ ![file exists ${prefix}/bin/root5] &&
+ ![file exists ${prefix}/bin/root6] } {
+ set run_port_select "Yes"
+ if { [file exists ${prefix}/etc/select/root/current] } {
+ delete ${prefix}/etc/select/root/current
+ }
+ }
+}
+
+post-activate {
+ ui_msg "======================================================================================"
+ if { ${run_port_select} == "Yes" } {
+ ui_msg " Making root${version_major} your default root version. To change this run 'sudo port select root'"
+ catch { system "port select root root${version_major}" }
+ } else {
+ ui_msg " To make root${version_major} your default root version, run 'sudo port select root root${version_major}'"
+ }
+ ui_msg "======================================================================================"
+}
+
</ins><span class="cx"> universal_variant no
</span><span class="cx">
</span><span class="cx"> default_variants +ssl +xml +gsl +minuit2 +tmva +roofit +graphviz +opengl +soversion
</span><span class="lines">@@ -177,12 +223,13 @@
</span><span class="cx"> set default_gui_variant +x11
</span><span class="cx"> }
</span><span class="cx">
</span><del>-# Currently giving problems
</del><ins>+# TODO - Doesn't seem to work. To be reported upstream..
</ins><span class="cx"> # variant xrootd description {Build with XRootD support} {
</span><del>-# configure.args-replace -Dxrootd=OFF -Dxrootd=ON
-# configure.args-append -Dbuiltin_xrootd=ON
-# #configure.args-append -DXROOTD_INCLUDE_DIR="${prefix}/include/xrootd"
-# #depends_lib-append port:xrootd
</del><ins>+# system "export XRDSYS=${prefix}/lib"
+# configure.args-replace -Dxrootd=OFF -Dxrootd=ON
+# #configure.args-append -Dbuiltin_xrootd=ON
+# configure.args-append -DXROOTD_INCLUDE_DIR="${prefix}/include/xrootd"
+# depends_lib-append port:xrootd
</ins><span class="cx"> # }
</span><span class="cx">
</span><span class="cx"> variant soversion description {Build with soversion support} {
</span><span class="lines">@@ -191,7 +238,7 @@
</span><span class="cx">
</span><span class="cx"> variant graphviz description {Build with graphviz support} {
</span><span class="cx"> configure.args-replace -Dgviz=OFF -Dgviz=ON
</span><del>-# configure.args-append -DGRAPHVIZ_INCLUDE_DIR="${prefix}/include" \
</del><ins>+ configure.args-append -DGRAPHVIZ_INCLUDE_DIR="${prefix}/include"
</ins><span class="cx"> # -DGRAPHVIZ_CDT_LIBRARY="${prefix}/lib/libcdt.dylib" \
</span><span class="cx"> # -DGRAPHVIZ_GRAPH_LIBRARY="${prefix}/lib/libcgraph.dylib" \
</span><span class="cx"> # -DGRAPHVIZ_GVC_LIBRARY="${prefix}/lib/libgvc.dylib" \
</span><span class="lines">@@ -208,8 +255,8 @@
</span><span class="cx">
</span><span class="cx"> variant fftw3 description {Build with fftw3 support} {
</span><span class="cx"> configure.args-replace -Dfftw3=OFF -Dfftw3=ON
</span><del>-# configure.args-append -DFFTW_INCLUDE_DIR="${prefix}/include" \
-# -DFFTW_LIBRARY="${prefix}/lib"
</del><ins>+ configure.args-append -DFFTW_INCLUDE_DIR="${prefix}/include" \
+ -DFFTW_LIBRARY="${prefix}/lib/libfftw3.dylib"
</ins><span class="cx"> depends_lib-append port:fftw-3
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -221,15 +268,15 @@
</span><span class="cx">
</span><span class="cx"> variant fitsio description {Build with fitsio support} {
</span><span class="cx"> configure.args-replace -Dfitsio=OFF -Dfitsio=ON
</span><del>-# configure.args-append -DCFITSIO_INCLUDE_DIR="${prefix}/include" \
-# -DCFITSIO_LIBRARIES="${prefix}/lib"
</del><ins>+ configure.args-append -DCFITSIO_INCLUDE_DIR="${prefix}/include" \
+ -DCFITSIO_LIBRARIES="${prefix}/lib"
</ins><span class="cx"> depends_lib-append port:cfitsio
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant odbc description {Build with odbc support} {
</span><span class="cx"> configure.args-replace -Dodbc=OFF -Dodbc=ON
</span><del>-# configure.args-append -DODBC_INCLUDE_DIR="${prefix}/include" \
-# -DODBC_LIBRARY="${prefix}/lib"
</del><ins>+ configure.args-append -DODBC_INCLUDE_DIR="${prefix}/include" \
+ -DODBC_LIBRARY="${prefix}/lib/libiodbc.dylib"
</ins><span class="cx"> depends_lib-append port:libiodbc
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -247,7 +294,7 @@
</span><span class="cx"> variant tmva description {Build the TMVA package} {
</span><span class="cx"> configure.args-replace -Dtmva=OFF -Dtmva=ON
</span><span class="cx"> post-destroot {
</span><del>- set tmvaTuts ${destroot}${prefix}/share/root${version_major}/tutorials/tmva
</del><ins>+ set tmvaTuts ${destroot}${install_prefix}/share/root/tutorial/tmva
</ins><span class="cx"> file mkdir ${tmvaTuts}
</span><span class="cx"> foreach f [glob ${worksrcpath}/tmva/test/*] { file copy $f ${tmvaTuts}/ }
</span><span class="cx"> }
</span><span class="lines">@@ -267,8 +314,8 @@
</span><span class="cx"> # Setup various python variants
</span><span class="cx"> # ========================================================================================
</span><span class="cx">
</span><del>-# List of possible python versions
-set python_versions { 2.6 2.7 3.1 3.2 3.3 3.4 }
</del><ins>+# List of possible python versions ( 3.x does not seem to work yet )
+set python_versions { 2.6 2.7 }
</ins><span class="cx">
</span><span class="cx"> # Define the available variants
</span><span class="cx"> foreach ver ${python_versions} {
</span><span class="lines">@@ -304,24 +351,21 @@
</span><span class="cx"> }
</span><span class="cx"> set mypydir ${prefix}/Library/Frameworks/Python.framework/Versions/${active_python_variant}
</span><span class="cx"> configure.args-replace -Dpython=OFF -Dpython=ON
</span><del>- configure.args-append -DPYTHON_INCLUDE_DIR="${mypydir}/Headers"
</del><ins>+ configure.args-append -DPYTHON_INCLUDE_DIR="${mypydir}/Headers" \
+ -DPYTHON_LIBRARY="${prefix}/lib/libpython${active_python_variant}.dylib" \
+ -DPYTHON_EXECUTABLE="${prefix}/bin/python${active_python_variant}"
</ins><span class="cx"> depends_lib-append port:python${ver_no_dot}
</span><span class="cx"> post-destroot {
</span><span class="cx"> set mypylibdir ${prefix}/Library/Frameworks/Python.framework/Versions/${active_python_variant}/lib/python${active_python_variant}
</span><span class="cx"> set mypysitedir ${mypylibdir}/site-packages/
</span><span class="cx"> file mkdir ${destroot}${mypysitedir}
</span><del>- foreach pyfile [glob ${destroot}${prefix}/lib/root${version_major}/*.py*] { move $pyfile ${destroot}${mypysitedir} }
- ln -sf ${prefix}/lib/root${version_major}/libPyROOT.so ${destroot}${mypylibdir}/
</del><ins>+ foreach pyfile [glob ${destroot}${install_prefix}/lib/root/*.py*] { move $pyfile ${destroot}${mypysitedir}/ }
+ ln -sf ${install_prefix}/lib/root/libPyROOT.so ${destroot}${mypylibdir}/
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # ========================================================================================
</span><span class="cx">
</span><del>-variant ruby description {Build with ruby support} {
- configure.args-replace -Druby=OFF -Druby=ON
- depends_lib-append port:ruby
-}
-
</del><span class="cx"> variant ssl description {Build with ssl support} {
</span><span class="cx"> configure.args-replace -Dssl=OFF -Dssl=ON
</span><span class="cx"> # configure.args-append -DOPENSSL_INCLUDE_DIR="${prefix}/include" \
</span><span class="lines">@@ -368,6 +412,7 @@
</span><span class="cx"> depends_lib-append port:percona
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+# TODO - Doesn't seem to work. To be reported upstream..
</ins><span class="cx"> # variant postgresql90 conflicts postgresql92 description {Build with PostgreSQL 9.0 support} {
</span><span class="cx"> # configure.args-replace -Dpgsql=OFF -Dpgsql=ON
</span><span class="cx"> # configure.args-append -DPOSTGRESQL_INCLUDE_DIR="${prefix}/include/postgresql90" \
</span><span class="lines">@@ -375,6 +420,7 @@
</span><span class="cx"> # depends_lib-append port:libpqxx port:postgresql90
</span><span class="cx"> # }
</span><span class="cx">
</span><ins>+# TODO - Doesn't seem to work. To be reported upstream..
</ins><span class="cx"> # variant postgresql92 conflicts postgresql90 description {Build with PostgreSQL 9.2 support} {
</span><span class="cx"> # configure.args-replace -Dpgsql=OFF -Dpgsql=ON
</span><span class="cx"> # configure.args-append -DPOSTGRESQL_INCLUDE_DIR="${prefix}/include/postgresql92" \
</span><span class="lines">@@ -382,13 +428,22 @@
</span><span class="cx"> # depends_lib-append port:libpqxx port:postgresql92
</span><span class="cx"> # }
</span><span class="cx">
</span><del>-variant pythia description {Pythia 8 support for root} {
- configure.args-replace -Dpythia8=OFF -Dpythia8=ON
-# configure.args-append -DPYTHIA8_INCLUDE_DIR=${prefix}/include \
-# -DPYTHIA8_LIBRARY=${prefix}/lib
- depends_lib-append port:pythia
-}
</del><ins>+# variant oracle description {Build with Oracle support} {
+# configure.args-replace --disable-oracle --enable-oracle
+# configure.args-append -DORACLE_PATH_INCLUDES="${prefix}/lib/oracle/sdk/include" \
+# -DORACLE_PATH_LIB="${prefix}/lib/oracle" \
+# -DORACLE_OCI_VERSION=8
+# depends_lib-append port:oracle-instantclient
+# }
</ins><span class="cx">
</span><ins>+# TODO - Doesn't seem to work. To be reported upstream..
+# variant pythia description {Pythia 8 support for root} {
+# configure.args-replace -Dpythia8=OFF -Dpythia8=ON
+# configure.args-append -DPYTHIA8_INCLUDE_DIR=${prefix}/include \
+# -DPYTHIA8_LIBRARY=${prefix}/lib/libpythia8.dylib
+# depends_lib-append port:pythia
+# }
+
</ins><span class="cx"> variant cocoa conflicts x11 description {Enables native OSX graphical backend} {
</span><span class="cx"> # Enable cocoa support in configure
</span><span class="cx"> configure.args-append -Dcocoa=ON
</span><span class="lines">@@ -452,8 +507,7 @@
</span><span class="cx"> # Note that g95 does not work here, so that variant is removed
</span><span class="cx"> # ========================================================================================
</span><span class="cx">
</span><del>-# https://trac.macports.org/ticket/37732
-set gcc_versions {4.7 4.8 4.9}
</del><ins>+set gcc_versions { 4.7 4.8 4.9 }
</ins><span class="cx"> set default_fortran_variant +gcc48
</span><span class="cx">
</span><span class="cx"> foreach ver ${gcc_versions} {
</span><span class="lines">@@ -501,6 +555,12 @@
</span><span class="cx">
</span><span class="cx"> # ========================================================================================
</span><span class="cx">
</span><ins>+# Problems finding includes ...
+# variant ruby description {Build with ruby support} {
+# configure.args-replace -Druby=OFF -Druby=ON
+# depends_lib-append port:ruby
+# }
+
</ins><span class="cx"> # TODO
</span><span class="cx"> # livecheck.type regex
</span><span class="cx"> # livecheck.url http://root.cern.ch/svn/root/trunk
</span></span></pre></div>
<a id="usersmojcaportsscienceroot6filesroot6"></a>
<div class="modfile"><h4>Modified: users/mojca/ports/science/root6/files/root6 (119108 => 119109)</h4>
<pre class="diff"><span>
<span class="info">--- users/mojca/ports/science/root6/files/root6 2014-04-17 16:25:59 UTC (rev 119108)
+++ users/mojca/ports/science/root6/files/root6 2014-04-17 16:26:03 UTC (rev 119109)
</span><span class="lines">@@ -1,2 +1,72 @@
</span><ins>+libexec/root6/bin/g2root
+-
+-
+-
+libexec/root6/bin/h2root
+libexec/root6/bin/hadd
+libexec/root6/bin/hist2workspace
+libexec/root6/bin/memprobe
+-
+-
+-
+libexec/root6/bin/proofserv
+libexec/root6/bin/proofserv.exe
+-
+libexec/root6/bin/rmkdepend
</ins><span class="cx"> libexec/root6/bin/root
</span><span class="cx"> libexec/root6/bin/root-config
</span><ins>+libexec/root6/bin/root.exe
+-
+-
+libexec/root6/bin/rootn.exe
+libexec/root6/bin/roots
+libexec/root6/bin/roots.exe
+libexec/root6/bin/setxrd.csh
+libexec/root6/bin/setxrd.sh
+libexec/root6/bin/ssh2rpd
+libexec/root6/bin/thisroot.csh
+libexec/root6/bin/thisroot.sh
+-
+libexec/root6/bin/rootcling
+-
+libexec/root6/share/man/man1/g2root.1.gz
+libexec/root6/share/man/man1/g2rootold.1.gz
+libexec/root6/share/man/man1/genmap.1.gz
+libexec/root6/share/man/man1/genreflex-rootcint.1.gz
+libexec/root6/share/man/man1/genreflex.1.gz
+libexec/root6/share/man/man1/h2root.1.gz
+libexec/root6/share/man/man1/hadd.1.gz
+libexec/root6/share/man/man1/hist2workspace.1.gz
+-
+libexec/root6/share/man/man1/memprobe.1.gz
+libexec/root6/share/man/man1/pq2-ana-dist.1.gz
+libexec/root6/share/man/man1/pq2-cache.1.gz
+libexec/root6/share/man/man1/pq2-info-server.1.gz
+libexec/root6/share/man/man1/pq2-ls-files-server.1.gz
+libexec/root6/share/man/man1/pq2-ls-files.1.gz
+libexec/root6/share/man/man1/pq2-ls.1.gz
+libexec/root6/share/man/man1/pq2-put.1.gz
+libexec/root6/share/man/man1/pq2-redistribute.1.gz
+libexec/root6/share/man/man1/pq2-rm.1.gz
+libexec/root6/share/man/man1/pq2-verify.1.gz
+libexec/root6/share/man/man1/pq2.1.gz
+libexec/root6/share/man/man1/prepareHistFactory.1.gz
+libexec/root6/share/man/man1/proofd.1.gz
+libexec/root6/share/man/man1/proofserv.1.gz
+libexec/root6/share/man/man1/proofserva.1.gz
+libexec/root6/share/man/man1/rlibmap.1.gz
+libexec/root6/share/man/man1/rmkdepend.1.gz
+libexec/root6/share/man/man1/root-config.1.gz
+libexec/root6/share/man/man1/root.1.gz
+libexec/root6/share/man/man1/root.exe.1.gz
+libexec/root6/share/man/man1/roota.1.gz
+-
+libexec/root6/share/man/man1/rootd.1.gz
+libexec/root6/share/man/man1/rootn.exe.1.gz
+libexec/root6/share/man/man1/roots.exe.1.gz
+libexec/root6/share/man/man1/setup-pq2.1.gz
+libexec/root6/share/man/man1/ssh2rpd.1.gz
+libexec/root6/share/man/man1/system.rootdaemonrc.1.gz
+libexec/root6/share/man/man1/xpdtest.1.gz
+libexec/root6/share/man/man1/xproofd.1.gz
+libexec/root6/share/man/man1/rootcling.1.gz
</ins></span></pre></div>
<a id="usersmojcaportssysutilsroot_selectPortfile"></a>
<div class="modfile"><h4>Modified: users/mojca/ports/sysutils/root_select/Portfile (119108 => 119109)</h4>
<pre class="diff"><span>
<span class="info">--- users/mojca/ports/sysutils/root_select/Portfile 2014-04-17 16:25:59 UTC (rev 119108)
+++ users/mojca/ports/sysutils/root_select/Portfile 2014-04-17 16:26:03 UTC (rev 119109)
</span><span class="lines">@@ -5,8 +5,8 @@
</span><span class="cx"> PortGroup select 1.0
</span><span class="cx">
</span><span class="cx"> name root_select
</span><del>-conflicts root
</del><span class="cx"> version 1.0
</span><ins>+
</ins><span class="cx"> categories sysutils science
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers hep.phy.cam.ac.uk:jonesc mojca
</span></span></pre></div>
<a id="usersmojcaportssysutilsroot_selectfilesbase"></a>
<div class="modfile"><h4>Modified: users/mojca/ports/sysutils/root_select/files/base (119108 => 119109)</h4>
<pre class="diff"><span>
<span class="info">--- users/mojca/ports/sysutils/root_select/files/base 2014-04-17 16:25:59 UTC (rev 119108)
+++ users/mojca/ports/sysutils/root_select/files/base 2014-04-17 16:26:03 UTC (rev 119109)
</span><span class="lines">@@ -1,2 +1,72 @@
</span><ins>+bin/g2root
+bin/genmap
+bin/genreflex
+bin/genreflex-rootcint
+bin/h2root
+bin/hadd
+bin/hist2workspace
+bin/memprobe
+bin/pq2
+bin/prepareHistFactory
+bin/proofd
+bin/proofserv
+bin/proofserv.exe
+bin/rlibmap
+bin/rmkdepend
</ins><span class="cx"> bin/root
</span><span class="cx"> bin/root-config
</span><ins>+bin/root.exe
+bin/rootcint
+bin/rootd
+bin/rootn.exe
+bin/roots
+bin/roots.exe
+bin/setxrd.csh
+bin/setxrd.sh
+bin/ssh2rpd
+bin/thisroot.csh
+bin/thisroot.sh
+bin/xpdtest
+bin/rootcling
+share/man/man1/cint.1.gz
+share/man/man1/g2root.1.gz
+share/man/man1/g2rootold.1.gz
+share/man/man1/genmap.1.gz
+share/man/man1/genreflex-rootcint.1.gz
+share/man/man1/genreflex.1.gz
+share/man/man1/h2root.1.gz
+share/man/man1/hadd.1.gz
+share/man/man1/hist2workspace.1.gz
+share/man/man1/makecint.1.gz
+share/man/man1/memprobe.1.gz
+share/man/man1/pq2-ana-dist.1.gz
+share/man/man1/pq2-cache.1.gz
+share/man/man1/pq2-info-server.1.gz
+share/man/man1/pq2-ls-files-server.1.gz
+share/man/man1/pq2-ls-files.1.gz
+share/man/man1/pq2-ls.1.gz
+share/man/man1/pq2-put.1.gz
+share/man/man1/pq2-redistribute.1.gz
+share/man/man1/pq2-rm.1.gz
+share/man/man1/pq2-verify.1.gz
+share/man/man1/pq2.1.gz
+share/man/man1/prepareHistFactory.1.gz
+share/man/man1/proofd.1.gz
+share/man/man1/proofserv.1.gz
+share/man/man1/proofserva.1.gz
+share/man/man1/rlibmap.1.gz
+share/man/man1/rmkdepend.1.gz
+share/man/man1/root-config.1.gz
+share/man/man1/root.1.gz
+share/man/man1/root.exe.1.gz
+share/man/man1/roota.1.gz
+share/man/man1/rootcint.1.gz
+share/man/man1/rootd.1.gz
+share/man/man1/rootn.exe.1.gz
+share/man/man1/roots.exe.1.gz
+share/man/man1/setup-pq2.1.gz
+share/man/man1/ssh2rpd.1.gz
+share/man/man1/system.rootdaemonrc.1.gz
+share/man/man1/xpdtest.1.gz
+share/man/man1/xproofd.1.gz
+share/man/man1/rootcling.1.gz
</ins></span></pre></div>
<a id="usersmojcaportssysutilsroot_selectfilesnone"></a>
<div class="modfile"><h4>Modified: users/mojca/ports/sysutils/root_select/files/none (119108 => 119109)</h4>
<pre class="diff"><span>
<span class="info">--- users/mojca/ports/sysutils/root_select/files/none 2014-04-17 16:25:59 UTC (rev 119108)
+++ users/mojca/ports/sysutils/root_select/files/none 2014-04-17 16:26:03 UTC (rev 119109)
</span><span class="lines">@@ -1,2 +1,72 @@
</span><span class="cx"> -
</span><span class="cx"> -
</span><ins>+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
</ins></span></pre>
</div>
</div>
</body>
</html>