Mon Apr 19 21:23:24 2010 UTC ()
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/


(zafer)
diff -r1.5 -r1.6 pkgsrc/net/csup/Makefile
diff -r1.5 -r1.6 pkgsrc/net/csup/distinfo
diff -r1.2 -r1.3 pkgsrc/net/csup/PLIST
diff -r0 -r1.3 pkgsrc/net/csup/patches/patch-aa
diff -r1.4 -r1.5 pkgsrc/net/csup/patches/patch-ab
cvs diff -r1.5 -r1.6 pkgsrc/net/csup/Makefile (expand / switch to unified diff)

--- pkgsrc/net/csup/Makefile 2010/01/17 12:02:30 1.5
+++ pkgsrc/net/csup/Makefile 2010/04/19 21:23:24 1.6
@@ -1,33 +1,34 @@ @@ -1,33 +1,34 @@
1# $NetBSD: Makefile,v 1.5 2010/01/17 12:02:30 wiz Exp $ 1# $NetBSD: Makefile,v 1.6 2010/04/19 21:23:24 zafer Exp $
2# 2#
3 3
4DISTNAME= csup-snap-20070216 4DISTNAME= csup-snap-20100404
5PKGNAME= ${DISTNAME:S/-snap//} 5PKGNAME= ${DISTNAME:S/-snap//}
6PKGREVISION= 1 
7CATEGORIES= net devel 6CATEGORIES= net devel
8MASTER_SITES= ${MASTER_SITE_BACKUP} 7MASTER_SITES= http://distfiles.aydogan.net/net/ \
 8 http://www.plhk.ru/static/csup/
9 9
10MAINTAINER= imil@gcu.info 10MAINTAINER= imil@gcu.info
11HOMEPAGE= http://www.mu.org/~mux/csup.html 11HOMEPAGE= http://www.mu.org/~mux/csup.html
12COMMENT= Rewrite of the CVSup file updating client in C 12COMMENT= Rewrite of the CVSup file updating client in C
 13LICENSE= 2-clause-bsd
13 14
14PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
15 16
16USE_TOOLS+= lex yacc 17USE_TOOLS+= lex yacc
17 18
18USE_BSD_MAKEFILE= yes 19USE_BSD_MAKEFILE= yes
19 20
20WRKSRC= ${WRKDIR}/csup 21WRKSRC= ${WRKDIR}/${DISTNAME}
21 22
22INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/cat1 23INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/cat1
23 24
24CFLAGS+= ${PTHREAD_CFLAGS} 25CFLAGS+= ${PTHREAD_CFLAGS}
25LDFLAGS+= ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} 26LDFLAGS+= ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
26 27
27BUILDLINK_TRANSFORM+= rm:-Werror 28BUILDLINK_TRANSFORM+= rm:-Werror
28 29
29.include "../../mk/bsd.prefs.mk" 30.include "../../mk/bsd.prefs.mk"
30 31
31.if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" \ 32.if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" \
32 || ${OPSYS} == "DragonFly" || ${OPSYS} == "Darwin" 33 || ${OPSYS} == "DragonFly" || ${OPSYS} == "Darwin"
33CFLAGS+= -DHAVE_FFLAGS 34CFLAGS+= -DHAVE_FFLAGS
cvs diff -r1.5 -r1.6 pkgsrc/net/csup/distinfo (expand / switch to unified diff)

--- pkgsrc/net/csup/distinfo 2009/08/01 20:01:57 1.5
+++ pkgsrc/net/csup/distinfo 2010/04/19 21:23:24 1.6
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.5 2009/08/01 20:01:57 dholland Exp $ 1$NetBSD: distinfo,v 1.6 2010/04/19 21:23:24 zafer Exp $
2 2
3SHA1 (csup-snap-20070216.tar.gz) = b2a5b5a95496f166caa6f4c03003fe354a4e76c2 3SHA1 (csup-snap-20100404.tar.gz) = 05598a6a56c15b86a7b3e6658ddf5b144d662867
4RMD160 (csup-snap-20070216.tar.gz) = 7d96422461d7538b8f5ff2afaff9341a38ad2a8f 4RMD160 (csup-snap-20100404.tar.gz) = d78906c6dbc110f828ea3848df84a569aec43733
5Size (csup-snap-20070216.tar.gz) = 80734 bytes 5Size (csup-snap-20100404.tar.gz) = 124351 bytes
6SHA1 (patch-ab) = e97991969a42613a021e389ce228cd475cf3cac2 6SHA1 (patch-aa) = 7f5491d7d3a5c6e636b6c027a0dfb890425037dc
 7SHA1 (patch-ab) = 47af904f0a1c56cb99f565916a6a8c416c47a49c
