Index: head/graphics/eog/Makefile
===================================================================
--- head/graphics/eog/Makefile	(revision 442275)
+++ head/graphics/eog/Makefile	(revision 442276)
@@ -1,70 +1,57 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	eog
-PORTVERSION=	3.18.3
+PORTVERSION=	3.24.1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	The Eye Of Gnome image viewer
+COMMENT=	Eye Of Gnome image viewer
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 BUILD_DEPENDS=	itstool:textproc/itstool \
 		gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
 LIB_DEPENDS=	libpeas-gtk-1.0.so:devel/libpeas \
 		liblcms2.so:graphics/lcms2
 RUN_DEPENDS=	gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
 
 PORTSCOUT=	limitw:1,even
 
-USES=		desktop-file-utils gettext gmake gnome jpeg libtool pathfix \
-		pkgconfig tar:xz
+USES=		desktop-file-utils gettext gmake gnome jpeg libtool localbase \
+		pathfix pkgconfig tar:xz
 USE_GNOME=	cairo intltool librsvg2 gtk30 gnomedesktop3 introspection
 USE_XORG=	x11
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
 GLIB_SCHEMAS=	org.gnome.eog.enums.xml \
 		org.gnome.eog.gschema.xml
 
 PLIST_SUB+=	VERSION=3.0
 
+OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	EXIF EXEMPI
 OPTIONS_DEFAULT=EXIF EXEMPI
+
 EXIF_DESC=	Digital camera file meta-data support
+EXIF_CONFIGURE_WITH=	libexif
+EXIF_LIB_DEPENDS=	libexif.so:graphics/libexif
+
 EXEMPI_DESC=	XMP support
+EXEMPI_CONFIGURE_WITH=	xmp
+EXEMPI_LIB_DEPENDS=	libexempi.so:textproc/exempi
 
 .include <bsd.port.options.mk>
 
-_WITH_EXIF=	no
-_WITH_EXEMPI=	no
-
-.if ${PORT_OPTIONS:MEXIF}
-CONFIGURE_ARGS+=--with-libexif
-LIB_DEPENDS+=	libexif.so:graphics/libexif
-PLIST_SUB+=	EXIF=""
-_WITH_EXIF=	yes
-.else
-CONFIGURE_ARGS+=--without-libexif
-PLIST_SUB+=	EXIF="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MEXEMPI}
-CONFIGURE_ARGS+=--with-xmp
-LIB_DEPENDS+=	libexempi.so:textproc/exempi
-_WITH_EXEMPI=	yes
-.else
-CONFIGURE_ARGS+=--without-xmp
-.endif
-
-.if ${_WITH_EXIF}=="yes" || ${_WITH_EXEMPI}=="yes"
+.if ${PORT_OPTIONS:MEXIF} != "" || ${PORT_OPTIONS:MEXEMPI} != ""
 PLIST_SUB+=	EXIFEXEMPI=""
 .else
 PLIST_SUB+=	EXIFEXEMPI="@comment "
 .endif
 
 .include <bsd.port.mk>
Index: head/graphics/eog/distinfo
===================================================================
--- head/graphics/eog/distinfo	(revision 442275)
+++ head/graphics/eog/distinfo	(revision 442276)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1471883741
-SHA256 (gnome3/eog-3.18.3.tar.xz) = fb534bab125f28445fe7d17ea04817ba17e2a9a0d94ba6bc6408a3aadab43563
-SIZE (gnome3/eog-3.18.3.tar.xz) = 4334460
+TIMESTAMP = 1496238448
+SHA256 (gnome3/eog-3.24.1.tar.xz) = f51ee116e2c159fac1719e003a32e1cb6cbff51914fd1f6409f461a790ff27e7
+SIZE (gnome3/eog-3.24.1.tar.xz) = 4632496
Index: head/graphics/eog/pkg-descr
===================================================================
--- head/graphics/eog/pkg-descr	(revision 442275)
+++ head/graphics/eog/pkg-descr	(revision 442276)
@@ -1,5 +1,5 @@
-This is the Eye of Gnome, a GNOME 2 image viewer and cataloging
+This is the Eye of Gnome, a GNOME 3 image viewer and cataloging
 application.  It provides inline image viewing support for
 nautilus.
 
 WWW: http://www.gnome.org/gnome-office/eog.shtml