Index: head/graphics/vigra/Makefile
===================================================================
--- head/graphics/vigra/Makefile	(revision 441330)
+++ head/graphics/vigra/Makefile	(revision 441331)
@@ -1,102 +1,71 @@
 # Created by: cartola (Carlos E. G. Carvalho)
 # $FreeBSD$
 
 PORTNAME=	vigra
 DISTVERSION=	1.11.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	graphics
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	VIGRA stands for "Vision with Generic Algorithms"
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
+LIB_DEPENDS=	libHalf.so:graphics/ilmbase \
+		libsz.so:science/szip
+
+USES=		cmake:outsource python:2,run shebangfix
+CMAKE_ARGS=	-DDEPENDENCY_SEARCH_PREFIX:PATH=${LOCALBASE} \
+		-DDOCINSTALL:PATH=${DOCSDIR_REL}
+
 USE_GITHUB=	yes
 GH_ACCOUNT=     ukoethe
 GH_TAGNAME=     e6c21f3
 
-USES=		cmake
-CMAKE_ARGS=	-DDEPENDENCY_SEARCH_PREFIX:PATH=${LOCALBASE} \
-		-DDOCINSTALL:PATH=${DOCSDIR_REL}
+SHEBANG_FILES=	config/vigra-config.in
 
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=		HDF5 OPENEXR NUMPY DOCS
+OPTIONS_DEFINE=		HDF5 OPENEXR NUMPY DOCS FFTW
 OPTIONS_DEFAULT=	HDF5 OPENEXR
-NUMPY_DESC=		NumPy mathematical computing (USE Fortran/GCC47+)
+OPTIONS_GROUP=		IMAGEFORMATS
+OPTIONS_GROUP_IMAGEFORMATS=	PNG JPEG TIFF
+OPTIONS_SUB=		yes
 
-.include <bsd.port.options.mk>
+HDF5_CMAKE_BOOL=	WITH_HDF5
+HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 
-.if ${PORT_OPTIONS:MHDF5}
-CMAKE_ARGS+=	-DWITH_HDF5=1
-LIB_DEPENDS+=	libhdf5.so:science/hdf5
-.else
-CMAKE_ARGS+=	-DWITH_HDF5=0
-.endif
+OPENEXR_CMAKE_BOOL=	WITH_OPENEXR
+OPENEXR_LIB_DEPENDS=	libIlmImf.so:graphics/OpenEXR
 
-.if ${PORT_OPTIONS:MOPENEXR}
-CMAKE_ARGS+=	-DWITH_OPENEXR=1
-LIB_DEPENDS+=	libIlmImf.so:graphics/OpenEXR
-.else
-CMAKE_ARGS+=	-DWITH_OPENEXR=0
-.endif
+NUMPY_DESC=		NumPy mathematical computing (USE Fortran/GCC47+)
+NUMPY_CMAKE_BOOL=	WITH_VIGRANUMPY
+NUMPY_USES=		compiler:gcc-c++11-lib python:2,build
+NUMPY_BUILD_DEPENDS=	nosetests:devel/py-nose \
+			f2py:math/py-numpy
+NUMPY_RUN_DEPENDS=	nosetests:devel/py-nose \
+			f2py:math/py-numpy
+NUMPY_LIB_DEPENDS=	libboost_python.so:devel/boost-python-libs
 
-.if ${PORT_OPTIONS:MNUMPY}
-# Should ignore Python3 since commit f51b0b5
-#CONFLICTS_BUILD=	python3*
-CMAKE_ARGS+=	-DWITH_VIGRANUMPY=1
-USES+=		compiler:gcc-c++11-lib python:2
-BUILD_DEPENDS+=	nosetests:devel/py-nose
-BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/numpy/core/numeric.py:math/py-numpy
-#BUILD_DEPENDS+=	sphinx-build:textproc/py-sphinx
-LIB_DEPENDS+=	libboost_python.so:devel/boost-python-libs
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-PLIST_SUB+=	PYTHON=""
-.else
-CMAKE_ARGS+=	-DWITH_VIGRANUMPY=0
-PLIST_SUB+=	PYTHON="@comment "
-.endif
+PNG_CMAKE_BOOL=		WITH_PNG
+PNG_LIB_DPEENDS=	libpng.so:graphics/png
 
