Upgrade graphics/hugin from 0.7.r3135 to 0.7.0.

4 files changed, 132 insertions, 9 deletions

diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile
index a6049cda73c8..ca6adbfaf261 100644
--- a/graphics/hugin/Makefile
+++ b/graphics/hugin/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	hugin
-PORTVERSION=	0.7.r3135
+PORTVERSION=	0.7.0
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	vd/hugin
+MASTER_SITES=	SF
 
 MAINTAINER=	vd@FreeBSD.org
 COMMENT=	A GUI for Panorama Tools, to stitch panoramic images
@@ -22,7 +21,8 @@ LIB_DEPENDS=	tiff:${PORTSDIR}/graphics/tiff \
 		pano13:${PORTSDIR}/graphics/libpano13 \
 		boost_date_time:${PORTSDIR}/devel/boost
 RUN_DEPENDS=	enblend>=3.1.r20080615:${PORTSDIR}/graphics/enblend \
-		exiftool:${PORTSDIR}/graphics/p5-Image-ExifTool
+		exiftool:${PORTSDIR}/graphics/p5-Image-ExifTool \
+		gmake:${PORTSDIR}/devel/gmake
 
 # TODO add autopano-sift-C to the ports collection and hook it here as
 # an optional dependency
@@ -30,8 +30,6 @@ RUN_DEPENDS=	enblend>=3.1.r20080615:${PORTSDIR}/graphics/enblend \
 OPTIONS=	PANOMATIC "Install graphics/panomatic" on \
 		AUTOPANOSIFT "Install graphics/autopano-sift" on
 
-USE_BZIP2=	yes
-
 USE_CMAKE=	yes
 
 CMAKE_ARGS=	-DwxWidgets_CONFIG_EXECUTABLE=${WX_CONFIG}
diff --git a/graphics/hugin/distinfo b/graphics/hugin/distinfo
index 97e2c4249399..693991b4ae04 100644
--- a/graphics/hugin/distinfo
+++ b/graphics/hugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (hugin-0.7.r3135.tar.bz2) = db441446f61e4b185e170f580042c875
-SHA256 (hugin-0.7.r3135.tar.bz2) = 39c3f0f6f8afd0896a0973e75d7179342fe49ca7de8f50c16b2ba76a83f05d55
-SIZE (hugin-0.7.r3135.tar.bz2) = 3704233
+MD5 (hugin-0.7.0.tar.gz) = 6efbfc72ceba028ca3dff3c23806a7f3
+SHA256 (hugin-0.7.0.tar.gz) = 8e31fad113d60881c229d0eaf9c9971cbc0082a7148014b6980f3f92fedf7959
+SIZE (hugin-0.7.0.tar.gz) = 6074207
diff --git a/graphics/hugin/files/patch-src_hugin1_base_wx_RunStitchPanel.cpp b/graphics/hugin/files/patch-src_hugin1_base_wx_RunStitchPanel.cpp
new file mode 100644
index 000000000000..f39793709250
--- /dev/null
+++ b/graphics/hugin/files/patch-src_hugin1_base_wx_RunStitchPanel.cpp
@@ -0,0 +1,11 @@
+--- src/hugin1/base_wx/RunStitchPanel.cpp.orig	2008-12-03 14:29:01.000000000 +0200
++++ src/hugin1/base_wx/RunStitchPanel.cpp	2008-12-03 14:31:30.000000000 +0200
+@@ -240,6 +240,8 @@
+             cmd = wxT("make");  
+         }
+         cmd += wxT(" ") + args;
++#elif defined __FreeBSD__
++        wxString cmd = wxT("gmake ") + args;  
+ #else
+         wxString cmd = wxT("make ") + args;  
+ #endif
diff --git a/graphics/hugin/pkg-plist b/graphics/hugin/pkg-plist
index 3c318d0034cd..371f97aae28a 100644
--- a/graphics/hugin/pkg-plist
+++ b/graphics/hugin/pkg-plist
@@ -7,6 +7,7 @@ bin/hugin_stitch_project
 bin/matchpoint
 bin/nona
 bin/nona_gui
