Update from 7.12.x to 7.14.4. Switch to GraphicsMagick.

4 files changed, 132 insertions, 135 deletions

diff --git a/graphics/nip2/Makefile b/graphics/nip2/Makefile
index 23ee73eddbe3..b104fbc831a4 100644
--- a/graphics/nip2/Makefile
+++ b/graphics/nip2/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	nip2
-PORTVERSION=	7.12.4
-PORTREVISION=	1
+PORTVERSION=	7.14.4
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.vips.ecs.soton.ac.uk/vips-${PORTVERSION:R}/
+MASTER_SITES=	http://www.vips.ecs.soton.ac.uk/supported/${PORTVERSION:R}/
 
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Graphical user interface for VIPS
diff --git a/graphics/nip2/distinfo b/graphics/nip2/distinfo
index ecad7e8f3f4c..738743529c1c 100644
--- a/graphics/nip2/distinfo
+++ b/graphics/nip2/distinfo
@@ -1,3 +1,3 @@
-MD5 (nip2-7.12.4.tar.gz) = d9d9cf35fe47385e2eb4200cc02a9dd3
-SHA256 (nip2-7.12.4.tar.gz) = 904e010e0025510f0c587cd0a0c44a599134de7402f13ace898e3570763992ea
-SIZE (nip2-7.12.4.tar.gz) = 8311116
+MD5 (nip2-7.14.4.tar.gz) = 453c8f3f1893088fbc10e6ddbdb20245
+SHA256 (nip2-7.14.4.tar.gz) = 9e35bf9232b5cac47eb290db3dfbb1ceeed103718c662db2a1fab00e0d916a54
+SIZE (nip2-7.14.4.tar.gz) = 8385200
diff --git a/graphics/nip2/files/patch-po-Makefile.in.in b/graphics/nip2/files/patch-po-Makefile.in.in
deleted file mode 100644
index 050d50ee11de..000000000000
--- a/graphics/nip2/files/patch-po-Makefile.in.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- po/Makefile.in.in.orig	Thu Dec 14 17:24:22 2006
-+++ po/Makefile.in.in	Thu Dec 14 17:24:51 2006
-@@ -34,7 +34,7 @@
- datarootdir = @datarootdir@
- libdir = @libdir@
- DATADIRNAME = @DATADIRNAME@
--itlocaledir = $(prefix)/$(DATADIRNAME)/locale
-+itlocaledir = $(datadir)/locale
- subdir = po
- install_sh = @install_sh@
- # Automake >= 1.8 provides @mkdir_p@.
-@@ -44,8 +44,8 @@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- 
--GMSGFMT = @GMSGFMT@
--MSGFMT = @MSGFMT@
-+GMSGFMT = @INTLTOOL_MSGFMT@
-+MSGFMT = @INTLTOOL_MSGFMT@
- XGETTEXT = @XGETTEXT@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
diff --git a/graphics/nip2/pkg-plist b/graphics/nip2/pkg-plist
index 9f08e1b08448..b7278851a29b 100644
--- a/graphics/nip2/pkg-plist
+++ b/graphics/nip2/pkg-plist
@@ -1,18 +1,104 @@
 bin/nip2
 bin/run-nip2.sh
