Date: Wed, 23 Feb 2005 12:02:03 +0100 From: Clement Laforet <clement@FreeBSD.org> To: apache@FreeBSD.org Subject: Fwd: cvs commit: ports/www/apache21 Makefile Makefile.doc distinfo pkg-plist ports/www/apache21/files patch-docs:conf:httpd-std.conf.in patch-modules:ssl:ssl_engine_io.c patch-srclib:apr-util:Makefile.in patch-srclib:apr:Makefile.in patch-srclib:apr:build Message-ID: <20050223110202.GB6946@goofy.cultdeadsheep.org>
next in thread | raw e-mail | index | archive | help
--QTprm0S8XgL7H0Dt
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
FYI.
Please test and report any odd behavior.
Thanks.
clem
----- Forwarded message from Clement Laforet <clement@FreeBSD.org> -----
=46rom: Clement Laforet <clement@FreeBSD.org>
Date: Wed, 23 Feb 2005 10:59:45 +0000 (UTC)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org,
cvs-all@FreeBSD.org
Subject: cvs commit: ports/www/apache21 Makefile Makefile.doc distinfo
pkg-plist ports/www/apache21/files patch-docs:conf:httpd-std.conf.=
in
patch-modules:ssl:ssl_engine_io.c patch-srclib:apr-util:Makefile.i=
n patch-srclib:apr:Makefile.in
patch-srclib:apr:build:buildcheck.sh
clement 2005-02-23 10:59:45 UTC
FreeBSD ports repository
Modified files:
www/apache21 Makefile Makefile.doc distinfo pkg-plist=20
www/apache21/files patch-docs:conf:httpd-std.conf.in=20
patch-srclib:apr-util:Makefile.in=20
patch-srclib:apr:Makefile.in=20
patch-srclib:apr:build:buildcheck.sh=20
Removed files:
www/apache21/files patch-modules:ssl:ssl_engine_io.c=20
Log:
- Update to 2.1.3
=20
If you can't fetch the distfile, fetch http://httpd.apache.org/dev/dist/h=
ttpd-2.1.3-alpha.tar.bz2
into ${PORTSDIR}/distfiles/apache21
=20
Revision Changes Path
1.170 +5 -4 ports/www/apache21/Makefile
1.4 +2 -2 ports/www/apache21/Makefile.doc
1.61 +2 -2 ports/www/apache21/distinfo
1.5 +6 -6 ports/www/apache21/files/patch-docs:conf:httpd-std.c=
onf.in
1.2 +0 -11 ports/www/apache21/files/patch-modules:ssl:ssl_engin=
e_io.c (dead)
1.4 +6 -5 ports/www/apache21/files/patch-srclib:apr-util:Makef=
ile.in
1.4 +6 -4 ports/www/apache21/files/patch-srclib:apr:Makefile.in
1.2 +3 -3 ports/www/apache21/files/patch-srclib:apr:build:buil=
dcheck.sh
1.65 +5 -5 ports/www/apache21/pkg-plist
http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/www/apache21/Makefile.diff?&r1=
=3D1.169&r2=3D1.170&f=3Dh&f=3Du
http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/www/apache21/Makefile.doc.diff?=
&r1=3D1.3&r2=3D1.4&f=3Dh&f=3Du
http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/www/apache21/distinfo.diff?&r1=
=3D1.60&r2=3D1.61&f=3Dh&f=3Du
http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/www/apache21/files/patch-docs:c=
onf:httpd-std.conf.in.diff?&r1=3D1.4&r2=3D1.5&f=3Dh&f=3Du
http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/www/apache21/files/patch-module=
s:ssl:ssl_engine_io.c
http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/www/apache21/files/patch-srclib=
:apr-util:Makefile.in.diff?&r1=3D1.3&r2=3D1.4&f=3Dh&f=3Du
http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/www/apache21/files/patch-srclib=
:apr:Makefile.in.diff?&r1=3D1.3&r2=3D1.4&f=3Dh&f=3Du
http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/www/apache21/files/patch-srclib=
:apr:build:buildcheck.sh.diff?&r1=3D1.1&r2=3D1.2&f=3Dh&f=3Du
http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/www/apache21/pkg-plist.diff?&r1=
=3D1.64&r2=3D1.65&f=3Dh&f=3Du
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /usr/local/www/cvsroot/FreeBSD/ports/www/apache21/Makefile,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -p -r1.169 -r1.170
--- ports/www/apache21/Makefile 2005/02/05 18:26:20 1.169
+++ ports/www/apache21/Makefile 2005/02/23 10:59:45 1.170
@@ -2,20 +2,19 @@
# Date created: Dec 11 2004
# Whom: Clement Laforet <clement@FreeBSD.org>
#
-# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/www/apache21/Makefile,v 1=
=2E169 2005/02/05 18:26:20 clement Exp $
+# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/www/apache21/Makefile,v 1=
=2E170 2005/02/23 10:59:45 clement Exp $
#
# For more information, please read Makefile.doc
#
=20
PORTNAME=3D apache
-PORTVERSION=3D 2.1.2
-PORTREVISION=3D 4
+PORTVERSION=3D 2.1.3
CATEGORIES=3D www
MASTER_SITES=3D ${MASTER_SITE_LOCAL:S/%SUBDIR%/clement/}
DISTNAME=3D httpd-${PORTVERSION}-alpha
-DISTFILES=3D ${DISTNAME}.tar.gz powerlogo.gif
+DISTFILES=3D ${DISTNAME}.tar.bz2 powerlogo.gif
DIST_SUBDIR=3D apache21
-EXTRACT_ONLY=3D ${DISTNAME}.tar.gz
+EXTRACT_ONLY=3D ${DISTNAME}.tar.bz2
=20
MAINTAINER?=3D clement@FreeBSD.org
COMMENT?=3D Version 2.1 of Apache web server with ${WITH_MPM:L} MPM.
@@ -37,6 +36,8 @@ SCRIPTS_ENV+=3D LIBTOOL=3D${LIBTOOL} LIBTOO
LIBTOOL_VERSION=3D${LIBTOOL_VERSION} AUTOCONF=3D${AUTOCONF} \
LIBTOOL_M4=3D${LOCALBASE}/share/aclocal/libtool${LIBTOOL_VERSION}.m4 \
AUTOHEADER=3D${AUTOHEADER}
+
+USE_BZIP2=3D yes
USE_ICONV=3D yes
USE_AUTOCONF_VER=3D 259
USE_LIBTOOL_VER=3D 15
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /usr/local/www/cvsroot/FreeBSD/ports/www/apache21/Makefile.doc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ports/www/apache21/Makefile.doc 2004/12/27 20:38:37 1.3
+++ ports/www/apache21/Makefile.doc 2005/02/23 10:59:45 1.4
@@ -5,7 +5,7 @@
# - make options output
# - apache2 man/docs routines
#
-# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/www/apache21/Makefile.doc=
,v 1.3 2004/12/27 20:38:37 clement Exp $
+# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/www/apache21/Makefile.doc=
,v 1.4 2005/02/23 10:59:45 clement Exp $
#
=20
## Available knobs:
@@ -150,4 +150,4 @@ PLIST_SUB+=3D ERROR=3D"@comment "
PLIST_SUB+=3D ERROR=3D""
.endif
=20
-PORTDOCS=3D #don't blame me ;-)
+PORTDOCS=3D *#don't blame me ;-)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /usr/local/www/cvsroot/FreeBSD/ports/www/apache21/distinfo,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- ports/www/apache21/distinfo 2004/12/11 18:06:04 1.60
+++ ports/www/apache21/distinfo 2005/02/23 10:59:45 1.61
@@ -1,4 +1,4 @@
-MD5 (apache21/httpd-2.1.2-alpha.tar.gz) =3D 06b459ae8aa46ca3336890b91dd10a=
ad
-SIZE (apache21/httpd-2.1.2-alpha.tar.gz) =3D 7458973
+MD5 (apache21/httpd-2.1.3-alpha.tar.bz2) =3D 26a610611603dda9132ec44b9b9b2=
a13
+SIZE (apache21/httpd-2.1.3-alpha.tar.bz2) =3D 5224114
MD5 (apache21/powerlogo.gif) =3D 0f106073b3c7844cf22d4df126b27c62
SIZE (apache21/powerlogo.gif) =3D 5279
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /usr/local/www/cvsroot/FreeBSD/ports/www/apache21/files/patch-doc=
s:conf:httpd-std.conf.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ports/www/apache21/files/patch-docs:conf:httpd-std.conf.in 2004/12/11 1=
8:06:04 1.4
+++ ports/www/apache21/files/patch-docs:conf:httpd-std.conf.in 2005/02/23 1=
0:59:45 1.5
@@ -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>
=20
#
-@@ -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>
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /usr/local/www/cvsroot/FreeBSD/ports/www/apache21/files/patch-src=
lib:apr-util:Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ports/www/apache21/files/patch-srclib:apr-util:Makefile.in 2004/12/11 1=
8:06:04 1.3
+++ ports/www/apache21/files/patch-srclib:apr-util:Makefile.in 2005/02/23 1=
0:59:45 1.4
@@ -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=3D\).*$$,\1installed,' < $(APU_CONFIG) > $@
=20
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_PCFI=
LE)
list=3D'$(INSTALL_SUBDIRS)'; for i in $$list; do \
( cd $$i ; $(MAKE) DESTDIR=3D$(DESTDIR) install ); \
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /usr/local/www/cvsroot/FreeBSD/ports/www/apache21/files/patch-src=
lib:apr:Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ports/www/apache21/files/patch-srclib:apr:Makefile.in 2004/12/11 18:06:=
04 1.3
+++ ports/www/apache21/files/patch-srclib:apr:Makefile.in 2005/02/23 10:59:=
45 1.4
@@ -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 @@
=20
install: $(TARGET_LIB) apr-config.out build/apr_rules.out
$(APR_MKDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(install=
builddir) \
- $(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=3Dinstall $(INSTALL) -m 755 $(TARGET_LIB) $(DESTDIR)$(=
libdir)
$(INSTALL_DATA) apr.exp $(DESTDIR)$(libdir)/apr.exp
- $(INSTALL_DATA) apr.pc $(DESTDIR)$(libdir)/pkgconfig/$(APR_PCFILE)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /usr/local/www/cvsroot/FreeBSD/ports/www/apache21/files/patch-src=
lib:apr:build:buildcheck.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ports/www/apache21/files/patch-srclib:apr:build:buildcheck.sh 2004/12/1=
1 18:06:04 1.1
+++ ports/www/apache21/files/patch-srclib:apr:build:buildcheck.sh 2005/02/2=
3 10:59:45 1.2
@@ -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
=20
- # Require libtool 1.3.3 or newer
+ # Require libtool 1.4 or newer
-libtool=3D`build/PrintPath glibtool libtool libtool15 libtool14`
+libtool=3D${LIBTOOL}
lt_pversion=3D`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0=
-9]*//;s/[- ].*//g;q'`
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /usr/local/www/cvsroot/FreeBSD/ports/www/apache21/pkg-plist,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- ports/www/apache21/pkg-plist 2005/02/05 18:26:20 1.64
+++ ports/www/apache21/pkg-plist 2005/02/23 10:59:45 1.65
@@ -1,4 +1,4 @@
-@comment $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/www/apache21/pkg-p=
list,v 1.64 2005/02/05 18:26:20 clement Exp $
+@comment $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/www/apache21/pkg-p=
list,v 1.65 2005/02/23 10:59:45 clement Exp $
@exec mkdir -p %D/etc/apache21 2> /dev/null
@unexec if cmp -s %D/etc/apache21/httpd.conf %D/%%EXAMPLESDIR%%/httpd-std.=
conf; then rm -f %D/etc/apache21/httpd.conf; fi
%%EXAMPLESDIR%%/httpd-std.conf
@@ -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
----- End forwarded message -----
--QTprm0S8XgL7H0Dt
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (FreeBSD)
iD8DBQFCHGKpsRhfjwcjuh0RArqcAJ4xkoAvPfXDYDj0LG2fYvZcSwuOEQCgu53S
2u+HWe4khSI/ALY5iIXHkOk=
=AxX1
-----END PGP SIGNATURE-----
--QTprm0S8XgL7H0Dt--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050223110202.GB6946>