Conversion to a single libtool environment.

Approved by:	portmgr (kris)

2 files changed, 45 insertions, 1 deletions

diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index fa1d6732c19a..b340807f2525 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	evolution-data-server
 PORTVERSION=	1.4.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.4
diff --git a/databases/evolution-data-server/pkg-plist b/databases/evolution-data-server/pkg-plist
index cfe9bbcfa2f4..e538af3a07d6 100644
--- a/databases/evolution-data-server/pkg-plist
+++ b/databases/evolution-data-server/pkg-plist
@@ -276,59 +276,103 @@ include/evolution-data-server-%%VERSION%%/libical/sspm.h
 include/evolution-data-server-%%VERSION%%/libical/vcaltmp.h
 include/evolution-data-server-%%VERSION%%/libical/vcc.h
 include/evolution-data-server-%%VERSION%%/libical/vobject.h
+lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelgroupwise.a
+lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelgroupwise.la
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelgroupwise.so
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelgroupwise.urls
+lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap.a
+lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap.la
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap.so
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap.urls
+lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap4.a
+lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap4.la
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap4.so
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap4.urls
+lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamellocal.a
+lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamellocal.la
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamellocal.so
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamellocal.urls
+lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelnntp.a
+lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelnntp.la
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelnntp.so
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelnntp.urls
+lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelpop3.a
+lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelpop3.la
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelpop3.so
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelpop3.urls
+lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelsendmail.a
+lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelsendmail.la
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelsendmail.so
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelsendmail.urls
+lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelsmtp.a
+lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelsmtp.la
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelsmtp.so
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelsmtp.urls
+lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendfile.a
+lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendfile.la
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendfile.so
+lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendgroupwise.a
+lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendgroupwise.la
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendgroupwise.so
+lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendldap.a
+lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendldap.la
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendldap.so
+lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendvcf.a
+lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendvcf.la
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendvcf.so
+lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendcontacts.a
+lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendcontacts.la
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendcontacts.so
+lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendfile.a
+lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendfile.la
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendfile.so
+lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendgroupwise.a
+lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendgroupwise.la
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendgroupwise.so
+lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendhttp.a
+lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendhttp.la
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendhttp.so
+lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendweather.a
+lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendweather.la
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendweather.so
 lib/libcamel-%%EVO_VERSION%%.a
+lib/libcamel-%%EVO_VERSION%%.la
 lib/libcamel-%%EVO_VERSION%%.so
 lib/libcamel-%%EVO_VERSION%%.so.0
 lib/libcamel-provider-%%EVO_VERSION%%.a
+lib/libcamel-provider-%%EVO_VERSION%%.la
 lib/libcamel-provider-%%EVO_VERSION%%.so
 lib/libcamel-provider-%%EVO_VERSION%%.so.6
 lib/libebook-%%EVO_VERSION%%.a
+lib/libebook-%%EVO_VERSION%%.la
 lib/libebook-%%EVO_VERSION%%.so
 lib/libebook-%%EVO_VERSION%%.so.5
 lib/libecal-%%EVO_VERSION%%.a
+lib/libecal-%%EVO_VERSION%%.la
 lib/libecal-%%EVO_VERSION%%.so
 lib/libecal-%%EVO_VERSION%%.so.3
 lib/libedata-book-%%EVO_VERSION%%.a
+lib/libedata-book-%%EVO_VERSION%%.la
 lib/libedata-book-%%EVO_VERSION%%.so
 lib/libedata-book-%%EVO_VERSION%%.so.2
 lib/libedata-cal-%%EVO_VERSION%%.a
+lib/libedata-cal-%%EVO_VERSION%%.la
 lib/libedata-cal-%%EVO_VERSION%%.so
 lib/libedata-cal-%%EVO_VERSION%%.so.1
 lib/libedataserver-%%EVO_VERSION%%.a
+lib/libedataserver-%%EVO_VERSION%%.la
 lib/libedataserver-%%EVO_VERSION%%.so
 lib/libedataserver-%%EVO_VERSION%%.so.4
 lib/libedataserverui-%%EVO_VERSION%%.a
+lib/libedataserverui-%%EVO_VERSION%%.la
 lib/libedataserverui-%%EVO_VERSION%%.so
 lib/libedataserverui-%%EVO_VERSION%%.so.6
 lib/libegroupwise-%%EVO_VERSION%%.a
+lib/libegroupwise-%%EVO_VERSION%%.la
 lib/libegroupwise-%%EVO_VERSION%%.so
 lib/libegroupwise-%%EVO_VERSION%%.so.8
 lib/libexchange-storage-%%EVO_VERSION%%.a
+lib/libexchange-storage-%%EVO_VERSION%%.la
 lib/libexchange-storage-%%EVO_VERSION%%.so
 lib/libexchange-storage-%%EVO_VERSION%%.so.0
 libdata/bonobo/servers/GNOME_Evolution_DataServer_%%EVO_VERSION%%.server