-share/locale/en_GB/LC_MESSAGES/nip2.mo
-share/nip2/compat/7.8/Capture.def
+share/nip2/rc/ipgtkrc
+share/nip2/data/examples/logo/logo2.ws
+share/nip2/data/examples/1_point_mosiac/cd1.2.jpg
+share/nip2/data/examples/1_point_mosiac/cd4.2.jpg
+share/nip2/data/examples/1_point_mosiac/cd2.1.jpg
+share/nip2/data/examples/1_point_mosiac/cd4.1.jpg
+share/nip2/data/examples/1_point_mosiac/cd1.1.jpg
+share/nip2/data/examples/1_point_mosiac/cd3.2.jpg
+share/nip2/data/examples/1_point_mosiac/cd2.2.jpg
+share/nip2/data/examples/1_point_mosiac/cd3.1.jpg
+share/nip2/data/examples/1_point_mosiac/1pt_mosaic.ws
+share/nip2/data/examples/overlays_and_blending/overlay_blend.ws
+share/nip2/data/examples/overlays_and_blending/blend_example_ir.jpg
+share/nip2/data/examples/overlays_and_blending/blend_example_vis.jpg
+share/nip2/data/examples/overlays_and_blending/blend_example_xray.jpg
+share/nip2/data/examples/manual_balance/mask_01.png
+share/nip2/data/examples/manual_balance/mask_02.png
+share/nip2/data/examples/manual_balance/simp_base.png
+share/nip2/data/examples/manual_balance/mask_03.png
+share/nip2/data/examples/manual_balance/mask_control.png
+share/nip2/data/examples/manual_balance/manual_balance.ws
+share/nip2/data/examples/2_point_mosiac/example_im_02.jpg
+share/nip2/data/examples/2_point_mosiac/example_im_04.jpg
+share/nip2/data/examples/2_point_mosiac/example_im_03.jpg
+share/nip2/data/examples/2_point_mosiac/full_image.jpg
+share/nip2/data/examples/2_point_mosiac/example_im_01.jpg
+share/nip2/data/examples/2_point_mosiac/example_im_05.jpg
+share/nip2/data/examples/2_point_mosiac/example_im_06.jpg
+share/nip2/data/examples/2_point_mosiac/2pts_mosaic.ws
+share/nip2/data/examples/registering/example_im_2.jpg
+share/nip2/data/examples/registering/registering.ws
+share/nip2/data/examples/registering/example_im_1.jpg
+share/nip2/data/examples/registering/example_im_4.jpg
+share/nip2/data/examples/registering/example_im_3.jpg
+share/nip2/data/examples/clone/clone.ws
+share/nip2/data/examples/clone/example_im_01.png
+share/nip2/data/examples/clone/example_im_02.png
+share/nip2/data/examples/businesscard/businesscard.ws
+share/nip2/data/examples/businesscard/slanted_oval_vase2.jpg
+share/nip2/data/examples/framing/framing_distorted_frame.png
+share/nip2/data/examples/framing/framing.ws
+share/nip2/data/examples/framing/framing_complex.png
+share/nip2/data/examples/framing/framing_corner.png
+share/nip2/data/examples/framing/framing_picture.jpg
+share/nip2/data/examples/print_test_image.v
+share/nip2/data/rachel.con
+share/nip2/data/AdobeRGB1998.icc
+share/nip2/data/sRGB.icm
+share/nip2/data/macbeth_lab_d65.mat
+share/nip2/data/macbeth_lab_d50.mat
+share/nip2/data/vips-128.png
+share/nip2/data/nip2-icon.ico
+share/nip2/data/HP5000_UVDuraImageGlossMaxQ.icc
+share/nip2/data/stock-tool-ink-22.png
+share/nip2/data/stock-tool-path-22.png
+share/nip2/data/stock-tool-text-22.png
+share/nip2/data/stock-tool-smudge-22.png
+share/nip2/data/stock-tool-bucket-fill-22.png
+share/nip2/data/stock-tool-rect-select-22.png
+share/nip2/data/stock-tool-select-22.png
+share/nip2/data/nip-slider-16.png
+share/nip2/data/stock-tool-move-22.png
+share/nip2/data/stock-led-red-18.png
+share/nip2/data/stock-led-green-18.png
+share/nip2/data/stock-led-blue-18.png
+share/nip2/data/stock-led-cyan-18.png
+share/nip2/data/stock-led-yellow-18.png
+share/nip2/data/stock-led-off-18.png
+share/nip2/start/Math.def
+share/nip2/start/Image.def
+share/nip2/start/Colour.def
+share/nip2/start/Tasks.def
+share/nip2/start/Object.def
+share/nip2/start/Filter.def
+share/nip2/start/Matrix.def
+share/nip2/start/Widgets.def
+share/nip2/start/Histogram.def
+share/nip2/start/Preferences.ws
+share/nip2/start/_joe_extra.def
+share/nip2/start/_joe_utilities.def
+share/nip2/start/_convert.def
+share/nip2/start/_generate.def
+share/nip2/start/_list.def
+share/nip2/start/_predicate.def
+share/nip2/start/_stdenv.def
+share/nip2/start/_Object.def
+share/nip2/start/_types.def
+share/nip2/compat/7.8/Math.def
+share/nip2/compat/7.8/Image.def
+share/nip2/compat/7.8/Mosaic.def
 share/nip2/compat/7.8/Colour.def
-share/nip2/compat/7.8/Filter.def
+share/nip2/compat/7.8/Resize.def
+share/nip2/compat/7.8/Capture.def
 share/nip2/compat/7.8/Format.def
-share/nip2/compat/7.8/Histogram.def
-share/nip2/compat/7.8/Image.def
-share/nip2/compat/7.8/Math.def
+share/nip2/compat/7.8/Filter.def
 share/nip2/compat/7.8/Morphology.def
-share/nip2/compat/7.8/Mosaic.def
 share/nip2/compat/7.8/New.def
+share/nip2/compat/7.8/Histogram.def
 share/nip2/compat/7.8/Print.def
-share/nip2/compat/7.8/Resize.def
 share/nip2/compat/7.8/Rotate.def
 share/nip2/compat/7.8/Statistics.def
 share/nip2/compat/7.8/X_ray.def
