New files, libroken cleanup, linking cleanup, and other small fixes.

6 files changed, 109 insertions, 31 deletions

diff --git a/usr.sbin/afs/libexec/afsd/Makefile b/usr.sbin/afs/libexec/afsd/Makefile
index 99a197abfa2..189ff62da80 100644
--- a/usr.sbin/afs/libexec/afsd/Makefile
+++ b/usr.sbin/afs/libexec/afsd/Makefile
@@ -1,13 +1,15 @@
-#	$OpenBSD: Makefile,v 1.4 2002/06/11 14:30:32 brad Exp $
+#	$OpenBSD: Makefile,v 1.5 2003/08/05 11:11:42 hin Exp $
 
 AFSTOPDIR=	../..
 .include <../../Makefile.inc>
 
+.PATH:	$(ROKENSRC)
+
 PROG	= afsd
 MAN	= afsd.8 CellServDB.5 ThisCell.5 SuidCells.5 afsd.conf.5 DynRootDB.5
 BINDIR	= /usr/libexec
-LDADD	+= ${LIBARLA} ${LIBROKEN} -lkafs -lkrb -lkrb5 -lasn1 -lcrypto -ldes
-DPADD	+= ${LIBARLA} ${LIBROKEN}
+LDADD	+= ${LIBARLA} -lkrb5 -lasn1 -lcrypto
+DPADD	+= ${LIBARLA}
 
 CFLAGS	+=  -I${AFSSRC}/util -I${AFSSRC}/arlad \
 	   -I${AFSSRC} -I${DESTDIR}/usr/include/kerberosIV
@@ -21,18 +23,23 @@ SRCS	= adir.c \
 	  cmcb.c \
 	  conn.c \
 	  cred.c \
-	  darla.c \
-	  discon_log.c \
+	  d-trans.c \
+	  disco.c \
 	  dynroot.c \
 	  fcache.c \
 	  fprio.c \
 	  inter.c \
 	  kernel.c \
 	  messages.c \
-	  reconnect.c \
+	  nnpfs.c \
+	  poller.c \
+	  state.c \
+	  stats.c \
 	  subr.c \
 	  volcache.c \
-	  xfs.c
+	  estrdup.c \
+	  erealloc.c \
+	  print_version.c
 
 .PATH: ${AFSSRC}/arlad
 
diff --git a/usr.sbin/afs/usr.sbin/bos/Makefile b/usr.sbin/afs/usr.sbin/bos/Makefile
index 8e616f0a017..9807ceccc67 100644
--- a/usr.sbin/afs/usr.sbin/bos/Makefile
+++ b/usr.sbin/afs/usr.sbin/bos/Makefile
@@ -1,22 +1,32 @@
-# $OpenBSD: Makefile,v 1.2 2002/06/11 14:53:16 hin Exp $
+# $OpenBSD: Makefile,v 1.3 2003/08/05 11:11:42 hin Exp $
 
 AFSTOPDIR	= ../..
 .include <../../Makefile.inc>
 
+.PATH:	$(ROKENSRC)
+
 PROG	= bos
 BINDIR	= /usr/sbin
 MAN	= bos.8
-LDADD	+= ${LIBARLA} ${LIBROKEN} -lkafs -lkrb -lkrb5 -lcrypto -lasn1 -lreadline -ldes -lcurses
-DPADD	+= ${LIBARLA} ${LIBROKEN} ${LIBKAFS}
+LDADD	+= ${LIBARLA} -lkrb5 -lcrypto -lasn1 -lreadline -ldes -lcurses
+DPADD	+= ${LIBARLA}
 
 CFLAGS	+= -I${AFSSRC}/appl/lib
 
 SRCS	= bos.c \
+	  bos_addhost.c \
 	  bos_adduser.c \
 	  bos_getrestart.c \
 	  bos_listhosts.c \
 	  bos_listusers.c \
