Convert to buildlink2.

4 files changed, 45 insertions, 18 deletions

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 7f6955e5133..d065bf12bd2 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2002/09/30 00:01:15 rh Exp $
+# $NetBSD: Makefile,v 1.25 2002/10/07 08:54:41 wiz Exp $
 
 DISTNAME=		evolution-1.0.8
 PKGREVISION=		3
@@ -11,21 +11,19 @@ HOMEPAGE=		http://www.ximian.com/products/ximian_evolution/
 COMMENT=		GNOME mailer, calendar, contact manager, and communications tool
 
 BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
-DEPENDS+=		bonobo-conf>=0.14nb1:../../devel/bonobo-conf
 DEPENDS+=		psmisc-[0-9]*:../../sysutils/psmisc
 BUILD_USES_MSGFMT=	YES
 
-BUILDLINK_DEPENDS.gdk-pixbuf=		gdk-pixbuf>=0.11.0nb1
-BUILDLINK_DEPENDS.gdk-pixbuf-gnome=	gdk-pixbuf-gnome>=0.11.0nb1
 # Using a wildcard here doesn't make sense because the version number of
 # "db3" is hardcoded in the "configure" script and some source modules.
 BUILDLINK_DEPENDS.db3=			db3-3.11.2
-BUILDLINK_DEPENDS.gal=			gal>=0.19.2
 
 GNU_CONFIGURE=		YES
 USE_GMAKE=		YES
 USE_X11BASE=		YES
 USE_LIBTOOL=		YES
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool ${WRKSRC}/libical/libtool
+USE_BUILDLINK2=		YES
 YACC=			${PREFIX}/bin/bison -y
 
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
@@ -73,16 +71,17 @@ MAKE_ENV+=	DISPLAY=${DISPLAY}
 
 pre-build: checkforx
 
-.include "../../textproc/libunicode/buildlink.mk"
-.include "../../sysutils/gnome-vfs/buildlink.mk"
-.include "../../devel/gettext-lib/buildlink.mk"
-.include "../../print/gnome-print/buildlink.mk"
-.include "../../security/openssl/buildlink.mk"
-.include "../../databases/db3/buildlink.mk"
-.include "../../databases/openldap/buildlink.mk"
-.include "../../www/gtkhtml/buildlink.mk"
-.include "../../devel/bonobo/buildlink.mk"
-.include "../../devel/oaf/buildlink.mk"
-.include "../../devel/gal/buildlink.mk"
-.include "../../net/ORBit/buildlink.mk"
+.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 "../../mk/bsd.pkg.mk"
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index 821a4c7558b..cb73388791c 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2002/09/05 23:25:27 rh Exp $
+$NetBSD: distinfo,v 1.15 2002/10/07 08:54:42 wiz Exp $
 
 SHA1 (evolution-1.0.8.tar.bz2) = 68e0545f15f7ab3bc43f386ff8f829f1836e05ef
 Size (evolution-1.0.8.tar.bz2) = 10772710 bytes
@@ -13,4 +13,6 @@ SHA1 (patch-ah) = cdd1973d64ca10a52dc4c868bc7a6a15156526ae
 SHA1 (patch-ai) = 2d73b5a3a2a006bb29b83650154ca64d721ef09d
 SHA1 (patch-aj) = 0e132d78a59631d443a8fe03a838033089e1802c
 SHA1 (patch-ak) = b9ab6bd5cfc3645ff606c34df01fec4ce0054a43
+SHA1 (patch-al) = 6f1bec1c7d967db05a09564db6a3ec101801f91b
 SHA1 (patch-am) = ff3becd8e70f76bcf001cc95c96a066b39338660
+SHA1 (patch-an) = 690e66cc29c4d1b4e2df0140d767352603b6270e
diff --git a/mail/evolution/patches/patch-al b/mail/evolution/patches/patch-al
new file mode 100644
index 00000000000..6b731140ea3
--- /dev/null
+++ b/mail/evolution/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.4 2002/10/07 08:54:43 wiz Exp $
+
+--- doc/devel/calendar/cal-util/Makefile.in.orig	Sat Oct  5 06:36:07 2002
++++ doc/devel/calendar/cal-util/Makefile.in
+@@ -242,7 +242,7 @@ extra_files = 
+ GTKDOC_CFLAGS =  	-I$(top_srcdir)/calendar				-I$(top_srcdir)						-I$(top_builddir)					-I$(top_builddir)/libical/src/libical			-I$(top_srcdir)/libical/src/libical			$(BONOBO_VFS_GNOME_CFLAGS)
+ 
+ 
+-GTKDOC_LIBS =  	$(BONOBO_VFS_GNOME_LIBS)						$(top_builddir)/calendar/cal-util/.libs/libcal-util-static.al		$(top_builddir)/libical/src/libical/.libs/libical-static.al		$(top_builddir)/libversit/.libs/libversit.al
++GTKDOC_LIBS =  	$(BONOBO_VFS_GNOME_LIBS)						-L$(top_builddir)/calendar/cal-util -lcal-util		-L$(top_builddir)/libical/src/libical -lical-evolution
+ 
+ 
+ GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC)
diff --git a/mail/evolution/patches/patch-an b/mail/evolution/patches/patch-an
new file mode 100644
index 00000000000..63ac75bf45f
--- /dev/null
+++ b/mail/evolution/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.1 2002/10/07 08:54:45 wiz Exp $
+
+--- doc/devel/calendar/cal-client/Makefile.in.orig	Sun Oct  6 16:58:03 2002
++++ doc/devel/calendar/cal-client/Makefile.in
+@@ -242,7 +242,7 @@ extra_files = 
+ GTKDOC_CFLAGS =  	-I$(top_srcdir)/calendar				-I$(top_builddir)/calendar/cal-client			-I$(top_srcdir)						-I$(top_builddir)					-I$(top_builddir)/libical/src/libical			-I$(top_srcdir)/libical/src/libical			$(BONOBO_VFS_GNOME_CFLAGS)				$(BONOBO_CONF_CFLAGS)
+ 
+ 
+-GTKDOC_LIBS =  	$(BONOBO_VFS_GNOME_LIBS)						$(BONOBO_CONF_LIBS)							$(top_builddir)/calendar/cal-client/.libs/libcal-client-static.al 	$(top_builddir)/calendar/cal-util/.libs/libcal-util-static.al		$(top_builddir)/libical/src/libical/.libs/libical-static.al		$(top_builddir)/libversit/.libs/libversit.al				$(top_builddir)/libwombat/libwombat.la
++GTKDOC_LIBS =  	$(BONOBO_VFS_GNOME_LIBS)						$(BONOBO_CONF_LIBS)							-L$(top_builddir)/calendar/cal-client -lcal-client-static 	-L$(top_builddir)/calendar/cal-util -lcal-util-static		-L$(top_builddir)/libical/src/libical -lical-static		-L$(top_builddir)/libversit -lversit				$(top_builddir)/libwombat/libwombat.la
+ 
+ 
+ GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC)