summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/hugin/Makefile5
-rw-r--r--graphics/hugin/PLIST7
-rw-r--r--graphics/hugin/distinfo13
-rw-r--r--graphics/hugin/patches/patch-aa6
-rw-r--r--graphics/hugin/patches/patch-ab23
-rw-r--r--graphics/hugin/patches/patch-ac16
6 files changed, 46 insertions, 24 deletions
diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile
index 8be811f96bb..89f009be3ee 100644
--- a/graphics/hugin/Makefile
+++ b/graphics/hugin/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2009/08/26 19:57:44 sno Exp $
+# $NetBSD: Makefile,v 1.4 2009/10/14 12:41:04 adam Exp $
-DISTNAME= hugin-0.8.0
-PKGREVISION= 1
+DISTNAME= hugin-2009.2.0
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hugin/}
diff --git a/graphics/hugin/PLIST b/graphics/hugin/PLIST
index 3dbcc87cf6a..1da23acce94 100644
--- a/graphics/hugin/PLIST
+++ b/graphics/hugin/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/08/21 18:08:46 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/10/14 12:41:04 adam Exp $
bin/PTBatcher
bin/PTBatcherGUI
bin/align_image_stack
bin/autooptimiser
+bin/autopano-noop.sh
bin/celeste_standalone
bin/fulla
bin/hugin
@@ -38,6 +39,7 @@ man/man1/vig_optimize.1
share/applications/PTBatcherGUI.desktop
share/applications/hugin.desktop
share/hugin/Makefile.equirect.mk
+share/hugin/data/celeste.model
share/hugin/xrc/about.xrc
share/hugin/xrc/assistant_panel.xrc
share/hugin/xrc/batch_frame.xrc
@@ -45,6 +47,7 @@ share/hugin/xrc/batch_menu.xrc
share/hugin/xrc/batch_toolbar.xrc
share/hugin/xrc/cp_editor_panel.xrc
share/hugin/xrc/cp_list_frame.xrc
+share/hugin/xrc/cpdetector_dialog.xrc
share/hugin/xrc/crop_panel.xrc
share/hugin/xrc/data/1leftarrow.png
share/hugin/xrc/data/1rightarrow.png
@@ -58,7 +61,6 @@ share/hugin/xrc/data/CPCursor6.png
share/hugin/xrc/data/about.htm
share/hugin/xrc/data/add_project.png
share/hugin/xrc/data/add_projects.png
-share/hugin/xrc/data/celeste.model
share/hugin/xrc/data/center_pano.png
share/hugin/xrc/data/center_pano.xpm
share/hugin/xrc/data/close.xpm
@@ -551,6 +553,7 @@ share/hugin/xrc/data/pause.png
share/hugin/xrc/data/photometric.png
share/hugin/xrc/data/preview.png
share/hugin/xrc/data/preview_auto_update.png
+share/hugin/xrc/data/preview_control_point_tool.png
share/hugin/xrc/data/preview_num_transform.png
share/hugin/xrc/data/preview_show_all.png
share/hugin/xrc/data/preview_show_none.png
diff --git a/graphics/hugin/distinfo b/graphics/hugin/distinfo
index 411863e8642..e5342570774 100644
--- a/graphics/hugin/distinfo
+++ b/graphics/hugin/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/08/21 18:08:44 adam Exp $
+$NetBSD: distinfo,v 1.2 2009/10/14 12:41:04 adam Exp $
-SHA1 (hugin-0.8.0.tar.gz) = 698f0a7c4bb25efdf06313d05e3980f20d088ce5
-RMD160 (hugin-0.8.0.tar.gz) = c98ff8558e8094b50aa8ed6b556f72bb0be8da40
-Size (hugin-0.8.0.tar.gz) = 12077874 bytes
-SHA1 (patch-aa) = 2ddaf4bebbe0697cad52d1a39421bd8734a344a3
-SHA1 (patch-ab) = e64c2a6f3e185cd1df88ce248fe8003310776e43
+SHA1 (hugin-2009.2.0.tar.gz) = aaf41867a7face95ec0b8ae753299da75448ed5c
+RMD160 (hugin-2009.2.0.tar.gz) = 78626de90a1fe77c55509a40722a94dcb61789fa
+Size (hugin-2009.2.0.tar.gz) = 11159002 bytes
+SHA1 (patch-aa) = 2d68f6ddccc542e95bc0b0f48f2f5d7f0907887d
+SHA1 (patch-ab) = 59d06a24f38652da24271d1966639aaef3d14e60
+SHA1 (patch-ac) = 67200485442d31ae6a4aa0242fc1169cec2c49f1
diff --git a/graphics/hugin/patches/patch-aa b/graphics/hugin/patches/patch-aa
index e9a3fc7ded4..79e080b4bae 100644
--- a/graphics/hugin/patches/patch-aa
+++ b/graphics/hugin/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/08/21 18:08:46 adam Exp $
+$NetBSD: patch-aa,v 1.2 2009/10/14 12:41:04 adam Exp $
---- src/hugin1/hugin/config_defaults.h.orig 2009-08-21 19:36:01.000000000 +0200
+--- src/hugin1/hugin/config_defaults.h.orig 2009-09-21 03:04:06.000000000 +0200
+++ src/hugin1/hugin/config_defaults.h
-@@ -148,7 +148,7 @@
+@@ -131,7 +131,7 @@
#endif
diff --git a/graphics/hugin/patches/patch-ab b/graphics/hugin/patches/patch-ab
index cc541799b25..cfe2602aaec 100644
--- a/graphics/hugin/patches/patch-ab
+++ b/graphics/hugin/patches/patch-ab
@@ -1,12 +1,15 @@
-$NetBSD: patch-ab,v 1.1.1.1 2009/08/21 18:08:46 adam Exp $
+$NetBSD: patch-ab,v 1.2 2009/10/14 12:41:04 adam Exp $
---- doc/CMakeLists.txt.orig 2009-08-21 19:49:55.000000000 +0200
-+++ doc/CMakeLists.txt
-@@ -3,6 +3,6 @@ IF (WIN32)
- INSTALL(FILES fulla.html DESTINATION doc)
- INSTALL(FILES nona.txt DESTINATION doc)
- ELSE (WIN32)
--INSTALL(FILES align_image_stack.1 autooptimiser.1 celeste_standalone.1 fulla.1 hugin.1 hugin_hdrmerge.1 hugin_stitch_project.1 nona.1 nona_gui.1 PTBatcherGUI.1 pto2mk.1 tca_correct.1 vig_optimize.1 DESTINATION share/man/man1)
-+INSTALL(FILES align_image_stack.1 autooptimiser.1 celeste_standalone.1 fulla.1 hugin.1 hugin_hdrmerge.1 hugin_stitch_project.1 nona.1 nona_gui.1 PTBatcherGUI.1 pto2mk.1 tca_correct.1 vig_optimize.1 DESTINATION man/man1)
- ENDIF(WIN32)
+--- src/hugin_base/vigra_ext/ImageTransforms.h.orig 2009-10-01 11:13:30.000000000 +0200
++++ src/hugin_base/vigra_ext/ImageTransforms.h
+@@ -42,9 +42,7 @@
+ #include "MultiThreadOperations.h"
+ #include <boost/thread/thread.hpp>
+ #include <boost/bind.hpp>
+-#ifdef __APPLE__
+- #include <boost/function.hpp>
+-#endif
++#include <boost/function.hpp>
+
+ namespace vigra_ext
diff --git a/graphics/hugin/patches/patch-ac b/graphics/hugin/patches/patch-ac
new file mode 100644
index 00000000000..8252c067a94
--- /dev/null
+++ b/graphics/hugin/patches/patch-ac
@@ -0,0 +1,16 @@
+$NetBSD: patch-ac,v 1.1 2009/10/14 12:41:04 adam Exp $
+
+--- CMakeLists.txt.orig 2009-09-30 23:05:05.000000000 +0200
++++ CMakeLists.txt
+@@ -268,10 +268,8 @@ SET(BINDIR bin)
+
+ IF("$ENV{MANDIR}")
+ SET (MANDIR "$ENV{MANDIR}")
+-ELSEIF(CMAKE_SYSTEM_NAME=="FreeBSD")
+- SET (MANDIR "man")
+ ELSE("$ENV{MANDIR}")
+- SET (MANDIR "share/man")
++ SET (MANDIR "man")
+ ENDIF("$ENV{MANDIR}")
+
+ SET(LOCALEDIR share/locale)