Index: graphics/exiv2/Makefile
===================================================================
--- graphics/exiv2/Makefile	(revision 546053)
+++ graphics/exiv2/Makefile	(working copy)
@@ -18,7 +18,7 @@
 TEST_DEPENDS=	bash:shells/bash
 TEST_LIB_DEPENDS=	libgtest.so:devel/googletest
 
-USES=		cmake compiler:c++11-lang cpe dos2unix gettext iconv pathfix \
+USES=		cmake compiler:c++11-lang cpe dos2unix gettext-tools pathfix \
 		python:3.5+,test localbase:ldflags
 USE_LDCONFIG=	yes
 DOS2UNIX_FILES=	cmake/compilerFlags.cmake
@@ -25,16 +25,16 @@
 
 TEST_TARGET=	tests
 
-LDFLAGS+=	-lintl
-
-CMAKE_ON=	EXIV2_ENABLE_VIDEO \
-		EXIV2_ENABLE_NLS
+CMAKE_ON=	EXIV2_ENABLE_VIDEO
 CMAKE_OFF=	EXIV2_ENABLE_LIBXMP
 
-OPTIONS_DEFINE=	SAMPLE TEST
+OPTIONS_DEFINE=	NLS SAMPLE TEST
 OPTIONS_SUB=	yes
 TEST_IMPLIES=	SAMPLE
 
+NLS_CMAKE_BOOL=	EXIV2_ENABLE_NLS
+NLS_USES=	gettext-runtime
+
 SAMPLE_DESC=	Include sample applications
 SAMPLE_CMAKE_BOOL=	EXIV2_BUILD_SAMPLES
 
Index: graphics/exiv2/pkg-plist
===================================================================
--- graphics/exiv2/pkg-plist	(revision 546053)
+++ graphics/exiv2/pkg-plist	(working copy)
@@ -74,20 +74,20 @@
 lib/libexiv2-xmp.a
 libdata/pkgconfig/exiv2.pc
 man/man1/exiv2.1.gz
-share/locale/bs/LC_MESSAGES/exiv2.mo
-share/locale/ca/LC_MESSAGES/exiv2.mo
-share/locale/de/LC_MESSAGES/exiv2.mo
-share/locale/es/LC_MESSAGES/exiv2.mo
-share/locale/fi/LC_MESSAGES/exiv2.mo
-share/locale/fr/LC_MESSAGES/exiv2.mo
-share/locale/gl/LC_MESSAGES/exiv2.mo
-share/locale/ms/LC_MESSAGES/exiv2.mo
-share/locale/nl/LC_MESSAGES/exiv2.mo
-share/locale/pl/LC_MESSAGES/exiv2.mo
-share/locale/pt/LC_MESSAGES/exiv2.mo
-share/locale/ru/LC_MESSAGES/exiv2.mo
-share/locale/sk/LC_MESSAGES/exiv2.mo
-share/locale/sv/LC_MESSAGES/exiv2.mo
-share/locale/ug/LC_MESSAGES/exiv2.mo
-share/locale/uk/LC_MESSAGES/exiv2.mo
-share/locale/vi/LC_MESSAGES/exiv2.mo
+%%NLS%%share/locale/bs/LC_MESSAGES/exiv2.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/exiv2.mo
+%%NLS%%share/locale/de/LC_MESSAGES/exiv2.mo
+%%NLS%%share/locale/es/LC_MESSAGES/exiv2.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/exiv2.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/exiv2.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/exiv2.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/exiv2.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/exiv2.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/exiv2.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/exiv2.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/exiv2.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/exiv2.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/exiv2.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/exiv2.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/exiv2.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/exiv2.mo