diff -ruN --exclude=CVS /usr/ports/graphics/libexif/Makefile ./Makefile
--- /usr/ports/graphics/libexif/Makefile	2013-01-06 07:35:19.719630337 +0800
+++ ./Makefile	2013-02-07 00:32:43.643222347 +0800
@@ -1,28 +1,31 @@
-# New ports collection makefile for:    libexif
-# Date created:        Tue Feb 26 19:02:44 MST 2002
-# Whom:                Peter Schmiedeskamp
-#
+# Created by: Peter Schmiedeskamp <pschmied@qwest.net>
 # $FreeBSD: head/graphics/libexif/Makefile 300896 2012-07-14 13:54:48Z beat $
-#
 
 PORTNAME=	libexif
-PORTVERSION=	0.6.20
+PORTVERSION=	0.6.21
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
 MAINTAINER=	marius@nuenneri.ch
 COMMENT=	Library to read digital camera file meta-data
 
+LICENSE=	LGPL21
+
 USE_BZIP2=	yes
-USE_GNOME=	gnomehack ltverhack pkgconfig
+USE_GNOME=	gnomehack ltverhack
 USE_GMAKE=	yes
+USE_PKGCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-docs
 USE_LDCONFIG=	yes
 
-.if !defined(WITHOUT_NLS)
+PORTDOCS=	AUTHORS ChangeLog NEWS README
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 .else
@@ -32,15 +35,14 @@
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-g -Wall||g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e '/^SUBDIRS =/s|doc||g ; \
 		 /^am__installdirs =/s|$$(docdir)||g ; \
 		 /^install-data-am:/s|install-docDATA||g' ${WRKSRC}/Makefile.in
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-.for file in AUTHORS ChangeLog NEWS README
+.for file in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
diff -ruN --exclude=CVS /usr/ports/graphics/libexif/distinfo ./distinfo
--- /usr/ports/graphics/libexif/distinfo	2013-01-06 07:35:19.719630337 +0800
+++ ./distinfo	2013-02-06 23:31:58.353251351 +0800
@@ -1,2 +1,2 @@
-SHA256 (libexif-0.6.20.tar.bz2) = a772d20bd8fb9802d7f0d70fde6ac8872f87d0c66c52b0d14026dafcaa83d715
-SIZE (libexif-0.6.20.tar.bz2) = 1412921
+SHA256 (libexif-0.6.21.tar.bz2) = 16cdaeb62eb3e6dfab2435f7d7bccd2f37438d21c5218ec4e58efa9157d4d41a
+SIZE (libexif-0.6.21.tar.bz2) = 1368435
diff -ruN --exclude=CVS /usr/ports/graphics/libexif/pkg-plist ./pkg-plist
--- /usr/ports/graphics/libexif/pkg-plist	2013-01-06 07:35:19.719630337 +0800
+++ ./pkg-plist	2013-02-07 00:33:19.373247664 +0800
@@ -1,8 +1,8 @@
 include/libexif/_stdint.h
 include/libexif/exif-byte-order.h
 include/libexif/exif-content.h
-include/libexif/exif-data.h
 include/libexif/exif-data-type.h
+include/libexif/exif-data.h
 include/libexif/exif-entry.h
 include/libexif/exif-format.h
 include/libexif/exif-ifd.h
@@ -17,15 +17,12 @@
 lib/libexif.so
 lib/libexif.so.12
 libdata/pkgconfig/libexif.pc
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
 %%NLS%%share/locale/be/LC_MESSAGES/libexif-12.mo
 %%NLS%%share/locale/bs/LC_MESSAGES/libexif-12.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/libexif-12.mo
 %%NLS%%share/locale/da/LC_MESSAGES/libexif-12.mo
 %%NLS%%share/locale/de/LC_MESSAGES/libexif-12.mo
+%%NLS%%share/locale/en_AU/LC_MESSAGES/libexif-12.mo
 %%NLS%%share/locale/en_CA/LC_MESSAGES/libexif-12.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/libexif-12.mo
 %%NLS%%share/locale/es/LC_MESSAGES/libexif-12.mo
@@ -34,15 +31,15 @@
 %%NLS%%share/locale/ja/LC_MESSAGES/libexif-12.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/libexif-12.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/libexif-12.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/libexif-12.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/libexif-12.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/libexif-12.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/libexif-12.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/libexif-12.mo
 %%NLS%%share/locale/sq/LC_MESSAGES/libexif-12.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/libexif-12.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/libexif-12.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/libexif-12.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/libexif-12.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/libexif-12.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/libexif-12.mo
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/libexif