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

9 files changed, 43 insertions, 76 deletions

diff --git a/mail/evolution-ews/Makefile b/mail/evolution-ews/Makefile
index a10104737..9d48c4a63 100644
--- a/mail/evolution-ews/Makefile
+++ b/mail/evolution-ews/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	evolution-ews
-# Date created:				20 Okt 2011
-# Whom:					Koop Mast <kwm@FreeBSD.org>
-#
+# Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/mail/evolution-ews/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	evolution-ews
 PORTVERSION=	3.4.4
@@ -16,19 +12,19 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Evolution 3 plugin to connect to Microsoft Exchange Web Services
 
 BUILD_DEPENDS=	evolution>=${EVO_VER}:${PORTSDIR}/mail/evolution3
-LIB_DEPENDS=	soup-2.4.1:${PORTSDIR}/devel/libsoup \
-		ical.44:${PORTSDIR}/devel/libical
+LIB_DEPENDS=	soup-2.4:${PORTSDIR}/devel/libsoup \
+		ical:${PORTSDIR}/devel/libical
 RUN_DEPENDS=	evolution>=${EVO_VER}:${PORTSDIR}/mail/evolution3
 
 EVO_VER=	3.4.1
 USE_XZ=		yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_SQLITE=	yes
 USE_GMAKE=	yes
 USE_BDB=	41
 USE_OPENLDAP=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack ltasneededhack
+USE_GNOME=	gnomeprefix intlhack ltasneededhack
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index 6b9424a97..606c06692 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	evolution-exchange
-# Date created:				28 April, 2005
-# Whom:					Adam Weinberger, based off kiesel's ximian-exchange port
-#
+# Created by: Adam Weinberger, based off kiesel's ximian-exchange port
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/mail/evolution-exchange/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	evolution-exchange
 PORTVERSION=	2.32.1
@@ -23,12 +19,12 @@ RUN_DEPENDS=	${EVO_PC_FILE}:${PORTSDIR}/mail/evolution
 CONFLICTS=	evolution-exchange-3.[0-9]*
 
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 USE_BDB=	41
 USE_OPENLDAP=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack ltasneededhack
+USE_GNOME=	gnomeprefix intlhack ltasneededhack
 CPPFLAGS+=	-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR}
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-openldap=${LOCALBASE} \
diff --git a/mail/evolution-exchange3/Makefile b/mail/evolution-exchange3/Makefile
index 12efe1769..a903477d6 100644
--- a/mail/evolution-exchange3/Makefile
+++ b/mail/evolution-exchange3/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	evolution-exchange
-# Date created:				28 April, 2005
-# Whom:					Adam Weinberger, based off kiesel's ximian-exchange port
-#
+# Created by: Adam Weinberger, based off kiesel's ximian-exchange port
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/mail/evolution-exchange3/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	evolution-exchange
 PORTVERSION=	3.4.4
@@ -23,12 +19,12 @@ CONFLICTS=	evolution-exchange-2.[0-9]*
 EVO_VER=	3.4.3
 LATEST_LINK=	evolution-exchange3
 USE_XZ=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 USE_BDB=	41
 USE_OPENLDAP=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack ltasneededhack
+USE_GNOME=	gnomeprefix intlhack ltasneededhack
 CPPFLAGS+=	-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR}
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-openldap=${LOCALBASE} \
diff --git a/mail/evolution-groupwise/Makefile b/mail/evolution-groupwise/Makefile
index 554f9317b..062fbc2eb 100644
--- a/mail/evolution-groupwise/Makefile
+++ b/mail/evolution-groupwise/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	evolution-groupwise
-# Date created:				16 Okt 2011
-# Whom:					Koop Mast <kwm@FreeBSD.org>
-#
+# Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/mail/evolution-groupwise/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	evolution-groupwise
 PORTVERSION=	3.4.2
