diff --git a/sysutils/radmind/Makefile b/sysutils/radmind/Makefile
index 7cc8e9914de..850c5d905b8 100644
--- a/sysutils/radmind/Makefile
+++ b/sysutils/radmind/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.10 2007/09/09 20:02:09 jasper Exp $
+# $OpenBSD: Makefile,v 1.11 2008/11/10 09:19:25 jasper Exp $
 
 COMMENT=	remote administration software
 
-DISTNAME=      	radmind-1.10.0
+DISTNAME=      	radmind-1.13.0
 CATEGORIES=	sysutils
 
 HOMEPAGE=	http://rsug.itd.umich.edu/software/radmind/
diff --git a/sysutils/radmind/distinfo b/sysutils/radmind/distinfo
index 92808524dde..239db58e1d4 100644
--- a/sysutils/radmind/distinfo
+++ b/sysutils/radmind/distinfo
@@ -1,5 +1,5 @@
-MD5 (radmind-1.10.0.tar.gz) = rejdLi72jynxBWEeeTvTkw==
-RMD160 (radmind-1.10.0.tar.gz) = pg561z99/xn2eujgjn6HsIqXjEE=
-SHA1 (radmind-1.10.0.tar.gz) = AsPRo4Io4tTsTh4ouYkggTWLzs0=
-SHA256 (radmind-1.10.0.tar.gz) = tKeSmykvQD1U8UPkeDXp2Z7y44ND4n9/cWkXLx69tiA=
-SIZE (radmind-1.10.0.tar.gz) = 397065
+MD5 (radmind-1.13.0.tar.gz) = Kc4AcLcHpH/g3lBa59aARw==
+RMD160 (radmind-1.13.0.tar.gz) = K4LcOYawnJgFOwzuJ/3X73WsmTY=
+SHA1 (radmind-1.13.0.tar.gz) = c62uR3FCKygsoESu9QAohJUe0IE=
+SHA256 (radmind-1.13.0.tar.gz) = nSN4fYtIKtfOpZCpcMQN4ufuwfWdBbVC3385lnmZG38=
+SIZE (radmind-1.13.0.tar.gz) = 447650
diff --git a/sysutils/radmind/patches/patch-Makefile_in b/sysutils/radmind/patches/patch-Makefile_in
index 3c1418f85f4..7222bc0eb00 100644
--- a/sysutils/radmind/patches/patch-Makefile_in
+++ b/sysutils/radmind/patches/patch-Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-Makefile_in,v 1.6 2007/09/09 20:02:09 jasper Exp $
---- Makefile.in.orig	Tue Jul 31 16:08:16 2007
-+++ Makefile.in	Sun Sep  9 21:59:52 2007
-@@ -11,6 +11,7 @@ exec_prefix=@exec_prefix@
+$OpenBSD: patch-Makefile_in,v 1.7 2008/11/10 09:19:25 jasper Exp $
+--- Makefile.in.orig	Fri Nov  7 23:30:12 2008
++++ Makefile.in	Fri Nov  7 23:32:16 2008
+@@ -13,6 +13,7 @@ datadir=@datadir@
  MANDIR=@mandir@
  BINDIR=@bindir@
  SBINDIR=@sbindir@
@@ -9,7 +9,7 @@ $OpenBSD: patch-Makefile_in,v 1.6 2007/09/09 20:02:09 jasper Exp $
  
  # For server
  RADMINDDIR=@radminddir@
-@@ -89,7 +90,7 @@ TWHICH_OBJ=     version.o twhich.o argcargv.o transcri
+@@ -95,7 +96,7 @@ TWHICH_OBJ=     version.o twhich.o argcargv.o transcri
  
  LSORT_OBJ=     version.o lsort.o pathcmp.o code.o argcargv.o
  
@@ -18,7 +18,7 @@ $OpenBSD: patch-Makefile_in,v 1.6 2007/09/09 20:02:09 jasper Exp $
  
  version.o : version.c
  	${CC} ${CFLAGS} \
-@@ -255,6 +256,7 @@ rash : FRC
+@@ -270,6 +271,7 @@ rash : FRC
  	    -e 's@_RADMIND_COMMANDFILE@${COMMANDFILE}@g' \
  	    -e 's@_RADMIND_VERSION@$(shell cat VERSION)@g' \
  	    -e 's@_RADMIND_ECHO_PATH@${ECHO}@g' \
@@ -26,7 +26,7 @@ $OpenBSD: patch-Makefile_in,v 1.6 2007/09/09 20:02:09 jasper Exp $
  	    ${srcdir}/ra.sh > tmp/ra.sh; 
  
  man : FRC
-@@ -272,7 +274,7 @@ man : FRC
+@@ -287,7 +289,7 @@ man : FRC
  		${srcdir}/man/$$i > tmp/man/$$i; \
  	done
  
@@ -35,7 +35,7 @@ $OpenBSD: patch-Makefile_in,v 1.6 2007/09/09 20:02:09 jasper Exp $
  	-mkdir -p ${DESTDIR}/${exec_prefix}
  	-mkdir -p ${DESTDIR}/${SBINDIR}
  	${INSTALL} -m 0755 -c radmind ${DESTDIR}/${SBINDIR}/
-@@ -299,6 +301,7 @@ install	: all man rash
+@@ -314,6 +316,7 @@ install	: all man rash
  	-mkdir -p ${DESTDIR}/${PREAPPLYDIR}
  	-mkdir -p ${DESTDIR}/${POSTAPPLYDIR}
  	-mkdir -p ${DESTDIR}/${CERTDIR}
