YODA-1.6.7 (WIP)

YODA/README

@@ -6,46 +6,47 @@ generator validation analyses, particularly as the core histogramming system
 in Rivet.
 
 Runtime requirements:
-  bash-4.3.33-1
-  cygwin-2.0.2-1
-  libgcc1-4.9.2-3
-  libstdc++6-4.9.2-3
-  libtinyxml0-2.6.2-1bl2
-  libYODA-devel-1.3.1-1bl1
-  libYODA0-1.3.1-1bl1
+  bash-4.4.12-3
+  cygwin-2.9.0-3
+  libgcc1-6.4.0-4
+  libstdc++6-6.4.0-4
+  libtinyxml0-2.6.2-1bl3
+  libYODA-devel-1.6.7-1bl1
+  libYODA0-1.6.7-1bl1
+  pkg-config-0.29.1-1
 
 Build requirements:
 (besides corresponding -devel packages)
   autoconf-13-1
-  automake-9-1
-  binutils-2.25-2
-  boost.m4-0.4-1bl2
-  cygport-0.18.1-1
-  gcc-core-4.9.2-3
-  gcc-g++-4.9.2-3
-  libtool-2.4.6-1
-  make-4.1-1
+  automake-10-1
+  binutils-2.29-1
+  cygport-0.25.0-1
+  gcc-core-6.4.0-4
+  gcc-g++-6.4.0-4
+  libtool-2.4.6-5
+  make-4.2.1-2
+  python-2.7.14-1
 
 Canonical website:
   http://yoda.hepforge.org/
 
 Canonical download:
-  http://www.hepforge.org/archive/yoda/YODA-1.3.1.tar.bz2
+  http://www.hepforge.org/archive/yoda/YODA-1.6.7.tar.bz2
 
 -------------------------------------------
 
 Build instructions:
-  1. unpack YODA-1.3.1-X-src.tar.xz
+  1. unpack YODA-1.6.7-X-src.tar.xz
   2. if you use setup to install this src package,
      it will be unpacked under /usr/src automatically
         % cd /usr/src
-        % cygport ./YODA-1.3.1-X.cygport all
+        % cygport ./YODA-1.6.7-X.cygport all
 
 This will create:
-  /usr/src/YODA-1.3.1-X-src.tar.xz
-  /usr/src/YODA-1.3.1-X.tar.xz
-  /usr/src/libYODA0-1.3.1-X.tar.xz
-  /usr/src/libYODA-devel-1.3.1-X.tar.xz
+  /usr/src/YODA-1.6.7-X-src.tar.xz
+  /usr/src/YODA-1.6.7-X.tar.xz
+  /usr/src/libYODA0-1.6.7-X.tar.xz
+  /usr/src/libYODA-devel-1.6.7-X.tar.xz
 
 -------------------------------------------
 
@@ -84,6 +85,7 @@ Files included in the binary package:
   /usr/include/YODA/HistoBin1D.h
   /usr/include/YODA/HistoBin2D.h
   /usr/include/YODA/IO.h
+  /usr/include/YODA/Point.h
   /usr/include/YODA/Point1D.h
   /usr/include/YODA/Point2D.h
   /usr/include/YODA/Point3D.h
@@ -96,6 +98,7 @@ Files included in the binary package:
   /usr/include/YODA/Reader.h
   /usr/include/YODA/ReaderAIDA.h
   /usr/include/YODA/ReaderFLAT.h
+  /usr/include/YODA/ReaderMethods.icc
   /usr/include/YODA/ReaderYODA.h
   /usr/include/YODA/Scatter1D.h
   /usr/include/YODA/Scatter2D.h
@@ -106,8 +109,10 @@ Files included in the binary package:
   /usr/include/YODA/Utils/MathUtils.h
   /usr/include/YODA/Utils/Predicates.h
   /usr/include/YODA/Utils/StringUtils.h
+  /usr/include/YODA/Utils/Traits.h
   /usr/include/YODA/Utils/cachedvector.h
   /usr/include/YODA/Utils/fastlog.h
