summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
Diffstat (limited to 'graphics')
-rw-r--r--graphics/vigra/Makefile9
-rw-r--r--graphics/vigra/PLIST144
-rw-r--r--graphics/vigra/buildlink3.mk6
-rw-r--r--graphics/vigra/distinfo10
-rw-r--r--graphics/vigra/patches/patch-include-vigra-mathutil.hxx8
5 files changed, 155 insertions, 22 deletions
diff --git a/graphics/vigra/Makefile b/graphics/vigra/Makefile
index 97751246375..c998d334bb4 100644
--- a/graphics/vigra/Makefile
+++ b/graphics/vigra/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2014/04/10 06:21:29 obache Exp $
+# $NetBSD: Makefile,v 1.26 2014/05/18 11:31:09 adam Exp $
-DISTNAME= vigra-1.9.0-src
-PKGNAME= ${DISTNAME:S/-src//}
-PKGREVISION= 4
+DISTNAME= vigra-1.10.0-src-with-docu
+PKGNAME= vigra-1.10.0
CATEGORIES= graphics
-MASTER_SITES= http://hci.iwr.uni-heidelberg.de/vigra/
+MASTER_SITES= https://github.com/ukoethe/vigra/releases/download/Version-1-10-0/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://hci.iwr.uni-heidelberg.de/vigra/
diff --git a/graphics/vigra/PLIST b/graphics/vigra/PLIST
index 0f220b3ac18..9319fa864eb 100644
--- a/graphics/vigra/PLIST
+++ b/graphics/vigra/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2012/12/09 00:05:09 adam Exp $
+@comment $NetBSD: PLIST,v 1.7 2014/05/18 11:31:09 adam Exp $
bin/vigra-config
include/vigra/accessor.hxx
include/vigra/accumulator-grammar.hxx
@@ -7,6 +7,7 @@ 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
@@ -44,6 +45,7 @@ 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
@@ -77,16 +79,20 @@ 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
@@ -137,6 +143,7 @@ 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
@@ -153,6 +160,7 @@ 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
@@ -161,8 +169,8 @@ include/vigra/watersheds3d.hxx
include/vigra/wigner-matrix.hxx
include/vigra/windows.h
lib/libvigraimpex.so
-lib/libvigraimpex.so.4
-lib/libvigraimpex.so.4.190
+lib/libvigraimpex.so.5
+lib/libvigraimpex.so.5.1.10.0
lib/vigra/VigraConfig.cmake
lib/vigra/VigraConfigVersion.cmake
lib/vigra/vigra-targets-release.cmake
@@ -175,34 +183,41 @@ share/doc/vigra/Convolution.html
share/doc/vigra/CrackEdgeImage.html
share/doc/vigra/CreditsChangelog.html
share/doc/vigra/ErrorReporting.html
-share/doc/vigra/Examples.html
+share/doc/vigra/ExampleList.html
share/doc/vigra/FFTWComplexTraits.html
share/doc/vigra/FixedPoint16Traits.html
share/doc/vigra/FixedPointTraits.html
share/doc/vigra/FunctorExpressions.html
share/doc/vigra/ImageAnalysis.html
share/doc/vigra/ImageDataStructures.html
+share/doc/vigra/ImageInputOutputTutorial.html
share/doc/vigra/ImageProcessing.html
+share/doc/vigra/ImageProcessingTutorial.html
share/doc/vigra/ImportExport.html
share/doc/vigra/Installation.html
share/doc/vigra/KernelArgumentObjectFactories.html
share/doc/vigra/LICENSE.txt
share/doc/vigra/MathConstants.html
share/doc/vigra/MathFunctionality.html
+share/doc/vigra/MultiArrayArithmeticTutorial.html
+share/doc/vigra/MultiDimensionalArrayTutorial.html
share/doc/vigra/MultiDimensionalArrays.html
share/doc/vigra/MultiIteratorPage.html
share/doc/vigra/NormTraits.html
share/doc/vigra/NumericPromotionTraits.html
share/doc/vigra/NumericTraits.html
+share/doc/vigra/OwnFunctionsTutorial.html
share/doc/vigra/PixelTypes.html
share/doc/vigra/PointOperators.html
share/doc/vigra/PromoteTraits.html
+share/doc/vigra/PythonBindingsTutorial.html
share/doc/vigra/RGBValueTraits.html
share/doc/vigra/RationalTraits.html
share/doc/vigra/SquareRootTraits.html
share/doc/vigra/TimingMacros.html
share/doc/vigra/TinyVectorTraits.html
share/doc/vigra/TupleTypes.html
+share/doc/vigra/Tutorial.html
share/doc/vigra/Utilities.html
share/doc/vigra/VigraMatlab.html
share/doc/vigra/accessor_8hxx_source.html
@@ -213,11 +228,13 @@ share/doc/vigra/affinegeometry_8hxx_source.html
share/doc/vigra/algorithm_8hxx_source.html
share/doc/vigra/annotated.html
share/doc/vigra/array__vector_8hxx_source.html
+share/doc/vigra/autodiff_8hxx_source.html
share/doc/vigra/axistags_8hxx_source.html
share/doc/vigra/basicgeometry_8hxx_source.html
share/doc/vigra/basicimage_8hxx_source.html
share/doc/vigra/basicimageview_8hxx_source.html
share/doc/vigra/bc_s.png
+share/doc/vigra/bdwn.png
share/doc/vigra/bessel_8hxx_source.html
share/doc/vigra/bit__array_8hxx_source.html
share/doc/vigra/bordertreatment_8hxx_source.html
@@ -292,6 +309,7 @@ share/doc/vigra/classvigra_1_1CoupledHandle-members.html
share/doc/vigra/classvigra_1_1CoupledHandle.html
share/doc/vigra/classvigra_1_1CoupledScanOrderIterator-members.html
share/doc/vigra/classvigra_1_1CoupledScanOrderIterator.html
+share/doc/vigra/classvigra_1_1CoupledScanOrderIterator.png
share/doc/vigra/classvigra_1_1CrackContourCirculator-members.html
share/doc/vigra/classvigra_1_1CrackContourCirculator.html
share/doc/vigra/classvigra_1_1DT__StackEntry-members.html
@@ -309,6 +327,7 @@ share/doc/vigra/classvigra_1_1Edgel-members.html
share/doc/vigra/classvigra_1_1Edgel.html
share/doc/vigra/classvigra_1_1EightNeighborhood_1_1NeighborCode-members.html
share/doc/vigra/classvigra_1_1EightNeighborhood_1_1NeighborCode.html
+share/doc/vigra/classvigra_1_1EightNeighborhood_1_1NeighborCode.png
share/doc/vigra/classvigra_1_1EntropyCriterion-members.html
share/doc/vigra/classvigra_1_1EntropyCriterion.html
share/doc/vigra/classvigra_1_1FFTWComplex-members.html
@@ -364,6 +383,23 @@ share/doc/vigra/classvigra_1_1GrayToRGBAccessor-members.html
share/doc/vigra/classvigra_1_1GrayToRGBAccessor.html
share/doc/vigra/classvigra_1_1GreenAccessor-members.html
share/doc/vigra/classvigra_1_1GreenAccessor.html
+share/doc/vigra/classvigra_1_1GridGraph-members.html
+share/doc/vigra/classvigra_1_1GridGraph.html
+share/doc/vigra/classvigra_1_1GridGraph_1_1ArcMap-members.html
+share/doc/vigra/classvigra_1_1GridGraph_1_1ArcMap.html
+share/doc/vigra/classvigra_1_1GridGraph_1_1ArcMap.png
+share/doc/vigra/classvigra_1_1GridGraph_1_1EdgeMap-members.html
+share/doc/vigra/classvigra_1_1GridGraph_1_1EdgeMap.html
+share/doc/vigra/classvigra_1_1GridGraph_1_1EdgeMap.png
+share/doc/vigra/classvigra_1_1GridGraph_1_1InDegMap-members.html
+share/doc/vigra/classvigra_1_1GridGraph_1_1InDegMap.html
+share/doc/vigra/classvigra_1_1GridGraph_1_1IndexMap-members.html
+share/doc/vigra/classvigra_1_1GridGraph_1_1IndexMap.html
+share/doc/vigra/classvigra_1_1GridGraph_1_1NodeMap-members.html
+share/doc/vigra/classvigra_1_1GridGraph_1_1NodeMap.html
+share/doc/vigra/classvigra_1_1GridGraph_1_1NodeMap.png
+share/doc/vigra/classvigra_1_1GridGraph_1_1OutDegMap-members.html
+share/doc/vigra/classvigra_1_1GridGraph_1_1OutDegMap.html
share/doc/vigra/classvigra_1_1HDF5File-members.html
share/doc/vigra/classvigra_1_1HDF5File.html
share/doc/vigra/classvigra_1_1HDF5Handle-members.html
@@ -424,6 +460,10 @@ share/doc/vigra/classvigra_1_1MultiArrayShape-members.html
share/doc/vigra/classvigra_1_1MultiArrayShape.html
share/doc/vigra/classvigra_1_1MultiArrayView-members.html
share/doc/vigra/classvigra_1_1MultiArrayView.html
+share/doc/vigra/classvigra_1_1MultiArrayView.png
+share/doc/vigra/classvigra_1_1MultiCoordinateIterator-members.html
+share/doc/vigra/classvigra_1_1MultiCoordinateIterator.html
+share/doc/vigra/classvigra_1_1MultiCoordinateIterator.png
share/doc/vigra/classvigra_1_1MultiCoordinateNavigator-members.html
share/doc/vigra/classvigra_1_1MultiCoordinateNavigator.html
share/doc/vigra/classvigra_1_1MultiImageAccessor2-members.html
@@ -447,6 +487,8 @@ share/doc/vigra/classvigra_1_1Node_3_01e__ConstProbNode_01_4.html
share/doc/vigra/classvigra_1_1Node_3_01e__ConstProbNode_01_4.png
share/doc/vigra/classvigra_1_1NoiseNormalizationOptions-members.html
share/doc/vigra/classvigra_1_1NoiseNormalizationOptions.html
+share/doc/vigra/classvigra_1_1NonlinearLSQOptions-members.html
+share/doc/vigra/classvigra_1_1NonlinearLSQOptions.html
share/doc/vigra/classvigra_1_1NormalRandomFunctor-members.html
share/doc/vigra/classvigra_1_1NormalRandomFunctor.html
share/doc/vigra/classvigra_1_1NumpyAnyArray-members.html
@@ -470,6 +512,7 @@ share/doc/vigra/classvigra_1_1PriorityQueue-members.html
share/doc/vigra/classvigra_1_1PriorityQueue.html
share/doc/vigra/classvigra_1_1ProblemSpec-members.html
share/doc/vigra/classvigra_1_1ProblemSpec.html
+share/doc/vigra/classvigra_1_1Processor.html
share/doc/vigra/classvigra_1_1Processor_3_01ClassificationTag_00_01LabelType_00_01T1_00_01C1_00_01T2_00_01C2_01_4-members.html
share/doc/vigra/classvigra_1_1Processor_3_01ClassificationTag_00_01LabelType_00_01T1_00_01C1_00_01T2_00_01C2_01_4.html
share/doc/vigra/classvigra_1_1Processor_3_01RegressionTag_00_01LabelType_00_01T1_00_01C1_00_01T2_00_01C2_01_4-members.html
@@ -603,6 +646,7 @@ share/doc/vigra/classvigra_1_1StridedMultiIterator-members.html
share/doc/vigra/classvigra_1_1StridedMultiIterator.html
share/doc/vigra/classvigra_1_1StridedScanOrderIterator-members.html
share/doc/vigra/classvigra_1_1StridedScanOrderIterator.html
+share/doc/vigra/classvigra_1_1StridedScanOrderIterator.png
share/doc/vigra/classvigra_1_1Threshold-members.html
share/doc/vigra/classvigra_1_1Threshold.html
share/doc/vigra/classvigra_1_1ThresholdSplit-members.html
@@ -671,6 +715,7 @@ share/doc/vigra/classvigra_1_1acc_1_1AutoRangeHistogram-members.html
share/doc/vigra/classvigra_1_1acc_1_1AutoRangeHistogram.html
share/doc/vigra/classvigra_1_1acc_1_1Central-members.html
share/doc/vigra/classvigra_1_1acc_1_1Central.html
+share/doc/vigra/classvigra_1_1acc_1_1CentralMoment.html
share/doc/vigra/classvigra_1_1acc_1_1Central_3_01PowerSum_3_012_01_4_01_4-members.html
share/doc/vigra/classvigra_1_1acc_1_1Central_3_01PowerSum_3_012_01_4_01_4.html
share/doc/vigra/classvigra_1_1acc_1_1Central_3_01PowerSum_3_013_01_4_01_4-members.html
@@ -709,6 +754,7 @@ share/doc/vigra/classvigra_1_1acc_1_1Maximum-members.html
share/doc/vigra/classvigra_1_1acc_1_1Maximum.html
share/doc/vigra/classvigra_1_1acc_1_1Minimum-members.html
share/doc/vigra/classvigra_1_1acc_1_1Minimum.html
+share/doc/vigra/classvigra_1_1acc_1_1Moment.html
share/doc/vigra/classvigra_1_1acc_1_1PowerSum-members.html
share/doc/vigra/classvigra_1_1acc_1_1PowerSum.html
share/doc/vigra/classvigra_1_1acc_1_1Principal-members.html
@@ -737,6 +783,8 @@ share/doc/vigra/classvigra_1_1acc_1_1WeightArg-members.html
share/doc/vigra/classvigra_1_1acc_1_1WeightArg.html
share/doc/vigra/classvigra_1_1acc_1_1Weighted-members.html
share/doc/vigra/classvigra_1_1acc_1_1Weighted.html
+share/doc/vigra/classvigra_1_1autodiff_1_1DualVector-members.html
+share/doc/vigra/classvigra_1_1autodiff_1_1DualVector.html
share/doc/vigra/classvigra_1_1linalg_1_1LeastAngleRegressionOptions-members.html
share/doc/vigra/classvigra_1_1linalg_1_1LeastAngleRegressionOptions.html
share/doc/vigra/classvigra_1_1linalg_1_1Matrix-members.html
@@ -801,6 +849,7 @@ share/doc/vigra/closed.png
share/doc/vigra/codec_8hxx_source.html
share/doc/vigra/colorconversions_8hxx_source.html
share/doc/vigra/combineimages_8hxx_source.html
+share/doc/vigra/composite_8cxx-example.html
share/doc/vigra/configVersion_8hxx_source.html
share/doc/vigra/config_8hxx_source.html
share/doc/vigra/contourcirculator_8hxx_source.html
@@ -811,6 +860,11 @@ share/doc/vigra/copyimage_8hxx_source.html
share/doc/vigra/cornerdetection_8hxx_source.html
share/doc/vigra/deprecated.html
share/doc/vigra/diff2d_8hxx_source.html
+share/doc/vigra/dir_17d27c17175b7dd6993b33ff5a032f17.html
+share/doc/vigra/dir_250558fd2cbacd247a45c0a39807db85.html
+share/doc/vigra/dir_90c0918c15c561075bf15d939f2f27f9.html
+share/doc/vigra/dissolve_8cxx-example.html
+share/doc/vigra/dissolved_color.gif
share/doc/vigra/distancetransform_8hxx_source.html
share/doc/vigra/documents/DataAccessors.ps
share/doc/vigra/documents/FunctorFactory.ps
@@ -822,6 +876,7 @@ share/doc/vigra/documents/tutorial_reference.pdf
share/doc/vigra/documents/viff.ps
share/doc/vigra/documents/vigra.gif
share/doc/vigra/doxygen.png
+share/doc/vigra/dynsections.js
share/doc/vigra/edge_8cxx-example.html
share/doc/vigra/edgedetection_8hxx_source.html
share/doc/vigra/eigensystem_8hxx_source.html
@@ -863,7 +918,20 @@ share/doc/vigra/form_122.png
share/doc/vigra/form_123.png
share/doc/vigra/form_124.png
share/doc/vigra/form_125.png
+share/doc/vigra/form_126.png
+share/doc/vigra/form_127.png
+share/doc/vigra/form_128.png
+share/doc/vigra/form_129.png
share/doc/vigra/form_13.png
+share/doc/vigra/form_130.png
+share/doc/vigra/form_131.png
+share/doc/vigra/form_132.png
+share/doc/vigra/form_133.png
+share/doc/vigra/form_134.png
+share/doc/vigra/form_135.png
+share/doc/vigra/form_136.png
+share/doc/vigra/form_137.png
+share/doc/vigra/form_138.png
share/doc/vigra/form_14.png
share/doc/vigra/form_15.png
share/doc/vigra/form_16.png
@@ -959,6 +1027,22 @@ share/doc/vigra/form_97.png
share/doc/vigra/form_98.png
share/doc/vigra/form_99.png
share/doc/vigra/formula.repository
+share/doc/vigra/ftv2blank.png
+share/doc/vigra/ftv2cl.png
+share/doc/vigra/ftv2doc.png
+share/doc/vigra/ftv2folderclosed.png
+share/doc/vigra/ftv2folderopen.png
+share/doc/vigra/ftv2lastnode.png
+share/doc/vigra/ftv2link.png
+share/doc/vigra/ftv2mlastnode.png
+share/doc/vigra/ftv2mnode.png
+share/doc/vigra/ftv2mo.png
+share/doc/vigra/ftv2node.png
+share/doc/vigra/ftv2ns.png
+share/doc/vigra/ftv2plastnode.png
+share/doc/vigra/ftv2pnode.png
+share/doc/vigra/ftv2splitbar.png
+share/doc/vigra/ftv2vertline.png
share/doc/vigra/functionindex.html
share/doc/vigra/functions.html
share/doc/vigra/functions_0x62.html
@@ -1019,11 +1103,14 @@ share/doc/vigra/functions_type_0x63.html
share/doc/vigra/functions_type_0x64.html
share/doc/vigra/functions_type_0x65.html
share/doc/vigra/functions_type_0x66.html
+share/doc/vigra/functions_type_0x67.html
share/doc/vigra/functions_type_0x68.html
share/doc/vigra/functions_type_0x69.html
+share/doc/vigra/functions_type_0x6b.html
share/doc/vigra/functions_type_0x6c.html
share/doc/vigra/functions_type_0x6d.html
share/doc/vigra/functions_type_0x6e.html
+share/doc/vigra/functions_type_0x6f.html
share/doc/vigra/functions_type_0x70.html
share/doc/vigra/functions_type_0x72.html
share/doc/vigra/functions_type_0x73.html
@@ -1037,6 +1124,8 @@ share/doc/vigra/gaussians_8hxx_source.html
share/doc/vigra/globals.html
share/doc/vigra/globals_defs.html
share/doc/vigra/gradient__energy__tensor_8hxx_source.html
+share/doc/vigra/graphs_8hxx_source.html
+share/doc/vigra/group__BoostGraphExtensions.html
share/doc/vigra/group__ColorConversions.html
share/doc/vigra/group__CombineAlgo.html
share/doc/vigra/group__CombineFunctor.html
@@ -1056,6 +1145,7 @@ share/doc/vigra/group__FourierTransform.html
share/doc/vigra/group__Functors.html
share/doc/vigra/group__GaborFilter.html
share/doc/vigra/group__GeometricTransformations.html
+share/doc/vigra/group__GraphDataStructures.html
share/doc/vigra/group__ImageContainers.html
share/doc/vigra/group__ImageIteratorAdapters.html
share/doc/vigra/group__ImageIterators.html
@@ -1097,7 +1187,6 @@ share/doc/vigra/group__ResamplingConvolutionFilters.html
share/doc/vigra/group__SeededRegionGrowing.html
share/doc/vigra/group__SeparableConvolution.html
share/doc/vigra/group__SlantedEdgeMTF.html
-share/doc/vigra/group__StandardConvolution.html
share/doc/vigra/group__StandardImageTypes.html
share/doc/vigra/group__SymmetryDetection.html
share/doc/vigra/group__TIFFImpex.html
@@ -1114,6 +1203,9 @@ share/doc/vigra/group__VoxelNeighborhood.html
share/doc/vigra/hdf5impex_8hxx_source.html
share/doc/vigra/hierarchy.html
share/doc/vigra/histogram_8hxx_source.html
+share/doc/vigra/imageExportInfo_tutorial_8cxx-example.html
+share/doc/vigra/imageIO_tutorial_8cxx-example.html
+share/doc/vigra/imageImportInfo_tutorial_8cxx-example.html
share/doc/vigra/imagecontainer_8hxx_source.html
share/doc/vigra/imageinfo_8hxx_source.html
share/doc/vigra/imageiterator_8hxx_source.html
@@ -1130,11 +1222,26 @@ share/doc/vigra/interpolating__accessor_8hxx_source.html
share/doc/vigra/invariant__features3D_8hxx_source.html
share/doc/vigra/invert_8cxx-example.html
share/doc/vigra/invert_explicitly_8cxx-example.html
+share/doc/vigra/invert_tutorial_8cxx-example.html
share/doc/vigra/iteratoradapter_8hxx_source.html
share/doc/vigra/iteratortags_8hxx_source.html
share/doc/vigra/iteratortraits_8hxx_source.html
+share/doc/vigra/jquery.js
share/doc/vigra/labelimage_8hxx_source.html
share/doc/vigra/labelvolume_8hxx_source.html
+share/doc/vigra/lenna_color.gif
+share/doc/vigra/lenna_color_small.gif
+share/doc/vigra/lenna_composite_color.gif
+share/doc/vigra/lenna_gray.gif
+share/doc/vigra/lenna_inverted.gif
+share/doc/vigra/lenna_mirror_horizontal.gif
+share/doc/vigra/lenna_mirror_vertical.gif
+share/doc/vigra/lenna_small.gif
+share/doc/vigra/lenna_smoothed.gif
+share/doc/vigra/lenna_stripes.gif
+share/doc/vigra/lenna_sub.gif
+share/doc/vigra/lenna_transposed_major.gif
+share/doc/vigra/lenna_transposed_minor.gif
share/doc/vigra/linear__algebra_8hxx_source.html
share/doc/vigra/linear__solve_8hxx_source.html
share/doc/vigra/localminmax_8hxx_source.html
@@ -1145,21 +1252,27 @@ share/doc/vigra/matrix_8hxx_source.html
share/doc/vigra/memory_8hxx_source.html
share/doc/vigra/meshgrid_8hxx_source.html
share/doc/vigra/metaprogramming_8hxx_source.html
+share/doc/vigra/mirror_tutorial_8cxx-example.html
share/doc/vigra/modules.html
share/doc/vigra/multi__array_8hxx_source.html
share/doc/vigra/multi__convolution_8hxx_source.html
share/doc/vigra/multi__distance_8hxx_source.html
share/doc/vigra/multi__fft_8hxx_source.html
+share/doc/vigra/multi__gridgraph_8hxx_source.html
share/doc/vigra/multi__impex_8hxx_source.html
share/doc/vigra/multi__iterator_8hxx_source.html
share/doc/vigra/multi__iterator__coupled_8hxx_source.html
+share/doc/vigra/multi__labeling_8hxx_source.html
share/doc/vigra/multi__localminmax_8hxx_source.html
share/doc/vigra/multi__math_8hxx_source.html
share/doc/vigra/multi__morphology_8hxx_source.html
share/doc/vigra/multi__opencl_8hxx_source.html
share/doc/vigra/multi__pointoperators_8hxx_source.html
share/doc/vigra/multi__resize_8hxx_source.html
+share/doc/vigra/multi__shape_8hxx_source.html
share/doc/vigra/multi__tensorutilities_8hxx_source.html
+share/doc/vigra/multi__watersheds_8hxx_source.html
+share/doc/vigra/namespaceboost.html
share/doc/vigra/namespacemembers.html
share/doc/vigra/namespacemembers_enum.html
share/doc/vigra/namespacemembers_eval.html
@@ -1179,6 +1292,7 @@ share/doc/vigra/namespacevigra_1_1rf_1_1algorithms.html
share/doc/vigra/namespacevigra_1_1rf_1_1split.html
share/doc/vigra/namespacevigra_1_1rf_1_1visitors.html
share/doc/vigra/nav_f.png
+share/doc/vigra/nav_g.png
share/doc/vigra/nav_h.png
share/doc/vigra/navigator_8hxx_source.html
share/doc/vigra/noise__normalization_8hxx_source.html
@@ -1188,6 +1302,7 @@ share/doc/vigra/numpy__array_8hxx_source.html
share/doc/vigra/numpy__array__converters_8hxx_source.html
share/doc/vigra/numpy__array__taggedshape_8hxx_source.html
share/doc/vigra/numpy__array__traits_8hxx_source.html
+share/doc/vigra/oi_small.jpg
share/doc/vigra/open.png
share/doc/vigra/orientedtensorfilters_8hxx_source.html
share/doc/vigra/pages.html
@@ -1233,7 +1348,10 @@ share/doc/vigra/sifImport_8hxx_source.html
share/doc/vigra/singular__value__decomposition_8hxx_source.html
share/doc/vigra/sized__int_8hxx_source.html
share/doc/vigra/slanted__edge__mtf_8hxx_source.html
+share/doc/vigra/slic_8hxx_source.html
share/doc/vigra/smooth_8cxx-example.html
+share/doc/vigra/smooth_convolve_8cxx-example.html
+share/doc/vigra/smooth_explicitly_8cxx-example.html
share/doc/vigra/splices_8hxx_source.html
share/doc/vigra/splineimageview_8hxx_source.html
share/doc/vigra/splines_8hxx_source.html
@@ -1241,12 +1359,19 @@ share/doc/vigra/static__assert_8hxx_source.html
share/doc/vigra/stdconvolution_8hxx_source.html
share/doc/vigra/stdimage_8hxx_source.html
share/doc/vigra/stdimagefunctions_8hxx_source.html
+share/doc/vigra/structvigra_1_1CoupledArrays-members.html
+share/doc/vigra/structvigra_1_1CoupledArrays.html
+share/doc/vigra/structvigra_1_1CoupledArrays.png
share/doc/vigra/structvigra_1_1CoupledIteratorType-members.html
share/doc/vigra/structvigra_1_1CoupledIteratorType.html
+share/doc/vigra/structvigra_1_1CoupledIteratorType.png
+share/doc/vigra/structvigra_1_1GridGraph_1_1traversal__category.html
share/doc/vigra/structvigra_1_1IteratorTraits-members.html
share/doc/vigra/structvigra_1_1IteratorTraits.html
share/doc/vigra/structvigra_1_1MeshGridAccessor-members.html
share/doc/vigra/structvigra_1_1MeshGridAccessor.html
+share/doc/vigra/structvigra_1_1SlicOptions-members.html
+share/doc/vigra/structvigra_1_1SlicOptions.html
share/doc/vigra/structvigra_1_1StridedArrayTag.html
share/doc/vigra/structvigra_1_1UnstridedArrayTag.html
share/doc/vigra/structvigra_1_1acc_1_1Select-members.html
@@ -1254,13 +1379,18 @@ share/doc/vigra/structvigra_1_1acc_1_1Select.html
share/doc/vigra/structvigra_1_1rf_1_1algorithms_1_1HC__Entry-members.html
share/doc/vigra/structvigra_1_1rf_1_1algorithms_1_1HC__Entry.html
share/doc/vigra/subimage_8cxx-example.html
+share/doc/vigra/subimage_tutorial_8cxx-example.html
share/doc/vigra/symmetry_8hxx_source.html
+share/doc/vigra/sync_off.png
+share/doc/vigra/sync_on.png
share/doc/vigra/tab_a.png
share/doc/vigra/tab_b.png
share/doc/vigra/tab_h.png
share/doc/vigra/tab_s.png
share/doc/vigra/tabs.css
share/doc/vigra/tensorutilities_8hxx_source.html
+share/doc/vigra/testimage.gif
+share/doc/vigra/testimage.jpg
share/doc/vigra/tiff_8hxx_source.html
share/doc/vigra/timing_8hxx.html
share/doc/vigra/timing_8hxx_source.html
@@ -1268,14 +1398,18 @@ share/doc/vigra/tinyvector_8hxx_source.html
share/doc/vigra/todo.html
share/doc/vigra/total_variation_8cxx-example.html
share/doc/vigra/transformimage_8hxx_source.html
+share/doc/vigra/transpose_8cxx-example.html
+share/doc/vigra/transpose_image_tutorial_8cxx-example.html
share/doc/vigra/tuple_8hxx_source.html
share/doc/vigra/tv__filter_8hxx_source.html
share/doc/vigra/type__lists_8hxx_source.html
share/doc/vigra/union__find_8hxx_source.html
+share/doc/vigra/unittest_8hxx_source.html
share/doc/vigra/unsupervised__decomposition_8hxx_source.html
share/doc/vigra/utilities_8hxx_source.html
share/doc/vigra/vigra-icon.ico
share/doc/vigra/vigra.css
+share/doc/vigra/vigra_1_8_2.css
share/doc/vigra/voronoi_8cxx-example.html
share/doc/vigra/voxelneighborhood_8hxx_source.html
share/doc/vigra/watershed_8cxx-example.html
diff --git a/graphics/vigra/buildlink3.mk b/graphics/vigra/buildlink3.mk
index 74ce893c85c..a27b53db5b8 100644
--- a/graphics/vigra/buildlink3.mk
+++ b/graphics/vigra/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.8 2013/02/16 11:18:11 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2014/05/18 11:31:09 adam Exp $
BUILDLINK_TREE+= vigra
.if !defined(VIGRA_BUILDLINK3_MK)
VIGRA_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.vigra+= vigra>=1.7.0
-BUILDLINK_ABI_DEPENDS.vigra+= vigra>=1.9.0nb2
+BUILDLINK_API_DEPENDS.vigra+= vigra>=1.10.0
+BUILDLINK_ABI_DEPENDS.vigra+= vigra>=1.10.0
BUILDLINK_PKGSRCDIR.vigra?= ../../graphics/vigra
.include "../../devel/zlib/buildlink3.mk"
diff --git a/graphics/vigra/distinfo b/graphics/vigra/distinfo
index b00cc78c6f0..6177af8a50b 100644
--- a/graphics/vigra/distinfo
+++ b/graphics/vigra/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2012/12/09 00:05:09 adam Exp $
+$NetBSD: distinfo,v 1.11 2014/05/18 11:31:09 adam Exp $
-SHA1 (vigra-1.9.0-src.tar.gz) = 6e4981f4ce75932ec62df6523f577c327f885ba0
-RMD160 (vigra-1.9.0-src.tar.gz) = 84e3f1bc985df1ea928e9aa5adc6e0c153cbdd40
-Size (vigra-1.9.0-src.tar.gz) = 30813416 bytes
-SHA1 (patch-include-vigra-mathutil.hxx) = ccbf0061582f09493169f686d504e4c5a5b1924d
+SHA1 (vigra-1.10.0-src-with-docu.tar.gz) = 0a882bc09f5a6ec1f8381ff571020259eb88ee67
+RMD160 (vigra-1.10.0-src-with-docu.tar.gz) = 16c0468ea65b391fcc6299f9ae679124e688baaf
+Size (vigra-1.10.0-src-with-docu.tar.gz) = 36122311 bytes
+SHA1 (patch-include-vigra-mathutil.hxx) = 45a3e37c24d28a5a5ff9f70281f93c9e0e77348d
diff --git a/graphics/vigra/patches/patch-include-vigra-mathutil.hxx b/graphics/vigra/patches/patch-include-vigra-mathutil.hxx
index 2ef1fe24c2f..8d9cee59978 100644
--- a/graphics/vigra/patches/patch-include-vigra-mathutil.hxx
+++ b/graphics/vigra/patches/patch-include-vigra-mathutil.hxx
@@ -1,11 +1,11 @@
-$NetBSD: patch-include-vigra-mathutil.hxx,v 1.3 2012/02/26 08:38:21 obache Exp $
+$NetBSD: patch-include-vigra-mathutil.hxx,v 1.4 2014/05/18 11:31:09 adam Exp $
* missing abs(signed long long) in old GCC.
* Fix ambiguous math functions for DragonFly.
---- include/vigra/mathutil.hxx.orig 2011-09-20 18:38:36.000000000 +0000
+--- include/vigra/mathutil.hxx.orig 2013-11-18 16:48:16.000000000 +0000
+++ include/vigra/mathutil.hxx
-@@ -149,7 +149,7 @@ VIGRA_DEFINE_UNSIGNED_ABS(unsigned long
+@@ -153,7 +153,7 @@ VIGRA_DEFINE_UNSIGNED_ABS(unsigned long
VIGRA_DEFINE_MISSING_ABS(signed char)
VIGRA_DEFINE_MISSING_ABS(signed short)
@@ -14,7 +14,7 @@ $NetBSD: patch-include-vigra-mathutil.hxx,v 1.3 2012/02/26 08:38:21 obache Exp $
VIGRA_DEFINE_MISSING_ABS(signed long long)
#endif
-@@ -553,7 +553,12 @@ VIGRA_DEFINE_NORM(int)
+@@ -637,7 +637,12 @@ VIGRA_DEFINE_NORM(int)
VIGRA_DEFINE_NORM(unsigned int)
VIGRA_DEFINE_NORM(long)
VIGRA_DEFINE_NORM(unsigned long)