From b17a9e4ee27be61cfc042bf378550ef113b3982c Mon Sep 17 00:00:00 2001
From: steven <steven@openbsd.org>
Date: Wed, 28 Dec 2005 08:02:16 +0000
Subject: [PATCH] - SHARED_LIBS - remove no longer existing gtk2 flavor from
 mozilla in BUILD_DEPENDS - sync with update-plist

ok marcm@
---
 mail/evolution/Makefile         | 51 +++++++++++++++++++++++++++++++--
 mail/evolution/pkg/PFRAG.shared | 36 +++++++++++------------
 mail/evolution/pkg/PFRAG.ssl    |  6 ++--
 mail/evolution/pkg/PLIST        |  4 +--
 4 files changed, 71 insertions(+), 26 deletions(-)

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 8db3a6d6d38..2a56ef0eec5 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2005/12/03 00:26:40 brad Exp $
+# $OpenBSD: Makefile,v 1.23 2005/12/28 08:02:16 steven Exp $
 
 COMMENT=		"integrated email and PIM software for GNOME"
 
@@ -9,6 +9,53 @@ CATEGORIES=    		mail x11/gnome
 
 HOMEPAGE=		http://www.gnome.org/projects/evolution/
 
+SHARED_LIBS=		eabutil				0.0	\
+			econduit			0.0	\
+			econtacteditor			0.0	\
+			econtactlisteditor		0.0	\
+			efilterbar			0.0	\
+			emiscwidgets			0.0	\
+			eshell				0.0	\
+			essmime				0.0	\
+			etimezonedialog			0.0	\
+			evolution-smime			0.0	\
+			eutil				0.0	\
+			evolution-a11y			0.0	\
+			evolution-addressbook-a11y	0.0	\
+			evolution-calendar-a11y		0.0	\
+			evolution-importer		0.0	\
+			evolution-mail-importers	0.0	\
+			evolution-widgets-a11y		0.0	\
+			filter				0.0	\
+			menus				0.0
+
+MODGNU_SHARED_LIBS=	eabutil				''	\
+			econduit			''	\
+			econtacteditor			''	\
+			econtactlisteditor		''	\
+			efilterbar			''	\
+			emiscwidgets			''	\
+			eshell				''	\
+			essmime				''	\
+			etimezonedialog			''	\
+			evolution-smime			''	\
+			eutil				''	\
+			evolution-a11y			''	\
+			evolution-addressbook-a11y	''	\
+			evolution-calendar-a11y		''	\
+			evolution-importer		''	\
+			evolution-mail-importers	''	\
+			evolution-widgets-a11y		''	\
+			filter				''	\
+			menus				''
+
+ALIASLIBS=	smime a11y addressbook-a11y calendar-a11y	\
+		importer mail-importers widgets-a11y
+
+.for _name in ${ALIASLIBS}
+LIBevolution-${_name}_ALIAS=		evolution_${_name:S/-/_/}
+.endfor
+
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
@@ -65,7 +112,7 @@ FLAVORS=		ssl
 FLAVOR?=
 
 .if ${FLAVOR:L:Mssl}
-BUILD_DEPENDS=		::www/mozilla,gtk2,-devel
+BUILD_DEPENDS=		::www/mozilla,-devel
 CONFIGURE_ARGS+=	--with-nspr-libs=${LOCALBASE}/mozilla/lib
 CONFIGURE_ARGS+=	--with-nspr-includes=${LOCALBASE}/mozilla/include/nspr
 CONFIGURE_ARGS+=	--with-nss-libs=${LOCALBASE}/mozilla/lib
diff --git a/mail/evolution/pkg/PFRAG.shared b/mail/evolution/pkg/PFRAG.shared
index 2d469ff6e4c..95f68645af0 100644
--- a/mail/evolution/pkg/PFRAG.shared
+++ b/mail/evolution/pkg/PFRAG.shared
@@ -1,25 +1,25 @@
-@comment $OpenBSD: PFRAG.shared,v 1.8 2005/09/08 04:52:12 marcm Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.9 2005/12/28 08:02:16 steven Exp $
 lib/evolution/${PARENT_VERS}/components/libevolution-addressbook.so
 lib/evolution/${PARENT_VERS}/components/libevolution-calendar.so
 lib/evolution/${PARENT_VERS}/components/libevolution-mail.so
 lib/evolution/${PARENT_VERS}/evolution-calendar-importers/libevolution-calendar-importers.so
