Update empathy to 3.12.2. Remove the post-install target and convert

the options to the compact form.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19664 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 18 insertions, 50 deletions

diff --git a/net-im/empathy/Makefile b/net-im/empathy/Makefile
index 127f3fc18..f4b02073f 100644
--- a/net-im/empathy/Makefile
+++ b/net-im/empathy/Makefile
@@ -1,9 +1,9 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports-experimental/trunk/net-im/empathy/Makefile 19491 2014-04-14 15:07:51Z gusi $
+#   $MCom$
 
 PORTNAME=	empathy
-PORTVERSION=	3.12.1
+PORTVERSION=	3.12.2
 CATEGORIES=	net-im gnome
 MASTER_SITES=	GNOME
 
@@ -55,6 +55,7 @@ CONFIGURE_ARGS=	--disable-Werror \
 GLIB_SCHEMAS=	org.gnome.Empathy.gschema.xml \
 		org.gnome.telepathy-account-widgets.gschema.xml
 
+OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	JABBER MSN IRC SALUT HAZE MAP CHEESE
 OPTIONS_DEFAULT=JABBER MSN IRC SALUT      MAP
 JABBER_DESC=	Enable jabber (XMPP) client support
@@ -64,54 +65,21 @@ SALUT_DESC=	Enable link-local (serverless) XMPP support
 HAZE_DESC=	Enable libpurple protocol integration
 MAP_DESC=	Enable graphical map support
 CHEESE_DESC=	Enable cheese camera support
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MJABBER}
-RUN_DEPENDS+=	${LOCALBASE}/libexec/telepathy-gabble:${PORTSDIR}/net-im/telepathy-gabble
-.endif
-
-.if ${PORT_OPTIONS:MMSN}
-RUN_DEPENDS+=	${LOCALBASE}/libexec/telepathy-butterfly:${PORTSDIR}/net-im/telepathy-butterfly
-.endif
-
-.if ${PORT_OPTIONS:MIRC}
-RUN_DEPENDS+=	${LOCALBASE}/libexec/telepathy-idle:${PORTSDIR}/net-im/telepathy-idle
-.endif
-
-.if ${PORT_OPTIONS:MSALUT}
-RUN_DEPENDS+=	${LOCALBASE}/libexec/telepathy-salut:${PORTSDIR}/net-im/telepathy-salut
-.endif
-
-.if !defined(WITHOUT_HAZE)
-RUN_DEPENDS+=	${LOCALBASE}/libexec/telepathy-haze:${PORTSDIR}/net-im/telepathy-haze
-.endif
-
-.if ${PORT_OPTIONS:MMAP}
-USE_GL=		gl
-LIB_DEPENDS+=	libchamplain-0.12.so:${PORTSDIR}/graphics/libchamplain
-CONFIGURE_ARGS+=--enable-map
-PLIST_SUB+=	MAP=""
-.else
-CONFIGURE_ARGS+=--disable-map
-PLIST_SUB+=	MAP="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MCHEESE}
-BUILD_DEPENDS+=	cheese>=0:${PORTSDIR}/multimedia/cheese
-RUN_DEPENDS+=	cheese>=0:${PORTSDIR}/multimedia/cheese
-CONFIGURE_ARGS+=--with-cheese
-.else
-CONFIGURE_ARGS+=--without-cheese
-.endif
+JABBER_RUN_DEPENDS=	${LOCALBASE}/libexec/telepathy-gabble:${PORTSDIR}/net-im/telepathy-gabble
+MSN_RUN_DEPENDS=	${LOCALBASE}/libexec/telepathy-butterfly:${PORTSDIR}/net-im/telepathy-butterfly
+IRC_RUN_DEPENDS=	${LOCALBASE}/libexec/telepathy-idle:${PORTSDIR}/net-im/telepathy-idle
+SALUT_RUN_DEPENDS=	${LOCALBASE}/libexec/telepathy-salut:${PORTSDIR}/net-im/telepathy-salut
+HAZE_RUN_DEPENDS=	${LOCALBASE}/libexec/telepathy-haze:${PORTSDIR}/net-im/telepathy-haze
+MAP_USE=		GL=gl
+MAP_LIB_DEPENDS=	libchamplain-0.12.so:${PORTSDIR}/graphics/libchamplain
+MAP_CONFIGURE_ENABLE=	map	
+CHEESE_BUILD_DEPENDS=	cheese>=0:${PORTSDIR}/multimedia/cheese
+CHEESE_RUN_DEPENDS=	cheese>=0:${PORTSDIR}/multimedia/cheese
+CHEESE_CONFIGURE_WITH=	cheese	
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|clutter-gst-1.0|clutter-gst-2.0|g ;\
 		s|MISSION_CONTROL_PLUGINS_DIR=`pkg-config -|MISSION_CONTROL_PLUGINS_DIR=$${libdir}/`pkg-config -|g' \
 			${WRKSRC}/configure
 
-post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/empathy/libempathy-*3.12.1.so
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mission-control-plugins.0/mcp-account-manager-goa.so
-
 .include <bsd.port.mk>
diff --git a/net-im/empathy/distinfo b/net-im/empathy/distinfo
index f4773d5f7..9648ba56b 100644
--- a/net-im/empathy/distinfo
+++ b/net-im/empathy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (empathy-3.12.1.tar.xz) = 53049c069ea893b58b3b2c4307c064e28835d3d61c8e53199bceda3d9e734981
-SIZE (empathy-3.12.1.tar.xz) = 5042300
+SHA256 (empathy-3.12.2.tar.xz) = 414d0c6b1a30b1afbf35ad04b0b9ff3ada3e06fab797a50a7147cdfe0905e7cd
+SIZE (empathy-3.12.2.tar.xz) = 5042640
diff --git a/net-im/empathy/pkg-plist b/net-im/empathy/pkg-plist
index 920a7c656..d1f85d48d 100644
--- a/net-im/empathy/pkg-plist
+++ b/net-im/empathy/pkg-plist
@@ -1,8 +1,8 @@
 bin/empathy
 bin/empathy-accounts
 bin/empathy-debugger
-lib/empathy/libempathy-3.12.1.so
-lib/empathy/libempathy-gtk-3.12.1.so
+lib/empathy/libempathy-3.12.2.so
+lib/empathy/libempathy-gtk-3.12.2.so
 lib/empathy/libempathy-gtk.a
 lib/empathy/libempathy-gtk.la
 lib/empathy/libempathy-gtk.so