pkg/43120: net/csup update

[polachok%gmail.com@localhost]

>Number:         43120
>Category:       pkg
>Synopsis:       net/csup update
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sun Apr 04 20:20:01 +0000 2010
>Originator:     Alexander Polakov
>Release:        n/a
>Organization:
>Environment:
DragonFly noisy 2.7-DEVELOPMENT DragonFly v2.7.0.45.g5d6a9-DEVELOPMENT #16: Fri 
Apr  2 23:54:49 MSD 2010     polachok@noisy:/usr/obj/usr/src/sys/XEON  i386

>Description:
net/csup in pkgsrc is 3 years old while being actively developed inside the 
FreeBSD tree. So I took a snapshot from today's -CURRENT and put it online in a 
tarball (well, you can always do it yourself if you don't trust me).
Built and tested on DragonFly by checking out NetBSD tree, works just fine.
>How-To-Repeat:

>Fix:
diff --git a/net/csup/Makefile b/net/csup/Makefile
index 9ffebdc..8398677 100644
--- a/net/csup/Makefile
+++ b/net/csup/Makefile
@@ -1,11 +1,12 @@
 # $NetBSD: Makefile,v 1.5 2010/01/17 12:02:30 wiz 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= ${MASTER_SITE_BACKUP}
+MASTER_SITES=  http://www.plhk.ru/static/csup/
 
 MAINTAINER=    imil%gcu.info@localhost
 HOMEPAGE=      http://www.mu.org/~mux/csup.html
@@ -17,14 +18,14 @@ USE_TOOLS+= lex yacc
 
 USE_BSD_MAKEFILE=      yes
 
-WRKSRC=                ${WRKDIR}/csup
+WRKSRC=                ${WRKDIR}/${DISTNAME}
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 ${PKGMANDIR}/cat1
 
 CFLAGS+=       ${PTHREAD_CFLAGS}
 LDFLAGS+=      ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
 
-BUILDLINK_TRANSFORM+=  rm:-Werror
+BUILDLINK_TRANSFORM+=  rm:-Werror
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/net/csup/distinfo b/net/csup/distinfo
index 1414f49..58c6bfc 100644
--- a/net/csup/distinfo
+++ b/net/csup/distinfo
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.5 2009/08/01 20:01:57 dholland 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-ab) = 572e493d3637a66ad26cf151af00149476b99740
diff --git a/net/csup/patches/patch-ab b/net/csup/patches/patch-ab
index e02b6fb..9a772fb 100644
--- a/net/csup/patches/patch-ab
+++ b/net/csup/patches/patch-ab
@@ -1,47 +1,17 @@
-$NetBSD: patch-ab,v 1.4 2009/08/01 20:01:57 dholland 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 23:53:40 +0400
++++ Makefile   2010-04-04 23:56:13 +0400
+@@ -30,9 +30,13 @@
+       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
++# pkgsrc 
++LDFLAGS+=       -pthread
++YHEADER=        yes
++
+ DPADD=        ${LIBCRYPTO} ${LIBZ} ${LIBPTHREAD}
+ LDADD=        -lcrypto -lz -lpthread