+  /usr/include/YODA/Utils/getline.h
   /usr/include/YODA/Utils/indexedset.h
   /usr/include/YODA/Utils/ndarray.h
   /usr/include/YODA/Utils/sortedvector.h
@@ -125,6 +130,8 @@ Files included in the binary package:
 
 Port Notes:
 
+----- version 1.6.7-1bl1 -----
+Version bump.
+
 ----- version 1.3.1-1bl1 -----
 Initial release by fd0 <https://github.com/fd00/>
-

YODA/YODA-1.6.7-1bl1.src.patch

@@ -0,0 +1,71 @@
+--- origsrc/YODA-1.6.7/bin/yoda-config	2017-06-19 02:53:47.000000000 +0900
++++ src/YODA-1.6.7/bin/yoda-config	2017-11-18 09:30:51.529639800 +0900
+@@ -36,8 +36,8 @@ if [[ -n "$tmp" ]]; then
+     prefix=$(dirname $bindir)
+     exec_prefix=$prefix
+ else
+-    prefix=/home/andy/heplocal
+-    exec_prefix=${prefix}
++    prefix=/usr
++    exec_prefix=/usr
+ fi
+ datarootdir=${prefix}/share
+
+@@ -46,7 +46,7 @@ OUT=""
+
+ ## "Atomic" build info
+ tmp=$( echo "$*" | egrep -- '--\<prefix\>')
+-test -n "$tmp" && OUT="$OUT /home/andy/heplocal"
++test -n "$tmp" && OUT="$OUT /usr"
+
+ tmp=$( echo "$*" | egrep -- '--\<includedir\>')
+ test -n "$tmp" && OUT="$OUT ${prefix}/include"
+@@ -55,7 +55,7 @@ tmp=$( echo "$*" | egrep -- '--\<libdir\
+ test -n "$tmp" && OUT="$OUT ${exec_prefix}/lib"
+
+ tmp=$( echo "$*" | egrep -- '--\<pythonpath\>')
+-test -n "$tmp" && OUT="$OUT /home/andy/heplocal/lib/python2.7/site-packages"
++test -n "$tmp" && OUT="$OUT "
+
+ ## "Pre-rolled" build info
+ tmp=$( echo "$*" | egrep -- '--\<cflags\>|--\<cppflags\>|--\<cxxflags\>')
+--- origsrc/YODA-1.6.7/include/YODA/Utils/BinSearcher.h	2016-04-18 04:44:17.000000000 +0900
++++ src/YODA-1.6.7/include/YODA/Utils/BinSearcher.h	2017-11-18 09:31:42.392999800 +0900
+@@ -14,6 +14,10 @@
+ #include <limits>
+ #include <memory>
+
++#if defined(_N)
++#undef _N
++#endif
++
+ namespace YODA {
+   namespace Utils {
+
+--- origsrc/YODA-1.6.7/src/Makefile.am	2016-03-01 00:07:20.000000000 +0900
++++ src/YODA-1.6.7/src/Makefile.am	2017-11-18 09:28:35.262000000 +0900
+@@ -1,5 +1,3 @@
+-SUBDIRS = tinyxml .
+-
+ lib_LTLIBRARIES = libYODA.la
+
+ libYODA_la_SOURCES = \
+@@ -23,6 +21,6 @@ libYODA_la_SOURCES = \
+     Scatter3D.cc
+
+
+-libYODA_la_LDFLAGS = -avoid-version
+-libYODA_la_LIBADD = tinyxml/libtinyxml.la
++libYODA_la_LDFLAGS = -no-undefined
++libYODA_la_LIBADD = -ltinyxml
+ libYODA_la_CPPFLAGS = $(AM_CPPFLAGS) -DTIXML_USE_STL
+--- origsrc/YODA-1.6.7/yoda.pc	2017-06-19 02:53:47.000000000 +0900
++++ src/YODA-1.6.7/yoda.pc	2017-11-18 09:30:52.045540200 +0900
+@@ -1,5 +1,5 @@
+-prefix=/home/andy/heplocal
+-exec_prefix=${prefix}
++prefix=/usr
++exec_prefix=/usr
+ libdir=${exec_prefix}/lib
+ includedir=${prefix}/include
+ datarootdir=${prefix}/share