This is a part of update to 1.3.12+1.40. For the rest, please see the

Makefile's commit log.

(Actually I had a CVS problem, and Peter has fixed it for me)

		*		*		*		*

- Add patch-at to correctly build on FreeBSD 5.0+.

PR:		ports/17404
Submitted by:	Khetan H. Gajjar <khetan@freebsd.os.org.za>

- Mark `WWW:' in DESCR.

Noticed by:	portlint

5 files changed, 75 insertions, 38 deletions

diff --git a/www/apache13-ssl/files/patch-ar b/www/apache13-ssl/files/patch-ar
index deb116c2c053..d1f2bdc79cc9 100644
--- a/www/apache13-ssl/files/patch-ar
+++ b/www/apache13-ssl/files/patch-ar
@@ -5,7 +5,7 @@
  +SSL_CFLAGS= -DAPACHE_SSL
  +SSL_LIB_DIR= $(SSL_BASE)
 -+SSL_LIBS= -L$(SSL_LIB_DIR) -lssl -lcrypto
-++SSL_LIBS= -L$(OPENSSLLIB) -lssl -lcrypto $(EXTRA_SSL_LIBS)
+++SSL_LIBS= -L$(SSL_LIB_DIR) -lssl -lcrypto $(EXTRA_SSL_LIBS)
  +SSL_APP_DIR= $(SSL_BASE)/apps
  +SSL_APP=/usr/home/ben/work/openssl/apps/openssl
  +
diff --git a/www/apache13-ssl/files/patch-as b/www/apache13-ssl/files/patch-as
index ab7214774dbb..f4f61f16ac8a 100644
--- a/www/apache13-ssl/files/patch-as
+++ b/www/apache13-ssl/files/patch-as
@@ -1,11 +1,10 @@
---- configure.org       Wed Nov  3 14:52:06 1999
-+++ configure   Wed Nov  3 14:52:26 1999
-@@ -1086,7 +1086,7 @@
- ##  UID/GID as production oriented as a web server in NIS anyway.
+--- configure.org       Sun Feb 13 11:11:46 2000
++++ configure   Sun Feb 13 11:12:16 2000
+@@ -366,8 +366,8 @@
  ##
- conf_user="nobody"
--conf_group="#-1"
+ ##  Initialize server user ID and group ID variables
+ ##
+-conf_user=""
+-conf_group=""
++conf_user="nobody"
 +conf_group="nogroup"
- conf_port="80"
- conf_serveradmin="you@your.address"
- conf_servername="new.host.name"
diff --git a/www/apache13-ssl/files/patch-at b/www/apache13-ssl/files/patch-at
new file mode 100644
index 000000000000..f7aff8452ba3
--- /dev/null
+++ b/www/apache13-ssl/files/patch-at
@@ -0,0 +1,20 @@
+--- src/Configure.orig	Sun Feb  6 10:27:19 2000
++++ src/Configure	Thu Apr 27 23:55:17 2000
+@@ -467,7 +467,7 @@
+     	PLATOSVERS=`echo $PLAT | sed 's/^.*freebsd//'`
+ 	OS="FreeBSD $PLATOSVERS"
+ 	case "$PLATOSVERS" in
+-	    [234]*)
++	    [2-9]*)
+ 		DEF_WANTHSREGEX=no
+ 		CFLAGS="$CFLAGS -funsigned-char"
+ 		;;
+@@ -1043,7 +1043,7 @@
+ 	    LDFLAGS_SHLIB_EXPORT=""
+ 	    SHLIB_SUFFIX_DEPTH=2
+ 	    ;;
+-	*-freebsd3*|*-freebsd4*)
++	*-freebsd[3-9]*)
+ 		LD_SHLIB="gcc"
+ 	    CFLAGS_SHLIB="-fpic"
+ 	    LDFLAGS_SHLIB="-shared"
diff --git a/www/apache13-ssl/pkg-descr b/www/apache13-ssl/pkg-descr
index f5b355ee4ad6..085c867eb42e 100644
--- a/www/apache13-ssl/pkg-descr
+++ b/www/apache13-ssl/pkg-descr
@@ -9,7 +9,7 @@ the OpenSSL code is obtained from an overseas location.
 
 Full details can be found on the web at:
 
-        http://www.apache-ssl.org
+WWW:	http://www.apache-ssl.org
 
 Details of OpenSSL can be found at:
 
diff --git a/www/apache13-ssl/pkg-plist b/www/apache13-ssl/pkg-plist
index 60153b31debe..a097c16e582e 100644
--- a/www/apache13-ssl/pkg-plist
+++ b/www/apache13-ssl/pkg-plist
@@ -41,42 +41,58 @@ include/apache/util_md5.h
 include/apache/util_script.h
 include/apache/util_uri.h
 include/apache/xml/asciitab.h
-include/apache/xml/hashtable.h
-include/apache/xml/iasciitab.h
-include/apache/xml/latin1tab.h
-include/apache/xml/nametab.h
-include/apache/xml/utf8tab.h
-include/apache/xml/xmldef.h
-include/apache/xml/xmlparse.h
-include/apache/xml/xmlrole.h
 include/apache/xml/xmltok.h
+include/apache/xml/xmlrole.h
+include/apache/xml/xmlparse.h
+include/apache/xml/xmldef.h
+include/apache/xml/utf8tab.h
+include/apache/xml/nametab.h
+include/apache/xml/latin1tab.h
+include/apache/xml/iasciitab.h
+include/apache/xml/hashtable.h
 include/apache/xml/xmltok_impl.h
 libexec/apache/httpd.exp
-libexec/apache/libproxy.so
+libexec/apache/mod_vhost_alias.so
+libexec/apache/mod_mime_magic.so
+libexec/apache/mod_info.so
+libexec/apache/mod_speling.so
+libexec/apache/mod_rewrite.so
 libexec/apache/mod_auth_anon.so
 libexec/apache/mod_auth_db.so
-libexec/apache/mod_cern_meta.so
 libexec/apache/mod_digest.so
+libexec/apache/libproxy.so
+libexec/apache/mod_cern_meta.so
 libexec/apache/mod_expires.so
 libexec/apache/mod_headers.so
-libexec/apache/mod_info.so
-libexec/apache/mod_mime_magic.so
-libexec/apache/mod_rewrite.so
-libexec/apache/mod_speling.so
-libexec/apache/mod_unique_id.so
 libexec/apache/mod_usertrack.so
-libexec/apache/mod_vhost_alias.so
+libexec/apache/mod_unique_id.so
 sbin/ab
-sbin/httpsdctl
 sbin/apxs
+sbin/gcache
 sbin/httpsd
+sbin/httpsdctl
 sbin/logresolve
 sbin/rotatelogs
 @exec mkdir -p %D/www
 @exec ln -fs %B %D/www/data.default
 @unexec rm -f %D/www/data.default
 www/htdocs/apache_pb.gif
-www/htdocs/index.html
+www/htdocs/index.html.ca
+www/htdocs/index.html.cz
+www/htdocs/index.html.de
+www/htdocs/index.html.dk
+www/htdocs/index.html.ee
+www/htdocs/index.html.en
+www/htdocs/index.html.es
+www/htdocs/index.html.fr
+www/htdocs/index.html.it
+www/htdocs/index.html.po.iso-pl
+www/htdocs/index.html.ja.jis
+www/htdocs/index.html.lu
+www/htdocs/index.html.nl
+www/htdocs/index.html.pt
+www/htdocs/index.html.pt-br
+www/htdocs/index.html.se
 www/htdocs/manual/mod/core.html
 www/htdocs/manual/mod/directive-dict.html
 www/htdocs/manual/mod/directives.html
@@ -91,10 +107,10 @@ www/htdocs/manual/mod/mod_auth.html
 www/htdocs/manual/mod/mod_auth_anon.html
 www/htdocs/manual/mod/mod_auth_db.html
 www/htdocs/manual/mod/mod_auth_dbm.html
-www/htdocs/manual/mod/mod_auth_digest.html
 www/htdocs/manual/mod/mod_autoindex.html
 www/htdocs/manual/mod/mod_browser.html
 www/htdocs/manual/mod/mod_cern_meta.html
+www/htdocs/manual/mod/mod_so.html
 www/htdocs/manual/mod/mod_cgi.html
 www/htdocs/manual/mod/mod_cookies.html
 www/htdocs/manual/mod/mod_digest.html
@@ -120,13 +136,11 @@ www/htdocs/manual/mod/mod_negotiation.html
 www/htdocs/manual/mod/mod_proxy.html
 www/htdocs/manual/mod/mod_rewrite.html
 www/htdocs/manual/mod/mod_setenvif.html
-www/htdocs/manual/mod/mod_so.html
 www/htdocs/manual/mod/mod_speling.html
 www/htdocs/manual/mod/mod_status.html
 www/htdocs/manual/mod/mod_unique_id.html
 www/htdocs/manual/mod/mod_userdir.html
 www/htdocs/manual/mod/mod_usertrack.html
-www/htdocs/manual/mod/mod_vhost_alias.html
 www/htdocs/manual/LICENSE
 www/htdocs/manual/bind.html
 www/htdocs/manual/cgi_path.html
@@ -170,27 +184,27 @@ www/htdocs/manual/images/mod_rewrite_fig2.fig
 www/htdocs/manual/images/mod_rewrite_fig2.gif
 www/htdocs/manual/images/sub.gif
 www/htdocs/manual/misc/API.html
+www/htdocs/manual/misc/fin_wait_2.html
 www/htdocs/manual/misc/FAQ.html
-www/htdocs/manual/misc/HTTP_Features.tsv
+www/htdocs/manual/misc/known_client_problems.html
 www/htdocs/manual/misc/client_block_api.html
 www/htdocs/manual/misc/compat_notes.html
 www/htdocs/manual/misc/custom_errordocs.html
 www/htdocs/manual/misc/descriptors.html
-www/htdocs/manual/misc/fin_wait_2.html
+www/htdocs/manual/misc/HTTP_Features.tsv
 www/htdocs/manual/misc/footer.html
 www/htdocs/manual/misc/header.html
 www/htdocs/manual/misc/howto.html
 www/htdocs/manual/misc/index.html
-www/htdocs/manual/misc/known_client_problems.html
-www/htdocs/manual/misc/nopgp.html
 www/htdocs/manual/misc/perf-bsd44.html
+www/htdocs/manual/misc/nopgp.html
+www/htdocs/manual/misc/perf-tuning.html
 www/htdocs/manual/misc/perf-dec.html
 www/htdocs/manual/misc/perf-hp.html
-www/htdocs/manual/misc/perf-tuning.html
 www/htdocs/manual/misc/perf.html
+www/htdocs/manual/misc/windoz_keepalive.html
 www/htdocs/manual/misc/security_tips.html
 www/htdocs/manual/misc/vif-info.html
-www/htdocs/manual/misc/windoz_keepalive.html
 www/htdocs/manual/search/manual-index.cgi
 www/htdocs/manual/vhosts/details.html
 www/htdocs/manual/vhosts/details_1_2.html
@@ -205,6 +219,10 @@ www/htdocs/manual/vhosts/mass.html
 www/htdocs/manual/vhosts/name-based.html
 www/htdocs/manual/vhosts/vhosts-in-depth.html
 www/htdocs/manual/vhosts/virtual-host.html
+www/htdocs/manual/mod/mod_auth_digest.html
+www/htdocs/manual/mod/mod_vhost_alias.html
+www/htdocs/manual/netware.html
+www/htdocs/manual/misc/rewriteguide.html
 www/icons/README
 www/icons/a.gif
 www/icons/alert.black.gif