@@ -23,18 +109,18 @@ share/nip2/compat/7.8/_list.def
 share/nip2/compat/7.8/_predicate.def
 share/nip2/compat/7.8/_stdenv.def
 share/nip2/compat/7.8/_types.def
-share/nip2/compat/7.9/Capture.def
+share/nip2/compat/7.9/Math.def
+share/nip2/compat/7.9/Image.def
+share/nip2/compat/7.9/Mosaic.def
 share/nip2/compat/7.9/Colour.def
-share/nip2/compat/7.9/Filter.def
+share/nip2/compat/7.9/Resize.def
+share/nip2/compat/7.9/Capture.def
 share/nip2/compat/7.9/Format.def
-share/nip2/compat/7.9/Histogram.def
-share/nip2/compat/7.9/Image.def
-share/nip2/compat/7.9/Math.def
+share/nip2/compat/7.9/Filter.def
 share/nip2/compat/7.9/Morphology.def
-share/nip2/compat/7.9/Mosaic.def
 share/nip2/compat/7.9/New.def
+share/nip2/compat/7.9/Histogram.def
 share/nip2/compat/7.9/Print.def
-share/nip2/compat/7.9/Resize.def
 share/nip2/compat/7.9/Rotate.def
 share/nip2/compat/7.9/Statistics.def
 share/nip2/compat/7.9/X_ray.def
@@ -46,111 +132,44 @@ share/nip2/compat/7.9/_predicate.def
 share/nip2/compat/7.9/_stdenv.def
 share/nip2/compat/7.9/_types.def
 share/nip2/compat/7.10/Colour.def
+share/nip2/compat/7.10/_convert.def
 share/nip2/compat/7.10/Filter.def
 share/nip2/compat/7.10/Format.def
+share/nip2/compat/7.10/_generate.def
 share/nip2/compat/7.10/Histogram.def
 share/nip2/compat/7.10/Image.def
-share/nip2/compat/7.10/Math.def
-share/nip2/compat/7.10/Matrix.def
-share/nip2/compat/7.10/Tasks.def
-share/nip2/compat/7.10/Widgets.def
-share/nip2/compat/7.10/_convert.def
-share/nip2/compat/7.10/_generate.def
 share/nip2/compat/7.10/_joe_extra.def
 share/nip2/compat/7.10/_joe_utilities.def
 share/nip2/compat/7.10/_list.def
+share/nip2/compat/7.10/Math.def
+share/nip2/compat/7.10/Matrix.def
 share/nip2/compat/7.10/_predicate.def
 share/nip2/compat/7.10/_stdenv.def
+share/nip2/compat/7.10/Tasks.def
 share/nip2/compat/7.10/_types.def
