Massive port framework maintaince/update (long over due too)

Deal with recent USES changes, pet portlint here and there.
Sync with ports, more to come.


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

10 files changed, 55 insertions, 79 deletions

diff --git a/net-im/empathy/Makefile b/net-im/empathy/Makefile
index 82fd7498f..aac16f837 100644
--- a/net-im/empathy/Makefile
+++ b/net-im/empathy/Makefile
@@ -1,9 +1,6 @@
-# New ports collection makefile for:	empathy
-# Date created:		2007-10-29
-# Whom:			Michael Johnson <ahze@FreeBSD.org>
-#
+# Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/trunk/net-im/empathy/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	empathy
 PORTVERSION=	2.34.0
@@ -17,16 +14,16 @@ COMMENT=	GNOME IM client based around telepathy
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
 		${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \
     		${LOCALBASE}/libexec/mission-control-5:${PORTSDIR}/net-im/telepathy-mission-control
-LIB_DEPENDS=	enchant.1:${PORTSDIR}/textproc/enchant \
-		telepathy.2:${PORTSDIR}/net-im/libtelepathy \
-		telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib \
-		telepathy-farsight.0:${PORTSDIR}/net-im/telepathy-farsight \
-		telepathy-logger.2:${PORTSDIR}/net-im/telepathy-logger \
-		folks-telepathy.22:${PORTSDIR}/net-im/folks04 \
-		unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \
-		notify.4:${PORTSDIR}/devel/libnotify \
-		gcr.0:${PORTSDIR}/security/gnome-keyring \
-		canberra-gtk.0:${PORTSDIR}/audio/libcanberra
+LIB_DEPENDS=	enchant:${PORTSDIR}/textproc/enchant \
+		telepathy:${PORTSDIR}/net-im/libtelepathy \
+		telepathy-glib:${PORTSDIR}/net-im/telepathy-glib \
+		telepathy-farsight:${PORTSDIR}/net-im/telepathy-farsight \
+		telepathy-logger:${PORTSDIR}/net-im/telepathy-logger \
+		folks-telepathy:${PORTSDIR}/net-im/folks04 \
+		unique-1.0:${PORTSDIR}/x11-toolkits/unique \
+		notify:${PORTSDIR}/devel/libnotify \
+		gcr:${PORTSDIR}/security/gnome-keyring \
+		canberra-gtk:${PORTSDIR}/audio/libcanberra
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
 		${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \
     		${LOCALBASE}/libexec/mission-control-5:${PORTSDIR}/net-im/telepathy-mission-control
@@ -35,9 +32,9 @@ CONFLICTS=	empathy-3.[0-9]*
 
 USE_GMAKE=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_LDCONFIG=	yes
-USE_GNOME=	evolutiondataserver gnomehack gnomeprefix pygtk2 ltverhack
+USE_GNOME=	evolutiondataserver gnomeprefix pygtk2 ltverhack
 USE_GSTREAMER=	yes
 USE_AUTOTOOLS=	libtool
 INSTALLS_OMF=	yes
diff --git a/net-im/empathy3/Makefile b/net-im/empathy3/Makefile
index 7bb3fcc37..b4d7c073c 100644
--- a/net-im/empathy3/Makefile
+++ b/net-im/empathy3/Makefile
@@ -1,9 +1,6 @@
-# New ports collection makefile for:	empathy
-# Date created:		2007-10-29
-# Whom:			Michael Johnson <ahze@FreeBSD.org>
-#
+# Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/trunk/net-im/empathy3/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	empathy
 PORTVERSION=	3.4.2.1
@@ -18,18 +15,18 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-
 		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas \
 		itstool:${PORTSDIR}/textproc/itstool \
     		${LOCALBASE}/libexec/mission-control-5:${PORTSDIR}/net-im/telepathy-mission-control
-LIB_DEPENDS=	enchant.1:${PORTSDIR}/textproc/enchant \
-		pulse.0:${PORTSDIR}/audio/pulseaudio \
-		telepathy.2:${PORTSDIR}/net-im/libtelepathy \
-		telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib \
-		telepathy-farstream.2:${PORTSDIR}/net-im/telepathy-farstream \
-		telepathy-logger.2:${PORTSDIR}/net-im/telepathy-logger \
-		folks-telepathy.25:${PORTSDIR}/net-im/folks \
-		notify.4:${PORTSDIR}/devel/libnotify \
+LIB_DEPENDS=	enchant:${PORTSDIR}/textproc/enchant \
+		pulse:${PORTSDIR}/audio/pulseaudio \
+		telepathy:${PORTSDIR}/net-im/libtelepathy \
+		telepathy-glib:${PORTSDIR}/net-im/telepathy-glib \
+		telepathy-farstream:${PORTSDIR}/net-im/telepathy-farstream \
+		telepathy-logger:${PORTSDIR}/net-im/telepathy-logger \
+		folks-telepathy:${PORTSDIR}/net-im/folks \
+		notify:${PORTSDIR}/devel/libnotify \
 		gcr-3:${PORTSDIR}/security/gcr \
-		canberra-gtk3.0:${PORTSDIR}/audio/libcanberra-gtk3 \
+		canberra-gtk3:${PORTSDIR}/audio/libcanberra-gtk3 \
 		clutter-gst-1.0:${PORTSDIR}/multimedia/clutter-gst \
-		webkitgtk-3.0.0:${PORTSDIR}/www/webkit-gtk3 \
+		webkitgtk-3.0:${PORTSDIR}/www/webkit-gtk3 \
 		soup-2.4:${PORTSDIR}/devel/libsoup
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
 		${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \
@@ -41,16 +38,16 @@ CONFLICTS=	empathy-2.[0-9]*
 LATEST_LINK=	empathy3
 USE_GMAKE=	yes
 USE_XZ=		yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_LDCONFIG=	yes
-USE_GNOME=	evolutiondataserver3 gnomehack gnomeprefix ltverhack
+USE_GNOME=	evolutiondataserver3 gnomeprefix ltverhack
 USE_GSTREAMER=	yes
 USE_AUTOTOOLS=	libtool
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_PYTHON=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-Werror \
 		--disable-goa \
 		--enable-location=no
diff --git a/net-im/farsight2/Makefile b/net-im/farsight2/Makefile
index cbf543195..bf029f601 100644
--- a/net-im/farsight2/Makefile
+++ b/net-im/farsight2/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/trunk/net-im/farsight2/Makefile 17271 2013-04-01 15:16:27Z kwm $
 
 PORTNAME=	farsight2
 PORTVERSION=	0.0.31
@@ -16,11 +16,9 @@ CONFLICTS=	farstream-[0-9]*
 
 FETCH_ARGS=	-Fpr
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_LDCONFIG=	yes
 USE_PYTHON=	yes
-USES=		pathfix
-USE_PKGCONFIG=	build
 USE_GNOME=	glib20 ltverhack
 USE_GSTREAMER=	core good bad python
 USE_AUTOTOOLS=	libtool
diff --git a/net-im/farstream/Makefile b/net-im/farstream/Makefile
index b57e8a2b8..96efb0c8f 100644
--- a/net-im/farstream/Makefile
+++ b/net-im/farstream/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/net-im/farstream/Makefile 17271 2013-04-01 15:16:27Z kwm $
 
 PORTNAME=	farstream
 PORTVERSION=	0.1.2
@@ -16,11 +16,9 @@ CONFLICTS=	farsight2-[0-9]*
 
 FETCH_ARGS=	-Fpr
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_LDCONFIG=	yes
 USE_PYTHON=	yes
-USES=		pathfix
-USE_PKGCONFIG=	build
 USE_GNOME=	glib20 ltverhack
 USE_GSTREAMER=	core good bad python
 USE_AUTOTOOLS=	libtool
diff --git a/net-im/folks/Makefile b/net-im/folks/Makefile
index 03836d7c0..acbf5ba13 100644
--- a/net-im/folks/Makefile
+++ b/net-im/folks/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/net-im/folks/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	folks
 PORTVERSION=	0.7.0
@@ -12,8 +12,8 @@ COMMENT=	library to aggregates people from multiple sources
 
 BUILD_DEPENDS=	vapigen:${PORTSDIR}/lang/vala-vapigen \
 		g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
-LIB_DEPENDS=	gee.2:${PORTSDIR}/devel/libgee06 \
-		telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib
+LIB_DEPENDS=	gee:${PORTSDIR}/devel/libgee06 \
+		telepathy-glib:${PORTSDIR}/net-im/telepathy-glib
 
 CONFLICTS=	folks-0.4.[0-9]*
 
@@ -21,8 +21,8 @@ USE_XZ=		yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehier gnomehack intlhack ltverhack evolutiondataserver3
-USE_GETTEXT=	yes
+USE_GNOME=	gnomehier intlhack ltverhack evolutiondataserver3
+USES=		gettext pathfix
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/net-im/folks04/Makefile b/net-im/folks04/Makefile
index 6dcc7b53c..6051289d5 100644
--- a/net-im/folks04/Makefile
+++ b/net-im/folks04/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	folks
-# Date created:				23 July 2010
-# Whom:					Koop Mast <kwm@FreeBSD.org>
-#
+# Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/net-im/folks04/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	folks
 PORTVERSION=	0.4.3
@@ -16,16 +12,16 @@ COMMENT=	library to aggregates people from multiple sources
 
 BUILD_DEPENDS=	vapigen:${PORTSDIR}/lang/vala-vapigen \
 		g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
-LIB_DEPENDS=	gee.2:${PORTSDIR}/devel/libgee06 \
-		telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib
+LIB_DEPENDS=	gee:${PORTSDIR}/devel/libgee06 \
+		telepathy-glib:${PORTSDIR}/net-im/telepathy-glib
 
 CONFLICTS=	folks-0.[6-9].[0-9]*
 
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack intlhack gnomehier
-USE_GETTEXT=	yes
+USE_GNOME=	intlhack gnomehier
+USES=		gettext pathfix
 GNU_CONFIGURE=	yes
 CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
diff --git a/net-im/libnice/Makefile b/net-im/libnice/Makefile
index 780471c7b..32392a2c6 100644
--- a/net-im/libnice/Makefile
+++ b/net-im/libnice/Makefile
@@ -11,10 +11,8 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Library and transmitter that implements ICE-19
 
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_LDCONFIG=	yes
-USES=		pathfix
-USE_PKGCONFIG=	build
 USE_GNOME=	glib20 ltverhack
 USE_GSTREAMER=	yes
 USE_AUTOTOOLS=	libtool
diff --git a/net-im/loudmouth/Makefile b/net-im/loudmouth/Makefile
index ffc876b02..9cdee83d2 100644
--- a/net-im/loudmouth/Makefile
+++ b/net-im/loudmouth/Makefile
@@ -14,10 +14,10 @@ LIB_DEPENDS=	idn:${PORTSDIR}/dns/libidn
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
-USE_GNOME=	gnomehack glib20 ltverhack
+USE_GNOME=	glib20 ltverhack
 CONFIGURE_ARGS=	--disable-gtk-doc
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-Wl,-Bsymbolic -L${LOCALBASE}/lib
diff --git a/net-im/papyon/Makefile b/net-im/papyon/Makefile
index 4a952e00e..fe1e2b29c 100644
--- a/net-im/papyon/Makefile
+++ b/net-im/papyon/Makefile
@@ -1,9 +1,6 @@
-# New ports collection makefile for:	papyon
-# Date created:				August 1 2009
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#
+#   $MCom$
 
 PORTNAME=	papyon
 PORTVERSION=	0.5.6
diff --git a/net-im/telepathy-logger/Makefile b/net-im/telepathy-logger/Makefile
index d6e80cef8..229841e8b 100644
--- a/net-im/telepathy-logger/Makefile
+++ b/net-im/telepathy-logger/Makefile
@@ -1,9 +1,6 @@
-# New ports collection makefile for:	telepathy-logger
-# Date created:				23 July 2010
-# Whom:					Koop Mast <kwm@FreeBSD.org>
-#
+# Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/trunk/net-im/telepathy-logger/Makefile 17271 2013-04-01 15:16:27Z kwm $
 
 PORTNAME=	telepathy-logger
 PORTVERSION=	0.4.0
@@ -14,19 +11,17 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Logger utility library for the Telepathy framework
 
 BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
-LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib
+LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
+		telepathy-glib:${PORTSDIR}/net-im/telepathy-glib
 
 LICENSE=	LGPL21
-LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USES=		pathfix
+USES=		pathfix pkgconfig
 USE_GNOME=	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