Merge packages from the buildlink2 branch back into the main trunk that

have been converted to USE_BUILDLINK2.

5 files changed, 10 insertions, 8 deletions

diff --git a/www/kannel/Makefile b/www/kannel/Makefile
index b96f7504015..9c238159345 100644
--- a/www/kannel/Makefile
+++ b/www/kannel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/08/22 11:31:33 martti Exp $
+# $NetBSD: Makefile,v 1.12 2002/08/25 21:52:10 jlam Exp $
 #
 
 DISTNAME=	gateway-${KANNEL_VER}
@@ -13,14 +13,16 @@ COMMENT=	Open source WAP and SMS gateway
 KANNEL_VER=	1.2.0
 
 GNU_CONFIGURE=		YES
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 USE_GMAKE=		YES
 USE_PERL5=		YES
 PTHREAD_OPTS+=		require
 
 CONFIGURE_ARGS+=	--disable-docs
 CONFIGURE_ARGS+=	--disable-ssl
+CFLAGS+=		-I${BUILDLINK_PREFIX.libxml2}/include/libxml2/libxml
+
+.include "../../textproc/libxml2/buildlink2.mk"
+.include "../../mk/pthread.buildlink2.mk"
 
-.include "../../textproc/libxml2/buildlink.mk"
-.include "../../mk/pthread.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/kannel/PLIST b/www/kannel/PLIST
index 2ccc25843f3..3c479ac6329 100644
--- a/www/kannel/PLIST
+++ b/www/kannel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/08/22 11:31:33 martti Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/08/25 21:52:11 jlam Exp $
 bin/seewbmp
 bin/wmlsc
 bin/wmlsdasm
diff --git a/www/kannel/distinfo b/www/kannel/distinfo
index c8dcb6d4983..8849ff73f22 100644
--- a/www/kannel/distinfo
+++ b/www/kannel/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/08/22 11:31:34 martti Exp $
+$NetBSD: distinfo,v 1.5 2002/08/25 21:52:11 jlam Exp $
 
 SHA1 (gateway-1.2.0.tar.gz) = f81fdfca26be69de8505550a076fb3628f477af2
 Size (gateway-1.2.0.tar.gz) = 2094749 bytes
diff --git a/www/kannel/patches/patch-aa b/www/kannel/patches/patch-aa
index 44833ee7cf7..f29dc5d844d 100644
--- a/www/kannel/patches/patch-aa
+++ b/www/kannel/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2002/08/22 11:31:35 martti Exp $
+$NetBSD: patch-aa,v 1.4 2002/08/25 21:52:11 jlam Exp $
 
 --- utils/start-stop-daemon.c.orig	Mon Apr 23 16:52:29 2001
 +++ utils/start-stop-daemon.c	Sun Jul  7 21:28:04 2002
diff --git a/www/kannel/patches/patch-ab b/www/kannel/patches/patch-ab
index b0cc30f4055..099d58a9054 100644
--- a/www/kannel/patches/patch-ab
+++ b/www/kannel/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.3 2002/08/22 11:31:35 martti Exp $
+$NetBSD: patch-ab,v 1.4 2002/08/25 21:52:12 jlam Exp $
 
 --- Makefile.in.orig	Tue Jun 11 20:59:52 2002
 +++ Makefile.in	Sun Jul  7 21:30:27 2002