Index: head/graphics/feh/Makefile
===================================================================
--- head/graphics/feh/Makefile	(revision 445598)
+++ head/graphics/feh/Makefile	(revision 445599)
@@ -1,47 +1,59 @@
 # Created by: Jeremy Norris <ishmael127@home.com>
 # $FreeBSD$
 
 PORTNAME=	feh
-PORTVERSION=	2.18
+PORTVERSION=	2.19
 CATEGORIES=	graphics
 MASTER_SITES=	http://feh.finalrewind.org/ \
 		LOCAL/uqs
 
 MAINTAINER=	zeising@FreeBSD.org
 COMMENT=	Image viewer that utilizes Imlib2
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libImlib2.so:graphics/imlib2 \
 		libpng16.so:graphics/png
 
 USE_XORG=	x11 xt xinerama
 USES=		cpe desktop-file-utils gmake perl5 shebangfix tar:bzip2
 CPE_VENDOR=	daniel_friesel
 USE_PERL5=	run
 
 CPPFLAGS+=	-I${LOCALBASE}/include -std=c99
 LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ENV+=	LDFLAGS="${LDFLAGS}"
 
-OPTIONS_DEFINE=	CAM DOCS
+OPTIONS_DEFINE=	CAM DOCS EXAMPLES EXIF
 CAM_DESC=	Install feh-cam and related tools
-OPTIONS_DEFAULT=CAM
+EXIF_DESC=	Support EXIF tags
+OPTIONS_DEFAULT=CAM EXIF
+OPTIONS_SUB=	yes
 
+EXIF_LIB_DEPENDS=	libexif.so:graphics/libexif
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCAM}
 MAKE_ENV+=	cam=1
 SHEBANG_FILES=	${WRKSRC}/cam/feh-cam
-PLIST_SUB=	CAM=""
-.else
-MAKE_ENV+=	cam=0
-PLIST_SUB=	CAM="@comment "
 .endif
+
+.if ${PORT_OPTIONS:MEXIF}
+MAKE_ENV+=	exif=1
+.endif
+
+post-patch-DOCS-off:
+	@${REINPLACE_CMD} -e 's|install-doc||' \
+		${WRKSRC}/Makefile
+
+post-patch-EXAMPLES-off:
+	@${REINPLACE_CMD} -e 's|install-examples||' \
+		${WRKSRC}/Makefile
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/feh
 
 .include <bsd.port.mk>
Index: head/graphics/feh/distinfo
===================================================================
--- head/graphics/feh/distinfo	(revision 445598)
+++ head/graphics/feh/distinfo	(revision 445599)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1481670680
-SHA256 (feh-2.18.tar.bz2) = 9daebf5195511a5bde8061c932b5585b956c81193dfc00abcd758316d07ed40c
-SIZE (feh-2.18.tar.bz2) = 2127627
+TIMESTAMP = 1499798030
+SHA256 (feh-2.19.tar.bz2) = cebe25d8393a07aa79a6b2f99beb133d8de0cbc00d46bccc4df276248cc9d0e9
+SIZE (feh-2.19.tar.bz2) = 2128358
Index: head/graphics/feh/pkg-plist
===================================================================
--- head/graphics/feh/pkg-plist	(revision 445598)
+++ head/graphics/feh/pkg-plist	(revision 445599)
@@ -1,28 +1,28 @@
 bin/feh
 %%CAM%%bin/feh-cam
 %%CAM%%bin/gen-cam-menu
-share/applications/feh.desktop
-share/icons/hicolor/48x48/apps/feh.png
-share/icons/hicolor/scalable/apps/feh.svg
 %%CAM%%man/man1/feh-cam.1.gz
 man/man1/feh.1.gz
 %%CAM%%man/man1/gen-cam-menu.1.gz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/find-lowres
+share/applications/feh.desktop
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/README.md
+%%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/buttons
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/find-lowres
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/keys
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/themes
 %%DATADIR%%/fonts/black.style
 %%DATADIR%%/fonts/menu.style
 %%DATADIR%%/fonts/yudit.ttf
 %%DATADIR%%/images/feh.png
 %%DATADIR%%/images/feh.svg
 %%DATADIR%%/images/menubg_aluminium.png
 %%DATADIR%%/images/menubg_aqua.png
 %%DATADIR%%/images/menubg_black.png
 %%DATADIR%%/images/menubg_brushed.png
 %%DATADIR%%/images/menubg_default.png
 %%DATADIR%%/images/menubg_sky.png
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/README.md
-%%PORTDOCS%%%%DOCSDIR%%/TODO
+share/icons/hicolor/48x48/apps/feh.png
+share/icons/hicolor/scalable/apps/feh.svg