Changes 2010.4.0:

* Built-in Control Points Generator
* Improved Unattended Operation
* Improved Interaction and Functionality
* Improved Reporting of Stitching and System Information
* New Command-Line Tools
* Refactored Makefile Library
* Libraries and Build Improvements
* Migration to Launchpad
* New Visuals

4 files changed, 58 insertions, 27 deletions

diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile
index a2f7a4f7e6f..3c54956a2e7 100644
--- a/graphics/hugin/Makefile
+++ b/graphics/hugin/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2010/11/15 22:57:20 abs Exp $
+# $NetBSD: Makefile,v 1.16 2011/01/12 11:46:28 adam Exp $
 
-DISTNAME=	hugin-2010.2.0
-PKGREVISION=	2
+DISTNAME=	hugin-2010.4.0
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=hugin/}
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://hugin.sourceforge.net/
@@ -14,7 +14,6 @@ LICENSE=	gnu-gpl-v2
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 DEPENDS+=	autopano-sift-C>=2.5.1:../../graphics/autopano-sift-C
-DEPENDS+=	panomatic>=0.9.4:../../graphics/panomatic
 DEPENDS+=	enblend-enfuse>=4.0:../../graphics/enblend-enfuse
 DEPENDS+=	p5-Image-ExifTool>=8.15:../../graphics/p5-Image-ExifTool
 
diff --git a/graphics/hugin/PLIST b/graphics/hugin/PLIST
index f2df2a7ee3f..30f90e5e709 100644
--- a/graphics/hugin/PLIST
+++ b/graphics/hugin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2010/10/19 10:33:38 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2011/01/12 11:46:28 adam Exp $
 bin/PTBatcher
 bin/PTBatcherGUI
 bin/align_image_stack
@@ -6,12 +6,15 @@ bin/autooptimiser
 bin/autopano-noop.sh
 bin/calibrate_lens
 bin/celeste_standalone
+bin/checkpto
 bin/cpclean
+bin/cpfind
 bin/deghosting_mask
 bin/fulla
 bin/hugin
 bin/hugin_hdrmerge
 bin/hugin_stitch_project
+bin/icpfind
 bin/matchpoint
 bin/nona
 bin/nona_gui
@@ -21,27 +24,28 @@ bin/pto2mk
 bin/pto_merge
 bin/tca_correct
 bin/vig_optimize
-lib/libceleste.so
 lib/libceleste.so.0.0
-lib/libhuginANN.so
 lib/libhuginANN.so.0.0
-lib/libhuginbase.so
 lib/libhuginbase.so.0.0
-lib/libhuginbasewx.so
 lib/libhuginbasewx.so.0.0
-lib/libhuginvigraimpex.so
 lib/libhuginvigraimpex.so.0.0
+lib/libicpfindlib.so.0.0
+lib/liblocalfeatures.so.0.0
+lib/libmakefilelib.so.0.0
 man/man1/PTBatcherGUI.1
 man/man1/align_image_stack.1
 man/man1/autooptimiser.1
 man/man1/calibrate_lens.1
 man/man1/celeste_standalone.1
+man/man1/checkpto.1
 man/man1/cpclean.1
+man/man1/cpfind.1
 man/man1/deghosting_mask.1
 man/man1/fulla.1
 man/man1/hugin.1
 man/man1/hugin_hdrmerge.1
 man/man1/hugin_stitch_project.1
+man/man1/icpfind.1
 man/man1/nona.1
 man/man1/nona_gui.1
 man/man1/pano_modify.1
@@ -54,6 +58,7 @@ share/applications/PTBatcherGUI.desktop
 share/applications/hugin.desktop
 share/hugin/Makefile.equirect.mk
 share/hugin/data/celeste.model
+share/hugin/data/default.setting
 share/hugin/xrc/about.xrc
 share/hugin/xrc/assistant_panel.xrc
 share/hugin/xrc/batch_frame.xrc
@@ -70,7 +75,10 @@ share/hugin/xrc/data/add_project.png
 share/hugin/xrc/data/add_projects.png
 share/hugin/xrc/data/autocrop_tool.png
 share/hugin/xrc/data/center_pano.png
+share/hugin/xrc/data/crop_tool.png
 share/hugin/xrc/data/crop_tool_small.png
+share/hugin/xrc/data/dedication.htm
+share/hugin/xrc/data/drag_tool.png
 share/hugin/xrc/data/drag_tool_small.png
 share/hugin/xrc/data/druid.control.128.png
 share/hugin/xrc/data/druid.images.128.png
