diff options
| -rw-r--r-- | devel/apr/Makefile | 7 | ||||
| -rw-r--r-- | devel/apr/files/patch-apr_hints.m4 | 15 | ||||
| -rw-r--r-- | devel/apr0/Makefile | 7 | ||||
| -rw-r--r-- | devel/apr0/files/patch-apr_hints.m4 | 15 | ||||
| -rw-r--r-- | devel/apr1/Makefile | 7 | ||||
| -rw-r--r-- | devel/apr1/files/patch-apr_hints.m4 | 15 | ||||
| -rw-r--r-- | devel/apr2/Makefile | 7 | ||||
| -rw-r--r-- | devel/apr2/files/patch-apr_hints.m4 | 15 |
8 files changed, 72 insertions, 16 deletions
diff --git a/devel/apr/Makefile b/devel/apr/Makefile index f2fbf9f39b78..fb0d46aa2f45 100644 --- a/devel/apr/Makefile +++ b/devel/apr/Makefile @@ -123,10 +123,9 @@ pre-extract: .endif @${ECHO_MSG} "" -post-extract: - cd ${WRKDIR}; \ - ${LN} -s apr-APR_0_9_BRANCH apr-${PORTVERSION}; \ - ${LN} -s apr-util-APU_0_9_BRANCH apr-util-${PORTVERSION} +post-patch: + sed -i .orig1 's/OSVERSION/'${OSVERSION}'/g' \ + ${WRKDIR}/apr-${PORTVERSION}/build/apr_hints.m4 pre-configure: .for d in apr apr-util diff --git a/devel/apr/files/patch-apr_hints.m4 b/devel/apr/files/patch-apr_hints.m4 new file mode 100644 index 000000000000..f87447d8841c --- /dev/null +++ b/devel/apr/files/patch-apr_hints.m4 @@ -0,0 +1,15 @@ +--- apr-1.0.0/build/apr_hints.m4.orig Wed Oct 27 11:12:28 2004 ++++ apr-1.0.0/build/apr_hints.m4 Wed Oct 27 11:25:32 2004 +@@ -137,11 +137,7 @@ + ;; + *-freebsd*) + APR_SETIFNULL(apr_lock_method, [USE_FLOCK_SERIALIZE]) +- if test -x /sbin/sysctl; then +- os_version=`/sbin/sysctl -n kern.osreldate` +- else +- os_version=000000 +- fi ++ os_version="OSVERSION" + # 502102 is when libc_r switched to libpthread (aka libkse). + if test $os_version -ge "502102"; then + apr_cv_pthreads_cflags="none" diff --git a/devel/apr0/Makefile b/devel/apr0/Makefile index f2fbf9f39b78..fb0d46aa2f45 100644 --- a/devel/apr0/Makefile +++ b/devel/apr0/Makefile @@ -123,10 +123,9 @@ pre-extract: .endif @${ECHO_MSG} "" -post-extract: - cd ${WRKDIR}; \ - ${LN} -s apr-APR_0_9_BRANCH apr-${PORTVERSION}; \ - ${LN} -s apr-util-APU_0_9_BRANCH apr-util-${PORTVERSION} +post-patch: + sed -i .orig1 's/OSVERSION/'${OSVERSION}'/g' \ + ${WRKDIR}/apr-${PORTVERSION}/build/apr_hints.m4 pre-configure: .for d in apr apr-util diff --git a/devel/apr0/files/patch-apr_hints.m4 b/devel/apr0/files/patch-apr_hints.m4 new file mode 100644 index 000000000000..f87447d8841c --- /dev/null +++ b/devel/apr0/files/patch-apr_hints.m4 @@ -0,0 +1,15 @@ +--- apr-1.0.0/build/apr_hints.m4.orig Wed Oct 27 11:12:28 2004 ++++ apr-1.0.0/build/apr_hints.m4 Wed Oct 27 11:25:32 2004 +@@ -137,11 +137,7 @@ + ;; + *-freebsd*) + APR_SETIFNULL(apr_lock_method, [USE_FLOCK_SERIALIZE]) +- if test -x /sbin/sysctl; then +- os_version=`/sbin/sysctl -n kern.osreldate` +- else +- os_version=000000 +- fi ++ os_version="OSVERSION" + # 502102 is when libc_r switched to libpthread (aka libkse). + if test $os_version -ge "502102"; then + apr_cv_pthreads_cflags="none" diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile index f2fbf9f39b78..fb0d46aa2f45 100644 --- a/devel/apr1/Makefile +++ b/devel/apr1/Makefile @@ -123,10 +123,9 @@ pre-extract: .endif @${ECHO_MSG} "" -post-extract: - cd ${WRKDIR}; \ - ${LN} -s apr-APR_0_9_BRANCH apr-${PORTVERSION}; \ - ${LN} -s apr-util-APU_0_9_BRANCH apr-util-${PORTVERSION} +post-patch: + sed -i .orig1 's/OSVERSION/'${OSVERSION}'/g' \ + ${WRKDIR}/apr-${PORTVERSION}/build/apr_hints.m4 pre-configure: .for d in apr apr-util diff --git a/devel/apr1/files/patch-apr_hints.m4 b/devel/apr1/files/patch-apr_hints.m4 new file mode 100644 index 000000000000..f87447d8841c --- /dev/null +++ b/devel/apr1/files/patch-apr_hints.m4 @@ -0,0 +1,15 @@ +--- apr-1.0.0/build/apr_hints.m4.orig Wed Oct 27 11:12:28 2004 ++++ apr-1.0.0/build/apr_hints.m4 Wed Oct 27 11:25:32 2004 +@@ -137,11 +137,7 @@ + ;; + *-freebsd*) + APR_SETIFNULL(apr_lock_method, [USE_FLOCK_SERIALIZE]) +- if test -x /sbin/sysctl; then +- os_version=`/sbin/sysctl -n kern.osreldate` +- else +- os_version=000000 +- fi ++ os_version="OSVERSION" + # 502102 is when libc_r switched to libpthread (aka libkse). + if test $os_version -ge "502102"; then + apr_cv_pthreads_cflags="none" diff --git a/devel/apr2/Makefile b/devel/apr2/Makefile index f2fbf9f39b78..fb0d46aa2f45 100644 --- a/devel/apr2/Makefile +++ b/devel/apr2/Makefile @@ -123,10 +123,9 @@ pre-extract: .endif @${ECHO_MSG} "" -post-extract: - cd ${WRKDIR}; \ - ${LN} -s apr-APR_0_9_BRANCH apr-${PORTVERSION}; \ - ${LN} -s apr-util-APU_0_9_BRANCH apr-util-${PORTVERSION} +post-patch: + sed -i .orig1 's/OSVERSION/'${OSVERSION}'/g' \ + ${WRKDIR}/apr-${PORTVERSION}/build/apr_hints.m4 pre-configure: .for d in apr apr-util diff --git a/devel/apr2/files/patch-apr_hints.m4 b/devel/apr2/files/patch-apr_hints.m4 new file mode 100644 index 000000000000..f87447d8841c --- /dev/null +++ b/devel/apr2/files/patch-apr_hints.m4 @@ -0,0 +1,15 @@ +--- apr-1.0.0/build/apr_hints.m4.orig Wed Oct 27 11:12:28 2004 ++++ apr-1.0.0/build/apr_hints.m4 Wed Oct 27 11:25:32 2004 +@@ -137,11 +137,7 @@ + ;; + *-freebsd*) + APR_SETIFNULL(apr_lock_method, [USE_FLOCK_SERIALIZE]) +- if test -x /sbin/sysctl; then +- os_version=`/sbin/sysctl -n kern.osreldate` +- else +- os_version=000000 +- fi ++ os_version="OSVERSION" + # 502102 is when libc_r switched to libpthread (aka libkse). + if test $os_version -ge "502102"; then + apr_cv_pthreads_cflags="none" |