diff --git a/Makefile b/Makefile
index 093ac2fb9100ce76975b8e04a02f5b6a964541be..4eb83e8e56953ea308fb6391c158e5f48ab6e65e 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,9 @@
COMMENT= WIP packages
+SUBDIR+= assimp
SUBDIR+= attentional-genom
+SUBDIR+= certi
SUBDIR+= genom3
SUBDIR+= genom3-openprs
SUBDIR+= genom3-pocolibs
@@ -11,44 +13,59 @@ SUBDIR+= genom3-ros
SUBDIR+= genomix
SUBDIR+= gest-genom
SUBDIR+= hatpconsole
+SUBDIR+= hatptester
SUBDIR+= hpp-geometry
SUBDIR+= hyper
SUBDIR+= hyper_genom
+SUBDIR+= icu-genom
SUBDIR+= jafar-lgl
SUBDIR+= jafar-rednav
SUBDIR+= jafar-qdisplay
SUBDIR+= jafar-gdhe
SUBDIR+= jafar-rtslam
+SUBDIR+= jointStateMapper
SUBDIR+= joystick-genom
SUBDIR+= kukaFri-libs
+SUBDIR+= laaswm-gui
SUBDIR+= lastwave
SUBDIR+= libANN
SUBDIR+= libfreenect
SUBDIR+= libhatp
SUBDIR+= libmove3d
+SUBDIR+= libmove3d-hri
+SUBDIR+= libmove3d-planners
SUBDIR+= lwr-genom
SUBDIR+= metapod
+SUBDIR+= mhp-genom
+SUBDIR+= morse-hla
+SUBDIR+= morse-pocolibs
+SUBDIR+= move3d-assets
+SUBDIR+= move3d-studio
SUBDIR+= MPC
SUBDIR+= MPC_avoidObs-genom
SUBDIR+= MPC_controller-genom
SUBDIR+= MPC_planner-genom
SUBDIR+= MPC_DEMTreatment-genom
-SUBDIR+= mhp-genom
-SUBDIR+= morse-pocolibs
-SUBDIR+= move3d-assets
-SUBDIR+= move3d-studio
SUBDIR+= msgconnector
SUBDIR+= mumps
SUBDIR+= oro-view
SUBDIR+= poisson
SUBDIR+= pr2-pick-object
+SUBDIR+= py-flann
+SUBDIR+= py-laaswm
+SUBDIR+= py-hla
+SUBDIR+= py-morse
SUBDIR+= rednav-genom
+SUBDIR+= rfid-genom
SUBDIR+= robotModelParser-libs
SUBDIR+= robot-viewer
SUBDIR+= spark-genom
+SUBDIR+= sparkyarp-genom
SUBDIR+= tcl-genomix
SUBDIR+= trajectory_monitor-genom
SUBDIR+= transgen3
+SUBDIR+= urbi
SUBDIR+= visp
+SUBDIR+= visuserv-genom
include ../mk/robotpkg.subdir.mk
diff --git a/TODO b/TODO
index 754869c228baf61c82f9d36cf28578a8f9f87f4c..8b6069bbe83736815248d647371f38afa9876bca 100644
--- a/TODO
+++ b/TODO
@@ -14,6 +14,7 @@ Suggested package updates
o middleware/openni-1.3.2.1
o middleware/yarp-2.3.20.1
o graphics/blender-2.66
+ o image/opencv-2.4.4
Suggested new packages
======================
diff --git a/certi/DESCR b/certi/DESCR
new file mode 100644
index 0000000000000000000000000000000000000000..92d11dc9831be295ddedfda17a64f2f4e9e23de0
--- /dev/null
+++ b/certi/DESCR
@@ -0,0 +1,5 @@
+CERTI is an Open Source HLA RTI. HLA (High-Level Architecture) is a general
+purpose architecture for distributed computer simulation systems. In HLA
+systems, the RTI (RunTime Infrastructure) manages data exchange between
+simulations. CERTI supports HLA 1.3 specifications (C++ and Java) and partial
+IEEE 1516-2000 (C++). CERTI is open source software (GPL, libraries are LGPL).
diff --git a/certi/Makefile b/certi/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..6f1fdeec2ce46f0d253a725b456feb7a9f988c70
--- /dev/null
+++ b/certi/Makefile
@@ -0,0 +1,23 @@
+# robotpkg Makefile for: architecture/certi
+# Created: Arnaud Degroote on Tue, 12 Mar 2013
+#
+
+COMMIT= HEAD
+PKG_VERSION= 20130312
+DISTNAME= certi-${PKG_VERSION}
+CATEGORIES= architecture
+MASTER_SITES= :pserver:anonymous@cvs.savannah.nongnu.org:/sources/certi@${COMMIT}+certi
+FETCH_METHOD= cvs
+
+MAINTAINER= robotpkg@laas.fr
+HOMEPAGE= https://savannah.nongnu.org/projects/certi
+COMMENT= An Open Source HLA RTI (High Level Architecture)
+LICENSE= gnu-gpl-v2
+
+include ../../mk/sysdep/cmake.mk
+include ../../mk/language/c.mk
+include ../../mk/language/c++.mk
+include ../../mk/sysdep/bison.mk
+include ../../mk/sysdep/flex.mk
+include ../../mk/sysdep/libxml2.mk
+include ../../mk/robotpkg.mk
diff --git a/certi/PLIST b/certi/PLIST
new file mode 100644
index 0000000000000000000000000000000000000000..3988d05c3095e59e391fe6e5c9970f0bfd51add2
--- /dev/null
+++ b/certi/PLIST
@@ -0,0 +1,94 @@
+@comment Tue Mar 12 14:58:56 CET 2013
+bin/CertiCheckHostAndIP
+bin/CertiProcessus_A
+bin/CertiProcessus_B
+bin/MessageBufferTests
+bin/MsgBufferTests
+bin/billard
+bin/billard-nogui
+bin/hlaomtdif2cpp.py
+bin/rtia
+bin/rtig
+include/Clock.hh
+include/GettimeofdayClock.hh
+include/HLAbasicType.hh
+include/HLAbuffer.hh
+include/HLAenumeratedType.hh
+include/HLAfixedArray.hh
+include/HLAfixedRecord.hh
+include/HLAtypesIEEE1516.hh
+include/HLAvariableArray.hh
+include/HLAvariantRecord.hh
+include/MessageBuffer.hh
+include/MsgBuffer.h
+include/NullFederateAmbassador.hh
+include/PosixClock.hh
+include/RTI.hh
+include/RTI/Enums.h
+include/RTI/Exception.h
+include/RTI/FederateAmbassador.h
+include/RTI/Handle.h
+include/RTI/LogicalTime.h
+include/RTI/LogicalTimeFactory.h
+include/RTI/LogicalTimeInterval.h
+include/RTI/NullFederateAmbassador.h
+include/RTI/RTI1516.h
+include/RTI/RTI1516fedTime.h
+include/RTI/RTIambassador.h
+include/RTI/RTIambassadorFactory.h
+include/RTI/RangeBounds.h
+include/RTI/SpecificConfig.h
+include/RTI/Typedefs.h
+include/RTI/VariableLengthData.h
+include/RTI/certiLogicalTime.h
+include/RTI/certiLogicalTimeFactory.h
+include/RTI/certiLogicalTimeInterval.h
+include/RTI/certiRTI1516.h
+include/RTIambServices.hh
+include/RTItypes.hh
+include/SHM.hh
+include/SHMPosix.hh
+include/SHMSysV.hh
+include/Semaphore.hh
+include/SemaphorePosix.hh
+include/SemaphoreSysV.hh
+include/baseTypes.hh
+include/federateAmbServices.hh
+include/fedtime.hh
+include/libhla.hh
+include/sha1.h
+include/tlsf.h
+lib/libCERTI.so
+lib/libCERTI.so.3
+lib/libCERTI.so.3.4.2cvs
+lib/libFedTime.so
+lib/libFedTime.so.1
+lib/libFedTime.so.1.0.0
+lib/libFedTime1516.so
+lib/libFedTime1516.so.1
+lib/libFedTime1516.so.1.0.0
+lib/libHLA.so
+lib/libHLA.so.3
+lib/libHLA.so.3.4.2cvs
+lib/libRTI-NG.so
+lib/libRTI-NG.so.1
+lib/libRTI-NG.so.1.0.0
+lib/libRTI1516.so
+lib/libRTI1516.so.1
+lib/libRTI1516.so.1.0.0
+lib/libgraph-nogui.a
+lib/libgraph.a
+share/doc/certi/favicon.ico
+share/doc/certi/index.html
+share/federations/Test.fed
+share/federations/Test.xml
+share/scripts/CERTIConfig.cmake
+share/scripts/CERTIConfigVersion.cmake
+share/scripts/CERTIDepends-release.cmake
+share/scripts/CERTIDepends.cmake
+share/scripts/FindCERTI.cmake
+share/scripts/FindRTI.cmake
+share/scripts/UseCERTI.cmake
+share/scripts/dtest_billard.py
+share/scripts/myCERTI_env.csh
+share/scripts/myCERTI_env.sh
diff --git a/certi/depend.mk b/certi/depend.mk
new file mode 100644
index 0000000000000000000000000000000000000000..8b1c795acfb7b8ad09fcf7fcad9c05e0c09ed3d6
--- /dev/null
+++ b/certi/depend.mk
@@ -0,0 +1,26 @@
+# robotpkg depend.mk for: architecture/certi
+# Created: Arnaud Degroote on Tue, 12 Mar 2013
+#
+
+DEPEND_DEPTH:= ${DEPEND_DEPTH}+
+CERTI_LIBS_DEPEND_MK:=${CERTI_LIBS_DEPEND_MK}+
+
+ifeq (+,$(DEPEND_DEPTH))
+DEPEND_PKG+= certi
+endif
+
+ifeq (+,$(CERTI_LIBS_DEPEND_MK))
+PREFER.certi?= robotpkg
+
+DEPEND_USE+= certi
+
+DEPEND_ABI.certi?= certi>=20120101
+DEPEND_DIR.certi?= ../../wip/certi
+
+SYSTEM_SEARCH.certi=\
+ bin/rtia \
+ include/RTI.hh \
+ lib/libCERTI.so
+endif
+
+DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
diff --git a/certi/distinfo b/certi/distinfo
new file mode 100644
index 0000000000000000000000000000000000000000..6a1e11fee7ceea421c06a0ab8d444e146049a596
--- /dev/null
+++ b/certi/distinfo
@@ -0,0 +1,2 @@
+SHA1 (certi-20130312.tar.gz) = adc6a24ddcf952ca9ae0862cd67444c4835b5827
+RMD160 (certi-20130312.tar.gz) = 1d2f507fbfffef040544116f903b28c8d3783423
diff --git a/hri-simulation/Makefile b/hri-simulation/Makefile
index 84f85e547f8ed65ef65db9936219044857baeb40..fcab77845d39bd546f845aaedeed7d4b31a0c15a 100644
--- a/hri-simulation/Makefile
+++ b/hri-simulation/Makefile
@@ -4,6 +4,7 @@
PKGNAME= hri-simulation
VERSION= 1.1
+PKGREVISION= 1
DISTNAME= ${PKGNAME}-${VERSION}
@@ -21,20 +22,28 @@ DEPEND_ABI.python+= python<3
PYDISTUTILSPKG= ON
-# Required dependencies
+REQD_BUILD_OPTIONS.pom-genom+=python
include ../../localization/pom-genom/depend.mk
+REQD_BUILD_OPTIONS.platine-genom+=python
include ../../hardware/platine-genom/depend.mk
+
+REQD_BUILD_OPTIONS.viman-genom+=python
+include ../../image/viman-genom/depend.mk
+
+REQD_BUILD_OPTIONS.lwr-genom+=python
include ../../wip/lwr-genom/depend.mk
-REQD_BUILD_OPTIONS.spark-genom+=jido
+REQD_BUILD_OPTIONS.genPos-genom+=python
+include ../../interfaces/genPos-genom/depend.mk
+
+REQD_BUILD_OPTIONS.spark-genom+=jido python
include ../../wip/spark-genom/depend.mk
REQD_BUILD_OPTIONS.pilo-genom+=fake
include ../../wip/mhp-genom/depend.mk
include ../../wip/move3d-assets/depend.mk
-REQD_BUILD_OPTIONS.morse-pocolibs+= hri
include ../../wip/morse-pocolibs/depend.mk
include ../../sysutils/alog/depend.mk
diff --git a/morse-hla/DESCR b/morse-hla/DESCR
new file mode 100644
index 0000000000000000000000000000000000000000..e7a4f8de7ece1411b4e1cfa71ca71bdc4c6bc975
--- /dev/null
+++ b/morse-hla/DESCR
@@ -0,0 +1 @@
+HLA (High Level Architecture) bindings for the morse simulator.
diff --git a/morse-hla/Makefile b/morse-hla/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..94194cbbd22b3c8c561490f1f8f47b5ddc57fdbe
--- /dev/null
+++ b/morse-hla/Makefile
@@ -0,0 +1,20 @@
+# robotpkg Makefile for: simulation/morse-hla
+# Created: Arnaud Degroote on Tue, 12 Mar 2013
+#
+
+PKGNAME= morse-hla-${MORSE_VERSION}
+
+include ../../simulation/morse/Makefile.common
+
+COMMENT+= (hla bindings)
+
+CMAKE_ARGS+= -DBUILD_CORE_SUPPORT=OFF
+CMAKE_ARGS+= -DBUILD_DOC_SUPPORT=OFF
+
+CMAKE_ARGS+= -DBUILD_HLA_SUPPORT=ON
+CMAKE_ARGS+= -DBUILD_ROS_SUPPORT=OFF
+CMAKE_ARGS+= -DBUILD_YARP2_SUPPORT=OFF
+
+include ../../simulation/morse/depend.mk
+include ../../wip/py-hla/depend.mk
+include ../../mk/robotpkg.mk
diff --git a/morse-hla/PLIST b/morse-hla/PLIST
new file mode 100644
index 0000000000000000000000000000000000000000..26bb34a00a090df0510cca3b1fc6d54e126eb2e0
--- /dev/null
+++ b/morse-hla/PLIST
@@ -0,0 +1,5 @@
+@comment Tue Mar 12 16:06:21 CET 2013
+${PYTHON_SITELIB}/morse/multinode/${PYTHON_PYCACHE}/hla${PYTHON_TAG}.pyc
+${PYTHON_SITELIB}/morse/multinode/${PYTHON_PYCACHE}/hla${PYTHON_TAG}.pyo
+${PYTHON_SITELIB}/morse/multinode/hla.py
+share/federations/morse.fed
diff --git a/morse-hla/depend.mk b/morse-hla/depend.mk
new file mode 100644
index 0000000000000000000000000000000000000000..8b313beff4ac5e307f63795b8df9b447eb31bcd5
--- /dev/null
+++ b/morse-hla/depend.mk
@@ -0,0 +1,28 @@
+# robotpkg depend.mk for: simulation/morse-hla
+# Created: Arnaud Degroote on Tue, 12 Mar 2013
+#
+
+DEPEND_DEPTH:= ${DEPEND_DEPTH}+
+MORSE_HLA_DEPEND_MK:= ${MORSE_HLA_DEPEND_MK}+
+
+ifeq (+,$(DEPEND_DEPTH))
+DEPEND_PKG+= morse-hla
+endif
+
+ifeq (+,$(MORSE_HLA_DEPEND_MK)) # -------------------------------------
+
+PREFER.morse-hla?= robotpkg
+
+DEPEND_USE+= morse-hla
+
+DEPEND_ABI.morse-hla?= morse-hla>=1.0
+DEPEND_DIR.morse-hla?= ../../wip/morse-hla
+
+SYSTEM_SEARCH.morse-hla=\
+ lib/python*/{site,dist}-packages/morse/multinode/hla.py
+
+include ../../mk/sysdep/python.mk
+
+endif # MORSE_HLA_DEPEND_MK -------------------------------------------
+
+DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
diff --git a/msgconnector/Makefile b/msgconnector/Makefile
index 7fa9607bb6c5438cb641107f76a68244c6124f26..c8902851d26decfa7047e90c03481aded8b57d3c 100644
--- a/msgconnector/Makefile
+++ b/msgconnector/Makefile
@@ -16,6 +16,8 @@ LICENSE= 2-clause-bsd
MAKE_JOBS_SAFE= yes
+ONLY_FOR_PLATFORM = Linux-%
+
#--- Options : msgconnector can be build with different bridges
PKG_SUPPORTED_OPTIONS+= bridge-print
PKG_SUPPORTED_OPTIONS+= openprs
diff --git a/py-flann/Makefile b/py-flann/Makefile
index 474aa7dc012c3a9dc41858543a703e21f6da8783..7259714b088d16813a44a776f259fae6138d8834 100644
--- a/py-flann/Makefile
+++ b/py-flann/Makefile
@@ -2,27 +2,28 @@
# Created: Nizar Sallem on Tue, 28 Dec 2010
#
-VERSION= 1.6.11
-PKGNAME= ${PKGTAG.python-}-flann-${VERSION}
-DISTNAME= flann-${VERSION}-src
-EXTRACT_SUFX= .zip
-CATEGORIES= math
+VERSION= 1.7.1
+DISTNAME= flann-${VERSION}-src
+PKGNAME= ${PKGTAG.python}-flann-${VERSION}
MASTER_SITES= http://www.cs.ubc.ca/~mariusm/uploads/FLANN/
+EXTRACT_SUFX= .zip
+CATEGORIES= graphics
+COMMENT= Fast approximate nearest neighbor search for high dimension
MAINTAINER= openrobots@laas.fr
HOMEPAGE= http://www.cs.ubc.ca/~mariusm/index.php/FLANN/FLANN
-COMMENT= Python bindings for flann
LICENSE= 2-clause-bsd
+CMAKE_ARGS+= -DBUILD_MATLAB_BINDINGS=OFF
+CMAKE_ARGS+= -DBUILD_PYTHON_BINDINGS=ON
+CMAKE_ARGS+= -DUSE_MPI=OFF
+CMAKE_ARGS+= -DBUILD_CUDA_LIB=OFF
+CMAKE_ARGS+= -DBUILD_C_BINDINGS=OFF
+CMAKE_ARGS+= -DPYTHON_SITELIB=${PYTHON_SITELIB}
-#option for c bindings generation
-CMAKE_ARGS+= -DBUILD_C_BINDINGS=OFF
-CMAKE_ARGS+= -DBUILD_MATLAB_BINDINGS=OFF
-CMAKE_ARGS+= -DPYTHON_SITELIB=${PYTHON_SITELIB}
+include ../../graphics/flann/depend.mk
include ../../mk/sysdep/python.mk
-include ../../wip/flann/depend.mk
-include ../../mk/sysdep/latex.mk
include ../../mk/sysdep/cmake.mk
include ../../mk/language/c.mk
include ../../mk/language/c++.mk
diff --git a/py-flann/PLIST b/py-flann/PLIST
index e198c8138b4319bfbb21ff46e676289f970b3f76..fe6f5cb7cd547a29c43941803f5e845f84cfe078 100644
--- a/py-flann/PLIST
+++ b/py-flann/PLIST
@@ -1,26 +1,40 @@
-@comment Wed Jul 20 14:14:22 CEST 2011
-${PYTHON_SITELIB}/pyflann/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyc
-${PYTHON_SITELIB}/pyflann/${PYTHON_PYCACHE}/exceptions${PYTHON_TAG}.pyc
-${PYTHON_SITELIB}/pyflann/${PYTHON_PYCACHE}/index${PYTHON_TAG}.pyc
+@comment Tue Mar 12 14:17:29 CET 2013
${PYTHON_SITELIB}/pyflann/__init__.py
-${PYTHON_SITELIB}/pyflann/bindings/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyc
-${PYTHON_SITELIB}/pyflann/bindings/${PYTHON_PYCACHE}/flann_ctypes${PYTHON_TAG}.pyc
+${PYTHON_SITELIB}/pyflann/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyc
+${PYTHON_SITELIB}/pyflann/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/pyflann/bindings/__init__.py
+${PYTHON_SITELIB}/pyflann/bindings/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyc
+${PYTHON_SITELIB}/pyflann/bindings/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/pyflann/bindings/flann_ctypes.py
-${PYTHON_SITELIB}/pyflann/bindings/test.txt
+${PYTHON_SITELIB}/pyflann/bindings/${PYTHON_PYCACHE}/flann_ctypes${PYTHON_TAG}.pyc
+${PYTHON_SITELIB}/pyflann/bindings/${PYTHON_PYCACHE}/flann_ctypes${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/pyflann/exceptions.py
+${PYTHON_SITELIB}/pyflann/${PYTHON_PYCACHE}/exceptions${PYTHON_TAG}.pyc
+${PYTHON_SITELIB}/pyflann/${PYTHON_PYCACHE}/exceptions${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/pyflann/index.py
-${PYTHON_SITELIB}/pyflann/io/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyc
-${PYTHON_SITELIB}/pyflann/io/${PYTHON_PYCACHE}/binary_dataset${PYTHON_TAG}.pyc
-${PYTHON_SITELIB}/pyflann/io/${PYTHON_PYCACHE}/dat_dataset${PYTHON_TAG}.pyc
-${PYTHON_SITELIB}/pyflann/io/${PYTHON_PYCACHE}/dataset${PYTHON_TAG}.pyc
-${PYTHON_SITELIB}/pyflann/io/${PYTHON_PYCACHE}/hdf5_dataset${PYTHON_TAG}.pyc
-${PYTHON_SITELIB}/pyflann/io/${PYTHON_PYCACHE}/npy_dataset${PYTHON_TAG}.pyc
+${PYTHON_SITELIB}/pyflann/${PYTHON_PYCACHE}/index${PYTHON_TAG}.pyc
+${PYTHON_SITELIB}/pyflann/${PYTHON_PYCACHE}/index${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/pyflann/io/__init__.py
+${PYTHON_SITELIB}/pyflann/io/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyc
+${PYTHON_SITELIB}/pyflann/io/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/pyflann/io/binary_dataset.py
+${PYTHON_SITELIB}/pyflann/io/${PYTHON_PYCACHE}/binary_dataset${PYTHON_TAG}.pyc
+${PYTHON_SITELIB}/pyflann/io/${PYTHON_PYCACHE}/binary_dataset${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/pyflann/io/dat_dataset.py
+${PYTHON_SITELIB}/pyflann/io/${PYTHON_PYCACHE}/dat_dataset${PYTHON_TAG}.pyc
+${PYTHON_SITELIB}/pyflann/io/${PYTHON_PYCACHE}/dat_dataset${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/pyflann/io/dataset.py
+${PYTHON_SITELIB}/pyflann/io/${PYTHON_PYCACHE}/dataset${PYTHON_TAG}.pyc
+${PYTHON_SITELIB}/pyflann/io/${PYTHON_PYCACHE}/dataset${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/pyflann/io/hdf5_dataset.py
+${PYTHON_SITELIB}/pyflann/io/${PYTHON_PYCACHE}/hdf5_dataset${PYTHON_TAG}.pyc
+${PYTHON_SITELIB}/pyflann/io/${PYTHON_PYCACHE}/hdf5_dataset${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/pyflann/io/npy_dataset.py
+${PYTHON_SITELIB}/pyflann/io/${PYTHON_PYCACHE}/npy_dataset${PYTHON_TAG}.pyc
+${PYTHON_SITELIB}/pyflann/io/${PYTHON_PYCACHE}/npy_dataset${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/pyflann/util/__init__.py
+${PYTHON_SITELIB}/pyflann/util/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyc
+${PYTHON_SITELIB}/pyflann/util/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyo
${PYTHON_SITELIB}/pyflann/util/weave_tools.py
+${PYTHON_SITELIB}/pyflann/util/${PYTHON_PYCACHE}/weave_tools${PYTHON_TAG}.pyc
+${PYTHON_SITELIB}/pyflann/util/${PYTHON_PYCACHE}/weave_tools${PYTHON_TAG}.pyo
diff --git a/py-flann/distinfo b/py-flann/distinfo
index b699e18145305835e7a9a3ed7429399bd9e12d7b..05ba1c26ed03dbea254dd76aa7178aaf3e572935 100644
--- a/py-flann/distinfo
+++ b/py-flann/distinfo
@@ -1,5 +1,5 @@
-SHA1 (flann-1.6.11-src.zip) = cecb709299f1cf16c9f6202e648d6d7ee2b12f8a
-RMD160 (flann-1.6.11-src.zip) = 52263c560f71d0ce1fc4f6c63c19bfc2f789c7ea
-Size (flann-1.6.11-src.zip) = 500128 bytes
-SHA1 (patch-aa) = 49c75d7c9e19663e5b36e097633a6baa753e8a38
+SHA1 (flann-1.7.1-src.zip) = 61b9858620528919ea60a2a4b085ccc2b3c2d138
+RMD160 (flann-1.7.1-src.zip) = cec1ce99d2c91ddf8f20d5aa8009a08c5347b904
+Size (flann-1.7.1-src.zip) = 582517 bytes
+SHA1 (patch-aa) = 11feeab66768072b4761cda5aa3c63ff85f73e67
SHA1 (patch-ab) = 83a9b0c9ea815e5d69b3e96fc5056f7c5caa532b
diff --git a/py-flann/patches/patch-aa b/py-flann/patches/patch-aa
index 142b695475a3ecdbadfb7582b6a7ddea0d66bf16..78f9bc13a0cbeb96ee2a6be9ba6828cbbe3bb253 100644
--- a/py-flann/patches/patch-aa
+++ b/py-flann/patches/patch-aa
@@ -1,22 +1,21 @@
-diff -ru CMakeLists.txt CMakeLists.txt
---- CMakeLists.txt 2011-07-20 13:32:34.259315161 +0100
-+++ CMakeLists.txt 2011-07-20 13:34:15.583817611 +0100
-@@ -43,10 +43,10 @@
- option(USE_MPI "Use MPI" OFF)
+--- CMakeLists.txt.orig 2011-12-23 12:16:09.000000000 +0100
++++ CMakeLists.txt 2013-03-12 14:16:34.920354953 +0100
+@@ -47,10 +47,10 @@
+ set(NVCC_COMPILER_BINDIR "" CACHE PATH "Directory where nvcc should look for C++ compiler. This is passed to nvcc through the --compiler-bindir option.")
-if (NOT BUILD_C_BINDINGS)
- set(BUILD_PYTHON_BINDINGS OFF)
- set(BUILD_MATLAB_BINDINGS OFF)
-endif()
-+# if (NOT BUILD_C_BINDINGS)
-+# set(BUILD_PYTHON_BINDINGS OFF)
-+# set(BUILD_MATLAB_BINDINGS OFF)
-+# endif()
++#if (NOT BUILD_C_BINDINGS)
++# set(BUILD_PYTHON_BINDINGS OFF)
++# set(BUILD_MATLAB_BINDINGS OFF)
++#endif()
# find python
-@@ -103,11 +103,11 @@
+@@ -141,11 +141,11 @@
add_definitions( "-Wall" )
endif(WIN32)
@@ -32,20 +31,3 @@ diff -ru CMakeLists.txt CMakeLists.txt
# CPACK options
-diff -ru src/CMakeLists.txt src/CMakeLists.txt
---- src/CMakeLists.txt 2011-07-20 13:32:34.267315202 +0100
-+++ src/CMakeLists.txt 2011-07-20 13:34:13.811808817 +0100
-@@ -1,9 +1,9 @@
-
--add_subdirectory( cpp )
-+#add_subdirectory( cpp )
-
--if (BUILD_MATLAB_BINDINGS)
-- add_subdirectory( matlab )
--endif()
-+# if (BUILD_MATLAB_BINDINGS)
-+# add_subdirectory( matlab )
-+# endif()
-
- if (BUILD_PYTHON_BINDINGS)
- add_subdirectory( python )
diff --git a/py-hla/DESCR b/py-hla/DESCR
new file mode 100644
index 0000000000000000000000000000000000000000..38cb3e8957900f776f754fcdab2f89bc214635dc
--- /dev/null
+++ b/py-hla/DESCR
@@ -0,0 +1,7 @@
+CERTI is an Open Source HLA RTI. HLA (High-Level Architecture) is a general
+purpose architecture for distributed computer simulation systems. In HLA
+systems, the RTI (RunTime Infrastructure) manages data exchange between
+simulations. CERTI supports HLA 1.3 specifications (C++ and Java) and partial
+IEEE 1516-2000 (C++). CERTI is open source software (GPL, libraries are LGPL).
+
+This package contains the Python API to communicate with CERTI.
diff --git a/py-hla/Makefile b/py-hla/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..d907661968f74320772c35756e7936ed56c45b07
--- /dev/null
+++ b/py-hla/Makefile
@@ -0,0 +1,31 @@
+# robotpkg Makefile for: architecture/py27-hla
+# Created: Arnaud Degroote on Tue, 12 Mar 2013
+#
+
+COMMIT= HEAD
+PKG_VERSION= 20130312
+DISTNAME= pyhla-${PKG_VERSION}
+PKGNAME= ${PKGTAG.python}-hla-${PKG_VERSION}
+CATEGORIES= architecture
+MASTER_SITES= :pserver:anonymous@cvs.savannah.nongnu.org:/sources/certi@${COMMIT}+applications/PyHLA
+FETCH_METHOD= cvs
+
+MAINTAINER= robotpkg@laas.fr
+HOMEPAGE= https://savannah.nongnu.org/projects/certi
+COMMENT= An Open Source HLA RTI (High Level Architecture) python API
+LICENSE= gnu-gpl-v2
+
+CMAKE_ARGS+= -DPYTHON_EXECUTABLE=${PYTHON}
+CMAKE_ARGS+= -DPYTHON_INCLUDE_PATH=${PYTHON_INCLUDE}
+CMAKE_ARGS+= -DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDE}
+CMAKE_ARGS+= -DPYTHON_LIBRARY=${PYTHON_LIB}
+CMAKE_ARGS+= -DCMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT=ON
+CMAKE_ARGS+= -DPYTHON_PACKAGES_PATH=${PREFIX}/${PYTHON_SITELIB}
+
+include ../../wip/certi/depend.mk
+
+include ../../mk/sysdep/cmake.mk
+include ../../mk/sysdep/python.mk
+include ../../mk/language/c.mk
+include ../../mk/language/c++.mk
+include ../../mk/robotpkg.mk
diff --git a/py-hla/PLIST b/py-hla/PLIST
new file mode 100644
index 0000000000000000000000000000000000000000..5ce6c76b74f99ef8ebb4d41dd5e3bbbe377ce838
--- /dev/null
+++ b/py-hla/PLIST
@@ -0,0 +1,24 @@
+@comment Tue Mar 12 15:43:34 CET 2013
+${PYTHON_SITELIB}/hla/__init__.py
+${PYTHON_SITELIB}/hla/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyc
+${PYTHON_SITELIB}/hla/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyo
+${PYTHON_SITELIB}/hla/_omt.so
+${PYTHON_SITELIB}/hla/_rti.so
+${PYTHON_SITELIB}/hla/omt/__init__.py
+${PYTHON_SITELIB}/hla/omt/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyc
+${PYTHON_SITELIB}/hla/omt/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyo
+${PYTHON_SITELIB}/hla/omt/array.py
+${PYTHON_SITELIB}/hla/omt/${PYTHON_PYCACHE}/array${PYTHON_TAG}.pyc
+${PYTHON_SITELIB}/hla/omt/${PYTHON_PYCACHE}/array${PYTHON_TAG}.pyo
+${PYTHON_SITELIB}/hla/omt/basic.py
+${PYTHON_SITELIB}/hla/omt/${PYTHON_PYCACHE}/basic${PYTHON_TAG}.pyc
+${PYTHON_SITELIB}/hla/omt/${PYTHON_PYCACHE}/basic${PYTHON_TAG}.pyo
+${PYTHON_SITELIB}/hla/omt/enumerated.py
+${PYTHON_SITELIB}/hla/omt/${PYTHON_PYCACHE}/enumerated${PYTHON_TAG}.pyc
+${PYTHON_SITELIB}/hla/omt/${PYTHON_PYCACHE}/enumerated${PYTHON_TAG}.pyo
+${PYTHON_SITELIB}/hla/omt/record.py
+${PYTHON_SITELIB}/hla/omt/${PYTHON_PYCACHE}/record${PYTHON_TAG}.pyc
+${PYTHON_SITELIB}/hla/omt/${PYTHON_PYCACHE}/record${PYTHON_TAG}.pyo
+${PYTHON_SITELIB}/hla/rti/__init__.py
+${PYTHON_SITELIB}/hla/rti/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyc
+${PYTHON_SITELIB}/hla/rti/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyo
diff --git a/py-hla/depend.mk b/py-hla/depend.mk
new file mode 100644
index 0000000000000000000000000000000000000000..a9afcb8d3b88693a2ecb3087a118ee6bff28d6fa
--- /dev/null
+++ b/py-hla/depend.mk
@@ -0,0 +1,26 @@
+# robotpkg depend.mk for: architecture/py27-hla
+# Created: Arnaud Degroote on Tue, 12 Mar 2013
+#
+
+DEPEND_DEPTH:= ${DEPEND_DEPTH}+
+PYHLA_DEPEND_MK:=${PYHLA_DEPEND_MK}+
+
+ifeq (+,$(DEPEND_DEPTH))
+DEPEND_PKG+= py-hla
+endif
+
+ifeq (+,$(PYHLA_DEPEND_MK))
+PREFER.py-hla?= robotpkg
+
+DEPEND_USE+= py-hla
+
+DEPEND_ABI.py-hla?= ${PKGTAG.python-}hla>=20101119
+DEPEND_DIR.py-hla?= ../../wip/py-hla
+
+SYSTEM_SEARCH.py-hla=\
+ '${PYTHON_SYSLIBSEARCH}/hla/__init__.py'
+endif
+
+include ../../mk/sysdep/python.mk
+
+DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
diff --git a/py-hla/distinfo b/py-hla/distinfo
new file mode 100644
index 0000000000000000000000000000000000000000..75dfe917872a6d10ffbcfb623b3d0b5120032142
--- /dev/null
+++ b/py-hla/distinfo
@@ -0,0 +1,2 @@
+SHA1 (pyhla-20130312.tar.gz) = 82dfe589de54d4503cea7b712ba3268e7380d66d
+RMD160 (pyhla-20130312.tar.gz) = 24668d1241e268fbab3af2d68e8e93c02acfb60f
diff --git a/py-morse/Makefile b/py-morse/Makefile
index e06c6dc20e533d25ba28efc924c65363b240d71b..340f9dc76ff1a8256ce7eef7ea15c2770e483720 100644
--- a/py-morse/Makefile
+++ b/py-morse/Makefile
@@ -15,7 +15,6 @@ HOMEPAGE= http://morse.openrobots.org
COMMENT= Python bindings for the MORSE simulator for robotics
LICENSE= modified-bsd
-
CMAKE_ARGS+= -DBUILD_CORE_SUPPORT=OFF
CMAKE_ARGS+= -DBUILD_DOC_SUPPORT=OFF
CMAKE_ARGS+= -DBUILD_HLA_SUPPORT=OFF
@@ -25,8 +24,9 @@ CMAKE_ARGS+= -DBUILD_ROS_SUPPORT=OFF
CMAKE_ARGS+= -DBUILD_YARP2_SUPPORT=OFF
CMAKE_ARGS+= -DPYMORSE_SUPPORT=ON
+CMAKE_ARGS+= -DPYTHON_INSTDIR=${PREFIX}/${PYTHON_SITELIB}
-DEPEND_ABI.python+= python>=3.2<3.3
+DEPEND_ABI.python+= python>=3.2
include ../../mk/sysdep/python.mk
include ../../mk/sysdep/cmake.mk
diff --git a/py-morse/PLIST b/py-morse/PLIST
index b5568ac94a7f268a3b7dcc523f2a4b22be41d03b..3a1e415d1c49b59bbb803d9591b6e808b1cc8b1b 100644
--- a/py-morse/PLIST
+++ b/py-morse/PLIST
@@ -1,19 +1,19 @@
-@comment Fri Mar 1 18:17:41 CET 2013
-lib/python3/dist-packages/pymorse/__init__.py
-lib/python3/dist-packages/pymorse/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyc
-lib/python3/dist-packages/pymorse/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyo
-lib/python3/dist-packages/pymorse/${PYTHON_PYCACHE}/future${PYTHON_TAG}.pyc
-lib/python3/dist-packages/pymorse/${PYTHON_PYCACHE}/future${PYTHON_TAG}.pyo
-lib/python3/dist-packages/pymorse/${PYTHON_PYCACHE}/pymorse-internals-testing${PYTHON_TAG}.pyc
-lib/python3/dist-packages/pymorse/${PYTHON_PYCACHE}/pymorse-internals-testing${PYTHON_TAG}.pyo
-lib/python3/dist-packages/pymorse/${PYTHON_PYCACHE}/pymorse-testing${PYTHON_TAG}.pyc
-lib/python3/dist-packages/pymorse/${PYTHON_PYCACHE}/pymorse-testing${PYTHON_TAG}.pyo
-lib/python3/dist-packages/pymorse/${PYTHON_PYCACHE}/pymorse${PYTHON_TAG}.pyc
-lib/python3/dist-packages/pymorse/${PYTHON_PYCACHE}/pymorse${PYTHON_TAG}.pyo
-lib/python3/dist-packages/pymorse/${PYTHON_PYCACHE}/stream${PYTHON_TAG}.pyc
-lib/python3/dist-packages/pymorse/${PYTHON_PYCACHE}/stream${PYTHON_TAG}.pyo
-lib/python3/dist-packages/pymorse/future.py
-lib/python3/dist-packages/pymorse/pymorse-internals-testing.py
-lib/python3/dist-packages/pymorse/pymorse-testing.py
-lib/python3/dist-packages/pymorse/pymorse.py
-lib/python3/dist-packages/pymorse/stream.py
+@comment Tue Mar 12 17:48:16 CET 2013
+${PYTHON_SITELIB}/pymorse/__init__.py
+${PYTHON_SITELIB}/pymorse/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyc
+${PYTHON_SITELIB}/pymorse/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyo
+${PYTHON_SITELIB}/pymorse/${PYTHON_PYCACHE}/future${PYTHON_TAG}.pyc
+${PYTHON_SITELIB}/pymorse/${PYTHON_PYCACHE}/future${PYTHON_TAG}.pyo
+${PYTHON_SITELIB}/pymorse/${PYTHON_PYCACHE}/pymorse-internals-testing${PYTHON_TAG}.pyc
+${PYTHON_SITELIB}/pymorse/${PYTHON_PYCACHE}/pymorse-internals-testing${PYTHON_TAG}.pyo
+${PYTHON_SITELIB}/pymorse/${PYTHON_PYCACHE}/pymorse-testing${PYTHON_TAG}.pyc
+${PYTHON_SITELIB}/pymorse/${PYTHON_PYCACHE}/pymorse-testing${PYTHON_TAG}.pyo
+${PYTHON_SITELIB}/pymorse/${PYTHON_PYCACHE}/pymorse${PYTHON_TAG}.pyc
+${PYTHON_SITELIB}/pymorse/${PYTHON_PYCACHE}/pymorse${PYTHON_TAG}.pyo
+${PYTHON_SITELIB}/pymorse/${PYTHON_PYCACHE}/stream${PYTHON_TAG}.pyc
+${PYTHON_SITELIB}/pymorse/${PYTHON_PYCACHE}/stream${PYTHON_TAG}.pyo
+${PYTHON_SITELIB}/pymorse/future.py
+${PYTHON_SITELIB}/pymorse/pymorse-internals-testing.py
+${PYTHON_SITELIB}/pymorse/pymorse-testing.py
+${PYTHON_SITELIB}/pymorse/pymorse.py
+${PYTHON_SITELIB}/pymorse/stream.py
diff --git a/transgen3/Makefile b/transgen3/Makefile
index 7e56722e3c38ec563ccbda8e205f3a414c50756a..94c9e35d0f6b7b4b52b2bf82f324ecf451b07a3c 100644
--- a/transgen3/Makefile
+++ b/transgen3/Makefile
@@ -18,6 +18,9 @@ DEPEND_ABI.openprs= openprs>=1.1b5
include ../../wip/genom3/depend.mk
include ../../supervision/openprs/depend.mk
include ../../pkgtools/pkg-config/depend.mk
+include ../../mk/sysdep/bison.mk
+include ../../mk/sysdep/flex.mk
+include ../../mk/sysdep/perl.mk
include ../../mk/language/java.mk
include ../../mk/language/c.mk
include ../../mk/robotpkg.mk