5 files changed, 58 insertions, 38 deletions

diff --git a/graphics/vigra/Makefile b/graphics/vigra/Makefile
index 42d8091b853f..d6639f85cb58 100644
--- a/graphics/vigra/Makefile
+++ b/graphics/vigra/Makefile
@@ -10,8 +10,7 @@
 # The hugin port is a gui interface to interact with panorama tools.
 
 PORTNAME=	vigra
-PORTVERSION=	1.3.0
-PORTREVISION=	1
+PORTVERSION=	1.3.2
 CATEGORIES=	graphics
 MASTER_SITES=	http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/
 DISTNAME=	${PORTNAME}${PORTVERSION}
diff --git a/graphics/vigra/distinfo b/graphics/vigra/distinfo
index caebceb5b2c8..ee296ae3c45b 100644
--- a/graphics/vigra/distinfo
+++ b/graphics/vigra/distinfo
@@ -1,2 +1,2 @@
-MD5 (vigra1.3.0.tar.gz) = cc7e0749e758f4d5e5a597dbc07eaa35
-SIZE (vigra1.3.0.tar.gz) = 3047970
+MD5 (vigra1.3.2.tar.gz) = 6a787f86df5e45be809ac97c86acddae
+SIZE (vigra1.3.2.tar.gz) = 3150473
diff --git a/graphics/vigra/files/patch-Makefile.in b/graphics/vigra/files/patch-Makefile.in
new file mode 100644
index 000000000000..10cec478b500
--- /dev/null
+++ b/graphics/vigra/files/patch-Makefile.in
@@ -0,0 +1,34 @@
+--- Makefile.in.orig	Wed Mar  9 09:53:07 2005
++++ Makefile.in	Wed Mar  9 09:53:45 2005
+@@ -10,26 +10,26 @@
+ install-exec:
+ 	@cd src ; $(MAKE) install ; cd ..
+ 	$(INSTALL) -d $(bindir)
+-	$(INSTALL) --mode=755 $(vigra_builddir)/config/vigra-config $(bindir)
++	$(INSTALL) -m 755 $(vigra_builddir)/config/vigra-config $(bindir)
+ 
+ install-includes:
+ 	if test "$(includedir)" != "$(vigra_srcdir)/include" ; then \
+           $(INSTALL) -d $(includedir)/vigra ; \
+-          $(INSTALL) --mode=644 $(vigra_srcdir)/include/vigra/*.hxx $(includedir)/vigra ; \
++          $(INSTALL) -m 644 $(vigra_srcdir)/include/vigra/*.hxx $(includedir)/vigra ; \
+         fi
+ install-headers: install-includes
+ 
+ install-docs:
+ 	$(INSTALL) -d $(docdir)
+-	$(INSTALL) --mode=644 LICENSE $(docdir)
++	$(INSTALL) -m 644 LICENSE $(docdir)
+ 	if test "$(docdir)" != "$(vigra_srcdir)/doc/vigra" ; then \
+-          $(INSTALL) --mode=644 \
++          $(INSTALL) -m 644 \
+             $(vigra_srcdir)/doc/vigra/*.html \
+             $(vigra_srcdir)/doc/vigra/classvigra*.png $(vigra_srcdir)/doc/vigra/form*.png \
+             $(vigra_srcdir)/doc/vigra/doxygen.png $(vigra_srcdir)/doc/vigra/doxygen.css \
+             $(docdir) ; \
+           $(INSTALL) -d $(docdir)/documents ; \
+-          $(INSTALL) --mode=644 \
++          $(INSTALL) -m 644 \
+             $(vigra_srcdir)/doc/vigra/documents/*.ps \
+             $(vigra_srcdir)/doc/vigra/documents/*.gif \
+             $(docdir)/documents ; \
diff --git a/graphics/vigra/files/patch-aa b/graphics/vigra/files/patch-aa
deleted file mode 100644
index 6e163c65d6a6..000000000000
--- a/graphics/vigra/files/patch-aa
+++ /dev/null
@@ -1,34 +0,0 @@
---- Makefile	Tue Apr  6 08:34:01 2004
-+++ Makefile	Mon Jan 10 20:53:47 2005
-@@ -10,26 +10,26 @@
- install-exec:
- 	@cd src ; $(MAKE) install ; cd ..
- 	$(INSTALL) -d $(bindir)
--	$(INSTALL) --mode=755 $(vigra_builddir)/config/vigra-config $(bindir)
-+	$(INSTALL) -m 755 $(vigra_builddir)/config/vigra-config $(bindir)
- 
- install-includes:
- 	if test "$(includedir)" != "$(vigra_builddir)/include" ; then \
-           $(INSTALL) -d $(includedir)/vigra ; \
--          $(INSTALL) --mode=644 $(vigra_builddir)/include/vigra/*.hxx $(includedir)/vigra ; \
-+          $(INSTALL) -m 644 $(vigra_builddir)/include/vigra/*.hxx $(includedir)/vigra ; \
-         fi
- install-headers: install-includes
- 
- install-docs:
- 	$(INSTALL) -d $(docdir)
--	$(INSTALL) --mode=644 LICENSE $(docdir)
-+	$(INSTALL) -m 644 LICENSE $(docdir)
- 	if test "$(docdir)" != "$(vigra_builddir)/doc/vigra" ; then \
--          $(INSTALL) --mode=644 \
-+          $(INSTALL) -m 644 \
-             $(vigra_builddir)/doc/vigra/*.html \
-             $(vigra_builddir)/doc/vigra/classvigra*.png $(vigra_builddir)/doc/vigra/form*.png \
-             $(vigra_builddir)/doc/vigra/doxygen.png $(vigra_builddir)/doc/vigra/doxygen.css \
-             $(docdir) ; \
-           $(INSTALL) -d $(docdir)/documents ; \
--          $(INSTALL) --mode=644 \
-+          $(INSTALL) -m 644 \
-             $(vigra_builddir)/doc/vigra/documents/*.ps \
-             $(vigra_builddir)/doc/vigra/documents/*.gif \
-             $(docdir)/documents ; \
diff --git a/graphics/vigra/pkg-plist b/graphics/vigra/pkg-plist
index d753a704607b..a0caa2d5951f 100644
--- a/graphics/vigra/pkg-plist
+++ b/graphics/vigra/pkg-plist
@@ -17,11 +17,13 @@ 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/flatmorphology.hxx
 include/vigra/functorexpression.hxx
+include/vigra/functortraits.hxx
 include/vigra/gaborfilter.hxx
 include/vigra/gaussians.hxx
 include/vigra/imagecontainer.hxx
@@ -36,8 +38,11 @@ include/vigra/iteratoradapter.hxx
 include/vigra/iteratortags.hxx
 include/vigra/iteratortraits.hxx
 include/vigra/labelimage.hxx
+include/vigra/linear_algebra.hxx
+include/vigra/linear_solve.hxx
 include/vigra/localminmax.hxx
 include/vigra/mathutil.hxx
+include/vigra/matrix.hxx
 include/vigra/memory.hxx
 include/vigra/metaprogramming.hxx
 include/vigra/multi_array.hxx
@@ -198,11 +203,15 @@ lib/libvigraimpex.so.2
 %%DOCSDIR%%/classvigra_1_1FindROISize.html
 %%DOCSDIR%%/classvigra_1_1FourNeighborhood_1_1NeighborCode-members.html
 %%DOCSDIR%%/classvigra_1_1FourNeighborhood_1_1NeighborCode.html
+%%DOCSDIR%%/classvigra_1_1FunctorTraits-members.html
+%%DOCSDIR%%/classvigra_1_1FunctorTraits.html
 %%DOCSDIR%%/classvigra_1_1GaborFilterFamily-members.html
 %%DOCSDIR%%/classvigra_1_1GaborFilterFamily.html
 %%DOCSDIR%%/classvigra_1_1GaborFilterFamily.png
 %%DOCSDIR%%/classvigra_1_1Gaussian-members.html
 %%DOCSDIR%%/classvigra_1_1Gaussian.html
+%%DOCSDIR%%/classvigra_1_1GrayToRGBAccessor-members.html
+%%DOCSDIR%%/classvigra_1_1GrayToRGBAccessor.html
 %%DOCSDIR%%/classvigra_1_1GreenAccessor-members.html
 %%DOCSDIR%%/classvigra_1_1GreenAccessor.html
 %%DOCSDIR%%/classvigra_1_1ImageArray-members.html
@@ -309,6 +318,8 @@ lib/libvigraimpex.so.2
 %%DOCSDIR%%/classvigra_1_1Rect2D.html
 %%DOCSDIR%%/classvigra_1_1RedAccessor-members.html
 %%DOCSDIR%%/classvigra_1_1RedAccessor.html
+%%DOCSDIR%%/classvigra_1_1ReduceFunctor-members.html
+%%DOCSDIR%%/classvigra_1_1ReduceFunctor.html
 %%DOCSDIR%%/classvigra_1_1RowIterator-members.html
 %%DOCSDIR%%/classvigra_1_1RowIterator.html
 %%DOCSDIR%%/classvigra_1_1SeedRgDirectValueFunctor-members.html
@@ -380,6 +391,9 @@ lib/libvigraimpex.so.2
 %%DOCSDIR%%/classvigra_1_1YPrimePbPr2RGBPrimeFunctor.html
 %%DOCSDIR%%/classvigra_1_1YPrimeUV2RGBPrimeFunctor-members.html
 %%DOCSDIR%%/classvigra_1_1YPrimeUV2RGBPrimeFunctor.html
+%%DOCSDIR%%/classvigra_1_1linalg_1_1Matrix-members.html
+%%DOCSDIR%%/classvigra_1_1linalg_1_1Matrix.html
+%%DOCSDIR%%/classvigra_1_1linalg_1_1Matrix.png
 %%DOCSDIR%%/codec_8hxx-source.html
 %%DOCSDIR%%/colorconversions_8hxx-source.html
 %%DOCSDIR%%/combineimages_8hxx-source.html
@@ -404,6 +418,7 @@ lib/libvigraimpex.so.2
 %%DOCSDIR%%/doxygen.png
 %%DOCSDIR%%/edge_8cxx-example.html
 %%DOCSDIR%%/edgedetection_8hxx-source.html
+%%DOCSDIR%%/eigensystem_8hxx-source.html
 %%DOCSDIR%%/error_8hxx-source.html
 %%DOCSDIR%%/examples.html
 %%DOCSDIR%%/fftw3_8hxx-source.html
@@ -469,6 +484,7 @@ lib/libvigraimpex.so.2
 %%DOCSDIR%%/functionindex.html
 %%DOCSDIR%%/functions.html
 %%DOCSDIR%%/functorexpression_8hxx-source.html
+%%DOCSDIR%%/functortraits_8hxx-source.html
 %%DOCSDIR%%/gaborfilter_8hxx-source.html
 %%DOCSDIR%%/gaussians_8hxx-source.html
 %%DOCSDIR%%/group__CombineAlgo.html
@@ -482,6 +498,7 @@ lib/libvigraimpex.so.2
 %%DOCSDIR%%/group__FFTWComplexAccessors.html
 %%DOCSDIR%%/group__FFTWComplexOperators.html
 %%DOCSDIR%%/group__FourierTransform.html
+%%DOCSDIR%%/group__Functors.html
 %%DOCSDIR%%/group__GaborFilter.html
 %%DOCSDIR%%/group__GeometricTransformations.html
 %%DOCSDIR%%/group__ImageContainers.html
@@ -491,6 +508,7 @@ lib/libvigraimpex.so.2
 %%DOCSDIR%%/group__InspectAlgo.html
 %%DOCSDIR%%/group__InspectFunctor.html
 %%DOCSDIR%%/group__Labeling.html
+%%DOCSDIR%%/group__LinearAlgebraFunctions.html
 %%DOCSDIR%%/group__LocalMinMax.html
 %%DOCSDIR%%/group__MathFunctions.html
 %%DOCSDIR%%/group__Morphology.html
@@ -538,8 +556,11 @@ lib/libvigraimpex.so.2
 %%DOCSDIR%%/iteratortags_8hxx-source.html
 %%DOCSDIR%%/iteratortraits_8hxx-source.html
 %%DOCSDIR%%/labelimage_8hxx-source.html
+%%DOCSDIR%%/linear__algebra_8hxx-source.html
+%%DOCSDIR%%/linear__solve_8hxx-source.html
 %%DOCSDIR%%/localminmax_8hxx-source.html
 %%DOCSDIR%%/mathutil_8hxx-source.html
+%%DOCSDIR%%/matrix_8hxx-source.html
 %%DOCSDIR%%/memory_8hxx-source.html
 %%DOCSDIR%%/metaprogramming_8hxx-source.html
 %%DOCSDIR%%/modules.html