4 files changed, 46 insertions, 56 deletions

diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index a6fee9f6305a..655208cda11f 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -1,19 +1,12 @@
 # Created by: erich@FreeBSD.org
 # $FreeBSD$
-#   $MCom: ports/graphics/gimp-app/Makefile,v 1.65 2012/12/30 18:09:11 mezz Exp $
 
 PORTNAME?=	gimp-app
-PORTVERSION=	2.8.10
-PORTREVISION?=	7
+PORTVERSION=	2.8.14
+PORTREVISION?=	0
 PORTEPOCH?=	1
 CATEGORIES?=	graphics gnome
-MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
-		http://gimp.mirrors.hoobly.com/%SUBDIR%/ \
-		http://ftp.gwdg.de/pub/misc/grafik/gimp/%SUBDIR%/ \
-		ftp://ftp.is.co.za/mirror/ftp.gimp.org/gimp/%SUBDIR%/ \
-		ftp://ftp.cc.uoc.gr/mirrors/gimp/%SUBDIR%/ \
-		http://www.mirrorservice.org/sites/ftp.gimp.org/pub/%SUBDIR%/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/%SUBDIR%,}
+MASTER_SITES=	GIMP
 MASTER_SITE_SUBDIR=	gimp/v${PORTVERSION:R}
 DISTNAME=	gimp-${PORTVERSION}
 
@@ -33,10 +26,10 @@ LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png \
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
 
 GNU_CONFIGURE=	yes
-USES+=		desktop-file-utils gettext gmake libtool:keepla pathfix \
+USES+=		desktop-file-utils gettext gmake libtool pathfix \
 		pkgconfig tar:bzip2
 USE_XORG=	xpm xmu xext
-USE_GNOME+=	intltool intlhack gtk20 libartlgpl2 gnomehier
+USE_GNOME+=	intlhack gtk20
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 INSTALL_TARGET=	install-strip
@@ -55,6 +48,8 @@ CONFIGURE_ENV=	GIMP_THREAD_LIBS=${PTHREAD_LIBS}
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 
+PLIST_SUB+=	LIBVER=0.800.14
+
 .if !defined(GIMP_SLAVE)
 
 OPTIONS_DEFINE?=	AA DBUS LIBEXIF GHOSTSCRIPT GVFS HELPBROWSER JASPER \
diff --git a/graphics/gimp-app/distinfo b/graphics/gimp-app/distinfo
index aab7a144ce8c..2e8f19b18b34 100644
--- a/graphics/gimp-app/distinfo
+++ b/graphics/gimp-app/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gimp-2.8.10.tar.bz2) = e7fd8b19f989138d826003c75f56bd5b6f136eef597e86e3978ede0bba470ae6
-SIZE (gimp-2.8.10.tar.bz2) = 20343461
+SHA256 (gimp-2.8.14.tar.bz2) = d82a958641c9c752d68e35f65840925c08e314cea90222ad845892a40e05b22d
+SIZE (gimp-2.8.14.tar.bz2) = 20440077
diff --git a/graphics/gimp-app/files/patch-app_text_gimpfont.c b/graphics/gimp-app/files/patch-app_text_gimpfont.c
deleted file mode 100644
index a15ace1402aa..000000000000
--- a/graphics/gimp-app/files/patch-app_text_gimpfont.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- app/text/gimpfont.c.orig	2013-12-02 21:01:06.000000000 +0100
-+++ app/text/gimpfont.c	2013-12-02 21:01:47.000000000 +0100
-@@ -27,7 +27,9 @@
- 
- #define PANGO_ENABLE_ENGINE  1   /* Argh */
- #include <pango/pango-ot.h>
--#include <freetype/tttables.h>
-+
-+#include <ft2build.h>
-+#include FT_TRUETYPE_TABLES_H
- 
- #include "text-types.h"
- 
diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist
index 9abf4ef09c86..29527b2a9305 100644
--- a/graphics/gimp-app/pkg-plist
+++ b/graphics/gimp-app/pkg-plist
@@ -9,8 +9,8 @@ etc/gimp/2.2/sessionrc
 etc/gimp/2.2/templaterc
 etc/gimp/2.2/unitrc
 include/gimp-2.0/libgimp/gimp.h