-	  bos_status.c 
+	  bos_removehost.c \
+	  bos_restart.c \
+	  bos_start.c \
+	  bos_status.c \
+	  bos_stop.c \
+	  estrdup.c \
+	  emalloc.c \
+	  erealloc.c
 
 .PATH: ${AFSSRC}/appl/bos
 
diff --git a/usr.sbin/afs/usr.sbin/fs/Makefile b/usr.sbin/afs/usr.sbin/fs/Makefile
index ca65c04d830..d2203048bee 100644
--- a/usr.sbin/afs/usr.sbin/fs/Makefile
+++ b/usr.sbin/afs/usr.sbin/fs/Makefile
@@ -1,16 +1,52 @@
-# $OpenBSD: Makefile,v 1.2 2002/06/11 14:53:16 hin Exp $
+# $OpenBSD: Makefile,v 1.3 2003/08/05 11:11:42 hin Exp $
 
 AFSTOPDIR	= ../..
 .include <../../Makefile.inc>
 
+.PATH:	$(ROKENSRC)
+
 PROG	= fs
 BINDIR	= /usr/sbin
-LDADD	+= ${LIBARLA} ${LIBROKEN} -lkafs -lkrb -lkrb5 -lcrypto -lasn1 -lreadline -ldes -lcurses
-DPADD	+= ${LIBARLA} ${LIBROKEN} ${LIBKAFS}
+LDADD	+= ${LIBARLA} -lkrb5 -lcrypto -lasn1 -lreadline -lcurses
+DPADD	+= ${LIBARLA}
 
 CFLAGS	+= -I${AFSSRC}/appl/lib
 
-SRCS	= fs.c
+SRCS	= fs.c \
+	  fs_arladebug.c \
+	  fs_checkservers.c \
+	  fs_connect.c \
+	  fs_copyacl.c \
+	  fs_diskfree.c \
+	  fs_examine.c \
+	  fs_flush.c \
+	  fs_flushvol.c \
+	  fs_getcache.c \
+	  fs_getcellstat.c \
+	  fs_getfid.c \
+	  fs_getprio.c \
+	  fs_la.c \
+	  fs_listcell.c \
+	  fs_listquota.c \
+	  fs_lsm.c \
+	  fs_mkm.c \
+	  fs_newcell.c \
+	  fs_nnpfsdebug.c \
+	  fs_quota.c \
+	  fs_rmm.c \
+	  fs_setacl.c \
+	  fs_setcache.c \
+	  fs_setcrypt.c \
+	  fs_setquota.c \
+	  fs_statistics.c \
+	  fs_strerror.c \
+	  fs_whereis.c \
+	  fs_whichcell.c \
+	  fs_wscell.c \
+	  estrdup.c \
+	  print_version.c \
+	  getarg.c
+
 .PATH: ${AFSSRC}/appl/fs
 
 SRCS	+= arladebu.c fs_lib.c
diff --git a/usr.sbin/afs/usr.sbin/pts/Makefile b/usr.sbin/afs/usr.sbin/pts/Makefile
index 90ebb195586..57e3ad4f061 100644
--- a/usr.sbin/afs/usr.sbin/pts/Makefile
+++ b/usr.sbin/afs/usr.sbin/pts/Makefile
@@ -1,12 +1,15 @@
-# $OpenBSD: Makefile,v 1.2 2002/06/11 14:53:17 hin Exp $
+# $OpenBSD: Makefile,v 1.3 2003/08/05 11:11:42 hin Exp $
 
 AFSTOPDIR	= ../..
 .include <../../Makefile.inc>
 
+.PATH:	$(ROKENSRC)
+
 PROG	= pts
-SRCS	= pts.c
-LDADD	+= ${LIBARLA} ${LIBROKEN} -lkafs -lkrb -lkrb5 -lcrypto -lasn1 -lreadline -ldes -lcurses
-DPADD	+= ${LIBARLA} ${LIBROKEN} ${LIBKAFS}
+SRCS	= pts.c \
+	  estrdup.c
+LDADD	+= ${LIBARLA} -lkrb5 -lcrypto -lasn1 -lreadline -ldes -lcurses
+DPADD	+= ${LIBARLA}
 
 .PATH: ${AFSSRCDIR}/appl/pts
 
