From owner-svn-src-all@FreeBSD.ORG  Wed Mar  3 08:23:21 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2741D106566B;
	Wed,  3 Mar 2010 08:23:21 +0000 (UTC)
	(envelope-from lulf@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 168FD8FC15;
	Wed,  3 Mar 2010 08:23:21 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o238NJsb094226;
	Wed, 3 Mar 2010 08:23:19 GMT (envelope-from lulf@svn.freebsd.org)
Received: (from lulf@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o238NJ4O094224;
	Wed, 3 Mar 2010 08:23:19 GMT (envelope-from lulf@svn.freebsd.org)
Message-Id: <201003030823.o238NJ4O094224@svn.freebsd.org>
From: Ulf Lilleengen <lulf@FreeBSD.org>
Date: Wed, 3 Mar 2010 08:23:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204628 - head/usr.bin/csup
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Mar 2010 08:23:21 -0000

Author: lulf
Date: Wed Mar  3 08:23:19 2010
New Revision: 204628
URL: http://svn.freebsd.org/changeset/base/204628

Log:
  - Revert Makefile to revision r203368, as the svn mv from contrib/csup replaced
    the Makefile with a broken version.

Modified:
  head/usr.bin/csup/Makefile

Modified: head/usr.bin/csup/Makefile
==============================================================================
--- head/usr.bin/csup/Makefile	Wed Mar  3 07:38:12 2010	(r204627)
+++ head/usr.bin/csup/Makefile	Wed Mar  3 08:23:19 2010	(r204628)
@@ -1,22 +1,40 @@
 # $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
+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
+
+CFLAGS+= -I. -I${.CURDIR}/../../contrib/csup
+CFLAGS+= -DHAVE_FFLAGS -DNDEBUG
+WARNS?=	1
 
-DPADD=	${LIBCRYPTO} ${LIBZ}
-LDADD=	-lcrypto -lz
+DPADD=	${LIBCRYPTO} ${LIBZ} ${LIBPTHREAD}
+LDADD=	-lcrypto -lz -lpthread
 
 SCRIPTS=	cpasswd.sh
 MAN=		csup.1 cpasswd.1