diff options
author | kris <kris@FreeBSD.org> | 2004-02-16 10:52:55 +0800 |
---|---|---|
committer | kris <kris@FreeBSD.org> | 2004-02-16 10:52:55 +0800 |
commit | 3ccc0394aad8f7fd6ff19d58ac189a6c0a6daaaf (patch) | |
tree | a4c11728bbf04b9797b0338bb60571c91875f8fb /net/cvsync | |
parent | 22908862e19c7a2e513d205e664655607d8f78b8 (diff) | |
download | freebsd-ports-gnome-3ccc0394aad8f7fd6ff19d58ac189a6c0a6daaaf.tar.gz freebsd-ports-gnome-3ccc0394aad8f7fd6ff19d58ac189a6c0a6daaaf.tar.zst freebsd-ports-gnome-3ccc0394aad8f7fd6ff19d58ac189a6c0a6daaaf.zip |
Respect PTHREAD_{CFLAGS,LIBS} and bump PORTREVISION
Diffstat (limited to 'net/cvsync')
-rw-r--r-- | net/cvsync/Makefile | 3 | ||||
-rw-r--r-- | net/cvsync/files/patch-mk::pthread.mk | 24 |
2 files changed, 26 insertions, 1 deletions
diff --git a/net/cvsync/Makefile b/net/cvsync/Makefile index 1e1018e4eee7..16d14ce7110d 100644 --- a/net/cvsync/Makefile +++ b/net/cvsync/Makefile @@ -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) diff --git a/net/cvsync/files/patch-mk::pthread.mk b/net/cvsync/files/patch-mk::pthread.mk new file mode 100644 index 000000000000..691ad33c6aff --- /dev/null +++ b/net/cvsync/files/patch-mk::pthread.mk @@ -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) |