+bin/pto2mk
 bin/tca_correct
 bin/vig_optimize
 lib/libhuginANN.so
@@ -54,8 +55,59 @@ share/applications/hugin_stitch_project.desktop
 %%DATADIR%%/xrc/data/filesaveas.png
 %%DATADIR%%/xrc/data/find.png
 %%DATADIR%%/xrc/data/fit_pano.xpm
+%%DATADIR%%/xrc/data/help_en_EN/100px-Big_ben_transverse_mercator.jpg
+%%DATADIR%%/xrc/data/help_en_EN/100px-PC_img01.jpg
+%%DATADIR%%/xrc/data/help_en_EN/100px-PC_img02.jpg
+%%DATADIR%%/xrc/data/help_en_EN/100px-PC_img03.jpg
+%%DATADIR%%/xrc/data/help_en_EN/100px-PC_img04.jpg
+%%DATADIR%%/xrc/data/help_en_EN/100px-PC_img05.jpg
+%%DATADIR%%/xrc/data/help_en_EN/100px-PC_img06.jpg
+%%DATADIR%%/xrc/data/help_en_EN/100px-PC_img07.jpg
+%%DATADIR%%/xrc/data/help_en_EN/100px-PC_img08.jpg
+%%DATADIR%%/xrc/data/help_en_EN/100px-PC_img09.jpg
+%%DATADIR%%/xrc/data/help_en_EN/120px-Flatfield1_Munich.jpg
+%%DATADIR%%/xrc/data/help_en_EN/120px-Flatfield2_Munich.jpg
+%%DATADIR%%/xrc/data/help_en_EN/120px-Flatfield3_Munich.jpg
+%%DATADIR%%/xrc/data/help_en_EN/120px-Flatfield4_Munich.jpg
+%%DATADIR%%/xrc/data/help_en_EN/150px-Big_ben_fisheye.jpg
+%%DATADIR%%/xrc/data/help_en_EN/150px-Big_ben_rectilinear.jpg
+%%DATADIR%%/xrc/data/help_en_EN/150px-Big_ben_stereographic.jpg
 %%DATADIR%%/xrc/data/help_en_EN/16bit_workflow_with_hugin.html
+%%DATADIR%%/xrc/data/help_en_EN/17af7474cdfd5abe24fd07eb58810dba.png
+%%DATADIR%%/xrc/data/help_en_EN/180px-2125768589_b.jpg
+%%DATADIR%%/xrc/data/help_en_EN/180px-Focal_length.gif
+%%DATADIR%%/xrc/data/help_en_EN/180px-Lamp_enfuse.jpg
+%%DATADIR%%/xrc/data/help_en_EN/1f09c25c5247c1eaf121df644ca42f8c.png
+%%DATADIR%%/xrc/data/help_en_EN/200px-Big_ben_cubic.jpg
+%%DATADIR%%/xrc/data/help_en_EN/200px-Big_ben_cylindrical.jpg
+%%DATADIR%%/xrc/data/help_en_EN/200px-Big_ben_equirectangular.jpg
+%%DATADIR%%/xrc/data/help_en_EN/200px-Big_ben_mercator.jpg
+%%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/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-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/38d368a092f7d5a4d2b42bdf4d0dd89c.png
+%%DATADIR%%/xrc/data/help_en_EN/3d6de401d007ea0cffc99610ad623239.png
+%%DATADIR%%/xrc/data/help_en_EN/532cd2696f6296132aaf8dc65152c28e.png
+%%DATADIR%%/xrc/data/help_en_EN/5f558fa7e9b1567daca23dc3433f5cec.png
+%%DATADIR%%/xrc/data/help_en_EN/600px-Tuebingen_Neckarfront_small15_2006-06-11.jpg
+%%DATADIR%%/xrc/data/help_en_EN/600px-Tuebingen_Neckarfront_withdustspots_small15_2006-06-11.jpg
+%%DATADIR%%/xrc/data/help_en_EN/687431209ed4a8feab0c151b622ef1e0.png
+%%DATADIR%%/xrc/data/help_en_EN/6e1e330821217bd2d14c40ea21747a03.png
+%%DATADIR%%/xrc/data/help_en_EN/7a62f58ab1c3f78523eee522e71a9416.png
+%%DATADIR%%/xrc/data/help_en_EN/81b4c8dd7cbec41cae5ef37da5644e99.png
+%%DATADIR%%/xrc/data/help_en_EN/89539baed8c394f4b6eea437f16b047d.png
+%%DATADIR%%/xrc/data/help_en_EN/98dda29ec0838b4a60698e962d90cd03.png
 %%DATADIR%%/xrc/data/help_en_EN/Aliasing.html
