3 files changed, 149 insertions, 37 deletions

diff --git a/graphics/mahotas/Makefile b/graphics/mahotas/Makefile
index ed6c73bef3d5..d253d34d61ac 100644
--- a/graphics/mahotas/Makefile
+++ b/graphics/mahotas/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mahotas
-PORTVERSION=	0.6.6
+PORTVERSION=	0.9.6
 CATEGORIES=	graphics python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,6 +15,7 @@ MAINTAINER=	sawp@sawp.com.br
 COMMENT=	An Efficient Image Processing Library for Python
 
 BUILD_DEPENDS+=	${PYNUMPY}
+LIB_DEPENDS= freeimage:${PORTSDIR}/graphics/freeimage
 
 USE_GCC=	4.6+
 USE_PYTHON=	2.5+
diff --git a/graphics/mahotas/distinfo b/graphics/mahotas/distinfo
index 667a3c36b8de..18a0898b706a 100644
--- a/graphics/mahotas/distinfo
+++ b/graphics/mahotas/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mahotas-0.6.6.tar.gz) = 390bc66a99b06eed92c27114d1ed85e9dec6d6ecb50d0357a91b034f12eb3150
-SIZE (mahotas-0.6.6.tar.gz) = 89252
+SHA256 (mahotas-0.9.6.tar.gz) = 89e7c235b0cad20a1dd2e89723c77a5ae66b4636f04b3a605bb773fffa0c7adf
+SIZE (mahotas-0.9.6.tar.gz) = 1206848
diff --git a/graphics/mahotas/pkg-plist b/graphics/mahotas/pkg-plist
index e6254b0b3037..8fc7deba7e62 100644
--- a/graphics/mahotas/pkg-plist
+++ b/graphics/mahotas/pkg-plist
@@ -4,6 +4,20 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/native_libs.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
+
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/_interpolate.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/_interpolate.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/_interpolate.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/_interpolate.so
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/_segmentation.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/_segmentation.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/_segmentation.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/_segmentation.so
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/interpolate.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/interpolate.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/interpolate.pyo
+
+
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/__init__.pyo
@@ -38,30 +52,14 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/_labeled.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/_labeled.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/_labeled.so
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/_lbp.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/_lbp.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/_lbp.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/_lbp.so
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/_morph.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/_morph.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/_morph.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/_morph.so
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/_surf.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/_surf.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/_surf.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/_surf.so
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/_texture.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/_texture.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/_texture.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/_texture.so
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/_thin.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/_thin.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/_thin.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/_thin.so
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/_zernike.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/_zernike.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/_zernike.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/_zernike.so
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/bbox.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/bbox.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/bbox.pyo
@@ -83,9 +81,6 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/euler.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/euler.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/euler.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/features.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/features.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/features.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/freeimage.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/freeimage.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/freeimage.pyo
@@ -128,11 +123,137 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tas.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tas.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tas.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/colors.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/colors.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/colors.pyo
+
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/features/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/features/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/features/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/features/_texture.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/features/_texture.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/features/_texture.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/features/_zernike.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/features/_zernike.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/features/_zernike.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/features/_zernike.so
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/features/shape.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/features/shape.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/features/shape.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/features/_lbp.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/features/_lbp.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/features/_lbp.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/features/_lbp.so
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/features/_surf.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/features/_surf.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/features/_surf.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/features/_surf.so
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/features/_texture.so
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/features/lbp.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/features/lbp.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/features/lbp.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/features/moments.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/features/moments.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/features/moments.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/features/surf.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/features/surf.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/features/surf.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/features/tas.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/features/tas.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/features/tas.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/features/texture.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/features/texture.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/features/texture.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/features/zernike.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/features/zernike.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/features/zernike.pyo
+
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/io/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/io/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/io/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/io/freeimage.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/io/freeimage.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/io/freeimage.pyo
+
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/demos/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/demos/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/demos/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/demos/distance.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/demos/distance.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/demos/distance.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/demos/morphology.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/demos/morphology.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/demos/morphology.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/demos/nuclear.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/demos/nuclear.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/demos/nuclear.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/demos/superpixels.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/demos/superpixels.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/demos/superpixels.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/demos/surf_gaussians.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/demos/surf_gaussians.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/demos/surf_gaussians.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/demos/surf_luispedro.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/demos/surf_luispedro.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/demos/surf_luispedro.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/demos/thresholding.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/demos/thresholding.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/demos/thresholding.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/demos/wally.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/demos/wally.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/demos/wally.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/demos/wavelet_compress.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/demos/wavelet_compress.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/demos/wavelet_compress.pyo
+
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/demos/data/DepartmentStore.jpg
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/demos/data/lena.jpg
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/demos/data/luispedro.jpg
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/demos/data/nuclear.png
+
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/texture.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/texture.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/texture.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/thin.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/thin.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/thin.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/thresholding.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/thresholding.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/thresholding.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/zernike.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/zernike.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/zernike.pyo
+
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tests/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tests/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tests/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tests/data/1bpp.bmp
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tests/data/determinant_zero.png
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tests/data/rgba.png
+
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tests/pymorph_copy.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tests/pymorph_copy.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tests/pymorph_copy.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tests/test_colors.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tests/test_colors.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tests/test_colors.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tests/test_filters.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tests/test_filters.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tests/test_filters.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tests/test_internal.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tests/test_internal.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tests/test_internal.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tests/test_interpolate.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tests/test_interpolate.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tests/test_interpolate.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tests/test_io.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tests/test_io.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tests/test_io.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tests/test_segmentation.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tests/test_segmentation.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tests/test_segmentation.pyo
+
+
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tests/test_bbox.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tests/test_bbox.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tests/test_bbox.pyo
@@ -163,9 +284,6 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tests/test_freeimage.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tests/test_freeimage.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tests/test_freeimage.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tests/test_get_output.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tests/test_get_output.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tests/test_get_output.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tests/test_gvoronoi.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tests/test_gvoronoi.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tests/test_gvoronoi.pyo
@@ -235,20 +353,13 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tests/test_zernike.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tests/test_zernike.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tests/test_zernike.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/texture.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/texture.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/texture.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/thin.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/thin.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/thin.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/thresholding.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/thresholding.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/thresholding.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/zernike.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/zernike.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/zernike.pyo
+
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/demos/data
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/demos
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tests/data
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tests
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/features
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/io
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%