Upgrade graphics/hugin from 0.7_beta4 to 0.7.r3135 (SVN revision 3135).

This version is not archived by the authors, so this is a
snapshot of the SVN repository as of revision 3135.

The archive is put on the freebsd.org cluster.

14 files changed, 26 insertions, 245 deletions

diff --git a/graphics/hugin/files/patch-CMakeLists.txt b/graphics/hugin/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..5e10ca6fdc22
--- /dev/null
+++ b/graphics/hugin/files/patch-CMakeLists.txt
@@ -0,0 +1,10 @@
+--- CMakeLists.txt.orig	2008-06-30 08:28:53.000000000 +0300
++++ CMakeLists.txt	2008-06-30 08:29:57.000000000 +0300
+@@ -202,6 +202,7 @@
+ SET(HUGINDATADIR share/hugin)
+ SET(DATADIR share)
+ SET(BINDIR  bin)
++SET(MANDIR man)
+ SET(LOCALEDIR share/locale) 
+ SET(ICONDIR share/icons) 
+ SET(LINKDIR share/applications)
diff --git a/graphics/hugin/files/patch-bootstrap b/graphics/hugin/files/patch-bootstrap
deleted file mode 100644
index c4b5b99e833f..000000000000
--- a/graphics/hugin/files/patch-bootstrap
+++ /dev/null
@@ -1,20 +0,0 @@
---- bootstrap.orig	2006-12-17 23:13:03.000000000 +0200
-+++ bootstrap	2008-06-11 12:14:34.000000000 +0300
-@@ -42,7 +42,7 @@
- 	gettextize_version=`$GETTEXTIZE --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
- #	echo gettextize version: $gettextize_version
- 	case $gettextize_version in
--	    0.11*|0.12*|0.13*|0.14*|0.15*|0.16*)
-+	    0.1[1-9]*|0.[2-9]*|[1-9].*)
- 		have_gettextize=true
- 		;;
- 	esac
-@@ -79,7 +79,7 @@
- 	automake_version=`$AUTOMAKE --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
- #	echo automake version: $automake_version
- 	case $automake_version in
--	    1.7*|1.8*|1.9*)
-+	    1.7*|1.8*|1.9*|1.[1-9][0-9]*)
- 		have_automake=true
- 		;;
- 	esac
diff --git a/graphics/hugin/files/patch-configure.ac b/graphics/hugin/files/patch-configure.ac
deleted file mode 100644
index 328b63040d84..000000000000
--- a/graphics/hugin/files/patch-configure.ac
+++ /dev/null
@@ -1,36 +0,0 @@
---- configure.ac.orig	Mon Aug 21 01:19:33 2006
-+++ configure.ac	Tue Jan 23 15:48:26 2007
-@@ -35,6 +35,10 @@
- 	    ;;
- 	esac
-     ;;
-+  *freebsd*)
-+    HSYS=freebsd
-+    HCPU="${target_cpu}"
-+    ;;
-   darwin*)
-     HSYS=darwin
- 	HCPU="${target_cpu}"
-@@ -56,6 +60,7 @@
-     ;;
- esac
- AM_CONDITIONAL(HAVE_LINUX, test "${HSYS}" = "linux")
-+AM_CONDITIONAL(HAVE_FREEBSD, test "${HSYS}" = "freebsd")
- AM_CONDITIONAL(HAVE_DARWIN, test "${HSYS}" = "darwin")
- AM_CONDITIONAL(HAVE_MINGW, test "${HSYS}" = "mingw32")
- 
-@@ -240,6 +245,14 @@
-  	where wxWidgets libraries are installed (returned by
-  	'wx-config --libs' command) is in LD_LIBRARY_PATH or
-  	equivalent variable and wxWidgets version is 2.4.2 or above.
-+    ])
-+fi
-+
-+AM_PATH_WXRC([HAVE_WXRC=1], [HAVE_WXRC=0])
-+if test "x$HAVE_WXRC" != x1; then
-+    AC_MSG_ERROR([
-+           The wxrc program was not installed or not found.
-+           Please check the wxWidgets installation.
-     ])
- fi
- 
diff --git a/graphics/hugin/files/patch-doc_CMakeLists.txt b/graphics/hugin/files/patch-doc_CMakeLists.txt
new file mode 100644
index 000000000000..1ff5cc6e4513
--- /dev/null
+++ b/graphics/hugin/files/patch-doc_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- doc/CMakeLists.txt.orig	2008-06-30 08:31:18.000000000 +0300
++++ doc/CMakeLists.txt	2008-06-30 08:31:40.000000000 +0300
+@@ -3,7 +3,7 @@
+ INSTALL(FILES fulla.html DESTINATION doc)
+ INSTALL(FILES nona.txt DESTINATION doc)
+ ELSE (WIN32)
+-INSTALL(FILES fulla.1 DESTINATION share/man/man1)
++INSTALL(FILES fulla.1 DESTINATION ${MANDIR}/man1)
+ INSTALL(FILES nona.txt DESTINATION share/hugin)
+ ENDIF(WIN32)
+ 
diff --git a/graphics/hugin/files/patch-m4_ax_boost.m4 b/graphics/hugin/files/patch-m4_ax_boost.m4
deleted file mode 100644
index c69674823fa2..000000000000
--- a/graphics/hugin/files/patch-m4_ax_boost.m4
+++ /dev/null
@@ -1,20 +0,0 @@
---- m4/ax_boost.m4.orig	2006-11-30 09:36:48.000000000 +0200
-+++ m4/ax_boost.m4	2007-12-12 18:39:43.000000000 +0200
-@@ -97,7 +97,7 @@
-         dnl this location ist chosen if boost libraries are installed with the --layout=system option
-         dnl or if you install boost with RPM
-         if test "$ac_boost_path" != ""; then
--                BOOST_LDFLAGS="-L$ac_boost_path/lib"
-+                BOOST_LDFLAGS="-L$ac_boost_path/lib $PTHREAD_LIBS"
-                 BOOST_CPPFLAGS="-I$ac_boost_path/include"
-         else
-                 for ac_boost_path_tmp in /usr /usr/local /opt ; do
-@@ -331,7 +331,7 @@
-                                                 for BT in "-mt" ""; do
-                                                     for BL in "" "-s" ; do
-                                                         ax_lib=$BP$BN$BC$BT$BL$BV;
--                                                        AC_CHECK_LIB($ax_lib, main, [BOOST_THREAD_LIB="-l$ax_lib" AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"
-+                                                        AC_CHECK_LIB($ax_lib, main, [BOOST_THREAD_LIB="-l$ax_lib $BOOST_LDFLAGS" AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"
-  break 5],
-                                                         [link_thread="no"])
-                                                     done
diff --git a/graphics/hugin/files/patch-m4_ax_check_graphics.m4 b/graphics/hugin/files/patch-m4_ax_check_graphics.m4
deleted file mode 100644
index 206c6a3f6676..000000000000
--- a/graphics/hugin/files/patch-m4_ax_check_graphics.m4
+++ /dev/null
@@ -1,74 +0,0 @@
---- m4/ax_check_graphics.m4.orig	Wed Jan 17 15:23:15 2007
-+++ m4/ax_check_graphics.m4	Wed Jan 17 15:27:55 2007
-@@ -44,7 +44,7 @@
-   ZLIB_OLD_LDFLAGS=$LDFLAGS
-   ZLIB_OLD_CPPFLAGS=$CPPFLAGS
-   if test "x$ZLIB_HOME" != 'x' ; then
--    if test "x$HCPU" = 'xamd64' ; then
-+    if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
-       LDFLAGS="$LDFLAGS -L$ZLIB_HOME/lib64"
-     else
-       LDFLAGS="$LDFLAGS -L$ZLIB_HOME/lib"
-@@ -69,7 +69,7 @@
-         LIB_ZLIB="-lz"
-         ZLIB_FLAGS="-DHasZLIB"
-       else
--        if test "x$HCPU" = 'xamd64' ; then
-+        if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
-           LIB_ZLIB="-L$ZLIB_HOME/lib64 -lz"
-         else
-           LIB_ZLIB="-L$ZLIB_HOME/lib -lz"
-@@ -133,7 +133,7 @@
-   PNG_OLD_LDFLAGS=$LDFLAGS
-   PNG_OLD_CPPFLAGS=$CPPFLAGS
-   if test "x$PNG_HOME" != 'x' ; then
--    if test "x$HCPU" = 'xamd64' ; then
-+    if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
-       LDFLAGS="$LDFLAGS -L$PNG_HOME/lib64"
-     else
-       LDFLAGS="$LDFLAGS -L$PNG_HOME/lib"
-@@ -158,7 +158,7 @@
-         LIB_PNG="-lpng"
-         PNG_FLAGS="-DHasPNG"
-       else
--        if test "x$HCPU" = 'xamd64' ; then
-+        if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
-           LIB_PNG="-L$PNG_HOME/lib64 -lpng"
-         else
-           LIB_PNG="-L$PNG_HOME/lib -lpng"
-@@ -224,7 +224,7 @@
-   JPEG_OLD_LDFLAGS=$LDFLAGS
-   JPEG_OLD_CPPFLAGS=$CPPFLAGS
-   if test "x$JPEG_HOME" != 'x' ; then
--    if test "x$HCPU" = 'xamd64' ; then
-+    if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
-       LDFLAGS="$LDFLAGS -L$JPEG_HOME/lib64"
-     else
-       LDFLAGS="$LDFLAGS -L$JPEG_HOME/lib"
-@@ -274,7 +274,7 @@
-         LIB_JPEG="-ljpeg"
-         JPEG_FLAGS="-DHasJPEG"
-       else
--        if test "x$HCPU" = 'xamd64' ; then
-+        if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
-           LIB_JPEG="-L$JPEG_HOME/lib64 -ljpeg"
-         else
-           LIB_JPEG="-L$JPEG_HOME/lib -ljpeg"
-@@ -339,7 +339,7 @@
-   TIFF_OLD_LDFLAGS=$LDFLAGS
-   TIFF_OLD_CPPFLAGS=$CPPFLAGS
-   if test "x$TIFF_HOME" != 'x' ; then
--    if test "x$HCPU" = 'xamd64' ; then
-+    if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
-       LDFLAGS="$LDFLAGS -L$TIFF_HOME/lib64"
-     else
-       LDFLAGS="$LDFLAGS -L$TIFF_HOME/lib"
-@@ -364,7 +364,7 @@
-         LIB_TIFF="-ltiff"
-         TIFF_FLAGS="-DHasTIFF"
-       else
--        if test "x$HCPU" = 'xamd64' ; then
-+        if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
-           LIB_TIFF="-L$TIFF_HOME/lib64 -ltiff"
-         else
-           LIB_TIFF="-L$TIFF_HOME/lib -ltiff"
diff --git a/graphics/hugin/files/patch-m4_ax_check_panotools.m4 b/graphics/hugin/files/patch-m4_ax_check_panotools.m4
deleted file mode 100644
index 280956d3740a..000000000000
--- a/graphics/hugin/files/patch-m4_ax_check_panotools.m4
+++ /dev/null
@@ -1,20 +0,0 @@
---- m4/ax_check_panotools.m4.orig	Wed Dec 20 21:41:29 2006
-+++ m4/ax_check_panotools.m4	Wed May  2 21:54:25 2007
-@@ -57,7 +57,7 @@
-     passed=0;
-     PANO_OLD_LDFLAGS=$LDFLAGS
-     PANO_OLD_CPPFLAGS=$CPPFLAGS
--    if test "x$HCPU" = 'xamd64' ; then
-+    if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
-       LDFLAGS="$LDFLAGS -L$PANO_HOME/lib64"
-     else
-       LDFLAGS="$LDFLAGS -L$PANO_HOME/lib"
-@@ -95,7 +95,7 @@
-             PANO_FLAGS="-DHasPANO12"
-           fi
-         else
--          if test "x$HCPU" = 'xamd64' ; then
-+          if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
-             if test "$have_pano13" = 'yes' ; then
-               LIB_PANO="-L$PANO_HOME/lib64 -lpano13"
-             else
diff --git a/graphics/hugin/files/patch-src-common-utils.cpp b/graphics/hugin/files/patch-src-common-utils.cpp
deleted file mode 100644
index 9dddd7b41572..000000000000
--- a/graphics/hugin/files/patch-src-common-utils.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/common/utils.cpp.orig	Mon Jan 17 07:29:39 2005
-+++ src/common/utils.cpp	Thu Aug 11 20:28:47 2005
-@@ -37,8 +37,10 @@
-   char tmp[100];
-   struct tm t;
-   struct timeval tv;
-+  time_t _clock;
-   gettimeofday(&tv,NULL);
--  localtime_r(&tv.tv_sec, &t);
-+  _clock = tv.tv_sec;
-+  localtime_r(&_clock, &t);
-   strftime(tmp,99,"%H:%M:%S",&t);
-   sprintf(tmp+8,".%06ld",tv.tv_usec);
-   return tmp;
diff --git a/graphics/hugin/files/patch-src-hugin-ImagesPanel.cpp b/graphics/hugin/files/patch-src-hugin-ImagesPanel.cpp
deleted file mode 100644
index be910b25f420..000000000000
--- a/graphics/hugin/files/patch-src-hugin-ImagesPanel.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/hugin/ImagesPanel.cpp.orig	Thu Aug 11 20:18:49 2005
-+++ src/hugin/ImagesPanel.cpp	Thu Aug 11 20:20:24 2005
-@@ -448,9 +448,9 @@
-         for (UIntSet::const_iterator it = selImg.begin();
-              it != selImg.end(); ++it )
-         {
--            vars[i].insert(make_pair("y", Variable("y",0.0)));
--            vars[i].insert(make_pair("p", Variable("p",0.0)));
--            vars[i].insert(make_pair("r", Variable("r",0.0)));
-+            vars[i].insert(make_pair((char *) "y", Variable("y",0.0)));
-+            vars[i].insert(make_pair((char *) "p", Variable("p",0.0)));
-+            vars[i].insert(make_pair((char *) "r", Variable("r",0.0)));
-             i++;
-         }
-         GlobalCmdHist::getInstance().addCommand(
diff --git a/graphics/hugin/files/patch-src-hugin-Makefile.in b/graphics/hugin/files/patch-src-hugin-Makefile.in
deleted file mode 100644
index 271dc85c4e85..000000000000
--- a/graphics/hugin/files/patch-src-hugin-Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/hugin/Makefile.in.marco	Sun Dec 18 23:26:42 2005
-+++ src/hugin/Makefile.in	Sun Dec 18 23:27:30 2005
-@@ -754,7 +754,6 @@
- install-data-am: install-desktopDATA install-gnomemimeiconDATA \
- 	install-sharedmimepackageDATA
- 	@$(NORMAL_INSTALL)
--	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
- 
- install-exec-am: install-binPROGRAMS
- 
diff --git a/graphics/hugin/files/patch-src-include-common-utils.h b/graphics/hugin/files/patch-src-include-common-utils.h
deleted file mode 100644
index 17d99366f2f7..000000000000
--- a/graphics/hugin/files/patch-src-include-common-utils.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/include/common/utils.h.orig	Mon Jan 17 07:29:40 2005
-+++ src/include/common/utils.h	Thu Aug 11 20:24:45 2005
-@@ -30,6 +30,9 @@
- #include <sstream>
- #include <cassert>
- 
-+#include <locale.h>
-+#include <stdio.h>
-+
- #include "platform.h"
- 
- #ifdef __WXMSW__
diff --git a/graphics/hugin/files/patch-src-include-panoinc.h b/graphics/hugin/files/patch-src-include-panoinc.h
deleted file mode 100644
index bfb9142c7162..000000000000
--- a/graphics/hugin/files/patch-src-include-panoinc.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/include/panoinc.h.orig      Wed Mar  2 23:04:45 2005
-+++ src/include/panoinc.h   Wed Mar  2 23:05:09 2005
-@@ -32,6 +32,8 @@
- #ifdef __unix__
- #include <sys/time.h>
- #include <sys/resource.h>
-+#include <sys/types.h>
-+#include <sys/wait.h>
- #endif
- 
- #include <vector>
diff --git a/graphics/hugin/files/patch-src_include_hugin_config_defaults.h b/graphics/hugin/files/patch-src_hugin1_hugin_config_defaults.h
index 0894a0886f2f..2487cd3d153a 100644
--- a/graphics/hugin/files/patch-src_include_hugin_config_defaults.h
+++ b/graphics/hugin/files/patch-src_hugin1_hugin_config_defaults.h
@@ -1,11 +1,11 @@
---- src/include/hugin/config_defaults.h.orig	2008-06-15 18:26:33.000000000 +0300
-+++ src/include/hugin/config_defaults.h	2008-06-15 18:27:33.000000000 +0300
-@@ -150,8 +150,8 @@
+--- src/hugin1/hugin/config_defaults.h.orig	2008-06-20 17:21:28.000000000 +0300
++++ src/hugin1/hugin/config_defaults.h	2008-06-20 17:22:40.000000000 +0300
+@@ -160,8 +160,8 @@
  #define HUGIN_APKOLOR_EXE                     ""
  #define HUGIN_APKOLOR_ARGS                    ""
  
--#define HUGIN_APSIFT_EXE                      "autopano-complete.sh"
--#define HUGIN_APSIFT_ARGS                     "--output %o --points %p %i"
+-#define HUGIN_APSIFT_EXE                      "autopano-sift-c"
+-#define HUGIN_APSIFT_ARGS                     "--maxmatches %p %o %i"
 +#define HUGIN_APSIFT_EXE                      "autopano-complete"
 +#define HUGIN_APSIFT_ARGS                     "-o %o -p %p %i"
  #define HUGIN_STITCHER_RUN_EDITOR             0l
diff --git a/graphics/hugin/files/patch-src_hugin_xrc_Makefile.am b/graphics/hugin/files/patch-src_hugin_xrc_Makefile.am
deleted file mode 100644
index dc9fd15bf0a5..000000000000
--- a/graphics/hugin/files/patch-src_hugin_xrc_Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
---- src/hugin/xrc/Makefile.am.orig	Tue Jan 23 15:13:43 2007
-+++ src/hugin/xrc/Makefile.am	Tue Jan 23 15:52:04 2007
-@@ -42,4 +42,4 @@
- dist_xrc_DATA = $(XRC_FILES)
- 
- .xrc.xrs: 
--	-wxrc -g -o $(srcdir)/$@ $<
-+	-$(WXRC) -g -o $(srcdir)/$@ $<