1. Upgrade 2.0.35 --> 2.0.36

2.  Port printed message to "pw userdel www" if port removed permanently.
    However master.passwd 1.25.2.5 has user www by default, so this is no
    longer correct advice.  Removed pkg-deinstall to correct this.

PR:		37849 and 36907
Approved by:	MAINTAINER:  Hye-Shik Chang <perky@fallin.lv>

11 files changed, 60 insertions, 126 deletions

diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index d2e3f3ded2bd..93aafec698b2 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	apache
-PORTVERSION=	2.0.35
-PORTREVISION=	1
+PORTVERSION=	2.0.36
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.apache.org/dist/httpd/ \
 		http://apache.mirrorcentral.com/dist/httpd/ \
@@ -42,7 +41,7 @@ CONFIGURE_ENV=	CC="${CC}" CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" \
 SHARED_MODULES= all cgid charset_lite ext_filter case_filter case_filter_in \
 		deflate bucketeer
 RC_SUB=		-e 's,@@PREFIX@@,${PREFIX},g' -e 's,@@DESTDIR@@,${DESTDIR},g'
-MAKE_ENV+=	DESTDIR=${DESTDIR}
+MAKE_ENV+=	DESTDIR=${DESTDIR} EXPR_COMPAT=yes
 PLIST_SUB+=	DESTDIR=${DESTDIR}
 
 .if defined(NOPORTDOCS)
@@ -115,13 +114,6 @@ post-patch:
 	@${FIND} ${WRKSRC} -name "*.orig" -exec ${RM} -f {} \;
 	@${SED} ${RC_SUB} ${FILESDIR}/apache.sh >${WRKDIR}/apache2.sh
 	@${SED} ${RC_SUB} ${FILESDIR}/config.layout >>${WRKSRC}/config.layout
-.if ${OSVERSION} >= 500032
-.for ltfile in srclib/pcre/ltmain.sh srclib/apr/build/ltmain.sh \
-		srclib/apr-util/xml/expat/conftools/ltmain.sh
-	@${PERL} -pi.orig -e 's|expr|expr --|' \
-		${WRKSRC}/${ltfile}
-.endfor
-.endif
 
 pre-install:
 	PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL
@@ -131,7 +123,7 @@ post-install:
 		${ECHO} "Installing ${PREFIX}/etc/rc.d/apache2.sh startup file."; \
 		${INSTALL_SCRIPT} -m 751 ${WRKDIR}/apache2.sh ${PREFIX}/etc/rc.d/apache2.sh; \
 	fi
-	[ -d ${DESTDIR}/var/log ] || ${MKDIR} ${DESTDIR}/var/log
-	[ -d ${DESTDIR}/var/run ] || ${MKDIR} ${DESTDIR}/var/run
+	@[ -d ${DESTDIR}/var/log ] || ${MKDIR} ${DESTDIR}/var/log
+	@[ -d ${DESTDIR}/var/run ] || ${MKDIR} ${DESTDIR}/var/run
 
 .include <bsd.port.post.mk>
