6 files changed, 49 insertions, 30 deletions
diff --git a/devel/cvsd/Makefile b/devel/cvsd/Makefile
index f14511acb5f..a7fa28824b0 100644
--- a/devel/cvsd/Makefile
+++ b/devel/cvsd/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/05/20 23:38:16 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2006/05/30 19:24:27 wiz Exp $
 
-DISTNAME=		cvsd-1.0.10
+DISTNAME=		cvsd-1.0.11
 CATEGORIES=		devel
 MASTER_SITES=		http://ch.tudelft.nl/~arthur/cvsd/
 
diff --git a/devel/cvsd/distinfo b/devel/cvsd/distinfo
index 9414267472a..fa74d600580 100644
--- a/devel/cvsd/distinfo
+++ b/devel/cvsd/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/20 23:38:16 wiz Exp $
+$NetBSD: distinfo,v 1.2 2006/05/30 19:24:27 wiz Exp $
 
-SHA1 (cvsd-1.0.10.tar.gz) = f615a8830bb2a4f415b3267dc628b64561b53d9f
-RMD160 (cvsd-1.0.10.tar.gz) = 9a7129d9fa9b200bfeb8c54abeaae5e9c563cbcc
-Size (cvsd-1.0.10.tar.gz) = 206048 bytes
-SHA1 (patch-aa) = adfcecc2412aa30828c5b5cec1b0763bca599abb
-SHA1 (patch-ab) = f24f3ceac0c5e5d156c3ffc094b679d165e45e21
-SHA1 (patch-ac) = 02f4caa955d88eeadef14a05dd6e4ec19b9ee4b9
-SHA1 (patch-ad) = 2da407e6037ee3cd187b48d8ee668df281ae6907
+SHA1 (cvsd-1.0.11.tar.gz) = 1ebaa2e434249ff98669f09fed9737aaad78ceef
+RMD160 (cvsd-1.0.11.tar.gz) = b73b9c1dd58ec48146102b36385a4914da5f55c1
+Size (cvsd-1.0.11.tar.gz) = 209974 bytes
+SHA1 (patch-aa) = 8cef69eb184abdbea08314243c124ef0715bb275
+SHA1 (patch-ab) = 5a6c8046234edff271d521912eadf8bc8ebd294e
+SHA1 (patch-ac) = 3caa574e077d4650a603c8c5d59770b342628fc9
+SHA1 (patch-ad) = 6a60053187293687214d3565c5a6e1d373e5862f
diff --git a/devel/cvsd/patches/patch-aa b/devel/cvsd/patches/patch-aa
index 4db1fa600f4..0303d035c9b 100644
--- a/devel/cvsd/patches/patch-aa
+++ b/devel/cvsd/patches/patch-aa
@@ -1,9 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/05/20 23:38:16 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2006/05/30 19:24:27 wiz Exp $
 
---- configure.ac.orig	2004-08-07 23:11:01.000000000 +0300
-+++ configure.ac	2004-09-13 14:25:08.000000000 +0300
-@@ -274,3 +274,3 @@
+--- configure.ac.orig	2006-05-24 20:25:24.000000000 +0000
++++ configure.ac
+@@ -273,7 +273,7 @@ fi
+ 
+ # where to find the configuration file
  # TODO: this should probably be fixed to be nicer
 -CONFIGFILE=`eval echo $sysconfdir/cvsd/cvsd.conf | \
 +CONFIGFILE=`eval echo $sysconfdir/cvsd.conf | \
              sed "s%^NONE/%${prefix}/%" | \
+             sed "s%^NONE/%${ac_default_prefix}/%"`
+ AC_SUBST(CONFIGFILE)
diff --git a/devel/cvsd/patches/patch-ab b/devel/cvsd/patches/patch-ab
index d48517aa950..aa2901d36c7 100644
--- a/devel/cvsd/patches/patch-ab
+++ b/devel/cvsd/patches/patch-ab
@@ -1,9 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/05/20 23:38:16 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2006/05/30 19:24:27 wiz Exp $
 
---- configure.orig	2004-08-07 23:11:20.000000000 +0300
-+++ configure	2004-09-13 14:25:34.000000000 +0300
-@@ -9983,3 +9983,3 @@
+--- configure.orig	2006-05-24 20:25:24.000000000 +0000
++++ configure
+@@ -10610,7 +10610,7 @@ fi
+ 
+ # where to find the configuration file
  # TODO: this should probably be fixed to be nicer
 -CONFIGFILE=`eval echo $sysconfdir/cvsd/cvsd.conf | \
 +CONFIGFILE=`eval echo $sysconfdir/cvsd.conf | \
              sed "s%^NONE/%${prefix}/%" | \
+             sed "s%^NONE/%${ac_default_prefix}/%"`
+ 
diff --git a/devel/cvsd/patches/patch-ac b/devel/cvsd/patches/patch-ac
index f96c70f639a..fdec087373f 100644
--- a/devel/cvsd/patches/patch-ac
+++ b/devel/cvsd/patches/patch-ac
@@ -1,17 +1,17 @@
-$NetBSD: patch-ac,v 1.1.1.1 2006/05/20 23:38:16 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2006/05/30 19:24:27 wiz Exp $
 
---- Makefile.in.orig	2005-07-24 09:19:45.000000000 -0500
+--- Makefile.in.orig	2006-05-24 20:25:24.000000000 +0000
 +++ Makefile.in
-@@ -184,6 +184,8 @@ libdir = @libdir@
- libexecdir = @libexecdir@
+@@ -189,6 +189,8 @@ libexecdir = @libexecdir@
+ localedir = @localedir@
  localstatedir = @localstatedir@
  mandir = @mandir@
 +exampledir = $(prefix)/share/examples/@PACKAGE@
 +docdir = $(prefix)/share/doc/@PACKAGE@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
- prefix = @prefix@
-@@ -763,17 +765,19 @@ uninstall-man: uninstall-man5 uninstall-
+ pdfdir = @pdfdir@
+@@ -772,17 +774,19 @@ uninstall-man: uninstall-man5 uninstall-
  
  
  #  install configuration files
diff --git a/devel/cvsd/patches/patch-ad b/devel/cvsd/patches/patch-ad
index 0dcf2d0673e..b07f6442ef5 100644
--- a/devel/cvsd/patches/patch-ad
+++ b/devel/cvsd/patches/patch-ad
@@ -1,21 +1,32 @@
-$NetBSD: patch-ad,v 1.1.1.1 2006/05/20 23:38:16 wiz Exp $
+$NetBSD: patch-ad,v 1.2 2006/05/30 19:24:27 wiz Exp $
 
---- cvsd-buildroot.in.orig	2004-07-29 22:53:14.000000000 +0300
-+++ cvsd-buildroot.in	2004-09-13 14:26:18.000000000 +0300
-@@ -51,2 +51,4 @@
+--- 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:
-@@ -294,3 +296,3 @@
+ 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 ]
-@@ -301,3 +303,5 @@
+ 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
+