- Force devel/pcre and abandon the bundled pcre:

  0) its like 7yrs old
  0) the new version have speed,bug,&security fixes
  0) www/apache22 already does this
  0) www/apache23+ no longer bundle pcre [or apr* for that matter]
- Bump PORTREVISION

With Hat:   apache@

6 files changed, 56 insertions, 6 deletions

diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index 7c3336abb8ae..95692e9992fa 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	apache
 PORTVERSION=	2.0.63
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD} \
 		${MASTER_SITE_LOCAL:S/$/:powerlogo/}
@@ -22,7 +22,8 @@ EXTRACT_ONLY=	${DISTNAME}.tar.bz2
 MAINTAINER?=	apache@FreeBSD.org
 COMMENT?=	Version 2.0.x of Apache web server with ${WITH_MPM:L} MPM.
 
-LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
+	pcre.0:${PORTSDIR}/devel/pcre
 
 MAKE_JOBS_SAFE=	yes
 
@@ -193,10 +194,12 @@ post-patch:
 	@${RM} -f ${WRKSRC}/docs/docroot/*.bak
 	@${RM} -f ${WRKSRC}/docs/manual/index.html.ko.euc-kr
 	@${RM} -f ${WRKSRC}/docs/conf/highperformance-std.conf
+	@${RM} -rf ${WRKSRC}/srclib/pcre ${WRKSRC}/include/pcreposix.h
 	@${REINPLACE_CMD} -e 's," PLATFORM ",FreeBSD,' \
 			${WRKSRC}/server/core.c
 	@${REINPLACE_CMD} -e 's,freebsd\[2345\],freebsd\[23456\],' \
 			${WRKSRC}/srclib/apr/build/apr_hints.m4
+	@${REINPLACE_CMD} -e "s,\$abs_builddir/srclib/pcre/libpcre.la,${LOCALBASE}/lib/libpcre.la," ${WRKSRC}/configure.in
 	@${INSTALL_DATA} ${WRKSRC}/NOTICE ${WRKSRC}/docs/manual
 
 pre-configure:
diff --git a/www/apache20/files/patch-Makefile.in b/www/apache20/files/patch-Makefile.in
index db6880783569..4d9419987dbc 100644
--- a/www/apache20/files/patch-Makefile.in
+++ b/www/apache20/files/patch-Makefile.in
@@ -136,7 +136,15 @@
  
  install-other:
  	@test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir)
-@@ -191,8 +190,11 @@
+@@ -179,7 +178,6 @@
+ 	@cp -p $(srcdir)/modules/http/mod_core.h $(DESTDIR)$(includedir)
+ 	@cp -p $(srcdir)/modules/proxy/mod_proxy.h $(DESTDIR)$(includedir)
+ 	@cp -p $(srcdir)/modules/ssl/*.h $(DESTDIR)$(includedir)
+-	@cp -p $(srcdir)/srclib/pcre/pcre*.h $(DESTDIR)$(includedir)
+ 	@cp -p $(srcdir)/os/$(OS_DIR)/*.h $(DESTDIR)$(includedir)
+ 	@chmod 644 $(DESTDIR)$(includedir)/*.h
+ 
+@@ -191,8 +189,11 @@
  	@test -d $(DESTDIR)$(manualdir)   || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
  	@cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1
  	@cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8
diff --git a/www/apache20/files/patch-buildconf b/www/apache20/files/patch-buildconf
new file mode 100644
index 000000000000..83fd0bac9ddd
--- /dev/null
+++ b/www/apache20/files/patch-buildconf
@@ -0,0 +1,20 @@
+--- ./buildconf.orig	2010-05-06 20:50:20.262614348 -0400
++++ ./buildconf	2010-05-06 20:48:47.000000000 -0400
+@@ -102,7 +102,6 @@
+ 
+ apr_configure="$apr_src_dir/configure"
+ aprutil_configure="$apu_src_dir/configure"
+-pcre_configure="srclib/pcre/configure"
+ config_h_in="include/ap_config_auto.h.in"
+ 
+ cross_compile_warning="warning: AC_TRY_RUN called without default to allow cross compiling"
+@@ -157,9 +156,6 @@
+ touch ssl_expr_scan.c
+ cd ../..
+ 
+-echo rebuilding $pcre_configure
+-(cd srclib/pcre && ${AUTOCONF:-autoconf})
+-
+ echo rebuilding $config_h_in
+ rm -f $config_h_in
+ ${AUTOHEADER:-autoheader} 2>&1 | grep -v "$cross_compile_warning"
diff --git a/www/apache20/files/patch-configure.in b/www/apache20/files/patch-configure.in
index 59149994f8c5..c09a104796f0 100644
--- a/www/apache20/files/patch-configure.in
+++ b/www/apache20/files/patch-configure.in
@@ -18,7 +18,19 @@
                      [--enable-layout=*|\'--enable-layout=*])
    dnl We must be the last to build and the first to be cleaned
    AP_BUILD_SRCLIB_DIRS="$AP_BUILD_SRCLIB_DIRS apr-util"
-@@ -172,7 +172,7 @@
+@@ -124,11 +124,6 @@
+ AC_PROG_CC
+ AC_PROG_CPP
+ 
+-echo $ac_n "${nl}Configuring PCRE regular expression library ...${nl}"
+-
+-APR_SUBDIR_CONFIG(srclib/pcre,
+-                  [--prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir])
+-
+ echo $ac_n "${nl}Configuring Apache httpd ...${nl}"
+ 
+ dnl Absolute source/build directory
+@@ -172,7 +167,7 @@
        LIBTOOL="$my_libtool \$(LTFLAGS)"
        libtoolversion=`$my_libtool --version`
        case $libtoolversion in
diff --git a/www/apache20/files/patch-srclib__Makefile.in b/www/apache20/files/patch-srclib__Makefile.in
new file mode 100644
index 000000000000..d7c5f70f7a31
--- /dev/null
+++ b/www/apache20/files/patch-srclib__Makefile.in
@@ -0,0 +1,9 @@
+--- srclib/Makefile.in.orig	2010-05-06 21:03:45.453360110 -0400
++++ srclib/Makefile.in	2010-05-06 21:03:50.421209682 -0400
+@@ -1,5 +1,5 @@
+ 
+-SUBDIRS = pcre
++SUBDIRS = 
+ BUILD_SUBDIRS = $(AP_BUILD_SRCLIB_DIRS)
+ CLEAN_SUBDIRS = $(AP_CLEAN_SRCLIB_DIRS)
+ 
diff --git a/www/apache20/pkg-plist b/www/apache20/pkg-plist
index 5904defb46ee..21fcb622ac1a 100644
--- a/www/apache20/pkg-plist
+++ b/www/apache20/pkg-plist
@@ -107,8 +107,6 @@ include/apache2/mpm.h
 include/apache2/mpm_common.h
 include/apache2/mpm_default.h
 include/apache2/os.h
-include/apache2/pcre.h
-include/apache2/pcreposix.h
 %%WORKER%%include/apache2/pod.h
 include/apache2/rfc1413.h
 include/apache2/scoreboard.h