7 files changed, 24 insertions, 22 deletions
diff --git a/net-im/empathy/Makefile b/net-im/empathy/Makefile
index e0871e2ed..dce98318e 100644
--- a/net-im/empathy/Makefile
+++ b/net-im/empathy/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/net-im/empathy/Makefile,v 1.88 2011/11/12 14:54:37 kwm Exp $
+#    $MCom: ports/net-im/empathy/Makefile,v 1.89 2011/12/06 14:17:10 kwm Exp $
 
 PORTNAME=	empathy
 PORTVERSION=	2.34.0
@@ -44,8 +44,8 @@ INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_PYTHON=	yes
 MAKE_JOBS_UNSAFE=yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-Werror \
 		--with-ca-file=${LOCALBASE}/share/certs/ca-root-nss.crt
 
diff --git a/net-im/folks/Makefile b/net-im/folks/Makefile
index 8d79c543c..099541e68 100644
--- a/net-im/folks/Makefile
+++ b/net-im/folks/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/net-im/folks/Makefile,v 1.27 2012/02/27 23:21:47 kwm Exp $
+#   $MCom: ports/net-im/folks/Makefile,v 1.28 2012/06/03 03:07:03 mezz Exp $
 #
 
 PORTNAME=	folks
@@ -28,8 +28,8 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomehier gnomehack intlhack ltverhack evolutiondataserver3
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_SUB=	LIBVER=25 VERSION=33
 
diff --git a/net-im/telepathy-farsight/Makefile b/net-im/telepathy-farsight/Makefile
index fbacf50df..1f0df9e51 100644
--- a/net-im/telepathy-farsight/Makefile
+++ b/net-im/telepathy-farsight/Makefile
@@ -29,7 +29,7 @@ USE_LDCONFIG=	yes
 USE_PYTHON=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehack pkgconfig glib20 ltverhack
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.mk>
diff --git a/net-im/telepathy-idle/Makefile b/net-im/telepathy-idle/Makefile
index 7887ee0de..3ecdfed19 100644
--- a/net-im/telepathy-idle/Makefile
+++ b/net-im/telepathy-idle/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Florent Thoumie <flz@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/net-im/telepathy-idle/Makefile,v 1.4 2011/05/28 13:33:32 kwm Exp $
+#    $MCom: ports/net-im/telepathy-idle/Makefile,v 1.5 2011/11/22 11:12:58 kwm Exp $
 #
 
 PORTNAME=	telepathy-idle
@@ -31,7 +31,8 @@ USE_GNOME=	gnomehack pkgconfig glib20
 
 MAN8=		telepathy-idle.8
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git a/net-im/telepathy-logger/Makefile b/net-im/telepathy-logger/Makefile
index 215200757..1d22fadfd 100644
--- a/net-im/telepathy-logger/Makefile
+++ b/net-im/telepathy-logger/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/net-im/telepathy-logger/Makefile,v 1.12 2012/06/12 22:59:55 mezz Exp $
+#    $MCom: ports/net-im/telepathy-logger/Makefile,v 1.13 2012/08/08 16:56:40 kwm Exp $
 
 PORTNAME=	telepathy-logger
 PORTVERSION=	0.4.0
@@ -13,10 +13,8 @@ MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Logger utility library for the Telepathy framework
 
-BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt \
-		g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
+BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		xml2.5:${PORTSDIR}/textproc/libxml2 \
 		telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib
 
 LICENSE=	LGPL21
@@ -26,8 +24,10 @@ USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USE_GNOME=	gnomehack pkgconfig glib20 intltool gnomedocutils ltverhack
-USE_SQLITE=	build
+USE_GNOME=	gnomehack glib20 intltool gnomedocutils ltverhack libxml2 \
+		libxslt:build
+USE_PKGCONFIG=	build
+USE_SQLITE=	yes
 USE_PYTHON_BUILD=	yes
 GLIB_SCHEMAS=	org.freedesktop.Telepathy.Logger.gschema.xml
 
diff --git a/net-im/telepathy-mission-control/Makefile b/net-im/telepathy-mission-control/Makefile
index f8053b46c..48311273c 100644
--- a/net-im/telepathy-mission-control/Makefile
+++ b/net-im/telepathy-mission-control/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/net-im/telepathy-mission-control/Makefile,v 1.21 2011/11/22 11:32:37 kwm Exp $
+#    $MCom: ports/net-im/telepathy-mission-control/Makefile,v 1.22 2012/06/12 22:55:59 mezz Exp $
 
 PORTNAME=	telepathy-mission-control
 PORTVERSION=	5.12.0
@@ -18,8 +18,8 @@ LIB_DEPENDS=	telepathy.2:${PORTSDIR}/net-im/libtelepathy \
 
 USE_GNOME=	gnomeprefix pkgconfig gconf2 libxslt gnomehack ltverhack
 USE_AUTOTOOLS=	libtool
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 GLIB_SCHEMAS=	im.telepathy.MissionControl.FromEmpathy.gschema.xml
diff --git a/net-im/telepathy-salut/Makefile b/net-im/telepathy-salut/Makefile
index 6adc42321..f3fae8840 100644
--- a/net-im/telepathy-salut/Makefile
+++ b/net-im/telepathy-salut/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Florent Thoumie <flz@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/net-im/telepathy-salut/Makefile,v 1.7 2012/04/20 21:04:15 kwm Exp $
+#   $MCom: ports/net-im/telepathy-salut/Makefile,v 1.8 2012/06/12 23:14:58 mezz Exp $
 #
 
 PORTNAME=	telepathy-salut
@@ -21,13 +21,14 @@ LIB_DEPENDS=	avahi-glib.1:${PORTSDIR}/net/avahi-app \
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack pkgconfig glib20
+USE_GNOME=	gnomehack glib20
+USE_PKGCONFIG=	build
 USE_OPENSSL=	yes
 USE_PYTHON_BUILD=	yes
 USE_SQLITE=	3
-CONFIGURE_ENV=	LIBS="${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--disable-Werror --enable-avahi-tests=no
 CPPFLAGS+=	${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
 
 MAN8=		telepathy-salut.8