-include/gimp-2.0/libgimp/gimp_pdb_headers.h
 include/gimp-2.0/libgimp/gimp_pdb.h
+include/gimp-2.0/libgimp/gimp_pdb_headers.h
 include/gimp-2.0/libgimp/gimpaspectpreview.h
 include/gimp-2.0/libgimp/gimpbrush_pdb.h
 include/gimp-2.0/libgimp/gimpbrushes.h
@@ -108,8 +108,8 @@ include/gimp-2.0/libgimp/gimpui.h
 include/gimp-2.0/libgimp/gimpuitypes.h
 include/gimp-2.0/libgimp/gimpundo_pdb.h
 include/gimp-2.0/libgimp/gimpunit_pdb.h
-include/gimp-2.0/libgimp/gimpvectors_pdb.h
 include/gimp-2.0/libgimp/gimpvectors.h
+include/gimp-2.0/libgimp/gimpvectors_pdb.h
 include/gimp-2.0/libgimp/gimpzoompreview.h
 include/gimp-2.0/libgimpbase/gimpbase.h
 include/gimp-2.0/libgimpbase/gimpbaseenums.h
@@ -224,64 +224,46 @@ include/gimp-2.0/libgimpwidgets/gimpwidgets.h
 include/gimp-2.0/libgimpwidgets/gimpwidgetsenums.h
 include/gimp-2.0/libgimpwidgets/gimpwidgetstypes.h
 include/gimp-2.0/libgimpwidgets/gimpzoommodel.h
-lib/libgimp-2.0.la
 lib/libgimp-2.0.so
+lib/libgimp-2.0.so.%%LIBVER%%
 lib/libgimp-2.0.so.0
-lib/libgimp-2.0.so.0.800.10
-lib/libgimpbase-2.0.la
 lib/libgimpbase-2.0.so
+lib/libgimpbase-2.0.so.%%LIBVER%%
 lib/libgimpbase-2.0.so.0
-lib/libgimpbase-2.0.so.0.800.10
-lib/libgimpcolor-2.0.la
 lib/libgimpcolor-2.0.so
+lib/libgimpcolor-2.0.so.%%LIBVER%%
 lib/libgimpcolor-2.0.so.0
-lib/libgimpcolor-2.0.so.0.800.10
-lib/libgimpconfig-2.0.la
 lib/libgimpconfig-2.0.so
+lib/libgimpconfig-2.0.so.%%LIBVER%%
 lib/libgimpconfig-2.0.so.0
-lib/libgimpconfig-2.0.so.0.800.10
-lib/libgimpmath-2.0.la
 lib/libgimpmath-2.0.so
+lib/libgimpmath-2.0.so.%%LIBVER%%
 lib/libgimpmath-2.0.so.0
-lib/libgimpmath-2.0.so.0.800.10
-lib/libgimpmodule-2.0.la
 lib/libgimpmodule-2.0.so
+lib/libgimpmodule-2.0.so.%%LIBVER%%
 lib/libgimpmodule-2.0.so.0
-lib/libgimpmodule-2.0.so.0.800.10
-lib/libgimpthumb-2.0.la
 lib/libgimpthumb-2.0.so
+lib/libgimpthumb-2.0.so.%%LIBVER%%
 lib/libgimpthumb-2.0.so.0
-lib/libgimpthumb-2.0.so.0.800.10
-lib/libgimpui-2.0.la
 lib/libgimpui-2.0.so
+lib/libgimpui-2.0.so.%%LIBVER%%
 lib/libgimpui-2.0.so.0
-lib/libgimpui-2.0.so.0.800.10
-lib/libgimpwidgets-2.0.la
 lib/libgimpwidgets-2.0.so
+lib/libgimpwidgets-2.0.so.%%LIBVER%%
 lib/libgimpwidgets-2.0.so.0
