- Fix typo in SLAVE_DESIGNED_FOR check [1]

- Make ldap fix optional, since it may break LDAP auth [2]
  Please use WITH_LDAPFIX if you need the fix.
- Improve pthreads support
- SIZEify distinfo

Submitted by:           mharo [1]
Discussed with:         Robin P. Blanchard <robin.blanchard@gactr.uga.edu> [2]

6 files changed, 28 insertions, 12 deletions

diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 5539ea605e41..4ddb92465329 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -32,9 +32,11 @@ CONFLICTS=	apache+ipv6-1.* apache+modssl-1.* apache+ssl-1.* apache-1.* apache_fp
 # patch files
 PATCH_SITES+=		${MASTER_SITE_LOCAL:S/$/:clement/}
 PATCH_SITE_SUBDIR=	clement/:clement
-PATCHFILES+=		httpd-2.0.48-buildconf.patch:clement \
-			httpd-2.0.48-ldap-fix.patch:clement
-PATCH_DIST_STRIP+=	-p1:apache-clem
+PATCHFILES+=		httpd-2.0.48-buildconf.patch:clement
+PATCH_DIST_STRIP+=	-p1:clement
+.if defined (WITH_LDAPFIX)
+PATCHFILES+=		httpd-2.0.48-ldap-fix.patch:clement
+.endif
 SCRIPTS_ENV+=		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
 			LIBTOOL_VERSION=${LIBTOOL_VERSION}
 
