Upgrade graphics/hugin from 2009.4.0 to 2010.4.0

* WX Unicode is now required to build Hugin
* Remove the requirement for GCC 4.2 on 6.x since Hugin does not do
  RPATH_REMOVE anymore (see the log message for graphics/hugin/Makefile,
  rev 1.43)

4 files changed, 80 insertions, 88 deletions

diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile
index cdc5d3c79ce0..1bd67db74fc7 100644
--- a/graphics/hugin/Makefile
+++ b/graphics/hugin/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	hugin
-PORTVERSION=	2009.4.0
-PORTREVISION=	6
+PORTVERSION=	2010.4.0
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}
 
@@ -28,6 +27,8 @@ RUN_DEPENDS=	enblend>=3.1.r20080615:${PORTSDIR}/graphics/enblend \
 		exiftool:${PORTSDIR}/graphics/p5-Image-ExifTool \
 		gmake:${PORTSDIR}/devel/gmake
 
+USE_BZIP2=	yes
+
 OPTIONS=	PANOMATIC "Install graphics/panomatic" on \
 		AUTOPANOSIFT "Install graphics/autopano-sift" off \
 		AUTOPANOSIFTC "Install graphics/autopano-sift-c" on
@@ -39,6 +40,7 @@ CMAKE_VERBOSE=	yes
 CMAKE_USE_PTHREAD=	yes
 
 USE_WX=		2.8+
+WX_UNICODE=	yes
 
 USE_GETTEXT=	yes
 
@@ -50,14 +52,21 @@ MAN1=		\
 		autooptimiser.1 \
 		calibrate_lens.1 \
 		celeste_standalone.1 \
+		checkpto.1 \
 		cpclean.1 \
+		cpfind.1 \
+		deghosting_mask.1 \
 		fulla.1 \
 		hugin.1 \
 		hugin_hdrmerge.1 \
 		hugin_stitch_project.1 \
+		icpfind.1 \
 		nona.1 \
 		nona_gui.1 \
+		pano_modify.1 \
+		pano_trafo.1 \
 		pto2mk.1 \
+		pto_merge.1 \
 		tca_correct.1 \
 		vig_optimize.1
 
@@ -84,11 +93,6 @@ post-configure:
 
 .include <bsd.port.pre.mk>
 
-# see the commit log message for Makefile rev 1.43
-.if ${OSVERSION} < 700000
-USE_GCC=	4.2
-.endif
-
 .if defined(WITH_PANOMATIC)
 RUN_DEPENDS+=	panomatic:${PORTSDIR}/graphics/panomatic
 .endif
diff --git a/graphics/hugin/distinfo b/graphics/hugin/distinfo
index 7983a96bbf65..7bcb5f4bb1ca 100644
--- a/graphics/hugin/distinfo
+++ b/graphics/hugin/distinfo
@@ -1,3 +1,2 @@
-MD5 (hugin-2009.4.0.tar.gz) = ed197d35213a46c77489f512cb8ff191
-SHA256 (hugin-2009.4.0.tar.gz) = 2913e0ba3b4a6449715676dc33109c977a0cc9d199d619a7e3c86ccaafcd47f5
-SIZE (hugin-2009.4.0.tar.gz) = 11586078
+SHA256 (hugin-2010.4.0.tar.bz2) = d45cc65df6b424ef5bf1c5d2cd99a360ecfda46688782c75f36dd5341cb9c38e
+SIZE (hugin-2010.4.0.tar.bz2) = 11009978
diff --git a/graphics/hugin/files/patch-png.cxx b/graphics/hugin/files/patch-png.cxx
deleted file mode 100644
index 5a721b7e269e..000000000000
--- a/graphics/hugin/files/patch-png.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/foreign/vigra/vigra_impex/png.cxx.orig	2009-12-01 23:39:05.000000000 +0100
-+++ src/foreign/vigra/vigra_impex/png.cxx	2010-03-29 13:22:16.000000000 +0200
-@@ -272,7 +272,7 @@
-         if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
-             if (setjmp(png->jmpbuf))
-                 vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str());
--            png_set_gray_1_2_4_to_8(png);
-+            png_set_expand_gray_1_2_4_to_8(png);
-             bit_depth = 8;
-         }
- 
diff --git a/graphics/hugin/pkg-plist b/graphics/hugin/pkg-plist
index 61c3a091ce2c..ca8230c1aa2e 100644
--- a/graphics/hugin/pkg-plist
+++ b/graphics/hugin/pkg-plist
@@ -5,29 +5,37 @@ 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
+bin/pano_modify
+bin/pano_trafo
 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/libhuginvigraimpex.so
