Make Evolution "GNOME 2" pkgsrc compatible with these changes:

1) s/USE_X11BASE/USE_X11/
2) Enable IPv6 if USE_INET6 is enabled.
3) Use GConf2 schemas.mk framework, and GCONF2_SCHEMAS pointing to the
   schemas files.
4) There's no need to depend on gnome1-dirs, we'll use gnome2-dirs instead.
5) Use PKGCONFIG_OVERRIDE poiting to pkgconfig's files.
6) Previous buildlink2 file had gnome1 dependencies...
7) There's no need to depend on net/soup package...

so bump PKGREVISION.

3 files changed, 122 insertions, 81 deletions

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index e096a7ff386..b1d506ebf8c 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2004/01/12 09:46:04 cjep Exp $
+# $NetBSD: Makefile,v 1.47 2004/01/14 07:27:51 xtraeme Exp $
 
 DISTNAME=		evolution-1.4.5
+PKGREVISION=		1
 CATEGORIES=		mail time gnome
 MASTER_SITES=		ftp://ftp.ximian.com/pub/source/evolution/ \
 			${MASTER_SITE_GNOME:=sources/evolution/1.4/}
@@ -11,7 +12,7 @@ HOMEPAGE=		http://ximian.com/products/evolution/
 COMMENT=		GNOME mailer, calendar, contact manager, and communications tool
 
 BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
-DEPENDS+=		gnome1-dirs>=1.2:../../misc/gnome1-dirs
+DEPENDS+=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
 DEPENDS+=		psmisc-[0-9]*:../../sysutils/psmisc
 BUILD_USES_MSGFMT=	YES
 
@@ -20,16 +21,25 @@ BUILD_USES_MSGFMT=	YES
 # to make sure locally stored mails remain in the same format!
 BUILDLINK_DEPENDS.db3=		db3-3.11.2{,nb*}
 
+.include "../../mk/bsd.prefs.mk"
+
+BUILD_DEFS+=		USE_INET6
+
+.if defined(USE_INET6) && !empty(USE_INET6:M[Yy][Ee][Ss])
+CONFIGURE_ARGS+=	--enable-ipv6=yes
+.else
+CONFIGURE_ARGS+=	--enable-ipv6=no
+.endif
+
 GNU_CONFIGURE=		YES
 USE_GMAKE=		YES
-USE_X11BASE=		YES
+USE_X11=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool ${WRKSRC}/libical/libtool
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
 YACC=			${PREFIX}/bin/bison -y
 
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 REPLACE_PERL+=		libical/scripts/mkderivedvalues.pl
 REPLACE_PERL+=		libical/scripts/mkparameterrestrictions.pl
 REPLACE_PERL+=		libical/scripts/mkrestrictionrecords.pl
@@ -46,7 +56,16 @@ CONFIGURE_ARGS+=	--with-db3-includes=${LOCALBASE}/include/db3
 CONFIGURE_ARGS+=	--with-db3-libs=${LOCALBASE}/lib
 CONFIGURE_ENV+=		PKG_CONFIG_PATH="${LOCALBASE}/lib/pkgconfig:${X11BASE}/lib/pkgconfig"
 
