9 files changed, 34 insertions, 41 deletions

diff --git a/www/apache21/Makefile b/www/apache21/Makefile
index f9e771796d02..fe734e6377b6 100644
--- a/www/apache21/Makefile
+++ b/www/apache21/Makefile
@@ -8,14 +8,13 @@
 #
 
 PORTNAME=	apache
-PORTVERSION=	2.1.2
-PORTREVISION=	4
+PORTVERSION=	2.1.3
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_LOCAL:S/%SUBDIR%/clement/}
 DISTNAME=	httpd-${PORTVERSION}-alpha
-DISTFILES=	${DISTNAME}.tar.gz powerlogo.gif
+DISTFILES=	${DISTNAME}.tar.bz2 powerlogo.gif
 DIST_SUBDIR=	apache21
-EXTRACT_ONLY=	${DISTNAME}.tar.gz
+EXTRACT_ONLY=	${DISTNAME}.tar.bz2
 
 MAINTAINER?=	clement@FreeBSD.org
 COMMENT?=	Version 2.1 of Apache web server with ${WITH_MPM:L} MPM.
@@ -37,6 +36,8 @@ SCRIPTS_ENV+=		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
 			LIBTOOL_VERSION=${LIBTOOL_VERSION} AUTOCONF=${AUTOCONF} \
 			LIBTOOL_M4=${LOCALBASE}/share/aclocal/libtool${LIBTOOL_VERSION}.m4 \
 			AUTOHEADER=${AUTOHEADER}
+
+USE_BZIP2=		yes
 USE_ICONV=		yes
 USE_AUTOCONF_VER=	259
 USE_LIBTOOL_VER=	15
diff --git a/www/apache21/Makefile.doc b/www/apache21/Makefile.doc
index 43432aff08b6..227ca316e5b0 100644
--- a/www/apache21/Makefile.doc
+++ b/www/apache21/Makefile.doc
@@ -5,7 +5,7 @@
 #      - make options output
 #      - apache2 man/docs routines
 #
-# $FreeBSD: /tmp/pcvs/ports/www/apache21/Attic/Makefile.doc,v 1.3 2004-12-27 20:38:37 clement Exp $
+# $FreeBSD: /tmp/pcvs/ports/www/apache21/Attic/Makefile.doc,v 1.4 2005-02-23 10:59:45 clement Exp $
 #
 
 ## Available knobs:
@@ -150,4 +150,4 @@ PLIST_SUB+=	ERROR="@comment "
 PLIST_SUB+=	ERROR=""
 .endif
 