-lib/libhuginvigraimpex.so.0.0
+lib/hugin/libceleste.so.0.0
+lib/hugin/libhuginANN.so.0.0
+lib/hugin/libhuginvigraimpex.so.0.0
+lib/hugin/libhuginbase.so.0.0
+lib/hugin/libmakefilelib.so.0.0
+lib/hugin/libhuginbasewx.so.0.0
+lib/hugin/libicpfindlib.so.0.0
+lib/hugin/liblocalfeatures.so.0.0
 share/applications/hugin.desktop
 share/applications/PTBatcherGUI.desktop
 %%DATADIR%%/Makefile.equirect.mk
 %%DATADIR%%/data/celeste.model
+%%DATADIR%%/data/default.setting
 %%DATADIR%%/xrc/about.xrc
 %%DATADIR%%/xrc/assistant_panel.xrc
 %%DATADIR%%/xrc/batch_frame.xrc
@@ -37,47 +45,31 @@ share/applications/PTBatcherGUI.desktop
 %%DATADIR%%/xrc/cp_list_frame.xrc
 %%DATADIR%%/xrc/cpdetector_dialog.xrc
 %%DATADIR%%/xrc/crop_panel.xrc
-%%DATADIR%%/xrc/data/1leftarrow.png
-%%DATADIR%%/xrc/data/1rightarrow.png
-%%DATADIR%%/xrc/data/CPCursor0.png
-%%DATADIR%%/xrc/data/CPCursor1.png
-%%DATADIR%%/xrc/data/CPCursor2.png
-%%DATADIR%%/xrc/data/CPCursor3.png
-%%DATADIR%%/xrc/data/CPCursor4.png
-%%DATADIR%%/xrc/data/CPCursor5.png
-%%DATADIR%%/xrc/data/CPCursor6.png
+%%DATADIR%%/xrc/data/COPYING
 %%DATADIR%%/xrc/data/about.htm
+%%DATADIR%%/xrc/data/about.txt
 %%DATADIR%%/xrc/data/add_project.png
 %%DATADIR%%/xrc/data/add_projects.png
+%%DATADIR%%/xrc/data/autocrop_tool.png
 %%DATADIR%%/xrc/data/center_pano.png
-%%DATADIR%%/xrc/data/center_pano.xpm
-%%DATADIR%%/xrc/data/close.xpm
 %%DATADIR%%/xrc/data/crop_tool.png
-%%DATADIR%%/xrc/data/document-new.png
-%%DATADIR%%/xrc/data/document-open.png
+%%DATADIR%%/xrc/data/crop_tool_small.png
+%%DATADIR%%/xrc/data/dedication.htm
 %%DATADIR%%/xrc/data/drag_tool.png
+%%DATADIR%%/xrc/data/drag_tool_small.png
 %%DATADIR%%/xrc/data/druid.control.128.png
 %%DATADIR%%/xrc/data/druid.images.128.png
 %%DATADIR%%/xrc/data/druid.lenses.128.png
 %%DATADIR%%/xrc/data/druid.optimize.128.png
 %%DATADIR%%/xrc/data/druid.stitch.128.png
 %%DATADIR%%/xrc/data/edit_add.png
-%%DATADIR%%/xrc/data/editcopy.png
-%%DATADIR%%/xrc/data/editcut.png
-%%DATADIR%%/xrc/data/editdelete.png
-%%DATADIR%%/xrc/data/editpaste.png
-%%DATADIR%%/xrc/data/emblem-symbolic-link.png
-%%DATADIR%%/xrc/data/emblem-unreadable.png
 %%DATADIR%%/xrc/data/filenew.png
 %%DATADIR%%/xrc/data/fileopen.png
 %%DATADIR%%/xrc/data/filesave.png
 %%DATADIR%%/xrc/data/filesaveas.png
-%%DATADIR%%/xrc/data/find.png
 %%DATADIR%%/xrc/data/fit_pano.png
