Index: graphics/gexiv2/Makefile
===================================================================
--- graphics/gexiv2/Makefile	(revision 403986)
+++ graphics/gexiv2/Makefile	(working copy)
@@ -2,39 +2,35 @@
 # $FreeBSD$
 
 PORTNAME=	gexiv2
-PORTVERSION=	0.6.1
-PORTREVISION=	5
+PORTVERSION=	0.10.3
 CATEGORIES=	graphics
-MASTER_SITES=	http://pkgs.fedoraproject.org/repo/pkgs/libgexiv2/libgexiv2_0.6.1.tar.xz/5bd2ba92b765a2b3721874ebd2647734/
-DISTNAME=	lib${PORTNAME}_${PORTVERSION}
+MASTER_SITES=	GNOME
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GObject-based wrapper around Exiv2 library
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
+# gexiv2 doesn't use python itself, but it has override files
+# for python2 and python3. The applications using the gexiv2 python
+# introspection will need to select the right python version.
+BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
+		python3:${PORTSDIR}/lang/python3
 LIB_DEPENDS=	libexiv2.so:${PORTSDIR}/graphics/exiv2
 
-USES=		gmake libtool:build pkgconfig tar:xz
+USES=		gmake libtool pathfix pkgconfig python:2,build tar:xz
 USE_GNOME=	glib20 introspection:build
+GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-MAKE_ARGS=	REQUIRED_CFLAGS="" ENABLE_INTROSPECTION=1
-WRKSRC=		${WRKDIR}/lib${PORTNAME}-${PORTVERSION}
+CONFIGURE_ARGS+=--enable-introspection
+INSTALL_TARGET=	install-strip
 
+PLIST_SUB+=	PYTHON2_VERSION=${PYTHON2_DEFAULT} \
+		PYTHON3_VERSION=${PYTHON3_DEFAULT}
+
 post-patch:
-	@${REINPLACE_CMD} -E \
-		-e 's|^([[:space:]]+)m4[[:space:]]|\1gm4 |' \
-		-e 's|\$$\(LIB\)/pkgconfig|libdata/pkgconfig|' \
-		-e '/^CFLAGS/ s|CFLAGS|CXXFLAGS|' \
-		-e 's|\(CFLAGS\)|(CXXFLAGS)|' \
-		${WRKSRC}/${MAKEFILE}
+	@${REINPLACE_CMD} -e 's|\-Wl\,\-lstdc\+\+||' \
+		${WRKSRC}/Makefile.in
 
-pre-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/vala/vapi
-
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgexiv2.so
-
 .include <bsd.port.mk>
Index: graphics/gexiv2/distinfo
===================================================================
--- graphics/gexiv2/distinfo	(revision 403986)
+++ graphics/gexiv2/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (libgexiv2_0.6.1.tar.xz) = 72ee2fcc6a98c9e83467adea45b10d1b61c55654c204dcce9c2463615389a9e3
-SIZE (libgexiv2_0.6.1.tar.xz) = 27300
+SHA256 (gexiv2-0.10.3.tar.xz) = 390cfb966197fa9f3f32200bc578d7c7f3560358c235e6419657206a362d3988
+SIZE (gexiv2-0.10.3.tar.xz) = 244816
Index: graphics/gexiv2/pkg-plist
===================================================================
--- graphics/gexiv2/pkg-plist	(revision 403986)
+++ graphics/gexiv2/pkg-plist	(working copy)
@@ -1,15 +1,17 @@
-include/gexiv2/gexiv2.h
 include/gexiv2/gexiv2-log.h
+include/gexiv2/gexiv2-managed-stream.h
 include/gexiv2/gexiv2-metadata.h
-include/gexiv2/gexiv2-managed-stream.h
+include/gexiv2/gexiv2-preview-image.h
 include/gexiv2/gexiv2-preview-properties.h
-include/gexiv2/gexiv2-preview-image.h
 include/gexiv2/gexiv2-startup.h
-lib/girepository-1.0/GExiv2-0.4.typelib
-lib/libgexiv2.a
+include/gexiv2/gexiv2-version.h
+include/gexiv2/gexiv2.h
+lib/girepository-1.0/GExiv2-0.10.typelib
 lib/libgexiv2.so
 lib/libgexiv2.so.2
 lib/libgexiv2.so.2.0.0
+lib/python%%PYTHON2_VERSION%%/site-packages/gi/overrides/GExiv2.py
+lib/python%%PYTHON3_VERSION%%/site-packages/gi/overrides/GExiv2.py
 libdata/pkgconfig/gexiv2.pc
-share/gir-1.0/GExiv2-0.4.gir
+share/gir-1.0/GExiv2-0.10.gir
 share/vala/vapi/gexiv2.vapi