Not complete yet.

Trim header, remove leading "A" from comments.

Convert:
 USE_GNOME=pkgconfig -> USE_PKGCONFIG=build
 USE_GNOME=gnomehack -> USES=pathfix

Do some maintaince where needed, and let there be breakage! [1]

[1] But since nobody (can't) use(s) SVN yet to build this isn't a issue :)


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

12 files changed, 71 insertions, 111 deletions

diff --git a/net-im/farsight2/Makefile b/net-im/farsight2/Makefile
index f085e6252..cbf543195 100644
--- a/net-im/farsight2/Makefile
+++ b/net-im/farsight2/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	farsight2
-# Date created:				27 February 2009
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
 #    $MCom$
 
@@ -13,7 +10,7 @@ MASTER_SITES=	http://farsight.freedesktop.org/releases/farsight2/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Collection of GStreamer modules and libraries for videoconferencing
 
-LIB_DEPENDS=	nice.10:${PORTSDIR}/net-im/libnice
+LIB_DEPENDS=	nice:${PORTSDIR}/net-im/libnice
 
 CONFLICTS=	farstream-[0-9]*
 
@@ -22,7 +19,9 @@ USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 USE_PYTHON=	yes
-USE_GNOME=	gnomehack pkgconfig glib20 ltverhack
+USES=		pathfix
+USE_PKGCONFIG=	build
+USE_GNOME=	glib20 ltverhack
 USE_GSTREAMER=	core good bad python
 USE_AUTOTOOLS=	libtool
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/net-im/farstream/Makefile b/net-im/farstream/Makefile
index 6e2cbcfaa..b57e8a2b8 100644
--- a/net-im/farstream/Makefile
+++ b/net-im/farstream/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	farsight2
-# Date created:				27 February 2009
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
 #   $MCom$
-#
 
 PORTNAME=	farstream
 PORTVERSION=	0.1.2
@@ -14,7 +10,7 @@ MASTER_SITES=	http://freedesktop.org/software/farstream/releases/farstream/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Collection of GStreamer modules and libraries for videoconferencing
 
-LIB_DEPENDS=	nice.10:${PORTSDIR}/net-im/libnice
+LIB_DEPENDS=	nice:${PORTSDIR}/net-im/libnice
 
 CONFLICTS=	farsight2-[0-9]*
 
@@ -23,7 +19,9 @@ USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 USE_PYTHON=	yes
-USE_GNOME=	gnomehack pkgconfig glib20 ltverhack
+USES=		pathfix
+USE_PKGCONFIG=	build
+USE_GNOME=	glib20 ltverhack
 USE_GSTREAMER=	core good bad python
 USE_AUTOTOOLS=	libtool
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/net-im/libnice/Makefile b/net-im/libnice/Makefile
index b80568023..780471c7b 100644
--- a/net-im/libnice/Makefile
+++ b/net-im/libnice/Makefile
@@ -1,9 +1,6 @@
-# New ports collection makefile for:	libnice
-# Date created:				27 February 2009
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#
+#   $MCom$
 
 PORTNAME=	libnice
 PORTVERSION=	0.1.3
@@ -16,7 +13,9 @@ COMMENT=	Library and transmitter that implements ICE-19
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
-USE_GNOME=	gnomehack pkgconfig glib20 ltverhack
+USES=		pathfix
+USE_PKGCONFIG=	build
+USE_GNOME=	glib20 ltverhack
 USE_GSTREAMER=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--without-gstreamer --with-gstreamer-0.10
diff --git a/net-im/telepathy-farsight/Makefile b/net-im/telepathy-farsight/Makefile
index 1f0df9e51..158d226c1 100644
--- a/net-im/telepathy-farsight/Makefile
+++ b/net-im/telepathy-farsight/Makefile
@@ -1,9 +1,6 @@
-# New ports collection makefile for:	telepathy-farsight
-# Date created:				27 February 2009
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#
+#   $MCom$
 
 PORTNAME=	telepathy-farsight
 PORTVERSION=	0.0.19
@@ -13,22 +10,18 @@ MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Farsight Connection Manager for Telepathy Framework
 