-.include "../../mk/bsd.prefs.mk"
+PKGCONFIG_OVERRIDE=	camel.pc.in
+PKGCONFIG_OVERRIDE+=	evolution-shell.pc.in
+PKGCONFIG_OVERRIDE+=	evolution-calendar.pc.in
+PKGCONFIG_OVERRIDE+=	evolution-addressbook.pc.in
+
+GCONF2_SCHEMAS=		apps_evolution_shell.schemas
+GCONF2_SCHEMAS+=	apps_evolution_addressbook.schemas
+GCONF2_SCHEMAS+=	apps_evolution_calendar.schemas
+GCONF2_SCHEMAS+=	apps_evolution_summary.schemas
+GCONF2_SCHEMAS+=	evolution-mail.schemas
 
 pre-configure:
 	for i in ${WRKSRC}/camel/providers/*/Makefile.in ; do		\
@@ -57,7 +76,7 @@ pre-configure:
 
 .include "../../databases/db3/buildlink2.mk"
 .include "../../databases/openldap/buildlink2.mk"
-.include "../../devel/GConf2/buildlink2.mk"
+.include "../../devel/GConf2/schemas.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/gal2/buildlink2.mk"
 .include "../../devel/libbonoboui/buildlink2.mk"
@@ -65,7 +84,6 @@ pre-configure:
 .include "../../devel/libgnomeui/buildlink2.mk"
 .include "../../devel/pkgconfig/buildlink2.mk"
 .include "../../graphics/libgnomecanvas/buildlink2.mk"
-.include "../../net/soup/buildlink2.mk"
 .include "../../print/libgnomeprint/buildlink2.mk"
 .include "../../security/openssl/buildlink2.mk"
 .include "../../sysutils/gnome-vfs2/buildlink2.mk"
@@ -73,4 +91,5 @@ pre-configure:
 .include "../../textproc/libunicode/buildlink2.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../www/gtkhtml3/buildlink2.mk"
+.include "../../mk/pthread.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/evolution/PLIST b/mail/evolution/PLIST
index 489d505349c..f4e75dbc929 100644
--- a/mail/evolution/PLIST
+++ b/mail/evolution/PLIST
@@ -1,12 +1,7 @@
-@comment $NetBSD: PLIST,v 1.15 2004/01/04 21:37:09 rh Exp $
+@comment $NetBSD: PLIST,v 1.16 2004/01/14 07:27:51 xtraeme Exp $
 bin/evolution
 bin/evolution-1.4
 bin/evolution-addressbook-export
-etc/gconf/schemas/apps_evolution_addressbook.schemas
-etc/gconf/schemas/apps_evolution_calendar.schemas
-etc/gconf/schemas/apps_evolution_shell.schemas
-etc/gconf/schemas/apps_evolution_summary.schemas
-etc/gconf/schemas/evolution-mail.schemas
 include/evolution-1.4/cal-client/cal-client-multi.h
 include/evolution-1.4/cal-client/cal-client-types.h
 include/evolution-1.4/cal-client/cal-client.h
@@ -1133,6 +1128,11 @@ share/evolution/1.4/zoneinfo/Pacific/Wake.ics
 share/evolution/1.4/zoneinfo/Pacific/Wallis.ics
 share/evolution/1.4/zoneinfo/Pacific/Yap.ics
 share/evolution/1.4/zoneinfo/zones.tab
+share/gconf/schemas/apps_evolution_addressbook.schemas
+share/gconf/schemas/apps_evolution_calendar.schemas
+share/gconf/schemas/apps_evolution_shell.schemas
+share/gconf/schemas/apps_evolution_summary.schemas
+share/gconf/schemas/evolution-mail.schemas
 share/gnome/help/evolution-1.4/C/apx-authors.xml
 share/gnome/help/evolution-1.4/C/apx-bugs.xml
 share/gnome/help/evolution-1.4/C/apx-fdl.xml
diff --git a/mail/evolution/buildlink2.mk b/mail/evolution/buildlink2.mk
index 20a682b1c8f..9477647e8f5 100644
--- a/mail/evolution/buildlink2.mk
+++ b/mail/evolution/buildlink2.mk
@@ -1,83 +1,105 @@
-# $NetBSD: buildlink2.mk,v 1.6 2004/01/03 18:49:45 reed Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2004/01/14 07:27:51 xtraeme Exp $
+#
+# This Makefile fragment is included by packages that use evolution.
+#
+# This file was created automatically using createbuildlink 2.9.
 #
 
 .if !defined(EVOLUTION_BUILDLINK2_MK)
 EVOLUTION_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			evolution
-BUILDLINK_DEPENDS.evolution?=		evolution>=1.2.4nb6
+BUILDLINK_DEPENDS.evolution?=		evolution>=1.4.5nb1
 BUILDLINK_PKGSRCDIR.evolution?=		../../mail/evolution
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.evolution=evolution
-BUILDLINK_PREFIX.evolution_DEFAULT=	${X11PREFIX}
-BUILDLINK_FILES.evolution+=	include/camel/*.h
-BUILDLINK_FILES.evolution+=	include/camel/camel-exception-list.def
-BUILDLINK_FILES.evolution+=	include/ename/e-address-western.h
-BUILDLINK_FILES.evolution+=	include/ename/e-name-western-tables.h
-BUILDLINK_FILES.evolution+=	include/ename/e-name-western.h
-BUILDLINK_FILES.evolution+=	include/evolution/cal-client/*.h
-BUILDLINK_FILES.evolution+=	include/evolution/cal-util/*.h
-BUILDLINK_FILES.evolution+=	include/evolution/ebook/*.h
-BUILDLINK_FILES.evolution+=	include/evolution/ical.h
-BUILDLINK_FILES.evolution+=	include/evolution/importer/*.h
-BUILDLINK_FILES.evolution+=	include/evolution/shell/*.h
-BUILDLINK_FILES.evolution+=	include/evolution/wombat/wombat-client.h
-BUILDLINK_FILES.evolution+=	lib/evolution/camel-providers/1.0/libcamelimap.*
-BUILDLINK_FILES.evolution+=	lib/evolution/camel-providers/1.0/libcamelimap.urls
-BUILDLINK_FILES.evolution+=	lib/evolution/camel-providers/1.0/libcamellocal.*
-BUILDLINK_FILES.evolution+=	lib/evolution/camel-providers/1.0/libcamellocal.urls
-BUILDLINK_FILES.evolution+=	lib/evolution/camel-providers/1.0/libcamelnntp.*
-BUILDLINK_FILES.evolution+=	lib/evolution/camel-providers/1.0/libcamelnntp.urls
-BUILDLINK_FILES.evolution+=	lib/evolution/camel-providers/1.0/libcamelpop3.*
-BUILDLINK_FILES.evolution+=	lib/evolution/camel-providers/1.0/libcamelpop3.urls
-BUILDLINK_FILES.evolution+=	lib/evolution/camel-providers/1.0/libcamelsendmail.*
-BUILDLINK_FILES.evolution+=	lib/evolution/camel-providers/1.0/libcamelsendmail.urls
-BUILDLINK_FILES.evolution+=	lib/evolution/camel-providers/1.0/libcamelsmtp.*
-BUILDLINK_FILES.evolution+=	lib/evolution/camel-providers/1.0/libcamelsmtp.urls
-BUILDLINK_FILES.evolution+=	lib/evolution/evolution-mail-importers/${PKGVERSION}/libmbox.*
-BUILDLINK_FILES.evolution+=	lib/evolution/evolution-mail-importers/${PKGVERSION}/liboutlook.*
-BUILDLINK_FILES.evolution+=	lib/libcal-client.*
-BUILDLINK_FILES.evolution+=	lib/libcal-util.*
-BUILDLINK_FILES.evolution+=	lib/libcamel.*
-BUILDLINK_FILES.evolution+=	lib/libebook.*
-BUILDLINK_FILES.evolution+=	lib/libename.*
-BUILDLINK_FILES.evolution+=	lib/libeselectnames.*
-BUILDLINK_FILES.evolution+=	lib/libeshell.*
-BUILDLINK_FILES.evolution+=	lib/libevolution-importer.*
-BUILDLINK_FILES.evolution+=	lib/libical-evolution.*
-BUILDLINK_FILES.evolution+=	lib/libwombat.*
-BUILDLINK_FILES.evolution+=	share/idl/Composer.idl
-BUILDLINK_FILES.evolution+=	share/idl/Evolution-Activity.idl
-BUILDLINK_FILES.evolution+=	share/idl/Evolution-Composer.idl
-BUILDLINK_FILES.evolution+=	share/idl/Evolution-Offline.idl
-BUILDLINK_FILES.evolution+=	share/idl/Evolution-Session.idl
-BUILDLINK_FILES.evolution+=	share/idl/Evolution-Shell.idl
-BUILDLINK_FILES.evolution+=	share/idl/Evolution-ShellComponent.idl
-BUILDLINK_FILES.evolution+=	share/idl/Evolution-ShellComponentDnd.idl
-BUILDLINK_FILES.evolution+=	share/idl/Evolution-ShellView.idl
-BUILDLINK_FILES.evolution+=	share/idl/Evolution-Shortcuts.idl
-BUILDLINK_FILES.evolution+=	share/idl/Evolution-Storage.idl
-BUILDLINK_FILES.evolution+=	share/idl/Evolution-StorageSetView.idl
-BUILDLINK_FILES.evolution+=	share/idl/Evolution-Wizard.idl
-BUILDLINK_FILES.evolution+=	share/idl/Evolution-common.idl
-BUILDLINK_FILES.evolution+=	share/idl/Evolution.idl
-BUILDLINK_FILES.evolution+=	share/idl/GNOME_Evolution_Importer.idl
-BUILDLINK_FILES.evolution+=	share/idl/addressbook.idl
-BUILDLINK_FILES.evolution+=	share/idl/evolution-calendar.idl
+BUILDLINK_PREFIX.evolution_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.evolution+=	include/evolution-1.4/cal-client/*.h
+BUILDLINK_FILES.evolution+=	include/evolution-1.4/cal-util/*.h
+BUILDLINK_FILES.evolution+=	include/evolution-1.4/camel/*.h
+BUILDLINK_FILES.evolution+=	include/evolution-1.4/e-conduit/*.h
+BUILDLINK_FILES.evolution+=	include/evolution-1.4/e-db3util/*.h
+BUILDLINK_FILES.evolution+=	include/evolution-1.4/e-util/*.h
+BUILDLINK_FILES.evolution+=	include/evolution-1.4/ebook/*.h
+BUILDLINK_FILES.evolution+=	include/evolution-1.4/ename/*.h
+BUILDLINK_FILES.evolution+=	include/evolution-1.4/*.h
+BUILDLINK_FILES.evolution+=	include/evolution-1.4/importer/*.h
+BUILDLINK_FILES.evolution+=	include/evolution-1.4/pas/*.h
+BUILDLINK_FILES.evolution+=	include/evolution-1.4/pcs/*.h
+BUILDLINK_FILES.evolution+=	include/evolution-1.4/shell/*.h
+BUILDLINK_FILES.evolution+=	include/evolution-1.4/widgets/*.h
+BUILDLINK_FILES.evolution+=	lib/bonobo/servers/GNOME_Evolution_Addressbook.server
+BUILDLINK_FILES.evolution+=	lib/bonobo/servers/GNOME_Evolution_Addressbook_LDIF_Importer.server
+BUILDLINK_FILES.evolution+=	lib/bonobo/servers/GNOME_Evolution_Addressbook_SelectNames.server
+BUILDLINK_FILES.evolution+=	lib/bonobo/servers/GNOME_Evolution_Addressbook_VCard_Importer.server
+BUILDLINK_FILES.evolution+=	lib/bonobo/servers/GNOME_Evolution_Calendar.server
+BUILDLINK_FILES.evolution+=	lib/bonobo/servers/GNOME_Evolution_Calendar_AlarmNotify.server
+BUILDLINK_FILES.evolution+=	lib/bonobo/servers/GNOME_Evolution_Calendar_Importer.server
+BUILDLINK_FILES.evolution+=	lib/bonobo/servers/GNOME_Evolution_Mail.server
+BUILDLINK_FILES.evolution+=	lib/bonobo/servers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server
+BUILDLINK_FILES.evolution+=	lib/bonobo/servers/GNOME_Evolution_Mail_Mbox_Importer.server
+BUILDLINK_FILES.evolution+=	lib/bonobo/servers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server
+BUILDLINK_FILES.evolution+=	lib/bonobo/servers/GNOME_Evolution_Mail_Outlook_Importer.server
+BUILDLINK_FILES.evolution+=	lib/bonobo/servers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server
+BUILDLINK_FILES.evolution+=	lib/bonobo/servers/GNOME_Evolution_Shell.server
+BUILDLINK_FILES.evolution+=	lib/bonobo/servers/GNOME_Evolution_Summary.server
+BUILDLINK_FILES.evolution+=	lib/bonobo/servers/GNOME_Evolution_Wombat.server
+BUILDLINK_FILES.evolution+=	lib/evolution/1.4/camel-providers/libcamelimap.*
+BUILDLINK_FILES.evolution+=	lib/evolution/1.4/camel-providers/libcamelimap.urls
+BUILDLINK_FILES.evolution+=	lib/evolution/1.4/camel-providers/libcamellocal.*
+BUILDLINK_FILES.evolution+=	lib/evolution/1.4/camel-providers/libcamellocal.urls
+BUILDLINK_FILES.evolution+=	lib/evolution/1.4/camel-providers/libcamelpop3.*
+BUILDLINK_FILES.evolution+=	lib/evolution/1.4/camel-providers/libcamelpop3.urls
+BUILDLINK_FILES.evolution+=	lib/evolution/1.4/camel-providers/libcamelsendmail.*
+BUILDLINK_FILES.evolution+=	lib/evolution/1.4/camel-providers/libcamelsendmail.urls
+BUILDLINK_FILES.evolution+=	lib/evolution/1.4/camel-providers/libcamelsmtp.*
+BUILDLINK_FILES.evolution+=	lib/evolution/1.4/camel-providers/libcamelsmtp.urls
+BUILDLINK_FILES.evolution+=	lib/evolution/1.4/components/libevolution-addressbook.*
+BUILDLINK_FILES.evolution+=	lib/evolution/1.4/components/libevolution-calendar.*
+BUILDLINK_FILES.evolution+=	lib/evolution/1.4/components/libevolution-executive-summary.*
+BUILDLINK_FILES.evolution+=	lib/evolution/1.4/components/libevolution-mail.*
+BUILDLINK_FILES.evolution+=	lib/evolution/1.4/evolution-calendar-importers/libevolution-calendar-importers.*
+BUILDLINK_FILES.evolution+=	lib/evolution/1.4/evolution-mail-importers/libevolution-elm-importer.*
+BUILDLINK_FILES.evolution+=	lib/evolution/1.4/evolution-mail-importers/libevolution-netscape-importer.*
+BUILDLINK_FILES.evolution+=	lib/evolution/1.4/evolution-mail-importers/libevolution-pine-importer.*
+BUILDLINK_FILES.evolution+=	lib/evolution/1.4/evolution-mail-importers/libmbox.*
+BUILDLINK_FILES.evolution+=	lib/evolution/1.4/evolution-mail-importers/liboutlook.*
+BUILDLINK_FILES.evolution+=	lib/evolution/1.4/libcal-client.*
+BUILDLINK_FILES.evolution+=	lib/evolution/1.4/libcal-util-static.*
+BUILDLINK_FILES.evolution+=	lib/evolution/1.4/libcal-util.*
+BUILDLINK_FILES.evolution+=	lib/evolution/1.4/libcamel.*
+BUILDLINK_FILES.evolution+=	lib/evolution/1.4/libebook-static.*
+BUILDLINK_FILES.evolution+=	lib/evolution/1.4/libebook.*
+BUILDLINK_FILES.evolution+=	lib/evolution/1.4/libeconduit.*
+BUILDLINK_FILES.evolution+=	lib/evolution/1.4/libedb3util.*
+BUILDLINK_FILES.evolution+=	lib/evolution/1.4/libemiscwidgets.*
+BUILDLINK_FILES.evolution+=	lib/evolution/1.4/libename.*
+BUILDLINK_FILES.evolution+=	lib/evolution/1.4/libeshell.*
+BUILDLINK_FILES.evolution+=	lib/evolution/1.4/libetimezonedialog.*
+BUILDLINK_FILES.evolution+=	lib/evolution/1.4/libeutil.*
+BUILDLINK_FILES.evolution+=	lib/evolution/1.4/libevolution-importer.*
+BUILDLINK_FILES.evolution+=	lib/evolution/1.4/libical-evolution.*
+BUILDLINK_FILES.evolution+=	lib/evolution/1.4/libicalvcal-evolution.*
+BUILDLINK_FILES.evolution+=	lib/evolution/1.4/libmenus.*
+BUILDLINK_FILES.evolution+=	lib/evolution/1.4/libpas.*
+BUILDLINK_FILES.evolution+=	lib/evolution/1.4/libpcs.*
+BUILDLINK_FILES.evolution+=	lib/evolution/1.4/libversit.*
+BUILDLINK_FILES.evolution+=	lib/evolution/1.4/libwombat.*
 
-.include "../../textproc/libunicode/buildlink2.mk"
-.include "../../sysutils/gnome-vfs/buildlink2.mk"
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../print/gnome-print/buildlink2.mk"
-.include "../../security/openssl/buildlink2.mk"
 .include "../../databases/db3/buildlink2.mk"
 .include "../../databases/openldap/buildlink2.mk"
-.include "../../www/gtkhtml/buildlink2.mk"
-.include "../../devel/bonobo/buildlink2.mk"
-.include "../../devel/bonobo-conf/buildlink2.mk"
-.include "../../devel/oaf/buildlink2.mk"
-.include "../../devel/gal/buildlink2.mk"
-.include "../../net/ORBit/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/gal2/buildlink2.mk"
+.include "../../devel/libbonoboui/buildlink2.mk"
+.include "../../devel/libglade2/buildlink2.mk"
+.include "../../devel/libgnomeui/buildlink2.mk"
+.include "../../graphics/libgnomecanvas/buildlink2.mk"
+.include "../../print/libgnomeprint/buildlink2.mk"
+.include "../../security/openssl/buildlink2.mk"
+.include "../../sysutils/gnome-vfs2/buildlink2.mk"
+.include "../../textproc/libxml2/buildlink2.mk"
+.include "../../textproc/libunicode/buildlink2.mk"
+.include "../../www/gtkhtml3/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	evolution-buildlink