Merge changes in the main trunk into the buildlink2 branch for thosebuildlink2

packages that have been converted to USE_BUILDLINK2.

42 files changed, 586 insertions, 179 deletions

diff --git a/net/gnet/distinfo b/net/gnet/distinfo
index 6a6adc8efef..cb464262c4a 100644
--- a/net/gnet/distinfo
+++ b/net/gnet/distinfo
@@ -1,3 +1,4 @@
+$NetBSD: distinfo,v 1.1.1.1.2.3 2002/08/25 21:20:17 jlam Exp $
 
 SHA1 (gnet-1.1.4.tar.gz) = 1970534bebbfbd9a5255e7d23c26fdbad1ea6acb
 Size (gnet-1.1.4.tar.gz) = 363006 bytes
diff --git a/net/gtk-gnutella/Makefile b/net/gtk-gnutella/Makefile
index 09eaffff9b9..ca4705d1252 100644
--- a/net/gtk-gnutella/Makefile
+++ b/net/gtk-gnutella/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15.2.1 2002/07/01 17:44:59 jlam Exp $
+# $NetBSD: Makefile,v 1.15.2.2 2002/08/25 21:20:17 jlam Exp $
 #
 
-DISTNAME=		gtk-gnutella-0.85
+DISTNAME=		gtk-gnutella-0.90
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gtk-gnutella/}
 
@@ -18,5 +18,7 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gtk-gnutella
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/gtk-gnutella
 
+.include "../../textproc/libxml2/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/gtk-gnutella/PLIST b/net/gtk-gnutella/PLIST
index 1c982ec268d..166de3679f0 100644
--- a/net/gtk-gnutella/PLIST
+++ b/net/gtk-gnutella/PLIST
@@ -1,4 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:55:32 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.1.2.1 2002/08/25 21:20:19 jlam Exp $
 bin/gtk-gnutella
 share/doc/gtk-gnutella/README
+share/gtk-gnutella/pixmaps/arrow_down.xpm
+share/gtk-gnutella/pixmaps/arrow_up.xpm
+share/gtk-gnutella/pixmaps/firewall.xpm
+share/gtk-gnutella/pixmaps/no_firewall.xpm
+@dirrm share/gtk-gnutella/pixmaps
+@dirrm share/gtk-gnutella
 @dirrm share/doc/gtk-gnutella
diff --git a/net/gtk-gnutella/distinfo b/net/gtk-gnutella/distinfo
index 266ec1853c3..cd2301255fa 100644
--- a/net/gtk-gnutella/distinfo
+++ b/net/gtk-gnutella/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2002/04/15 06:59:23 martti Exp $
+$NetBSD: distinfo,v 1.6.2.1 2002/08/25 21:20:20 jlam Exp $
 
-SHA1 (gtk-gnutella-0.85.tar.gz) = 614cc8ff83ea1ed7d1fd002a3bb3d759dc23c083
-Size (gtk-gnutella-0.85.tar.gz) = 261538 bytes
+SHA1 (gtk-gnutella-0.90.tar.gz) = b31984b6e83b0471a5ee2de2486d85b3400ecb67
+Size (gtk-gnutella-0.90.tar.gz) = 469236 bytes
diff --git a/net/jwhois/PLIST b/net/jwhois/PLIST
index b206897666b..83910f7e3fc 100644
--- a/net/jwhois/PLIST
+++ b/net/jwhois/PLIST
@@ -1,9 +1,15 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:36 seb Exp $
+@comment $NetBSD: PLIST,v 1.2.2.1 2002/08/25 21:20:21 jlam Exp $
 bin/jwhois
 @unexec	${INSTALL_INFO} --delete %D/info/jwhois.info %D/info/dir
 info/jwhois.info
 @exec	${INSTALL_INFO} %D/info/jwhois.info %D/info/dir
 man/man1/jwhois.1
+man/sv/man1/jwhois.1
 share/examples/jwhois.conf
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/jwhois.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/jwhois.mo
+${PKGLOCALEDIR}/locale/id/LC_MESSAGES/jwhois.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/jwhois.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/jwhois.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/jwhois.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/jwhois.mo
diff --git a/net/lftp/Makefile b/net/lftp/Makefile
index c8d4a66c113..922cb9202c3 100644
--- a/net/lftp/Makefile
+++ b/net/lftp/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.15.2.2 2002/07/01 17:45:00 jlam Exp $
+# $NetBSD: Makefile,v 1.15.2.3 2002/08/25 21:20:22 jlam Exp $
 
 DISTNAME=	lftp-2.5.2
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/
+MASTER_SITES=	ftp://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/ \
+		ftp://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/old/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	michal@pasternak.w.lub.pl
diff --git a/net/lftp/PLIST b/net/lftp/PLIST
index 3b28dd3d45b..3654cf0743d 100644
--- a/net/lftp/PLIST
+++ b/net/lftp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2.2.1 2002/07/01 17:45:00 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2.2.2 2002/08/25 21:20:23 jlam Exp $
 bin/lftp
 bin/lftpget
 man/man1/lftp.1
@@ -18,3 +18,6 @@ share/locale/zh_CN/LC_MESSAGES/lftp.mo
 share/locale/zh_TW/LC_MESSAGES/lftp.mo
 @dirrm share/examples/lftp
 @dirrm share/lftp
+@exec ${MKDIR} %D/lib/lftp/${PKGVERSION}
+@dirrm lib/lftp/${PKGVERSION}
+@dirrm lib/lftp
diff --git a/net/nap/Makefile b/net/nap/Makefile
index 930057e796b..5b623a94cee 100644
--- a/net/nap/Makefile
+++ b/net/nap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10.2.1 2002/07/01 17:45:01 jlam Exp $
+# $NetBSD: Makefile,v 1.10.2.2 2002/08/25 21:20:24 jlam Exp $
 
 DISTNAME=	nap-1.4.4
 CATEGORIES=	net
@@ -11,8 +11,9 @@ COMMENT=	Terminal based Napster client similar to ircII
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
 
-# nap needs newterm()
-INCOMPAT_CURSES=	1.4* 1.5 1.5_* 1.5.[1-9]* 1.5[A-Z]
+# newterm()
+INCOMPAT_CURSES=	NetBSD-1.4*-*
+INCOMPAT_CURSES+=	NetBSD-1.5-* NetBSD-1.5.*-* NetBSD-1.5[A-Z]-*
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nap ${PREFIX}/share/examples/nap
diff --git a/net/netsaint-base/distinfo b/net/netsaint-base/distinfo
index b687faed850..a8f2f6f4866 100644
--- a/net/netsaint-base/distinfo
+++ b/net/netsaint-base/distinfo
@@ -1,3 +1,4 @@
+$NetBSD: distinfo,v 1.4.2.1 2002/08/25 21:20:25 jlam Exp $
 
 SHA1 (netsaint-0.0.7.tar.gz) = 5ce4832c9cccaba0baa49fe3e222c6753a811143
 Size (netsaint-0.0.7.tar.gz) = 1278019 bytes
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 4103ea57301..99400c18bac 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,66 +1,24 @@
-# $NetBSD: Makefile,v 1.82.2.2 2002/06/30 06:24:08 jlam Exp $
-
-DISTNAME=		samba-2.2.5
-WRKSRC=			${WRKDIR}/${DISTNAME}/source
-CATEGORIES=		net
-MASTER_SITES=		ftp://ftp.samba.org/pub/samba/ \
-			ftp://ring.asahi-net.or.jp/pub/net/samba/ \
-			ftp://samba.anu.edu.au/pub/samba/ \
-			http://de.samba.org/samba/ftp/ \
-			ftp://ftp.sunet.se/pub/unix/utilities/samba/
-COUNTRY_MIRRORS=	au1 ca fi fr de it pl ru sg se us1 us6
-.for COUNTRY in ${COUNTRY_MIRRORS}
-MASTER_SITES+=		ftp://${COUNTRY}.samba.org/pub/samba/
-.endfor
-EXTRACT_SUFX=		.tar.bz2
+# $NetBSD: Makefile,v 1.82.2.3 2002/08/25 21:20:26 jlam Exp $
+
+.include "Makefile.common"
 
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.samba.org/
 COMMENT=		SMB/CIFS protocol server suite for UNIX
 
