- 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

1 files changed, 13 insertions, 33 deletions

diff --git a/usr.bin/csup/Makefile b/usr.bin/csup/Makefile
index 417de54..af1815c 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