Chase libtasn1 update, by removing shlib versions in LIB_DEPEND. Do this also

for other libs. Note that libgdata still has them since the library names
are the same for both versions.
Update Makefile headers to new world order.
OptionsNg evolution-database-server* ports.


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

5 files changed, 39 insertions, 73 deletions

diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index 6a5e61ab9..277c8a475 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	evolution-data-server
-# Date created:				09 December 2003
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/databases/evolution-data-server/Makefile,v 1.215 2012/09/01 23:02:08 mezz Exp $
-#
+#   $MCom: ports/databases/evolution-data-server/Makefile,v 1.216 2012/12/30 18:15:15 mezz Exp $
 
 PORTNAME=	evolution-data-server
 PORTVERSION=	2.32.1
@@ -16,13 +12,13 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	The data backends for the Evolution integrated mail/PIM suite
 
-LIB_DEPENDS=	soup-2.4.1:${PORTSDIR}/devel/libsoup \
+LIB_DEPENDS=	soup-2.4:${PORTSDIR}/devel/libsoup \
 		gdata.7:${PORTSDIR}/devel/libgdata06 \
-		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+		dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
 		ical:${PORTSDIR}/devel/libical \
-		nss3.1:${PORTSDIR}/security/nss \
-		tasn1.4:${PORTSDIR}/security/libtasn1 \
-		gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring
+		nss3:${PORTSDIR}/security/nss \
+		tasn1:${PORTSDIR}/security/libtasn1 \
+		gnome-keyring:${PORTSDIR}/security/libgnome-keyring
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -44,26 +40,19 @@ LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 PLIST_SUB=	VERSION="2.32" EVO_VERSION="1.2"
 
-#OPTIONS=	IMAP4	"Enable experimental IMAP4 backend" off
-OPTIONS=	WEATHER		"Enable weather calendar backend"	on \
-		KERBEROS	"Adds Kerberos support"			on
+OPTIONS_DEFINE=	WEATHER KERBEROS
+OPTIONS_DEFAULT=WEATHER KERBEROS
+WEATHER_DESC=	Weather calendar backend
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_KERBEROS)
+.if ${PORT_OPTIONS:MKERBEROS}
 CONFIGURE_ARGS+=	--with-krb5=/usr
 KRB5_LIB=		`/usr/bin/krb5-config gssapi --libs`
 .endif
 
-#.if defined(WITH_IMAP4) || defined(PACKAGE_BUILDING)
-#CONFIGURE_ARGS+=	--enable-imap4=yes
-#PLIST_SUB+=		IMAP4=""
-#.else
-PLIST_SUB+=		IMAP4="@comment "
-#.endif
-
-.if defined(WITH_WEATHER)
-LIB_DEPENDS+=		gweather.1:${PORTSDIR}/net/libgweather
+.if ${PORT_OPTIONS:MWEATHER}
+LIB_DEPENDS+=		gweather:${PORTSDIR}/net/libgweather
 CONFIGURE_ARGS+=	--with-weather
 PLIST_SUB+=		WEATHER=""
 .else
@@ -87,4 +76,4 @@ post-patch:
 		s|-Wmissing-include-dirs||g' \
 			${WRKSRC}/configure
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/evolution-data-server3/Makefile b/databases/evolution-data-server3/Makefile
index 832c12d63..aebf94e0f 100644
--- a/databases/evolution-data-server3/Makefile
+++ b/databases/evolution-data-server3/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	evolution-data-server
-# Date created:				09 December 2003
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/databases/evolution-data-server3/Makefile,v 1.28 2012/08/16 19:28:53 kwm Exp $
-#
+#   $MCom: ports/databases/evolution-data-server3/Makefile,v 1.29 2012/12/30 18:15:16 mezz Exp $
 
 PORTNAME=	evolution-data-server
 PORTVERSION=	3.4.4
@@ -20,14 +16,14 @@ LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
-LIB_DEPENDS=	soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup-gnome \
-		oauth.8:${PORTSDIR}/net/liboauth \
-		goa-1.0.0:${PORTSDIR}/net/gnome-online-accounts \
+LIB_DEPENDS=	soup-gnome-2.4:${PORTSDIR}/devel/libsoup-gnome \
+		oauth:${PORTSDIR}/net/liboauth \
+		goa-1.0:${PORTSDIR}/net/gnome-online-accounts \
 		gdata.13:${PORTSDIR}/devel/libgdata \
 		ical:${PORTSDIR}/devel/libical \
