* Need OpenSSL to build.

* Ensure to use BSD_MAKEFILE and pass appropriate CFLAGS.

Fixes PR 40171.
This commit is contained in:
obache 2008-12-23 11:22:05 +00:00
parent b5c044f05a
commit 678915fe8d
5 changed files with 29 additions and 29 deletions

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.3 2007/12/02 08:32:24 rillig Exp $
# $NetBSD: Makefile,v 1.4 2008/12/23 11:22:05 obache Exp $
#
DISTNAME= csup-snap-20070216
@ -10,20 +10,34 @@ MAINTAINER= imil@gcu.info
HOMEPAGE= http://www.mu.org/~mux/csup.html
COMMENT= Rewrite of the CVSup file updating client in C
PKG_DESTDIR_SUPPORT= user-destdir
USE_TOOLS+= lex yacc
USE_BSD_MAKEFILE= yes
WRKSRC= ${WRKDIR}/csup
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/cat1
CFLAGS+= ${PTHREAD_CFLAGS}
LDFLAGS+= ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
CFLAGS+= ${PTHREAD_CFLAGS}
LDFLAGS+= ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
BUILDLINK_TRANSFORM+= rm:-Werror
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/csup ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/csup.1 ${PREFIX}/${PKGMANDIR}/man1/csup.1
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" \
|| ${OPSYS} == "DragonFly" || ${OPSYS} == "Darwin"
CFLAGS+= -DHAVE_FFLAGS
.endif
# taken from ${WRKSRC}/GNUmakefile
.if ${OPSYS} == "Linux"
CFLAGS+= -D_XOPEN_SOURCE -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
.endif
.include "../../devel/zlib/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

View file

@ -1,3 +1,4 @@
@comment $NetBSD: PLIST,v 1.1.1.1 2007/02/16 12:06:39 xtraeme Exp $
@comment $NetBSD: PLIST,v 1.2 2008/12/23 11:22:05 obache Exp $
bin/csup
man/cat1/csup.0
man/man1/csup.1

View file

@ -1,7 +1,6 @@
$NetBSD: distinfo,v 1.3 2007/07/12 06:11:54 xtraeme Exp $
$NetBSD: distinfo,v 1.4 2008/12/23 11:22:05 obache 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-aa) = 9f0792cb8d3f6acd28df3db6fd6b629800c4cc1c
SHA1 (patch-ab) = 3ae5cc715d204d2b08042b0ace24092cbc423f01
SHA1 (patch-ab) = 06a9523e87eccd566fe14115698aadcfa2fb3270

View file

@ -1,13 +0,0 @@
$NetBSD: patch-aa,v 1.1.1.1 2007/02/16 12:06:39 xtraeme Exp $
--- GNUmakefile.orig 2006-03-13 23:17:59.000000000 +0100
+++ GNUmakefile
@@ -29,7 +29,7 @@ ifeq ($(UNAME), Darwin)
CFLAGS+= -DHAVE_FFLAGS
endif
CFLAGS+= $(WARNS)
-LDFLAGS= -L$(PREFIX)/lib -lcrypto -lz -lpthread
+LDFLAGS= -L$(PREFIX)/lib -lcrypto -lz ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
.PHONY: all clean install

View file

@ -1,14 +1,13 @@
$NetBSD: patch-ab,v 1.2 2007/02/20 13:31:19 joerg Exp $
$NetBSD: patch-ab,v 1.3 2008/12/23 11:22:06 obache Exp $
--- Makefile.orig 2006-03-07 19:10:25.000000000 +0000
--- Makefile.orig 2006-03-08 04:10:25.000000000 +0900
+++ Makefile
@@ -11,33 +11,13 @@ SRCS= attrstack.c config.c detailer.c di
@@ -11,33 +11,12 @@ SRCS= attrstack.c config.c detailer.c di
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} -g -pthread -DHAVE_FFLAGS -DNDEBUG
+CFLAGS+= -I. -I${.CURDIR} -g ${PTHREAD_CFLAGS} -DHAVE_FFLAGS -DNDEBUG
+LDFLAGS+= ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
+CFLAGS+= -I. -I${.CURDIR} -g -DNDEBUG
WARNS?= 6
-# A bit of tweaking is needed to get this Makefile working