-GNU_CONFIGURE=		# defined
-USE_LIBTOOL=		# defined
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
-
 USE_BUILDLINK2=		# defined
-USE_GNU_READLINE=	# uses rl_event_hook interface to GNU readline
-
-.include "../../mk/bsd.prefs.mk"
-
-PKG_SYSCONFSUBDIR?=	samba
-
-VARDIR?=		/var
-SAMBA_ETCDIR?=		${PKG_SYSCONFDIR}
-SAMBA_DATADIR=		${PREFIX}/share
-SAMBA_LOCKDIR?=		${VARDIR}/db/samba
-SAMBA_LOGDIR?=		${VARDIR}/log
-SAMBA_PIDDIR?=		${VARDIR}/run
-SAMBA_PRIVATE?=		${SAMBA_ETCDIR}/private
-
-CONFIGURE_ARGS+=	--localstatedir=${VARDIR}
-CONFIGURE_ARGS+=	--sbindir=${PREFIX}/sbin
-CONFIGURE_ARGS+=	--with-configdir=${SAMBA_ETCDIR}
-CONFIGURE_ARGS+=	--with-codepagedir=${SAMBA_DATADIR}/samba/codepages
-CONFIGURE_ARGS+=	--with-datadir=${SAMBA_DATADIR}
-CONFIGURE_ARGS+=	--with-lockdir=${SAMBA_LOCKDIR}
-CONFIGURE_ARGS+=	--with-logfilebase=${SAMBA_LOGDIR}
-CONFIGURE_ARGS+=	--with-piddir=${SAMBA_PIDDIR}
-CONFIGURE_ARGS+=	--with-privatedir=${SAMBA_PRIVATE}
-CONFIGURE_ARGS+=	--with-swatdir=${SAMBA_DATADIR}/samba/swat
 
+USE_GNU_READLINE=	# uses rl_event_hook interface to GNU readline
 CONFIGURE_ARGS+=	--with-readline
+
 CONFIGURE_ARGS+=	--with-ssl
 CONFIGURE_ARGS+=	--with-sslinc=${SSLBASE}
 CFLAGS+=		-I${SSLBASE}/include/openssl	# ssl.h, err.h
 
-CONFIGURE_ENV+=		ac_cv_lib_curses_tgetent=no
-
 .if defined(USE_CUPS) && (${USE_CUPS} == "YES")
 .include "../../print/cups/buildlink2.mk"
 BUILD_DEFS+=		USE_CUPS
 CONFIGURE_ARGS+=	--enable-cups
-.else
-CONFIGURE_ARGS+=	--disable-cups
 .endif
 
 .if defined(USE_PAM)
@@ -81,25 +39,14 @@ SMBPASSWD_FILE=		/dev/null ${SAMBA_PRIVATE}/smbpasswd		\
 			${ROOT_USER} ${ROOT_GROUP} 0600
 .endif
 
-# The following are Linux-only options.
-CONFIGURE_ARGS+=	--without-smbwrapper
-CONFIGURE_ARGS+=	--without-smbmount
-
-# Explicitly disable winbind until it may be properly handled by pkgsrc.
-CONFIGURE_ARGS+=	--without-winbind
-
-DOCDIR=			${PREFIX}/share/doc/samba
-HTMLDIR=		${PREFIX}/share/doc/html/samba
-EXAMPLESDIR=		${PREFIX}/share/examples/samba
-
-FILES_SUBST=		SAMBA_PRIVATE=${SAMBA_PRIVATE}
-FILES_SUBST+=		SAMBA_LOCKDIR=${SAMBA_LOCKDIR}
-FILES_SUBST+=		SAMBA_LOGDIR=${SAMBA_LOGDIR}
-FILES_SUBST+=		SAMBA_ETCDIR=${SAMBA_ETCDIR}
 MESSAGE_SUBST+=		SAMBA_PRIVATE=${SAMBA_PRIVATE}
 MESSAGE_SUBST+=		ROOT_GROUP=${ROOT_GROUP}
 MESSAGE_SUBST+=		ROOT_USER=${ROOT_USER}
 
+DOCDIR=			${PREFIX}/share/doc/${PKGBASE}
+HTMLDIR=		${PREFIX}/share/doc/html/${PKGBASE}
+EXAMPLESDIR=		${PREFIX}/share/examples/${PKGBASE}
+
 CONF_FILES=		${EXAMPLESDIR}/smb.conf.default ${SAMBA_ETCDIR}/smb.conf
 SUPPORT_FILES_PERMS=	${SMBPASSWD_FILE}
 RCD_SCRIPTS=		samba nmbd smbd