-lib/libgimpwidgets-2.0.so.0.800.10
 libdata/pkgconfig/gimp-2.0.pc
 libdata/pkgconfig/gimpthumb-2.0.pc
 libdata/pkgconfig/gimpui-2.0.pc
 libexec/gimp/2.2/environ/default.env
 libexec/gimp/2.2/interpreters/default.interp
-libexec/gimp/2.2/modules/libcolor-selector-cmyk.la
 libexec/gimp/2.2/modules/libcolor-selector-cmyk.so
-libexec/gimp/2.2/modules/libcolor-selector-water.la
 libexec/gimp/2.2/modules/libcolor-selector-water.so
-libexec/gimp/2.2/modules/libcolor-selector-wheel.la
 libexec/gimp/2.2/modules/libcolor-selector-wheel.so
-libexec/gimp/2.2/modules/libcontroller-midi.la
 libexec/gimp/2.2/modules/libcontroller-midi.so
-libexec/gimp/2.2/modules/libdisplay-filter-color-blind.la
 libexec/gimp/2.2/modules/libdisplay-filter-color-blind.so
-libexec/gimp/2.2/modules/libdisplay-filter-gamma.la
 libexec/gimp/2.2/modules/libdisplay-filter-gamma.so
-libexec/gimp/2.2/modules/libdisplay-filter-high-contrast.la
 libexec/gimp/2.2/modules/libdisplay-filter-high-contrast.so
-libexec/gimp/2.2/modules/libdisplay-filter-lcms.la
 libexec/gimp/2.2/modules/libdisplay-filter-lcms.so
-libexec/gimp/2.2/modules/libdisplay-filter-proof.la
 libexec/gimp/2.2/modules/libdisplay-filter-proof.so
 libexec/gimp/2.2/plug-ins/alien-map
 libexec/gimp/2.2/plug-ins/align-layers
@@ -481,6 +463,7 @@ share/doc/gimp/libgimp/GimpZoomPreview.html
 share/doc/gimp/libgimp/home.png
 share/doc/gimp/libgimp/index.html
 share/doc/gimp/libgimp/index.sgml
+share/doc/gimp/libgimp/left-insensitive.png
 share/doc/gimp/libgimp/left.png
 share/doc/gimp/libgimp/libgimp-Gimp.html
 share/doc/gimp/libgimp/libgimp-GimpItemComboBox.html
@@ -561,12 +544,15 @@ share/doc/gimp/libgimp/libgimp.devhelp2
 share/doc/gimp/libgimp/libgimp.html
 share/doc/gimp/libgimp/libgimpui-hierarchy.html
 share/doc/gimp/libgimp/libgimpui.html
+share/doc/gimp/libgimp/right-insensitive.png
 share/doc/gimp/libgimp/right.png
 share/doc/gimp/libgimp/style.css
+share/doc/gimp/libgimp/up-insensitive.png
 share/doc/gimp/libgimp/up.png
 share/doc/gimp/libgimpbase/home.png
 share/doc/gimp/libgimpbase/index.html
 share/doc/gimp/libgimpbase/index.sgml
+share/doc/gimp/libgimpbase/left-insensitive.png
 share/doc/gimp/libgimpbase/left.png
 share/doc/gimp/libgimpbase/libgimpbase-gimpbaseenums.html
 share/doc/gimp/libgimpbase/libgimpbase-gimpbasetypes.html
@@ -592,12 +578,15 @@ share/doc/gimp/libgimpbase/libgimpbase-index-new-in-2-8.html
 share/doc/gimp/libgimpbase/libgimpbase-index.html
 share/doc/gimp/libgimpbase/libgimpbase.devhelp2
 share/doc/gimp/libgimpbase/libgimpbase.html
+share/doc/gimp/libgimpbase/right-insensitive.png
 share/doc/gimp/libgimpbase/right.png
 share/doc/gimp/libgimpbase/style.css
+share/doc/gimp/libgimpbase/up-insensitive.png
 share/doc/gimp/libgimpbase/up.png
 share/doc/gimp/libgimpcolor/home.png
 share/doc/gimp/libgimpcolor/index.html
 share/doc/gimp/libgimpcolor/index.sgml
