Index: head/deskutils/conduit/Makefile
===================================================================
--- head/deskutils/conduit/Makefile	(revision 507267)
+++ head/deskutils/conduit/Makefile	(revision 507268)
@@ -1,54 +1,51 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
 #    $MCom: ports/deskutils/conduit/Makefile,v 1.7 2008/03/18 14:53:42 ahze Exp $
 
 PORTNAME=	conduit
 PORTVERSION=	0.3.17
 PORTREVISION=	11
 CATEGORIES=	deskutils
 MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Synchronization application for GNOME
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/goocanvasmodule.so:graphics/py-goocanvas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}vobject>=0.4.8:deskutils/py-vobject@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR}
 LIB_DEPENDS=	libdbus-1.so:devel/dbus
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/goocanvasmodule.so:graphics/py-goocanvas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}vobject>=0.4.8:deskutils/py-vobject@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} \
 		xdg-open:devel/xdg-utils
 
-GNU_CONFIGURE=	yes
-USES=		gettext gmake pathfix pkgconfig python:2.7 \
+USES=		gettext gmake localbase:ldflags pathfix pkgconfig python:2.7 \
 		shebangfix
+GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GNOME=	intltool pygnome2 gnomeprefix gnomedocutils
 CONFIGURE_ARGS=	--disable-nautilus-extension
 SHEBANG_FILES=	conduit/conduit.real \
 		tools/conduit-client
+NO_ARCH=	yes
 
 OPTIONS_DEFINE=	EOG
 OPTIONS_DEFAULT=EOG
 EOG_DESC=	Build Eye-Of-Gnome Plugin
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MEOG}
-BUILD_DEPENDS+=	eog:graphics/eog
-RUN_DEPENDS+=	eog:graphics/eog
-CONFIGURE_ARGS+=	--enable-eog-plugin
-.endif
+EOG_BUILD_DEPENDS=	eog:graphics/eog
+EOG_RUN_DEPENDS=	eog:graphics/eog
+EOG_CONFIGURE_ON=	--enable-eog-plugin
 
 post-patch:
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e 's|/bin/bash|${SH}|' \
 		-e 's|/usr/bin/python|${LOCALBASE}/bin/python|' \
 		-e 's|/usr/lib/firefox*|${LOCALBASE}/lib/firefox|'
 
 .include <bsd.port.mk>
Index: head/deskutils/conduit/pkg-descr
===================================================================
--- head/deskutils/conduit/pkg-descr	(revision 507267)
+++ head/deskutils/conduit/pkg-descr	(revision 507268)
@@ -1,4 +1,4 @@
 Synchronization application for GNOME. It allows you to synchronize your data
 between online web services (Gmail, backpackit.com, etc) and your computer.
 
-WWW: http://www.conduit-project.org/
+WWW: https://wiki.gnome.org/action/show/Attic/Conduit