Index: gimp/Makefile
===================================================================
--- gimp/Makefile	(revision 418428)
+++ gimp/Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gimp
-DISTVERSION?=	2.8.16
+DISTVERSION?=	2.8.18
 PORTREVISION?=	0
 PORTEPOCH?=	2
 CATEGORIES=	graphics gnome
Index: gimp-app/Makefile
===================================================================
--- gimp-app/Makefile	(revision 418428)
+++ gimp-app/Makefile	(working copy)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME?=	gimp-app
-PORTVERSION=	2.8.16
-PORTREVISION?=	2
+PORTVERSION=	2.8.18
 PORTEPOCH?=	1
 CATEGORIES?=	graphics gnome
 MASTER_SITES=	GIMP/gimp/v${PORTVERSION:R}
@@ -20,14 +19,18 @@
 		libtiff.so:graphics/tiff \
 		liblcms2.so:graphics/lcms2 \
 		libgegl-0.2.so:graphics/gegl \
-		libbabl-0.1.so:x11/babl
+		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
-USE_XORG=	xpm xmu xext
-USE_GNOME+=	intlhack gtk20
+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
@@ -47,7 +50,7 @@
 CPE_PRODUCT=	gimp
 CPE_VENDOR=	gnu
 
-PLIST_SUB+=	LIBVER=0.800.16
+PLIST_SUB+=	LIBVER=0.800.18
 
 .if !defined(GIMP_SLAVE)
 
Index: gimp-app/distinfo
===================================================================
--- gimp-app/distinfo	(revision 418428)
+++ gimp-app/distinfo	(working copy)
@@ -1,2 +1,3 @@
-SHA256 (gimp-2.8.16.tar.bz2) = 95e3857bd0b5162cf8d1eda8c78b741eef968c3e3ac6c1195aaac2a4e2574fb7
-SIZE (gimp-2.8.16.tar.bz2) = 20847212
+TIMESTAMP = 1468525766
+SHA256 (gimp-2.8.18.tar.bz2) = 39dd2247c678deaf5cc664397d3c6bd4fb910d3472290fd54b52b441b5815441
+SIZE (gimp-2.8.18.tar.bz2) = 20824198
Index: gimp-app/pkg-plist
===================================================================
--- gimp-app/pkg-plist	(revision 418428)
+++ gimp-app/pkg-plist	(working copy)
@@ -225,32 +225,32 @@
 include/gimp-2.0/libgimpwidgets/gimpwidgetstypes.h
 include/gimp-2.0/libgimpwidgets/gimpzoommodel.h
 lib/libgimp-2.0.so
+lib/libgimp-2.0.so.0
 lib/libgimp-2.0.so.%%LIBVER%%
-lib/libgimp-2.0.so.0
 lib/libgimpbase-2.0.so
+lib/libgimpbase-2.0.so.0
 lib/libgimpbase-2.0.so.%%LIBVER%%
-lib/libgimpbase-2.0.so.0
 lib/libgimpcolor-2.0.so
+lib/libgimpcolor-2.0.so.0
 lib/libgimpcolor-2.0.so.%%LIBVER%%
-lib/libgimpcolor-2.0.so.0
 lib/libgimpconfig-2.0.so
+lib/libgimpconfig-2.0.so.0
 lib/libgimpconfig-2.0.so.%%LIBVER%%
-lib/libgimpconfig-2.0.so.0
 lib/libgimpmath-2.0.so
+lib/libgimpmath-2.0.so.0
 lib/libgimpmath-2.0.so.%%LIBVER%%
-lib/libgimpmath-2.0.so.0
 lib/libgimpmodule-2.0.so
+lib/libgimpmodule-2.0.so.0
 lib/libgimpmodule-2.0.so.%%LIBVER%%
-lib/libgimpmodule-2.0.so.0
 lib/libgimpthumb-2.0.so
+lib/libgimpthumb-2.0.so.0
 lib/libgimpthumb-2.0.so.%%LIBVER%%
-lib/libgimpthumb-2.0.so.0
 lib/libgimpui-2.0.so
+lib/libgimpui-2.0.so.0
 lib/libgimpui-2.0.so.%%LIBVER%%
-lib/libgimpui-2.0.so.0
 lib/libgimpwidgets-2.0.so
+lib/libgimpwidgets-2.0.so.0
 lib/libgimpwidgets-2.0.so.%%LIBVER%%
-lib/libgimpwidgets-2.0.so.0
 libdata/pkgconfig/gimp-2.0.pc
 libdata/pkgconfig/gimpthumb-2.0.pc
 libdata/pkgconfig/gimpui-2.0.pc
@@ -313,7 +313,7 @@
 libexec/gimp/2.2/plug-ins/edge-sobel
 libexec/gimp/2.2/plug-ins/emboss
 libexec/gimp/2.2/plug-ins/engrave
