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

have been converted to USE_BUILDLINK2.

22 files changed, 24 insertions, 24 deletions

diff --git a/net/zebra/Makefile b/net/zebra/Makefile
index ea32ac32924..e04f27e7c5e 100644
--- a/net/zebra/Makefile
+++ b/net/zebra/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2002/08/03 12:27:18 itojun Exp $
+# $NetBSD: Makefile,v 1.53 2002/08/25 21:50:20 jlam Exp $
 # Based on KAME Id: Makefile,v 1.1.2.1.2.1.10.2 1999/01/05 11:03:50 itojun Exp
 #
 
@@ -16,7 +16,7 @@ BUILD_DEPENDS+=	automake>=1.4:../../devel/automake
 
 .include "../../mk/bsd.prefs.mk"
 
-USE_BUILDLINK_ONLY=	# defined
+USE_BUILDLINK2=		# defined
 GNU_CONFIGURE=		# defined
 PKG_SYSCONFSUBDIR?=	zebra
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
@@ -27,7 +27,7 @@ PLIST_SRC=		# empty
 
 .if defined(USE_ZEBRA_VTYSH) && ${USE_ZEBRA_VTYSH} == "YES"
 USE_GNU_READLINE=	# uses rl_pending_input
-.include "../../devel/readline/buildlink.mk"
+.  include "../../devel/readline/buildlink2.mk"
 CONFIGURE_ARGS+=	--enable-vtysh
 PLIST_SRC+=		${PKGDIR}/PLIST.vtysh
 .else
diff --git a/net/zebra/PLIST b/net/zebra/PLIST
index 63402e69dd2..596c29e9af2 100644
--- a/net/zebra/PLIST
+++ b/net/zebra/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/07/09 23:48:17 itojun Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/25 21:50:20 jlam Exp $
 @unexec ${INSTALL_INFO} --delete %D/info/zebra.info %D/info/dir
 info/zebra.info
 @exec   ${INSTALL_INFO}          %D/info/zebra.info %D/info/dir
diff --git a/net/zebra/distinfo b/net/zebra/distinfo
index bd1e467b64d..bc32feb482f 100644
--- a/net/zebra/distinfo
+++ b/net/zebra/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2002/08/03 12:27:19 itojun Exp $
+$NetBSD: distinfo,v 1.9 2002/08/25 21:50:21 jlam Exp $
 
 SHA1 (zebra-0.93a.tar.gz) = aa9d307a53adcd6e9b76003f230c4cd79eefba6b
 Size (zebra-0.93a.tar.gz) = 1335141 bytes
diff --git a/net/zebra/patches/patch-aa b/net/zebra/patches/patch-aa
index b551330b5b8..fbda1e076a9 100644
--- a/net/zebra/patches/patch-aa
+++ b/net/zebra/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2002/07/09 23:48:17 itojun Exp $
+$NetBSD: patch-aa,v 1.7 2002/08/25 21:50:21 jlam Exp $
 
 --- bgpd/Makefile.am.orig	Wed Jun 19 04:05:04 2002
 +++ bgpd/Makefile.am	Wed Jul 10 08:34:31 2002
diff --git a/net/zebra/patches/patch-ab b/net/zebra/patches/patch-ab
index 3ec6ea09da5..40de24c956b 100644
--- a/net/zebra/patches/patch-ab
+++ b/net/zebra/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.4 2002/07/09 23:48:18 itojun Exp $
+$NetBSD: patch-ab,v 1.5 2002/08/25 21:50:21 jlam Exp $
 
 --- ospf6d/Makefile.am.orig	Sat Jun 29 15:20:39 2002
 +++ ospf6d/Makefile.am	Wed Jul 10 08:34:31 2002
diff --git a/net/zebra/patches/patch-ac b/net/zebra/patches/patch-ac
index ed7ac1f1cae..bd970951890 100644
--- a/net/zebra/patches/patch-ac
+++ b/net/zebra/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2002/07/09 23:48:18 itojun Exp $
+$NetBSD: patch-ac,v 1.3 2002/08/25 21:50:22 jlam Exp $
 
 --- ospfd/Makefile.am.orig	Wed Jun 19 04:06:08 2002
 +++ ospfd/Makefile.am	Wed Jul 10 08:34:31 2002
diff --git a/net/zebra/patches/patch-ad b/net/zebra/patches/patch-ad
index 62c0f104d4a..6705fdd2480 100644
--- a/net/zebra/patches/patch-ad
+++ b/net/zebra/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.2 2002/07/09 23:48:18 itojun Exp $
+$NetBSD: patch-ad,v 1.3 2002/08/25 21:50:22 jlam Exp $
 
 --- ripd/Makefile.am.orig	Wed Jun 19 04:06:18 2002
 +++ ripd/Makefile.am	Wed Jul 10 08:34:31 2002
diff --git a/net/zebra/patches/patch-ae b/net/zebra/patches/patch-ae
index a1f5cb01d11..3e6705e6951 100644
--- a/net/zebra/patches/patch-ae
+++ b/net/zebra/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.2 2002/07/09 23:48:18 itojun Exp $
+$NetBSD: patch-ae,v 1.3 2002/08/25 21:50:22 jlam Exp $
 
 --- ripngd/Makefile.am.orig	Wed Jun 19 04:06:33 2002
 +++ ripngd/Makefile.am	Wed Jul 10 08:34:31 2002
