Respect PTHREAD_{CFLAGS,LIBS} and bump PORTREVISION

This commit is contained in:
Kris Kennaway 2004-02-16 02:52:55 +00:00
parent b3ad513018
commit cb61c9cc0c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=101006
2 changed files with 26 additions and 1 deletions

View file

@ -7,7 +7,7 @@
PORTNAME= cvsync
PORTVERSION= 0.24.13
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= net ipv6
MASTER_SITES= ftp://ftp.cvsync.org/pub/cvsync/ \
ftp://ftp.allbsd.org/pub/cvsync/
@ -22,6 +22,7 @@ DOCS= doc/COPYRIGHT doc/ChangeLog doc/FAQ doc/TODO
EXAMPLES= samples/cvsync.conf samples/cvsyncd.conf \
samples/cvsyncd-NetBSD.conf samples/cvsyncd-OpenBSD.conf
MAKE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}"
MAKE_FLAGS= OSVER="${OSVERSION}"
.if defined(WITH_OPENSSL)

View file

@ -0,0 +1,24 @@
--- mk/pthread.mk.orig Fri Oct 31 22:36:21 2003
+++ mk/pthread.mk Sun Feb 15 18:52:26 2004
@@ -35,7 +35,7 @@
PTHREAD_TYPE ?= native
-CFLAGS += -D_REENTRANT -D_THREAD_SAFE
+CFLAGS += ${PTHREAD_CFLAGS}
ifeq (${PTHREAD_TYPE}, native) # native POSIX thread
@@ -48,11 +48,7 @@
endif # CYGWIN
ifeq (${HOST_OS}, FreeBSD)
-ifeq ($(shell ${TEST} ${OSVER} -lt 500016 && ${ECHO} yes), yes)
-LDFLAGS+= -pthread
-else # 500016
-LIBS += -lc_r
-endif # 500016
+LIBS += ${PTHREAD_LIBS}
endif # FreeBSD
ifeq (${HOST_OS}, Linux)