diff -urN -x CVS -x .svn -I '^# .FreeBSD: ' /ports/graphics/geeqie/Makefile graphics/geeqie/Makefile
--- /ports/graphics/geeqie/Makefile	2008-06-26 13:01:21.000000000 +0200
+++ graphics/geeqie/Makefile	2009-01-31 01:08:46.000000000 +0100
@@ -1,17 +1,16 @@
 # New ports collection makefile for:	graphics/geeqie
 # Date created:				17 May 2008
-# Whom:					Martin Tournoij <carpetsmoker@xs4all.nl>
+# Whom:					Martin Tournoij <carpetsmoker@rwxrwxrwx.net>
 #
-# $Carpetsmoker: ports/graphics/geeqie/Makefile,v 1.2 2008/05/17 19:35:22 carpetsmoker Exp $
 # $FreeBSD: ports/graphics/geeqie/Makefile,v 1.1 2008/06/26 11:01:21 amdmi3 Exp $
 #
 
 PORTNAME=	geeqie
-DISTVERSION=	1.0alpha1
+DISTVERSION=	1.0alpha3
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
-MAINTAINER=	carpetsmoker@xs4all.nl
+MAINTAINER=	carpetsmoker@rwxrwxrwx.net
 COMMENT=	Lightweight image viewer forked from GQview
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
@@ -22,29 +21,43 @@
 		--htmldir="${DOCSDIR}/html" \
 		--with-htmldir="${DOCSDIR}/html" \
 		--with-readmedir="${DOCSDIR}"
+CFLAGS+=	-I${LOCALBASE}/include
+CONFIGURE_ENV+=	CPPFLAGS="${CFLAGS}" LDFLAGS="-L${LOCALBASE}/lib"
 MAKE_ARGS+=	top_builddir="${WRKSRC}"
 
+PLIST_FILES=	bin/geeqie \
+		share/pixmaps/geeqie.png \
+		share/applications/geeqie.desktop
 PORTDOCS=	*
-
 MAN1=		geeqie.1
 
+
 OPTIONS=	EXIV2 "Enable EXIV2 for metadata editing" on \
 		LCMS "Enable LCMS for color adjusting" on
+# Build fails with lirc enabled, disable it for now
+#		LIRC "Enable lirc for remote control" off
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_EXIV2)
 LIB_DEPENDS+=	exiv2.3:${PORTSDIR}/graphics/exiv2
-CONFIGURE_ARGS+=--with-exiv2
+CONFIGURE_ARGS+=--enable-exiv2
 .else
-CONFIGURE_ARGS+=--without-exiv2
+CONFIGURE_ARGS+=--disable-exiv2
 .endif
 
 .if defined(WITH_LCMS)
 LIB_DEPENDS+=	lcms.1:${PORTSDIR}/graphics/lcms
-CONFIGURE_ARGS+=--with-lcms
+CONFIGURE_ARGS+=--enable-lcms
+.else
+CONFIGURE_ARGS+=--disable-lcms
+.endif
+
+.if defined(WITH_LIRC)
+LIB_DEPENDS+=	lirc_client.1:${PORTSDIR}/comms/lirc
+CONFIGURE_ARGS+=--enable-lirc
 .else
-CONFIGURE_ARGS+=--without-lcms
+CONFIGURE_ARGS+=--disable-lirc
 .endif
 
 post-patch:
diff -urN -x CVS -x .svn -I '^# .FreeBSD: ' /ports/graphics/geeqie/distinfo graphics/geeqie/distinfo
--- /ports/graphics/geeqie/distinfo	2008-06-26 13:01:21.000000000 +0200
+++ graphics/geeqie/distinfo	2009-01-31 00:24:01.000000000 +0100
@@ -1,3 +1,3 @@
-MD5 (geeqie-1.0alpha1.tar.gz) = 8e4838018b597cb6df056959ccf1ba45
-SHA256 (geeqie-1.0alpha1.tar.gz) = 7df5b644e572ec0f8a489c31ccf01789d602c788cffa33bca5ecd236020ad199
-SIZE (geeqie-1.0alpha1.tar.gz) = 1970338
+MD5 (geeqie-1.0alpha3.tar.gz) = 0f0c3991ee4ef9232e21ed49fa879b83
+SHA256 (geeqie-1.0alpha3.tar.gz) = 98073322e9db72ede5c374eb3213a981fecf60542f0e610436b4fd9c01b9b464
+SIZE (geeqie-1.0alpha3.tar.gz) = 2067890
diff -urN -x CVS -x .svn -I '^# .FreeBSD: ' /ports/graphics/geeqie/pkg-plist graphics/geeqie/pkg-plist
--- /ports/graphics/geeqie/pkg-plist	2008-06-26 13:01:21.000000000 +0200
+++ graphics/geeqie/pkg-plist	1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-bin/geeqie
-share/pixmaps/geeqie.png
-share/applications/geeqie.desktop
-@dirrmtry share/applications