-PORTDOCS=	#don't blame me ;-)
+PORTDOCS=	*#don't blame me ;-)
diff --git a/www/apache21/distinfo b/www/apache21/distinfo
index d6df92c80ab3..87cb788ab5fd 100644
--- a/www/apache21/distinfo
+++ b/www/apache21/distinfo
@@ -1,4 +1,4 @@
-MD5 (apache21/httpd-2.1.2-alpha.tar.gz) = 06b459ae8aa46ca3336890b91dd10aad
-SIZE (apache21/httpd-2.1.2-alpha.tar.gz) = 7458973
+MD5 (apache21/httpd-2.1.3-alpha.tar.bz2) = 26a610611603dda9132ec44b9b9b2a13
+SIZE (apache21/httpd-2.1.3-alpha.tar.bz2) = 5224114
 MD5 (apache21/powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62
 SIZE (apache21/powerlogo.gif) = 5279
diff --git a/www/apache21/files/patch-docs:conf:httpd-std.conf.in b/www/apache21/files/patch-docs:conf:httpd-std.conf.in
index 150c922152f7..1147ce18c192 100644
--- a/www/apache21/files/patch-docs:conf:httpd-std.conf.in
+++ b/www/apache21/files/patch-docs:conf:httpd-std.conf.in
@@ -1,9 +1,9 @@
---- docs/conf/httpd-std.conf.in.orig	Sat Nov 20 21:16:24 2004
-+++ docs/conf/httpd-std.conf.in	Sat Dec 11 16:49:35 2004
+--- docs/conf/httpd-std.conf.in.orig	Tue Feb  8 23:31:56 2005
++++ docs/conf/httpd-std.conf.in	Wed Feb 23 11:06:23 2005
 @@ -68,7 +68,7 @@
  #
- #<IfModule !mpm_netware.c>
- #<IfModule !perchild.c>
+ #<IfModule !mpm_netware_module>
+ #<IfModule !mpm_perchild_module>
 -#ScoreBoardFile @rel_logfiledir@/apache_runtime_status
 +#ScoreBoardFile @rel_runtimedir@/apache_runtime_status
  #</IfModule>
@@ -30,7 +30,7 @@
      Deny from all
 @@ -369,6 +368,23 @@
  #
- <IfModule mod_userdir.c>
+ <IfModule userdir_module>
      UserDir public_html
 +    UserDir disabled %%FTPUSERS%%
 +#
@@ -86,7 +86,7 @@
  </IfModule>
  
  #
-@@ -1082,3 +1098,5 @@
+@@ -1071,3 +1087,5 @@
  #    ErrorLog @rel_logfiledir@/dummy-host.example.com-error_log
  #    CustomLog @rel_logfiledir@/dummy-host.example.com-access_log common
  #</VirtualHost>
diff --git a/www/apache21/files/patch-modules:ssl:ssl_engine_io.c b/www/apache21/files/patch-modules:ssl:ssl_engine_io.c
deleted file mode 100644
index 48681d53a393..000000000000
--- a/www/apache21/files/patch-modules:ssl:ssl_engine_io.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/ssl/ssl_engine_io.c.orig	Tue Dec  7 23:49:54 2004
-+++ modules/ssl/ssl_engine_io.c	Sat Dec 18 11:56:00 2004
-@@ -155,7 +155,7 @@
-                                  outctx->bb);
-     /* create new brigade ready for next time through */
-     outctx->bb = apr_brigade_create(outctx->c->pool, outctx->c->bucket_alloc);
--    return (outctx->rc == APR_SUCCESS) ? 1 : -1;
-+    return (outctx->rc == APR_SUCCESS && !outctx->c->aborted) ? 1 : -1;
- }
- 
- static int bio_filter_create(BIO *bio)
diff --git a/www/apache21/files/patch-srclib:apr-util:Makefile.in b/www/apache21/files/patch-srclib:apr-util:Makefile.in
index 76805db43fcc..d0e295d2c6df 100644
--- a/www/apache21/files/patch-srclib:apr-util:Makefile.in
+++ b/www/apache21/files/patch-srclib:apr-util:Makefile.in
@@ -1,14 +1,15 @@
---- srclib/apr-util/Makefile.in.orig	Wed Nov 17 02:12:20 2004
-+++ srclib/apr-util/Makefile.in	Sat Dec 11 18:20:07 2004
-@@ -55,11 +55,10 @@
+--- srclib/apr-util/Makefile.in.orig	Sun Nov 28 19:59:35 2004
++++ srclib/apr-util/Makefile.in	Wed Feb 23 11:26:13 2005
+@@ -54,12 +54,11 @@
  	sed 's,^\(location=\).*$$,\1installed,' < $(APU_CONFIG) > $@
  
  install: $(TARGET_LIB) apu-config.out
 -	$(APR_MKDIR) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)/pkgconfig \
 +	$(APR_MKDIR) $(DESTDIR)$(includedir) \
  		     $(DESTDIR)$(libdir) $(DESTDIR)$(bindir)