-@lib lib/evolution/${PARENT_VERS}/libeabutil.so.0.0
-@lib lib/evolution/${PARENT_VERS}/libeconduit.so.0.0
-@lib lib/evolution/${PARENT_VERS}/libecontacteditor.so.0.0
-@lib lib/evolution/${PARENT_VERS}/libecontactlisteditor.so.0.0
-@lib lib/evolution/${PARENT_VERS}/libefilterbar.so.0.0
-@lib lib/evolution/${PARENT_VERS}/libemiscwidgets.so.0.0
-@lib lib/evolution/${PARENT_VERS}/libeshell.so.0.0
-@lib lib/evolution/${PARENT_VERS}/libetimezonedialog.so.0.0
-@lib lib/evolution/${PARENT_VERS}/libeutil.so.0.0
-@lib lib/evolution/${PARENT_VERS}/libevolution-a11y.so.0.0
-@lib lib/evolution/${PARENT_VERS}/libevolution-addressbook-a11y.so.0.0
-@lib lib/evolution/${PARENT_VERS}/libevolution-calendar-a11y.so.0.0
-@lib lib/evolution/${PARENT_VERS}/libevolution-importer.so.0.0
-@lib lib/evolution/${PARENT_VERS}/libevolution-mail-importers.so.0.0
-@lib lib/evolution/${PARENT_VERS}/libevolution-widgets-a11y.so.0.0
-@lib lib/evolution/${PARENT_VERS}/libfilter.so.0.0
-@lib lib/evolution/${PARENT_VERS}/libmenus.so.0.0
+@lib lib/evolution/${PARENT_VERS}/libeabutil.so.${LIBeabutil_VERSION}
+@lib lib/evolution/${PARENT_VERS}/libeconduit.so.${LIBeconduit_VERSION}
+@lib lib/evolution/${PARENT_VERS}/libecontacteditor.so.${LIBecontacteditor_VERSION}
+@lib lib/evolution/${PARENT_VERS}/libecontactlisteditor.so.${LIBecontactlisteditor_VERSION}
+@lib lib/evolution/${PARENT_VERS}/libefilterbar.so.${LIBefilterbar_VERSION}
+@lib lib/evolution/${PARENT_VERS}/libemiscwidgets.so.${LIBemiscwidgets_VERSION}
+@lib lib/evolution/${PARENT_VERS}/libeshell.so.${LIBeshell_VERSION}
+@lib lib/evolution/${PARENT_VERS}/libetimezonedialog.so.${LIBetimezonedialog_VERSION}
+@lib lib/evolution/${PARENT_VERS}/libeutil.so.${LIBeutil_VERSION}
+@lib lib/evolution/${PARENT_VERS}/libevolution-a11y.so.${LIBevolution-a11y_VERSION}
+@lib lib/evolution/${PARENT_VERS}/libevolution-addressbook-a11y.so.${LIBevolution-addressbook-a11y_VERSION}
+@lib lib/evolution/${PARENT_VERS}/libevolution-calendar-a11y.so.${LIBevolution-calendar-a11y_VERSION}
+@lib lib/evolution/${PARENT_VERS}/libevolution-importer.so.${LIBevolution-importer_VERSION}
+@lib lib/evolution/${PARENT_VERS}/libevolution-mail-importers.so.${LIBevolution-mail-importers_VERSION}
+@lib lib/evolution/${PARENT_VERS}/libevolution-widgets-a11y.so.${LIBevolution-widgets-a11y_VERSION}
+@lib lib/evolution/${PARENT_VERS}/libfilter.so.${LIBfilter_VERSION}
+@lib lib/evolution/${PARENT_VERS}/libmenus.so.${LIBmenus_VERSION}
 lib/evolution/${PARENT_VERS}/plugins/liborg-gnome-addressbook-file.so
 lib/evolution/${PARENT_VERS}/plugins/liborg-gnome-addressbook-groupwise.so
 lib/evolution/${PARENT_VERS}/plugins/liborg-gnome-audio-inline.so
diff --git a/mail/evolution/pkg/PFRAG.ssl b/mail/evolution/pkg/PFRAG.ssl
index 0c9ae0ac41a..237ef93830e 100644
--- a/mail/evolution/pkg/PFRAG.ssl
+++ b/mail/evolution/pkg/PFRAG.ssl
@@ -1,8 +1,8 @@
-@comment $OpenBSD: PFRAG.ssl,v 1.1 2005/09/08 04:52:12 marcm Exp $
+@comment $OpenBSD: PFRAG.ssl,v 1.2 2005/12/28 08:02:16 steven Exp $
 lib/evolution/${PARENT_VERS}/libessmime.a
 lib/evolution/${PARENT_VERS}/libessmime.la
-@lib lib/evolution/${PARENT_VERS}/libessmime.so.0.0
+@lib lib/evolution/${PARENT_VERS}/libessmime.so.${LIBessmime_VERSION}
 lib/evolution/${PARENT_VERS}/libevolution-smime.a
 lib/evolution/${PARENT_VERS}/libevolution-smime.la
-@lib lib/evolution/${PARENT_VERS}/libevolution-smime.so.0.0
+@lib lib/evolution/${PARENT_VERS}/libevolution-smime.so.${LIBevolution-smime_VERSION}
 share/evolution/${PARENT_VERS}/glade/smime-ui.glade
diff --git a/mail/evolution/pkg/PLIST b/mail/evolution/pkg/PLIST
index 77c7d95c6b5..d6f9cbae058 100644
--- a/mail/evolution/pkg/PLIST
+++ b/mail/evolution/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.10 2005/09/08 04:52:12 marcm Exp $
+@comment $OpenBSD: PLIST,v 1.11 2005/12/28 08:02:16 steven Exp $
 bin/evolution
 bin/evolution-${PARENT_VERS}
 include/evolution-${PARENT_VERS}/
@@ -487,8 +487,6 @@ share/locale/fa/LC_MESSAGES/
 share/locale/fa/LC_MESSAGES/evolution-${PARENT_VERS}.mo
 share/locale/fi/LC_MESSAGES/evolution-${PARENT_VERS}.mo
 share/locale/fr/LC_MESSAGES/evolution-${PARENT_VERS}.mo
-share/locale/ga/
-share/locale/ga/LC_MESSAGES/
 share/locale/ga/LC_MESSAGES/evolution-${PARENT_VERS}.mo
 share/locale/gl/LC_MESSAGES/evolution-${PARENT_VERS}.mo
 share/locale/gu/