Cleanup after r308514 by beech@:

- Fix whitespace in Makefile
- Remove empty lines in pkg-plist

While here:
- Trim the header per new bylaws
- Update COMMENT and port description

3 files changed, 17 insertions, 33 deletions

diff --git a/graphics/mahotas/Makefile b/graphics/mahotas/Makefile
index d253d34d61ac..b4dbbff38fb8 100644
--- a/graphics/mahotas/Makefile
+++ b/graphics/mahotas/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	py-mahotas
-# Date created:		2010-12-14
-# Whom:			Pedro Garcia Freitas <sawp@sawp.com.br>
-#
+# Created by: Pedro Garcia Freitas <sawp@sawp.com.br>
 # $FreeBSD$
-#
 
 PORTNAME=	mahotas
 PORTVERSION=	0.9.6
@@ -12,10 +8,10 @@ MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sawp@sawp.com.br
-COMMENT=	An Efficient Image Processing Library for Python
+COMMENT=	Computer vision and image processing library for Python
 
-BUILD_DEPENDS+=	${PYNUMPY}
-LIB_DEPENDS= freeimage:${PORTSDIR}/graphics/freeimage
+BUILD_DEPENDS=	${PYNUMPY}
+LIB_DEPENDS=	freeimage:${PORTSDIR}/graphics/freeimage
 
 USE_GCC=	4.6+
 USE_PYTHON=	2.5+
diff --git a/graphics/mahotas/pkg-descr b/graphics/mahotas/pkg-descr
index 1cc717026416..beccad8e1883 100644
--- a/graphics/mahotas/pkg-descr
+++ b/graphics/mahotas/pkg-descr
@@ -1,16 +1,17 @@
-Mahotas is an Image Processing Library for Python.
-It includes a couple of algorithms implemented in C++ for speed while
-operating in numpy arrays.
+Mahotas is a computer vision and image processing library for Python.  It
+includes many algorithms implemented in C++ for speed while operating in
+numpy arrays and with a very clean Python interface.
 
 Notable algorithms:
- - watershed.
- - thresholding.
- - convex points calculations.
- - hit & miss. thinning.
- - Zernike & Haralick features.
- - freeimage based numpy image loading (requires freeimage libraries
-to be installed).
- - Release the GIL in morphological functions
- - Convolution
+
+  - Watershed
+  - Convex points calculations
+  - Hit & miss thinning
+  - Zernike & Haralick, LBP, and TAS features
+  - Freeimage-based numpy image loading
+  - Speeded-Up Robust Features (SURF), a form of local features
+  - Thresholding
+  - Convolution
+  - Sobel edge detection
 
 WWW: http://packages.python.org/mahotas/
diff --git a/graphics/mahotas/pkg-plist b/graphics/mahotas/pkg-plist
index 8fc7deba7e62..9881f3ecd2a1 100644
--- a/graphics/mahotas/pkg-plist
+++ b/graphics/mahotas/pkg-plist
@@ -4,7 +4,6 @@
 %%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
@@ -16,8 +15,6 @@
 %%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
@@ -126,7 +123,6 @@
 %%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
@@ -167,14 +163,12 @@
 %%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
@@ -205,12 +199,10 @@
 %%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
@@ -223,14 +215,12 @@
 %%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
@@ -252,8 +242,6 @@
 %%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
@@ -353,7 +341,6 @@
 %%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
-
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/demos/data
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/demos
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mahotas/tests/data