diff --git a/devel/apr/Makefile b/devel/apr/Makefile index 280c0ef7f95..388c7cfd67f 100644 --- a/devel/apr/Makefile +++ b/devel/apr/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.2 2004/12/09 01:12:13 kevlo Exp $ +# $OpenBSD: Makefile,v 1.3 2005/01/20 18:48:54 alek Exp $ COMMENT= "Apache Portable Runtime" DISTNAME= apr-1.0.1 -PKGNAME= apr-1.0.1p0 +PKGNAME= apr-1.0.1p1 CATEGORIES= devel MAINTAINER= Aleksander Piotrowski @@ -22,6 +22,7 @@ MASTER_SITES= http://www.apache.org/dist/apr/ \ CONFIGURE_STYLE=gnu CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ --with-installbuilddir=${LOCALBASE}/lib/apr-1/ \ - --enable-other-child + --enable-other-child \ + --disable-threads .include diff --git a/devel/apr/patches/patch-configure b/devel/apr/patches/patch-configure new file mode 100644 index 00000000000..c9b6ba4cad4 --- /dev/null +++ b/devel/apr/patches/patch-configure @@ -0,0 +1,23 @@ +$OpenBSD: patch-configure,v 1.3 2005/01/20 18:48:54 alek Exp $ +--- configure.orig Wed Nov 17 02:17:20 2004 ++++ configure Tue Jan 18 16:29:35 2005 +@@ -4290,11 +4290,6 @@ if test "x$apr_preload_done" != "xyes" ; + ;; + *-openbsd*) + +- if test "x$CPPFLAGS" = "x"; then +- test "x$silent" != "xyes" && echo " setting CPPFLAGS to \"-D_POSIX_THREADS\"" +- CPPFLAGS="-D_POSIX_THREADS" +- else +- apr_addto_bugger="-D_POSIX_THREADS" + for i in $apr_addto_bugger; do + apr_addto_duplicate="0" + for j in $CPPFLAGS; do +@@ -4308,7 +4303,6 @@ if test "x$apr_preload_done" != "xyes" ; + CPPFLAGS="$CPPFLAGS $i" + fi + done +- fi + + # binding to an ephemeral port fails on OpenBSD so override + # the test for O_NONBLOCK inheritance across accept().