diff --git a/net/zebra/patches/patch-af b/net/zebra/patches/patch-af
index 0fc176c3952..a31717d3395 100644
--- a/net/zebra/patches/patch-af
+++ b/net/zebra/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.3 2002/07/09 23:48:18 itojun Exp $
+$NetBSD: patch-af,v 1.4 2002/08/25 21:50:23 jlam Exp $
 
 --- zebra/Makefile.am.orig	Wed Jun 19 08:17:32 2002
 +++ zebra/Makefile.am	Wed Jul 10 08:34:31 2002
diff --git a/net/zebra/patches/patch-ba b/net/zebra/patches/patch-ba
index e9823bdfd1f..809f41f1faf 100644
--- a/net/zebra/patches/patch-ba
+++ b/net/zebra/patches/patch-ba
@@ -1,4 +1,4 @@
-$NetBSD: patch-ba,v 1.1 2002/08/03 12:27:20 itojun Exp $
+$NetBSD: patch-ba,v 1.2 2002/08/25 21:50:23 jlam Exp $
 
 diff -u1 bgpd/bgp_fsm.c /home/itojun/work/zebra/zebra/bgpd/bgp_fsm.c
 --- bgpd/bgp_fsm.c	Wed Jun 19 17:05:38 2002
diff --git a/net/zebra/patches/patch-bb b/net/zebra/patches/patch-bb
index de051834b0e..ce06665182b 100644
--- a/net/zebra/patches/patch-bb
+++ b/net/zebra/patches/patch-bb
@@ -1,4 +1,4 @@
-$NetBSD: patch-bb,v 1.1 2002/08/03 12:27:20 itojun Exp $
+$NetBSD: patch-bb,v 1.2 2002/08/25 21:50:23 jlam Exp $
 
 diff -u1 bgpd/bgp_open.c /home/itojun/work/zebra/zebra/bgpd/bgp_open.c
 --- bgpd/bgp_open.c	Wed Jun 19 17:05:38 2002
diff --git a/net/zebra/patches/patch-bc b/net/zebra/patches/patch-bc
index 1764f3f8e38..ad42df6cdfb 100644
--- a/net/zebra/patches/patch-bc
+++ b/net/zebra/patches/patch-bc
@@ -1,4 +1,4 @@
-$NetBSD: patch-bc,v 1.1 2002/08/03 12:27:21 itojun Exp $
+$NetBSD: patch-bc,v 1.2 2002/08/25 21:50:23 jlam Exp $
 
 diff -u1 bgpd/bgp_packet.c /home/itojun/work/zebra/zebra/bgpd/bgp_packet.c
 --- bgpd/bgp_packet.c	Sat Jun 29 15:20:39 2002
diff --git a/net/zebra/patches/patch-bd b/net/zebra/patches/patch-bd
index 82b52034c39..3db06222295 100644
--- a/net/zebra/patches/patch-bd
+++ b/net/zebra/patches/patch-bd
@@ -1,4 +1,4 @@
-$NetBSD: patch-bd,v 1.1 2002/08/03 12:27:21 itojun Exp $
+$NetBSD: patch-bd,v 1.2 2002/08/25 21:50:24 jlam Exp $
 
 diff -u1 bgpd/bgp_vty.c /home/itojun/work/zebra/zebra/bgpd/bgp_vty.c
 --- bgpd/bgp_vty.c	Mon Jul  8 22:31:01 2002
diff --git a/net/zebra/patches/patch-ca b/net/zebra/patches/patch-ca
index e48afdbfb0b..06c1f8066b8 100644
--- a/net/zebra/patches/patch-ca
+++ b/net/zebra/patches/patch-ca
@@ -1,4 +1,4 @@
-$NetBSD: patch-ca,v 1.1 2002/08/03 12:27:22 itojun Exp $
+$NetBSD: patch-ca,v 1.2 2002/08/25 21:50:24 jlam Exp $
 
 diff -u1 ospf6d/ChangeLog /home/itojun/work/zebra/zebra/ospf6d/ChangeLog
 --- ospf6d/ChangeLog	Mon Jul  8 22:31:02 2002
diff --git a/net/zebra/patches/patch-cc b/net/zebra/patches/patch-cc
index 1e46c3d738d..6723e7ecfb9 100644
--- a/net/zebra/patches/patch-cc
+++ b/net/zebra/patches/patch-cc
@@ -1,4 +1,4 @@
-$NetBSD: patch-cc,v 1.1 2002/08/03 12:27:22 itojun Exp $
+$NetBSD: patch-cc,v 1.2 2002/08/25 21:50:24 jlam Exp $
 
 diff -u1 ospf6d/ospf6_area.c /home/itojun/work/zebra/zebra/ospf6d/ospf6_area.c
 --- ospf6d/ospf6_area.c	Mon Jul  8 22:31:02 2002
