Update csup to csup-snap-20100404

Changelog since 20070216:
Its part the FreeBSD base system.
http://www.freebsd.org/cgi/cvsweb.cgi/src/usr.bin/csup/

5 files changed, 43 insertions, 54 deletions

diff --git a/net/csup/Makefile b/net/csup/Makefile
index 9ffebdc08ed..476aa24f2a4 100644
--- a/net/csup/Makefile
+++ b/net/csup/Makefile
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.5 2010/01/17 12:02:30 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2010/04/19 21:23:24 zafer Exp $
 #
 
-DISTNAME=	csup-snap-20070216
+DISTNAME=	csup-snap-20100404
 PKGNAME=	${DISTNAME:S/-snap//}
-PKGREVISION=	1
 CATEGORIES=	net devel
-MASTER_SITES=	${MASTER_SITE_BACKUP}
+MASTER_SITES=	http://distfiles.aydogan.net/net/ \
+				http://www.plhk.ru/static/csup/
 
 MAINTAINER=	imil@gcu.info
 HOMEPAGE=	http://www.mu.org/~mux/csup.html
 COMMENT=	Rewrite of the CVSup file updating client in C
+LICENSE=	2-clause-bsd
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -17,7 +18,7 @@ USE_TOOLS+=	lex yacc
 
 USE_BSD_MAKEFILE=	yes
 
-WRKSRC=		${WRKDIR}/csup
+WRKSRC=		${WRKDIR}/${DISTNAME}
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/cat1
 
diff --git a/net/csup/PLIST b/net/csup/PLIST
index b3d5a5709f4..8b5d7b5ffce 100644
--- a/net/csup/PLIST
+++ b/net/csup/PLIST
@@ -1,4 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2008/12/23 11:22:05 obache Exp $
+@comment $NetBSD: PLIST,v 1.3 2010/04/19 21:23:24 zafer Exp $
+bin/cpasswd
 bin/csup
+man/cat1/cpasswd.0
 man/cat1/csup.0
+man/man1/cpasswd.1
 man/man1/csup.1
diff --git a/net/csup/distinfo b/net/csup/distinfo
index 1414f49b28b..1aaf2223d87 100644
--- a/net/csup/distinfo
+++ b/net/csup/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2009/08/01 20:01:57 dholland Exp $
+$NetBSD: distinfo,v 1.6 2010/04/19 21:23:24 zafer Exp $
 
-SHA1 (csup-snap-20070216.tar.gz) = b2a5b5a95496f166caa6f4c03003fe354a4e76c2
-RMD160 (csup-snap-20070216.tar.gz) = 7d96422461d7538b8f5ff2afaff9341a38ad2a8f
-Size (csup-snap-20070216.tar.gz) = 80734 bytes
-SHA1 (patch-ab) = e97991969a42613a021e389ce228cd475cf3cac2
+SHA1 (csup-snap-20100404.tar.gz) = 05598a6a56c15b86a7b3e6658ddf5b144d662867
+RMD160 (csup-snap-20100404.tar.gz) = d78906c6dbc110f828ea3848df84a569aec43733
+Size (csup-snap-20100404.tar.gz) = 124351 bytes
+SHA1 (patch-aa) = 7f5491d7d3a5c6e636b6c027a0dfb890425037dc
+SHA1 (patch-ab) = 47af904f0a1c56cb99f565916a6a8c416c47a49c
diff --git a/net/csup/patches/patch-aa b/net/csup/patches/patch-aa
new file mode 100644
index 00000000000..340d042b5b5
--- /dev/null
+++ b/net/csup/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.3 2010/04/19 21:23:24 zafer Exp $
+
+--- diff.c.orig	2010-04-19 20:45:00.000000000 +0000
++++ diff.c
+@@ -26,7 +26,7 @@
+  * $FreeBSD: src/usr.bin/csup/diff.c,v 1.1 2010/03/02 07:26:07 lulf Exp $
+  */
+ 
+-#include <sys/limits.h>
++#include <limits.h>
+ 
+ #include <assert.h>
+ #include <err.h>
diff --git a/net/csup/patches/patch-ab b/net/csup/patches/patch-ab
index e02b6fb5528..acdb6cd8e8a 100644
--- a/net/csup/patches/patch-ab
+++ b/net/csup/patches/patch-ab
@@ -1,47 +1,18 @@
-$NetBSD: patch-ab,v 1.4 2009/08/01 20:01:57 dholland Exp $
+$NetBSD: patch-ab,v 1.5 2010/04/19 21:23:24 zafer Exp $
 
---- Makefile.orig	2006-03-07 14:10:25.000000000 -0500
-+++ Makefile	2009-08-01 16:02:17.000000000 -0400
-@@ -4,40 +4,17 @@
- BINDIR?=	${PREFIX}/bin
- MANDIR?=	${PREFIX}/man/man
+--- Makefile.orig	2010-04-04 19:34:56.000000000 +0000
++++ Makefile
+@@ -30,9 +30,12 @@ SRCS=	attrstack.c \
+ 	updater.c
  
--UNAME!=		/usr/bin/uname -s
--
- PROG=	csup
- SRCS=	attrstack.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
+ CFLAGS+= -I. -I${.CURDIR}
+-CFLAGS+= -DHAVE_FFLAGS -DNDEBUG
++CFLAGS+= -DNDEBUG
+ WARNS?=	1
  
--CFLAGS+=	-I. -I${.CURDIR} -g -pthread -DHAVE_FFLAGS -DNDEBUG
-+CFLAGS+=	-I. -I${.CURDIR} -g -DNDEBUG
- WARNS?=		6
- 
--# 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
-+# The NetBSD rules apply on all pkgsrc platforms.
- 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
++LDFLAGS+=	-pthread
++YHEADER=	yes
++
+ DPADD=	${LIBCRYPTO} ${LIBZ} ${LIBPTHREAD}
+ LDADD=	-lcrypto -lz -lpthread