diff --git a/net/samba/Makefile.common b/net/samba/Makefile.common
new file mode 100644
index 00000000000..3161603cb64
--- /dev/null
+++ b/net/samba/Makefile.common
@@ -0,0 +1,64 @@
+# $NetBSD: Makefile.common,v 1.1.2.2 2002/08/25 21:20:29 jlam Exp $
+
+DISTNAME=		samba-${SAMBA_DIST_VERS}
+SAMBA_DIST_VERS=	2.2.5
+WRKSRC?=		${WRKDIR}/${DISTNAME}/source
+CATEGORIES?=		net
+MASTER_SITES=		ftp://ftp.samba.org/pub/samba/ \
+			ftp://ring.asahi-net.or.jp/pub/net/samba/ \
+			ftp://samba.anu.edu.au/pub/samba/ \
+			http://de.samba.org/samba/ftp/ \
+			ftp://ftp.sunet.se/pub/unix/utilities/samba/
+COUNTRY_MIRRORS=	au1 ca fi fr de it pl ru sg se us1 us6
+.for COUNTRY in ${COUNTRY_MIRRORS}
+MASTER_SITES+=		ftp://${COUNTRY}.samba.org/pub/samba/
+.endfor
+EXTRACT_SUFX=		.tar.bz2
+
+DISTINFO_FILE?=		${.CURDIR}/../../net/samba/distinfo
+PATCHDIR?=		${.CURDIR}/../../net/samba/patches
+
+GNU_CONFIGURE=		# defined
+USE_LIBTOOL=		# defined
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+
+.include "../../mk/bsd.prefs.mk"
+
+PKG_SYSCONFSUBDIR?=	samba
+
+VARDIR?=		/var
+SAMBA_ETCDIR?=		${PKG_SYSCONFDIR}
+SAMBA_DATADIR=		${PREFIX}/share
+SAMBA_LOCKDIR?=		${VARDIR}/db/samba
+SAMBA_LOGDIR?=		${VARDIR}/log
+SAMBA_PIDDIR?=		${VARDIR}/run
+SAMBA_PRIVATE?=		${SAMBA_ETCDIR}/private
+
+CONFIGURE_ARGS+=	--localstatedir=${VARDIR}
+CONFIGURE_ARGS+=	--sbindir=${PREFIX}/sbin
+CONFIGURE_ARGS+=	--with-configdir=${SAMBA_ETCDIR}
+CONFIGURE_ARGS+=	--with-codepagedir=${SAMBA_DATADIR}/samba/codepages
+CONFIGURE_ARGS+=	--with-datadir=${SAMBA_DATADIR}
+CONFIGURE_ARGS+=	--with-lockdir=${SAMBA_LOCKDIR}
+CONFIGURE_ARGS+=	--with-logfilebase=${SAMBA_LOGDIR}
+CONFIGURE_ARGS+=	--with-piddir=${SAMBA_PIDDIR}
+CONFIGURE_ARGS+=	--with-privatedir=${SAMBA_PRIVATE}
+CONFIGURE_ARGS+=	--with-swatdir=${SAMBA_DATADIR}/samba/swat
+
+CONFIGURE_ARGS+=	--without-readline
+CONFIGURE_ARGS+=	--without-ssl
+
+CONFIGURE_ENV+=		ac_cv_lib_curses_tgetent=no
+
+CONFIGURE_ARGS+=	--disable-cups
+CONFIGURE_ARGS+=	--without-pam
+CONFIGURE_ARGS+=	--without-winbind
+
+# The following are Linux-only options.
+CONFIGURE_ARGS+=	--without-smbwrapper
+CONFIGURE_ARGS+=	--without-smbmount
+
+FILES_SUBST=		SAMBA_PRIVATE=${SAMBA_PRIVATE}
+FILES_SUBST+=		SAMBA_LOCKDIR=${SAMBA_LOCKDIR}
+FILES_SUBST+=		SAMBA_LOGDIR=${SAMBA_LOGDIR}
+FILES_SUBST+=		SAMBA_ETCDIR=${SAMBA_ETCDIR}
diff --git a/net/samba/PLIST b/net/samba/PLIST
index 75b66be0efb..c9a759f7fae 100644
--- a/net/samba/PLIST
+++ b/net/samba/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6.2.1 2002/06/23 18:56:55 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6.2.2 2002/08/25 21:20:30 jlam Exp $
 bin/findsmb
 bin/make_printerdef
 bin/make_smbcodepage
@@ -442,18 +442,10 @@ share/samba/swat/using_samba/this_edition.html
 @dirrm share/examples/samba/LDAP/smbldap-tools/cgi
 @dirrm share/examples/samba/LDAP/smbldap-tools
 @dirrm share/examples/samba/LDAP
-@dirrm share/examples/samba/VFS/recycle
-@dirrm share/examples/samba/VFS/block
-@dirrm share/examples/samba/VFS
-@dirrm share/examples/samba/appliance
-@dirrm share/examples/samba/autofs
-@dirrm share/examples/samba/dce-dfs
-@dirrm share/examples/samba/libsmbclient
 @dirrm share/examples/samba/misc
 @dirrm share/examples/samba/printer-accounting
 @dirrm share/examples/samba/printing
 @dirrm share/examples/samba/simple
-@dirrm share/examples/samba/svr4-startup
 @dirrm share/examples/samba/thoralf
 @dirrm share/examples/samba/tridge
 @dirrm share/examples/samba/validchars
diff --git a/net/samba/distinfo b/net/samba/distinfo
index f51d0960e1c..217134c8f26 100644
--- a/net/samba/distinfo
+++ b/net/samba/distinfo
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.17.2.1 2002/06/23 18:56:56 jlam Exp $
+$NetBSD: distinfo,v 1.17.2.2 2002/08/25 21:20:31 jlam Exp $
 
 SHA1 (samba-2.2.5.tar.bz2) = 67e1025a8d01ba51b8cea6f04176fdbc57b7c012
 Size (samba-2.2.5.tar.bz2) = 4343641 bytes
+SHA1 (patch-aa) = 994befda25575f26829ea096d609dd204511d117
+SHA1 (patch-ab) = 777bd40add3c40b299e03fe9b26704ebffb528d4
 SHA1 (patch-ac) = a055bcc69e1a40124ada075ac836d1061ecfcd15
+SHA1 (patch-ad) = 38dc1cf2d2c322db32a1a3cbebf9dff59841fa4f
 SHA1 (patch-ag) = 256a7e1edb961985398a94c0b738fd96fe781f9c
 SHA1 (patch-ah) = e87f2e393db68acc7028fe20d4772455379ad7aa
 SHA1 (patch-aj) = e2c5f7580a8c701b6bf35d0d3004f714f2c810cb