+%%DATADIR%%/xrc/data/help_en_EN/AliasingPScubic.jpg
+%%DATADIR%%/xrc/data/help_en_EN/AliasingPScubic_2x.jpg
+%%DATADIR%%/xrc/data/help_en_EN/AliasingPTpoly3.jpg
+%%DATADIR%%/xrc/data/help_en_EN/AliasingPTpoly3_2x.jpg
 %%DATADIR%%/xrc/data/help_en_EN/Align_a_stack_of_photos.html
 %%DATADIR%%/xrc/data/help_en_EN/Align_image_stack.html
 %%DATADIR%%/xrc/data/help_en_EN/Alpha_channel.html
@@ -65,8 +117,30 @@ share/applications/hugin_stitch_project.desktop
 %%DATADIR%%/xrc/data/help_en_EN/Autopano-sift.html
 %%DATADIR%%/xrc/data/help_en_EN/Autopano.html
 %%DATADIR%%/xrc/data/help_en_EN/Banding.html
+%%DATADIR%%/xrc/data/help_en_EN/Barrel-distortion.jpg
 %%DATADIR%%/xrc/data/help_en_EN/Barrel_distortion.html
+%%DATADIR%%/xrc/data/help_en_EN/Big_ben_circ_fisheye.jpg
+%%DATADIR%%/xrc/data/help_en_EN/Big_ben_cubic.jpg
+%%DATADIR%%/xrc/data/help_en_EN/Big_ben_cylindrical.jpg
+%%DATADIR%%/xrc/data/help_en_EN/Big_ben_equirectangular.jpg
+%%DATADIR%%/xrc/data/help_en_EN/Big_ben_ff_fisheye.jpg
+%%DATADIR%%/xrc/data/help_en_EN/Big_ben_rectilinear.jpg
+%%DATADIR%%/xrc/data/help_en_EN/Big_ben_stereographic.jpg
 %%DATADIR%%/xrc/data/help_en_EN/Bracketing.html
+%%DATADIR%%/xrc/data/help_en_EN/Bubble-distortion.jpg
+%%DATADIR%%/xrc/data/help_en_EN/CA_artifical_B_Y.jpg
+%%DATADIR%%/xrc/data/help_en_EN/CA_artifical_R_C.jpg
+%%DATADIR%%/xrc/data/help_en_EN/CA_fringes00.jpg
+%%DATADIR%%/xrc/data/help_en_EN/CA_fringes01.gif
+%%DATADIR%%/xrc/data/help_en_EN/CA_fringes01.jpg
+%%DATADIR%%/xrc/data/help_en_EN/CA_strange01.gif
+%%DATADIR%%/xrc/data/help_en_EN/CA_strange01.jpg
+%%DATADIR%%/xrc/data/help_en_EN/CA_strange02.jpg
+%%DATADIR%%/xrc/data/help_en_EN/CA_tCA00.jpg
+%%DATADIR%%/xrc/data/help_en_EN/CA_tCA01.gif
+%%DATADIR%%/xrc/data/help_en_EN/CA_tCA01.jpg
+%%DATADIR%%/xrc/data/help_en_EN/CA_tCA02.jpg
+%%DATADIR%%/xrc/data/help_en_EN/CA_tCA03.jpg
 %%DATADIR%%/xrc/data/help_en_EN/CCD.html
 %%DATADIR%%/xrc/data/help_en_EN/CMakeLists.txt
 %%DATADIR%%/xrc/data/help_en_EN/Camera_response_curve.html
