Changes 4.0:

* Huge new documentation in Info, PS, PDF, and XHTML formats.  Plain
  HTML format is not supported because it cannot portably render MathML.
* New manual pages.
* Automatic bit depth conversion between input and output images if
  necessary.
* Compilation without image cache works again
  ("--disable-image-cache").  Speedups of up to 30% have been reported
  on the amd64 architecture.
* Enblend and Enfuse accept repsonse files in addition to literal
  image files.  Response files contain lists of image filenames or
  names of other response files.
* Lots of new warnings if a command-line option has no effect, like,
  for example, combining a mask optimization option with "--no-optimize".
* Enblend shows the initial, unoptimized seam line in addition to the
  optimized one in all seam-line visualization images (option "--visualize").
* Enblend and Enfuse read multi-layer TIFF files ("multi directory" in
  TIFF jargon).  It is even possible to mix multi-layer with single
  layer images.  This partially fixes SourceForge bug ID 1170329.
* Save masks with (lossless) "Deflate" compression.
* An improved wrap-around option, formerly only "-w", now "-wMODE" and
  "--wrap=MODE", lets the user determine whether to create a 360
  degrees horizontal or vertical panorama.  It is possible to wrap
  around vertically and horizontally at the same time.
* Without any output filename given, i.e. no "-o" option, the output
  filename now defaults to "a.tif", making "-o" truly an option.
* The user has better control of the number of pyramid levels.
  Previously only the maximum number in any blend could be reduced
  by the "-l" option.  Now, the maximum number can be reduced by a
  fixed amount no matter what the actual maximum number of permissible
  pyramid levels is.
* Use OpenMP to make better use of multi-processor machines.  As the
  image cache is not reentrant, OpenMP can only be activated when the
  image cache is disabled.
* Enblend and Enfuse issue messages following the GNU standard.
* Bug Fixes

6 files changed, 41 insertions, 50 deletions

diff --git a/graphics/enblend-enfuse/Makefile b/graphics/enblend-enfuse/Makefile
index 250dfcf93e9..e15eb363df0 100644
--- a/graphics/enblend-enfuse/Makefile
+++ b/graphics/enblend-enfuse/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/09/01 14:39:28 adam Exp $
+# $NetBSD: Makefile,v 1.2 2009/12/16 21:28:35 adam Exp $
 
-DISTNAME=	enblend-enfuse-3.2
+DISTNAME=	enblend-enfuse-4.0
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=enblend/}
 
@@ -12,10 +12,12 @@ LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}-753b534c819d
+
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
+USE_TOOLS+=		gmake perl:build
 GNU_CONFIGURE=		yes
-INFO_FILES=		yes
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/graphics/enblend-enfuse/PLIST b/graphics/enblend-enfuse/PLIST
index aac3446797c..60b4beb117f 100644
--- a/graphics/enblend-enfuse/PLIST
+++ b/graphics/enblend-enfuse/PLIST
@@ -1,8 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/09/01 14:39:28 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/12/16 21:28:35 adam Exp $
 bin/enblend
 bin/enfuse
-info/enblend.info
-info/enfuse-focus-stacking.info
-info/enfuse.info
 man/man1/enblend.1
 man/man1/enfuse.1
diff --git a/graphics/enblend-enfuse/distinfo b/graphics/enblend-enfuse/distinfo
index 00d68f81cc0..6bfbf9d9005 100644
--- a/graphics/enblend-enfuse/distinfo
+++ b/graphics/enblend-enfuse/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/09/01 14:39:28 adam Exp $
+$NetBSD: distinfo,v 1.2 2009/12/16 21:28:35 adam Exp $
 
-SHA1 (enblend-enfuse-3.2.tar.gz) = e44226ec6759dd3e6dcf46bb34848b64536ad495
-RMD160 (enblend-enfuse-3.2.tar.gz) = 7a9b0037b821ac287327477d52665372d0850dbb
-Size (enblend-enfuse-3.2.tar.gz) = 831504 bytes
-SHA1 (patch-aa) = 54429e564118e0c4e18b39d2ba27e30f09f375e7
-SHA1 (patch-ab) = 762f14337372df061619b856e328c61501ba431c
-SHA1 (patch-ac) = 1be5b32578934f540d53dec8eeaa4da2d4e2144a
+SHA1 (enblend-enfuse-4.0.tar.gz) = 07dad728a16624a8aa6e13fee6a68cec581f065b
+RMD160 (enblend-enfuse-4.0.tar.gz) = b59d43445435846f256a46801d535a29b5af9ae0
+Size (enblend-enfuse-4.0.tar.gz) = 1046540 bytes
+SHA1 (patch-aa) = b1809fe6ef6609658b697635c6cbf0c112a03fd1
+SHA1 (patch-ab) = afc074bb94e2a2b96c654c37540072514ba0bce0
+SHA1 (patch-ac) = 916f4655ff30013583014eb8deecc72bd19ae55d
diff --git a/graphics/enblend-enfuse/patches/patch-aa b/graphics/enblend-enfuse/patches/patch-aa
index 08c959a657d..afd7b900e5c 100644
--- a/graphics/enblend-enfuse/patches/patch-aa
+++ b/graphics/enblend-enfuse/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/09/01 14:39:28 adam Exp $
+$NetBSD: patch-aa,v 1.2 2009/12/16 21:28:35 adam Exp $
 
