Support stage

USES=libtool

2 files changed, 12 insertions, 73 deletions

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 0f1811169044..b2a87d885a4d 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	evolution
 PORTVERSION=	2.32.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	mail gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -12,18 +12,20 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Integrated mail, calendar and address book distributed suite
 
-LIB_DEPENDS=	nss3:${PORTSDIR}/security/nss \
-		unique-1.0:${PORTSDIR}/x11-toolkits/unique \
-		gtkimageview:${PORTSDIR}/x11-toolkits/gtkimageview
+LIB_DEPENDS=	libnss3.so:${PORTSDIR}/security/nss \
+		libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique \
+		libgtkimageview.so:${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
-USES=		bison desktop-file-utils gettext pathfix gmake pkgconfig
+USES=		bison desktop-file-utils gettext pathfix gmake libtool pkgconfig tar:bzip2 \
+		perl5
+USE_PERL5=	run
 USE_GNOME=	gnomeprefix intlhack evolutiondataserver gtkhtml3 \
-		gnomedocutils ltasneededhack gnomedesktop
-USE_AUTOTOOLS=	libtool
+		gnomedocutils gnomedesktop
+GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install-strip
 USE_GSTREAMER=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
@@ -55,7 +57,6 @@ OPTIONS_DEFAULT=LDAP CANBERRA
 CANBERRA_DESC=	Canberra theme audio plugin
 SPAMASSASSIN_DESC=	SpamAssassin spam filtering
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MLDAP}
@@ -71,7 +72,7 @@ RUN_DEPENDS+=	spamassassin:${PORTSDIR}/mail/spamassassin
 
 .if defined(HEIMDAL_HOME) || defined(WITH_HEIMDAL) || defined(NO_KERBEROS)
 HEIMDAL_HOME?=		${LOCALBASE}
-LIB_DEPENDS+=		krb5.26:${PORTSDIR}/security/heimdal
+LIB_DEPENDS+=		libkrb5.so:${PORTSDIR}/security/heimdal
 CONFIGURE_ARGS+=	--with-krb5=${HEIMDAL_HOME} \
 			--with-krb5-includes=${HEIMDAL_HOME}/include
 KRB5_LIB=		`${HEIMDAL_HOME}/bin/krb5-config gssapi --libs`
@@ -81,7 +82,7 @@ KRB5_LIB=		`/usr/bin/krb5-config gssapi --libs`
 .endif
 
 .if ${PORT_OPTIONS:MCANBERRA}
-LIB_DEPENDS+=	canberra-gtk:${PORTSDIR}/audio/libcanberra
+LIB_DEPENDS+=	libcanberra-gtk.so:${PORTSDIR}/audio/libcanberra
 CONFIGURE_ARGS+=--enable-canberra=yes
 PLIST_SUB+=	CANBERRA=""
 .else
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index 7f96ce4194d2..20d2419ac97c 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -429,214 +429,152 @@ include/evolution-%%VERSION%%/text/e-text-model.h
 include/evolution-%%VERSION%%/text/e-text.h
 include/evolution-%%VERSION%%/text/gal-a11y-e-text-factory.h
 include/evolution-%%VERSION%%/text/gal-a11y-e-text.h
-lib/evolution/%%VERSION%%/libeabutil.a
 lib/evolution/%%VERSION%%/libeabutil.la
 lib/evolution/%%VERSION%%/libeabutil.so
 lib/evolution/%%VERSION%%/libeabutil.so.0
-lib/evolution/%%VERSION%%/libart_lgpl.a
 lib/evolution/%%VERSION%%/libart_lgpl.la
 lib/evolution/%%VERSION%%/libart_lgpl.so
 lib/evolution/%%VERSION%%/libart_lgpl.so.0
