Tue Dec 23 11:22:06 2008 UTC ()
* Need OpenSSL to build.
* Ensure to use BSD_MAKEFILE and pass appropriate CFLAGS.

Fixes PR 40171.


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

--- pkgsrc/net/csup/Makefile 2007/12/02 08:32:24 1.3
+++ pkgsrc/net/csup/Makefile 2008/12/23 11:22:05 1.4
@@ -1,29 +1,43 @@ @@ -1,29 +1,43 @@
1# $NetBSD: Makefile,v 1.3 2007/12/02 08:32:24 rillig Exp $ 1# $NetBSD: Makefile,v 1.4 2008/12/23 11:22:05 obache Exp $
2# 2#
3 3
4DISTNAME= csup-snap-20070216 4DISTNAME= csup-snap-20070216
5PKGNAME= ${DISTNAME:S/-snap//} 5PKGNAME= ${DISTNAME:S/-snap//}
6CATEGORIES= net devel 6CATEGORIES= net devel
7MASTER_SITES= ${MASTER_SITE_BACKUP} 7MASTER_SITES= ${MASTER_SITE_BACKUP}
8 8
9MAINTAINER= imil@gcu.info 9MAINTAINER= imil@gcu.info
10HOMEPAGE= http://www.mu.org/~mux/csup.html 10HOMEPAGE= http://www.mu.org/~mux/csup.html
11COMMENT= Rewrite of the CVSup file updating client in C 11COMMENT= Rewrite of the CVSup file updating client in C
12 12
 13PKG_DESTDIR_SUPPORT= user-destdir
 14
13USE_TOOLS+= lex yacc 15USE_TOOLS+= lex yacc
 16
 17USE_BSD_MAKEFILE= yes
 18
14WRKSRC= ${WRKDIR}/csup 19WRKSRC= ${WRKDIR}/csup
15 20
16INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 21INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/cat1
17 22
18CFLAGS+= ${PTHREAD_CFLAGS} 23CFLAGS+= ${PTHREAD_CFLAGS}
19LDFLAGS+= ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} 24LDFLAGS+= ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
20 25
21BUILDLINK_TRANSFORM+= rm:-Werror 26BUILDLINK_TRANSFORM+= rm:-Werror
22 27
23do-install: 28.include "../../mk/bsd.prefs.mk"
24 ${INSTALL_PROGRAM} ${WRKSRC}/csup ${PREFIX}/bin 29
25 ${INSTALL_MAN} ${WRKSRC}/csup.1 ${PREFIX}/${PKGMANDIR}/man1/csup.1 30.if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" \
 31 || ${OPSYS} == "DragonFly" || ${OPSYS} == "Darwin"
 32CFLAGS+= -DHAVE_FFLAGS
 33.endif
 34
 35# taken from ${WRKSRC}/GNUmakefile
 36.if ${OPSYS} == "Linux"
 37CFLAGS+= -D_XOPEN_SOURCE -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
 38.endif
26 39
27.include "../../devel/zlib/buildlink3.mk" 40.include "../../devel/zlib/buildlink3.mk"
 41.include "../../security/openssl/buildlink3.mk"
28.include "../../mk/pthread.buildlink3.mk" 42.include "../../mk/pthread.buildlink3.mk"
29.include "../../mk/bsd.pkg.mk" 43.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/net/csup/distinfo (expand / switch to unified diff)

--- pkgsrc/net/csup/distinfo 2007/07/12 06:11:54 1.3
+++ pkgsrc/net/csup/distinfo 2008/12/23 11:22:05 1.4
@@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
1$NetBSD: distinfo,v 1.3 2007/07/12 06:11:54 xtraeme Exp $ 1$NetBSD: distinfo,v 1.4 2008/12/23 11:22:05 obache Exp $
2 2
3SHA1 (csup-snap-20070216.tar.gz) = b2a5b5a95496f166caa6f4c03003fe354a4e76c2 3SHA1 (csup-snap-20070216.tar.gz) = b2a5b5a95496f166caa6f4c03003fe354a4e76c2
4RMD160 (csup-snap-20070216.tar.gz) = 7d96422461d7538b8f5ff2afaff9341a38ad2a8f 4RMD160 (csup-snap-20070216.tar.gz) = 7d96422461d7538b8f5ff2afaff9341a38ad2a8f
5Size (csup-snap-20070216.tar.gz) = 80734 bytes 5Size (csup-snap-20070216.tar.gz) = 80734 bytes
6SHA1 (patch-aa) = 9f0792cb8d3f6acd28df3db6fd6b629800c4cc1c 6SHA1 (patch-ab) = 06a9523e87eccd566fe14115698aadcfa2fb3270
7SHA1 (patch-ab) = 3ae5cc715d204d2b08042b0ace24092cbc423f01 
cvs diff -r1.1.1.1 -r1.2 pkgsrc/net/csup/PLIST (expand / switch to unified diff)