+share/doc/gimp/libgimpcolor/left-insensitive.png
 share/doc/gimp/libgimpcolor/left.png
 share/doc/gimp/libgimpcolor/libgimpcolor-GimpAdaptiveSupersample.html
 share/doc/gimp/libgimpcolor/libgimpcolor-GimpBilinear.html
@@ -615,13 +604,16 @@ share/doc/gimp/libgimpcolor/libgimpcolor-index-new-in-2-8.html
 share/doc/gimp/libgimpcolor/libgimpcolor-index.html
 share/doc/gimp/libgimpcolor/libgimpcolor.devhelp2
 share/doc/gimp/libgimpcolor/libgimpcolor.html
+share/doc/gimp/libgimpcolor/right-insensitive.png
 share/doc/gimp/libgimpcolor/right.png
 share/doc/gimp/libgimpcolor/style.css
+share/doc/gimp/libgimpcolor/up-insensitive.png
 share/doc/gimp/libgimpcolor/up.png
 share/doc/gimp/libgimpconfig/GimpColorConfig.html
 share/doc/gimp/libgimpconfig/home.png
 share/doc/gimp/libgimpconfig/index.html
 share/doc/gimp/libgimpconfig/index.sgml
+share/doc/gimp/libgimpconfig/left-insensitive.png
 share/doc/gimp/libgimpconfig/left.png
 share/doc/gimp/libgimpconfig/libgimpconfig-GimpConfig-deserialize.html
 share/doc/gimp/libgimpconfig/libgimpconfig-GimpConfig-params.html
@@ -640,12 +632,15 @@ share/doc/gimp/libgimpconfig/libgimpconfig-index-new-in-2-8.html
 share/doc/gimp/libgimpconfig/libgimpconfig-index.html
 share/doc/gimp/libgimpconfig/libgimpconfig.devhelp2
 share/doc/gimp/libgimpconfig/libgimpconfig.html
+share/doc/gimp/libgimpconfig/right-insensitive.png
 share/doc/gimp/libgimpconfig/right.png
 share/doc/gimp/libgimpconfig/style.css
+share/doc/gimp/libgimpconfig/up-insensitive.png
 share/doc/gimp/libgimpconfig/up.png
 share/doc/gimp/libgimpmath/home.png
 share/doc/gimp/libgimpmath/index.html
 share/doc/gimp/libgimpmath/index.sgml
+share/doc/gimp/libgimpmath/left-insensitive.png
 share/doc/gimp/libgimpmath/left.png
 share/doc/gimp/libgimpmath/libgimpmath-GimpMD5.html
 share/doc/gimp/libgimpmath/libgimpmath-GimpMath.html
@@ -658,14 +653,17 @@ share/doc/gimp/libgimpmath/libgimpmath-index-new-in-2-6.html
 share/doc/gimp/libgimpmath/libgimpmath-index.html
 share/doc/gimp/libgimpmath/libgimpmath.devhelp2
 share/doc/gimp/libgimpmath/libgimpmath.html
+share/doc/gimp/libgimpmath/right-insensitive.png
 share/doc/gimp/libgimpmath/right.png
 share/doc/gimp/libgimpmath/style.css
+share/doc/gimp/libgimpmath/up-insensitive.png
 share/doc/gimp/libgimpmath/up.png
 share/doc/gimp/libgimpmodule/GimpModule.html
 share/doc/gimp/libgimpmodule/GimpModuleDB.html
 share/doc/gimp/libgimpmodule/home.png
 share/doc/gimp/libgimpmodule/index.html
 share/doc/gimp/libgimpmodule/index.sgml
+share/doc/gimp/libgimpmodule/left-insensitive.png
 share/doc/gimp/libgimpmodule/left.png
 share/doc/gimp/libgimpmodule/libgimpmodule-index-deprecated.html
 share/doc/gimp/libgimpmodule/libgimpmodule-index-new-in-2-2.html
@@ -675,13 +673,16 @@ share/doc/gimp/libgimpmodule/libgimpmodule-index-new-in-2-8.html
 share/doc/gimp/libgimpmodule/libgimpmodule-index.html
 share/doc/gimp/libgimpmodule/libgimpmodule.devhelp2
 share/doc/gimp/libgimpmodule/libgimpmodule.html