---- configure.orig	2009-08-31 18:11:36.000000000 +0200
-+++ configure
-@@ -11378,7 +11378,7 @@ if test "x$enable_debug" = "xyes"; then
-   { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
- else
--  CXXFLAGS="$CXXFLAGS -O3 -ffast-math -DNDEBUG -Wall"
-+  CXXFLAGS="$CXXFLAGS -ffast-math -DNDEBUG -Wall"
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
- fi
+--- src/error_message.cc.orig	2009-11-25 20:56:49.000000000 +0100
++++ src/error_message.cc
+@@ -58,7 +58,7 @@ errorMessage(int anErrorNumber)
+     return_code = 0;
+ #else
+     message = message_buffer.get();
+-    return_code = strerror_r(anErrorNumber, message, buffer_size);
++    return_code = strerror_r(anErrorNumber, (char *)message, buffer_size);
+ #endif // STRERROR_R_CHAR_P
+ #elif defined(HAVE_STRERROR)
+     message = strerror(anErrorNumber);
diff --git a/graphics/enblend-enfuse/patches/patch-ab b/graphics/enblend-enfuse/patches/patch-ab
index 37b014f396f..9d8ed7dd7a3 100644
--- a/graphics/enblend-enfuse/patches/patch-ab
+++ b/graphics/enblend-enfuse/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2009/09/01 14:39:28 adam Exp $
+$NetBSD: patch-ab,v 1.2 2009/12/16 21:28:35 adam Exp $
 
---- src/enfuse.cc.orig	2009-08-31 18:38:09.000000000 +0200
+--- src/enfuse.cc.orig	2009-11-13 16:58:19.000000000 +0100
 +++ src/enfuse.cc
-@@ -62,8 +62,12 @@ extern "C" char *optarg;
+@@ -54,8 +54,12 @@ extern "C" char *optarg;
  extern "C" int optind;
  
  #ifndef _MSC_VER
@@ -15,16 +15,12 @@ $NetBSD: patch-ab,v 1.1.1.1 2009/09/01 14:39:28 adam Exp $
  
  #include <signal.h>
  #include <stdlib.h>
-@@ -279,8 +283,12 @@ int main(int argc, char** argv) {
+@@ -1341,6 +1345,8 @@ int main(int argc, char** argv)
+     // functions in float_cast.h will work properly.
      // See changes in vigra numerictraits.hxx
-     _controlfp( _RC_NEAR, _MCW_RC );
+     _controlfp(_RC_NEAR, _MCW_RC);
++#elif defined(__NetBSD__)
++    //fpsetround(FE_TONEAREST);
  #else
-+#ifdef __NetBSD__
-+//    fpsetround(FE_TONEAREST);
-+#else
      fesetround(FE_TONEAREST);
  #endif
-+#endif
-     
- #ifndef _WIN32
-     sigemptyset(&SigintMask);
diff --git a/graphics/enblend-enfuse/patches/patch-ac b/graphics/enblend-enfuse/patches/patch-ac
index 25c776b7293..907e0cee240 100644
--- a/graphics/enblend-enfuse/patches/patch-ac
+++ b/graphics/enblend-enfuse/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 2009/09/01 14:39:29 adam Exp $
+$NetBSD: patch-ac,v 1.2 2009/12/16 21:28:35 adam Exp $
 
---- src/enblend.cc.orig	2009-08-31 18:39:19.000000000 +0200
+--- src/enblend.cc.orig	2009-11-13 16:57:53.000000000 +0100
 +++ src/enblend.cc
-@@ -62,8 +62,12 @@ extern "C" char *optarg;
+@@ -54,8 +54,12 @@ extern "C" char *optarg;
  extern "C" int optind;
  
  #ifndef _MSC_VER
@@ -15,16 +15,12 @@ $NetBSD: patch-ac,v 1.1.1.1 2009/09/01 14:39:29 adam Exp $
  
  #include <signal.h>
  #include <stdlib.h>
-@@ -230,8 +234,12 @@ int main(int argc, char** argv) {
+@@ -1259,6 +1263,8 @@ int main(int argc, char** argv)
+     // functions in float_cast.h will work properly.
      // See changes in vigra numerictraits.hxx
-     _controlfp( _RC_NEAR, _MCW_RC );
+     _controlfp(_RC_NEAR, _MCW_RC);
++#elif defined(__NetBSD__)
++    //fpsetround(FE_TONEAREST);
  #else
-+#ifdef __NetBSD__
-+//    fpsetround(FE_TONEAREST);
-+#else
      fesetround(FE_TONEAREST);
  #endif
-+#endif
-     
- #ifndef _WIN32
-     sigemptyset(&SigintMask);