3 files changed, 96 insertions, 212 deletions

diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile
index 99153b04e344..9fce5bd831a0 100644
--- a/graphics/hugin/Makefile
+++ b/graphics/hugin/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	hugin
-PORTVERSION=	2016.2.0
-PORTREVISION=	6
+PORTVERSION=	2017.0.0
+PORTREVISION=	0
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}
 
@@ -38,7 +38,7 @@ SHEBANG_FILES=	src/hugin_script_interface/hpi.py \
 		src/hugin_script_interface/plugins-dev/*.py
 
 OPTIONS_DEFINE=		PANOMATIC AUTOPANOSIFTC PYTHON
-OPTIONS_DEFAULT=	PANOMATIC AUTOPANOSIFTC PYTHON
+OPTIONS_DEFAULT=	PANOMATIC PYTHON
 OPTIONS_SUB=		yes
 
 PANOMATIC_DESC=		Install graphics/panomatic
diff --git a/graphics/hugin/distinfo b/graphics/hugin/distinfo
index 8870a64203a7..e26510f1707d 100644
--- a/graphics/hugin/distinfo
+++ b/graphics/hugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1474439221
-SHA256 (hugin-2016.2.0.tar.bz2) = 54ab1bc8dd94d83c02bfd4082c4454b3b33f0fa56bc17b45cf3e89be87691f15
-SIZE (hugin-2016.2.0.tar.bz2) = 10386216
+TIMESTAMP = 1499403807
+SHA256 (hugin-2017.0.0.tar.bz2) = 86646ea27f32b959d38e7d36270703214b1ae961e379dd64b14d027139cd4609
+SIZE (hugin-2017.0.0.tar.bz2) = 9803272
diff --git a/graphics/hugin/pkg-plist b/graphics/hugin/pkg-plist
index cec729728e7f..3cbf6d03bb66 100644
--- a/graphics/hugin/pkg-plist
+++ b/graphics/hugin/pkg-plist
@@ -1,11 +1,99 @@
+bin/PTBatcherGUI
+bin/align_image_stack
+bin/autooptimiser
+bin/calibrate_lens_gui
+bin/celeste_standalone
+bin/checkpto
+bin/cpclean
+bin/cpfind
+bin/deghosting_mask
+bin/fulla
+bin/geocpset
+bin/hugin
+bin/hugin_executor
+bin/hugin_hdrmerge
+bin/hugin_lensdb
+bin/hugin_stitch_project
+bin/icpfind
+bin/linefind
+bin/nona
+bin/pano_modify
+bin/pano_trafo
+bin/pto_gen
+bin/pto_lensstack
+bin/pto_mask
+bin/pto_merge
+bin/pto_move
+bin/pto_template
+bin/pto_var
+bin/tca_correct
+bin/verdandi
+bin/vig_optimize
+lib/hugin/libceleste.so.0.0
+lib/hugin/libhugin_python_interface.so.0.0
+lib/hugin/libhuginbase.so.0.0
+lib/hugin/libhuginbasewx.so.0.0
+lib/hugin/libicpfindlib.so.0.0
+lib/hugin/liblocalfeatures.so.0.0
+%%PYTHON_SITELIBDIR%%/_hsi.so
+%%PYTHON_SITELIBDIR%%/hpi.py
+%%PYTHON_SITELIBDIR%%/hsi.py
+man/man1/PTBatcherGUI.1.gz
+man/man1/align_image_stack.1.gz
+man/man1/autooptimiser.1.gz
+man/man1/calibrate_lens_gui.1.gz
+man/man1/celeste_standalone.1.gz
+man/man1/checkpto.1.gz
+man/man1/cpclean.1.gz
+man/man1/cpfind.1.gz
+man/man1/deghosting_mask.1.gz
+man/man1/fulla.1.gz
+man/man1/geocpset.1.gz
+man/man1/hugin.1.gz
+man/man1/hugin_executor.1.gz
+man/man1/hugin_hdrmerge.1.gz
+man/man1/hugin_lensdb.1.gz
+man/man1/hugin_stitch_project.1.gz
+man/man1/icpfind.1.gz
+man/man1/linefind.1.gz
+man/man1/nona.1.gz
+man/man1/pano_modify.1.gz
+man/man1/pano_trafo.1.gz
+man/man1/pto_gen.1.gz
+man/man1/pto_lensstack.1.gz
+man/man1/pto_mask.1.gz
+man/man1/pto_merge.1.gz
+man/man1/pto_move.1.gz
+man/man1/pto_template.1.gz
+man/man1/pto_var.1.gz
+man/man1/tca_correct.1.gz
+man/man1/verdandi.1.gz
+man/man1/vig_optimize.1.gz
+share/appdata/PTBatcherGUI.appdata.xml
+share/appdata/calibrate_lens_gui.appdata.xml
+share/appdata/hugin.appdata.xml
+share/applications/PTBatcherGUI.desktop
+share/applications/calibrate_lens_gui.desktop
+share/applications/hugin.desktop
+share/applications/pto_gen.desktop
 %%DATADIR%%/data/blended_stacks.executor
 %%DATADIR%%/data/celeste.model
 %%DATADIR%%/data/default.setting
 %%DATADIR%%/data/fused_layers.executor
 %%DATADIR%%/data/hdr_pano.executor
 %%DATADIR%%/data/hugin_exiftool_copy.arg
+%%DATADIR%%/data/hugin_exiftool_final_example.arg
 %%DATADIR%%/data/normal_enblend.executor
+%%DATADIR%%/data/normal_enblend_cubic.executor
+%%DATADIR%%/data/normal_layered_tiff.executor
 %%DATADIR%%/data/normal_smartblend.executor
+%%DATADIR%%/data/plugins-templates/dual_use.py
+%%DATADIR%%/data/plugins-templates/plugin_skeleton.py
+%%DATADIR%%/data/plugins/README_woa.txt
+%%DATADIR%%/data/plugins/crop_cp.py
+%%DATADIR%%/data/plugins/shooting_pattern.py
+%%DATADIR%%/data/plugins/top_five.py
+%%DATADIR%%/data/plugins/woa.py
 %%DATADIR%%/data/zeronoise.executor
 %%DATADIR%%/xrc/about.xrc
 %%DATADIR%%/xrc/batch_frame.xrc
@@ -293,6 +381,7 @@
 %%DATADIR%%/xrc/data/help_en_EN/Linefind.html
 %%DATADIR%%/xrc/data/help_en_EN/Medinet_habu_horizontal_fisheye.jpg
 %%DATADIR%%/xrc/data/help_en_EN/Medinet_habu_horizontal_stereographic.jpg
+%%DATADIR%%/xrc/data/help_en_EN/Multi_image_techniques.html
 %%DATADIR%%/xrc/data/help_en_EN/NPP.html
 %%DATADIR%%/xrc/data/help_en_EN/Nadir.html
 %%DATADIR%%/xrc/data/help_en_EN/No-parallax_point.html
@@ -357,6 +446,7 @@
 %%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/User_defined_output_sequence.html
 %%DATADIR%%/xrc/data/help_en_EN/Using_Celeste_with_hugin.html
 %%DATADIR%%/xrc/data/help_en_EN/Verdandi.html
 %%DATADIR%%/xrc/data/help_en_EN/Vertical-fisheye.jpg
@@ -382,131 +472,11 @@
 %%DATADIR%%/xrc/data/help_en_EN/fa5313ae442c1ac7f832c141880e3e74.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/magnify-clip.png
 %%DATADIR%%/xrc/data/help_en_EN/manual.css
 %%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
-%%DATADIR%%/xrc/data/help_it_IT/Align_image_stack.html
-%%DATADIR%%/xrc/data/help_it_IT/Alpha_channel.html
-%%DATADIR%%/xrc/data/help_it_IT/Aspect_Ratio.html
-%%DATADIR%%/xrc/data/help_it_IT/Autooptimiser.html
-%%DATADIR%%/xrc/data/help_it_IT/Autopano-sift-C.html
-%%DATADIR%%/xrc/data/help_it_IT/Autopano-sift.html
-%%DATADIR%%/xrc/data/help_it_IT/Autopano.html
-%%DATADIR%%/xrc/data/help_it_IT/Banding.html
-%%DATADIR%%/xrc/data/help_it_IT/Barrel_distortion.html
-%%DATADIR%%/xrc/data/help_it_IT/Bracketing.html
-%%DATADIR%%/xrc/data/help_it_IT/CCD.html
-%%DATADIR%%/xrc/data/help_it_IT/Camera_response_curve.html
-%%DATADIR%%/xrc/data/help_it_IT/Chromatic_aberration.html
-%%DATADIR%%/xrc/data/help_it_IT/Color_correct_tiff.html
-%%DATADIR%%/xrc/data/help_it_IT/Colour_profile.html
-%%DATADIR%%/xrc/data/help_it_IT/Control_points.html
-%%DATADIR%%/xrc/data/help_it_IT/Crop_factor.html
-%%DATADIR%%/xrc/data/help_it_IT/Cropped_TIFF.html
-%%DATADIR%%/xrc/data/help_it_IT/Cubic.html
-%%DATADIR%%/xrc/data/help_it_IT/Cubic_Projection.html
-%%DATADIR%%/xrc/data/help_it_IT/Cylindrical.html
-%%DATADIR%%/xrc/data/help_it_IT/Cylindrical_Projection.html
-%%DATADIR%%/xrc/data/help_it_IT/Cylindrical_panorama.html
-%%DATADIR%%/xrc/data/help_it_IT/Depth_of_Field.html
-%%DATADIR%%/xrc/data/help_it_IT/Dust_Removal_with_Flatfield.html
-%%DATADIR%%/xrc/data/help_it_IT/Dynamic_range.html
-%%DATADIR%%/xrc/data/help_it_IT/EXIF.html
-%%DATADIR%%/xrc/data/help_it_IT/Enblend.html
-%%DATADIR%%/xrc/data/help_it_IT/Enfuse.html
-%%DATADIR%%/xrc/data/help_it_IT/Entrance_pupil.html
-%%DATADIR%%/xrc/data/help_it_IT/Equirectangular.html
-%%DATADIR%%/xrc/data/help_it_IT/Equirectangular_Projection.html
-%%DATADIR%%/xrc/data/help_it_IT/Field_of_View.html
-%%DATADIR%%/xrc/data/help_it_IT/Fisheye_Projection.html
-%%DATADIR%%/xrc/data/help_it_IT/Focal_Length.html
-%%DATADIR%%/xrc/data/help_it_IT/Freepv.html
-%%DATADIR%%/xrc/data/help_it_IT/Fulla.html
-%%DATADIR%%/xrc/data/help_it_IT/GIF.html
-%%DATADIR%%/xrc/data/help_it_IT/Gamma.html
-%%DATADIR%%/xrc/data/help_it_IT/HDR.html
-%%DATADIR%%/xrc/data/help_it_IT/HDR_workflow_with_hugin.html
-%%DATADIR%%/xrc/data/help_it_IT/Horizontal_control_points.html
-%%DATADIR%%/xrc/data/help_it_IT/Hugin.html
-%%DATADIR%%/xrc/data/help_it_IT/Hugin_Assistant_tab.html
-%%DATADIR%%/xrc/data/help_it_IT/Hugin_Batch_Processor.html
-%%DATADIR%%/xrc/data/help_it_IT/Hugin_Batch_Stitcher.html
-%%DATADIR%%/xrc/data/help_it_IT/Hugin_Camera_and_Lens_tab.html
-%%DATADIR%%/xrc/data/help_it_IT/Hugin_Control_Points_tab.html
-%%DATADIR%%/xrc/data/help_it_IT/Hugin_Control_Points_table.html
-%%DATADIR%%/xrc/data/help_it_IT/Hugin_Crop_tab.html
-%%DATADIR%%/xrc/data/help_it_IT/Hugin_Exposure_tab.html
-%%DATADIR%%/xrc/data/help_it_IT/Hugin_FAQ.html
-%%DATADIR%%/xrc/data/help_it_IT/Hugin_Fast_Preview_window.html
-%%DATADIR%%/xrc/data/help_it_IT/Hugin_Images_tab.html
-%%DATADIR%%/xrc/data/help_it_IT/Hugin_Keyboard_shortcuts.html
-%%DATADIR%%/xrc/data/help_it_IT/Hugin_Main_window.html
-%%DATADIR%%/xrc/data/help_it_IT/Hugin_Optimizer_tab.html
-%%DATADIR%%/xrc/data/help_it_IT/Hugin_Preferences.html
-%%DATADIR%%/xrc/data/help_it_IT/Hugin_Preview_window.html
-%%DATADIR%%/xrc/data/help_it_IT/Hugin_Stitcher_tab.html
-%%DATADIR%%/xrc/data/help_it_IT/Hugin_translation_guide.html
-%%DATADIR%%/xrc/data/help_it_IT/Interpolation.html
-%%DATADIR%%/xrc/data/help_it_IT/JPEG.html
-%%DATADIR%%/xrc/data/help_it_IT/Landscape.html
-%%DATADIR%%/xrc/data/help_it_IT/Lens_correction_model.html
-%%DATADIR%%/xrc/data/help_it_IT/Lens_distortion.html
-%%DATADIR%%/xrc/data/help_it_IT/MatchPoint.html
-%%DATADIR%%/xrc/data/help_it_IT/NPP.html
-%%DATADIR%%/xrc/data/help_it_IT/Nadir.html
-%%DATADIR%%/xrc/data/help_it_IT/No-parallax_point.html
-%%DATADIR%%/xrc/data/help_it_IT/Nodal_Point.html
-%%DATADIR%%/xrc/data/help_it_IT/Nona.html
-%%DATADIR%%/xrc/data/help_it_IT/Nona_gui.html
-%%DATADIR%%/xrc/data/help_it_IT/OpenEXR.html
-%%DATADIR%%/xrc/data/help_it_IT/Optimization.html
-%%DATADIR%%/xrc/data/help_it_IT/PNG.html
-%%DATADIR%%/xrc/data/help_it_IT/PPI.html
-%%DATADIR%%/xrc/data/help_it_IT/PSD.html
-%%DATADIR%%/xrc/data/help_it_IT/PTOptimizer.html
-%%DATADIR%%/xrc/data/help_it_IT/PTStitcher.html
-%%DATADIR%%/xrc/data/help_it_IT/PTblender.html
-%%DATADIR%%/xrc/data/help_it_IT/PTmender.html
-%%DATADIR%%/xrc/data/help_it_IT/PTtiff2psd.html
-%%DATADIR%%/xrc/data/help_it_IT/Pano12.html
-%%DATADIR%%/xrc/data/help_it_IT/Panoglview.html
-%%DATADIR%%/xrc/data/help_it_IT/Panoinfo.html
-%%DATADIR%%/xrc/data/help_it_IT/Panomatic.html
-%%DATADIR%%/xrc/data/help_it_IT/Panorama.html
-%%DATADIR%%/xrc/data/help_it_IT/Panorama_formats.html
-%%DATADIR%%/xrc/data/help_it_IT/Panorama_tools.html
-%%DATADIR%%/xrc/data/help_it_IT/Panotools.html
-%%DATADIR%%/xrc/data/help_it_IT/Parallax.html
-%%DATADIR%%/xrc/data/help_it_IT/Perspective_correction.html
-%%DATADIR%%/xrc/data/help_it_IT/Perspective_distortion.html
-%%DATADIR%%/xrc/data/help_it_IT/Pincushion_distortion.html
-%%DATADIR%%/xrc/data/help_it_IT/Pitch.html
-%%DATADIR%%/xrc/data/help_it_IT/Portrait.html
-%%DATADIR%%/xrc/data/help_it_IT/Projections.html
-%%DATADIR%%/xrc/data/help_it_IT/QTVR.html
-%%DATADIR%%/xrc/data/help_it_IT/RAW.html
-%%DATADIR%%/xrc/data/help_it_IT/RGBE.html
-%%DATADIR%%/xrc/data/help_it_IT/Rectilinear_Projection.html
-%%DATADIR%%/xrc/data/help_it_IT/Roll.html
-%%DATADIR%%/xrc/data/help_it_IT/Spherical.html
-%%DATADIR%%/xrc/data/help_it_IT/Stereographic_Projection.html
-%%DATADIR%%/xrc/data/help_it_IT/Straight_line_control_points.html
-%%DATADIR%%/xrc/data/help_it_IT/TIFF.html
-%%DATADIR%%/xrc/data/help_it_IT/Tone_mapping.html
-%%DATADIR%%/xrc/data/help_it_IT/Vertical_control_points.html
-%%DATADIR%%/xrc/data/help_it_IT/Vignetting.html
-%%DATADIR%%/xrc/data/help_it_IT/Wavy_distortion.html
-%%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/hugin_small.png
@@ -572,92 +542,6 @@
 %%DATADIR%%/xrc/pref_dialog.xrc
 %%DATADIR%%/xrc/preview_frame.xrc
 %%DATADIR%%/xrc/reset_dialog.xrc
-%%PYTHON%%%%DATADIR%%/data/plugins-templates/dual_use.py
-%%PYTHON%%%%DATADIR%%/data/plugins-templates/plugin_skeleton.py
-%%PYTHON%%%%DATADIR%%/data/plugins/README_woa.txt
-%%PYTHON%%%%DATADIR%%/data/plugins/crop_cp.py
-%%PYTHON%%%%DATADIR%%/data/plugins/shooting_pattern.py
-%%PYTHON%%%%DATADIR%%/data/plugins/top_five.py
-%%PYTHON%%%%DATADIR%%/data/plugins/woa.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/_hsi.so
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/hpi.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/hsi.py
-%%PYTHON%%lib/hugin/libhugin_python_interface.so.0.0
-bin/PTBatcherGUI
-bin/align_image_stack
-bin/autooptimiser
-bin/calibrate_lens_gui
-bin/celeste_standalone
-bin/checkpto
-bin/cpclean
-bin/cpfind
-bin/deghosting_mask
-bin/fulla
-bin/geocpset
-bin/hugin
-bin/hugin_executor
-bin/hugin_hdrmerge
-bin/hugin_lensdb
-bin/hugin_stitch_project
-bin/icpfind
-bin/linefind
-bin/nona
-bin/pano_modify
-bin/pano_trafo
-bin/pto_gen
-bin/pto_lensstack
-bin/pto_mask
-bin/pto_merge
-bin/pto_move
-bin/pto_template
-bin/pto_var
-bin/tca_correct
-bin/verdandi
-bin/vig_optimize
-lib/hugin/libceleste.so.0.0
-lib/hugin/libhuginbase.so.0.0
-lib/hugin/libhuginbasewx.so.0.0
-lib/hugin/libhuginlines.so.0.0
-lib/hugin/libicpfindlib.so.0.0
-lib/hugin/liblocalfeatures.so.0.0
-man/man1/PTBatcherGUI.1.gz
-man/man1/align_image_stack.1.gz
-man/man1/autooptimiser.1.gz
-man/man1/calibrate_lens_gui.1.gz
-man/man1/celeste_standalone.1.gz
-man/man1/checkpto.1.gz
-man/man1/cpclean.1.gz
-man/man1/cpfind.1.gz
-man/man1/deghosting_mask.1.gz
-man/man1/fulla.1.gz
-man/man1/geocpset.1.gz
-man/man1/hugin.1.gz
-man/man1/hugin_executor.1.gz
-man/man1/hugin_hdrmerge.1.gz
-man/man1/hugin_lensdb.1.gz
-man/man1/hugin_stitch_project.1.gz
-man/man1/icpfind.1.gz
-man/man1/linefind.1.gz
-man/man1/nona.1.gz
-man/man1/pano_modify.1.gz
-man/man1/pano_trafo.1.gz
-man/man1/pto_gen.1.gz
-man/man1/pto_lensstack.1.gz
-man/man1/pto_mask.1.gz
-man/man1/pto_merge.1.gz
-man/man1/pto_move.1.gz
-man/man1/pto_template.1.gz
-man/man1/pto_var.1.gz
-man/man1/tca_correct.1.gz
-man/man1/verdandi.1.gz
-man/man1/vig_optimize.1.gz
-share/appdata/PTBatcherGUI.appdata.xml
-share/appdata/calibrate_lens_gui.appdata.xml
-share/appdata/hugin.appdata.xml
-share/applications/PTBatcherGUI.desktop
-share/applications/calibrate_lens_gui.desktop
-share/applications/hugin.desktop
-share/applications/pto_gen.desktop
 share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-ptoptimizer-script.png
 share/locale/ca_ES/LC_MESSAGES/hugin.mo
 share/locale/ca_ES@valencia/LC_MESSAGES/hugin.mo