Update for new libtool world order.

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

4 files changed, 65 insertions, 5 deletions

diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index a38c8b9cc..f56c8e3fd 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Adam Weinberger, based off kiesel's ximian-exchange port
 #
 # $FreeBSD$
-#   $MCom: ports/mail/evolution-exchange/Makefile,v 1.48 2006/01/31 20:36:50 marcus Exp $
+#   $MCom: ports/mail/evolution-exchange/Makefile,v 1.49 2006/02/14 18:15:03 marcus Exp $
 #
 
 PORTNAME=	evolution-exchange
 PORTVERSION=	2.5.91
+PORTREVISION=	1
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}${PKGNAMESUFFIX}/2.5
@@ -22,7 +23,7 @@ RUN_DEPENDS=	evolution-${EVO_VERSION}:${PORTSDIR}/mail/evolution
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_OPENLDAP=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack gnometarget
diff --git a/mail/evolution-exchange/pkg-plist b/mail/evolution-exchange/pkg-plist
index 1468431e3..3c15a218f 100644
--- a/mail/evolution-exchange/pkg-plist
+++ b/mail/evolution-exchange/pkg-plist
@@ -1,4 +1,5 @@
 bin/ximian-connector-setup-%%VERSION%%
+lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelexchange.la
 lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelexchange.so
 lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelexchange.urls
 libdata/bonobo/servers/GNOME_Evolution_Exchange_Storage_%%VERSION%%.server
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 73d104ec5..49e902e5e 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/mail/evolution/Makefile,v 1.89 2006/02/14 18:02:16 marcus Exp $
+#   $MCom: ports/mail/evolution/Makefile,v 1.90 2006/02/20 06:42:26 marcus Exp $
 #
 
 PORTNAME=	evolution
 PORTVERSION=	2.5.91
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.5
@@ -27,7 +27,7 @@ USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack evolutiondataserver \
 		gtkhtml3 desktopfileutils
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib/evolution/%%VERSION%%
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index cdb6daf2e..886693a84 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -232,107 +232,165 @@ include/evolution-%%VERSION%%/text/e-text-model-repos.h
 include/evolution-%%VERSION%%/text/e-text-model-uri.h
 include/evolution-%%VERSION%%/text/e-text-model.h
 include/evolution-%%VERSION%%/text/e-text.h
+lib/evolution/%%VERSION%%/components/libevolution-addressbook.la
 lib/evolution/%%VERSION%%/components/libevolution-addressbook.so
+lib/evolution/%%VERSION%%/components/libevolution-calendar.la
 lib/evolution/%%VERSION%%/components/libevolution-calendar.so
+lib/evolution/%%VERSION%%/components/libevolution-mail.la
 lib/evolution/%%VERSION%%/components/libevolution-mail.so
+%%PILOT:%%lib/evolution/%%VERSION%%/conduits/libeaddress_conduit.la
 %%PILOT:%%lib/evolution/%%VERSION%%/conduits/libeaddress_conduit.so
+%%PILOT:%%lib/evolution/%%VERSION%%/conduits/libecalendar_conduit.la
 %%PILOT:%%lib/evolution/%%VERSION%%/conduits/libecalendar_conduit.so
+%%PILOT:%%lib/evolution/%%VERSION%%/conduits/libetodo_conduit.la
 %%PILOT:%%lib/evolution/%%VERSION%%/conduits/libetodo_conduit.so
 lib/evolution/%%VERSION%%/libeabutil.a
+lib/evolution/%%VERSION%%/libeabutil.la
 lib/evolution/%%VERSION%%/libeabutil.so
 lib/evolution/%%VERSION%%/libeabutil.so.0
 lib/evolution/%%VERSION%%/libeconduit.a
+lib/evolution/%%VERSION%%/libeconduit.la
 lib/evolution/%%VERSION%%/libeconduit.so
 lib/evolution/%%VERSION%%/libeconduit.so.0
 lib/evolution/%%VERSION%%/libecontacteditor.a
+lib/evolution/%%VERSION%%/libecontacteditor.la
 lib/evolution/%%VERSION%%/libecontacteditor.so
 lib/evolution/%%VERSION%%/libecontacteditor.so.0
 lib/evolution/%%VERSION%%/libecontactlisteditor.a
+lib/evolution/%%VERSION%%/libecontactlisteditor.la
 lib/evolution/%%VERSION%%/libecontactlisteditor.so
 lib/evolution/%%VERSION%%/libecontactlisteditor.so.0
 lib/evolution/%%VERSION%%/libefilterbar.a
+lib/evolution/%%VERSION%%/libefilterbar.la
 lib/evolution/%%VERSION%%/libefilterbar.so
 lib/evolution/%%VERSION%%/libefilterbar.so.0
 lib/evolution/%%VERSION%%/libemiscwidgets.a
+lib/evolution/%%VERSION%%/libemiscwidgets.la
 lib/evolution/%%VERSION%%/libemiscwidgets.so
 lib/evolution/%%VERSION%%/libemiscwidgets.so.0
 lib/evolution/%%VERSION%%/libeshell.a
+lib/evolution/%%VERSION%%/libeshell.la
 lib/evolution/%%VERSION%%/libeshell.so
 lib/evolution/%%VERSION%%/libeshell.so.0
 lib/evolution/%%VERSION%%/libessmime.a
+lib/evolution/%%VERSION%%/libessmime.la
 lib/evolution/%%VERSION%%/libessmime.so
 lib/evolution/%%VERSION%%/libessmime.so.0
 lib/evolution/%%VERSION%%/libetable.a
+lib/evolution/%%VERSION%%/libetable.la
 lib/evolution/%%VERSION%%/libetable.so
 lib/evolution/%%VERSION%%/libetable.so.0
 lib/evolution/%%VERSION%%/libetext.a