-# Vigra's CMakeLists.txt does not support disabling those so we hook them
-# as dependencies here unconditionally (without OPTIONS=) even though if
-# they are not present then Vigra/CMake will do without them (they are not
-# mandatory).
-#
-# Notice that if you define e.g. WITHOUT_VIGRA_TIFF and graphics/tiff is
-# installed on your system, then the lib will be picked up by Vigra, the
-# dependency will not be recorded by the ports system and later deletion
-# of graphics/tiff will break Vigra. Only define WITHOUT_VIGRA_TIFF if you
-# do not have graphics/tiff installed and do not want TIFF support in Vigra.
+JPEG_CMAKE_BOOL=	WITH_JPEG
+JPEG_USES=		jpeg
 
-.if !defined(WITHOUT_VIGRA_TIFF)
-LIB_DEPENDS+=	libtiff.so:graphics/tiff
-.endif
+TIFF_CMAKE_BOOL=	WITH_TIFF
+TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 
-.if !defined(WITHOUT_VIGRA_JPEG)
-USES+=		jpeg
-.endif
+FFTW_CMAKE_BOOL=	WITH_FFTW
+FFTW_LIB_DEPENDS=	libfftw3.so:math/fftw3 \
+			libfftw3f.so:math/fftw3-float
 
-.if !defined(WITHOUT_VIGRA_PNG)
-LIB_DEPENDS+=	libpng.so:graphics/png
-.endif
-
-.if !defined(WITHOUT_VIGRA_FFTW)
-LIB_DEPENDS+=	libfftw3.so:math/fftw3
-LIB_DEPENDS+=	libfftw3f.so:math/fftw3-float
-.endif
-
-pre-everything::
-.if ${PORT_OPTIONS:MNUMPY}
+post-package-NUMPY-on:
 	@${ECHO} ""
 	@${ECHO} "* BEWARE!"
 	@${ECHO} "* Using py-NumPY implies Fortran and GCC 4.7+ as hard dependencies"
 	@${ECHO} "* and require all ports, depending on vigra, to set USE_GCC=yes"
 	@${ECHO} ""