diff --git a/www/apache2/distinfo b/www/apache2/distinfo
index b50dc1e491d5..959ca9adfa4f 100644
--- a/www/apache2/distinfo
+++ b/www/apache2/distinfo
@@ -1,2 +1,2 @@
-MD5 (httpd-2.0.35.tar.gz) = 29ec330f01594d1fd81f30c7a18752c6
+MD5 (httpd-2.0.36.tar.gz) = dc80f22608bccba6c49e1fe9f12f51c8
 MD5 (powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62
diff --git a/www/apache2/files/patch-Makefile.in b/www/apache2/files/patch-Makefile.in
index 5c784ddc3807..5d49a5d426a9 100644
--- a/www/apache2/files/patch-Makefile.in
+++ b/www/apache2/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Sat Apr  6 04:36:06 2002
-+++ Makefile.in	Thu Apr 18 09:22:29 2002
-@@ -33,23 +33,28 @@
+--- Makefile.in.orig	Sun Apr 28 16:41:25 2002
++++ Makefile.in	Tue May  7 19:05:12 2002
+@@ -33,23 +33,27 @@
  	@test -d $(sysconfdir) || $(MKINSTALLDIRS) $(sysconfdir)
  	@cd $(top_srcdir)/docs/conf; \
  	for i in mime.types magic; do \
@@ -11,8 +11,8 @@
  	done; \
  	for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \
  		cd $$j ; \
- 	for i in *-std* ssl.conf; do \
- 		[ -f $$i ] || continue; \
+ 	for i in *-std*.conf ssl.conf; do \
+-		[ -f $$i ] || continue; \
 +		[ -f `echo "$$i"|sed 's,\.in$$,_nonex,g'` ] || continue; \
  		( \
  			n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \
@@ -30,7 +30,7 @@
  					-e 'p' \
  					< $$i; \
  				for j in $(DSO_MODULES) "^EOL^"; do \
-@@ -57,7 +62,7 @@
+@@ -57,7 +61,7 @@
  						echo "<IfDefine SSL>"; \
  					fi; \
  					if test $$j != "^EOL^"; then \
@@ -39,7 +39,7 @@
  					fi; \
  					if test "x$$j" = "xssl"; then \
  						echo "</IfDefine>"; \
-@@ -106,11 +111,14 @@
+@@ -106,12 +110,14 @@
  
  install-htdocs:
  	@echo Installing HTML documents
@@ -52,12 +52,13 @@
  	@test -d $(manualdir) || $(MKINSTALLDIRS) $(manualdir)
  	@test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(manualdir))
 -	@test "x$(htdocsdir)" != "x" && cd $(htdocsdir) && find . -name "CVS" -print | xargs rm -rf {} \;
+-
 +.endif
 +	@test "x$(htdocsdir)" != "x" && cd $(htdocsdir).default && find . -name "CVS" -print | xargs rm -rf {} \;
- 
  install-error:
  	@echo Installing error documents
-@@ -126,9 +134,10 @@
+ 	@test -d $(errordir) || $(MKINSTALLDIRS) $(errordir)
+@@ -126,9 +132,10 @@
  
  install-cgi:
  	@echo Installing CGIs
diff --git a/www/apache2/files/patch-configure b/www/apache2/files/patch-configure
index 8c3f38a5bc46..942d1b071371 100644
--- a/www/apache2/files/patch-configure
+++ b/www/apache2/files/patch-configure
@@ -1,12 +1,21 @@
---- configure.orig	Sat Apr  6 15:19:30 2002
-+++ configure	Sun Apr  7 09:13:07 2002
-@@ -12087,6 +12087,9 @@
+--- configure.orig	Thu May  2 05:53:00 2002
++++ configure	Wed May  8 16:12:46 2002
+@@ -1503,7 +1503,7 @@
+       $srcdir/config.layout > $pldconf
+   layout_name=$LAYOUT
+   . $pldconf
+-  rm $pldconf
++  rm -f $pldconf
+   for var in prefix exec_prefix bindir sbindir libexecdir mandir \
+              sysconfdir datadir errordir iconsdir htdocsdir cgidir \
+              includedir localstatedir runtimedir logfiledir libdir \
+@@ -15077,6 +15077,9 @@
  
- cat >> confdefs.h <<EOF
+ cat >>confdefs.h <<_ACEOF
  #define SERVER_CONFIG_FILE "${rel_sysconfdir}/${progname}.conf"
 +#define DEFAULT_ERRORLOG "${rel_logfiledir}/httpd-error.log"
 +#define AP_TYPES_CONFIG_FILE "${rel_sysconfdir}/mime.types"
 +#define DOCUMENT_LOCATION "${rel_htdocsdir}"
- EOF
+ _ACEOF
+ 
  
- cat >> confdefs.h <<EOF
diff --git a/www/apache2/files/patch-docs:conf:httpd-std.conf.in b/www/apache2/files/patch-docs:conf:httpd-std.conf.in
index 91ccd0b595b0..d87b8bdcc679 100644
--- a/www/apache2/files/patch-docs:conf:httpd-std.conf.in
+++ b/www/apache2/files/patch-docs:conf:httpd-std.conf.in
@@ -1,5 +1,5 @@
---- docs/conf/httpd-std.conf.in.orig	Thu Apr  4 18:15:43 2002
-+++ docs/conf/httpd-std.conf.in	Sun Apr  7 11:51:13 2002
+--- docs/conf/httpd-std.conf.in.orig	Wed Apr 24 07:24:35 2002
++++ docs/conf/httpd-std.conf.in	Tue May  7 19:29:28 2002
 @@ -68,7 +68,7 @@
  #
  <IfModule !mpm_netware.c>
@@ -9,16 +9,7 @@
  </IfModule>
  </IfModule>
  
-@@ -78,7 +78,7 @@
- # identification number when it starts.
- #
- <IfModule !mpm_netware.c>
--PidFile @rel_logfiledir@/httpd.pid
-+PidFile @rel_runtimedir@/httpd.pid
- </IfModule>
- 
- #
-@@ -250,8 +250,8 @@
+@@ -263,8 +263,8 @@
  #  when the value of (unsigned)Group is above 60000; 
  #  don't use Group #-1 on these systems!
  #
@@ -29,7 +20,7 @@
  </IfModule>
  </IfModule>
  
-@@ -437,7 +437,7 @@
+@@ -450,7 +450,7 @@
  # logged here.  If you *do* define an error logfile for a <VirtualHost>
  # container, that host's errors will be logged there and not here.
  #
@@ -38,7 +29,7 @@
  
  #
  # LogLevel: Control the number of messages logged to the error_log.
-@@ -462,20 +462,20 @@
+@@ -475,20 +475,20 @@
  # define per-<VirtualHost> access logfiles, transactions will be
  # logged therein and *not* in this file.
  #
diff --git a/www/apache2/files/patch-srclib:apr-util:configure b/www/apache2/files/patch-srclib:apr-util:configure
index bf6d83956754..755790d2b41c 100644
--- a/www/apache2/files/patch-srclib:apr-util:configure
+++ b/www/apache2/files/patch-srclib:apr-util:configure
@@ -1,11 +1,11 @@
---- srclib/apr-util/configure.orig	Sat Apr  6 15:19:28 2002
-+++ srclib/apr-util/configure	Sun Apr  7 06:35:09 2002
-@@ -5790,7 +5790,7 @@
- 
+--- srclib/apr-util/configure.orig	Wed May  1 13:52:45 2002
++++ srclib/apr-util/configure	Tue May  7 19:34:07 2002
+@@ -11419,7 +11419,7 @@
+ fi;
  
  if test -z "$expat_include_dir"; then
 -  for d in /usr /usr/local xml/expat-cvs xml/expat $srcdir/xml/expat ; do
 +  for d in xml/expat-cvs xml/expat $srcdir/xml/expat ; do
-     
-   echo $ac_n "checking for Expat in $d""... $ac_c" 1>&6
- echo "configure:5797: checking for Expat in $d" >&5
+ 
+   echo "$as_me:$LINENO: checking for Expat in $d" >&5
+ echo $ECHO_N "checking for Expat in $d... $ECHO_C" >&6
diff --git a/www/apache2/files/patch-srclib:apr:include:apr_atomic.h b/www/apache2/files/patch-srclib:apr:include:apr_atomic.h
index b9622dfc5c8a..14d1dd444ba3 100644
--- a/www/apache2/files/patch-srclib:apr:include:apr_atomic.h
+++ b/www/apache2/files/patch-srclib:apr:include:apr_atomic.h
@@ -1,6 +1,6 @@
---- srclib/apr/include/apr_atomic.h.orig	Sun Apr  7 22:54:09 2002
-+++ srclib/apr/include/apr_atomic.h	Sun Apr  7 22:55:03 2002
-@@ -191,10 +191,10 @@
+--- srclib/apr/include/apr_atomic.h.orig	Wed May  1 03:41:59 2002
++++ srclib/apr/include/apr_atomic.h	Tue May  7 19:37:45 2002
+@@ -175,10 +175,10 @@
  #include <machine/atomic.h>
  
  #define apr_atomic_t apr_uint32_t
@@ -12,6 +12,6 @@
 +#define apr_atomic_dec(mem)          (atomic_subtract_int(mem,1),mem)
 +#define apr_atomic_inc(mem)          (atomic_add_int(mem,1),mem)
 +#define apr_atomic_set(mem, val)     (atomic_set_int(mem, val),mem)
- #define apr_atomic_read(mem)         *mem
+ #define apr_atomic_read(mem)         (*mem)
  
  #define APR_ATOMIC_NEED_CAS_DEFAULT 1
diff --git a/www/apache2/files/patch-support:apachectl.in b/www/apache2/files/patch-support:apachectl.in
index 2c49f1d188f8..0287f77bed6b 100644
--- a/www/apache2/files/patch-support:apachectl.in
+++ b/www/apache2/files/patch-support:apachectl.in
@@ -1,14 +1,5 @@
 --- support/apachectl.in.orig	Thu Apr  4 18:15:44 2002
 +++ support/apachectl.in	Sun Apr  7 08:49:25 2002
-@@ -29,7 +29,7 @@
- PIDFILE=@exp_runtimedir@/@progname@.pid
- #
- # the path to your httpd binary, including options if necessary
--HTTPD='@exp_bindir@/@progname@'
-+HTTPD='@exp_sbindir@/@progname@'
- #
- # pick up any necessary environment variables
- if test -f @exp_bindir@/envvars; then
 @@ -47,6 +47,7 @@
  #
  # --------------------                              --------------------
diff --git a/www/apache2/files/patch-support:apxs.in b/www/apache2/files/patch-support:apxs.in
index 5e6f5fdf6cdc..ffa21a1ff918 100644
--- a/www/apache2/files/patch-support:apxs.in
+++ b/www/apache2/files/patch-support:apxs.in
@@ -1,5 +1,5 @@
---- support/apxs.in.orig	Thu Mar 14 05:48:05 2002
-+++ support/apxs.in	Sun Apr  7 08:47:34 2002
+--- support/apxs.in.orig	Tue Apr 30 03:09:02 2002
++++ support/apxs.in	Wed May  8 19:41:06 2002
 @@ -66,7 +66,7 @@
  
  # read the configuration variables once
@@ -9,7 +9,16 @@
  
  my $exec_prefix    = get_vars("exec_prefix");
  my $CFG_TARGET     = get_vars("progname");
-@@ -415,7 +415,7 @@
+@@ -223,7 +223,7 @@
+ my $httpd = get_vars("sbindir") . "/" . get_vars("progname");
+ $httpd = eval qq("$httpd");
+ $httpd = eval qq("$httpd");
+-my $envvars = get_vars("bindir") . "/envvars";
++my $envvars = get_vars("sbindir") . "/envvars";
+ $envvars = eval qq("$envvars");
+ $envvars = eval qq("$envvars");
+ 
+@@ -418,7 +418,7 @@
          $la =~ s|\.c$|.la|;
          my $o = $s;
          $o =~ s|\.c$|.o|;
@@ -18,7 +27,7 @@
          unshift(@objs, $lo);
      }
  