@@ -20,14 +16,13 @@ RUN_DEPENDS=	evolution>=${EVO_VER}:${PORTSDIR}/mail/evolution3
 
 EVO_VER=	3.4.1
 USE_XZ=		yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 USE_BDB=	41
-USE_GNOME=	gnomeprefix intlhack gnomehack ltasneededhack libxml2 \
-		gconf2 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR}" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+USE_GNOME=	gnomeprefix intlhack ltasneededhack libxml2 gconf2
+CPPFLAGS+=	-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR}
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-libdb=${LOCALBASE}
 
 VERSION=	3.4
diff --git a/mail/evolution-kolab/Makefile b/mail/evolution-kolab/Makefile
index cefca40e8..1d75afcde 100644
--- a/mail/evolution-kolab/Makefile
+++ b/mail/evolution-kolab/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	evolution-kolab
-# Date created:				18 Jun 2012
-# Whom:					Koop Mast <kwm@FreeBSD.org>
-#
+# Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/mail/evolution-kolab/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	evolution-kolab
 PORTVERSION=	3.4.4
@@ -22,12 +18,12 @@ RUN_DEPENDS=	evolution>=${EVO_VER}:${PORTSDIR}/mail/evolution3
 
 EVO_VER=	3.4.1
 USE_XZ=		yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 USE_SQLITE=	yes
 MAKE_JOBS_UNSAFE=yes
-USE_GNOME=	gnomeprefix intlhack gnomehack ltasneededhack libxml2 gconf2 
+USE_GNOME=	gnomeprefix intlhack ltasneededhack libxml2 gconf2 
 CONFIGURE_ENV=	ac_cv_path_GPERF=${LOCALBASE}/bin/gperf
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/mail/evolution-mapi/Makefile b/mail/evolution-mapi/Makefile
index 749459594..5ffda33a5 100644
--- a/mail/evolution-mapi/Makefile
+++ b/mail/evolution-mapi/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	evolution-mapi
-# Date created:				24 Mar, 2009
-# Whom:					Koop Mast <kwm@FreeBSD.org>
-#
+# Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/mail/evolution-mapi/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	evolution-mapi
 PORTVERSION=	0.32.2
@@ -17,7 +13,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Evolution plugin to connect to Microsoft Exchange servers
 
 BUILD_DEPENDS=	${PKGFILES}:${PORTSDIR}/mail/evolution
-LIB_DEPENDS=	mapi.0:${PORTSDIR}/mail/libmapi
+LIB_DEPENDS=	mapi:${PORTSDIR}/mail/libmapi
 RUN_DEPENDS=	${PKGFILES}:${PORTSDIR}/mail/evolution
 
 CONFLICTS=	evolution-mapi-3.[0-9]*
@@ -25,7 +21,7 @@ CONFLICTS=	evolution-mapi-3.[0-9]*
 PKGFILES=	${LOCALBASE}/libdata/pkgconfig/evolution-plugin.pc
 
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GMAKE=	yes
 USE_GNOME=	evolutiondataserver
 USE_LDCONFIG=	yes
@@ -37,12 +33,10 @@ EVO_VERSION=	2.32
 EDS_VERSION=	1.2
 PLIST_SUB=	EVO_VERSION=${EVO_VERSION} EDS_VERSION=${EDS_VERSION}
 