+share/doc/gimp/libgimpmodule/right-insensitive.png
 share/doc/gimp/libgimpmodule/right.png
 share/doc/gimp/libgimpmodule/style.css
+share/doc/gimp/libgimpmodule/up-insensitive.png
 share/doc/gimp/libgimpmodule/up.png
 share/doc/gimp/libgimpthumb/GimpThumbnail.html
 share/doc/gimp/libgimpthumb/home.png
 share/doc/gimp/libgimpthumb/index.html
 share/doc/gimp/libgimpthumb/index.sgml
+share/doc/gimp/libgimpthumb/left-insensitive.png
 share/doc/gimp/libgimpthumb/left.png
 share/doc/gimp/libgimpthumb/libgimpthumb-GimpThumb-enums.html
 share/doc/gimp/libgimpthumb/libgimpthumb-GimpThumb-error.html
@@ -693,8 +694,10 @@ share/doc/gimp/libgimpthumb/libgimpthumb-index-new-in-2-6.html
 share/doc/gimp/libgimpthumb/libgimpthumb-index.html
 share/doc/gimp/libgimpthumb/libgimpthumb.devhelp2
 share/doc/gimp/libgimpthumb/libgimpthumb.html
+share/doc/gimp/libgimpthumb/right-insensitive.png
 share/doc/gimp/libgimpthumb/right.png
 share/doc/gimp/libgimpthumb/style.css
+share/doc/gimp/libgimpthumb/up-insensitive.png
 share/doc/gimp/libgimpthumb/up.png
 share/doc/gimp/libgimpwidgets/GimpBrowser.html
 share/doc/gimp/libgimpwidgets/GimpButton.html
@@ -768,6 +771,7 @@ share/doc/gimp/libgimpwidgets/gimp-unit-menu.png
 share/doc/gimp/libgimpwidgets/home.png
 share/doc/gimp/libgimpwidgets/index.html
 share/doc/gimp/libgimpwidgets/index.sgml
+share/doc/gimp/libgimpwidgets/left-insensitive.png
 share/doc/gimp/libgimpwidgets/left.png
 share/doc/gimp/libgimpwidgets/libgimpwidgets-GimpCairoUtils.html
 share/doc/gimp/libgimpwidgets/libgimpwidgets-GimpEnumWidgets.html
@@ -794,6 +798,7 @@ share/doc/gimp/libgimpwidgets/libgimpwidgets-index.html
 share/doc/gimp/libgimpwidgets/libgimpwidgets-utils.html
 share/doc/gimp/libgimpwidgets/libgimpwidgets-widgets.html
 share/doc/gimp/libgimpwidgets/libgimpwidgets.devhelp2
+share/doc/gimp/libgimpwidgets/right-insensitive.png
 share/doc/gimp/libgimpwidgets/right.png
 share/doc/gimp/libgimpwidgets/stock-anchor-16.png
 share/doc/gimp/libgimpwidgets/stock-cap-butt-16.png
@@ -1122,6 +1127,7 @@ share/doc/gimp/libgimpwidgets/stock-wilber-64.png
 share/doc/gimp/libgimpwidgets/stock-wilber-eek-64.png
 share/doc/gimp/libgimpwidgets/stock-zoom-follow-window-12.png
 share/doc/gimp/libgimpwidgets/style.css
+share/doc/gimp/libgimpwidgets/up-insensitive.png
 share/doc/gimp/libgimpwidgets/up.png
 share/gimp/brushes/Basic/1-pixel.vbr
 share/gimp/brushes/Basic/Block-01.vbr
@@ -1936,6 +1942,8 @@ share/locale/ga/LC_MESSAGES/gimp20-python.mo
 share/locale/ga/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/ga/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/ga/LC_MESSAGES/gimp20.mo
+share/locale/gd/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/gd/LC_MESSAGES/gimp20.mo
 share/locale/gl/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/gl/LC_MESSAGES/gimp20-python.mo
 share/locale/gl/LC_MESSAGES/gimp20-script-fu.mo