-%%DATADIR%%/xrc/data/fit_pano.xpm
-%%DATADIR%%/xrc/data/folder-saved-search.png
 %%DATADIR%%/xrc/data/gl_preview.png
-%%DATADIR%%/xrc/data/go-jump.png
+%%DATADIR%%/xrc/data/gl_preview_small.png
 %%DATADIR%%/xrc/data/help_en_EN/0a647fdd7aa9d6bbb8633f8f034bb50e.png
 %%DATADIR%%/xrc/data/help_en_EN/100px-Big_ben_transverse_mercator.jpg
 %%DATADIR%%/xrc/data/help_en_EN/100px-PC_img01.jpg
@@ -108,7 +100,9 @@ share/applications/PTBatcherGUI.desktop
 %%DATADIR%%/xrc/data/help_en_EN/180px-Fast_preview_guide_rotate_drag.png
 %%DATADIR%%/xrc/data/help_en_EN/180px-Fast_preview_guide_start.png
 %%DATADIR%%/xrc/data/help_en_EN/180px-Focal_length.gif
+%%DATADIR%%/xrc/data/help_en_EN/180px-LagardePont-fish.jpg
 %%DATADIR%%/xrc/data/help_en_EN/180px-Lamp_enfuse.jpg
+%%DATADIR%%/xrc/data/help_en_EN/197px-Field-of-view.svg.png
 %%DATADIR%%/xrc/data/help_en_EN/1f09c25c5247c1eaf121df644ca42f8c.png
 %%DATADIR%%/xrc/data/help_en_EN/200px-Ben_Architectural.jpg
 %%DATADIR%%/xrc/data/help_en_EN/200px-Ben_Equirectangular_panini.jpg
@@ -122,23 +116,32 @@ share/applications/PTBatcherGUI.desktop
 %%DATADIR%%/xrc/data/help_en_EN/200px-Bin_ben_sinusoidal.jpg
 %%DATADIR%%/xrc/data/help_en_EN/200px-Panoglview.png
 %%DATADIR%%/xrc/data/help_en_EN/21cb21c7c1de5b4c61da90794c62bc1a.png
+%%DATADIR%%/xrc/data/help_en_EN/220px-Ben_Equirectangular_panini.jpg
+%%DATADIR%%/xrc/data/help_en_EN/22px-Fast_preview_icon_autocrop.svg.png
 %%DATADIR%%/xrc/data/help_en_EN/22px-Fast_preview_icon_crop.svg.png
 %%DATADIR%%/xrc/data/help_en_EN/22px-Fast_preview_icon_drag.svg.png
 %%DATADIR%%/xrc/data/help_en_EN/22px-Fast_preview_icon_identify.svg.png
 %%DATADIR%%/xrc/data/help_en_EN/22px-Fast_preview_icon_photometric.svg.png
+%%DATADIR%%/xrc/data/help_en_EN/22px-Preview_layout.svg.png
+%%DATADIR%%/xrc/data/help_en_EN/22px-Show_Control_Points_Button.svg.png
 %%DATADIR%%/xrc/data/help_en_EN/24597ccab188a3598a0828c69e380228.png
 %%DATADIR%%/xrc/data/help_en_EN/250px-Cubic.jpg
 %%DATADIR%%/xrc/data/help_en_EN/250px-Cylindrical.JPG
 %%DATADIR%%/xrc/data/help_en_EN/250px-Equirectangular.JPG
 %%DATADIR%%/xrc/data/help_en_EN/250px-Equirectangular_cut.jpg
+%%DATADIR%%/xrc/data/help_en_EN/250px-LagardePont-defish.jpg
 %%DATADIR%%/xrc/data/help_en_EN/250px-Little_planet.jpg
 %%DATADIR%%/xrc/data/help_en_EN/250px-Orientation-plate.jpg
 %%DATADIR%%/xrc/data/help_en_EN/250px-Rectlinear.JPG
+%%DATADIR%%/xrc/data/help_en_EN/250px-TKS-Mmm-obliquev120-gP70_50_50.png
+%%DATADIR%%/xrc/data/help_en_EN/250px-TKS-Mmm-obliquev120-recti.png
 %%DATADIR%%/xrc/data/help_en_EN/29e2300eb2f198d830f04682f14872e2.png
 %%DATADIR%%/xrc/data/help_en_EN/3016f25d3d1249eab1305b78b0b82d3d.png
 %%DATADIR%%/xrc/data/help_en_EN/312418a7fcf9d47adc8e5683e89c58cd.png