- 	$(INSTALL_DATA) $(top_srcdir)/include/*.h $(DESTDIR)$(includedir)
- 	$(INSTALL_DATA) $(top_blddir)/include/*.h $(DESTDIR)$(includedir)
+ 	for f in $(top_srcdir)/include/*.h $(top_blddir)/include/*.h; do \
+ 		$(INSTALL_DATA) $${f} $(DESTDIR)$(includedir); \
+ 	done
 -	$(INSTALL_DATA) apr-util.pc $(DESTDIR)$(libdir)/pkgconfig/$(APRUTIL_PCFILE)
  	list='$(INSTALL_SUBDIRS)'; for i in $$list; do \
  		( cd $$i ; $(MAKE) DESTDIR=$(DESTDIR) install ); \
diff --git a/www/apache21/files/patch-srclib:apr:Makefile.in b/www/apache21/files/patch-srclib:apr:Makefile.in
index 4a9bbf0d3684..0ca7f3f529c3 100644
--- a/www/apache21/files/patch-srclib:apr:Makefile.in
+++ b/www/apache21/files/patch-srclib:apr:Makefile.in
@@ -1,13 +1,15 @@
---- srclib/apr/Makefile.in.orig	Wed Nov 17 02:07:02 2004
-+++ srclib/apr/Makefile.in	Sat Dec 11 18:19:36 2004
-@@ -67,12 +67,11 @@
+--- srclib/apr/Makefile.in.orig	Sun Nov 28 20:00:49 2004
++++ srclib/apr/Makefile.in	Wed Feb 23 11:10:47 2005
+@@ -67,14 +67,13 @@
  
  install: $(TARGET_LIB) apr-config.out build/apr_rules.out
  	$(APR_MKDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(installbuilddir) \
 -		     $(DESTDIR)$(libdir)/pkgconfig $(DESTDIR)$(includedir)
 +		     $(DESTDIR)$(includedir)
  	$(INSTALL_DATA) $(top_blddir)/include/apr.h $(DESTDIR)$(includedir)
- 	$(INSTALL_DATA) $(top_srcdir)/include/apr_*.h $(DESTDIR)$(includedir)
+ 	for f in $(top_srcdir)/include/apr_*.h; do \
+ 	    $(INSTALL_DATA) $${f} $(DESTDIR)$(includedir); \
+ 	done
  	$(LIBTOOL) --mode=install $(INSTALL) -m 755 $(TARGET_LIB) $(DESTDIR)$(libdir)
  	$(INSTALL_DATA) apr.exp $(DESTDIR)$(libdir)/apr.exp
 -	$(INSTALL_DATA) apr.pc $(DESTDIR)$(libdir)/pkgconfig/$(APR_PCFILE)
diff --git a/www/apache21/files/patch-srclib:apr:build:buildcheck.sh b/www/apache21/files/patch-srclib:apr:build:buildcheck.sh
index 1262a9422284..ca7b49943294 100644
--- a/www/apache21/files/patch-srclib:apr:build:buildcheck.sh
+++ b/www/apache21/files/patch-srclib:apr:build:buildcheck.sh
@@ -1,9 +1,9 @@
---- srclib/apr/build/buildcheck.sh.orig	Sun Jun  6 23:19:19 2004
-+++ srclib/apr/build/buildcheck.sh	Sat Dec 11 16:57:18 2004
+--- srclib/apr/build/buildcheck.sh.orig	Fri Jan 14 11:16:31 2005
++++ srclib/apr/build/buildcheck.sh	Wed Feb 23 11:16:25 2005
 @@ -38,7 +38,7 @@
  # output is multiline from 1.5 onwards
  
- # Require libtool 1.3.3 or newer
+ # Require libtool 1.4 or newer
 -libtool=`build/PrintPath glibtool libtool libtool15 libtool14`
 +libtool=${LIBTOOL}
  lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
diff --git a/www/apache21/pkg-plist b/www/apache21/pkg-plist
index 5c5717cad799..e5d89542721e 100644
--- a/www/apache21/pkg-plist
+++ b/www/apache21/pkg-plist
@@ -21,6 +21,7 @@ include/apache21/ap_listen.h
 include/apache21/ap_mmn.h
 include/apache21/ap_mpm.h
 include/apache21/ap_provider.h
+include/apache21/ap_regex.h
 include/apache21/ap_regkey.h
 include/apache21/ap_release.h
 %%APR_PORTS%%include/apr-1/apr.h
@@ -45,6 +46,7 @@ include/apache21/ap_release.h
 %%APR_PORTS%%include/apr-1/apr_inherit.h
 %%APR_PORTS%%include/apr-1/apr_ldap.h
 %%APR_PORTS%%include/apr-1/apr_ldap_init.h
+%%APR_PORTS%%include/apr-1/apr_ldap_option.h
 %%APR_PORTS%%include/apr-1/apr_ldap_url.h
 %%APR_PORTS%%include/apr-1/apr_lib.h
 %%APR_PORTS%%include/apr-1/apr_md4.h
@@ -111,8 +113,6 @@ include/apache21/mpm.h
 include/apache21/mpm_common.h
 include/apache21/mpm_default.h
 include/apache21/os.h
-include/apache21/pcre.h
-include/apache21/pcreposix.h
 %%WORKER%%include/apache21/pod.h
 include/apache21/scoreboard.h
 include/apache21/unixd.h
@@ -131,10 +131,10 @@ include/apache21/util_xml.h
 %%APR_PORTS%%lib/aprutil.exp
 %%APR_PORTS%%lib/libapr-1.a
 %%APR_PORTS%%lib/libapr-1.so
-%%APR_PORTS%%lib/libapr-1.so.0
+%%APR_PORTS%%lib/libapr-1.so.1
 %%APR_PORTS%%lib/libaprutil-1.a
 %%APR_PORTS%%lib/libaprutil-1.so
-%%APR_PORTS%%lib/libaprutil-1.so.0
+%%APR_PORTS%%lib/libaprutil-1.so.1
 libexec/apache21/httpd.exp
 %%MOD_ACTIONS%%libexec/apache21/mod_actions.so
 %%MOD_ALIAS%%libexec/apache21/mod_alias.so