Index: ports/www/apache2/Makefile
===================================================================
RCS file: /home/pcvs/ports/www/apache2/Makefile,v
retrieving revision 1.163
diff -u -r1.163 Makefile
--- ports/www/apache2/Makefile	16 Jan 2004 00:30:22 -0000	1.163
+++ ports/www/apache2/Makefile	20 Jan 2004 13:18:32 -0000
@@ -48,7 +48,8 @@
 		--with-port=${WITH_HTTP_PORT} \
 		--with-expat=${LOCALBASE} \
 		--libdir=${PREFIX_RELDEST}/lib/apache2 \
-		--includedir=${PREFIX_RELDEST}/include/apache2
+		--includedir=${PREFIX_RELDEST}/include/apache2 \
+		--enable-nonportable-atomics
 
 CONFIGURE_ENV=	CC="${CC}" CPPFLAGS="${CPPFLAGS}" \
 		CFLAGS="${CFLAGS}" \
@@ -110,7 +111,7 @@
 					at your own risk)"
 .   endif
 .endif
-
+WITH_PTHREAD_LIBS?=	${PTHREAD_LIBS:S/-l//}
 .include "${APACHEDIR}/Makefile.doc"
 .include "${APACHEDIR}/Makefile.modules"
 
Index: ports/www/apache2/Makefile.doc
===================================================================
RCS file: /home/pcvs/ports/www/apache2/Makefile.doc,v
retrieving revision 1.2
diff -u -r1.2 Makefile.doc
--- ports/www/apache2/Makefile.doc	10 Jan 2004 22:24:51 -0000	1.2
+++ ports/www/apache2/Makefile.doc	20 Jan 2004 13:18:32 -0000
@@ -26,6 +26,7 @@
 ##      WITHOUT_SSL:              Disable SSL support
 ##      WITH_THREADS:             Enable threads support !! USE IT WITH CARE !!
 ##           WITH_CUSTOM_THREADS: Let you choose which threaded modules you want
+##           WITH_PTHREAD_LIBS:    Let you choose which threading model you wish (c_r(default), kse, thr)
 ##      WITH_DBM:                 Choose your DBM: bdb (Berkeley DB), gdbm or ndbm (default)
 ##          WITH_BERKELEYDB:      Choose your BerkeleyDB version: db2, db3, db4, db41, db42 or FreeBSD (1.85)(default)
 ##      WITH_STATIC_SUPPORT:      Build statically linked support binaries
Index: ports/www/apache2/Makefile.modules
===================================================================
RCS file: /home/pcvs/ports/www/apache2/Makefile.modules,v
retrieving revision 1.7
diff -u -r1.7 Makefile.modules
--- ports/www/apache2/Makefile.modules	10 Jan 2004 22:24:51 -0000	1.7
+++ ports/www/apache2/Makefile.modules	20 Jan 2004 13:18:32 -0000
@@ -172,6 +172,8 @@
 .if defined(WITH_THREADS)
 CONFIGURE_ARGS+=	--enable-threads
 CFLAGS+=		-DFREEBSD_THREAD_HACK
+CONFIGURE_ARGS+=	--enable-nonportable-atomics
+CONFIGURE_ENV+=		ac_cv_pthreads_lib=${WITH_PTHREAD_LIBS}
 .   if !defined(WITH_CUSTOM_THREADS)
 _APACHE_MODULES+=	${THREAD_MODULES}
 .   else