+%%DATADIR%%/xrc/data/help_en_EN/360px-Pantheon-150x100-rect-panini.jpg
 %%DATADIR%%/xrc/data/help_en_EN/38d368a092f7d5a4d2b42bdf4d0dd89c.png
 %%DATADIR%%/xrc/data/help_en_EN/3d6de401d007ea0cffc99610ad623239.png
+%%DATADIR%%/xrc/data/help_en_EN/400px-220x120deg-panini-grid.png
 %%DATADIR%%/xrc/data/help_en_EN/428px-Local-analysis-window.png
 %%DATADIR%%/xrc/data/help_en_EN/44ab04cdf6dce93c3e7a7cb1d00e8c83.png
 %%DATADIR%%/xrc/data/help_en_EN/4d2df1ec22beeb53124bd8941ea0db11.png
@@ -163,6 +166,7 @@ share/applications/PTBatcherGUI.desktop
 %%DATADIR%%/xrc/data/help_en_EN/7410666dfcbeeaa522ddf92427bc74ba.png
 %%DATADIR%%/xrc/data/help_en_EN/7a62f58ab1c3f78523eee522e71a9416.png
 %%DATADIR%%/xrc/data/help_en_EN/7ab63d1bb57f091d55507c4c4c582f03.png
+%%DATADIR%%/xrc/data/help_en_EN/800px-C_Marchi-GrandCentral-adj.jpg
 %%DATADIR%%/xrc/data/help_en_EN/81b4c8dd7cbec41cae5ef37da5644e99.png
 %%DATADIR%%/xrc/data/help_en_EN/84aad7e0b33f2a1c47ed32902df4f3f3.png
 %%DATADIR%%/xrc/data/help_en_EN/89539baed8c394f4b6eea437f16b047d.png
@@ -222,8 +226,11 @@ share/applications/PTBatcherGUI.desktop
 %%DATADIR%%/xrc/data/help_en_EN/Color_correct_tiff.html
 %%DATADIR%%/xrc/data/help_en_EN/Colour_profile.html
 %%DATADIR%%/xrc/data/help_en_EN/Contrast.html
+%%DATADIR%%/xrc/data/help_en_EN/Control_Point_Detector_Parameters.html
 %%DATADIR%%/xrc/data/help_en_EN/Control_point_generators.html
 %%DATADIR%%/xrc/data/help_en_EN/Control_points.html
+%%DATADIR%%/xrc/data/help_en_EN/Cpclean.html
+%%DATADIR%%/xrc/data/help_en_EN/Cpfind.html
 %%DATADIR%%/xrc/data/help_en_EN/Crop_factor.html
 %%DATADIR%%/xrc/data/help_en_EN/Cropped_TIFF.html
 %%DATADIR%%/xrc/data/help_en_EN/Cubic.html
@@ -271,10 +278,14 @@ share/applications/PTBatcherGUI.desktop
 %%DATADIR%%/xrc/data/help_en_EN/Hugin_Images_tab.html
 %%DATADIR%%/xrc/data/help_en_EN/Hugin_Keyboard_shortcuts.html
 %%DATADIR%%/xrc/data/help_en_EN/Hugin_Main_window.html
+%%DATADIR%%/xrc/data/help_en_EN/Hugin_Mask_tab.html
 %%DATADIR%%/xrc/data/help_en_EN/Hugin_Optimizer_tab.html
+%%DATADIR%%/xrc/data/help_en_EN/Hugin_Parameters_for_Control_Point_Detectors_dialog.html
 %%DATADIR%%/xrc/data/help_en_EN/Hugin_Preferences.html
 %%DATADIR%%/xrc/data/help_en_EN/Hugin_Preview_window.html
+%%DATADIR%%/xrc/data/help_en_EN/Hugin_Reset_Values_window.html
 %%DATADIR%%/xrc/data/help_en_EN/Hugin_Stitcher_tab.html
