4 files changed, 34 insertions, 20 deletions

diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index b3bbd0bd3db4..06783f2f1f7a 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME?=	gimp-app
-PORTVERSION=	2.8.18
-PORTREVISION=	2
+PORTVERSION=	2.8.22
 PORTEPOCH?=	1
 CATEGORIES?=	graphics gnome
 MASTER_SITES=	GIMP/gimp/v${PORTVERSION:R}
@@ -23,18 +22,21 @@ LIB_DEPENDS=	libpng.so:graphics/png \
 		libbabl-0.1.so:x11/babl \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libdbus-1.so:devel/dbus \
-		libsoup-2.4.so:devel/libsoup \
 		libfreetype.so:print/freetype2
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes
 
 GNU_CONFIGURE=	yes
-USES+=		cpe desktop-file-utils execinfo gettext gmake jpeg libtool \
-		localbase pathfix pkgconfig tar:bzip2
+USES+=		cpe execinfo gettext gmake jpeg libtool \
+		localbase pathfix pkgconfig shebangfix tar:bzip2
 USE_XORG=	ice sm xcursor xext xfixes xmu xpm xt x11
 USE_GNOME+=	cairo gtk20 intlhack
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 INSTALL_TARGET=	install-strip
+TEST_TARGET=	check
+.if !defined(XAUTHORITY)
+TEST_ENV=	XAUTHORITY=${HOME}/.Xauthority
+.endif
 CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc/gimp \
 		--disable-gtk-doc \
 		--without-linux-input \
@@ -51,10 +53,14 @@ LIBS+=		-lexecinfo
 CPE_PRODUCT=	gimp
 CPE_VENDOR=	gnu
 
-PLIST_SUB+=	LIBVER=0.800.18
+SHEBANG_FILES=	plug-ins/pygimp/plug-ins/*.py
+
+PLIST_SUB+=	LIBVER=0.800.${PORTVERSION:E}
 
 .if !defined(GIMP_SLAVE)
 
+USES+=		desktop-file-utils
+
 OPTIONS_DEFINE?=	AA DBUS LIBEXIF GHOSTSCRIPT GVFS HELPBROWSER JASPER \
 			LIBMNG LIBRSVG2 POPPLER SIMD WMF
 OPTIONS_DEFAULT=	AA DBUS LIBEXIF GVFS HELPBROWSER LIBMNG LIBRSVG2 \
@@ -90,7 +96,8 @@ GVFS_USE=		GNOME=gvfs
 GVFS_LIB_DEPENDS_OFF=	libcurl.so:ftp/curl
 GVFS_CONFIGURE_OFF=	--without-gvfs
 
-HELPBROWSER_LIB_DEPENDS=	libwebkitgtk-1.0.so:www/webkit-gtk2
+HELPBROWSER_LIB_DEPENDS=	libwebkitgtk-1.0.so:www/webkit-gtk2 \
+				libsoup-2.4.so:devel/libsoup
 HELPBROWSER_CONFIGURE_WITH=	webkit
 
 JASPER_LIB_DEPENDS=	libjasper.so:graphics/jasper
diff --git a/graphics/gimp-app/distinfo b/graphics/gimp-app/distinfo
index 79392f0a4732..d978576f31ba 100644
--- a/graphics/gimp-app/distinfo
+++ b/graphics/gimp-app/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1468525766
-SHA256 (gimp-2.8.18.tar.bz2) = 39dd2247c678deaf5cc664397d3c6bd4fb910d3472290fd54b52b441b5815441
-SIZE (gimp-2.8.18.tar.bz2) = 20824198
+TIMESTAMP = 1494885183
+SHA256 (gimp-2.8.22.tar.bz2) = 9187a35cc52b110d78124d7b27b68a68ade14a794c2721314bac6134d2a5638a
+SIZE (gimp-2.8.22.tar.bz2) = 20873278
diff --git a/graphics/gimp-app/pkg-message b/graphics/gimp-app/pkg-message
new file mode 100644
index 000000000000..ba168380714c
--- /dev/null
+++ b/graphics/gimp-app/pkg-message
@@ -0,0 +1,7 @@
+On FreeBSD 10.3 gimp can cause the following error.
+
+(script-fu:3985): LibGimp-ERROR **: shmat() failed: Invalid argument
+Could not attach to gimp shared memory segment
+
+This can be fixed by setting kern.ipc.shm_allow_removed=1 in /etc/sysctl.conf.
+FreeBSD 11.0-R and newer have this set by default.
diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist
index 4768c4bfb597..d631b8ff8923 100644
--- a/graphics/gimp-app/pkg-plist
+++ b/graphics/gimp-app/pkg-plist
@@ -225,32 +225,32 @@ 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.so
-lib/libgimp-2.0.so.%%LIBVER%%
 lib/libgimp-2.0.so.0
+lib/libgimp-2.0.so.%%LIBVER%%
 lib/libgimpbase-2.0.so
-lib/libgimpbase-2.0.so.%%LIBVER%%
 lib/libgimpbase-2.0.so.0
+lib/libgimpbase-2.0.so.%%LIBVER%%
 lib/libgimpcolor-2.0.so
-lib/libgimpcolor-2.0.so.%%LIBVER%%
 lib/libgimpcolor-2.0.so.0
+lib/libgimpcolor-2.0.so.%%LIBVER%%
 lib/libgimpconfig-2.0.so
-lib/libgimpconfig-2.0.so.%%LIBVER%%
 lib/libgimpconfig-2.0.so.0
+lib/libgimpconfig-2.0.so.%%LIBVER%%
 lib/libgimpmath-2.0.so
-lib/libgimpmath-2.0.so.%%LIBVER%%
 lib/libgimpmath-2.0.so.0
+lib/libgimpmath-2.0.so.%%LIBVER%%
 lib/libgimpmodule-2.0.so
-lib/libgimpmodule-2.0.so.%%LIBVER%%
 lib/libgimpmodule-2.0.so.0
+lib/libgimpmodule-2.0.so.%%LIBVER%%
 lib/libgimpthumb-2.0.so
-lib/libgimpthumb-2.0.so.%%LIBVER%%
 lib/libgimpthumb-2.0.so.0
+lib/libgimpthumb-2.0.so.%%LIBVER%%
 lib/libgimpui-2.0.so
-lib/libgimpui-2.0.so.%%LIBVER%%
 lib/libgimpui-2.0.so.0
+lib/libgimpui-2.0.so.%%LIBVER%%
 lib/libgimpwidgets-2.0.so
-lib/libgimpwidgets-2.0.so.%%LIBVER%%
 lib/libgimpwidgets-2.0.so.0
+lib/libgimpwidgets-2.0.so.%%LIBVER%%
 libdata/pkgconfig/gimp-2.0.pc
 libdata/pkgconfig/gimpthumb-2.0.pc
 libdata/pkgconfig/gimpui-2.0.pc
@@ -464,11 +464,11 @@ share/doc/gimp/libgimp/home.png
 share/doc/gimp/libgimp/index.html
 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
 share/doc/gimp/libgimp/libgimp-GimpProcView.html
 share/doc/gimp/libgimp/libgimp-data.html
 share/doc/gimp/libgimp/libgimp-general.html
+share/doc/gimp/libgimp/libgimp-gimp.html
 share/doc/gimp/libgimp/libgimp-gimpbrush.html
 share/doc/gimp/libgimp/libgimp-gimpbrushes.html
 share/doc/gimp/libgimp/libgimp-gimpbrushmenu.html