@@ -241,9 +249,11 @@ share/hugin/xrc/data/help_en_EN/Chromatic_aberration.html
 share/hugin/xrc/data/help_en_EN/Color_correct_tiff.html
 share/hugin/xrc/data/help_en_EN/Colour_profile.html
 share/hugin/xrc/data/help_en_EN/Contrast.html
+share/hugin/xrc/data/help_en_EN/Control_Point_Detector_Parameters.html
 share/hugin/xrc/data/help_en_EN/Control_point_generators.html
 share/hugin/xrc/data/help_en_EN/Control_points.html
 share/hugin/xrc/data/help_en_EN/Cpclean.html
+share/hugin/xrc/data/help_en_EN/Cpfind.html
 share/hugin/xrc/data/help_en_EN/Crop_factor.html
 share/hugin/xrc/data/help_en_EN/Cropped_TIFF.html
 share/hugin/xrc/data/help_en_EN/Cubic.html
@@ -326,9 +336,11 @@ share/hugin/xrc/data/help_en_EN/Hugin_remove_project.png
 share/hugin/xrc/data/help_en_EN/Hugin_save_batch.png
 share/hugin/xrc/data/help_en_EN/Hugin_skip_batch.png
 share/hugin/xrc/data/help_en_EN/Hugin_start_batch.png
+share/hugin/xrc/data/help_en_EN/Hugin_stitch_project.html
 share/hugin/xrc/data/help_en_EN/Hugin_straighten_pano.png
 share/hugin/xrc/data/help_en_EN/Hugin_translation_guide.html
 share/hugin/xrc/data/help_en_EN/Hugin_undo.png
+share/hugin/xrc/data/help_en_EN/Icpfind.html
 share/hugin/xrc/data/help_en_EN/Interpolate_none.jpg
 share/hugin/xrc/data/help_en_EN/Interpolate_poly3.jpg
 share/hugin/xrc/data/help_en_EN/Interpolate_sinc256.jpg
@@ -432,10 +444,14 @@ share/hugin/xrc/data/help_en_EN/f103730f19548bcf3e7bc170fb1f7860.png
 share/hugin/xrc/data/help_en_EN/f44fbe128fd280b77a856b2275d7a655.png
 share/hugin/xrc/data/help_en_EN/fa5313ae442c1ac7f832c141880e3e74.png
 share/hugin/xrc/data/help_en_EN/fd9eb36b9149cc4e2efebd10bdc4fdf2.png
+share/hugin/xrc/data/help_en_EN/help_index_en.hhk
+share/hugin/xrc/data/help_en_EN/help_toc_en.hhc
 share/hugin/xrc/data/help_en_EN/hugin.hhc
 share/hugin/xrc/data/help_en_EN/hugin.hhk
 share/hugin/xrc/data/help_en_EN/hugin.hhp
+share/hugin/xrc/data/help_en_EN/hugin_help_en_EN.hhp
 share/hugin/xrc/data/help_en_EN/license.html
+share/hugin/xrc/data/help_en_EN/panotoolsng.png
 share/hugin/xrc/data/help_it_IT/16bit_workflow_with_hugin.html
 share/hugin/xrc/data/help_it_IT/Aliasing.html
 share/hugin/xrc/data/help_it_IT/Align_a_stack_of_photos.html
@@ -553,37 +569,35 @@ share/hugin/xrc/data/help_it_IT/Wavy_distortion.html
 share/hugin/xrc/data/help_it_IT/Yaw.html
 share/hugin/xrc/data/help_it_IT/Zenith.html
 share/hugin/xrc/data/help_it_IT/license.html
+share/hugin/xrc/data/hugin.ico
 share/hugin/xrc/data/hugin.png
-share/hugin/xrc/data/icon.ico
-share/hugin/xrc/data/icon.png
-share/hugin/xrc/data/icon_128x128.ico
-share/hugin/xrc/data/icon_128x128.png
-share/hugin/xrc/data/icon_16x16.ico
-share/hugin/xrc/data/icon_32x32.ico
-share/hugin/xrc/data/icon_48x48.ico
-share/hugin/xrc/data/icon_48x48.png
-share/hugin/xrc/data/icon_64x64.ico
-share/hugin/xrc/data/icon_72x72.ico
-share/hugin/xrc/data/icon_96x96.ico
 share/hugin/xrc/data/identify_tool.png
 share/hugin/xrc/data/identify_tool_small.png
 share/hugin/xrc/data/info.png
 share/hugin/xrc/data/keyboard_pl.html
 share/hugin/xrc/data/list.png
 share/hugin/xrc/data/logo.png