-@@ -440,7 +440,7 @@
+@@ -443,7 +443,7 @@
          $opt .= " -l$opt_l";
      }
  
@@ -27,7 +36,7 @@
  
      #   execute the commands
      &execute_cmds(@cmds);
-@@ -471,8 +471,8 @@
+@@ -474,8 +474,8 @@
          $t =~ s|^.+/([^/]+)$|$1|;
          $t =~ s|\.la$|\.so|;
          if ($opt_i) {
diff --git a/www/apache2/pkg-deinstall b/www/apache2/pkg-deinstall
deleted file mode 100644
index ebd5f5bc8f82..000000000000
--- a/www/apache2/pkg-deinstall
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/www/apache2/Attic/pkg-deinstall,v 1.4 2001-12-07 23:12:32 ache Exp $
-#
-
-if [ "$2" != "POST-DEINSTALL" ]; then
-    exit 0
-fi
-
-USER=www
-
-if pw usershow "${USER}" 2>/dev/null 1>&2; then
-	echo "To delete Apache user permanently, use 'pw userdel ${USER}'"
-fi
-
-exit 0
diff --git a/www/apache2/pkg-plist b/www/apache2/pkg-plist
index d9ab005277bb..f381ec5c91f1 100644
--- a/www/apache2/pkg-plist
+++ b/www/apache2/pkg-plist
@@ -46,7 +46,6 @@ include/apache2/apr_hooks.h
 include/apache2/apr_inherit.h
 include/apache2/apr_ldap.h
 include/apache2/apr_lib.h
-include/apache2/apr_lock.h
 include/apache2/apr_md4.h
 include/apache2/apr_md5.h
 include/apache2/apr_mmap.h
@@ -422,65 +421,22 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/server-wide.html.en
 %%PORTDOCS%%share/doc/apache2/server-wide.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/sitemap.html
-%%PORTDOCS%%share/doc/apache2/ssl/Makefile
 %%PORTDOCS%%share/doc/apache2/ssl/footer.html
 %%PORTDOCS%%share/doc/apache2/ssl/header.html
 %%PORTDOCS%%share/doc/apache2/ssl/index.html
-%%PORTDOCS%%share/doc/apache2/ssl/mod_ssl_sb.gif
-%%PORTDOCS%%share/doc/apache2/ssl/openssl_ics.gif
-%%PORTDOCS%%share/doc/apache2/ssl/ssl_compat.gfont000.gif
 %%PORTDOCS%%share/doc/apache2/ssl/ssl_compat.html
-%%PORTDOCS%%share/doc/apache2/ssl/ssl_compat.wml
-%%PORTDOCS%%share/doc/apache2/ssl/ssl_cover.wml
 %%PORTDOCS%%share/doc/apache2/ssl/ssl_cover_logo.jpg
 %%PORTDOCS%%share/doc/apache2/ssl/ssl_cover_title.jpg
-%%PORTDOCS%%share/doc/apache2/ssl/ssl_faq.gfont000.gif
 %%PORTDOCS%%share/doc/apache2/ssl/ssl_faq.html
-%%PORTDOCS%%share/doc/apache2/ssl/ssl_faq.wml
 %%PORTDOCS%%share/doc/apache2/ssl/ssl_glossary.html
-%%PORTDOCS%%share/doc/apache2/ssl/ssl_glossary.wml
-%%PORTDOCS%%share/doc/apache2/ssl/ssl_howto.gfont000.gif
 %%PORTDOCS%%share/doc/apache2/ssl/ssl_howto.html
-%%PORTDOCS%%share/doc/apache2/ssl/ssl_howto.wml
-%%PORTDOCS%%share/doc/apache2/ssl/ssl_intro.gfont000.gif
 %%PORTDOCS%%share/doc/apache2/ssl/ssl_intro.html
-%%PORTDOCS%%share/doc/apache2/ssl/ssl_intro.wml
 %%PORTDOCS%%share/doc/apache2/ssl/ssl_intro_fig1.gif
 %%PORTDOCS%%share/doc/apache2/ssl/ssl_intro_fig2.gif
 %%PORTDOCS%%share/doc/apache2/ssl/ssl_intro_fig3.gif
-%%PORTDOCS%%share/doc/apache2/ssl/ssl_overview.gfont000.gif
-%%PORTDOCS%%share/doc/apache2/ssl/ssl_overview.html
-%%PORTDOCS%%share/doc/apache2/ssl/ssl_overview.wml
 %%PORTDOCS%%share/doc/apache2/ssl/ssl_overview_fig1.gif
-%%PORTDOCS%%share/doc/apache2/ssl/ssl_reference.gfont000.gif
-%%PORTDOCS%%share/doc/apache2/ssl/ssl_reference.html
-%%PORTDOCS%%share/doc/apache2/ssl/ssl_reference.wml
-%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.head-chapter.gif
-%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.head-num-1.gif
-%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.head-num-2.gif
-%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.head-num-3.gif
-%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.head-num-4.gif
-%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.head-num-5.gif
-%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.head-num-6.gif
-%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.head-num-7.gif
 %%PORTDOCS%%share/doc/apache2/ssl/ssl_template.imgdot-1x1-000000.gif
 %%PORTDOCS%%share/doc/apache2/ssl/ssl_template.imgdot-1x1-transp.gif
-%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.inc
-%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.navbut-next-n.gif
-%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.navbut-next-s.gif
-%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.navbut-prev-n.gif
-%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.navbut-prev-s.gif
-%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.title-abstract.gif
-%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.title-compat.gif
-%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.title-faq.gif
-%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.title-gloss.gif
-%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.title-howto.gif
-%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.title-intro.gif
-%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.title-over.gif
-%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.title-preface.gif
-%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.title-ref.gif
-%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.title-toc.gif
-%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.title-tutor.gif
 %%PORTDOCS%%share/doc/apache2/stopping.html
 %%PORTDOCS%%share/doc/apache2/style/build.sh
 %%PORTDOCS%%share/doc/apache2/style/build.xml