Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/apr/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- Makefile	3 Oct 2003 05:25:25 -0000	1.21
+++ Makefile	2 Nov 2003 15:27:27 -0000
@@ -24,6 +24,8 @@
 USE_LIBTOOL_VER=	14
 LIBTOOLFILES=		# none
 INSTALLS_SHLIB=		yes
+CONFIGURE_ENV=  CPPFLAGS="${PTHREAD_CFLAGS}" \
+                LIBS="${PTHREAD_LIBS}"
 
 WRKSRC=	${WRKDIR}
 
--- /dev/null	Sun Nov  2 10:22:00 2003
+++ devel/apr/files/patch-apr_hints.m4	Sun Nov  2 01:25:47 2003
@@ -0,0 +1,12 @@
+--- 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_SETIFNULL(enable_threads, [no])
+         APR_SETIFNULL(apr_lock_method, [USE_FLOCK_SERIALIZE])
+-	APR_ADDTO(CPPFLAGS, [-D_REENTRANT -D_THREAD_SAFE])
+ 	;;
+     *-next-nextstep*)
+ 	APR_SETIFNULL(CFLAGS, [-O])
--- /dev/null	Sun Nov  2 10:22:00 2003
+++ devel/apr/files/patch-apr_atomic.h	Sun Nov  2 02:23:07 2003
@@ -0,0 +1,20 @@
+--- apr-0.9.4/include/apr_atomic.h.orig	Sun Nov  2 01:57:08 2003
++++ apr-0.9.4/include/apr_atomic.h	Sun Nov  2 02:20:37 2003
+@@ -206,10 +206,16 @@
+ 
+ #define apr_atomic_t apr_uint32_t
+ #define apr_atomic_add(mem, val)     atomic_add_int(mem,val)
+-#define apr_atomic_dec(mem)          atomic_subtract_int(mem,1)
+ #define apr_atomic_inc(mem)          atomic_add_int(mem,1)
+ #define apr_atomic_set(mem, val)     atomic_set_int(mem, val)
+ #define apr_atomic_read(mem)         (*mem)
++
++#define apr_atomic_dec(mem)                                     \
++({                                                              \
++   atomic_subtract_int(mem,1);                                  \
++   *(int *)mem;                                                 \
++  })
++
+ 
+ #elif (defined(__linux__) || defined(__EMX__)) && defined(__i386__) && !APR_FORCE_ATOMIC_GENERIC
+