diff --git a/net/samba/patches/patch-aa b/net/samba/patches/patch-aa
new file mode 100644
index 00000000000..39fcf563360
--- /dev/null
+++ b/net/samba/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.18.2.2 2002/08/25 21:20:32 jlam Exp $
+
+--- configure.in.orig	Sun Jul 28 18:13:04 2002
++++ configure.in
+@@ -1976,6 +1976,10 @@ AC_ARG_WITH(pam,
+ # we can't build a pam module if we don't have pam.
+ AC_CHECK_LIB(pam, pam_get_data, [AC_DEFINE(HAVE_LIBPAM)])
+ 
++dnl Checks for libraries.
++AC_CHECK_LIB(c, __libc_sched_setscheduler, PAM_NEEDS_LIBC=, PAM_NEEDS_LIBC=-lc)
++AC_SUBST(PAM_NEEDS_LIBC)
++
+ #################################################
+ # check for pam_smbpass support
+ AC_MSG_CHECKING(whether to use pam_smbpass)
diff --git a/net/samba/patches/patch-ab b/net/samba/patches/patch-ab
new file mode 100644
index 00000000000..3243b2a3c1e
--- /dev/null
+++ b/net/samba/patches/patch-ab
@@ -0,0 +1,62 @@
+$NetBSD: patch-ab,v 1.14.2.2 2002/08/25 21:20:33 jlam Exp $
+
+--- configure.orig	Sun Jul 28 18:13:04 2002
++++ configure
+@@ -11945,6 +11945,49 @@ else
+ fi
+ 
+ 
++echo $ac_n "checking for __libc_sched_setscheduler in -lc""... $ac_c" 1>&6
++echo "configure:11950: checking for __libc_sched_setscheduler in -lc" >&5
++ac_lib_var=`echo c'_'__libc_sched_setscheduler | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  ac_save_LIBS="$LIBS"
++LIBS="-lc  $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 11958 "configure"
++#include "confdefs.h"
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char __libc_sched_setscheduler();
++
++int main() {
++__libc_sched_setscheduler()
++; return 0; }
++EOF
++if { (eval echo configure:11969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  PAM_NEEDS_LIBC=
++else
++  echo "$ac_t""no" 1>&6
++PAM_NEEDS_LIBC=-lc
++fi
++
++
++
+ #################################################
+ # check for pam_smbpass support
+ echo $ac_n "checking whether to use pam_smbpass""... $ac_c" 1>&6
+@@ -13787,6 +13830,7 @@ s%@TERMLIBS@%$TERMLIBS%g
+ s%@TERMLDFLAGS@%$TERMLDFLAGS%g
+ s%@ROFF@%$ROFF%g
+ s%@DYNEXP@%$DYNEXP%g
++s%@PAM_NEEDS_LIBC@%$PAM_NEEDS_LIBC%g
+ s%@LDAPLIBS@%$LDAPLIBS%g
+ s%@QUOTAOBJS@%$QUOTAOBJS%g
+ s%@WINBIND_TARGETS@%$WINBIND_TARGETS%g
diff --git a/net/samba/patches/patch-ad b/net/samba/patches/patch-ad
new file mode 100644
index 00000000000..4d3207b916d
--- /dev/null
+++ b/net/samba/patches/patch-ad
@@ -0,0 +1,31 @@
+$NetBSD: patch-ad,v 1.9.2.2 2002/08/25 21:20:34 jlam Exp $
+
+--- Makefile.in.orig	Sun Jul 28 18:13:04 2002
++++ Makefile.in
+@@ -89,6 +89,8 @@ FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $
+ FLAGS  = $(ISA) $(FLAGS5) $(PASSWD_FLAGS)
+ FLAGS32  = $(ISA32) $(FLAGS5) $(PASSWD_FLAGS)
+ 
++PAM_NEEDS_LIBC = @PAM_NEEDS_LIBC@
++
+ WINBIND_PROGS = @WINBIND_TARGETS@
+ WINBIND_SPROGS = @WINBIND_STARGETS@
+ WINBIND_PAM_PROGS = @WINBIND_PAM_TARGETS@
+@@ -650,7 +652,7 @@ bin/libsmbclient.a: $(LIBSMBCLIENT_PICOB
+ 
+ bin/pam_smbpass.@SHLIBEXT@: $(PAM_SMBPASS_OBJ) bin/.dummy
+ 	@echo Linking shared library $@
+-	$(SHLD) @LDSHFLAGS@ -o $@ $(PAM_SMBPASS_OBJ) $(LDFLAGS) -lpam $(DYNEXP) $(LIBS) -lc \
++	$(SHLD) @LDSHFLAGS@ -o $@ $(PAM_SMBPASS_OBJ) $(LDFLAGS) -lpam $(DYNEXP) $(LIBS) $(PAM_NEEDS_LIBC) \
+ 		@SONAMEFLAG@`basename $@`
+ 
+ nsswitch/libnss_wins.so: $(NSS_OBJ)
+@@ -674,7 +676,7 @@ nsswitch/libnss_winbind.so: $(WINBIND_NS
+ 
+ nsswitch/pam_winbind.so: $(PAM_WINBIND_OBJ)
+ 	@echo Linking $@
+-	@$(SHLD) @LDSHFLAGS@ -o $@ $(PAM_WINBIND_OBJ) \
++	@$(SHLD) @LDSHFLAGS@ -o $@ $(PAM_WINBIND_OBJ) $(LDFLAGS) $(DYNEXP) $(PAM_NEEDS_LIBC) \
+ 		@SONAMEFLAG@`basename $@`
+ 
+ bin/wbinfo: $(WBINFO_OBJ) $(PARAM_OBJ) $(LIB_OBJ) $(NOPROTO_OBJ) \
diff --git a/net/samba20/Makefile b/net/samba20/Makefile
index a0d2f934f1e..b1cc174fd3d 100644
--- a/net/samba20/Makefile
+++ b/net/samba20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7.2.1 2002/07/01 17:45:03 jlam Exp $
+# $NetBSD: Makefile,v 1.7.2.2 2002/08/25 21:20:35 jlam Exp $
 
 DISTNAME=		samba-2.0.10
 WRKSRC=			${WRKDIR}/${DISTNAME}/source
@@ -11,8 +11,6 @@ MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://www.samba.org/
 COMMENT=		SMB/CIFS protocol server suite for UNIX
 
-#IGNORE=			"${PKGNAME} has been superseded samba>=2.2.3"
-
 BUILD_USES_MSGFMT=	# defined
 GNU_CONFIGURE=		# defined
 USE_BUILDLINK2=		# defined
diff --git a/net/vtun/Makefile b/net/vtun/Makefile
index 8177237b286..c6494188f17 100644
--- a/net/vtun/Makefile
+++ b/net/vtun/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.14.2.1 2002/07/01 17:45:04 jlam Exp $
+# $NetBSD: Makefile,v 1.14.2.2 2002/08/25 21:20:36 jlam Exp $
 
-DISTNAME=	vtun-2.4
+DISTNAME=	vtun-2.5
 CATEGORIES=	net
 MASTER_SITES=	http://vtun.sourceforge.net/
 
@@ -18,6 +18,7 @@ CONFIGURE_ARGS+=	--with-lzo-headers=${BUILDLINK_PREFIX.liblzo}/include
 CONFIGURE_ARGS+=	--with-lzo-lib=${BUILDLINK_PREFIX.liblzo}/lib
 ALL_TARGET=		vtund
 
+WRKSRC=			${WRKDIR}/vtun
 DOCDIR=			${PREFIX}/share/doc/vtun
 EGDIR=			${PREFIX}/share/examples/vtun
 LOCKDIR=		/var/run/vtund
diff --git a/net/vtun/distinfo b/net/vtun/distinfo
index 70d02fec2e9..08c3cced0dd 100644
--- a/net/vtun/distinfo
+++ b/net/vtun/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2001/12/21 21:04:23 jlam Exp $
+$NetBSD: distinfo,v 1.3.2.1 2002/08/25 21:20:37 jlam Exp $
 
-SHA1 (vtun-2.4.tar.gz) = 3ffbcc0864ca429ff37f39ffe30cb06e50144da7
-Size (vtun-2.4.tar.gz) = 82540 bytes
+SHA1 (vtun-2.5.tar.gz) = 6220497fc64b8b4d42e972e3b7855ec97cab1975
+Size (vtun-2.5.tar.gz) = 92510 bytes
 SHA1 (patch-aa) = b921a0b095848a49e79c81696324a6e67e8f07ba
 SHA1 (patch-ab) = e1891ef0c50ef79ee05967e06e110ce64891ab0a
diff --git a/net/wget/Makefile b/net/wget/Makefile
index e32e50e27a0..e2a2757d60f 100644
--- a/net/wget/Makefile
+++ b/net/wget/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45.2.1 2002/07/01 17:45:04 jlam Exp $
+# $NetBSD: Makefile,v 1.45.2.2 2002/08/25 21:20:37 jlam Exp $
 
 DISTNAME=	wget-1.7
 CATEGORIES=	net
@@ -12,7 +12,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/wget/wget.html
 COMMENT=	Retrieve files from the 'net via HTTP and FTP
 
-BUILD_DEPENDS+=	perl>=${PERL5_REQD}:../../lang/perl5
+USE_PERL5=	build
 
 BUILD_USES_MSGFMT=	YES
 USE_BUILDLINK2=		YES
diff --git a/net/zebra/Makefile b/net/zebra/Makefile
index 0cc1dfc5425..c3f79ecd344 100644
--- a/net/zebra/Makefile
+++ b/net/zebra/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.50.2.1 2002/07/01 17:45:05 jlam Exp $
+# $NetBSD: Makefile,v 1.50.2.2 2002/08/25 21:20:39 jlam Exp $
 # Based on KAME Id: Makefile,v 1.1.2.1.2.1.10.2 1999/01/05 11:03:50 itojun Exp
 #
 
-DISTNAME=	zebra-0.92a
+DISTNAME=	zebra-0.93a
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.zebra.org/pub/zebra/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
diff --git a/net/zebra/PLIST b/net/zebra/PLIST
index 820de18b3b8..2a588acf61a 100644
--- a/net/zebra/PLIST
+++ b/net/zebra/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:37 seb Exp $
+@comment $NetBSD: PLIST,v 1.2.2.1 2002/08/25 21:20:40 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
@@ -16,4 +16,8 @@ share/examples/zebra/bgpd.conf.sample2
 share/examples/zebra/ospfd.conf.sample
 share/examples/zebra/ripd.conf.sample
 share/examples/zebra/zebra.conf.sample
+info/zebra.info-1
+info/zebra.info-2
+info/zebra.info-3
+info/zebra.info-4
 @dirrm share/examples/zebra
diff --git a/net/zebra/distinfo b/net/zebra/distinfo
index d9c1d8d13e8..17057db3959 100644
--- a/net/zebra/distinfo
+++ b/net/zebra/distinfo
@@ -1,11 +1,24 @@
-$NetBSD: distinfo,v 1.6 2001/08/20 07:12:27 itojun Exp $
+$NetBSD: distinfo,v 1.6.2.1 2002/08/25 21:20:40 jlam Exp $
 
-SHA1 (zebra-0.92a.tar.gz) = 7dc3813dfe3c3a70f298cdbb0abefcb4663682d7
-Size (zebra-0.92a.tar.gz) = 1155814 bytes
-SHA1 (patch-aa) = ee8100984152dc69237b53977d63c506095cdfd2
-SHA1 (patch-ab) = 415ee0d3c18240165bfabc77d9fa6ff4c2e7ac34
-SHA1 (patch-ac) = 4bdc7ded7d39702529f774b8a809d33898c5559e
-SHA1 (patch-ad) = 7a9a1daa024b9efacefb3c469bc86dbbc36af47c
-SHA1 (patch-ae) = 0d255facaacd0521d9e5fe31698c1f7f5d4c7f61
-SHA1 (patch-af) = b3b879e8932196a8e3e9f6fe92815a817223aceb
+SHA1 (zebra-0.93a.tar.gz) = aa9d307a53adcd6e9b76003f230c4cd79eefba6b
+Size (zebra-0.93a.tar.gz) = 1335141 bytes
+SHA1 (patch-aa) = 689404752d3d793d9d2620303d6f3355f43e38cd
+SHA1 (patch-ab) = 6725c6034adaf5580186f46b7cd9e15c4de66db2
+SHA1 (patch-ac) = f6c10cd468cd89228202876de49981e664378cc7
+SHA1 (patch-ad) = fb20a6b64a9e07dd94bd62b01e4b2f17a437d840
+SHA1 (patch-ae) = bad18eda9b4ffd4cc22666b26573858e7de84a7d
+SHA1 (patch-af) = d045b85bfc8f8d5f6894e2333b0a799661997f90
 SHA1 (patch-ag) = 62b5e4f28c1d13cb1f9c772250529aefe0511f90
+SHA1 (patch-ba) = 77aa37644c355af17f8f5f446c8bbc3b00c434d1
+SHA1 (patch-bb) = 31fe77cfe767becd067d5fa68ae27c66d8fb0c48
+SHA1 (patch-bc) = 7c98d7a810fdb2a95ad64735fac23eac071287d4
+SHA1 (patch-bd) = 2ce066ee0398b84c7a32754a100cdd807d13b457
+SHA1 (patch-ca) = 01f8992150efee456c87beba885a9c3bd75efa39
+SHA1 (patch-cc) = 3b9293d8adda8bd8742a5c518410f8c535ae0086
+SHA1 (patch-cd) = ca436711d23564f0aa1580c16abd6e72e85f4232
+SHA1 (patch-ce) = 03e3ba47ed6a37114294740bad0e678d66e5f842
+SHA1 (patch-cf) = 32be0cc835e003a167ccd92677d9dd74d9012516
+SHA1 (patch-cg) = 4844502b4a52e87aea56b09342ec51a7f269b623
+SHA1 (patch-ch) = 2db3581898631bee6f81e5b736226d5c859670ef
+SHA1 (patch-ci) = dfd651863ca4d80b6f280ed338458adeca3796ce
+SHA1 (patch-cj) = 6ec1fba77f03ef649206a7c22494a56764e39950
diff --git a/net/zebra/patches/patch-aa b/net/zebra/patches/patch-aa
index edcdfc43e5f..fd8a93451b7 100644
--- a/net/zebra/patches/patch-aa
+++ b/net/zebra/patches/patch-aa
@@ -1,18 +1,13 @@
-$NetBSD: patch-aa,v 1.5 2000/08/24 01:25:38 kim Exp $
+$NetBSD: patch-aa,v 1.5.2.1 2002/08/25 21:20:41 jlam Exp $
 
---- bgpd/Makefile.am.orig	Thu Aug 17 04:27:58 2000
-+++ bgpd/Makefile.am	Wed Aug 23 16:19:15 2000
-@@ -4,6 +4,8 @@
- DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
- INSTALL_SDATA=@INSTALL@ -m 600
+--- bgpd/Makefile.am.orig	Wed Jun 19 04:05:04 2002
++++ bgpd/Makefile.am	Wed Jul 10 08:34:31 2002
+@@ -30,15 +30,17 @@
+ 
+ EXTRA_DIST = $(sysconf_DATA) BGP4-MIB.txt
  
 +sysconfdatadir=$(datadir)/examples/zebra
 +
- noinst_LIBRARIES = libbgp.a
- sbin_PROGRAMS = bgpd
- #noinst_PROGRAMS = bgp_btoa
-@@ -36,14 +38,14 @@
- 
  install-sysconfDATA: $(sysconf_DATA)
  	@$(NORMAL_INSTALL)
 -	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
@@ -30,4 +25,3 @@ $NetBSD: patch-aa,v 1.5 2000/08/24 01:25:38 kim Exp $
 +	    $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p; \
  	  fi; fi; \
  	done
- 
diff --git a/net/zebra/patches/patch-ab b/net/zebra/patches/patch-ab
index 28c972e950d..ee02c1f0ab9 100644
--- a/net/zebra/patches/patch-ab
+++ b/net/zebra/patches/patch-ab
@@ -1,18 +1,13 @@
-$NetBSD: patch-ab,v 1.3 2000/08/24 01:25:42 kim Exp $
+$NetBSD: patch-ab,v 1.3.2.1 2002/08/25 21:20:42 jlam Exp $
 
---- ospf6d/Makefile.am.orig	Thu Aug 17 04:27:37 2000
-+++ ospf6d/Makefile.am	Wed Aug 23 16:21:19 2000
-@@ -4,6 +4,8 @@
- DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
- INSTALL_SDATA=@INSTALL@ -m 600
+--- ospf6d/Makefile.am.orig	Sat Jun 29 15:20:39 2002
++++ ospf6d/Makefile.am	Wed Jul 10 08:34:31 2002
+@@ -34,15 +34,17 @@
+ 
+ EXTRA_DIST = $(sysconf_DATA)
  
 +sysconfdatadir=$(datadir)/examples/zebra
 +
- noinst_LIBRARIES = libospf6.a
- sbin_PROGRAMS = ospf6d
- 
-@@ -33,14 +35,14 @@
- 
  install-sysconfDATA: $(sysconf_DATA)
  	@$(NORMAL_INSTALL)
 -	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
@@ -30,4 +25,3 @@ $NetBSD: patch-ab,v 1.3 2000/08/24 01:25:42 kim Exp $
 +	    $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p; \
  	  fi; fi; \
  	done
- 
diff --git a/net/zebra/patches/patch-ac b/net/zebra/patches/patch-ac
index 05d0735c369..7c6ef54bf78 100644
--- a/net/zebra/patches/patch-ac
+++ b/net/zebra/patches/patch-ac
@@ -1,18 +1,13 @@
-$NetBSD: patch-ac,v 1.1 2000/08/24 01:25:44 kim Exp $
+$NetBSD: patch-ac,v 1.1.2.1 2002/08/25 21:20:43 jlam Exp $
 
---- ospfd/Makefile.am.orig	Thu Aug 17 04:27:22 2000
-+++ ospfd/Makefile.am	Wed Aug 23 16:22:52 2000
-@@ -4,6 +4,8 @@
- DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
- INSTALL_SDATA=@INSTALL@ -m 600
+--- ospfd/Makefile.am.orig	Wed Jun 19 04:06:08 2002
++++ ospfd/Makefile.am	Wed Jul 10 08:34:31 2002
+@@ -30,15 +30,17 @@
+ 
+ EXTRA_DIST = $(sysconf_DATA) OSPF-MIB.txt OSPF-TRAP-MIB.txt
  
 +sysconfdatadir=$(datadir)/examples/zebra
 +
- noinst_LIBRARIES = libospf.a
- sbin_PROGRAMS = ospfd
- 
-@@ -30,14 +32,14 @@
- 
  install-sysconfDATA: $(sysconf_DATA)
  	@$(NORMAL_INSTALL)
 -	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
@@ -30,4 +25,3 @@ $NetBSD: patch-ac,v 1.1 2000/08/24 01:25:44 kim Exp $
 +	    $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p; \
  	  fi; fi; \
  	done
- 
diff --git a/net/zebra/patches/patch-ad b/net/zebra/patches/patch-ad
index e70ec8d7424..d05d18d0d3c 100644
--- a/net/zebra/patches/patch-ad
+++ b/net/zebra/patches/patch-ad
@@ -1,18 +1,13 @@
-$NetBSD: patch-ad,v 1.1 2000/08/24 01:25:45 kim Exp $
+$NetBSD: patch-ad,v 1.1.2.1 2002/08/25 21:20:43 jlam Exp $
 
---- ripd/Makefile.am.orig	Thu Aug 17 04:26:57 2000
-+++ ripd/Makefile.am	Wed Aug 23 16:23:48 2000
-@@ -4,6 +4,8 @@
- DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
- INSTALL_SDATA=@INSTALL@ -m 600
+--- ripd/Makefile.am.orig	Wed Jun 19 04:06:18 2002
++++ ripd/Makefile.am	Wed Jul 10 08:34:31 2002
+@@ -23,15 +23,17 @@
+ 
+ EXTRA_DIST = $(sysconf_DATA) RIPv2-MIB.txt
  
 +sysconfdatadir=$(datadir)/examples/zebra
 +
- noinst_LIBRARIES = librip.a
- sbin_PROGRAMS = ripd
- 
-@@ -25,14 +27,14 @@
- 
  install-sysconfDATA: $(sysconf_DATA)
  	@$(NORMAL_INSTALL)
 -	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
@@ -30,4 +25,3 @@ $NetBSD: patch-ad,v 1.1 2000/08/24 01:25:45 kim Exp $
 +	    $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p; \
  	  fi; fi; \
  	done
- 
diff --git a/net/zebra/patches/patch-ae b/net/zebra/patches/patch-ae
index fef09c4fde5..ffb5066133e 100644
--- a/net/zebra/patches/patch-ae
+++ b/net/zebra/patches/patch-ae
@@ -1,18 +1,13 @@
-$NetBSD: patch-ae,v 1.1 2000/08/24 01:25:46 kim Exp $
+$NetBSD: patch-ae,v 1.1.2.1 2002/08/25 21:20:44 jlam Exp $
 
---- ripngd/Makefile.am.orig	Thu Aug 17 04:27:11 2000
-+++ ripngd/Makefile.am	Wed Aug 23 16:24:39 2000
-@@ -4,6 +4,8 @@
- DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
- INSTALL_SDATA=@INSTALL@ -m 600
+--- ripngd/Makefile.am.orig	Wed Jun 19 04:06:33 2002
++++ ripngd/Makefile.am	Wed Jul 10 08:34:31 2002
+@@ -23,15 +23,17 @@
+ 
+ EXTRA_DIST = $(sysconf_DATA)
  
 +sysconfdatadir=$(datadir)/examples/zebra
 +
- noinst_LIBRARIES = libripng.a
- sbin_PROGRAMS = ripngd
- 
-@@ -25,14 +27,14 @@
- 
  install-sysconfDATA: $(sysconf_DATA)
  	@$(NORMAL_INSTALL)
 -	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
@@ -30,4 +25,3 @@ $NetBSD: patch-ae,v 1.1 2000/08/24 01:25:46 kim Exp $
 +	    $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p; \
  	  fi; fi; \
  	done
- 
diff --git a/net/zebra/patches/patch-af b/net/zebra/patches/patch-af
index 8db65252a52..750e463f5c4 100644
--- a/net/zebra/patches/patch-af
+++ b/net/zebra/patches/patch-af
@@ -1,18 +1,13 @@
-$NetBSD: patch-af,v 1.2 2001/01/11 05:34:16 itojun Exp $
+$NetBSD: patch-af,v 1.2.2.1 2002/08/25 21:20:45 jlam Exp $
 
---- zebra/Makefile.am.orig	Wed Jan 10 10:11:11 2001
-+++ zebra/Makefile.am	Thu Jan 11 13:57:23 2001
-@@ -4,6 +4,8 @@
- DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" -DMULTIPATH_NUM=@MULTIPATH_NUM@
- INSTALL_SDATA=@INSTALL@ -m 600
+--- zebra/Makefile.am.orig	Wed Jun 19 08:17:32 2002
++++ zebra/Makefile.am	Wed Jul 10 08:34:31 2002
+@@ -43,15 +43,17 @@
+ #client : client_main.o ../lib/libzebra.a
+ #	$(CC) -g -o client client_main.o ../lib/libzebra.a $(LIBS) $(LIB_IPV6)
  
 +sysconfdatadir=$(datadir)/examples/zebra
 +
- LIB_IPV6 = @LIB_IPV6@
- 
- ipforward = @IPFORWARD@
-@@ -50,14 +52,14 @@
- 
  install-sysconfDATA: $(sysconf_DATA)
  	@$(NORMAL_INSTALL)
 -	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
@@ -30,4 +25,3 @@ $NetBSD: patch-af,v 1.2 2001/01/11 05:34:16 itojun Exp $
 +	    $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p; \
  	  fi; fi; \
  	done
- 
diff --git a/net/zebra/patches/patch-ba b/net/zebra/patches/patch-ba
new file mode 100644
index 00000000000..36c96b6a9fc
--- /dev/null
+++ b/net/zebra/patches/patch-ba
@@ -0,0 +1,11 @@
+$NetBSD: patch-ba,v 1.1.2.2 2002/08/25 21:20:46 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
++++ /home/itojun/work/zebra/zebra/bgpd/bgp_fsm.c	Sat Aug  3 21:05:48 2002
+@@ -348,2 +348,5 @@
+ 
++  /* Send capability.  */
++  SET_FLAG (peer->sflags, PEER_STATUS_CAPABILITY_OPEN);
++
+   /* Delete all existing events of the peer. */
diff --git a/net/zebra/patches/patch-bb b/net/zebra/patches/patch-bb
new file mode 100644
index 00000000000..dcfc0267509
--- /dev/null
+++ b/net/zebra/patches/patch-bb
@@ -0,0 +1,13 @@
+$NetBSD: patch-bb,v 1.1.2.2 2002/08/25 21:20:47 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
++++ /home/itojun/work/zebra/zebra/bgpd/bgp_open.c	Sat Aug  3 21:05:48 2002
+@@ -670,7 +670,2 @@
+ 
+-  /* Do not send capability. */
+-  if (! CHECK_FLAG (peer->sflags, PEER_STATUS_CAPABILITY_OPEN) 
+-      || CHECK_FLAG (peer->flags, PEER_FLAG_DONT_CAPABILITY))
+-    return;
+-    
+   /* When the peer is IPv4 unicast only, do not send capability. */
diff --git a/net/zebra/patches/patch-bc b/net/zebra/patches/patch-bc
new file mode 100644
index 00000000000..a73b82ffda1
--- /dev/null
+++ b/net/zebra/patches/patch-bc
@@ -0,0 +1,12 @@
+$NetBSD: patch-bc,v 1.1.2.2 2002/08/25 21:20:48 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
++++ /home/itojun/work/zebra/zebra/bgpd/bgp_packet.c	Sat Aug  3 21:05:49 2002
+@@ -758,3 +758,5 @@
+   /* Set capability code. */
+-  bgp_open_capability (s, peer);
++  if (CHECK_FLAG (peer->sflags, PEER_STATUS_CAPABILITY_OPEN) &&
++      ! CHECK_FLAG (peer->flags, PEER_FLAG_DONT_CAPABILITY))
++    bgp_open_capability (s, peer);
+ 
diff --git a/net/zebra/patches/patch-bd b/net/zebra/patches/patch-bd
new file mode 100644
index 00000000000..12094a627be
--- /dev/null
+++ b/net/zebra/patches/patch-bd
@@ -0,0 +1,49 @@
+$NetBSD: patch-bd,v 1.1.2.2 2002/08/25 21:20:49 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
++++ /home/itojun/work/zebra/zebra/bgpd/bgp_vty.c	Sat Aug  3 21:05:54 2002
+@@ -98,8 +98,2 @@
+ 
+-  if (peer_address_self_check (&su))
+-    {
+-      vty_out (vty, "%% Cannot configure the local system as neighbor%s", VTY_NEWLINE);
+-      return NULL;
+-    }
+-
+   peer = peer_lookup (bgp, &su);
+@@ -128,8 +122,2 @@
+     {
+-      if (peer_address_self_check (&su))
+-	{
+-	  vty_out (vty, "%% Cannot configure the local system as neighbor%s", VTY_NEWLINE);
+-	  return NULL;
+-	}
+-
+       peer = peer_lookup (bgp, &su);
+@@ -1123,3 +1111,4 @@
+     {
+-      vty_out (vty, "%% Cannot configure the local system as neighbor%s", VTY_NEWLINE);
++      vty_out (vty, "%% Can not configure the local system as neighbor%s",
++	       VTY_NEWLINE);
+       return CMD_WARNING;
+@@ -1200,9 +1189,2 @@
+     {
+-      if (peer_address_self_check (&su))
+-	{
+-	  vty_out (vty, "%% Cannot configure the local system as neighbor%s",
+-		   VTY_NEWLINE);
+-	  return CMD_WARNING;
+-	}
+-
+       peer = peer_lookup (vty->index, &su);
+@@ -1410,2 +1392,9 @@
+       vty_out (vty, "%% Configure the peer-group first%s", VTY_NEWLINE);
++      return CMD_WARNING;
++    }
++
++  if (peer_address_self_check (&su))
++    {
++      vty_out (vty, "%% Can not configure the local system as neighbor%s",
++	       VTY_NEWLINE);
+       return CMD_WARNING;
diff --git a/net/zebra/patches/patch-ca b/net/zebra/patches/patch-ca
new file mode 100644
index 00000000000..93a4ed0ff6c
--- /dev/null
+++ b/net/zebra/patches/patch-ca
@@ -0,0 +1,22 @@
+$NetBSD: patch-ca,v 1.1.2.2 2002/08/25 21:20:49 jlam Exp $
+
+diff -u1 ospf6d/ChangeLog /home/itojun/work/zebra/zebra/ospf6d/ChangeLog
+--- ospf6d/ChangeLog	Mon Jul  8 22:31:02 2002
++++ /home/itojun/work/zebra/zebra/ospf6d/ChangeLog	Sat Aug  3 21:06:01 2002
+@@ -1 +1,16 @@
++2002-07-14  Yasuhiro Ohara  <yasu@sfc.wide.ad.jp>
++
++	* ospf6_dbex.c: bug that ospf6d fails to refresh self-originated
++	LSA if he have not the LSA before has been fixed.
++	* ospf6_asbr.c: bug of failing removing ASE LSA when remove
++	message arrived from zebra has been fixed.
++	* version: 0.9.6k
++
++2002-07-13  Yasuhiro Ohara  <yasu@sfc.wide.ad.jp>
++
++	* ospf6_zebra.c: bug reported [zebra 14642] fixed.
++	The bug was related to the synchronization between zebra
++	and ospf6d. Now synchronization will be correctly done.
++	* version: 0.9.6j
++
+ 2002-07-07  Yasuhiro Ohara  <yasu@sfc.wide.ad.jp>
diff --git a/net/zebra/patches/patch-cc b/net/zebra/patches/patch-cc
new file mode 100644
index 00000000000..f0b3577a829
--- /dev/null
+++ b/net/zebra/patches/patch-cc
@@ -0,0 +1,30 @@
+$NetBSD: patch-cc,v 1.1.2.2 2002/08/25 21:20:50 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
++++ /home/itojun/work/zebra/zebra/ospf6d/ospf6_area.c	Sat Aug  3 21:06:04 2002
+@@ -102,24 +102,2 @@
+ void
+-ospf6_area_intra_topo_add (struct ospf6_route_req *topo_entry)
+-{
+-  if (topo_entry->route.type == OSPF6_DEST_TYPE_ROUTER)
+-    {
+-      if (CHECK_FLAG (topo_entry->path.router_bits, OSPF6_ROUTER_LSA_BIT_B))
+-        ospf6_abr_abr_entry_add (topo_entry);
+-    }
+-  CALL_ADD_HOOK (&intra_topology_hook, topo_entry);
+-}
+-
+-void
+-ospf6_area_intra_topo_remove (struct ospf6_route_req *topo_entry)
+-{
+-  if (topo_entry->route.type == OSPF6_DEST_TYPE_ROUTER)
+-    {
+-      if (CHECK_FLAG (topo_entry->path.router_bits, OSPF6_ROUTER_LSA_BIT_E))
+-        ospf6_abr_abr_entry_add (topo_entry);
+-    }
+-  CALL_REMOVE_HOOK (&intra_topology_hook, topo_entry);
+-}
+-
+-void
+ ospf6_area_route_add (void *data)
diff --git a/net/zebra/patches/patch-cd b/net/zebra/patches/patch-cd
new file mode 100644
index 00000000000..af17a16c3cd
--- /dev/null
+++ b/net/zebra/patches/patch-cd
@@ -0,0 +1,16 @@
+$NetBSD: patch-cd,v 1.1.2.2 2002/08/25 21:20:51 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
++++ /home/itojun/work/zebra/zebra/ospf6d/ospf6_asbr.c	Sat Aug  3 21:06:04 2002
+@@ -119,3 +119,3 @@
+   lsa = ospf6_lsdb_lookup_lsdb (htons (OSPF6_LSA_TYPE_AS_EXTERNAL),
+-                                htonl (route->path.origin.id),
++                                route->path.origin.id,
+                                 ospf6->router_id, ospf6->lsdb);
+@@ -419,2 +419,5 @@
+   assert (ospf6);
++
++  if (IS_OSPF6_DUMP_ASBR)
++    zlog_info ("ASBR: refresh %s", lsa->str);
+ 
diff --git a/net/zebra/patches/patch-ce b/net/zebra/patches/patch-ce
new file mode 100644
index 00000000000..656df89df7c
--- /dev/null
+++ b/net/zebra/patches/patch-ce
@@ -0,0 +1,10 @@
+$NetBSD: patch-ce,v 1.1.2.2 2002/08/25 21:20:52 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
++++ /home/itojun/work/zebra/zebra/ospf6d/ospf6_dbex.c	Sat Aug  3 21:06:05 2002
+@@ -363,3 +363,3 @@
+       if (received->lsa_hdr->lsh_advrtr == ospf6->router_id
+-          && have && ismore_recent < 0)
++          && (! have || ismore_recent < 0))
+         {
diff --git a/net/zebra/patches/patch-cf b/net/zebra/patches/patch-cf
new file mode 100644
index 00000000000..eeaf70554ba
--- /dev/null
+++ b/net/zebra/patches/patch-cf
@@ -0,0 +1,25 @@
+$NetBSD: patch-cf,v 1.1.2.2 2002/08/25 21:20:53 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
++++ /home/itojun/work/zebra/zebra/ospf6d/ospf6_intra.c	Sat Jul 13 01:03:44 2002
+@@ -39,2 +39,12 @@
+ 
++  if (IS_OSPF6_DUMP_INTRA)
++    {
++      char buf[64];
++      struct prefix_ls *p_ls;
++      p_ls = (struct prefix_ls *) &topo_entry->route.prefix;
++      inet_ntop (AF_INET, &p_ls->adv_router, buf, sizeof (buf));
++      zlog_info ("INTRA: Calculate [%s] %s and %s",
++                 (type == ADD ? "add" : "remove"), lsa->str, buf);
++    }
++
+   intra_prefix = OSPF6_LSA_HEADER_END (lsa->header);
+@@ -200,6 +210,2 @@
+     {
+-      if (IS_OSPF6_DUMP_INTRA)
+-        zlog_info ("INTRA: topology hook: Examining %s (%p)",
+-                   node.lsa->str, node.lsa);
+-
+       if (IS_LSA_MAXAGE (node.lsa))
diff --git a/net/zebra/patches/patch-cg b/net/zebra/patches/patch-cg
new file mode 100644
index 00000000000..8c4a1ab083c
--- /dev/null
+++ b/net/zebra/patches/patch-cg
@@ -0,0 +1,23 @@
+$NetBSD: patch-cg,v 1.1.2.2 2002/08/25 21:20:54 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
++++ /home/itojun/work/zebra/zebra/ospf6d/ospf6_lsa.c	Sat Aug  3 21:06:08 2002
+@@ -777,2 +777,3 @@
+   struct ospf6_lsdb *lsdb = NULL;
++  void (*hook) (struct ospf6_lsa *, struct ospf6_lsa *);
+ 
+@@ -806,8 +807,7 @@
+ 
+-#if 0
+-      if (lsdb->hook)
+-        (*lsdb->hook) (lsa, NULL);
+-#else /*0*/
+-      CALL_REMOVE_HOOK (&database_hook, lsa);
+-#endif /*0*/
++      /* call LSDB hook to re-process LSA */
++      hook = ospf6_lsdb_hook[ntohs (lsa->header->type) &
++                             OSPF6_LSTYPE_CODE_MASK].hook;
++      if (hook)
++        (*hook) (NULL, lsa);
+ 
diff --git a/net/zebra/patches/patch-ch b/net/zebra/patches/patch-ch
new file mode 100644
index 00000000000..cb30bd04d60
--- /dev/null
+++ b/net/zebra/patches/patch-ch
@@ -0,0 +1,37 @@
+$NetBSD: patch-ch,v 1.1.2.2 2002/08/25 21:20:56 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
++++ /home/itojun/work/zebra/zebra/ospf6d/ospf6_route.c	Sat Aug  3 21:06:12 2002
+@@ -1015,2 +1015,6 @@
+ 
++  u_int route_count = 0;
++  u_int path_count = 0;
++  u_int route_redundant = 0;
++
+   memset (&prefix, 0, sizeof (struct prefix));
+@@ -1103,3 +1107,5 @@
+     {
+-      if (! node->info)
++      struct ospf6_route_node *route = node->info;
++
++      if (! route)
+         continue;
+@@ -1107,6 +1113,15 @@
+       if (detail)
+-        ospf6_route_show_detail (vty, node->info);
++        ospf6_route_show_detail (vty, route);
+       else
+-        ospf6_route_show (vty, node->info);
++        ospf6_route_show (vty, route);
++
++      route_count++;
++      path_count += route->path_list->count;
++      if (route->path_list->count > 1)
++        route_redundant++;
+     }
++
++  vty_out (vty, "===========%s", VTY_NEWLINE);
++  vty_out (vty, "Route: %d Path: %d Redundant: %d%s",
++           route_count, path_count, route_redundant, VTY_NEWLINE);
+ 
diff --git a/net/zebra/patches/patch-ci b/net/zebra/patches/patch-ci
new file mode 100644
index 00000000000..075614c8323
--- /dev/null
+++ b/net/zebra/patches/patch-ci
@@ -0,0 +1,33 @@
+$NetBSD: patch-ci,v 1.1.2.2 2002/08/25 21:20:57 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
++++ /home/itojun/work/zebra/zebra/ospf6d/ospf6_zebra.c	Sat Aug  3 21:06:15 2002
+@@ -435,6 +435,9 @@
+ 
+-  if (type == REMOVE && nexthop_list->count == 0)
++  if (type == REMOVE && nexthop_list->count != 0)
++    type = ADD;
++  else if (type == REMOVE && nexthop_list->count == 0)
+     {
+-      if (! ospf6_route_end (&route))
+-        ospf6_route_next (&route);
++      if (IS_OSPF6_DUMP_ZEBRA)
++        zlog_info ("ZEBRA:   all nexthop with the selected path has gone");
++
+       if (! memcmp (&request->route, &route.route,
+@@ -446,3 +449,3 @@
+           if (IS_OSPF6_DUMP_ZEBRA)
+-            zlog_info ("ZEBRA:   find alternative path to add");
++            zlog_info ("ZEBRA:   found alternative path to add");
+ 
+@@ -478,2 +481,9 @@
+             zlog_info ("ZEBRA:   can't find alternative path, remove");
++
++          if (IS_OSPF6_DUMP_ZEBRA)
++            {
++              zlog_info ("ZEBRA:   Debug: walk over the route ?");
++              ospf6_route_log_request ("Debug route", "***", &route);
++              ospf6_route_log_request ("Debug request", "***", request);
++            }
+ 
diff --git a/net/zebra/patches/patch-cj b/net/zebra/patches/patch-cj
new file mode 100644
index 00000000000..74a9b6504e9
--- /dev/null
+++ b/net/zebra/patches/patch-cj
@@ -0,0 +1,10 @@
+$NetBSD: patch-cj,v 1.1.2.2 2002/08/25 21:20:59 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
++++ /home/itojun/work/zebra/zebra/ospf6d/ospf6d.h	Sat Aug  3 21:06:15 2002
+@@ -76,3 +76,3 @@
+ 
+-#define OSPF6_DAEMON_VERSION    "0.9.6i"
++#define OSPF6_DAEMON_VERSION    "0.9.6k"
+