@@ -92,6 +166,7 @@ share/applications/hugin_stitch_project.desktop
 %%DATADIR%%/xrc/data/help_en_EN/Equirectangular_Projection.html
 %%DATADIR%%/xrc/data/help_en_EN/Field_of_View.html
 %%DATADIR%%/xrc/data/help_en_EN/Fisheye_Projection.html
+%%DATADIR%%/xrc/data/help_en_EN/Flags.png
 %%DATADIR%%/xrc/data/help_en_EN/Focal_Length.html
 %%DATADIR%%/xrc/data/help_en_EN/Freepv.html
 %%DATADIR%%/xrc/data/help_en_EN/Fulla.html
@@ -115,6 +190,29 @@ share/applications/hugin_stitch_project.desktop
 %%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_Stitcher_tab.html
+%%DATADIR%%/xrc/data/help_en_EN/Hugin_center_pano.png
+%%DATADIR%%/xrc/data/help_en_EN/Hugin_edit_add.png
+%%DATADIR%%/xrc/data/help_en_EN/Hugin_filenew.png
+%%DATADIR%%/xrc/data/help_en_EN/Hugin_fileopen.png
+%%DATADIR%%/xrc/data/help_en_EN/Hugin_filesave.png
+%%DATADIR%%/xrc/data/help_en_EN/Hugin_filesaveas.png
+%%DATADIR%%/xrc/data/help_en_EN/Hugin_fit_pano.png
+%%DATADIR%%/xrc/data/help_en_EN/Hugin_info.png
+%%DATADIR%%/xrc/data/help_en_EN/Hugin_list.png
+%%DATADIR%%/xrc/data/help_en_EN/Hugin_optimize.png
+%%DATADIR%%/xrc/data/help_en_EN/Hugin_preview.png
+%%DATADIR%%/xrc/data/help_en_EN/Hugin_preview_auto_update.png
+%%DATADIR%%/xrc/data/help_en_EN/Hugin_preview_num_transform.png
+%%DATADIR%%/xrc/data/help_en_EN/Hugin_preview_show_all.png
+%%DATADIR%%/xrc/data/help_en_EN/Hugin_preview_show_none.png
+%%DATADIR%%/xrc/data/help_en_EN/Hugin_redo.png
+%%DATADIR%%/xrc/data/help_en_EN/Hugin_reload.png
+%%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/Interpolate_none.jpg
+%%DATADIR%%/xrc/data/help_en_EN/Interpolate_poly3.jpg
+%%DATADIR%%/xrc/data/help_en_EN/Interpolate_sinc256.jpg
 %%DATADIR%%/xrc/data/help_en_EN/Interpolation.html
 %%DATADIR%%/xrc/data/help_en_EN/JPEG.html
 %%DATADIR%%/xrc/data/help_en_EN/LICENCE.manual
@@ -122,6 +220,8 @@ share/applications/hugin_stitch_project.desktop
 %%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/MatchPoint.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/NPP.html
 %%DATADIR%%/xrc/data/help_en_EN/Nadir.html
 %%DATADIR%%/xrc/data/help_en_EN/No-parallax_point.html
@@ -145,9 +245,11 @@ share/applications/hugin_stitch_project.desktop
 %%DATADIR%%/xrc/data/help_en_EN/Panorama_formats.html
 %%DATADIR%%/xrc/data/help_en_EN/Panorama_tools.html
 %%DATADIR%%/xrc/data/help_en_EN/Panotools.html