--- pkgsrc/net/csup/PLIST 2007/02/16 12:06:39 1.1.1.1
+++ pkgsrc/net/csup/PLIST 2008/12/23 11:22:05 1.2
@@ -1,3 +1,4 @@ @@ -1,3 +1,4 @@
1@comment $NetBSD: PLIST,v 1.1.1.1 2007/02/16 12:06:39 xtraeme Exp $ 1@comment $NetBSD: PLIST,v 1.2 2008/12/23 11:22:05 obache Exp $
2bin/csup 2bin/csup
 3man/cat1/csup.0
3man/man1/csup.1 4man/man1/csup.1
File Deleted: pkgsrc/net/csup/patches/patch-aa
cvs diff -r1.2 -r1.3 pkgsrc/net/csup/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/net/csup/patches/patch-ab 2007/02/20 13:31:19 1.2
+++ pkgsrc/net/csup/patches/patch-ab 2008/12/23 11:22:06 1.3
@@ -1,24 +1,23 @@ @@ -1,24 +1,23 @@
1$NetBSD: patch-ab,v 1.2 2007/02/20 13:31:19 joerg Exp $ 1$NetBSD: patch-ab,v 1.3 2008/12/23 11:22:06 obache Exp $
2 2
3--- Makefile.orig 2006-03-07 19:10:25.000000000 +0000 3--- Makefile.orig 2006-03-08 04:10:25.000000000 +0900
4+++ Makefile 4+++ Makefile
5@@ -11,33 +11,13 @@ SRCS= attrstack.c config.c detailer.c di 5@@ -11,33 +11,12 @@ SRCS= attrstack.c config.c detailer.c di
6 globtree.c idcache.c keyword.c lister.c main.c misc.c mux.c parse.y \ 6 globtree.c idcache.c keyword.c lister.c main.c misc.c mux.c parse.y \
7 pathcomp.c proto.c status.c stream.c threads.c token.l updater.c 7 pathcomp.c proto.c status.c stream.c threads.c token.l updater.c
8  8
9-CFLAGS+= -I. -I${.CURDIR} -g -pthread -DHAVE_FFLAGS -DNDEBUG 9-CFLAGS+= -I. -I${.CURDIR} -g -pthread -DHAVE_FFLAGS -DNDEBUG
10+CFLAGS+= -I. -I${.CURDIR} -g ${PTHREAD_CFLAGS} -DHAVE_FFLAGS -DNDEBUG 10+CFLAGS+= -I. -I${.CURDIR} -g -DNDEBUG
11+LDFLAGS+= ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} 
12 WARNS?= 6 11 WARNS?= 6
13  12
14-# A bit of tweaking is needed to get this Makefile working 13-# A bit of tweaking is needed to get this Makefile working
15-# with the bsd.prog.mk of all the *BSD OSes... 14-# with the bsd.prog.mk of all the *BSD OSes...
16-.if (${UNAME} == "NetBSD") 15-.if (${UNAME} == "NetBSD")
17-LDFLAGS+= -pthread 16-LDFLAGS+= -pthread
18+# The NetBSD rules apply on all pkgsrc platforms. 17+# The NetBSD rules apply on all pkgsrc platforms.
19 YHEADER= yes 18 YHEADER= yes
20  19
21-.elif (${UNAME} == "OpenBSD") 20-.elif (${UNAME} == "OpenBSD")
22-# I bet there's a better way to do this with the OpenBSD mk 21-# I bet there's a better way to do this with the OpenBSD mk
23-# framework but well, this works and I got bored. 22-# framework but well, this works and I got bored.
24-LDFLAGS+= -pthread 23-LDFLAGS+= -pthread