Index: head/graphics/gtkam/Makefile
===================================================================
--- head/graphics/gtkam/Makefile	(revision 362750)
+++ head/graphics/gtkam/Makefile	(revision 362751)
@@ -1,49 +1,51 @@
 # Created by: ports@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	gtkam
 PORTVERSION=	0.2.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF/gphoto/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Download and view files from various digital cameras
 
 LICENSE=	GPLv2 # (or later)
 
 LIB_DEPENDS=	libexif-gtk.so:${PORTSDIR}/graphics/libexif-gtk \
 		libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
 
 USES=		gmake pathfix pkgconfig
 USE_GNOME=	gnomehier gtk20
 GNU_CONFIGURE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		`pkg-config --libs gtk+-x11-2.0`
 
 OPTIONS_DEFINE=	DOCS GIMP GNOME
 OPTIONS_SUB=	yes
 
 GIMP_DESC=		GIMP plugin support
 GIMP_LIB_DEPENDS=	libgimp-2.0.so:${PORTSDIR}/graphics/gimp
 GIMP_CONFIGURE_WITH=	gimp
 
 GNOME_USE=		GNOME=gnomeprefix,libgnomeui
 GNOME_CONFIGURE_OFF=	--without-bonobo --without-gnome
 GNOME_MAKE_ENV=		GNOME_SUBDIRS="help omf-install"
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGNOME}
 INSTALLS_OMF=	yes
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|GIMP_VERSION="2.0"|GIMP_VERSION="2.2"|g ; \
 		 s|images/gtkam|gtkam/images|g ; \
 		 s|FLAGS -g|FLAGS|g' ${WRKSRC}/configure
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|images/gtkam|gtkam/images|g ; \
 		 s|$$(libdir)/gimp/|$$(libexecdir)/gimp/|g'
 
 .include <bsd.port.mk>
Index: head/graphics/libexif-gtk/Makefile
===================================================================
--- head/graphics/libexif-gtk/Makefile	(revision 362750)
+++ head/graphics/libexif-gtk/Makefile	(revision 362751)
@@ -1,45 +1,46 @@
 # Created by: ports@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	libexif-gtk
 PORTVERSION=	0.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	SF/libexif/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	marius@nuenneri.ch
 COMMENT=	GTK+ widgets to display/edit EXIF tags
 
 LICENSE=	LGPL21
 
 LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif
 
-USES=		pathfix pkgconfig
+USES=		libtool pathfix pkgconfig
 USE_GNOME=	gtk20
-USE_AUTOTOOLS=	autoconf libtool
+USE_AUTOTOOLS=	autoconf
+GUN_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 
 PORTDOCS=	AUTHORS ChangeLog NEWS README
 
 OPTIONS_DEFINE=	DOCS NLS
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
 USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} 's|-g ||g' ${WRKSRC}/configure.ac
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/graphics/libexif-gtk/pkg-plist
===================================================================
--- head/graphics/libexif-gtk/pkg-plist	(revision 362750)
+++ head/graphics/libexif-gtk/pkg-plist	(revision 362751)
@@ -1,25 +1,24 @@
 include/libexif-gtk/gtk-exif-browser.h
 include/libexif-gtk/gtk-exif-content-list.h
 include/libexif-gtk/gtk-exif-entry-ascii.h
 include/libexif-gtk/gtk-exif-entry-copyright.h
 include/libexif-gtk/gtk-exif-entry-date.h
 include/libexif-gtk/gtk-exif-entry-flash.h
 include/libexif-gtk/gtk-exif-entry-generic.h
 include/libexif-gtk/gtk-exif-entry-number.h
 include/libexif-gtk/gtk-exif-entry-option.h
 include/libexif-gtk/gtk-exif-entry-rational.h
 include/libexif-gtk/gtk-exif-entry-resolution.h
 include/libexif-gtk/gtk-exif-entry-user-comment.h
 include/libexif-gtk/gtk-exif-entry-version.h
 include/libexif-gtk/gtk-exif-entry.h
 lib/libexif-gtk.a
-lib/libexif-gtk.la
 lib/libexif-gtk.so
-lib/libexif-gtk.so.6
+lib/libexif-gtk.so.5.1.0
 libdata/pkgconfig/libexif-gtk.pc
-share/locale/de/LC_MESSAGES/libexif-gtk-5.mo
-share/locale/es/LC_MESSAGES/libexif-gtk-5.mo
-share/locale/fr/LC_MESSAGES/libexif-gtk-5.mo
-share/locale/pl/LC_MESSAGES/libexif-gtk-5.mo
-share/locale/ru/LC_MESSAGES/libexif-gtk-5.mo
+%%NLS%%share/locale/de/LC_MESSAGES/libexif-gtk-5.mo
+%%NLS%%share/locale/es/LC_MESSAGES/libexif-gtk-5.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/libexif-gtk-5.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/libexif-gtk-5.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/libexif-gtk-5.mo
 @dirrm include/libexif-gtk