+%%DATADIR%%/xrc/data/help_en_EN/Parallax.gif
 %%DATADIR%%/xrc/data/help_en_EN/Parallax.html
 %%DATADIR%%/xrc/data/help_en_EN/Perspective_correction.html
 %%DATADIR%%/xrc/data/help_en_EN/Perspective_distortion.html
+%%DATADIR%%/xrc/data/help_en_EN/Pincushion-distortion.jpg
 %%DATADIR%%/xrc/data/help_en_EN/Pincushion_distortion.html
 %%DATADIR%%/xrc/data/help_en_EN/Pitch.html
 %%DATADIR%%/xrc/data/help_en_EN/Portrait.html
@@ -155,6 +257,7 @@ share/applications/hugin_stitch_project.desktop
 %%DATADIR%%/xrc/data/help_en_EN/QTVR.html
 %%DATADIR%%/xrc/data/help_en_EN/RAW.html
 %%DATADIR%%/xrc/data/help_en_EN/RGBE.html
+%%DATADIR%%/xrc/data/help_en_EN/RatingStar_002.jpg
 %%DATADIR%%/xrc/data/help_en_EN/Rectilinear_Projection.html
 %%DATADIR%%/xrc/data/help_en_EN/Roll.html
 %%DATADIR%%/xrc/data/help_en_EN/Spherical.html
@@ -162,11 +265,21 @@ share/applications/hugin_stitch_project.desktop
 %%DATADIR%%/xrc/data/help_en_EN/Straight_line_control_points.html
 %%DATADIR%%/xrc/data/help_en_EN/TIFF.html
 %%DATADIR%%/xrc/data/help_en_EN/Tone_mapping.html
+%%DATADIR%%/xrc/data/help_en_EN/Vertical-fisheye.jpg
+%%DATADIR%%/xrc/data/help_en_EN/Vertical-stereographic.jpg
 %%DATADIR%%/xrc/data/help_en_EN/Vertical_control_points.html
 %%DATADIR%%/xrc/data/help_en_EN/Vignetting.html
 %%DATADIR%%/xrc/data/help_en_EN/Wavy_distortion.html
 %%DATADIR%%/xrc/data/help_en_EN/Yaw.html
 %%DATADIR%%/xrc/data/help_en_EN/Zenith.html
+%%DATADIR%%/xrc/data/help_en_EN/b27abc434a11d07b390df859d7aa782a.png
+%%DATADIR%%/xrc/data/help_en_EN/c398d95d4b6e864a2b448a53b5a245fd.png
+%%DATADIR%%/xrc/data/help_en_EN/cc88199a6c96fed69af02f61e67435b6.png
+%%DATADIR%%/xrc/data/help_en_EN/ccf48cf728225d3dcecf1f74e74dafa3.png
+%%DATADIR%%/xrc/data/help_en_EN/d4466e5ff97cd6bbdddc514f3a28fb88.png
+%%DATADIR%%/xrc/data/help_en_EN/db71893e7683801204b25f076e7db8b3.png
+%%DATADIR%%/xrc/data/help_en_EN/e49f330a1a85dbab8724c8177de38cb0.png
+%%DATADIR%%/xrc/data/help_en_EN/fd9eb36b9149cc4e2efebd10bdc4fdf2.png
 %%DATADIR%%/xrc/data/help_en_EN/hugin.hhc
 %%DATADIR%%/xrc/data/help_en_EN/hugin.hhk
 %%DATADIR%%/xrc/data/help_en_EN/hugin.hhp
@@ -229,6 +342,7 @@ share/applications/hugin_stitch_project.desktop
 %%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
 share/locale/cs_CZ/LC_MESSAGES/hugin.mo
 share/locale/de/LC_MESSAGES/hugin.mo