diff --git a/usr.sbin/afs/usr.sbin/vos/Makefile b/usr.sbin/afs/usr.sbin/vos/Makefile
index 8bb759be39c..2e63281c72d 100644
--- a/usr.sbin/afs/usr.sbin/vos/Makefile
+++ b/usr.sbin/afs/usr.sbin/vos/Makefile
@@ -1,19 +1,37 @@
-# $OpenBSD: Makefile,v 1.2 2002/06/11 14:53:17 hin Exp $
+# $OpenBSD: Makefile,v 1.3 2003/08/05 11:11:42 hin Exp $
 
 AFSTOPDIR	= ../..
 .include <../../Makefile.inc>
 
+.PATH:	$(ROKENSRC)
+
 PROG	= vos
 MAN	= vos.8
 BINDIR	= /usr/sbin
-SRCS	= vos.c vos_common.c vos_createentry.c vos_createvolume.c \
-	  vos_dump.c vos_endtrans.c vos_examine.c vos_listpart.c \
-	  vos_listvldb.c vos_listvol.c vos_lock.c vos_partinfo.c \
-	  vos_status.c vos_syncsite.c vos_unlock.c vos_vldbexamine.c \
-	  vos_backup.c
+SRCS	= vos.c \
+	  vos_backup.c \
+	  vos_common.c \
+	  vos_createentry.c \
+	  vos_createvolume.c \
+	  vos_dump.c \
+	  vos_endtrans.c \
+	  vos_examine.c \
+	  vos_listaddrs.c \
+	  vos_listpart.c \
+	  vos_listvldb.c \
+	  vos_listvol.c \
+	  vos_lock.c \
+	  vos_partinfo.c \
+	  vos_status.c \
+	  vos_syncsite.c \
+	  vos_unlock.c \
+	  vos_vldbexamine.c \
+	  vos_zap.c \
+	  emalloc.c \
+	  estrdup.c
 
-LDADD	+= ${LIBARLA} ${LIBROKEN} -lkafs -lkrb -lkrb5 -lcrypto -lasn1 -lreadline -ldes -lcurses
-DPADD	+= ${LIBARLA} ${LIBROKEN} ${LIBKAFS}
+LDADD	+= ${LIBARLA} -lkrb5 -lcrypto -lasn1 -lreadline -lcurses
+DPADD	+= ${LIBARLA}
 
 .PATH: ${AFSSRC}/appl/vos
 
diff --git a/usr.sbin/afs/usr.sbin/ydr/Makefile b/usr.sbin/afs/usr.sbin/ydr/Makefile
index bd6bf5cb5d9..afadbc18451 100644
--- a/usr.sbin/afs/usr.sbin/ydr/Makefile
+++ b/usr.sbin/afs/usr.sbin/ydr/Makefile
@@ -1,16 +1,20 @@
-#	$OpenBSD: Makefile,v 1.1 2002/06/07 05:02:59 hin Exp $
+#	$OpenBSD: Makefile,v 1.2 2003/08/05 11:11:42 hin Exp $
 
 AFSTOPDIR=	../..
 .include <../../Makefile.inc>
 
-SRCS		+= main.c output.c symbol.c types.c lex.c parse.c list.c hash.c
+.PATH:	$(ROKENSRC)
+
+test:
+	echo $(ROKENSRC)
+
+SRCS		+= main.c output.c symbol.c types.c lex.c parse.c list.c \
+		   hash.c arlamath.c emalloc.c estrdup.c strupr.c
 CLEANFILES	+= lex.c parse.c parse.h y.tab.h
 CFLAGS		+= -DCPP='"/usr/bin/cpp"'
 MAN		=
 BINDIR		= ${DESTDIR}/usr/bin
 PROG		= ydr
-LDADD		+= ${LIBROKEN}
-DPADD		+= ${LIBROKEN}
 
 CFLAGS		+= -I${AFSSRC}/util -I.