diff options
| author | Lev A. Serebryakov <lev@FreeBSD.org> | 2003-11-10 07:45:43 +0000 |
|---|---|---|
| committer | Lev A. Serebryakov <lev@FreeBSD.org> | 2003-11-10 07:45:43 +0000 |
| commit | df5b1a63615e1880ae1a2ecf3031733ca6c95080 (patch) | |
| tree | f2283c5deb58ab6e918b3470fb4d3be141d9fc10 /devel/apr1 | |
| parent | 45b00b4d1c8170fc01933111d747d11112adf77a (diff) | |
| download | ports-df5b1a63615e1880ae1a2ecf3031733ca6c95080.tar.gz ports-df5b1a63615e1880ae1a2ecf3031733ca6c95080.zip | |
Notes
Diffstat (limited to 'devel/apr1')
| -rw-r--r-- | devel/apr1/Makefile | 2 | ||||
| -rw-r--r-- | devel/apr1/files/patch-apr_hints.m4 | 25 |
2 files changed, 20 insertions, 7 deletions
diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile index b09185071dc9..32fa63fa338d 100644 --- a/devel/apr1/Makefile +++ b/devel/apr1/Makefile @@ -14,7 +14,7 @@ PORTNAME= apr PORTVERSION= 0.9.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= http://www.apache.org/dist/apr/ DISTFILES= apr-${PORTVERSION}.tar.gz apr-util-${PORTVERSION}.tar.gz diff --git a/devel/apr1/files/patch-apr_hints.m4 b/devel/apr1/files/patch-apr_hints.m4 index 4adc12fafe34..7c8f8547efff 100644 --- a/devel/apr1/files/patch-apr_hints.m4 +++ b/devel/apr1/files/patch-apr_hints.m4 @@ -1,12 +1,25 @@ ---- apr-0.9.4/build/apr_hints.m4.orig Sun Nov 2 01:23:53 2003 -+++ apr-0.9.4/build/apr_hints.m4 Sun Nov 2 01:24:44 2003 -@@ -135,9 +135,7 @@ - APR_ADDTO(CFLAGS, [-funsigned-char]) - ;; - esac +--- apr-0.9.4/build/apr_hints.m4.orig Mon Jun 2 11:52:28 2003 ++++ apr-0.9.4/build/apr_hints.m4 Sun Nov 9 18:15:30 2003 +@@ -130,14 +130,15 @@ + APR_ADDTO(CPPFLAGS, [-DNETBSD]) + ;; + *-freebsd*) +- case $host in +- *freebsd[2345]*) +- APR_ADDTO(CFLAGS, [-funsigned-char]) +- ;; +- esac - APR_SETIFNULL(enable_threads, [no]) ++ os_version=`sysctl -n kern.osreldate` ++ APR_ADDTO(CFLAGS, [-funsigned-char]) APR_SETIFNULL(apr_lock_method, [USE_FLOCK_SERIALIZE]) - APR_ADDTO(CPPFLAGS, [-D_REENTRANT -D_THREAD_SAFE]) ++ if test $os_version -lt "500016"; then ++ ac_cv_pthreads_cflags="-D_THREAD_SAFE -D_REENTRANT" ++ APR_ADDTO(LIBS, [-pthread]) ++ else ++ ac_cv_pthreads_lib="c_r" ++ fi ;; *-next-nextstep*) APR_SETIFNULL(CFLAGS, [-O]) |