@@ -112,6 +114,7 @@ BROKEN=				"apr is installed and may conflict with apache one\
 .endif
 
 WITH_PTHREAD_LIBS?=	${PTHREAD_LIBS:S/-l//}
+WITH_PTHREAD_CFLAGS?=	${PTHREAD_CFLAGS}
 
 .include "${APACHEDIR}/Makefile.doc"
 .include "${APACHEDIR}/Makefile.modules"
diff --git a/www/apache2/Makefile.modules b/www/apache2/Makefile.modules
index d172ac3e8175..cf8694e3f6a9 100644
--- a/www/apache2/Makefile.modules
+++ b/www/apache2/Makefile.modules
@@ -13,7 +13,7 @@
 #
 
 .if defined(SLAVE_DESIGNED_FOR) && ${PORTVERSION} != ${SLAVE_DESIGNED_FOR}
-BROKEN=		"Sorry, ${SLAVENAME} and ${PORTNAME} versionsq are out of sync"
+BROKEN=		"Sorry, ${SLAVENAME} and ${PORTNAME} versions are out of sync"
 .endif
 
 # MPM section:
@@ -172,8 +172,9 @@ _APACHE_MODULES+=	${LDAP_MODULES}
 .if defined(WITH_THREADS)
 CONFIGURE_ARGS+=	--enable-threads
 CFLAGS+=		-DFREEBSD_THREAD_HACK
-.   if defined(WITH_EXPERIMENTAL_THREADS)
-CONFIGURE_ARGS+=	ac_cv_pthreads_lib=${WITH_PTHREAD_LIBS}
+.   if ${WITH_PTHREAD_LIBS} != "c_r" && ${OSVERSION} > 500023
+CONFIGURE_ENV+=		ac_cv_pthreads_lib=${WITH_PTHREAD_LIBS} \
+			ac_cv_pthreads_cflags=${WITH_PTHREAD_CFLAGS}
 .   endif
 .   if !defined(WITH_CUSTOM_THREADS)
 _APACHE_MODULES+=	${THREAD_MODULES}
diff --git a/www/apache2/distinfo b/www/apache2/distinfo
index 374f9067ab3e..1639cf983cd7 100644
--- a/www/apache2/distinfo
+++ b/www/apache2/distinfo
@@ -1,4 +1,8 @@
 MD5 (apache2/httpd-2.0.48.tar.gz) = 466c63bb71b710d20a5c353df8c1a19c
+SIZE (apache2/httpd-2.0.48.tar.gz) = 6258490
 MD5 (apache2/powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62
+SIZE (apache2/powerlogo.gif) = 5279
 MD5 (apache2/httpd-2.0.48-buildconf.patch) = 6c87bda01550a99402c3ea0bd333c5e0
+SIZE (apache2/httpd-2.0.48-buildconf.patch) = 2407
 MD5 (apache2/httpd-2.0.48-ldap-fix.patch) = cfb30edd10c43e51953aecc0da40b104
+SIZE (apache2/httpd-2.0.48-ldap-fix.patch) = 35209
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index 5539ea605e41..4ddb92465329 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -32,9 +32,11 @@ CONFLICTS=	apache+ipv6-1.* apache+modssl-1.* apache+ssl-1.* apache-1.* apache_fp
 # patch files
 PATCH_SITES+=		${MASTER_SITE_LOCAL:S/$/:clement/}
 PATCH_SITE_SUBDIR=	clement/:clement
-PATCHFILES+=		httpd-2.0.48-buildconf.patch:clement \
-			httpd-2.0.48-ldap-fix.patch:clement
-PATCH_DIST_STRIP+=	-p1:apache-clem
+PATCHFILES+=		httpd-2.0.48-buildconf.patch:clement
+PATCH_DIST_STRIP+=	-p1:clement
+.if defined (WITH_LDAPFIX)
+PATCHFILES+=		httpd-2.0.48-ldap-fix.patch:clement
+.endif
 SCRIPTS_ENV+=		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
 			LIBTOOL_VERSION=${LIBTOOL_VERSION}
 
@@ -112,6 +114,7 @@ BROKEN=				"apr is installed and may conflict with apache one\
 .endif
 
 WITH_PTHREAD_LIBS?=	${PTHREAD_LIBS:S/-l//}
+WITH_PTHREAD_CFLAGS?=	${PTHREAD_CFLAGS}
 
 .include "${APACHEDIR}/Makefile.doc"
 .include "${APACHEDIR}/Makefile.modules"
diff --git a/www/apache20/Makefile.modules b/www/apache20/Makefile.modules
index d172ac3e8175..cf8694e3f6a9 100644
--- a/www/apache20/Makefile.modules
+++ b/www/apache20/Makefile.modules
@@ -13,7 +13,7 @@
 #
 
 .if defined(SLAVE_DESIGNED_FOR) && ${PORTVERSION} != ${SLAVE_DESIGNED_FOR}
-BROKEN=		"Sorry, ${SLAVENAME} and ${PORTNAME} versionsq are out of sync"
+BROKEN=		"Sorry, ${SLAVENAME} and ${PORTNAME} versions are out of sync"
 .endif
 
 # MPM section:
@@ -172,8 +172,9 @@ _APACHE_MODULES+=	${LDAP_MODULES}
 .if defined(WITH_THREADS)
 CONFIGURE_ARGS+=	--enable-threads
 CFLAGS+=		-DFREEBSD_THREAD_HACK
-.   if defined(WITH_EXPERIMENTAL_THREADS)
-CONFIGURE_ARGS+=	ac_cv_pthreads_lib=${WITH_PTHREAD_LIBS}
+.   if ${WITH_PTHREAD_LIBS} != "c_r" && ${OSVERSION} > 500023
+CONFIGURE_ENV+=		ac_cv_pthreads_lib=${WITH_PTHREAD_LIBS} \
+			ac_cv_pthreads_cflags=${WITH_PTHREAD_CFLAGS}
 .   endif
 .   if !defined(WITH_CUSTOM_THREADS)
 _APACHE_MODULES+=	${THREAD_MODULES}
diff --git a/www/apache20/distinfo b/www/apache20/distinfo
index 374f9067ab3e..1639cf983cd7 100644
--- a/www/apache20/distinfo
+++ b/www/apache20/distinfo
@@ -1,4 +1,8 @@
 MD5 (apache2/httpd-2.0.48.tar.gz) = 466c63bb71b710d20a5c353df8c1a19c
+SIZE (apache2/httpd-2.0.48.tar.gz) = 6258490
 MD5 (apache2/powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62
+SIZE (apache2/powerlogo.gif) = 5279
 MD5 (apache2/httpd-2.0.48-buildconf.patch) = 6c87bda01550a99402c3ea0bd333c5e0
+SIZE (apache2/httpd-2.0.48-buildconf.patch) = 2407
 MD5 (apache2/httpd-2.0.48-ldap-fix.patch) = cfb30edd10c43e51953aecc0da40b104
+SIZE (apache2/httpd-2.0.48-ldap-fix.patch) = 35209