+lib/evolution/%%VERSION%%/libetext.la
 lib/evolution/%%VERSION%%/libetext.so
 lib/evolution/%%VERSION%%/libetext.so.0
 lib/evolution/%%VERSION%%/libetimezonedialog.a
+lib/evolution/%%VERSION%%/libetimezonedialog.la
 lib/evolution/%%VERSION%%/libetimezonedialog.so
 lib/evolution/%%VERSION%%/libetimezonedialog.so.0
 lib/evolution/%%VERSION%%/libeutil.a
+lib/evolution/%%VERSION%%/libeutil.la
 lib/evolution/%%VERSION%%/libeutil.so
 lib/evolution/%%VERSION%%/libeutil.so.0
 lib/evolution/%%VERSION%%/libevolution-a11y.a
+lib/evolution/%%VERSION%%/libevolution-a11y.la
 lib/evolution/%%VERSION%%/libevolution-a11y.so
 lib/evolution/%%VERSION%%/libevolution-a11y.so.0
 lib/evolution/%%VERSION%%/libevolution-addressbook-a11y.a
+lib/evolution/%%VERSION%%/libevolution-addressbook-a11y.la
 lib/evolution/%%VERSION%%/libevolution-addressbook-a11y.so
 lib/evolution/%%VERSION%%/libevolution-addressbook-a11y.so.0
 lib/evolution/%%VERSION%%/libevolution-addressbook-importers.a
+lib/evolution/%%VERSION%%/libevolution-addressbook-importers.la
 lib/evolution/%%VERSION%%/libevolution-addressbook-importers.so
 lib/evolution/%%VERSION%%/libevolution-addressbook-importers.so.0
 lib/evolution/%%VERSION%%/libevolution-calendar-a11y.a
+lib/evolution/%%VERSION%%/libevolution-calendar-a11y.la
 lib/evolution/%%VERSION%%/libevolution-calendar-a11y.so
 lib/evolution/%%VERSION%%/libevolution-calendar-a11y.so.0
 lib/evolution/%%VERSION%%/libevolution-calendar-importers.a
+lib/evolution/%%VERSION%%/libevolution-calendar-importers.la
 lib/evolution/%%VERSION%%/libevolution-calendar-importers.so
 lib/evolution/%%VERSION%%/libevolution-calendar-importers.so.0
 lib/evolution/%%VERSION%%/libevolution-mail-importers.a
+lib/evolution/%%VERSION%%/libevolution-mail-importers.la
 lib/evolution/%%VERSION%%/libevolution-mail-importers.so
 lib/evolution/%%VERSION%%/libevolution-mail-importers.so.0
 lib/evolution/%%VERSION%%/libevolution-smime.a
+lib/evolution/%%VERSION%%/libevolution-smime.la
 lib/evolution/%%VERSION%%/libevolution-smime.so
 lib/evolution/%%VERSION%%/libevolution-smime.so.0
 lib/evolution/%%VERSION%%/libevolution-widgets-a11y.a
+lib/evolution/%%VERSION%%/libevolution-widgets-a11y.la
 lib/evolution/%%VERSION%%/libevolution-widgets-a11y.so
 lib/evolution/%%VERSION%%/libevolution-widgets-a11y.so.0
 lib/evolution/%%VERSION%%/libfilter.a
+lib/evolution/%%VERSION%%/libfilter.la
 lib/evolution/%%VERSION%%/libfilter.so
 lib/evolution/%%VERSION%%/libfilter.so.0
 lib/evolution/%%VERSION%%/libmenus.a
+lib/evolution/%%VERSION%%/libmenus.la
 lib/evolution/%%VERSION%%/libmenus.so
 lib/evolution/%%VERSION%%/libmenus.so.0
+lib/evolution/%%VERSION%%/plugins/libmail-account-disable.la
 lib/evolution/%%VERSION%%/plugins/libmail-account-disable.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-addressbook-file.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-addressbook-file.so
+%%GSTREAMER%%lib/evolution/%%VERSION%%/plugins/liborg-gnome-audio-inline.la
 %%GSTREAMER%%lib/evolution/%%VERSION%%/plugins/liborg-gnome-audio-inline.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-file.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-file.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-http.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-http.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-weather.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-weather.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-copy-tool.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-copy-tool.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-mailer.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-mailer.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-source.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-source.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-bbdb.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-bbdb.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-caldav.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-caldav.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-hula-account-setup.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-hula-account-setup.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-mail-attachments-import-ics.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-mail-attachments-import-ics.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-startup-wizard.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-startup-wizard.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-exchange-operations.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-exchange-operations.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-groupwise-features.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-groupwise-features.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-gw-account-setup.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-gw-account-setup.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-itip-formatter.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-itip-formatter.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-mail-to-task.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-mail-to-task.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-mailing-list-actions.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-mailing-list-actions.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-mark-all-read.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-mark-all-read.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-mark-calendar-offline.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-mark-calendar-offline.so
+%%DBUS%%lib/evolution/%%VERSION%%/plugins/liborg-gnome-new-mail-notify.la
 %%DBUS%%lib/evolution/%%VERSION%%/plugins/liborg-gnome-new-mail-notify.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-plugin-manager.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-plugin-manager.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-print-message.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-print-message.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-publish-calendar.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-publish-calendar.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-sa-junk-plugin.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-sa-junk-plugin.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-save-calendar.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-save-calendar.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-select-one-source.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-select-one-source.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-subject-thread.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-subject-thread.so
 lib/evolution/%%VERSION%%/plugins/org-gnome-addressbook-file.eplug
 %%GSTREAMER%%lib/evolution/%%VERSION%%/plugins/org-gnome-audio-inline.eplug