$NetBSD: patch-ad,v 1.2 2006/05/30 19:24:27 wiz Exp $

--- cvsd-buildroot.in.orig	2006-05-24 20:25:24.000000000 +0000
+++ cvsd-buildroot.in
@@ -58,6 +58,8 @@ EXTRALIBS="$EXTRALIBS ld-elf.so"
 EXTRALIBS="$EXTRALIBS libnss_compat.so.2 libnss_files.so.2"
 # for OpenBSD:
 EXTRALIBS="$EXTRALIBS /usr/libexec/ld.so"
+# for NetBSD
+EXTRALIBS="$EXTRALIBS /usr/libexec/ld.elf_so /libexec/ld.elf_so"
 # for Solaris:
 EXTRALIBS="$EXTRALIBS /usr/lib/ld.so.1 nss_files.so.1"
 
@@ -341,14 +343,16 @@ then
   fi
 fi
 
-# for systems with strange password files (OpenBSD)
+# for systems with strange password files (OpenBSD/NetBSD/FreeBSD)
 if [ -r /etc/master.passwd ] && [ -r /etc/pwd.db ] && [ -x /usr/sbin/pwd_mkdb ]
 then
   echo $ECHO_N "making $ROOT/etc/pwd.db...$ECHO_C"
   # convert /etc/passwd to /etc/master.passwd
   sed 's|\([^:]*\):\([^:]*\):\([^:]*\):\([^:]*\):\([^:]*\):\([^:]*\):\([^:]*\)|\1:\2:\3:\4::0:0:\5:\6:\7|' \
     < "$ROOT/etc/passwd" > "$ROOT/etc/master.passwd"
-  /usr/sbin/pwd_mkdb -p -d "$ROOT/etc" "$ROOT/etc/master.passwd"
+  # NetBSD expects -d to be the new root directory.
+  /usr/sbin/pwd_mkdb -p -d "$ROOT/etc" "$ROOT/etc/master.passwd" 2>/dev/null|| \
+  /usr/sbin/pwd_mkdb -p -d "$ROOT" "$ROOT/etc/master.passwd" 2>/dev/null
   echo "done."
 fi
 
