From 4b6675a6f8806efbc9e51fffe566137d1912750b Mon Sep 17 00:00:00 2001 From: Ulf Lilleengen Date: Tue, 2 Mar 2010 07:26:07 +0000 Subject: [PATCH] - Move csup away from contrib/ and into usr.bin/. Software is no longer contributed, and main development is happening in the FreeBSD repo. Suggested by: joel --- contrib/csup/GNUmakefile | 64 ------------------------ contrib/csup/Makefile | 48 ------------------ usr.bin/csup/Makefile | 46 +++++------------ {contrib => usr.bin}/csup/README | 0 {contrib => usr.bin}/csup/TODO | 0 {contrib => usr.bin}/csup/attrstack.c | 0 {contrib => usr.bin}/csup/attrstack.h | 0 {contrib => usr.bin}/csup/auth.c | 0 {contrib => usr.bin}/csup/auth.h | 0 {contrib => usr.bin}/csup/config.c | 0 {contrib => usr.bin}/csup/config.h | 0 {contrib => usr.bin}/csup/cpasswd.1 | 0 {contrib => usr.bin}/csup/cpasswd.sh | 0 {contrib => usr.bin}/csup/csup.1 | 0 {contrib => usr.bin}/csup/detailer.c | 0 {contrib => usr.bin}/csup/detailer.h | 0 {contrib => usr.bin}/csup/diff.c | 0 {contrib => usr.bin}/csup/diff.h | 0 {contrib => usr.bin}/csup/fattr.c | 0 {contrib => usr.bin}/csup/fattr.h | 0 {contrib => usr.bin}/csup/fattr_bsd.h | 0 {contrib => usr.bin}/csup/fattr_posix.h | 0 {contrib => usr.bin}/csup/fixups.c | 0 {contrib => usr.bin}/csup/fixups.h | 0 {contrib => usr.bin}/csup/fnmatch.c | 0 {contrib => usr.bin}/csup/fnmatch.h | 0 {contrib => usr.bin}/csup/globtree.c | 0 {contrib => usr.bin}/csup/globtree.h | 0 {contrib => usr.bin}/csup/idcache.c | 0 {contrib => usr.bin}/csup/idcache.h | 0 {contrib => usr.bin}/csup/keyword.c | 0 {contrib => usr.bin}/csup/keyword.h | 0 {contrib => usr.bin}/csup/lex.rcs.c | 0 {contrib => usr.bin}/csup/lister.c | 0 {contrib => usr.bin}/csup/lister.h | 0 {contrib => usr.bin}/csup/main.c | 0 {contrib => usr.bin}/csup/main.h | 0 {contrib => usr.bin}/csup/misc.c | 0 {contrib => usr.bin}/csup/misc.h | 0 {contrib => usr.bin}/csup/mux.c | 0 {contrib => usr.bin}/csup/mux.h | 0 {contrib => usr.bin}/csup/parse.y | 0 {contrib => usr.bin}/csup/pathcomp.c | 0 {contrib => usr.bin}/csup/pathcomp.h | 0 {contrib => usr.bin}/csup/proto.c | 0 {contrib => usr.bin}/csup/proto.h | 0 {contrib => usr.bin}/csup/queue.h | 0 {contrib => usr.bin}/csup/rcsfile.c | 0 {contrib => usr.bin}/csup/rcsfile.h | 0 {contrib => usr.bin}/csup/rcsparse.c | 0 {contrib => usr.bin}/csup/rcsparse.h | 0 {contrib => usr.bin}/csup/rcstokenizer.h | 0 {contrib => usr.bin}/csup/rcstokenizer.l | 0 {contrib => usr.bin}/csup/rsyncfile.c | 0 {contrib => usr.bin}/csup/rsyncfile.h | 0 {contrib => usr.bin}/csup/status.c | 0 {contrib => usr.bin}/csup/status.h | 0 {contrib => usr.bin}/csup/stream.c | 0 {contrib => usr.bin}/csup/stream.h | 0 {contrib => usr.bin}/csup/threads.c | 0 {contrib => usr.bin}/csup/threads.h | 0 {contrib => usr.bin}/csup/token.h | 0 {contrib => usr.bin}/csup/token.l | 0 {contrib => usr.bin}/csup/updater.c | 0 {contrib => usr.bin}/csup/updater.h | 0 65 files changed, 13 insertions(+), 145 deletions(-) delete mode 100644 contrib/csup/GNUmakefile delete mode 100644 contrib/csup/Makefile rename {contrib => usr.bin}/csup/README (100%) rename {contrib => usr.bin}/csup/TODO (100%) rename {contrib => usr.bin}/csup/attrstack.c (100%) rename {contrib => usr.bin}/csup/attrstack.h (100%) rename {contrib => usr.bin}/csup/auth.c (100%) rename {contrib => usr.bin}/csup/auth.h (100%) rename {contrib => usr.bin}/csup/config.c (100%) rename {contrib => usr.bin}/csup/config.h (100%) rename {contrib => usr.bin}/csup/cpasswd.1 (100%) rename {contrib => usr.bin}/csup/cpasswd.sh (100%) rename {contrib => usr.bin}/csup/csup.1 (100%) rename {contrib => usr.bin}/csup/detailer.c (100%) rename {contrib => usr.bin}/csup/detailer.h (100%) rename {contrib => usr.bin}/csup/diff.c (100%) rename {contrib => usr.bin}/csup/diff.h (100%) rename {contrib => usr.bin}/csup/fattr.c (100%) rename {contrib => usr.bin}/csup/fattr.h (100%) rename {contrib => usr.bin}/csup/fattr_bsd.h (100%) rename {contrib => usr.bin}/csup/fattr_posix.h (100%) rename {contrib => usr.bin}/csup/fixups.c (100%) rename {contrib => usr.bin}/csup/fixups.h (100%) rename {contrib => usr.bin}/csup/fnmatch.c (100%) rename {contrib => usr.bin}/csup/fnmatch.h (100%) rename {contrib => usr.bin}/csup/globtree.c (100%) rename {contrib => usr.bin}/csup/globtree.h (100%) rename {contrib => usr.bin}/csup/idcache.c (100%) rename {contrib => usr.bin}/csup/idcache.h (100%) rename {contrib => usr.bin}/csup/keyword.c (100%) rename {contrib => usr.bin}/csup/keyword.h (100%) rename {contrib => usr.bin}/csup/lex.rcs.c (100%) rename {contrib => usr.bin}/csup/lister.c (100%) rename {contrib => usr.bin}/csup/lister.h (100%) rename {contrib => usr.bin}/csup/main.c (100%) rename {contrib => usr.bin}/csup/main.h (100%) rename {contrib => usr.bin}/csup/misc.c (100%) rename {contrib => usr.bin}/csup/misc.h (100%) rename {contrib => usr.bin}/csup/mux.c (100%) rename {contrib => usr.bin}/csup/mux.h (100%) rename {contrib => usr.bin}/csup/parse.y (100%) rename {contrib => usr.bin}/csup/pathcomp.c (100%) rename {contrib => usr.bin}/csup/pathcomp.h (100%) rename {contrib => usr.bin}/csup/proto.c (100%) rename {contrib => usr.bin}/csup/proto.h (100%) rename {contrib => usr.bin}/csup/queue.h (100%) rename {contrib => usr.bin}/csup/rcsfile.c (100%) rename {contrib => usr.bin}/csup/rcsfile.h (100%) rename {contrib => usr.bin}/csup/rcsparse.c (100%) rename {contrib => usr.bin}/csup/rcsparse.h (100%) rename {contrib => usr.bin}/csup/rcstokenizer.h (100%) rename {contrib => usr.bin}/csup/rcstokenizer.l (100%) rename {contrib => usr.bin}/csup/rsyncfile.c (100%) rename {contrib => usr.bin}/csup/rsyncfile.h (100%) rename {contrib => usr.bin}/csup/status.c (100%) rename {contrib => usr.bin}/csup/status.h (100%) rename {contrib => usr.bin}/csup/stream.c (100%) rename {contrib => usr.bin}/csup/stream.h (100%) rename {contrib => usr.bin}/csup/threads.c (100%) rename {contrib => usr.bin}/csup/threads.h (100%) rename {contrib => usr.bin}/csup/token.h (100%) rename {contrib => usr.bin}/csup/token.l (100%) rename {contrib => usr.bin}/csup/updater.c (100%) rename {contrib => usr.bin}/csup/updater.h (100%) diff --git a/contrib/csup/GNUmakefile b/contrib/csup/GNUmakefile deleted file mode 100644 index 18fb0718f022..000000000000 --- a/contrib/csup/GNUmakefile +++ /dev/null @@ -1,64 +0,0 @@ -# A simple gmake Makefile, to be used on Linux and Darwin. It shouldn't -# be used elsewhere because it assumes that the target system doesn't -# support BSD extended file flags. -# -# $FreeBSD$ -# - -PREFIX?=/usr/local -OWNER?= 0 -GROUP?= 0 - -UNAME= $(shell uname -s) - -SRCS= attrstack.c config.c detailer.c diff.c fattr.c fixups.c fnmatch.c \ - globtree.c idcache.c keyword.c lex.rcs.c lister.c main.c misc.c mux.c \ - pathcomp.c parse.c proto.c rcsfile.c rcsparse.c rsyncfile.c status.c \ - stream.c threads.c token.c updater.c -OBJS= $(SRCS:.c=.o) - -WARNS= -Wall -W -Wno-unused-parameter -Wmissing-prototypes -Wpointer-arith \ - -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wshadow \ - -Wcast-align -Wunused-parameter -Wchar-subscripts -Winline \ - -Wnested-externs -Wredundant-decls -Wno-format-y2k - -CFLAGS+= -g -O -pipe -DNDEBUG -I$(PREFIX)/include -ifeq ($(UNAME), Linux) - CFLAGS+= -D_XOPEN_SOURCE -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -endif -ifeq ($(UNAME), Darwin) - CFLAGS+= -DHAVE_FFLAGS -endif -CFLAGS+= $(WARNS) -LDFLAGS= -L$(PREFIX)/lib -lcrypto -lz -lpthread - -.PHONY: all clean install - -all: csup csup.1.gz - -csup: $(OBJS) - $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) - -config.c: parse.h - -token.c: token.l - -parse.c: parse.y - -parse.h: parse.c - -clean: - rm -f csup $(OBJS) parse.c parse.h token.c csup.1.gz - -%.o: %.c - $(CC) $(CFLAGS) -c -o $@ $< - -%.c: %.y - $(YACC) -d -o $@ $< - -csup.1.gz: csup.1 - gzip -cn $< > $@ - -install: csup csup.1.gz - install -s -o $(OWNER) -g $(GROUP) csup $(PREFIX)/bin - install -s -o $(OWNER) -g $(GROUP) csup.1.gz $(PREFIX)/share/man/man1 diff --git a/contrib/csup/Makefile b/contrib/csup/Makefile deleted file mode 100644 index ae34e7540822..000000000000 --- a/contrib/csup/Makefile +++ /dev/null @@ -1,48 +0,0 @@ -# $FreeBSD$ - -PREFIX?= /usr/local -BINDIR?= ${PREFIX}/bin -MANDIR?= ${PREFIX}/man/man - -UNAME!= /usr/bin/uname -s - -PROG= csup -SRCS= attrstack.c auth.c config.c detailer.c diff.c fattr.c fixups.c fnmatch.c \ - globtree.c idcache.c keyword.c lister.c main.c misc.c mux.c parse.y \ - pathcomp.c proto.c status.c stream.c threads.c token.l updater.c \ - rcsfile.c rcsparse.c lex.rcs.c rsyncfile.c - -CFLAGS+= -I. -I${.CURDIR} -g -pthread -DHAVE_FFLAGS -DNDEBUG -WARNS?= 1 - -# A bit of tweaking is needed to get this Makefile working -# with the bsd.prog.mk of all the *BSD OSes... -.if (${UNAME} == "NetBSD") -LDFLAGS+= -pthread -YHEADER= yes - -.elif (${UNAME} == "OpenBSD") -# I bet there's a better way to do this with the OpenBSD mk -# framework but well, this works and I got bored. -LDFLAGS+= -pthread -YFLAGS= -d -CLEANFILES+= parse.c parse.h y.tab.h - -config.c: parse.h - -token.l: parse.h - -y.tab.h: parse.c - -parse.h: y.tab.h - cp ${.ALLSRC} ${.TARGET} - -.endif - -DPADD= ${LIBCRYPTO} ${LIBZ} -LDADD= -lcrypto -lz - -SCRIPTS= cpasswd.sh -MAN= csup.1 cpasswd.1 - -.include diff --git a/usr.bin/csup/Makefile b/usr.bin/csup/Makefile index 417de54ca65d..af1815cb14e5 100644 --- a/usr.bin/csup/Makefile +++ b/usr.bin/csup/Makefile @@ -1,42 +1,22 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../contrib/csup +PREFIX?= /usr/local +BINDIR?= ${PREFIX}/bin +MANDIR?= ${PREFIX}/man/man + +UNAME!= /usr/bin/uname -s PROG= csup -SRCS= attrstack.c \ - auth.c \ - config.c \ - detailer.c \ - diff.c \ - fattr.c \ - fixups.c \ - fnmatch.c \ - globtree.c \ - idcache.c \ - keyword.c \ - lex.rcs.c \ - lister.c \ - main.c \ - misc.c \ - mux.c \ - parse.y \ - pathcomp.c \ - proto.c \ - rcsfile.c \ - rcsparse.c \ - rsyncfile.c \ - status.c \ - stream.c \ - threads.c \ - token.l \ - updater.c +SRCS= attrstack.c auth.c config.c detailer.c diff.c fattr.c fixups.c fnmatch.c \ + globtree.c idcache.c keyword.c lister.c main.c misc.c mux.c parse.y \ + pathcomp.c proto.c status.c stream.c threads.c token.l updater.c \ + rcsfile.c rcsparse.c lex.rcs.c rsyncfile.c -CFLAGS+= -I. -I${.CURDIR}/../../contrib/csup -CFLAGS+= -DHAVE_FFLAGS -DNDEBUG -WARNS?= 1 +CFLAGS+= -I. -I${.CURDIR} -g -pthread -DHAVE_FFLAGS -DNDEBUG +WARNS?= 1 -DPADD= ${LIBCRYPTO} ${LIBZ} ${LIBPTHREAD} -LDADD= -lcrypto -lz -lpthread +DPADD= ${LIBCRYPTO} ${LIBZ} +LDADD= -lcrypto -lz SCRIPTS= cpasswd.sh MAN= csup.1 cpasswd.1 diff --git a/contrib/csup/README b/usr.bin/csup/README similarity index 100% rename from contrib/csup/README rename to usr.bin/csup/README diff --git a/contrib/csup/TODO b/usr.bin/csup/TODO similarity index 100% rename from contrib/csup/TODO rename to usr.bin/csup/TODO diff --git a/contrib/csup/attrstack.c b/usr.bin/csup/attrstack.c similarity index 100% rename from contrib/csup/attrstack.c rename to usr.bin/csup/attrstack.c diff --git a/contrib/csup/attrstack.h b/usr.bin/csup/attrstack.h similarity index 100% rename from contrib/csup/attrstack.h rename to usr.bin/csup/attrstack.h diff --git a/contrib/csup/auth.c b/usr.bin/csup/auth.c similarity index 100% rename from contrib/csup/auth.c rename to usr.bin/csup/auth.c diff --git a/contrib/csup/auth.h b/usr.bin/csup/auth.h similarity index 100% rename from contrib/csup/auth.h rename to usr.bin/csup/auth.h diff --git a/contrib/csup/config.c b/usr.bin/csup/config.c similarity index 100% rename from contrib/csup/config.c rename to usr.bin/csup/config.c diff --git a/contrib/csup/config.h b/usr.bin/csup/config.h similarity index 100% rename from contrib/csup/config.h rename to usr.bin/csup/config.h diff --git a/contrib/csup/cpasswd.1 b/usr.bin/csup/cpasswd.1 similarity index 100% rename from contrib/csup/cpasswd.1 rename to usr.bin/csup/cpasswd.1 diff --git a/contrib/csup/cpasswd.sh b/usr.bin/csup/cpasswd.sh similarity index 100% rename from contrib/csup/cpasswd.sh rename to usr.bin/csup/cpasswd.sh diff --git a/contrib/csup/csup.1 b/usr.bin/csup/csup.1 similarity index 100% rename from contrib/csup/csup.1 rename to usr.bin/csup/csup.1 diff --git a/contrib/csup/detailer.c b/usr.bin/csup/detailer.c similarity index 100% rename from contrib/csup/detailer.c rename to usr.bin/csup/detailer.c diff --git a/contrib/csup/detailer.h b/usr.bin/csup/detailer.h similarity index 100% rename from contrib/csup/detailer.h rename to usr.bin/csup/detailer.h diff --git a/contrib/csup/diff.c b/usr.bin/csup/diff.c similarity index 100% rename from contrib/csup/diff.c rename to usr.bin/csup/diff.c diff --git a/contrib/csup/diff.h b/usr.bin/csup/diff.h similarity index 100% rename from contrib/csup/diff.h rename to usr.bin/csup/diff.h diff --git a/contrib/csup/fattr.c b/usr.bin/csup/fattr.c similarity index 100% rename from contrib/csup/fattr.c rename to usr.bin/csup/fattr.c diff --git a/contrib/csup/fattr.h b/usr.bin/csup/fattr.h similarity index 100% rename from contrib/csup/fattr.h rename to usr.bin/csup/fattr.h diff --git a/contrib/csup/fattr_bsd.h b/usr.bin/csup/fattr_bsd.h similarity index 100% rename from contrib/csup/fattr_bsd.h rename to usr.bin/csup/fattr_bsd.h diff --git a/contrib/csup/fattr_posix.h b/usr.bin/csup/fattr_posix.h similarity index 100% rename from contrib/csup/fattr_posix.h rename to usr.bin/csup/fattr_posix.h diff --git a/contrib/csup/fixups.c b/usr.bin/csup/fixups.c similarity index 100% rename from contrib/csup/fixups.c rename to usr.bin/csup/fixups.c diff --git a/contrib/csup/fixups.h b/usr.bin/csup/fixups.h similarity index 100% rename from contrib/csup/fixups.h rename to usr.bin/csup/fixups.h diff --git a/contrib/csup/fnmatch.c b/usr.bin/csup/fnmatch.c similarity index 100% rename from contrib/csup/fnmatch.c rename to usr.bin/csup/fnmatch.c diff --git a/contrib/csup/fnmatch.h b/usr.bin/csup/fnmatch.h similarity index 100% rename from contrib/csup/fnmatch.h rename to usr.bin/csup/fnmatch.h diff --git a/contrib/csup/globtree.c b/usr.bin/csup/globtree.c similarity index 100% rename from contrib/csup/globtree.c rename to usr.bin/csup/globtree.c diff --git a/contrib/csup/globtree.h b/usr.bin/csup/globtree.h similarity index 100% rename from contrib/csup/globtree.h rename to usr.bin/csup/globtree.h diff --git a/contrib/csup/idcache.c b/usr.bin/csup/idcache.c similarity index 100% rename from contrib/csup/idcache.c rename to usr.bin/csup/idcache.c diff --git a/contrib/csup/idcache.h b/usr.bin/csup/idcache.h similarity index 100% rename from contrib/csup/idcache.h rename to usr.bin/csup/idcache.h diff --git a/contrib/csup/keyword.c b/usr.bin/csup/keyword.c similarity index 100% rename from contrib/csup/keyword.c rename to usr.bin/csup/keyword.c diff --git a/contrib/csup/keyword.h b/usr.bin/csup/keyword.h similarity index 100% rename from contrib/csup/keyword.h rename to usr.bin/csup/keyword.h diff --git a/contrib/csup/lex.rcs.c b/usr.bin/csup/lex.rcs.c similarity index 100% rename from contrib/csup/lex.rcs.c rename to usr.bin/csup/lex.rcs.c diff --git a/contrib/csup/lister.c b/usr.bin/csup/lister.c similarity index 100% rename from contrib/csup/lister.c rename to usr.bin/csup/lister.c diff --git a/contrib/csup/lister.h b/usr.bin/csup/lister.h similarity index 100% rename from contrib/csup/lister.h rename to usr.bin/csup/lister.h diff --git a/contrib/csup/main.c b/usr.bin/csup/main.c similarity index 100% rename from contrib/csup/main.c rename to usr.bin/csup/main.c diff --git a/contrib/csup/main.h b/usr.bin/csup/main.h similarity index 100% rename from contrib/csup/main.h rename to usr.bin/csup/main.h diff --git a/contrib/csup/misc.c b/usr.bin/csup/misc.c similarity index 100% rename from contrib/csup/misc.c rename to usr.bin/csup/misc.c diff --git a/contrib/csup/misc.h b/usr.bin/csup/misc.h similarity index 100% rename from contrib/csup/misc.h rename to usr.bin/csup/misc.h diff --git a/contrib/csup/mux.c b/usr.bin/csup/mux.c similarity index 100% rename from contrib/csup/mux.c rename to usr.bin/csup/mux.c diff --git a/contrib/csup/mux.h b/usr.bin/csup/mux.h similarity index 100% rename from contrib/csup/mux.h rename to usr.bin/csup/mux.h diff --git a/contrib/csup/parse.y b/usr.bin/csup/parse.y similarity index 100% rename from contrib/csup/parse.y rename to usr.bin/csup/parse.y diff --git a/contrib/csup/pathcomp.c b/usr.bin/csup/pathcomp.c similarity index 100% rename from contrib/csup/pathcomp.c rename to usr.bin/csup/pathcomp.c diff --git a/contrib/csup/pathcomp.h b/usr.bin/csup/pathcomp.h similarity index 100% rename from contrib/csup/pathcomp.h rename to usr.bin/csup/pathcomp.h diff --git a/contrib/csup/proto.c b/usr.bin/csup/proto.c similarity index 100% rename from contrib/csup/proto.c rename to usr.bin/csup/proto.c diff --git a/contrib/csup/proto.h b/usr.bin/csup/proto.h similarity index 100% rename from contrib/csup/proto.h rename to usr.bin/csup/proto.h diff --git a/contrib/csup/queue.h b/usr.bin/csup/queue.h similarity index 100% rename from contrib/csup/queue.h rename to usr.bin/csup/queue.h diff --git a/contrib/csup/rcsfile.c b/usr.bin/csup/rcsfile.c similarity index 100% rename from contrib/csup/rcsfile.c rename to usr.bin/csup/rcsfile.c diff --git a/contrib/csup/rcsfile.h b/usr.bin/csup/rcsfile.h similarity index 100% rename from contrib/csup/rcsfile.h rename to usr.bin/csup/rcsfile.h diff --git a/contrib/csup/rcsparse.c b/usr.bin/csup/rcsparse.c similarity index 100% rename from contrib/csup/rcsparse.c rename to usr.bin/csup/rcsparse.c diff --git a/contrib/csup/rcsparse.h b/usr.bin/csup/rcsparse.h similarity index 100% rename from contrib/csup/rcsparse.h rename to usr.bin/csup/rcsparse.h diff --git a/contrib/csup/rcstokenizer.h b/usr.bin/csup/rcstokenizer.h similarity index 100% rename from contrib/csup/rcstokenizer.h rename to usr.bin/csup/rcstokenizer.h diff --git a/contrib/csup/rcstokenizer.l b/usr.bin/csup/rcstokenizer.l similarity index 100% rename from contrib/csup/rcstokenizer.l rename to usr.bin/csup/rcstokenizer.l diff --git a/contrib/csup/rsyncfile.c b/usr.bin/csup/rsyncfile.c similarity index 100% rename from contrib/csup/rsyncfile.c rename to usr.bin/csup/rsyncfile.c diff --git a/contrib/csup/rsyncfile.h b/usr.bin/csup/rsyncfile.h similarity index 100% rename from contrib/csup/rsyncfile.h rename to usr.bin/csup/rsyncfile.h diff --git a/contrib/csup/status.c b/usr.bin/csup/status.c similarity index 100% rename from contrib/csup/status.c rename to usr.bin/csup/status.c diff --git a/contrib/csup/status.h b/usr.bin/csup/status.h similarity index 100% rename from contrib/csup/status.h rename to usr.bin/csup/status.h diff --git a/contrib/csup/stream.c b/usr.bin/csup/stream.c similarity index 100% rename from contrib/csup/stream.c rename to usr.bin/csup/stream.c diff --git a/contrib/csup/stream.h b/usr.bin/csup/stream.h similarity index 100% rename from contrib/csup/stream.h rename to usr.bin/csup/stream.h diff --git a/contrib/csup/threads.c b/usr.bin/csup/threads.c similarity index 100% rename from contrib/csup/threads.c rename to usr.bin/csup/threads.c diff --git a/contrib/csup/threads.h b/usr.bin/csup/threads.h similarity index 100% rename from contrib/csup/threads.h rename to usr.bin/csup/threads.h diff --git a/contrib/csup/token.h b/usr.bin/csup/token.h similarity index 100% rename from contrib/csup/token.h rename to usr.bin/csup/token.h diff --git a/contrib/csup/token.l b/usr.bin/csup/token.l similarity index 100% rename from contrib/csup/token.l rename to usr.bin/csup/token.l diff --git a/contrib/csup/updater.c b/usr.bin/csup/updater.c similarity index 100% rename from contrib/csup/updater.c rename to usr.bin/csup/updater.c diff --git a/contrib/csup/updater.h b/usr.bin/csup/updater.h similarity index 100% rename from contrib/csup/updater.h rename to usr.bin/csup/updater.h