2 files changed, 19 insertions, 64 deletions

diff --git a/net-im/ekiga/Makefile b/net-im/ekiga/Makefile
index 926c4e50b814..6c8165d2bff0 100644
--- a/net-im/ekiga/Makefile
+++ b/net-im/ekiga/Makefile
@@ -1,13 +1,12 @@
 # Created by: Charlie & <root@ws.ipfw.ru>
 # $FreeBSD$
+#    $MCom: ports/trunk/net-im/ekiga/Makefile 19954 2014-10-15 10:03:57Z kwm $
 
 PORTNAME=	ekiga
 PORTVERSION=	4.0.1
-PORTREVISION=	7
+PORTREVISION=	8
 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
@@ -21,14 +20,14 @@ LIB_DEPENDS=	libboost_signals.so:${PORTSDIR}/devel/boost-libs \
 RUN_DEPENDS=	gnome-icon-theme>=3.0.0:${PORTSDIR}/misc/gnome-icon-theme
 
 GNU_CONFIGURE=	yes
-USES=		gettext gmake libtool perl5 pkgconfig tar:xz
+USES=		gettext gmake libtool pathfix perl5 pkgconfig \
+		tar:xz
 USE_XORG=	xv
-USE_GNOME=	gtk20 intltool libxml2
-INSTALLS_OMF=	yes
+USE_GNOME=	gtk20 intlhack libxml2
 INSTALLS_ICONS=	yes
-
 CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib
+LIBS+=		-I${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	LDAP NOTIFY EVOLUTION GCONF DBUS AVAHI GNOMEHELP
 OPTIONS_DEFAULT=NOTIFY DBUS GCONF AVAHI
@@ -102,6 +101,12 @@ CONFIGURE_ARGS+=--disable-ldap
 PLIST_SUB+=	LDAP="@comment "
 .endif
 
+.if defined(WITH_PLUGINS)
+PLIST_SUB+=	PLUGINS=""
+.else
+PLIST_SUB+=	PLUGINS="@comment "
+.endif
+
 .if ${PORT_OPTIONS:MNOTIFY}
 LIB_DEPENDS+=	libnotify.so:${PORTSDIR}/devel/libnotify
 CONFIGURE_ARGS+=--enable-notify
@@ -132,7 +137,8 @@ PLIST_SUB+=	GCONF=""
 .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
@@ -152,6 +158,7 @@ PLIST_SUB+=	AVAHI="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MGNOMEHELP}
+INSTALLS_OMF=	yes
 PLIST_SUB+=	GNOMEHELP=""
 USE_GNOME+=	gnomedocutils
 .else
@@ -159,14 +166,4 @@ CONFIGURE_ARGS+=--disable-gdu
 PLIST_SUB+=	GNOMEHELP="@comment "
 .endif
 
-.if defined(WITH_PLUGINS)
-PLIST_SUB+=	PLUGINS=""
-.else
-PLIST_SUB+=	PLUGINS="@comment "
-.endif
-
-post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ekiga/${PORTVERSION}/libekiga.so
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ekiga/${PORTVERSION}/plugins/*.so
-
 .include <bsd.port.mk>
diff --git a/net-im/ekiga/pkg-plist b/net-im/ekiga/pkg-plist
index b1116212157c..523f53f6853f 100644
--- a/net-im/ekiga/pkg-plist
+++ b/net-im/ekiga/pkg-plist
@@ -3,11 +3,11 @@ bin/ekiga-config-tool
 %%DBUS%%bin/ekiga-helper
 %%GCONF%%etc/ekiga/ekiga.schemas
 lib/ekiga/%%VERSION%%/libekiga.so
+man/man1/ekiga.1.gz
 %%AVAHI%%lib/ekiga/%%VERSION%%/plugins/libgmavahi.so
-%%EVOLUTION%%lib/ekiga/%%VERSION%%/plugins/libgmevolution.so
-%%LDAP%%lib/ekiga/%%VERSION%%/plugins/libgmldap.so
+%%EVOLUTION%%lib/ekiga/4.0.1/plugins/libgmevolution.so
+%%LDAP%%lib/ekiga/4.0.1/plugins/libgmldap.so
 %%NOTIFY%%lib/ekiga/%%VERSION%%/plugins/libgmlibnotify.so
-man/man1/ekiga.1.gz
 share/applications/ekiga.desktop
 %%DBUS%%share/dbus-1/services/org.ekiga.Ekiga.service
 %%DBUS%%share/dbus-1/services/org.ekiga.Helper.service
@@ -602,45 +602,3 @@ share/sounds/ekiga/dialtone.wav
 share/sounds/ekiga/newmessage.wav
 share/sounds/ekiga/ring.wav
 share/sounds/ekiga/voicemail.wav
-@dirrm share/pixmaps/ekiga
-@dirrm share/sounds/ekiga
-%%GNOMEHELP%%@dirrm share/omf/ekiga
-%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/zh_CN/figures
-%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/zh_CN
-%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/uk/figures
-%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/uk
-%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/sv/figures
-%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/sv
-%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/sl/figures
-%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/sl
-%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/ru/figures
-%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/ru
-%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/pt_BR/figures
-%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/pt_BR
-%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/oc/figures
-%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/oc
-%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/fr/figures
-%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/fr
-%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/fi/figures
-%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/fi
-%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/eu/figures
-%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/eu
-%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/es/figures
-%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/es
-%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/en_GB/figures
-%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/en_GB
-%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/el/figures
-%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/el
-%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/de/figures
-%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/de
-%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/ca/figures
-%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/ca
-%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/bg/figures
-%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/bg
-%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/C/figures
-%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/C
-%%GNOMEHELP%%@dirrm share/gnome/help/ekiga
-%%PLUGINS%%@dirrm lib/ekiga/%%VERSION%%/plugins
-@dirrm lib/ekiga/%%VERSION%%
-@dirrm lib/ekiga
-%%GCONF%%@dirrm etc/ekiga