cvs diff -r1.2 -r1.3 pkgsrc/net/csup/PLIST (expand / switch to unified diff)

--- pkgsrc/net/csup/PLIST 2008/12/23 11:22:05 1.2
+++ pkgsrc/net/csup/PLIST 2010/04/19 21:23:24 1.3
@@ -1,4 +1,7 @@ @@ -1,4 +1,7 @@
1@comment $NetBSD: PLIST,v 1.2 2008/12/23 11:22:05 obache Exp $ 1@comment $NetBSD: PLIST,v 1.3 2010/04/19 21:23:24 zafer Exp $
 2bin/cpasswd
2bin/csup 3bin/csup
 4man/cat1/cpasswd.0
3man/cat1/csup.0 5man/cat1/csup.0
 6man/man1/cpasswd.1
4man/man1/csup.1 7man/man1/csup.1
File Added: pkgsrc/net/csup/patches/patch-aa
$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>
cvs diff -r1.4 -r1.5 pkgsrc/net/csup/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/net/csup/patches/patch-ab 2009/08/01 20:01:57 1.4
+++ pkgsrc/net/csup/patches/patch-ab 2010/04/19 21:23:24 1.5
@@ -1,47 +1,18 @@ @@ -1,47 +1,18 @@
1$NetBSD: patch-ab,v 1.4 2009/08/01 20:01:57 dholland Exp $ 1$NetBSD: patch-ab,v 1.5 2010/04/19 21:23:24 zafer Exp $
2 2
3--- Makefile.orig 2006-03-07 14:10:25.000000000 -0500 3--- Makefile.orig 2010-04-04 19:34:56.000000000 +0000
4+++ Makefile 2009-08-01 16:02:17.000000000 -0400 4+++ Makefile
5@@ -4,40 +4,17 @@ 5@@ -30,9 +30,12 @@ SRCS= attrstack.c \
6 BINDIR?= ${PREFIX}/bin 6 updater.c
7 MANDIR?= ${PREFIX}/man/man 
8  7
9-UNAME!= /usr/bin/uname -s 8 CFLAGS+= -I. -I${.CURDIR}
10- 9-CFLAGS+= -DHAVE_FFLAGS -DNDEBUG
11 PROG= csup 10+CFLAGS+= -DNDEBUG
12 SRCS= attrstack.c config.c detailer.c diff.c fattr.c fixups.c fnmatch.c \ 11 WARNS?= 1
13 globtree.c idcache.c keyword.c lister.c main.c misc.c mux.c parse.y \ 
14 pathcomp.c proto.c status.c stream.c threads.c token.l updater.c 
15  12
16-CFLAGS+= -I. -I${.CURDIR} -g -pthread -DHAVE_FFLAGS -DNDEBUG 13+LDFLAGS+= -pthread
17+CFLAGS+= -I. -I${.CURDIR} -g -DNDEBUG 14+YHEADER= yes
18 WARNS?= 6 15+
19  16 DPADD= ${LIBCRYPTO} ${LIBZ} ${LIBPTHREAD}
20-# A bit of tweaking is needed to get this Makefile working 17 LDADD= -lcrypto -lz -lpthread
21-# with the bsd.prog.mk of all the *BSD OSes... 
22-.if (${UNAME} == "NetBSD") 
23-LDFLAGS+= -pthread 
24+# The NetBSD rules apply on all pkgsrc platforms. 
25 YHEADER= yes 
26  
27-.elif (${UNAME} == "OpenBSD") 
28-# I bet there's a better way to do this with the OpenBSD mk 
29-# framework but well, this works and I got bored. 
30-LDFLAGS+= -pthread 
31-YFLAGS= -d 
32-CLEANFILES+= parse.c parse.h y.tab.h 
33- 
34-config.c: parse.h 
35- 
36-token.l: parse.h 
37- 
38-y.tab.h: parse.c 
39- 
40-parse.h: y.tab.h 
41- cp ${.ALLSRC} ${.TARGET} 
42- 
43-.endif 
44- 
45 DPADD= ${LIBCRYPTO} ${LIBZ} 
46 LDADD= -lcrypto -lz 
47  18