+%%DATADIR%%/xrc/data/help_en_EN/Hugin_Trackers.html
 %%DATADIR%%/xrc/data/help_en_EN/Hugin_add_project.png
 %%DATADIR%%/xrc/data/help_en_EN/Hugin_cancel_batch.png
 %%DATADIR%%/xrc/data/help_en_EN/Hugin_center_pano.png
@@ -302,9 +313,11 @@ share/applications/PTBatcherGUI.desktop
 %%DATADIR%%/xrc/data/help_en_EN/Hugin_save_batch.png
 %%DATADIR%%/xrc/data/help_en_EN/Hugin_skip_batch.png
 %%DATADIR%%/xrc/data/help_en_EN/Hugin_start_batch.png
+%%DATADIR%%/xrc/data/help_en_EN/Hugin_stitch_project.html
 %%DATADIR%%/xrc/data/help_en_EN/Hugin_straighten_pano.png
 %%DATADIR%%/xrc/data/help_en_EN/Hugin_translation_guide.html
 %%DATADIR%%/xrc/data/help_en_EN/Hugin_undo.png
+%%DATADIR%%/xrc/data/help_en_EN/Icpfind.html
 %%DATADIR%%/xrc/data/help_en_EN/Interpolate_none.jpg
 %%DATADIR%%/xrc/data/help_en_EN/Interpolate_poly3.jpg
 %%DATADIR%%/xrc/data/help_en_EN/Interpolate_sinc256.jpg
@@ -313,8 +326,10 @@ share/applications/PTBatcherGUI.desktop
 %%DATADIR%%/xrc/data/help_en_EN/LICENCE.manual
 %%DATADIR%%/xrc/data/help_en_EN/Landscape.html
 %%DATADIR%%/xrc/data/help_en_EN/Laplacian-of-gaussian.png
+%%DATADIR%%/xrc/data/help_en_EN/Layout-small.png
 %%DATADIR%%/xrc/data/help_en_EN/Lens_correction_model.html
 %%DATADIR%%/xrc/data/help_en_EN/Lens_distortion.html
+%%DATADIR%%/xrc/data/help_en_EN/Lightprobe.html
 %%DATADIR%%/xrc/data/help_en_EN/Local-analysis-window.png
 %%DATADIR%%/xrc/data/help_en_EN/MatchPoint.html
 %%DATADIR%%/xrc/data/help_en_EN/Medinet_habu_horizontal_fisheye.jpg
@@ -336,6 +351,7 @@ share/applications/PTBatcherGUI.desktop
 %%DATADIR%%/xrc/data/help_en_EN/PTmender.html
 %%DATADIR%%/xrc/data/help_en_EN/PTtiff2psd.html
 %%DATADIR%%/xrc/data/help_en_EN/Pano12.html
+%%DATADIR%%/xrc/data/help_en_EN/Pano_modify.html
 %%DATADIR%%/xrc/data/help_en_EN/Panoglview.html
 %%DATADIR%%/xrc/data/help_en_EN/Panoinfo.html
 %%DATADIR%%/xrc/data/help_en_EN/Panomatic.html
@@ -355,6 +371,7 @@ share/applications/PTBatcherGUI.desktop
 %%DATADIR%%/xrc/data/help_en_EN/Portrait.html
 %%DATADIR%%/xrc/data/help_en_EN/Projections.html
 %%DATADIR%%/xrc/data/help_en_EN/Pto2mk.html
+%%DATADIR%%/xrc/data/help_en_EN/Pto_merge.html
 %%DATADIR%%/xrc/data/help_en_EN/QTVR.html
 %%DATADIR%%/xrc/data/help_en_EN/Qtvr2img.html
 %%DATADIR%%/xrc/data/help_en_EN/RAW.html
@@ -374,6 +391,7 @@ share/applications/PTBatcherGUI.desktop
 %%DATADIR%%/xrc/data/help_en_EN/Swing_rod.html
 %%DATADIR%%/xrc/data/help_en_EN/TIFF.html
 %%DATADIR%%/xrc/data/help_en_EN/Tca_correct.html
+%%DATADIR%%/xrc/data/help_en_EN/The_General_Panini_Projection.html
 %%DATADIR%%/xrc/data/help_en_EN/Tone_mapping.html
 %%DATADIR%%/xrc/data/help_en_EN/Using_Celeste_with_hugin.html
 %%DATADIR%%/xrc/data/help_en_EN/Vertical-fisheye.jpg