-share/nip2/data/AdobeRGB1998.icc
-share/nip2/data/HP5000_UVDuraImageGlossMaxQ.icc
-share/nip2/data/nip2-icon.ico
-share/nip2/data/examples/1_point_mosiac/1pt_mosaic.ws
-share/nip2/data/examples/1_point_mosiac/cd1.1.jpg
-share/nip2/data/examples/1_point_mosiac/cd1.2.jpg
-share/nip2/data/examples/1_point_mosiac/cd2.1.jpg
-share/nip2/data/examples/1_point_mosiac/cd2.2.jpg
-share/nip2/data/examples/1_point_mosiac/cd3.1.jpg
-share/nip2/data/examples/1_point_mosiac/cd3.2.jpg
-share/nip2/data/examples/1_point_mosiac/cd4.1.jpg
-share/nip2/data/examples/1_point_mosiac/cd4.2.jpg
-share/nip2/data/examples/2_point_mosiac/2pts_mosaic.ws
-share/nip2/data/examples/2_point_mosiac/example_im_01.jpg
-share/nip2/data/examples/2_point_mosiac/example_im_02.jpg
-share/nip2/data/examples/2_point_mosiac/example_im_03.jpg
-share/nip2/data/examples/2_point_mosiac/example_im_04.jpg
-share/nip2/data/examples/2_point_mosiac/example_im_05.jpg
-share/nip2/data/examples/2_point_mosiac/example_im_06.jpg
-share/nip2/data/examples/2_point_mosiac/full_image.jpg
-share/nip2/data/examples/businesscard/businesscard.ws
-share/nip2/data/examples/businesscard/slanted_oval_vase2.jpg
-share/nip2/data/examples/clone/clone.ws
-share/nip2/data/examples/clone/example_im_01.png
-share/nip2/data/examples/clone/example_im_02.png
-share/nip2/data/examples/framing/framing.ws
-share/nip2/data/examples/framing/framing_complex.png
-share/nip2/data/examples/framing/framing_corner.png
-share/nip2/data/examples/framing/framing_distorted_frame.png
-share/nip2/data/examples/framing/framing_picture.jpg
-share/nip2/data/examples/logo/logo2.ws
-share/nip2/data/examples/manual_balance/manual_balance.ws
-share/nip2/data/examples/manual_balance/mask_01.png
-share/nip2/data/examples/manual_balance/mask_02.png
-share/nip2/data/examples/manual_balance/mask_03.png
-share/nip2/data/examples/manual_balance/mask_control.png
-share/nip2/data/examples/manual_balance/simp_base.png
-share/nip2/data/examples/overlays_and_blending/blend_example_ir.jpg
-share/nip2/data/examples/overlays_and_blending/blend_example_vis.jpg
-share/nip2/data/examples/overlays_and_blending/blend_example_xray.jpg
-share/nip2/data/examples/overlays_and_blending/overlay_blend.ws
-share/nip2/data/examples/print_test_image.v
-share/nip2/data/examples/registering/example_im_1.jpg
-share/nip2/data/examples/registering/example_im_2.jpg
-share/nip2/data/examples/registering/example_im_3.jpg
-share/nip2/data/examples/registering/example_im_4.jpg
-share/nip2/data/examples/registering/registering.ws
-share/nip2/data/macbeth_lab_d50.mat
-share/nip2/data/macbeth_lab_d65.mat
-share/nip2/data/nip-slider-16.png
-share/nip2/data/rachel.con
-share/nip2/data/sRGB.icm
-share/nip2/data/stock-led-blue-18.png
-share/nip2/data/stock-led-cyan-18.png
-share/nip2/data/stock-led-green-18.png
-share/nip2/data/stock-led-off-18.png
-share/nip2/data/stock-led-red-18.png
-share/nip2/data/stock-led-yellow-18.png
-share/nip2/data/stock-tool-bucket-fill-22.png
-share/nip2/data/stock-tool-ink-22.png
-share/nip2/data/stock-tool-move-22.png
-share/nip2/data/stock-tool-path-22.png
-share/nip2/data/stock-tool-rect-select-22.png
-share/nip2/data/stock-tool-select-22.png
-share/nip2/data/stock-tool-smudge-22.png
-share/nip2/data/stock-tool-text-22.png
-share/nip2/data/vips-128.png
-share/nip2/rc/ipgtkrc
-share/nip2/start/Colour.def
-share/nip2/start/Filter.def
-share/nip2/start/Format.def
-share/nip2/start/Histogram.def
-share/nip2/start/Image.def
-share/nip2/start/Math.def
-share/nip2/start/Matrix.def
-share/nip2/start/Preferences.ws
-share/nip2/start/Tasks.def
-share/nip2/start/Widgets.def
-share/nip2/start/_convert.def
-share/nip2/start/_generate.def
-share/nip2/start/_joe_extra.def
-share/nip2/start/_joe_utilities.def
-share/nip2/start/_list.def
-share/nip2/start/_predicate.def
-share/nip2/start/_stdenv.def
-share/nip2/start/_types.def
+share/nip2/compat/7.10/Widgets.def
+share/nip2/compat/7.12/Math.def
+share/nip2/compat/7.12/Image.def
+share/nip2/compat/7.12/Colour.def
+share/nip2/compat/7.12/Tasks.def
+share/nip2/compat/7.12/Format.def
+share/nip2/compat/7.12/Filter.def
+share/nip2/compat/7.12/Matrix.def
+share/nip2/compat/7.12/Widgets.def
+share/nip2/compat/7.12/Histogram.def
+share/nip2/compat/7.12/Preferences.ws
+share/nip2/compat/7.12/_joe_extra.def
+share/nip2/compat/7.12/_joe_utilities.def
+share/nip2/compat/7.12/_convert.def
+share/nip2/compat/7.12/_generate.def
+share/nip2/compat/7.12/_list.def
+share/nip2/compat/7.12/_predicate.def
+share/nip2/compat/7.12/_stdenv.def
+share/nip2/compat/7.12/_types.def
 @dirrm share/nip2/compat/7.8
 @dirrm share/nip2/compat/7.9
 @dirrm share/nip2/compat/7.10
+@dirrm share/nip2/compat/7.12
 @dirrm share/nip2/compat
 @dirrm share/nip2/data/examples/1_point_mosiac
 @dirrm share/nip2/data/examples/2_point_mosiac
@@ -244,6 +263,7 @@ share/nip2/start/_types.def
 %%DOCSDIR%%/html/nipguidese33.html
 %%DOCSDIR%%/html/nipguidese34.html
 %%DOCSDIR%%/html/nipguidese35.html
+%%DOCSDIR%%/html/nipguidese36.html
 %%DOCSDIR%%/html/nipguidese4.html
 %%DOCSDIR%%/html/nipguidese5.html
 %%DOCSDIR%%/html/nipguidese6.html