-.endif
-
-post-patch:
-# FIXME: This is ugly
-	@${RM} ${WRKSRC}/include/vigra/*.orig
 
 .include <bsd.port.mk>
Index: head/graphics/vigra/files/patch-CMakeLists.txt
===================================================================
--- head/graphics/vigra/files/patch-CMakeLists.txt	(nonexistent)
+++ head/graphics/vigra/files/patch-CMakeLists.txt	(revision 441331)
@@ -0,0 +1,32 @@
+Add toggeles for the FreeBSD ports options.
+
+--- CMakeLists.txt.orig	2017-05-10 18:52:52 UTC
++++ CMakeLists.txt
+@@ -58,12 +58,27 @@ ENDIF ()
+ #
+ ##################################################
+
++# FreeBSD ports: add toggles for options
++option( WITH_PNG "Enable PNG support" ON )
++option( WITH_JPEG "Enable JPEG support" ON )
++option( WITH_TIFF "Enable TIFF support" ON )
++option( WITH_FFTW "Enable FFTW support" ON )
++
++
+ INCLUDE(VigraFindPackage)
++if (WITH_TIFF)
+ VIGRA_FIND_PACKAGE(TIFF NAMES libtiff)
++endif ()
++if (WITH_JPEG)
+ VIGRA_FIND_PACKAGE(JPEG NAMES libjpeg)
++endif ()
++if (WITH_PNG)
+ VIGRA_FIND_PACKAGE(PNG)
++endif ()
++if (WITH_FFTW)
+ VIGRA_FIND_PACKAGE(FFTW3 NAMES libfftw3-3 libfftw-3.3)
+ VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3f-3 libfftwf-3.3)
++endif ()
+
+ IF(WITH_OPENEXR)
+     VIGRA_FIND_PACKAGE(OpenEXR)

Property changes on: head/graphics/vigra/files/patch-CMakeLists.txt
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/graphics/vigra/pkg-plist
===================================================================
--- head/graphics/vigra/pkg-plist	(revision 441330)
+++ head/graphics/vigra/pkg-plist	(revision 441331)
@@ -1,201 +1,200 @@
 bin/vigra-config
 include/vigra/accessor.hxx
 include/vigra/accumulator-grammar.hxx
 include/vigra/accumulator.hxx
 include/vigra/affine_registration.hxx
 include/vigra/affinegeometry.hxx
 include/vigra/algorithm.hxx
 include/vigra/array_vector.hxx
 include/vigra/autodiff.hxx
 include/vigra/axistags.hxx
 include/vigra/basicgeometry.hxx
 include/vigra/basicimage.hxx
 include/vigra/basicimageview.hxx
 include/vigra/bessel.hxx
 include/vigra/bit_array.hxx
 include/vigra/bordertreatment.hxx
 include/vigra/boundarytensor.hxx
 include/vigra/box.hxx
 include/vigra/bucket_queue.hxx
 include/vigra/cellconfigurations.hxx
 include/vigra/cellimage.hxx
 include/vigra/clebsch-gordan.hxx
 include/vigra/codec.hxx
 include/vigra/colorconversions.hxx
 include/vigra/combineimages.hxx
 include/vigra/config.hxx
 include/vigra/configVersion.hxx
 include/vigra/contourcirculator.hxx
 include/vigra/convolution.hxx
 include/vigra/coordinate_iterator.hxx
 include/vigra/copyimage.hxx
 include/vigra/cornerdetection.hxx
 include/vigra/diff2d.hxx
 include/vigra/distancetransform.hxx
 include/vigra/edgedetection.hxx
 include/vigra/eigensystem.hxx
 include/vigra/error.hxx
 include/vigra/fftw.hxx
 include/vigra/fftw3.hxx
 include/vigra/fixedpoint.hxx
 include/vigra/flatmorphology.hxx
 include/vigra/functorexpression.hxx
 include/vigra/functortraits.hxx
 include/vigra/gaborfilter.hxx
 include/vigra/gaussians.hxx
 include/vigra/gradient_energy_tensor.hxx
 include/vigra/graphs.hxx
 include/vigra/hdf5impex.hxx
 include/vigra/histogram.hxx
 include/vigra/imagecontainer.hxx
 include/vigra/imageinfo.hxx
 include/vigra/imageiterator.hxx
 include/vigra/imageiteratoradapter.hxx
 include/vigra/impex.hxx
 include/vigra/impexalpha.hxx
 include/vigra/impexbase.hxx
 include/vigra/initimage.hxx
 include/vigra/inspectimage.hxx
 include/vigra/inspector_passes.hxx
 include/vigra/interpolating_accessor.hxx
 include/vigra/invariant_features3D.hxx
 include/vigra/iteratoradapter.hxx
 include/vigra/iteratortags.hxx
 include/vigra/iteratortraits.hxx
 include/vigra/labelimage.hxx
 include/vigra/labelvolume.hxx
 include/vigra/linear_algebra.hxx
 include/vigra/linear_solve.hxx
 include/vigra/localminmax.hxx
 include/vigra/mathutil.hxx
 include/vigra/matlab.hxx
 include/vigra/matlab_FLEXTYPE.hxx
 include/vigra/matrix.hxx
 include/vigra/memory.hxx
 include/vigra/meshgrid.hxx
 include/vigra/metaprogramming.hxx
 include/vigra/multi_array.hxx
 include/vigra/multi_convolution.hxx
 include/vigra/multi_distance.hxx
 include/vigra/multi_fft.hxx
 include/vigra/multi_gridgraph.hxx
 include/vigra/multi_impex.hxx
 include/vigra/multi_iterator.hxx
 include/vigra/multi_iterator_coupled.hxx
 include/vigra/multi_labeling.hxx
 include/vigra/multi_localminmax.hxx
 include/vigra/multi_math.hxx
 include/vigra/multi_morphology.hxx
 include/vigra/multi_opencl.hxx
 include/vigra/multi_pointoperators.hxx
 include/vigra/multi_resize.hxx
 include/vigra/multi_shape.hxx
 include/vigra/multi_tensorutilities.hxx
 include/vigra/multi_watersheds.hxx
 include/vigra/navigator.hxx
 include/vigra/noise_normalization.hxx
 include/vigra/nonlineardiffusion.hxx
 include/vigra/numerictraits.hxx
 include/vigra/numpy_array.hxx
 include/vigra/numpy_array_converters.hxx
 include/vigra/numpy_array_taggedshape.hxx
 include/vigra/numpy_array_traits.hxx
 include/vigra/orientedtensorfilters.hxx
 include/vigra/pixelneighborhood.hxx
 include/vigra/polygon.hxx
 include/vigra/polynomial.hxx
 include/vigra/project2ellipse.hxx
 include/vigra/promote_traits.hxx
 include/vigra/promote_traits.hxx.py
 include/vigra/python_utility.hxx
 include/vigra/quadprog.hxx
 include/vigra/quaternion.hxx
 include/vigra/random.hxx
 include/vigra/random_forest.hxx
 include/vigra/random_forest/features.hxx
 include/vigra/random_forest/rf_algorithm.hxx
 include/vigra/random_forest/rf_common.hxx
 include/vigra/random_forest/rf_decisionTree.hxx
 include/vigra/random_forest/rf_earlystopping.hxx
 include/vigra/random_forest/rf_nodeproxy.hxx
 include/vigra/random_forest/rf_online_prediction_set.hxx
 include/vigra/random_forest/rf_preprocessing.hxx
 include/vigra/random_forest/rf_region.hxx
 include/vigra/random_forest/rf_ridge_split.hxx
 include/vigra/random_forest/rf_split.hxx
 include/vigra/random_forest/rf_visitors.hxx
 include/vigra/random_forest/splices.hxx
 include/vigra/random_forest_deprec.hxx
 include/vigra/random_forest_hdf5_impex.hxx
 include/vigra/rational.hxx
 include/vigra/recursiveconvolution.hxx
 include/vigra/regression.hxx
 include/vigra/resampling_convolution.hxx
 include/vigra/resizeimage.hxx
 include/vigra/rfftw.hxx
 include/vigra/rgbvalue.hxx
 include/vigra/sampling.hxx
 include/vigra/seededregiongrowing.hxx
 include/vigra/seededregiongrowing3d.hxx
 include/vigra/separableconvolution.hxx
 include/vigra/sifImport.hxx
 include/vigra/singular_value_decomposition.hxx
 include/vigra/sized_int.hxx
 include/vigra/slanted_edge_mtf.hxx
 include/vigra/slic.hxx
 include/vigra/splineimageview.hxx
 include/vigra/splines.hxx
 include/vigra/static_assert.hxx
 include/vigra/stdconvolution.hxx
 include/vigra/stdimage.hxx
 include/vigra/stdimagefunctions.hxx
 include/vigra/symmetry.hxx
 include/vigra/tensorutilities.hxx
 include/vigra/tiff.hxx
 include/vigra/timing.hxx
 include/vigra/tinyvector.hxx
 include/vigra/transformimage.hxx
 include/vigra/tuple.hxx
 include/vigra/tv_filter.hxx
 include/vigra/type_lists.hxx
 include/vigra/union_find.hxx
 include/vigra/unittest.hxx
 include/vigra/unsupervised_decomposition.hxx
 include/vigra/utilities.hxx
 include/vigra/voxelneighborhood.hxx
 include/vigra/watersheds.hxx
 include/vigra/watersheds3d.hxx
 include/vigra/wigner-matrix.hxx
 include/vigra/windows.h
 lib/libvigraimpex.so
 lib/libvigraimpex.so.5
 lib/libvigraimpex.so.5.1.10.0
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/__init__.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/__version__.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/analysis.so
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/arraytypes.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/colors.so
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/filters.so
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/fourier.so
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/geometry.so
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/impex.so
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/learning.so
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/noise.so
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/optimization.so
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/pyqt/__init__.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/pyqt/imagewindow.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/pyqt/overlays.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/pyqt/quickdialog.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/pyqt/viewer2svg.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/sampling.so
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/tagged_array.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/ufunc.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/vigranumpycore.so
 lib/vigra/VigraConfig.cmake
 lib/vigra/VigraConfigVersion.cmake
 lib/vigra/vigra-targets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/vigra/vigra-targets.cmake
-%%PYTHON%%lib/vigranumpy/VigranumpyConfig.cmake
 %%PORTDOCS%%%%DOCSDIR%%/vigra/index.html
 %%PORTDOCS%%%%DOCSDIR%%/vigra/vigra-icon.ico
 %%PORTDOCS%%%%DOCSDIR%%/vigra/vigra.css
+%%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/__init__.py
+%%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/__version__.py
+%%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/analysis.so
+%%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/arraytypes.py
+%%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/colors.so
+%%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/filters.so
+%%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/geometry.so
+%%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/impex.so
+%%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/learning.so
+%%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/noise.so
+%%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/optimization.so
+%%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/pyqt/__init__.py
+%%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/pyqt/imagewindow.py
+%%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/pyqt/overlays.py
+%%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/pyqt/quickdialog.py
+%%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/pyqt/viewer2svg.py
+%%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/sampling.so
+%%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/tagged_array.py
+%%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/ufunc.py
+%%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/vigranumpycore.so
+%%NUMPY%%lib/vigranumpy/VigranumpyConfig.cmake