-.include <bsd.port.pre.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|g' \
 		${WRKSRC}/src/libexchangemapi/Makefile.in
 	@${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \
 	    	${WRKSRC}/configure
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/evolution-mapi3/Makefile b/mail/evolution-mapi3/Makefile
index 909d37cc9..87849ed50 100644
--- a/mail/evolution-mapi3/Makefile
+++ b/mail/evolution-mapi3/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	evolution-mapi
-# Date created:				24 Mar, 2009
-# Whom:					Koop Mast <kwm@FreeBSD.org>
-#
+# Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/mail/evolution-mapi3/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	evolution-mapi
 PORTVERSION=	3.4.4
@@ -16,7 +12,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Evolution plugin to connect to Microsoft Exchange servers
 
 BUILD_DEPENDS=	evolution>=${EVO_VER}:${PORTSDIR}/mail/evolution3
-LIB_DEPENDS=	mapi.0:${PORTSDIR}/mail/libmapi
+LIB_DEPENDS=	mapi:${PORTSDIR}/mail/libmapi
 RUN_DEPENDS=	evolution>=${EVO_VER}:${PORTSDIR}/mail/evolution3
 
 CONFLICTS=	evolution-mapi-2.[0-9]*
@@ -26,7 +22,7 @@ BROKEN=		needs newer libmapi which needs samba4 update.
 EVO_VER=	3.4.3
 LATEST_LINK=	evolution-mapi3
 USE_XZ=		yes
-USE_GETTEXT=	yes
+USES=		gettext pkgconfig
 USE_GMAKE=	yes
 USE_GNOME=	gconf2
 USE_LDCONFIG=	yes
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 59b3ce798..3c2f25446 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,6 +1,6 @@
 # Created by: Ade Lovett <ade@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/mail/evolution/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	evolution
 PORTVERSION=	2.32.1
@@ -12,19 +12,18 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An integrated mail, calendar and address book distributed suite
 
-LIB_DEPENDS=	nss3.1:${PORTSDIR}/security/nss \
-		unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \
-		gtkimageview.0:${PORTSDIR}/x11-toolkits/gtkimageview
+LIB_DEPENDS=	nss3:${PORTSDIR}/security/nss \
+		unique-1.0:${PORTSDIR}/x11-toolkits/unique \
+		gtkimageview:${PORTSDIR}/x11-toolkits/gtkimageview
 RUN_DEPENDS=	${LOCALBASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnome-spell
 
 CONFLICTS=	evolution-3.[0-9]*
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USES=		bison pathfix
-USE_GETTEXT=	yes
+USES=		bison gettext pathfix desktop-file-utils
 USE_GNOME=	gnomeprefix intlhack evolutiondataserver gtkhtml3 \
-		desktopfileutils gnomedocutils ltasneededhack gnomedesktop
+		gnomedocutils ltasneededhack gnomedesktop
 USE_AUTOTOOLS=	libtool
 USE_GSTREAMER=	yes
 INSTALLS_OMF=	yes
diff --git a/mail/evolution3/Makefile b/mail/evolution3/Makefile
index 9be0829e1..d13e2f356 100644
--- a/mail/evolution3/Makefile
+++ b/mail/evolution3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Ade Lovett <ade@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/mail/evolution3/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	evolution
 PORTVERSION=	3.4.4
@@ -13,7 +13,7 @@ COMMENT=	An integrated mail, calendar and address book distributed suite
 
 LIB_DEPENDS=	nss3:${PORTSDIR}/security/nss \
 		goa-1.0:${PORTSDIR}/net/gnome-online-accounts \
-		canberra-gtk3.0:${PORTSDIR}/audio/libcanberra-gtk3 \
+		canberra-gtk3:${PORTSDIR}/audio/libcanberra-gtk3 \
 		notify:${PORTSDIR}/devel/libnotify
 
 CONFLICTS=	evolution-2.[0-9]*
@@ -21,10 +21,9 @@ CONFLICTS=	evolution-2.[0-9]*
 LATEST_LINK=	evolution3
 USE_XZ=		yes
 USE_GMAKE=	yes
-USES=		bison pathfix
-USE_GETTEXT=	yes
+USES=		bison gettext pathfix desktop-file-utils
 USE_GNOME=	gnomeprefix intlhack evolutiondataserver3 gtkhtml4 \
-		desktopfileutils gnomedocutils ltasneededhack gnomedesktop3
+		gnomedocutils ltasneededhack gnomedesktop3
 USE_AUTOTOOLS=	libtool
 USE_GSTREAMER=	yes
 INSTALLS_OMF=	yes