-LIB_PC_DEPENDS=	gobject-2.0.pc:${PORTSDIR}/devel/glib20 \
-		dbus-glib-1.pc:${PORTSDIR}/devel/dbus-glib \
-		telepathy-glib.pc:${PORTSDIR}/net-im/telepathy-glib \
-		farsight2-0.10.pc:${PORTSDIR}/net-im/farsight2
-
-BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
-
-BUILD_DEPENDS+=	${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
-RUN_DEPENDS+=	${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
+LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
+		telepathy-glib:${PORTSDIR}/net-im/telepathy-glib \
+		gstfarsight-0.10:${PORTSDIR}/net-im/farsight2
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_PYTHON=	yes
 USE_AUTOTOOLS=	libtool
-USE_GNOME=	gnomehack pkgconfig glib20 ltverhack
+USES=		pathfix
+USE_PKGCONFIG=	build
+USE_GNOME=	glib20 ltverhack libxslt:build
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
diff --git a/net-im/telepathy-farstream/Makefile b/net-im/telepathy-farstream/Makefile
index bff334cd0..55a8ad706 100644
--- a/net-im/telepathy-farstream/Makefile
+++ b/net-im/telepathy-farstream/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	telepathy-farsight
-# Date created:				27 February 2009
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
 #   $MCom
-#
 
 PORTNAME=	telepathy-farstream
 PORTVERSION=	0.4.0
@@ -14,23 +10,19 @@ MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Farstream Connection Manager for Telepathy Framework
 
-LIB_PC_DEPENDS=	gobject-2.0.pc:${PORTSDIR}/devel/glib20 \
-		dbus-glib-1.pc:${PORTSDIR}/devel/dbus-glib \
-		telepathy-glib.pc:${PORTSDIR}/net-im/telepathy-glib \
-		farstream-0.1.pc:${PORTSDIR}/net-im/farstream
-
-BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
-
-BUILD_DEPENDS+=	${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
-RUN_DEPENDS+=	${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
+LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
+		telepathy-glib:${PORTSDIR}/net-im/telepathy-glib \
+		farstream-0.1:${PORTSDIR}/net-im/farstream
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 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}"
+USES=		pathfix
+USE_PKGCONFIG=	build
+USE_GNOME=	glib20 ltverhack libxslt:build
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -pthread
 
 .include <bsd.port.mk>
diff --git a/net-im/telepathy-gabble/Makefile b/net-im/telepathy-gabble/Makefile
index 7033c0b2d..7bad519bc 100644
--- a/net-im/telepathy-gabble/Makefile
+++ b/net-im/telepathy-gabble/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	telepathy-gabble
-# Date created:				Apr 19 2007
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
+# Created by: Florent Thoumie <flz@FreeBSD.org>
 # $FreeBSD$
 #    $MCom$
 
@@ -13,8 +10,7 @@ MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Jabber Connection Manager for Telepathy Framework
 
-BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt \
-		telepathy-glib>=0.18.0:${PORTSDIR}/net-im/telepathy-glib \
+BUILD_DEPENDS=	telepathy-glib>=0.18.0:${PORTSDIR}/net-im/telepathy-glib \
 		${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
 LIB_DEPENDS=	soup-2.4:${PORTSDIR}/devel/libsoup \
 		nice:${PORTSDIR}/net-im/libnice \
@@ -25,9 +21,11 @@ LIB_DEPENDS=	soup-2.4:${PORTSDIR}/devel/libsoup \
 RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
 
 GNU_CONFIGURE=	yes
-LDFLAGS+=	${PTHREAD_LIBS}
+LDFLAGS+=	-pthread
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack pkgconfig glib20
+USES=		pathfix
+USE_PKGCONFIG=	build
+USE_GNOME=	glib20 libxslt:build
 USE_SQLITE=	yes
 USE_OPENSSL=	yes
 USE_PYTHON_BUILD=	yes
diff --git a/net-im/telepathy-glib/Makefile b/net-im/telepathy-glib/Makefile
index 272dd2b88..26553f34f 100644
--- a/net-im/telepathy-glib/Makefile
+++ b/net-im/telepathy-glib/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	telepathy-glib
-# Date created:				Apr 19 2007
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
+# Created by: Florent Thoumie <flz@FreeBSD.org>
 # $FreeBSD$
 #    $MCom$
 
@@ -13,16 +10,17 @@ MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GLib utility library for the Telepathy framework
 
-BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt \
-		vala-vapigen>=0.14.0:${PORTSDIR}/lang/vala-vapigen \
+BUILD_DEPENDS=	vala-vapigen>=0.14.0:${PORTSDIR}/lang/vala-vapigen \
 		g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
-LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib
 RUN_DEPENDS=	vapigen:${PORTSDIR}/lang/vala-vapigen
 
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USE_GNOME=	gnomehack pkgconfig glib20 ltverhack gnomehier
+USES=		pathfix
+USE_PKGCONFIG=	build
+USE_GNOME=	glib20 ltverhack gnomehier libxslt:build
 USE_PYTHON_BUILD=	yes
 MAKE_JOBS_UNSAFE=	yes
 GNU_CONFIGURE=	yes
diff --git a/net-im/telepathy-haze/Makefile b/net-im/telepathy-haze/Makefile
index 499c672ed..7f16e4ada 100644
--- a/net-im/telepathy-haze/Makefile
+++ b/net-im/telepathy-haze/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	telepathy-haze
-# Date created:		2007-10-29
-# Whom:			Michael Johnson <ahze@FreeBSD.org>
-#
+# Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
 #   $MCom$
-#
 
 PORTNAME=	telepathy-haze
 PORTVERSION=	0.6.0
@@ -14,12 +10,12 @@ MASTER_SITES=	http://telepathy.freedesktop.org/releases/telepathy-haze/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Libpurple connection manager for telepathy
 
-BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
-LIB_DEPENDS=	purple.10:${PORTSDIR}/net-im/libpurple \
-		idn.17:${PORTSDIR}/dns/libidn \
-		telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib
+LIB_DEPENDS=	purple:${PORTSDIR}/net-im/libpurple \
+		idn:${PORTSDIR}/dns/libidn \
+		telepathy-glib:${PORTSDIR}/net-im/telepathy-glib
 
-USE_GNOME=	pkgconfig
+USES=		pathfix
+USE_GNOME=	libxslt:build
 CPPFLAGS+=	-I${LOCALBASE}/include
 WRKSRC=		${WRKDIR}/telepathy-${PORTNAME}-${DISTVERSION}
 GNU_CONFIGURE=	yes
diff --git a/net-im/telepathy-idle/Makefile b/net-im/telepathy-idle/Makefile
index 11bec2bc2..6af0bb946 100644
--- a/net-im/telepathy-idle/Makefile
+++ b/net-im/telepathy-idle/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	telepathy-idle
-# Date created:				Apr 19 2007
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
+# Created by: Florent Thoumie <flz@FreeBSD.org>
 # $FreeBSD$
 #    $MCom$
-#
 
 PORTNAME=	telepathy-idle
 PORTVERSION=	0.1.11
@@ -14,20 +10,16 @@ MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	IRC Connection Manager for Telepathy Framework
 
-LIB_PC_DEPENDS=	gobject-2.0.pc:${PORTSDIR}/devel/glib20 \
-		dbus-glib-1.pc:${PORTSDIR}/devel/dbus-glib \
-		telepathy-glib.pc:${PORTSDIR}/net-im/telepathy-glib
-
-BUILD_DEPENDS=	${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g} \
-    		xsltproc:${PORTSDIR}/textproc/libxslt
-RUN_DEPENDS=	${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
-
-LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo
+LIB_DEPENDS=	execinfo:${PORTSDIR}/devel/libexecinfo
+		dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
+		telepathy-glib:${PORTSDIR}/net-im/telepathy-glib
 
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack pkgconfig glib20
+USES=		pathfix
+USE_PKGCONFIG=	build
+USE_GNOME=	glib20 libxslt:build
 
 MAN8=		telepathy-idle.8
 
diff --git a/net-im/telepathy-logger/Makefile b/net-im/telepathy-logger/Makefile
index fa02b1fb0..d6e80cef8 100644
--- a/net-im/telepathy-logger/Makefile
+++ b/net-im/telepathy-logger/Makefile
@@ -24,8 +24,8 @@ USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USE_GNOME=	gnomehack glib20 intltool gnomedocutils ltverhack libxml2 \
-		libxslt:build
+USES=		pathfix
+USE_GNOME=	glib20 intltool gnomedocutils ltverhack libxml2 libxslt:build
 USE_PKGCONFIG=	build
 USE_SQLITE=	yes
 USE_PYTHON_BUILD=	yes
diff --git a/net-im/telepathy-mission-control/Makefile b/net-im/telepathy-mission-control/Makefile
index 09680f2bb..e713d5c91 100644
--- a/net-im/telepathy-mission-control/Makefile
+++ b/net-im/telepathy-mission-control/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	telepathy-mission-control
-# Date created:		2007-10-29
-# Whom:			Michael Johnson <ahze@FreeBSD.org>
-#
+# Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
 #    $MCom$
 
@@ -13,10 +10,12 @@ MASTER_SITES=	http://telepathy.freedesktop.org/releases/telepathy-mission-contro
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Telepathy component to apps to abstract details of connection managers
 
-LIB_DEPENDS=	telepathy.2:${PORTSDIR}/net-im/libtelepathy \
-		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS=	telepathy:${PORTSDIR}/net-im/libtelepathy \
+		dbus-glib-1:${PORTSDIR}/devel/dbus-glib
 
-USE_GNOME=	gnomeprefix pkgconfig gconf2 libxslt gnomehack ltverhack
+USES=		pathfix
+USE_PKGCONFIG=	build
+USE_GNOME=	gnomeprefix gconf2 libxslt ltverhack
 USE_AUTOTOOLS=	libtool
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/net-im/telepathy-salut/Makefile b/net-im/telepathy-salut/Makefile
index d62ccefb9..44917628b 100644
--- a/net-im/telepathy-salut/Makefile
+++ b/net-im/telepathy-salut/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	telepathy-salut
-# Date created:				Apr 16 2007
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
+# Created by: Florent Thoumie <flz@FreeBSD.org>
 # $FreeBSD$
 #   $MCom$
-#
 
 PORTNAME=	telepathy-salut
 PORTVERSION=	0.8.0
@@ -14,14 +10,14 @@ MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Link-local Connection Manager for Telepathy Framework
 
-BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
-LIB_DEPENDS=	avahi-glib.1:${PORTSDIR}/net/avahi-app \
-		telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib \
-		soup-2.4.1:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS=	avahi-glib:${PORTSDIR}/net/avahi-app \
+		telepathy-glib:${PORTSDIR}/net-im/telepathy-glib \
+		soup-2.4:${PORTSDIR}/devel/libsoup
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack glib20
+USES=		pathfix
+USE_GNOME=	glib20 libxslt:build
 USE_PKGCONFIG=	build
 USE_OPENSSL=	yes
 USE_PYTHON_BUILD=	yes