+share/hugin/xrc/data/milko.png
 share/hugin/xrc/data/nona_enblend.mk
 share/hugin/xrc/data/nona_multilayer.mk
 share/hugin/xrc/data/nona_smartblend.mk
 share/hugin/xrc/data/optimize.png
 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_layout.png
 share/hugin/xrc/data/preview_layout_small.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
+share/hugin/xrc/data/ptbatcher.ico
+share/hugin/xrc/data/ptbatcher.png
 share/hugin/xrc/data/ptmender_enblend.mk
 share/hugin/xrc/data/ptmender_smartblend.mk
+share/hugin/xrc/data/pto_icon.ico
+share/hugin/xrc/data/pto_icon.png
 share/hugin/xrc/data/redo.png
 share/hugin/xrc/data/reload.png
 share/hugin/xrc/data/remove_project.png
@@ -635,3 +649,4 @@ share/locale/zh_CN/LC_MESSAGES/hugin.mo
 share/locale/zh_TW/LC_MESSAGES/hugin.mo
 share/mime/packages/hugin.xml
 share/pixmaps/hugin.png
+share/pixmaps/ptbatcher.png
diff --git a/graphics/hugin/distinfo b/graphics/hugin/distinfo
index 6b969097e66..d2e9aee536b 100644
--- a/graphics/hugin/distinfo
+++ b/graphics/hugin/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2010/10/19 10:33:38 adam Exp $
+$NetBSD: distinfo,v 1.7 2011/01/12 11:46:28 adam Exp $
 
-SHA1 (hugin-2010.2.0.tar.gz) = f0676f28cd3fbebcf4086f55af7cf09566772899
-RMD160 (hugin-2010.2.0.tar.gz) = c39d279bf95cdf5686e5994030bb4eb61ba285aa
-Size (hugin-2010.2.0.tar.gz) = 12412050 bytes
+SHA1 (hugin-2010.4.0.tar.bz2) = 47f25c0a8b97c27108e567bcd22203c87f268d07
+RMD160 (hugin-2010.4.0.tar.bz2) = f97b8d37470443eb81c3e915e5f5efa91227b135
+Size (hugin-2010.4.0.tar.bz2) = 11009978 bytes
 SHA1 (patch-ab) = 41542f252de828f6a798f1172894f195b6ef46c8
-SHA1 (patch-ac) = 586be6b87ec4aad3a94dede0bd2391b0735f274b
+SHA1 (patch-ac) = aac60aa6d3b99a632fce03749660e10ea82ad028
diff --git a/graphics/hugin/patches/patch-ac b/graphics/hugin/patches/patch-ac
index 9163688dfad..b8e46a4d3d6 100644
--- a/graphics/hugin/patches/patch-ac
+++ b/graphics/hugin/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2010/10/19 10:33:39 adam Exp $
+$NetBSD: patch-ac,v 1.4 2011/01/12 11:46:28 adam Exp $
 
 --- CMakeLists.txt.orig	2010-09-28 22:06:42.000000000 +0000
 +++ CMakeLists.txt
@@ -11,3 +11,20 @@ $NetBSD: patch-ac,v 1.3 2010/10/19 10:33:39 adam Exp $
  ENDIF(NOT MANDIR AND NOT $ENV{MANDIR} STREQUAL "")
  
  SET(LOCALEDIR share/locale) 
+@@ -355,16 +355,6 @@ IF (APPLE)
+   ENDIF (NOT MAC_SELF_CONTAINED_BUNDLE)
+ ENDIF (APPLE)
+ 
+-IF (${HUGIN_SHARED} AND UNIX AND NOT APPLE)
+-  SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIBDIR}/hugin")
+-  SET(HUGIN_LIBS_PRIVATE_DIR "1" CACHE INTERNAL "Store internal
+-    libraries in private subdirectory" )
+-ELSE (${HUGIN_SHARED} AND UNIX AND NOT APPLE)
+-  # On OS X files are moved around after make install, do not try to use
+-  # rpath or CMAKE_INSTALL_NAME_DIR
+-  SET(HUGIN_LIBS_PRIVATE_DIR "0" CACHE INTERNAL "Store internal
+-    libraries in private subdirectory" )
+-ENDIF (${HUGIN_SHARED} AND UNIX AND NOT APPLE)
+ 
+ IF (UNIX)
+   IF (${HUGIN_SHARED})