Index: net-im/ekiga/Makefile
===================================================================
--- net-im/ekiga/Makefile	(revision 18796)
+++ net-im/ekiga/Makefile	(working copy)
@@ -6,8 +6,6 @@
 PORTVERSION=	4.0.1
 CATEGORIES=	net-im
 MASTER_SITES=	GNOME
-#MASTER_SITES=	http://www.ekiga.org/admin/downloads/latest/sources/ekiga_${PORTVERSION}/
-#DISTNAME=	ekiga-${PORTVERSION}
 DIST_SUBDIR=	gnome3

 MAINTAINER=	gnome@FreeBSD.org
@@ -25,22 +23,17 @@
 USES=		gettext gmake pathfix perl5 pkgconfig
 USE_XORG=	xv
 USE_GNOME=	gtk20 intltool libxml2
-INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes

 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-I${LOCALBASE}/lib

-MAN1=		ekiga.1
-
 OPTIONS_DEFINE=	LDAP NOTIFY EVOLUTION GCONF DBUS AVAHI GNOMEHELP
 OPTIONS_DEFAULT=NOTIFY DBUS GCONF AVAHI

 EVOLUTION_DESC=	Evolution data server support
 GNOMEHELP_DESC=	Build Ekiga help files

-#OPTIONS_GROUP=	EXP
-#OPTIONS_GROUP_EXP=	KDE KAB GSTREAMER XCAP LOUDMOUTH
 EXP_DESC=	Experimental features
 KDE_DESC=	KDE 4 support
 KAB_DESC=	KAddressBook support (implies KDE option)
@@ -50,7 +43,6 @@

 # Note that h.323 support is enabled when opal is build with it.

-NO_STAGE=	yes
 .include <bsd.port.options.mk>

 PLIST_SUB+=	VERSION=${PORTVERSION}
@@ -142,7 +134,8 @@
 .endif

 .if ${PORT_OPTIONS:MEVOLUTION}
-USE_GNOME+=	evolutiondataserver
+USE_GNOME+=	evolutiondataserver3
+LIB_DEPENDS+=	libgcr-3.so:${PORTSDIR}/security/gcr
 CONFIGURE_ARGS+=--enable-eds
 PLIST_SUB+=	EVOLUTION=""
 WITH_PLUGINS=	1
@@ -162,6 +155,7 @@
 .endif

 .if ${PORT_OPTIONS:MGNOMEHELP}
+INSTALLS_OMF=	yes
 PLIST_SUB+=	GNOMEHELP=""
 USE_GNOME+=	gnomedocutils
 .else
Index: net-im/ekiga/pkg-plist
===================================================================
--- net-im/ekiga/pkg-plist	(revision 18796)
+++ net-im/ekiga/pkg-plist	(working copy)
@@ -4,6 +4,7 @@
 %%GCONF%%etc/ekiga/ekiga.schemas
 lib/ekiga/%%VERSION%%/libekiga.so
 lib/ekiga/%%VERSION%%/libekiga.la
+man/man1/ekiga.1.gz
 %%AVAHI%%lib/ekiga/%%VERSION%%/plugins/libgmavahi.so
 %%AVAHI%%lib/ekiga/%%VERSION%%/plugins/libgmavahi.la
 %%EVOLUTION%%lib/ekiga/4.0.1/plugins/libgmevolution.la