@@ -403,10 +421,14 @@ share/applications/PTBatcherGUI.desktop
 %%DATADIR%%/xrc/data/help_en_EN/f44fbe128fd280b77a856b2275d7a655.png
 %%DATADIR%%/xrc/data/help_en_EN/fa5313ae442c1ac7f832c141880e3e74.png
 %%DATADIR%%/xrc/data/help_en_EN/fd9eb36b9149cc4e2efebd10bdc4fdf2.png
+%%DATADIR%%/xrc/data/help_en_EN/help_index_en.hhk
+%%DATADIR%%/xrc/data/help_en_EN/help_toc_en.hhc
 %%DATADIR%%/xrc/data/help_en_EN/hugin.hhc
 %%DATADIR%%/xrc/data/help_en_EN/hugin.hhk
 %%DATADIR%%/xrc/data/help_en_EN/hugin.hhp
+%%DATADIR%%/xrc/data/help_en_EN/hugin_help_en_EN.hhp
 %%DATADIR%%/xrc/data/help_en_EN/license.html
+%%DATADIR%%/xrc/data/help_en_EN/panotoolsng.png
 %%DATADIR%%/xrc/data/help_it_IT/16bit_workflow_with_hugin.html
 %%DATADIR%%/xrc/data/help_it_IT/Aliasing.html
 %%DATADIR%%/xrc/data/help_it_IT/Align_a_stack_of_photos.html
@@ -524,85 +546,61 @@ share/applications/PTBatcherGUI.desktop
 %%DATADIR%%/xrc/data/help_it_IT/Yaw.html
 %%DATADIR%%/xrc/data/help_it_IT/Zenith.html
 %%DATADIR%%/xrc/data/help_it_IT/license.html
+%%DATADIR%%/xrc/data/hugin.ico
 %%DATADIR%%/xrc/data/hugin.png
-%%DATADIR%%/xrc/data/icon.ico
-%%DATADIR%%/xrc/data/icon.png
-%%DATADIR%%/xrc/data/icon_128x128.ico
-%%DATADIR%%/xrc/data/icon_128x128.png
-%%DATADIR%%/xrc/data/icon_16x16.ico
-%%DATADIR%%/xrc/data/icon_32x32.ico
-%%DATADIR%%/xrc/data/icon_48x48.ico
-%%DATADIR%%/xrc/data/icon_48x48.png
-%%DATADIR%%/xrc/data/icon_64x64.ico
-%%DATADIR%%/xrc/data/icon_72x72.ico
-%%DATADIR%%/xrc/data/icon_96x96.ico
 %%DATADIR%%/xrc/data/identify_tool.png
-%%DATADIR%%/xrc/data/image-missing.png
+%%DATADIR%%/xrc/data/identify_tool_small.png
 %%DATADIR%%/xrc/data/info.png
-%%DATADIR%%/xrc/data/info.xpm
 %%DATADIR%%/xrc/data/keyboard_pl.html
-%%DATADIR%%/xrc/data/list-add.png
-%%DATADIR%%/xrc/data/list-remove.png
 %%DATADIR%%/xrc/data/list.png
 %%DATADIR%%/xrc/data/logo.png
-%%DATADIR%%/xrc/data/manual.html
-%%DATADIR%%/xrc/data/media-floppy.png
-%%DATADIR%%/xrc/data/media-playback-pause.png
-%%DATADIR%%/xrc/data/media-playback-start.png
-%%DATADIR%%/xrc/data/media-playback-stop.png
-%%DATADIR%%/xrc/data/media-skip-forward.png
+%%DATADIR%%/xrc/data/milko.png
 %%DATADIR%%/xrc/data/nona_enblend.mk
 %%DATADIR%%/xrc/data/nona_multilayer.mk
 %%DATADIR%%/xrc/data/nona_smartblend.mk
 %%DATADIR%%/xrc/data/optimize.png
-%%DATADIR%%/xrc/data/optimize.xpm
 %%DATADIR%%/xrc/data/pause.png
 %%DATADIR%%/xrc/data/photometric.png
 %%DATADIR%%/xrc/data/preview.png
 %%DATADIR%%/xrc/data/preview_auto_update.png
 %%DATADIR%%/xrc/data/preview_control_point_tool.png