-lib/evolution/%%VERSION%%/libcomposer.a
 lib/evolution/%%VERSION%%/libcomposer.la
 lib/evolution/%%VERSION%%/libcomposer.so
 lib/evolution/%%VERSION%%/libcomposer.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%%/libemformat.a
 lib/evolution/%%VERSION%%/libemformat.la
 lib/evolution/%%VERSION%%/libemformat.so
 lib/evolution/%%VERSION%%/libemformat.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-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.a
 lib/evolution/%%VERSION%%/libevolution-calendar.la
 lib/evolution/%%VERSION%%/libevolution-calendar.so
 lib/evolution/%%VERSION%%/libevolution-calendar.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.a
 lib/evolution/%%VERSION%%/libevolution-mail.la
 lib/evolution/%%VERSION%%/libevolution-mail.so
 lib/evolution/%%VERSION%%/libevolution-mail.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-mail-settings.a
 lib/evolution/%%VERSION%%/libevolution-mail-settings.la
 lib/evolution/%%VERSION%%/libevolution-mail-settings.so
 lib/evolution/%%VERSION%%/libevolution-mail-settings.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%%/libfilter.a
 lib/evolution/%%VERSION%%/libfilter.la
 lib/evolution/%%VERSION%%/libfilter.so
 lib/evolution/%%VERSION%%/libfilter.so.0
-lib/evolution/%%VERSION%%/libgnomecanvas.a
 lib/evolution/%%VERSION%%/libgnomecanvas.la
 lib/evolution/%%VERSION%%/libgnomecanvas.so
 lib/evolution/%%VERSION%%/libgnomecanvas.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%%/modules/libevolution-module-addressbook.a
 lib/evolution/%%VERSION%%/modules/libevolution-module-addressbook.la
 lib/evolution/%%VERSION%%/modules/libevolution-module-addressbook.so
-lib/evolution/%%VERSION%%/modules/libevolution-module-calendar.a
 lib/evolution/%%VERSION%%/modules/libevolution-module-calendar.la
 lib/evolution/%%VERSION%%/modules/libevolution-module-calendar.so
-lib/evolution/%%VERSION%%/modules/libevolution-module-composer-autosave.a
 lib/evolution/%%VERSION%%/modules/libevolution-module-composer-autosave.la
 lib/evolution/%%VERSION%%/modules/libevolution-module-composer-autosave.so
-lib/evolution/%%VERSION%%/modules/libevolution-module-mail.a
 lib/evolution/%%VERSION%%/modules/libevolution-module-mail.la
 lib/evolution/%%VERSION%%/modules/libevolution-module-mail.so
-lib/evolution/%%VERSION%%/modules/libevolution-module-mailto-handler.a
 lib/evolution/%%VERSION%%/modules/libevolution-module-mailto-handler.la
 lib/evolution/%%VERSION%%/modules/libevolution-module-mailto-handler.so
-lib/evolution/%%VERSION%%/modules/libevolution-module-plugin-lib.a
 lib/evolution/%%VERSION%%/modules/libevolution-module-plugin-lib.la
 lib/evolution/%%VERSION%%/modules/libevolution-module-plugin-lib.so
-lib/evolution/%%VERSION%%/modules/libevolution-module-startup-wizard.a
 lib/evolution/%%VERSION%%/modules/libevolution-module-startup-wizard.la
 lib/evolution/%%VERSION%%/modules/libevolution-module-startup-wizard.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-addressbook-file.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-addressbook-file.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-addressbook-file.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-audio-inline.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-audio-inline.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-audio-inline.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-backup-restore.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-backup-restore.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-backup-restore.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-bogo-junk-plugin.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-bogo-junk-plugin.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-bogo-junk-plugin.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-file.a
 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.a
 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.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-weather.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-weather.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-source.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-source.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-source.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-email-custom-header.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-email-custom-header.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-email-custom-header.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-attachment-reminder.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-attachment-reminder.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-attachment-reminder.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-bbdb.a
 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.a
 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-google.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-google.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-google.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-webdav.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-webdav.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-webdav.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-dbx-import.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-dbx-import.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-dbx-import.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-groupwise-features.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-groupwise-features.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-groupwise-features.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-image-inline.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-image-inline.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-image-inline.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-imap-features.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-imap-features.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-imap-features.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-itip-formatter.a
 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-notification.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-mail-notification.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-mail-notification.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-mail-to-task.a
 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.a
 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.a
 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-plugin-manager.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-plugin-manager.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-plugin-manager.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-prefer-plain.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-prefer-plain.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-prefer-plain.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-publish-calendar.a
 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.a
 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.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-save-calendar.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-save-calendar.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-subject-thread.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-subject-thread.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-subject-thread.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-templates.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-templates.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-templates.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-vcard-inline.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-vcard-inline.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-vcard-inline.so
 lib/evolution/%%VERSION%%/plugins/org-gnome-addressbook-file.eplug