diff --git a/sysutils/radmind/patches/patch-command_c b/sysutils/radmind/patches/patch-command_c
deleted file mode 100644
index 3aa57f972c2..00000000000
--- a/sysutils/radmind/patches/patch-command_c
+++ /dev/null
@@ -1,81 +0,0 @@
-$OpenBSD: patch-command_c,v 1.4 2007/09/04 20:52:13 jasper Exp $
---- command.c.orig	Fri Mar  9 13:36:28 2007
-+++ command.c	Sun Mar 18 12:15:14 2007
-@@ -662,7 +662,7 @@ f_stat( SNET *sn, int ac, char *av[] )
- 
- 	/* if allowable, check for transcript in the special file directory */
- 
--	strcat( path, ".T" );
-+	(void)strlcat( path, ".T", sizeof( path ) );
- 
- 	/* store value of av[ 2 ], because argcargv will be called
- 	 * from special_t(), and that will blow away the current values
-@@ -771,7 +771,7 @@ f_stor( SNET *sn, int ac, char *av[] )
- 	    snet_writef( sn, "%d Path too long\r\n", 540 );
- 	    return( 1 );
- 	}
--	strcpy( upload_xscript, av[ 2 ] );
-+	(void)strlcpy( upload_xscript, av[ 2 ], sizeof( upload_xscript ) );
- 
- 	/* make the directory for the files of this xscript to live in. */
- 	if ( mkdir( xscriptdir, 0777 ) < 0 ) {
-@@ -1244,7 +1244,7 @@ command_k( char *path_config )
- 	}
- 
- 	if (( p = strrchr( av[ 1 ], '/' )) == NULL ) {
--	    sprintf( special_dir, "special" );
-+	    (void)snprintf( special_dir, sizeof( special_dir ), "special" );
- 	} else {
- 	    *p = '\0';
- 	    if ( snprintf( special_dir, MAXPATHLEN, "special/%s", av[ 1 ] )
-@@ -1262,14 +1262,14 @@ command_k( char *path_config )
- 		    "config file: line %d: command file too long\n", linenum );
- 		continue;
- 	    }
--	    strcpy( command_file, av[ 1 ] );
-+	    (void)strlcpy( command_file, av[ 1 ], sizeof( command_file ) );
- 	    if ( snprintf( temp, MAXPATHLEN, "%s/%s", special_dir,
- 		    remote_cn ) >= MAXPATHLEN ) {
- 		syslog( LOG_ERR, "config file: line %d: special dir too long\n",
- 		    linenum );
- 		continue;
- 	    }
--	    strcpy( special_dir, temp );
-+	    (void)strlcpy( special_dir, temp, sizeof( special_dir ) );
- 	    return( 0 );
- 	}
- 	if ( wildcard( av[ 0 ], remote_host, 0 )) {
-@@ -1278,14 +1278,14 @@ command_k( char *path_config )
- 		    "config file: line %d: command file too long\n", linenum );
- 		continue;
- 	    }
--	    strcpy( command_file, av[ 1 ] );
-+	    (void)strlcpy( command_file, av[ 1 ], sizeof( command_file ) );
- 	    if ( snprintf( temp, MAXPATHLEN, "%s/%s", special_dir,
- 		    remote_host ) >= MAXPATHLEN ) {
- 		syslog( LOG_ERR, "config file: line %d: special dir too long\n",
- 		    linenum );
- 		continue;
- 	    }
--	    strcpy( special_dir, temp );
-+	    (void)strlcpy( special_dir, temp, sizeof( special_dir ) );
- 	    return( 0 );
- 	} 
- 	if ( wildcard( av[ 0 ], remote_addr, 1 )) {
-@@ -1294,14 +1294,14 @@ command_k( char *path_config )
- 		    "config file: line %d: command file too long\n", linenum );
- 		continue;
- 	    }
--	    strcpy( command_file, av[ 1 ] );
-+	    (void)strlcpy( command_file, av[ 1 ], sizeof( command_file ) );
- 	    if ( snprintf( temp, MAXPATHLEN, "%s/%s", special_dir,
- 		    remote_addr ) >= MAXPATHLEN ) {
- 		syslog( LOG_ERR, "config file: line %d: special dir too long\n",
- 		    linenum );
- 		continue;
- 	    }
--	    strcpy( special_dir, temp );
-+	    (void)strlcpy( special_dir, temp, sizeof( special_dir ) );
- 	    return( 0 );
- 	} 
-     }
diff --git a/sysutils/radmind/patches/patch-connect_c b/sysutils/radmind/patches/patch-connect_c
deleted file mode 100644
index 303c4e62fb2..00000000000
--- a/sysutils/radmind/patches/patch-connect_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-connect_c,v 1.1 2007/09/04 20:52:13 jasper Exp $
---- connect.c.orig	Wed Jul 18 09:50:13 2007
-+++ connect.c	Wed Jul 18 09:50:40 2007
-@@ -177,7 +177,7 @@ get_capabilities( SNET *sn )
- 	    return( NULL );
- 	}
- 	if ( verbose ) printf( "<<< %s\n", line );
--	strcpy( temp, line+4 );
-+	(void)strlcpy( temp, line+4, sizeof( temp ) );
- 	if (( ac = argcargv( temp, &av )) != 0 ) {
- 	    if ( strncasecmp( "CAPAbilities", av[0], MIN( 12, strlen( av[0] ))) == 0 ) {
- 		capa = malloc( sizeof(char *)*ac );
diff --git a/sysutils/radmind/patches/patch-fsdiff_c b/sysutils/radmind/patches/patch-fsdiff_c
deleted file mode 100644
index c6f947df06b..00000000000
--- a/sysutils/radmind/patches/patch-fsdiff_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-fsdiff_c,v 1.4 2007/09/04 20:52:13 jasper Exp $
---- fsdiff.c.orig	Sat May  6 18:13:18 2006
-+++ fsdiff.c	Wed Jul 18 09:41:16 2007
-@@ -111,7 +111,7 @@ fs_walk( char *path, struct stat *st, char *type, stru
- 		char			type0;
- 		struct applefileinfo	afinfo0;
- 
--		strcpy( temp, tran->t_pinfo.pi_name );
-+		(void)strlcpy( temp, tran->t_pinfo.pi_name, sizeof( temp ) );
- 		switch ( radstat( temp, &st0, &type0, &afinfo0 )) {
- 		case 0:
- 		    break;
diff --git a/sysutils/radmind/patches/patch-hardlink_c b/sysutils/radmind/patches/patch-hardlink_c
deleted file mode 100644
index d2b61cabed5..00000000000
--- a/sysutils/radmind/patches/patch-hardlink_c
+++ /dev/null
@@ -1,28 +0,0 @@
-$OpenBSD: patch-hardlink_c,v 1.3 2007/09/04 20:52:13 jasper Exp $
---- hardlink.c.orig	Tue May 20 18:23:11 2003
-+++ hardlink.c	Wed Jul 18 09:41:16 2007
-@@ -79,6 +79,7 @@ d_insert( struct devlist **dev_head, struct pathinfo *
- i_insert( struct devlist *dev_head, struct pathinfo *pinfo )
- {
-     struct inolist	*new, **cur;
-+    size_t buflen;
- 
-     for ( cur = &dev_head->d_ilist; *cur != NULL; cur = &(*cur)->i_next ) {
- 	if ( pinfo->pi_stat.st_ino <= (*cur)->i_ino ) {
-@@ -96,13 +97,14 @@ i_insert( struct devlist *dev_head, struct pathinfo *p
- 	exit( 2 );
-     }
- 
--    if (( new->i_name = ( char * ) malloc( strlen( pinfo->pi_name ) + 1 ))
-+    buflen = strlen( pinfo->pi_name ) + 1;
-+    if (( new->i_name = ( char * ) malloc( buflen ))
- 	    == NULL ) {
- 	perror( "i_insert malloc" );
- 	exit( 2 );
-     }
- 
--    strcpy( new->i_name, pinfo->pi_name );
-+    (void)strlcpy( new->i_name, pinfo->pi_name, buflen );
-     new->i_ino = pinfo->pi_stat.st_ino;
-     new->i_flag = 0;
- 
diff --git a/sysutils/radmind/patches/patch-ktcheck_c b/sysutils/radmind/patches/patch-ktcheck_c
deleted file mode 100644
index 5dd0400ad2a..00000000000
--- a/sysutils/radmind/patches/patch-ktcheck_c
+++ /dev/null
@@ -1,48 +0,0 @@
-$OpenBSD: patch-ktcheck_c,v 1.4 2007/09/09 20:02:09 jasper Exp $
---- ktcheck.c.orig	Tue Jul 31 04:55:36 2007
-+++ ktcheck.c	Sun Sep  9 21:59:53 2007
-@@ -240,7 +240,7 @@ clean_client_dir( void )
-      * can't pass in kdir, since it has a trailing slash.
-      * bounds checking done when creating kdir in main().
-      */
--    strcpy( dir, kdir );
-+    (void)strlcpy( dir, kdir, sizeof( dir ) );
-     if (( p = strrchr( dir, '/' )) != NULL ) {
- 	*p = '\0';
-     }
-@@ -284,7 +284,7 @@ getstat( SNET *sn, char *description, char *stats ) 
- 	fprintf( stderr, "%s: line too long\n", line );
- 	return( -1 );
-     }
--    strcpy( stats, line );
-+    (void)strlcpy( stats, line, MAXPATHLEN );
- 
-     if ( verbose ) printf( "<<< %s\n", stats );
- 
-@@ -435,7 +435,7 @@ check( SNET *sn, char *type, char *file )
- 	    fprintf( stderr, "%s: too long\n", type );
- 	    return( 2 );
- 	}
--	strcpy( pathdesc, type );
-+	(void)strlcpy( pathdesc, type, sizeof( pathdesc ) );
- 
- 	file = base_kfile;
- 
-@@ -444,7 +444,7 @@ check( SNET *sn, char *type, char *file )
- 	    fprintf( stderr, "%s: path too long\n", base_kfile );
- 	    return( 2 );
- 	}
--	strcpy( path, base_kfile );
-+	(void)strlcpy( path, base_kfile, sizeof( path ) );
-     }
- 
-     if ( getstat( sn, (char *)&pathdesc, stats ) != 0 ) {
-@@ -712,7 +712,7 @@ main( int argc, char **argv )
-         p++;
-         *p = (char)'\0';
-     }
--    strcpy( path, base_kfile );
-+    (void)strlcpy( path, base_kfile, sizeof( path ) );
- 
-     if (( sn = connectsn( host, port )) == NULL ) {
- 	exit( 2 );
diff --git a/sysutils/radmind/patches/patch-lapply_c b/sysutils/radmind/patches/patch-lapply_c
deleted file mode 100644
index 2fae6737d66..00000000000
--- a/sysutils/radmind/patches/patch-lapply_c
+++ /dev/null
@@ -1,66 +0,0 @@
-$OpenBSD: patch-lapply_c,v 1.5 2007/09/09 20:02:09 jasper Exp $
---- lapply.c.orig	Tue Jul 31 04:55:36 2007
-+++ lapply.c	Sun Sep  9 21:59:53 2007
-@@ -85,7 +85,7 @@ create_node( char *path, char *tline )
-     new_node = (struct node *) malloc( sizeof( struct node ));
-     new_node->path = strdup( path );
-     if ( tline != NULL ) {
--	sprintf( new_node->tline, "%s", tline );
-+	(void)snprintf( new_node->tline, sizeof( new_node->tline ), "%s", tline );
- 	new_node->doline = 1;
-     } else {
- 	new_node->doline = 0;
-@@ -129,7 +129,7 @@ do_line( char *tline, int present, struct stat *st, SN
- 	fprintf( stderr, "line %d: too long\n", linenum );
- 	return( 1 );
-     } 
--    strcpy( path, d_path );
-+    (void)strlcpy( path, d_path, sizeof( path ) );
- 
-     /* DOWNLOAD */
-     if ( *command == '+' ) {
-@@ -138,7 +138,7 @@ do_line( char *tline, int present, struct stat *st, SN
- 		    linenum, *targv[ 0 ] );
- 	    return( 1 );
- 	}
--	strcpy( cksum_b64, targv[ 7 ] );
-+	(void)strlcpy( cksum_b64, targv[ 7 ], sizeof( cksum_b64 ) );
- 
- 	if ( special ) {
- 	    if ( snprintf( pathdesc, MAXPATHLEN * 2, "SPECIAL %s",
-@@ -473,7 +473,7 @@ main( int argc, char **argv )
- 	    fprintf( stderr, "line %d: too long\n", linenum );
- 	    goto error2;
- 	}
--	strcpy( targvline, tline );
-+	(void)strlcpy( targvline, tline, sizeof( targvline ) );
- 
- 	tac = acav_parse( acav, targvline, &targv );
- 
-@@ -483,7 +483,7 @@ main( int argc, char **argv )
-         }
- 
- 	if ( tac == 1 ) {
--	    strcpy( transcript, targv[ 0 ] );
-+	    (void)strlcpy( transcript, targv[ 0 ], sizeof( transcript ) );
- 	    len = strlen( transcript );
- 	    if ( transcript[ len - 1 ] != ':' ) { 
- 		fprintf( stderr, "%s: line %d: invalid transcript name\n",
-@@ -525,7 +525,7 @@ main( int argc, char **argv )
- 	    fprintf( stderr, "line %d: too long\n", linenum );
- 	    return( 1 );
- 	} 
--	strcpy( path, d_path );
-+	(void)strlcpy( path, d_path, sizeof( path ) );
- 
- 	/* Check transcript order */
- 	if ( prepath != 0 ) {
-@@ -539,7 +539,7 @@ main( int argc, char **argv )
- 		    transcript, linenum );
- 	    goto error2;
- 	}
--	strcpy( prepath, path );
-+	(void)strlcpy( prepath, path, sizeof( prepath ) );
- 
- 	/* Do type check on local file */
- 	switch ( radstat( path, &st, &fstype, &afinfo )) {
diff --git a/sysutils/radmind/patches/patch-lcksum_c b/sysutils/radmind/patches/patch-lcksum_c
index 5c3dfbfdd43..ca635a70b01 100644
--- a/sysutils/radmind/patches/patch-lcksum_c
+++ b/sysutils/radmind/patches/patch-lcksum_c
@@ -1,41 +1,7 @@
-$OpenBSD: patch-lcksum_c,v 1.3 2007/09/04 20:52:13 jasper Exp $
---- lcksum.c.orig	Tue Aug  1 16:13:38 2006
-+++ lcksum.c	Sun Mar 18 12:15:14 2007
-@@ -176,13 +176,13 @@ do_lcksum( char *tpath )
- 	    fprintf( stderr, "%s: path too long\n", tpath );
- 	    exit( 2 );
- 	}
--	strcpy( cwd, tpath );
-+	(void)strlcpy( cwd, tpath, sizeof( cwd ) );
-     } else {
- 	if ( snprintf( temp, MAXPATHLEN, "%s/%s", cwd, tpath ) >= MAXPATHLEN ) {
- 	    fprintf( stderr, "%s/%s: path too long\n", cwd, tpath );
- 	    exit( 2 );
- 	}
--	strcpy( cwd, temp );
-+	(void)strlcpy( cwd, temp, sizeof( cwd ) );
-     }
-     if ( get_root( radmind_path, cwd, file_root, tran_root, tran_name ) != 0 ) {
- 	exit( 2 );
-@@ -293,7 +293,7 @@ do_lcksum( char *tpath )
- 	    exitval = 1;
- 	    goto done;
- 	}
--	strcpy( path, d_path );
-+	(void)strlcpy( path, d_path, sizeof( path ) );
- 	    
- 	/* check to see if file against prefix */
- 	if ( prefix != NULL ) {
-@@ -330,7 +330,7 @@ do_lcksum( char *tpath )
- 	    exitval = 1;
- 	    goto done;
- 	}
--	strcpy( prepath, path );
-+	(void)strlcpy( prepath, path, sizeof( prepath ) );
- 
- 	if ((( *targv[ 0 ] != 'f' )  && ( *targv[ 0 ] != 'a' )) || ( remove )) {
- 	    if ( updatetran ) {
-@@ -443,7 +443,7 @@ do_lcksum( char *tpath )
+$OpenBSD: patch-lcksum_c,v 1.4 2008/11/10 09:19:25 jasper Exp $
+--- lcksum.c.orig	Fri Nov  7 23:33:01 2008
++++ lcksum.c	Fri Nov  7 23:33:39 2008
+@@ -431,7 +431,7 @@ do_lcksum( char *tpath )
  		    fprintf( ufs, "%s %-37s %4s %5s %5s %9ld "
  			    "%7" PRIofft "d %s\n",
  			targv[ 0 ], targv[ 1 ], targv[ 2 ], targv[ 3 ],
diff --git a/sysutils/radmind/patches/patch-libsnet_Makefile_in b/sysutils/radmind/patches/patch-libsnet_Makefile_in
index 8159a086254..c37a284dd3d 100644
--- a/sysutils/radmind/patches/patch-libsnet_Makefile_in
+++ b/sysutils/radmind/patches/patch-libsnet_Makefile_in
@@ -1,21 +1,12 @@
-$OpenBSD: patch-libsnet_Makefile_in,v 1.3 2007/09/04 20:52:13 jasper Exp $
---- libsnet/Makefile.in.orig	Sat Jun 26 12:30:45 2004
-+++ libsnet/Makefile.in	Sat Jun 26 12:34:54 2004
-@@ -14,7 +14,7 @@ LOBJ = snet.lo
- INCPATH=	@CPPFLAGS@ -I.
- DEFS=		
- OPTOPTS=	@OPTOPTS@
--CFLAGS=		${DEFS} ${OPTOPTS} ${INCPATH}
-+CFLAGS=		${DEFS} ${OPTOPTS} @CFLAGS@ ${INCPATH}
- PROFILED=	@PROFILED@
- CC=		@CC@	
- 
-@@ -50,7 +50,7 @@ all:		libsnet.la
+$OpenBSD: patch-libsnet_Makefile_in,v 1.4 2008/11/10 09:19:25 jasper Exp $
+--- libsnet/Makefile.in.orig	Fri Nov  7 23:34:12 2008
++++ libsnet/Makefile.in	Fri Nov  7 23:35:57 2008
+@@ -51,7 +51,7 @@ all:		libsnet.la
  
  libsnet.la:	$(OBJ) $(LOBJ)
  	$(LIBTOOL) --mode=link \
--	  $(CC) -o libsnet.la $(LOBJ) -rpath $(libdir) -version-info 0:0:0
-+	  $(CC) -o libsnet.la $(LOBJ) -version-info 0:0:0
+-	  $(CC) -o libsnet.la $(LDFLAGS) $(LOBJ) -rpath $(libdir) -version-info 0:0:0
++	  $(CC) -o libsnet.la $(LDFLAGS) $(LOBJ) -version-info 0:0:0
  	@if test x_$(PROFILED) = x_true ; then echo "building profiled $@" ; \
  	  ( cd profiled ; ../$(LIBTOOL) --mode=link \
- 	  $(CC) -o libsnet_p.la $(LOBJ) -rpath $(libdir) \
+ 	  $(CC) -o libsnet_p.la $(LDFLAGS) $(LOBJ) -rpath $(libdir) \
diff --git a/sysutils/radmind/patches/patch-libsnet_snet_c b/sysutils/radmind/patches/patch-libsnet_snet_c
deleted file mode 100644
index a1fc4addd6a..00000000000
--- a/sysutils/radmind/patches/patch-libsnet_snet_c
+++ /dev/null
@@ -1,17 +0,0 @@
-$OpenBSD: patch-libsnet_snet_c,v 1.2 2007/09/04 20:52:13 jasper Exp $
---- libsnet/snet.c.orig	Mon Feb 19 16:10:13 2007
-+++ libsnet/snet.c	Sun Mar 18 12:15:14 2007
-@@ -274,8 +274,11 @@ modifier:
- 		p = va_arg( vl, char * );
- 		len = strlen( p );
- 		SNET_WBUFGROW( len );
--		strcpy( cur, p );
--		cur += strlen( p );
-+		if (strlcpy( cur, p, end - cur ) > (end - cur)) {
-+			cur += end - cur;
-+		} else {
-+			cur += strlen( p );
-+		}
- 		break;
- 
- 	    case 'c' :
diff --git a/sysutils/radmind/patches/patch-list_c b/sysutils/radmind/patches/patch-list_c
deleted file mode 100644
index 2a3778e45d1..00000000000
--- a/sysutils/radmind/patches/patch-list_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-list_c,v 1.1 2005/01/26 00:33:30 pvalchev Exp $
---- list.c.orig	Thu Jan 13 09:57:58 2005
-+++ list.c	Thu Jan 13 09:59:15 2005
-@@ -30,7 +30,7 @@ _list_create_node( char *path )
- 	return( NULL );
-     }
-     memset( new_node, 0, sizeof( struct node ));
--    sprintf( new_node->n_path, "%s", path );
-+    (void)snprintf( new_node->n_path, sizeof( new_node->n_path ), "%s", path );
- 
-     return( new_node );
- }
diff --git a/sysutils/radmind/patches/patch-llist_c b/sysutils/radmind/patches/patch-llist_c
deleted file mode 100644
index 099c830ba45..00000000000
--- a/sysutils/radmind/patches/patch-llist_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-llist_c,v 1.1.1.1 2004/06/26 19:00:48 sturm Exp $
---- llist.c.orig	2004-02-11 15:27:31.000000000 -0500
-+++ llist.c	2004-06-08 15:52:01.000000000 -0400
-@@ -27,7 +27,7 @@ ll_allocate( char *name ) 
-     } 
- 
-     /* copy info into new item */
--    strcpy( new->ll_name, name );
-+    (void)strlcpy( new->ll_name, name, sizeof( new->ll_name ) );
-     new->ll_next = NULL;
- 
-     return new;
diff --git a/sysutils/radmind/patches/patch-lmerge_c b/sysutils/radmind/patches/patch-lmerge_c
deleted file mode 100644
index 4d8cf55e2d9..00000000000
--- a/sysutils/radmind/patches/patch-lmerge_c
+++ /dev/null
@@ -1,69 +0,0 @@
-$OpenBSD: patch-lmerge_c,v 1.2 2007/09/04 20:52:13 jasper Exp $
---- lmerge.c.orig	Tue Feb  7 12:22:17 2006
-+++ lmerge.c	Sun Mar 18 12:15:14 2007
-@@ -48,7 +48,7 @@ create_node( char *path )
- 	fprintf( stderr, "%s: path too long\n", path );
- 	return( NULL );
-     }
--    strcpy( new_node->path, path );
-+    (void)strlcpy( new_node->path, path, sizeof( new_node->path ) );
- 
-     return( new_node );
- }
-@@ -144,7 +144,7 @@ getline:
- 		tran->t_tran_name, tran->t_linenum, d_path );
- 	return( 1 );
-     }
--    strcpy( tran->t_filepath, d_path );
-+    (void)strlcpy( tran->t_filepath, d_path, sizeof( tran->t_filepath ) );
- 
-     /* Check transcript order */
-     if ( tran->t_prepath != 0 ) {
-@@ -161,7 +161,7 @@ getline:
- 		tran->t_tran_name, tran->t_linenum, tran->t_filepath );
- 	return( 1 );
-     }
--    strcpy( tran->t_prepath, tran->t_filepath );
-+    (void)strlcpy( tran->t_prepath, tran->t_filepath, sizeof( tran->t_prepath ) );
- 
- 
-     return( 0 );
-@@ -316,17 +316,17 @@ main( int argc, char **argv )
- 	    fprintf( stderr, "%s: path too long\n", trans[ 1 ]->t_file_root );
- 	    exit( 2 );
- 	}
--	strcpy( file_root, trans[ 1 ]->t_file_root );
-+	(void)strlcpy( file_root, trans[ 1 ]->t_file_root, sizeof( file_root ) );
- 	if ( strlen( trans[ 1 ]->t_tran_root ) >= MAXPATHLEN ) {
- 	    fprintf( stderr, "%s: path too long\n", trans[ 1 ]->t_tran_root );
- 	    exit( 2 );
- 	}
--	strcpy( tran_root, trans[ 1 ]->t_tran_root );
-+	(void)strlcpy( tran_root, trans[ 1 ]->t_tran_root, sizeof( tran_root ) );
- 	if ( strlen( trans[ 1 ]->t_tran_name ) >= MAXPATHLEN ) {
- 	    fprintf( stderr, "%s: path too long\n", trans[ 1 ]->t_tran_name );
- 	    exit( 2 );
- 	}
--	strcpy( tran_name, trans[ 1 ]->t_tran_name );
-+	(void)strlcpy( tran_name, trans[ 1 ]->t_tran_name, sizeof( tran_name ) );
-     } else {
- 	/* Create tran if missing */
- 	if (( ofd = open( argv[ argc - 1 ], O_WRONLY | O_CREAT, 0666 ) ) < 0 ) {
-@@ -344,7 +344,7 @@ main( int argc, char **argv )
- 		fprintf( stderr, "%s: path too long\n", argv[ argc - 1 ] );
- 		exit( 2 );
- 	    }
--	    strcpy( cwd, argv[ argc - 1 ] );
-+	    (void)strlcpy( cwd, argv[ argc - 1 ], sizeof( cwd ) );
- 	} else {
- 	    if ( snprintf( temp, MAXPATHLEN, "%s/%s", cwd, argv[ argc - 1 ] )
- 		    > MAXPATHLEN - 1 ) {
-@@ -352,7 +352,7 @@ main( int argc, char **argv )
- 		    argv[ argc - 1 ] );
- 		exit( 2 );
- 	    }
--	    strcpy( cwd, temp );
-+	    (void)strlcpy( cwd, temp, sizeof( cwd ) );
- 	}
- 	if ( get_root( radmind_path, cwd, file_root, tran_root, tran_name ) != 0 ) {
- 	    exit( 2 );
diff --git a/sysutils/radmind/patches/patch-lsize_c b/sysutils/radmind/patches/patch-lsize_c
deleted file mode 100644
index ff6ee0706f4..00000000000
--- a/sysutils/radmind/patches/patch-lsize_c
+++ /dev/null
@@ -1,17 +0,0 @@
-$OpenBSD: patch-lsize_c,v 1.1 2007/09/04 20:52:13 jasper Exp $
---- lsize.c.orig	Wed Jul 18 09:50:46 2007
-+++ lsize.c	Wed Jul 18 09:51:15 2007
-@@ -223,11 +223,11 @@ main( int ac, char *av[] )
- 		fprintf( stderr, "%s: path too long\n", path );
- 		exit( 2 );
- 	    }
--	    strcpy( kdir, path );
-+	    (void)strlcpy( kdir, path, sizeof( kdir ) );
- 	    
- 	    if (( p = strrchr( kdir, '/' )) == NULL ) {
- 		/* use working directory */
--		strcpy( kdir, "./" );
-+		(void)strlcpy( kdir, "./", sizeof( kdir ) );
- 	    } else {
- 		p++;
- 		*p = (char)'\0';
diff --git a/sysutils/radmind/patches/patch-patch-connect_c b/sysutils/radmind/patches/patch-patch-connect_c
deleted file mode 100644
index db70c5ca33a..00000000000
--- a/sysutils/radmind/patches/patch-patch-connect_c
+++ /dev/null
@@ -1,16 +0,0 @@
-$OpenBSD: patch-patch-connect_c,v 1.1 2007/09/04 20:52:13 jasper Exp $
---- patch-connect_c.orig	Wed Jul 18 09:47:33 2007
-+++ patch-connect_c	Wed Jul 18 09:47:34 2007
-@@ -0,0 +1,12 @@
-+$OpenBSD: patch-patch-connect_c,v 1.1 2007/09/04 20:52:13 jasper Exp $
-+--- connect.c.orig	Fri Jul 13 20:58:35 2007
-++++ connect.c	Fri Jul 13 20:57:13 2007
-+@@ -177,7 +177,7 @@ get_capabilities( SNET *sn )
-+ 	    return( NULL );
-+ 	}
-+ 	if ( verbose ) printf( "<<< %s\n", line );
-+-	strcpy( temp, line+4 );
-++	(void)strlcpy( temp, line+4, sizeof( temp ) );
-+ 	if (( ac = argcargv( temp, &av )) != 0 ) {
-+ 	    if ( strncasecmp( "CAPAbilities", av[0], MIN( 12, strlen( av[0] ))) == 0 ) {
-+ 		capa = malloc( sizeof(char *)*ac );
diff --git a/sysutils/radmind/patches/patch-patch-lsize_c b/sysutils/radmind/patches/patch-patch-lsize_c
deleted file mode 100644
index 468cf57adca..00000000000
--- a/sysutils/radmind/patches/patch-patch-lsize_c
+++ /dev/null
@@ -1,21 +0,0 @@
-$OpenBSD: patch-patch-lsize_c,v 1.1 2007/09/04 20:52:13 jasper Exp $
---- patch-lsize_c.orig	Wed Jul 18 09:47:42 2007
-+++ patch-lsize_c	Wed Jul 18 09:47:42 2007
-@@ -0,0 +1,17 @@
-+$OpenBSD: patch-patch-lsize_c,v 1.1 2007/09/04 20:52:13 jasper Exp $
-+--- lsize.c.orig	Fri Jul 13 20:58:48 2007
-++++ lsize.c	Fri Jul 13 20:59:22 2007
-+@@ -223,11 +223,11 @@ main( int ac, char *av[] )
-+ 		fprintf( stderr, "%s: path too long\n", path );
-+ 		exit( 2 );
-+ 	    }
-+-	    strcpy( kdir, path );
-++	    (void)strlcpy( kdir, path, sizeof( kdir ) );
-+ 	    
-+ 	    if (( p = strrchr( kdir, '/' )) == NULL ) {
-+ 		/* use working directory */
-+-		strcpy( kdir, "./" );
-++		(void)strlcpy( kdir, "./", sizeof( kdir ) );
-+ 	    } else {
-+ 		p++;
-+ 		*p = (char)'\0';
diff --git a/sysutils/radmind/patches/patch-patch-repo_c b/sysutils/radmind/patches/patch-patch-repo_c
deleted file mode 100644
index fb9c05c65cf..00000000000
--- a/sysutils/radmind/patches/patch-patch-repo_c
+++ /dev/null
@@ -1,27 +0,0 @@
-$OpenBSD: patch-patch-repo_c,v 1.1 2007/09/04 20:52:13 jasper Exp $
---- patch-repo_c.orig	Wed Jul 18 09:47:51 2007
-+++ patch-repo_c	Wed Jul 18 09:47:51 2007
-@@ -0,0 +1,23 @@
-+$OpenBSD: patch-patch-repo_c,v 1.1 2007/09/04 20:52:13 jasper Exp $
-+--- repo.c.orig	Fri Jul 13 21:04:06 2007
-++++ repo.c	Fri Jul 13 21:04:08 2007
-+@@ -169,7 +169,7 @@ main( int argc, char *argv[] )
-+ 	    fprintf( stderr, "%s: too long\n", argv[ optind ] );
-+ 	    exit( 2 );
-+ 	}
-+-	strcpy( repodata, argv[ optind ] );
-++	(void)strlcpy( repodata, argv[ optind ], sizeof( repodata ) );
-+ 
-+ 	/* Skip first token in message */
-+ 	i = 1;
-+@@ -179,8 +179,8 @@ main( int argc, char *argv[] )
-+ 		fprintf( stderr, "%s %s: too long\n", repodata, argv[ i ] );
-+ 		exit( 2 );
-+ 	    }
-+-	    strcat( repodata, " " );
-+-	    strcat( repodata, argv[ i ] );
-++	    (void)strlcat( repodata, " ", sizeof( repodata ) );
-++	    (void)strlcat( repodata, argv[ i ], sizeof( repodata ) );
-+ 	}
-+     }
-+ 
diff --git a/sysutils/radmind/patches/patch-progress_c b/sysutils/radmind/patches/patch-progress_c
deleted file mode 100644
index bf47de08843..00000000000
--- a/sysutils/radmind/patches/patch-progress_c
+++ /dev/null
@@ -1,30 +0,0 @@
-$OpenBSD: patch-progress_c,v 1.3 2007/09/04 20:52:13 jasper Exp $
---- progress.c.orig	Fri Oct  1 11:20:04 2004
-+++ progress.c	Wed Jul 18 09:41:16 2007
-@@ -39,7 +39,7 @@ loadsetsize( FILE *tran )
- 
-     while ( fgets( tline, LINE_MAX, tran ) != NULL ) {
- 	linenum++;
--	strcpy( line, tline );
-+	(void)strlcpy( line, tline, sizeof( line ) );
- 	if (( tac = argcargv( tline, &targv )) == 0 ) {
- 	    continue;
- 	}
-@@ -72,7 +72,7 @@ applyloadsetsize( FILE *tran )
- 
-     while ( fgets( tline, LINE_MAX, tran ) != NULL ) {
- 	linenum++;
--	strcpy( line, tline );
-+	(void)strlcpy( line, tline, sizeof( line ) );
- 	/* skip empty lines and transcript marker lines */
- 	if (( tac = argcargv( tline, &targv )) <= 1 ) {
- 	    continue;
-@@ -113,7 +113,7 @@ lcksum_loadsetsize( FILE *tran, char *prefix )
- 
-     while ( fgets( tline, LINE_MAX, tran ) != NULL ) {
- 	linenum++;
--	strcpy( line, tline );
-+	(void)strlcpy( line, tline, sizeof( line ) );
- 	if (( tac = argcargv( tline, &targv )) <= 1 ) {
- 	    continue;
- 	}
diff --git a/sysutils/radmind/patches/patch-ra_sh b/sysutils/radmind/patches/patch-ra_sh
index 8b5fd872e44..86a71d6e7e7 100644
--- a/sysutils/radmind/patches/patch-ra_sh
+++ b/sysutils/radmind/patches/patch-ra_sh
@@ -1,16 +1,16 @@
-$OpenBSD: patch-ra_sh,v 1.2 2007/09/04 20:52:13 jasper Exp $
---- ra.sh.orig	Mon Jun 18 17:01:07 2007
-+++ ra.sh	Wed Jul 18 09:41:17 2007
-@@ -29,7 +29,7 @@ TLSLEVEL="_RADMIND_AUTHLEVEL"
- EDITOR=${EDITOR:-vi}
+$OpenBSD: patch-ra_sh,v 1.3 2008/11/10 09:19:25 jasper Exp $
+--- ra.sh.orig	Fri Nov  7 23:36:42 2008
++++ ra.sh	Fri Nov  7 23:37:18 2008
+@@ -30,7 +30,7 @@ EDITOR=${EDITOR:-vi}
+ PAGER=${PAGER:-cat}
  USER=${SUDO_USER:-$USER}
  TMPDIR="${TMPDIR:=/tmp}"
 -DEFAULTS="/etc/defaults/radmind"
 +DEFAULTS="SYSCONFDIR/defaults/radmind"
  FSDIFFROOT="."
+ DEFAULTWORKDIR="/"
  FLAG="_RADMIND_DIR/client/.RadmindRunning"
- CHECKEDOUT="_RADMIND_DIR/client/.CheckedOut"
-@@ -58,9 +58,9 @@ FTMP="${RASHTMP}/fsdiff.out"
+@@ -60,9 +60,9 @@ FTMP="${RASHTMP}/fsdiff.out"
  
  # different systems use different default dirs
  if [ ! -f "${DEFAULTS}" ]; then
diff --git a/sysutils/radmind/patches/patch-repo_c b/sysutils/radmind/patches/patch-repo_c
deleted file mode 100644
index cb0198b3cb0..00000000000
--- a/sysutils/radmind/patches/patch-repo_c
+++ /dev/null
@@ -1,23 +0,0 @@
-$OpenBSD: patch-repo_c,v 1.2 2007/09/09 20:02:09 jasper Exp $
---- repo.c.orig	Tue Jul 31 04:55:37 2007
-+++ repo.c	Sun Sep  9 21:59:55 2007
-@@ -173,7 +173,7 @@ main( int argc, char *argv[] )
- 	    fprintf( stderr, "%s: too long\n", argv[ optind ] );
- 	    exit( 2 );
- 	}
--	strcpy( repodata, argv[ optind ] );
-+	(void)strlcpy( repodata, argv[ optind ], sizeof( repodata ) );
- 
- 	/* Skip first token in message */
- 	i = 1;
-@@ -183,8 +183,8 @@ main( int argc, char *argv[] )
- 		fprintf( stderr, "%s %s: too long\n", repodata, argv[ i ] );
- 		exit( 2 );
- 	    }
--	    strcat( repodata, " " );
--	    strcat( repodata, argv[ i ] );
-+	    (void)strlcat( repodata, " ", sizeof( repodata ) );
-+	    (void)strlcat( repodata, argv[ i ], sizeof( repodata ) );
- 	}
-     }
- 
diff --git a/sysutils/radmind/patches/patch-root_c b/sysutils/radmind/patches/patch-root_c
deleted file mode 100644
index 3a91d5c661f..00000000000
--- a/sysutils/radmind/patches/patch-root_c
+++ /dev/null
@@ -1,23 +0,0 @@
-$OpenBSD: patch-root_c,v 1.4 2007/09/04 20:52:13 jasper Exp $
---- root.c.orig	Fri Jan 20 16:27:27 2006
-+++ root.c	Wed Jul 18 09:41:17 2007
-@@ -35,7 +35,7 @@ get_root( char *radmind_path, char *path, char *file_r
-         fprintf( stderr, "%s: path too long\n", p );
-         return( -1 );
-     }
--    strcpy( tran_name, p );
-+    (void)strlcpy( tran_name, p, MAXPATHLEN );
- 
-     if ( snprintf( test_path, MAXPATHLEN, "%s/tmp/transcript",
-             radmind_real_path ) > MAXPATHLEN - 1 ) {
-@@ -83,8 +83,8 @@ get_root( char *radmind_path, char *path, char *file_r
- 		return( -1 );
- 	    }
-         } else {
--            sprintf( file_root, "%s/../file", real_path );
--            sprintf( tran_root, "%s", real_path );
-+            (void)snprintf( file_root, MAXPATHLEN, "%s/../file", real_path );
-+            (void)snprintf( tran_root, MAXPATHLEN, "%s", real_path );
-         }
-     }
- 
diff --git a/sysutils/radmind/patches/patch-stor_c b/sysutils/radmind/patches/patch-stor_c
deleted file mode 100644
index d1250796e53..00000000000
--- a/sysutils/radmind/patches/patch-stor_c
+++ /dev/null
@@ -1,18 +0,0 @@
-$OpenBSD: patch-stor_c,v 1.4 2007/09/04 20:52:13 jasper Exp $
---- stor.c.orig	Sat May  6 18:07:45 2006
-+++ stor.c	Wed Jul 18 09:41:17 2007
-@@ -482,11 +482,13 @@ n_stor_applefile( SNET *sn, char *pathdesc, char *path
-     struct timeval      	tv;
-     struct applefileinfo	afinfo;
-     off_t			size;
-+    size_t			len;
- 
-     /* Setup fake apple file info */
-     /* Finder Info */
-     memset( &afinfo, 0, sizeof( afinfo ));
--    sprintf( (char *)(afinfo.ai.ai_data + FI_CREATOR_OFFSET), "%s", "RDMD" );
-+    len = sizeof( afinfo.ai.ai_data );
-+    (void)snprintf( (char *)(afinfo.ai.ai_data + FI_CREATOR_OFFSET), len - FI_CREATOR_OFFSET, "%s", "RDMD" );
-     afinfo.as_ents[AS_FIE].ae_id = ASEID_FINFO;
-     afinfo.as_ents[AS_FIE].ae_offset = AS_HEADERLEN +
- 	( 3 * sizeof( struct as_entry ));               /* 62 */
diff --git a/sysutils/radmind/patches/patch-transcript_c b/sysutils/radmind/patches/patch-transcript_c
deleted file mode 100644
index 59139fdd31b..00000000000
--- a/sysutils/radmind/patches/patch-transcript_c
+++ /dev/null
@@ -1,84 +0,0 @@
-$OpenBSD: patch-transcript_c,v 1.4 2007/09/04 20:52:13 jasper Exp $
---- transcript.c.orig	Thu May 31 17:26:47 2007
-+++ transcript.c	Wed Jul 18 09:41:17 2007
-@@ -108,7 +108,7 @@ transcript_parse( struct transcript *tran ) 
- 	exit( 2 );
-     }
- 
--    strcpy( tran->t_pinfo.pi_name, epath );
-+    (void)strlcpy( tran->t_pinfo.pi_name, epath, sizeof( tran->t_pinfo.pi_name ) );
- 
-     /* reading and parsing the line */
-     switch( *argv[ 0 ] ) {
-@@ -178,7 +178,7 @@ transcript_parse( struct transcript *tran ) 
- 		tran->t_fullname, tran->t_linenum );
- 	    exit( 2 );
- 	}
--	strcpy( tran->t_pinfo.pi_link, epath );
-+	(void)strlcpy( tran->t_pinfo.pi_link, epath, sizeof( tran->t_pinfo.pi_link ) );
- 	break;
- 
-     case 'a':				    /* hfs applefile */
-@@ -200,7 +200,7 @@ transcript_parse( struct transcript *tran ) 
- 		exit( 2 );
- 	    }
- 	}
--	strcpy( tran->t_pinfo.pi_cksum_b64, argv[ 7 ] );
-+	(void)strlcpy( tran->t_pinfo.pi_cksum_b64, argv[ 7 ], sizeof( tran->t_pinfo.pi_cksum_b64 ) );
- 	break;
- 
-     default:
-@@ -631,7 +631,7 @@ transcript( char *path, struct stat *st, char *type, s
-      * exhausted, to consume any remaining transcripts.
-      */
-     if ( path != NULL ) {
--	strcpy( pi.pi_name, path );
-+	(void)strlcpy( pi.pi_name, path, sizeof( pi.pi_name ) );
- 	pi.pi_stat = *st;
- 	pi.pi_type = *type;
- 	pi.pi_afinfo = *afinfo;
-@@ -640,11 +640,11 @@ transcript( char *path, struct stat *st, char *type, s
- 	if ( !S_ISDIR( pi.pi_stat.st_mode ) && ( pi.pi_stat.st_nlink > 1 ) &&
- 		(( linkpath = hardlink( &pi )) != NULL )) {
- 	    pi.pi_type = 'h';
--	    strcpy( pi.pi_link, linkpath );
-+	    (void)strlcpy( pi.pi_link, linkpath, sizeof( pi.pi_link ) );
- 	} else if ( S_ISLNK( pi.pi_stat.st_mode )) {
- 	    len = readlink( pi.pi_name, epath, MAXPATHLEN );
- 	    epath[ len ] = '\0';
--	    strcpy( pi.pi_link, epath );
-+	    (void)strlcpy( pi.pi_link, epath, sizeof( pi.pi_link ) );
- 	}
- 
- 	/* By default, go into directories */
-@@ -655,7 +655,7 @@ transcript( char *path, struct stat *st, char *type, s
- 	}
- 
- 	/* initialize cksum field. */
--	strcpy( pi.pi_cksum_b64, "-" );
-+	(void)strlcpy( pi.pi_cksum_b64, "-", sizeof( pi.pi_cksum_b64 ) );
-     }
- 
-     for (;;) {
-@@ -708,9 +708,9 @@ t_new( int type, char *fullname, char *shortname, char
-     case T_SPECIAL :
- 	new->t_eof = 0; 
- 	new->t_linenum = 0;
--	strcpy( new->t_shortname, shortname );
--	strcpy( new->t_fullname, fullname );
--	strcpy( new->t_kfile, kfile );
-+	(void)strlcpy( new->t_shortname, shortname, sizeof( new->t_shortname ) );
-+	(void)strlcpy( new->t_fullname, fullname, sizeof( new->t_fullname ) );
-+	(void)strlcpy( new->t_kfile, kfile, sizeof( new->t_kfile ) );
- 	if (( new->t_in = fopen( fullname, "r" )) == NULL ) {
- 	    perror( fullname );
- 	    exit( 2 );
-@@ -844,7 +844,7 @@ transcript_init( char *kfile, int location )
- 		    "special path too long: %s%s\n", kdir, special );
- 	    exit( 2 );
- 	}
--	sprintf( fullpath, "%s%s", kdir, special );
-+	(void)snprintf( fullpath, sizeof( fullpath ), "%s%s", kdir, special );
- 	t_new( T_SPECIAL, fullpath, special, "special" );
-     }
- 
diff --git a/sysutils/radmind/pkg/PLIST b/sysutils/radmind/pkg/PLIST
index 0d36de3b46f..7314ec77b39 100644
--- a/sysutils/radmind/pkg/PLIST
+++ b/sysutils/radmind/pkg/PLIST
@@ -1,15 +1,15 @@
-@comment $OpenBSD: PLIST,v 1.4 2007/09/04 20:52:13 jasper Exp $
-bin/fsdiff
-bin/ktcheck
-bin/lapply
-bin/lcksum
-bin/lcreate
-bin/lfdiff
-bin/lmerge
-bin/lsort
+@comment $OpenBSD: PLIST,v 1.5 2008/11/10 09:19:25 jasper Exp $
+@bin bin/fsdiff
+@bin bin/ktcheck
+@bin bin/lapply
+@bin bin/lcksum
+@bin bin/lcreate
+@bin bin/lfdiff
+@bin bin/lmerge
+@bin bin/lsort
 bin/ra.sh
-bin/repo
-bin/twhich
+@bin bin/repo
+@bin bin/twhich
 @man man/man1/fsdiff.1
 @man man/man1/ktcheck.1
 @man man/man1/lapply.1
@@ -23,7 +23,7 @@ bin/twhich
 @man man/man1/twhich.1
 @man man/man5/applefile.5
 @man man/man8/radmind.8
-sbin/radmind
+@bin sbin/radmind
 @sample /var/radmind/
 @sample /var/radmind/cert/
 @sample /var/radmind/client/