diff --git a/net/zebra/patches/patch-cd b/net/zebra/patches/patch-cd
index 2cbd83dd266..834b213b6ed 100644
--- a/net/zebra/patches/patch-cd
+++ b/net/zebra/patches/patch-cd
@@ -1,4 +1,4 @@
-$NetBSD: patch-cd,v 1.1 2002/08/03 12:27:23 itojun Exp $
+$NetBSD: patch-cd,v 1.2 2002/08/25 21:50:24 jlam Exp $
 
 diff -u1 ospf6d/ospf6_asbr.c /home/itojun/work/zebra/zebra/ospf6d/ospf6_asbr.c
 --- ospf6d/ospf6_asbr.c	Mon Jul  8 22:31:02 2002
diff --git a/net/zebra/patches/patch-ce b/net/zebra/patches/patch-ce
index aba2ad7e868..380cf0ab29d 100644
--- a/net/zebra/patches/patch-ce
+++ b/net/zebra/patches/patch-ce
@@ -1,4 +1,4 @@
-$NetBSD: patch-ce,v 1.1 2002/08/03 12:27:23 itojun Exp $
+$NetBSD: patch-ce,v 1.2 2002/08/25 21:50:25 jlam Exp $
 
 diff -u1 ospf6d/ospf6_dbex.c /home/itojun/work/zebra/zebra/ospf6d/ospf6_dbex.c
 --- ospf6d/ospf6_dbex.c	Mon Jul  8 22:31:02 2002
diff --git a/net/zebra/patches/patch-cf b/net/zebra/patches/patch-cf
index 527f968d0a2..66fd1071050 100644
--- a/net/zebra/patches/patch-cf
+++ b/net/zebra/patches/patch-cf
@@ -1,4 +1,4 @@
-$NetBSD: patch-cf,v 1.1 2002/08/03 12:27:24 itojun Exp $
+$NetBSD: patch-cf,v 1.2 2002/08/25 21:50:25 jlam Exp $
 
 diff -u1 ospf6d/ospf6_intra.c /home/itojun/work/zebra/zebra/ospf6d/ospf6_intra.c
 --- ospf6d/ospf6_intra.c	Mon Jul  8 22:31:02 2002
diff --git a/net/zebra/patches/patch-cg b/net/zebra/patches/patch-cg
index ad81f22de6c..72bfc512fca 100644
--- a/net/zebra/patches/patch-cg
+++ b/net/zebra/patches/patch-cg
@@ -1,4 +1,4 @@
-$NetBSD: patch-cg,v 1.1 2002/08/03 12:27:24 itojun Exp $
+$NetBSD: patch-cg,v 1.2 2002/08/25 21:50:25 jlam Exp $
 
 diff -u1 ospf6d/ospf6_lsa.c /home/itojun/work/zebra/zebra/ospf6d/ospf6_lsa.c
 --- ospf6d/ospf6_lsa.c	Mon Jul  8 22:31:02 2002
diff --git a/net/zebra/patches/patch-ch b/net/zebra/patches/patch-ch
index 7e28a0d244f..001a37e3df5 100644
--- a/net/zebra/patches/patch-ch
+++ b/net/zebra/patches/patch-ch
@@ -1,4 +1,4 @@
-$NetBSD: patch-ch,v 1.1 2002/08/03 12:27:25 itojun Exp $
+$NetBSD: patch-ch,v 1.2 2002/08/25 21:50:25 jlam Exp $
 
 diff -u1 ospf6d/ospf6_route.c /home/itojun/work/zebra/zebra/ospf6d/ospf6_route.c
 --- ospf6d/ospf6_route.c	Sun Jul  7 17:12:48 2002
diff --git a/net/zebra/patches/patch-ci b/net/zebra/patches/patch-ci
index 231de44a424..d0069e497dc 100644
--- a/net/zebra/patches/patch-ci
+++ b/net/zebra/patches/patch-ci
@@ -1,4 +1,4 @@
-$NetBSD: patch-ci,v 1.1 2002/08/03 12:27:25 itojun Exp $
+$NetBSD: patch-ci,v 1.2 2002/08/25 21:50:26 jlam Exp $
 
 diff -u1 ospf6d/ospf6_zebra.c /home/itojun/work/zebra/zebra/ospf6d/ospf6_zebra.c
 --- ospf6d/ospf6_zebra.c	Sun Jul  7 17:12:48 2002
diff --git a/net/zebra/patches/patch-cj b/net/zebra/patches/patch-cj
index d14eb860167..ce0f401f88c 100644
--- a/net/zebra/patches/patch-cj
+++ b/net/zebra/patches/patch-cj
@@ -1,4 +1,4 @@
-$NetBSD: patch-cj,v 1.1 2002/08/03 12:27:26 itojun Exp $
+$NetBSD: patch-cj,v 1.2 2002/08/25 21:50:26 jlam Exp $
 
 diff -u1 ospf6d/ospf6d.h /home/itojun/work/zebra/zebra/ospf6d/ospf6d.h
 --- ospf6d/ospf6d.h	Mon Jul  8 22:31:04 2002