+%%DATADIR%%/xrc/data/preview_layout.png
+%%DATADIR%%/xrc/data/preview_layout_small.png
 %%DATADIR%%/xrc/data/preview_num_transform.png
 %%DATADIR%%/xrc/data/preview_show_all.png
 %%DATADIR%%/xrc/data/preview_show_none.png
-%%DATADIR%%/xrc/data/print.xpm
-%%DATADIR%%/xrc/data/process-stop.png
-%%DATADIR%%/xrc/data/process-stop16.png
-%%DATADIR%%/xrc/data/process-stop22.png
+%%DATADIR%%/xrc/data/ptbatcher.ico
+%%DATADIR%%/xrc/data/ptbatcher.png
 %%DATADIR%%/xrc/data/ptmender_enblend.mk
 %%DATADIR%%/xrc/data/ptmender_smartblend.mk
+%%DATADIR%%/xrc/data/pto_icon.ico
+%%DATADIR%%/xrc/data/pto_icon.png
 %%DATADIR%%/xrc/data/redo.png
 %%DATADIR%%/xrc/data/reload.png
 %%DATADIR%%/xrc/data/remove_project.png
-%%DATADIR%%/xrc/data/searchfind.xpm
 %%DATADIR%%/xrc/data/skip.png
 %%DATADIR%%/xrc/data/splash.png
+%%DATADIR%%/xrc/data/sponsors.htm
 %%DATADIR%%/xrc/data/start.png
 %%DATADIR%%/xrc/data/stop.png
 %%DATADIR%%/xrc/data/straighten_pano.png
-%%DATADIR%%/xrc/data/straighten_pano.xpm
 %%DATADIR%%/xrc/data/tips.txt
 %%DATADIR%%/xrc/data/transparent.png
 %%DATADIR%%/xrc/data/undo.png
-%%DATADIR%%/xrc/data/zoomin.xpm
-%%DATADIR%%/xrc/data/zoomout.xpm
+%%DATADIR%%/xrc/data/upstream.txt
 %%DATADIR%%/xrc/edit_script_dialog.xrc
-%%DATADIR%%/xrc/edit_text.xrc
-%%DATADIR%%/xrc/help.xrc
 %%DATADIR%%/xrc/images_panel.xrc
-%%DATADIR%%/xrc/keyboard_help.xrc
 %%DATADIR%%/xrc/lens_panel.xrc
 %%DATADIR%%/xrc/main_frame.xrc
 %%DATADIR%%/xrc/main_menu.xrc
 %%DATADIR%%/xrc/main_tool.xrc
+%%DATADIR%%/xrc/mask_editor_panel.xrc
 %%DATADIR%%/xrc/optimize_panel.xrc
 %%DATADIR%%/xrc/optimize_photo_panel.xrc
 %%DATADIR%%/xrc/pano_panel.xrc
 %%DATADIR%%/xrc/pref_dialog.xrc
 %%DATADIR%%/xrc/preview_frame.xrc
 %%DATADIR%%/xrc/reset_dialog.xrc
-%%DATADIR%%/xrc/run_optimizer_frame.xrc
-%%DATADIR%%/xrc/run_stitcher_frame.xrc
-%%DATADIR%%/xrc/vig_corr_dlg.xrc
 share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-ptoptimizer-script.png
 share/locale/bg/LC_MESSAGES/hugin.mo
 share/locale/ca_ES/LC_MESSAGES/hugin.mo
@@ -610,6 +608,7 @@ share/locale/cs_CZ/LC_MESSAGES/hugin.mo
 share/locale/de/LC_MESSAGES/hugin.mo
 share/locale/en_GB/LC_MESSAGES/hugin.mo
 share/locale/es/LC_MESSAGES/hugin.mo
+share/locale/fi/LC_MESSAGES/hugin.mo
 share/locale/fr/LC_MESSAGES/hugin.mo
 share/locale/hu/LC_MESSAGES/hugin.mo
 share/locale/it/LC_MESSAGES/hugin.mo
@@ -627,6 +626,7 @@ 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
 @dirrmtry share/applications
 @dirrmtry share/icons/gnome/48x48/mimetypes
 @dirrmtry share/icons/gnome/48x48