-		nss3.1:${PORTSDIR}/security/nss \
-		tasn1.4:${PORTSDIR}/security/libtasn1 \
-		gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring
+		nss3:${PORTSDIR}/security/nss \
+		tasn1:${PORTSDIR}/security/libtasn1 \
+		gnome-keyring:${PORTSDIR}/security/libgnome-keyring
 
 CONFLICTS=	evolution-data-server-2.[0-9]*
 
@@ -54,26 +50,19 @@ GLIB_SCHEMAS=	org.gnome.evolution.eds-shell.gschema.xml \
 
 PLIST_SUB=	VERSION="3.4" EVO_VERSION="1.2"
 
-#OPTIONS=	IMAP4	"Enable experimental IMAP4 backend" off
-OPTIONS+=	WEATHER 	"Enable weather calendar backend"	on \
-		KERBEROS	"Adds Kerberos support"			on
+OPTIONS_DEFINE=	WEATHER KERBEROS
+OPTIONS_DEFAULT=WEATHER KERBEROS
+WEATHER_DESC=	Weather calendar backend
 
 .include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_KERBEROS)
+.if ${PORT_OPTIONS:MKERBEROS}
 CONFIGURE_ARGS+=	--with-krb5=/usr
 KRB5_LIB=		`/usr/bin/krb5-config gssapi --libs`
 .endif
 
-#.if defined(WITH_IMAP4) || defined(PACKAGE_BUILDING)
-#CONFIGURE_ARGS+=	--enable-imap4=yes
-#PLIST_SUB+=		IMAP4=""
-#.else
-PLIST_SUB+=		IMAP4="@comment "
-#.endif
-
-.if defined(WITH_WEATHER)
-LIB_DEPENDS+=		gweather-3.0:${PORTSDIR}/net/libgweather3
+.if ${PORT_OPTIONS:MWEATHER}
+LIB_DEPENDS+=		gweather-3:${PORTSDIR}/net/libgweather3
 CONFIGURE_ARGS+=	--enable-weather
 PLIST_SUB+=		WEATHER=""
 .else
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index 22a113298..09fdfa501 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:   gnomekeyring
-# Date Created:			08 December 2003
-# Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/security/gnome-keyring/Makefile,v 1.104 2012/08/17 19:06:46 kwm Exp $
-#
+#   $MCom: ports/security/gnome-keyring/Makefile,v 1.105 2012/09/01 23:02:12 mezz Exp $
 
 PORTNAME=	gnome-keyring
 PORTVERSION=	2.32.1
@@ -16,8 +12,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A program that keeps passwords and other secrets
 
-LIB_DEPENDS=	tasn1.4:${PORTSDIR}/security/libtasn1 \
-		gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring
+LIB_DEPENDS=	tasn1:${PORTSDIR}/security/libtasn1 \
+		gnome-keyring:${PORTSDIR}/security/libgnome-keyring
 RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
 
 CONFLICTS=	gnome-keyring-3.[0-9]* gcr-3.[0-9]*
diff --git a/security/gnome-keyring3/Makefile b/security/gnome-keyring3/Makefile
index d07db4a6c..09ec67f70 100644
--- a/security/gnome-keyring3/Makefile
+++ b/security/gnome-keyring3/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:   gnomekeyring
-# Date Created:			08 December 2003
-# Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/security/gnome-keyring3/Makefile,v 1.22 2012/05/26 16:43:29 kwm Exp $
-#
+#   $MCom: ports/security/gnome-keyring3/Makefile,v 1.23 2012/10/07 12:09:56 kwm Exp $
 
 PORTNAME=	gnome-keyring
 PORTVERSION=	3.4.1
diff --git a/security/libgnome-keyring/Makefile b/security/libgnome-keyring/Makefile
index a0427770c..42a7f4834 100644
--- a/security/libgnome-keyring/Makefile
+++ b/security/libgnome-keyring/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	libgnome-keyring
-# Date created:		2009-12-21
-# Whom:			Michael Johnson <ahze@FreeBSD.org>
-#
+# Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/security/libgnome-keyring/Makefile,v 1.23 2012/05/26 10:18:51 kwm Exp $
-#
+#   $MCom: ports/security/libgnome-keyring/Makefile,v 1.24 2012/05/26 10:39:01 kwm Exp $
 
 PORTNAME=	libgnome-keyring
 PORTVERSION=	3.4.1
@@ -15,8 +11,8 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A program that keeps passwords and other secrets
 
 BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
-LIB_DEPENDS=	dbus-1.3:${PORTSDIR}/devel/dbus \
-		gcrypt.18:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	dbus-1:${PORTSDIR}/devel/dbus \
+		gcrypt:${PORTSDIR}/security/libgcrypt
 
 USE_XZ=		yes
 USE_GNOME=	gnomehier gnomehack gnomeprefix ltverhack intlhack glib20