-%%AA%%libexec/gimp/2.2/plug-ins/file-aa
+libexec/gimp/2.2/plug-ins/file-aa
 libexec/gimp/2.2/plug-ins/file-bmp
 libexec/gimp/2.2/plug-ins/file-cel
 libexec/gimp/2.2/plug-ins/file-compressor
@@ -331,17 +331,15 @@
 libexec/gimp/2.2/plug-ins/file-header
 libexec/gimp/2.2/plug-ins/file-html-table
 libexec/gimp/2.2/plug-ins/file-ico
-%%JASPER%%libexec/gimp/2.2/plug-ins/file-jp2-load
 libexec/gimp/2.2/plug-ins/file-jpeg
-%%LIBMNG%%libexec/gimp/2.2/plug-ins/file-mng
+libexec/gimp/2.2/plug-ins/file-mng
 libexec/gimp/2.2/plug-ins/file-pat
 libexec/gimp/2.2/plug-ins/file-pcx
-%%POPPLER%%libexec/gimp/2.2/plug-ins/file-pdf-load
+libexec/gimp/2.2/plug-ins/file-pdf-load
 libexec/gimp/2.2/plug-ins/file-pdf-save
 libexec/gimp/2.2/plug-ins/file-pix
 libexec/gimp/2.2/plug-ins/file-png
 libexec/gimp/2.2/plug-ins/file-pnm
-%%GHOSTSCRIPT%%libexec/gimp/2.2/plug-ins/file-ps
 libexec/gimp/2.2/plug-ins/file-psd-load
 libexec/gimp/2.2/plug-ins/file-psd-save
 libexec/gimp/2.2/plug-ins/file-psp
@@ -348,12 +346,12 @@
 libexec/gimp/2.2/plug-ins/file-raw
 libexec/gimp/2.2/plug-ins/file-sgi
 libexec/gimp/2.2/plug-ins/file-sunras
-%%LIBRSVG2%%libexec/gimp/2.2/plug-ins/file-svg
+libexec/gimp/2.2/plug-ins/file-svg
 libexec/gimp/2.2/plug-ins/file-tga
 libexec/gimp/2.2/plug-ins/file-tiff-load
 libexec/gimp/2.2/plug-ins/file-tiff-save
 libexec/gimp/2.2/plug-ins/file-uri
-%%WMF%%libexec/gimp/2.2/plug-ins/file-wmf
+libexec/gimp/2.2/plug-ins/file-wmf
 libexec/gimp/2.2/plug-ins/file-xbm
 libexec/gimp/2.2/plug-ins/file-xjt
 libexec/gimp/2.2/plug-ins/file-xmc
@@ -371,7 +369,7 @@
 libexec/gimp/2.2/plug-ins/grid
 libexec/gimp/2.2/plug-ins/guillotine
 libexec/gimp/2.2/plug-ins/help
-%%HELPBROWSER%%libexec/gimp/2.2/plug-ins/help-browser
+libexec/gimp/2.2/plug-ins/help-browser
 libexec/gimp/2.2/plug-ins/hot
 libexec/gimp/2.2/plug-ins/ifs-compose
 libexec/gimp/2.2/plug-ins/illusion
@@ -387,7 +385,7 @@
 libexec/gimp/2.2/plug-ins/map-object
 libexec/gimp/2.2/plug-ins/max-rgb
 libexec/gimp/2.2/plug-ins/maze
-%%LIBEXIF%%libexec/gimp/2.2/plug-ins/metadata
+libexec/gimp/2.2/plug-ins/metadata
 libexec/gimp/2.2/plug-ins/mosaic
 libexec/gimp/2.2/plug-ins/newsprint
 libexec/gimp/2.2/plug-ins/nl-filter
@@ -437,7 +435,7 @@
 libexec/gimp/2.2/plug-ins/warp
 libexec/gimp/2.2/plug-ins/waves
 libexec/gimp/2.2/plug-ins/web-browser
-%%HELPBROWSER%%libexec/gimp/2.2/plug-ins/web-page
+libexec/gimp/2.2/plug-ins/web-page
 libexec/gimp/2.2/plug-ins/whirl-pinch
 libexec/gimp/2.2/plug-ins/wind
 man/man1/gimp-2.8.1.gz
@@ -462,7 +460,6 @@
 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
@@ -551,7 +548,6 @@
 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
@@ -585,7 +581,6 @@
 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
@@ -612,7 +607,6 @@
 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
@@ -639,7 +633,6 @@
 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
@@ -662,7 +655,6 @@
 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
@@ -681,7 +673,6 @@
 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
@@ -770,7 +761,6 @@
 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