diff options
| author | Andrey A. Chernov <ache@FreeBSD.org> | 1998-07-23 13:16:07 +0000 |
|---|---|---|
| committer | Andrey A. Chernov <ache@FreeBSD.org> | 1998-07-23 13:16:07 +0000 |
| commit | c54076b0c2f6c77e75fbaee2531eca261c0f652d (patch) | |
| tree | 10aa3a23e489ac96b0fc142cbfac709f6540e321 | |
| parent | Nobody seemed to be able to move the new distfile to ${MASTER_SITE_LOCAL}, (diff) | |
Upgrade to 1.3.1
Notes
Notes:
svn path=/head/; revision=12074
30 files changed, 1145 insertions, 785 deletions
diff --git a/www/apache13/Makefile b/www/apache13/Makefile index 2497dc1461c8..28d9322e430c 100644 --- a/www/apache13/Makefile +++ b/www/apache13/Makefile @@ -1,17 +1,17 @@ # New ports collection makefile for: apache HTTPD -# Version required: 1.3 +# Version required: 1.3* # Date created: Fri Aug 25 16:42:36 CDT 1995 # Whom: ache@nagual.pp.ru # -# $Id: Makefile,v 1.57 1998/06/18 11:56:17 ache Exp $ +# $Id: Makefile,v 1.58 1998/06/24 19:54:05 ache Exp $ # -DISTNAME= apache_1.3.0 -PKGNAME= apache-1.3.0 +DISTNAME= apache_1.3.1 +PKGNAME= apache-1.3.1 CATEGORIES= www MASTER_SITES= ftp://www.apache.org/apache/dist/ -#PATCH_SITES= ftp://www.apache.org/apache/dist/patches/apply_to_1.3.0/ +#PATCH_SITES= ftp://www.apache.org/apache/dist/patches/apply_to_1.3.1/ MAINTAINER= ache@freebsd.org @@ -21,11 +21,14 @@ MAINTAINER= ache@freebsd.org GNU_CONFIGURE= yes CONFIGURE_ARGS= \ + --sysconfdir=${PREFIX}/etc/apache \ + --includedir=${PREFIX}/include/apache \ --logfiledir=/var/log \ --runtimedir=/var/run \ --datadir=${PREFIX}/www \ --proxycachedir=${PREFIX}/www/proxy \ --libexecdir=${PREFIX}/libexec/apache \ + --without-confadjust \ --enable-shared=remain \ --enable-module=most \ --enable-module=auth_db \ diff --git a/www/apache13/distinfo b/www/apache13/distinfo index 92422d9b2a7b..66c4b7a0722c 100644 --- a/www/apache13/distinfo +++ b/www/apache13/distinfo @@ -1 +1 @@ -MD5 (apache_1.3.0.tar.gz) = 99aa7c04ae284180f85cf05f839b4308 +MD5 (apache_1.3.1.tar.gz) = fd28c26f94451216a23f34f5fe22e2b4 diff --git a/www/apache13/files/patch-aa b/www/apache13/files/patch-aa new file mode 100644 index 000000000000..21ea6449f6ca --- /dev/null +++ b/www/apache13/files/patch-aa @@ -0,0 +1,40 @@ +*** configure.bak Sun Jul 12 13:25:46 1998 +--- configure Thu Jul 23 16:52:04 1998 +*************** +*** 877,884 **** + echo " DEFAULT_PIDLOG: ${runtimedir_relative}httpd.pid" + echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}httpd.scoreboard" + echo " DEFAULT_LOCKFILE: ${runtimedir_relative}httpd.lock" +! echo " DEFAULT_XFERLOG: ${logfiledir_relative}access_log" +! echo " DEFAULT_ERRORLOG: ${logfiledir_relative}error_log" + echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types" + echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}httpd.conf" + echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf" +--- 877,884 ---- + echo " DEFAULT_PIDLOG: ${runtimedir_relative}httpd.pid" + echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}httpd.scoreboard" + echo " DEFAULT_LOCKFILE: ${runtimedir_relative}httpd.lock" +! echo " DEFAULT_XFERLOG: ${logfiledir_relative}httpd-access.log" +! echo " DEFAULT_ERRORLOG: ${logfiledir_relative}httpd-error.log" + echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types" + echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}httpd.conf" + echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf" +*************** +*** 942,949 **** + echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}httpd.pid\"'" >>$src/apaci + echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}httpd.scoreboard\"'" >>$src/apaci + echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}httpd.lock\"'" >>$src/apaci +! echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}access_log\"'" >>$src/apaci +! echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}error_log\"'" >>$src/apaci + echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci + echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}httpd.conf\"'" >>$src/apaci + echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci +--- 942,949 ---- + echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}httpd.pid\"'" >>$src/apaci + echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}httpd.scoreboard\"'" >>$src/apaci + echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}httpd.lock\"'" >>$src/apaci +! echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}httpd-access.log\"'" >>$src/apaci +! echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}httpd-error.log\"'" >>$src/apaci + echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci + echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}httpd.conf\"'" >>$src/apaci + echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci diff --git a/www/apache13/files/patch-ab b/www/apache13/files/patch-ab index 55c4a50bbd3e..040690f9b1df 100644 --- a/www/apache13/files/patch-ab +++ b/www/apache13/files/patch-ab @@ -1,7 +1,17 @@ -*** Makefile.tmpl.orig Tue May 12 15:52:11 1998 ---- Makefile.tmpl Fri Jun 5 19:13:32 1998 +*** Makefile.tmpl.orig Wed Jul 15 21:03:25 1998 +--- Makefile.tmpl Thu Jul 23 16:14:15 1998 *************** -*** 161,167 **** +*** 107,112 **** +--- 107,113 ---- + runtimedir = @runtimedir@ + logfiledir = @logfiledir@ + proxycachedir = @proxycachedir@ ++ doc_prefix = $(prefix)/share/doc/apache + + libexecdir_relative = @libexecdir_relative@ + +*************** +*** 167,173 **** -DGID_MIN=$(suexec_gidmin) \ -DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \ -DLOG_EXEC=\"$(logfiledir)/suexec_log\" \ @@ -9,7 +19,7 @@ -DSAFE_PATH=\"$(suexec_safepath)\" \ ' \ suexec; \ ---- 161,167 ---- +--- 168,174 ---- -DGID_MIN=$(suexec_gidmin) \ -DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \ -DLOG_EXEC=\"$(logfiledir)/suexec_log\" \ @@ -18,7 +28,7 @@ ' \ suexec; \ *************** -*** 216,224 **** +*** 224,232 **** $(MKDIR) $(root)$(mandir)/man1 $(MKDIR) $(root)$(mandir)/man8 $(MKDIR) $(root)$(sysconfdir) @@ -28,18 +38,18 @@ $(MKDIR) $(root)$(includedir) $(MKDIR) $(root)$(runtimedir) $(MKDIR) $(root)$(logfiledir) ---- 216,224 ---- +--- 225,233 ---- $(MKDIR) $(root)$(mandir)/man1 $(MKDIR) $(root)$(mandir)/man8 $(MKDIR) $(root)$(sysconfdir) -! $(MKDIR) $(root)$(datadir)/data.default +! $(MKDIR) $(root)$(doc_prefix) $(MKDIR) $(root)$(datadir)/icons ! $(MKDIR) $(root)$(datadir)/cgi-bin.default $(MKDIR) $(root)$(includedir) $(MKDIR) $(root)$(runtimedir) $(MKDIR) $(root)$(logfiledir) *************** -*** 330,352 **** +*** 338,360 **** # icons and distributed CGI scripts. install-data: @echo "===> [data: Installing initial data files]" @@ -63,22 +73,23 @@ fi @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \ (cd $(TOP)/icons/ && $(TAR) cf - *) |\ ---- 330,358 ---- +--- 339,368 ---- # icons and distributed CGI scripts. install-data: @echo "===> [data: Installing initial data files]" ! # -@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \ ! # echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \ ! # else \ -! echo "Copying tree $(TOP)/htdocs/ -> $(root)$(datadir)/data.default/"; \ +! echo "Copying tree $(TOP)/htdocs/ -> $(root)$(doc_prefix)/"; \ (cd $(TOP)/htdocs/ && $(TAR) cf - *) |\ -! (cd $(root)$(datadir)/data.default/ && $(TAR) xf -); \ -! find $(root)$(datadir)/data.default/ -type d -exec chmod a+rx {} \; ; \ -! find $(root)$(datadir)/data.default/ -type f -exec chmod a+r {} \; ; \ +! (cd $(root)$(doc_prefix)/ && $(TAR) xf -); \ +! find $(root)$(doc_prefix)/ -type d -exec chmod a+rx {} \; ; \ +! find $(root)$(doc_prefix)/ -type f -exec chmod a+r {} \; ; \ ! # fi ! if [ ! -d $(root)$(datadir)/data ]; then \ -! $(CP) -Rp $(root)$(datadir)/data.default $(root)$(datadir)/data; \ +! $(LN) -s $(root)$(doc_prefix) $(root)$(datadir)/data; \ ! fi +! $(LN) -s $(root)$(doc_prefix) $(root)$(datadir)/data.default ! # -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \ ! # echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \ ! # else \ @@ -89,12 +100,12 @@ ! find $(root)$(datadir)/cgi-bin.default/ -type f -exec chmod a+r {} \; ; \ ! # fi ! if [ ! -d $(root)$(datadir)/cgi-bin ]; then \ -! $(CP) -Rp $(root)$(datadir)/cgi-bin.default $(root)$(datadir)/cgi-bin; \ +! $(LN) -s $(root)$(datadir)/cgi-bin.default $(root)$(datadir)/cgi-bin; \ fi @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \ (cd $(TOP)/icons/ && $(TAR) cf - *) |\ *************** -*** 366,373 **** +*** 374,381 **** echo ""; \ cat $(TOP)/conf/$${conf}-dist ) |\ sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \ @@ -103,7 +114,7 @@ -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \ -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \ -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \ ---- 372,379 ---- +--- 382,389 ---- echo ""; \ cat $(TOP)/conf/$${conf}-dist ) |\ sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \ @@ -113,7 +124,7 @@ -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \ -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \ *************** -*** 375,384 **** +*** 383,392 **** -e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \ -e 's;logs/apache_runtime_status;$(runtimedir)/httpd.scoreboard;' \ -e 's;logs/httpd.pid;$(runtimedir)/httpd.pid;' \ @@ -122,9 +133,9 @@ ! -e 's;logs/referer_log;$(logfiledir)/referer_log;' \ ! -e 's;logs/agent_log;$(logfiledir)/agent_log;' \ -e 's;conf/magic;$(sysconfdir)/magic;' \ - > $(TOP)/$(SRC)/.apaci.install.tmp && \ - echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${conf}.default"; \ ---- 381,390 ---- + -e 's;conf/mime.types;$(sysconfdir)/mime.types;' \ + -e 's;Group #-1;Group $(conf_group);' \ +--- 391,400 ---- -e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \ -e 's;logs/apache_runtime_status;$(runtimedir)/httpd.scoreboard;' \ -e 's;logs/httpd.pid;$(runtimedir)/httpd.pid;' \ @@ -133,5 +144,5 @@ ! -e 's;logs/referer_log;$(logfiledir)/httpd-referer.log;' \ ! -e 's;logs/agent_log;$(logfiledir)/httpd-agent.log;' \ -e 's;conf/magic;$(sysconfdir)/magic;' \ - > $(TOP)/$(SRC)/.apaci.install.tmp && \ - echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${conf}.default"; \ + -e 's;conf/mime.types;$(sysconfdir)/mime.types;' \ + -e 's;Group #-1;Group $(conf_group);' \ diff --git a/www/apache13/files/patch-ak b/www/apache13/files/patch-ak index a99c4343151c..e85e920f178e 100644 --- a/www/apache13/files/patch-ak +++ b/www/apache13/files/patch-ak @@ -1,13 +1,23 @@ -*** src/support/apachectl.orig Tue Mar 31 16:53:46 1998 ---- src/support/apachectl Tue Apr 21 17:15:55 1998 +*** src/support/apachectl.orig Fri Jul 17 01:25:54 1998 +--- src/support/apachectl Thu Jul 23 17:11:38 1998 *************** -*** 37,42 **** ---- 37,44 ---- - # +*** 39,44 **** +--- 39,46 ---- # -------------------- -------------------- # |||||||||||||||||||| END CONFIGURATION SECTION |||||||||||||||||||| -+ -+ eval `limits -e -C daemon` >/dev/null 2>&1 ++ eval `limits -e -C daemon` >/dev/null 2>&1 ++ ERROR=0 ARGV="$@" + if [ "x$ARGV" = "x" ] ; then +*************** +*** 82,87 **** +--- 84,90 ---- + fi + if kill $PID ; then + echo "$0 $ARG: httpd stopped" ++ rm $PIDFILE + else + echo "$0 $ARG: httpd could not be stopped" + ERROR=4 diff --git a/www/apache13/pkg-plist b/www/apache13/pkg-plist index 1fe027c6c207..32f5bc97e88e 100644 --- a/www/apache13/pkg-plist +++ b/www/apache13/pkg-plist @@ -9,7 +9,11 @@ etc/apache/srm.conf.default etc/rc.d/apache.sh include/apache/alloc.h include/apache/ap.h +include/apache/ap_compat.h include/apache/ap_config.h +include/apache/ap_config_auto.h +include/apache/ap_ctype.h +include/apache/ap_md5.h include/apache/buff.h include/apache/compat.h include/apache/conf.h @@ -62,129 +66,133 @@ sbin/apxs sbin/httpd sbin/logresolve sbin/rotatelogs +share/doc/apache/apache_pb.gif +@exec ln -fs %B %D/www/data.default +@unexec rm -f %D/www/data.default +share/doc/apache/index.html +share/doc/apache/manual/LICENSE +share/doc/apache/manual/bind.html +share/doc/apache/manual/cgi_path.html +share/doc/apache/manual/content-negotiation.html +share/doc/apache/manual/custom-error.html +share/doc/apache/manual/dns-caveats.html +share/doc/apache/manual/dso.html +share/doc/apache/manual/ebcdic.html +share/doc/apache/manual/env.html +share/doc/apache/manual/footer.html +share/doc/apache/manual/handler.html +share/doc/apache/manual/header.html +share/doc/apache/manual/images/custom_errordocs.gif +share/doc/apache/manual/images/home.gif +share/doc/apache/manual/images/index.gif +share/doc/apache/manual/images/mod_rewrite_fig1.fig +share/doc/apache/manual/images/mod_rewrite_fig1.gif +share/doc/apache/manual/images/mod_rewrite_fig2.fig +share/doc/apache/manual/images/mod_rewrite_fig2.gif +share/doc/apache/manual/images/sub.gif +share/doc/apache/manual/index.html +share/doc/apache/manual/install.html +share/doc/apache/manual/invoking.html +share/doc/apache/manual/keepalive.html +share/doc/apache/manual/location.html +share/doc/apache/manual/man-template.html +share/doc/apache/manual/misc/API.html +share/doc/apache/manual/misc/FAQ.html +share/doc/apache/manual/misc/HTTP_Features.tsv +share/doc/apache/manual/misc/client_block_api.html +share/doc/apache/manual/misc/compat_notes.html +share/doc/apache/manual/misc/custom_errordocs.html +share/doc/apache/manual/misc/descriptors.html +share/doc/apache/manual/misc/fin_wait_2.html +share/doc/apache/manual/misc/footer.html +share/doc/apache/manual/misc/header.html +share/doc/apache/manual/misc/howto.html +share/doc/apache/manual/misc/index.html +share/doc/apache/manual/misc/known_client_problems.html +share/doc/apache/manual/misc/nopgp.html +share/doc/apache/manual/misc/perf-bsd44.html +share/doc/apache/manual/misc/perf-dec.html +share/doc/apache/manual/misc/perf-hp.html +share/doc/apache/manual/misc/perf-tuning.html +share/doc/apache/manual/misc/perf.html +share/doc/apache/manual/misc/security_tips.html +share/doc/apache/manual/misc/vif-info.html +share/doc/apache/manual/misc/windoz_keepalive.html +share/doc/apache/manual/mod/core.html +share/doc/apache/manual/mod/directive-dict.html +share/doc/apache/manual/mod/directives.html +share/doc/apache/manual/mod/footer.html +share/doc/apache/manual/mod/header.html +share/doc/apache/manual/mod/index.html +share/doc/apache/manual/mod/mod_access.html +share/doc/apache/manual/mod/mod_actions.html +share/doc/apache/manual/mod/mod_alias.html +share/doc/apache/manual/mod/mod_asis.html +share/doc/apache/manual/mod/mod_auth.html +share/doc/apache/manual/mod/mod_auth_anon.html +share/doc/apache/manual/mod/mod_auth_db.html +share/doc/apache/manual/mod/mod_auth_dbm.html +share/doc/apache/manual/mod/mod_autoindex.html +share/doc/apache/manual/mod/mod_browser.html +share/doc/apache/manual/mod/mod_cern_meta.html +share/doc/apache/manual/mod/mod_cgi.html +share/doc/apache/manual/mod/mod_cookies.html +share/doc/apache/manual/mod/mod_digest.html +share/doc/apache/manual/mod/mod_dir.html +share/doc/apache/manual/mod/mod_dld.html +share/doc/apache/manual/mod/mod_dll.html +share/doc/apache/manual/mod/mod_env.html +share/doc/apache/manual/mod/mod_example.html +share/doc/apache/manual/mod/mod_expires.html +share/doc/apache/manual/mod/mod_headers.html +share/doc/apache/manual/mod/mod_imap.html +share/doc/apache/manual/mod/mod_include.html +share/doc/apache/manual/mod/mod_info.html +share/doc/apache/manual/mod/mod_isapi.html +share/doc/apache/manual/mod/mod_log_agent.html +share/doc/apache/manual/mod/mod_log_common.html +share/doc/apache/manual/mod/mod_log_config.html +share/doc/apache/manual/mod/mod_log_referer.html +share/doc/apache/manual/mod/mod_mime.html +share/doc/apache/manual/mod/mod_mime_magic.html +share/doc/apache/manual/mod/mod_mmap_static.html +share/doc/apache/manual/mod/mod_negotiation.html +share/doc/apache/manual/mod/mod_proxy.html +share/doc/apache/manual/mod/mod_rewrite.html +share/doc/apache/manual/mod/mod_setenvif.html +share/doc/apache/manual/mod/mod_so.html +share/doc/apache/manual/mod/mod_speling.html +share/doc/apache/manual/mod/mod_status.html +share/doc/apache/manual/mod/mod_unique_id.html +share/doc/apache/manual/mod/mod_userdir.html +share/doc/apache/manual/mod/mod_usertrack.html +share/doc/apache/manual/multilogs.html +share/doc/apache/manual/new_features_1_0.html +share/doc/apache/manual/new_features_1_1.html +share/doc/apache/manual/new_features_1_2.html +share/doc/apache/manual/new_features_1_3.html +share/doc/apache/manual/process-model.html +share/doc/apache/manual/sections.html +share/doc/apache/manual/sourcereorg.html +share/doc/apache/manual/stopping.html +share/doc/apache/manual/suexec.html +share/doc/apache/manual/unixware.html +share/doc/apache/manual/upgrading_to_1_3.html +share/doc/apache/manual/vhosts/details.html +share/doc/apache/manual/vhosts/details_1_2.html +share/doc/apache/manual/vhosts/examples.html +share/doc/apache/manual/vhosts/fd-limits.html +share/doc/apache/manual/vhosts/footer.html +share/doc/apache/manual/vhosts/header.html +share/doc/apache/manual/vhosts/host.html +share/doc/apache/manual/vhosts/index.html +share/doc/apache/manual/vhosts/ip-based.html +share/doc/apache/manual/vhosts/name-based.html +share/doc/apache/manual/vhosts/vhosts-in-depth.html +share/doc/apache/manual/vhosts/virtual-host.html +share/doc/apache/manual/windows.html www/cgi-bin.default/printenv www/cgi-bin.default/test-cgi -www/data.default/apache_pb.gif -www/data.default/index.html -www/data.default/manual/LICENSE -www/data.default/manual/bind.html -www/data.default/manual/cgi_path.html -www/data.default/manual/content-negotiation.html -www/data.default/manual/custom-error.html -www/data.default/manual/dns-caveats.html -www/data.default/manual/ebcdic.html -www/data.default/manual/env.html -www/data.default/manual/footer.html -www/data.default/manual/handler.html -www/data.default/manual/header.html -www/data.default/manual/images/custom_errordocs.gif -www/data.default/manual/images/home.gif -www/data.default/manual/images/index.gif -www/data.default/manual/images/mod_rewrite_fig1.fig -www/data.default/manual/images/mod_rewrite_fig1.gif -www/data.default/manual/images/mod_rewrite_fig2.fig -www/data.default/manual/images/mod_rewrite_fig2.gif -www/data.default/manual/images/sub.gif -www/data.default/manual/index.html -www/data.default/manual/install.html -www/data.default/manual/invoking.html -www/data.default/manual/keepalive.html -www/data.default/manual/location.html -www/data.default/manual/man-template.html -www/data.default/manual/misc/API.html -www/data.default/manual/misc/FAQ.html -www/data.default/manual/misc/client_block_api.html -www/data.default/manual/misc/compat_notes.html -www/data.default/manual/misc/custom_errordocs.html -www/data.default/manual/misc/descriptors.html -www/data.default/manual/misc/fin_wait_2.html -www/data.default/manual/misc/footer.html -www/data.default/manual/misc/header.html -www/data.default/manual/misc/howto.html -www/data.default/manual/misc/index.html -www/data.default/manual/misc/known_client_problems.html -www/data.default/manual/misc/nopgp.html -www/data.default/manual/misc/perf-bsd44.html -www/data.default/manual/misc/perf-dec.html -www/data.default/manual/misc/perf-hp.html -www/data.default/manual/misc/perf-tuning.html -www/data.default/manual/misc/perf.html -www/data.default/manual/misc/security_tips.html -www/data.default/manual/misc/vif-info.html -www/data.default/manual/misc/windoz_keepalive.html -www/data.default/manual/mod/core.html -www/data.default/manual/mod/directive-dict.html -www/data.default/manual/mod/directives.html -www/data.default/manual/mod/footer.html -www/data.default/manual/mod/header.html -www/data.default/manual/mod/index.html -www/data.default/manual/mod/mod_access.html -www/data.default/manual/mod/mod_actions.html -www/data.default/manual/mod/mod_alias.html -www/data.default/manual/mod/mod_asis.html -www/data.default/manual/mod/mod_auth.html -www/data.default/manual/mod/mod_auth_anon.html -www/data.default/manual/mod/mod_auth_db.html -www/data.default/manual/mod/mod_auth_dbm.html -www/data.default/manual/mod/mod_autoindex.html -www/data.default/manual/mod/mod_browser.html -www/data.default/manual/mod/mod_cern_meta.html -www/data.default/manual/mod/mod_cgi.html -www/data.default/manual/mod/mod_cookies.html -www/data.default/manual/mod/mod_digest.html -www/data.default/manual/mod/mod_dir.html -www/data.default/manual/mod/mod_dld.html -www/data.default/manual/mod/mod_dll.html -www/data.default/manual/mod/mod_env.html -www/data.default/manual/mod/mod_example.html -www/data.default/manual/mod/mod_expires.html -www/data.default/manual/mod/mod_headers.html -www/data.default/manual/mod/mod_imap.html -www/data.default/manual/mod/mod_include.html -www/data.default/manual/mod/mod_info.html -www/data.default/manual/mod/mod_isapi.html -www/data.default/manual/mod/mod_log_agent.html -www/data.default/manual/mod/mod_log_common.html -www/data.default/manual/mod/mod_log_config.html -www/data.default/manual/mod/mod_log_referer.html -www/data.default/manual/mod/mod_mime.html -www/data.default/manual/mod/mod_mime_magic.html -www/data.default/manual/mod/mod_mmap_static.html -www/data.default/manual/mod/mod_negotiation.html -www/data.default/manual/mod/mod_proxy.html -www/data.default/manual/mod/mod_rewrite.html -www/data.default/manual/mod/mod_setenvif.html -www/data.default/manual/mod/mod_so.html -www/data.default/manual/mod/mod_speling.html -www/data.default/manual/mod/mod_status.html -www/data.default/manual/mod/mod_unique_id.html -www/data.default/manual/mod/mod_userdir.html -www/data.default/manual/mod/mod_usertrack.html -www/data.default/manual/multilogs.html -www/data.default/manual/new_features_1_0.html -www/data.default/manual/new_features_1_1.html -www/data.default/manual/new_features_1_2.html -www/data.default/manual/new_features_1_3.html -www/data.default/manual/process-model.html -www/data.default/manual/sections.html -www/data.default/manual/sourcereorg.html -www/data.default/manual/stopping.html -www/data.default/manual/suexec.html -www/data.default/manual/unixware.html -www/data.default/manual/upgrading_to_1_3.html -www/data.default/manual/vhosts/details.html -www/data.default/manual/vhosts/details_1_2.html -www/data.default/manual/vhosts/examples.html -www/data.default/manual/vhosts/fd-limits.html -www/data.default/manual/vhosts/footer.html -www/data.default/manual/vhosts/header.html -www/data.default/manual/vhosts/host.html -www/data.default/manual/vhosts/index.html -www/data.default/manual/vhosts/ip-based.html -www/data.default/manual/vhosts/name-based.html -www/data.default/manual/vhosts/vhosts-in-depth.html -www/data.default/manual/vhosts/virtual-host.html -www/data.default/manual/windows.html www/icons/README www/icons/a.gif www/icons/alert.black.gif diff --git a/www/apache2/Makefile b/www/apache2/Makefile index 2497dc1461c8..28d9322e430c 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -1,17 +1,17 @@ # New ports collection makefile for: apache HTTPD -# Version required: 1.3 +# Version required: 1.3* # Date created: Fri Aug 25 16:42:36 CDT 1995 # Whom: ache@nagual.pp.ru # -# $Id: Makefile,v 1.57 1998/06/18 11:56:17 ache Exp $ +# $Id: Makefile,v 1.58 1998/06/24 19:54:05 ache Exp $ # -DISTNAME= apache_1.3.0 -PKGNAME= apache-1.3.0 +DISTNAME= apache_1.3.1 +PKGNAME= apache-1.3.1 CATEGORIES= www MASTER_SITES= ftp://www.apache.org/apache/dist/ -#PATCH_SITES= ftp://www.apache.org/apache/dist/patches/apply_to_1.3.0/ +#PATCH_SITES= ftp://www.apache.org/apache/dist/patches/apply_to_1.3.1/ MAINTAINER= ache@freebsd.org @@ -21,11 +21,14 @@ MAINTAINER= ache@freebsd.org GNU_CONFIGURE= yes CONFIGURE_ARGS= \ + --sysconfdir=${PREFIX}/etc/apache \ + --includedir=${PREFIX}/include/apache \ --logfiledir=/var/log \ --runtimedir=/var/run \ --datadir=${PREFIX}/www \ --proxycachedir=${PREFIX}/www/proxy \ --libexecdir=${PREFIX}/libexec/apache \ + --without-confadjust \ --enable-shared=remain \ --enable-module=most \ --enable-module=auth_db \ diff --git a/www/apache2/distinfo b/www/apache2/distinfo index 92422d9b2a7b..66c4b7a0722c 100644 --- a/www/apache2/distinfo +++ b/www/apache2/distinfo @@ -1 +1 @@ -MD5 (apache_1.3.0.tar.gz) = 99aa7c04ae284180f85cf05f839b4308 +MD5 (apache_1.3.1.tar.gz) = fd28c26f94451216a23f34f5fe22e2b4 diff --git a/www/apache2/files/patch-aa b/www/apache2/files/patch-aa new file mode 100644 index 000000000000..21ea6449f6ca --- /dev/null +++ b/www/apache2/files/patch-aa @@ -0,0 +1,40 @@ +*** configure.bak Sun Jul 12 13:25:46 1998 +--- configure Thu Jul 23 16:52:04 1998 +*************** +*** 877,884 **** + echo " DEFAULT_PIDLOG: ${runtimedir_relative}httpd.pid" + echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}httpd.scoreboard" + echo " DEFAULT_LOCKFILE: ${runtimedir_relative}httpd.lock" +! echo " DEFAULT_XFERLOG: ${logfiledir_relative}access_log" +! echo " DEFAULT_ERRORLOG: ${logfiledir_relative}error_log" + echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types" + echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}httpd.conf" + echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf" +--- 877,884 ---- + echo " DEFAULT_PIDLOG: ${runtimedir_relative}httpd.pid" + echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}httpd.scoreboard" + echo " DEFAULT_LOCKFILE: ${runtimedir_relative}httpd.lock" +! echo " DEFAULT_XFERLOG: ${logfiledir_relative}httpd-access.log" +! echo " DEFAULT_ERRORLOG: ${logfiledir_relative}httpd-error.log" + echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types" + echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}httpd.conf" + echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf" +*************** +*** 942,949 **** + echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}httpd.pid\"'" >>$src/apaci + echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}httpd.scoreboard\"'" >>$src/apaci + echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}httpd.lock\"'" >>$src/apaci +! echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}access_log\"'" >>$src/apaci +! echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}error_log\"'" >>$src/apaci + echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci + echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}httpd.conf\"'" >>$src/apaci + echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci +--- 942,949 ---- + echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}httpd.pid\"'" >>$src/apaci + echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}httpd.scoreboard\"'" >>$src/apaci + echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}httpd.lock\"'" >>$src/apaci +! echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}httpd-access.log\"'" >>$src/apaci +! echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}httpd-error.log\"'" >>$src/apaci + echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci + echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}httpd.conf\"'" >>$src/apaci + echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci diff --git a/www/apache2/files/patch-ab b/www/apache2/files/patch-ab index 55c4a50bbd3e..040690f9b1df 100644 --- a/www/apache2/files/patch-ab +++ b/www/apache2/files/patch-ab @@ -1,7 +1,17 @@ -*** Makefile.tmpl.orig Tue May 12 15:52:11 1998 ---- Makefile.tmpl Fri Jun 5 19:13:32 1998 +*** Makefile.tmpl.orig Wed Jul 15 21:03:25 1998 +--- Makefile.tmpl Thu Jul 23 16:14:15 1998 *************** -*** 161,167 **** +*** 107,112 **** +--- 107,113 ---- + runtimedir = @runtimedir@ + logfiledir = @logfiledir@ + proxycachedir = @proxycachedir@ ++ doc_prefix = $(prefix)/share/doc/apache + + libexecdir_relative = @libexecdir_relative@ + +*************** +*** 167,173 **** -DGID_MIN=$(suexec_gidmin) \ -DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \ -DLOG_EXEC=\"$(logfiledir)/suexec_log\" \ @@ -9,7 +19,7 @@ -DSAFE_PATH=\"$(suexec_safepath)\" \ ' \ suexec; \ ---- 161,167 ---- +--- 168,174 ---- -DGID_MIN=$(suexec_gidmin) \ -DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \ -DLOG_EXEC=\"$(logfiledir)/suexec_log\" \ @@ -18,7 +28,7 @@ ' \ suexec; \ *************** -*** 216,224 **** +*** 224,232 **** $(MKDIR) $(root)$(mandir)/man1 $(MKDIR) $(root)$(mandir)/man8 $(MKDIR) $(root)$(sysconfdir) @@ -28,18 +38,18 @@ $(MKDIR) $(root)$(includedir) $(MKDIR) $(root)$(runtimedir) $(MKDIR) $(root)$(logfiledir) ---- 216,224 ---- +--- 225,233 ---- $(MKDIR) $(root)$(mandir)/man1 $(MKDIR) $(root)$(mandir)/man8 $(MKDIR) $(root)$(sysconfdir) -! $(MKDIR) $(root)$(datadir)/data.default +! $(MKDIR) $(root)$(doc_prefix) $(MKDIR) $(root)$(datadir)/icons ! $(MKDIR) $(root)$(datadir)/cgi-bin.default $(MKDIR) $(root)$(includedir) $(MKDIR) $(root)$(runtimedir) $(MKDIR) $(root)$(logfiledir) *************** -*** 330,352 **** +*** 338,360 **** # icons and distributed CGI scripts. install-data: @echo "===> [data: Installing initial data files]" @@ -63,22 +73,23 @@ fi @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \ (cd $(TOP)/icons/ && $(TAR) cf - *) |\ ---- 330,358 ---- +--- 339,368 ---- # icons and distributed CGI scripts. install-data: @echo "===> [data: Installing initial data files]" ! # -@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \ ! # echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \ ! # else \ -! echo "Copying tree $(TOP)/htdocs/ -> $(root)$(datadir)/data.default/"; \ +! echo "Copying tree $(TOP)/htdocs/ -> $(root)$(doc_prefix)/"; \ (cd $(TOP)/htdocs/ && $(TAR) cf - *) |\ -! (cd $(root)$(datadir)/data.default/ && $(TAR) xf -); \ -! find $(root)$(datadir)/data.default/ -type d -exec chmod a+rx {} \; ; \ -! find $(root)$(datadir)/data.default/ -type f -exec chmod a+r {} \; ; \ +! (cd $(root)$(doc_prefix)/ && $(TAR) xf -); \ +! find $(root)$(doc_prefix)/ -type d -exec chmod a+rx {} \; ; \ +! find $(root)$(doc_prefix)/ -type f -exec chmod a+r {} \; ; \ ! # fi ! if [ ! -d $(root)$(datadir)/data ]; then \ -! $(CP) -Rp $(root)$(datadir)/data.default $(root)$(datadir)/data; \ +! $(LN) -s $(root)$(doc_prefix) $(root)$(datadir)/data; \ ! fi +! $(LN) -s $(root)$(doc_prefix) $(root)$(datadir)/data.default ! # -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \ ! # echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \ ! # else \ @@ -89,12 +100,12 @@ ! find $(root)$(datadir)/cgi-bin.default/ -type f -exec chmod a+r {} \; ; \ ! # fi ! if [ ! -d $(root)$(datadir)/cgi-bin ]; then \ -! $(CP) -Rp $(root)$(datadir)/cgi-bin.default $(root)$(datadir)/cgi-bin; \ +! $(LN) -s $(root)$(datadir)/cgi-bin.default $(root)$(datadir)/cgi-bin; \ fi @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \ (cd $(TOP)/icons/ && $(TAR) cf - *) |\ *************** -*** 366,373 **** +*** 374,381 **** echo ""; \ cat $(TOP)/conf/$${conf}-dist ) |\ sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \ @@ -103,7 +114,7 @@ -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \ -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \ -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \ ---- 372,379 ---- +--- 382,389 ---- echo ""; \ cat $(TOP)/conf/$${conf}-dist ) |\ sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \ @@ -113,7 +124,7 @@ -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \ -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \ *************** -*** 375,384 **** +*** 383,392 **** -e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \ -e 's;logs/apache_runtime_status;$(runtimedir)/httpd.scoreboard;' \ -e 's;logs/httpd.pid;$(runtimedir)/httpd.pid;' \ @@ -122,9 +133,9 @@ ! -e 's;logs/referer_log;$(logfiledir)/referer_log;' \ ! -e 's;logs/agent_log;$(logfiledir)/agent_log;' \ -e 's;conf/magic;$(sysconfdir)/magic;' \ - > $(TOP)/$(SRC)/.apaci.install.tmp && \ - echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${conf}.default"; \ ---- 381,390 ---- + -e 's;conf/mime.types;$(sysconfdir)/mime.types;' \ + -e 's;Group #-1;Group $(conf_group);' \ +--- 391,400 ---- -e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \ -e 's;logs/apache_runtime_status;$(runtimedir)/httpd.scoreboard;' \ -e 's;logs/httpd.pid;$(runtimedir)/httpd.pid;' \ @@ -133,5 +144,5 @@ ! -e 's;logs/referer_log;$(logfiledir)/httpd-referer.log;' \ ! -e 's;logs/agent_log;$(logfiledir)/httpd-agent.log;' \ -e 's;conf/magic;$(sysconfdir)/magic;' \ - > $(TOP)/$(SRC)/.apaci.install.tmp && \ - echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${conf}.default"; \ + -e 's;conf/mime.types;$(sysconfdir)/mime.types;' \ + -e 's;Group #-1;Group $(conf_group);' \ diff --git a/www/apache2/files/patch-ak b/www/apache2/files/patch-ak index a99c4343151c..e85e920f178e 100644 --- a/www/apache2/files/patch-ak +++ b/www/apache2/files/patch-ak @@ -1,13 +1,23 @@ -*** src/support/apachectl.orig Tue Mar 31 16:53:46 1998 ---- src/support/apachectl Tue Apr 21 17:15:55 1998 +*** src/support/apachectl.orig Fri Jul 17 01:25:54 1998 +--- src/support/apachectl Thu Jul 23 17:11:38 1998 *************** -*** 37,42 **** ---- 37,44 ---- - # +*** 39,44 **** +--- 39,46 ---- # -------------------- -------------------- # |||||||||||||||||||| END CONFIGURATION SECTION |||||||||||||||||||| -+ -+ eval `limits -e -C daemon` >/dev/null 2>&1 ++ eval `limits -e -C daemon` >/dev/null 2>&1 ++ ERROR=0 ARGV="$@" + if [ "x$ARGV" = "x" ] ; then +*************** +*** 82,87 **** +--- 84,90 ---- + fi + if kill $PID ; then + echo "$0 $ARG: httpd stopped" ++ rm $PIDFILE + else + echo "$0 $ARG: httpd could not be stopped" + ERROR=4 diff --git a/www/apache2/pkg-plist b/www/apache2/pkg-plist index 1fe027c6c207..32f5bc97e88e 100644 --- a/www/apache2/pkg-plist +++ b/www/apache2/pkg-plist @@ -9,7 +9,11 @@ etc/apache/srm.conf.default etc/rc.d/apache.sh include/apache/alloc.h include/apache/ap.h +include/apache/ap_compat.h include/apache/ap_config.h +include/apache/ap_config_auto.h +include/apache/ap_ctype.h +include/apache/ap_md5.h include/apache/buff.h include/apache/compat.h include/apache/conf.h @@ -62,129 +66,133 @@ sbin/apxs sbin/httpd sbin/logresolve sbin/rotatelogs +share/doc/apache/apache_pb.gif +@exec ln -fs %B %D/www/data.default +@unexec rm -f %D/www/data.default +share/doc/apache/index.html +share/doc/apache/manual/LICENSE +share/doc/apache/manual/bind.html +share/doc/apache/manual/cgi_path.html +share/doc/apache/manual/content-negotiation.html +share/doc/apache/manual/custom-error.html +share/doc/apache/manual/dns-caveats.html +share/doc/apache/manual/dso.html +share/doc/apache/manual/ebcdic.html +share/doc/apache/manual/env.html +share/doc/apache/manual/footer.html +share/doc/apache/manual/handler.html +share/doc/apache/manual/header.html +share/doc/apache/manual/images/custom_errordocs.gif +share/doc/apache/manual/images/home.gif +share/doc/apache/manual/images/index.gif +share/doc/apache/manual/images/mod_rewrite_fig1.fig +share/doc/apache/manual/images/mod_rewrite_fig1.gif +share/doc/apache/manual/images/mod_rewrite_fig2.fig +share/doc/apache/manual/images/mod_rewrite_fig2.gif +share/doc/apache/manual/images/sub.gif +share/doc/apache/manual/index.html +share/doc/apache/manual/install.html +share/doc/apache/manual/invoking.html +share/doc/apache/manual/keepalive.html +share/doc/apache/manual/location.html +share/doc/apache/manual/man-template.html +share/doc/apache/manual/misc/API.html +share/doc/apache/manual/misc/FAQ.html +share/doc/apache/manual/misc/HTTP_Features.tsv +share/doc/apache/manual/misc/client_block_api.html +share/doc/apache/manual/misc/compat_notes.html +share/doc/apache/manual/misc/custom_errordocs.html +share/doc/apache/manual/misc/descriptors.html +share/doc/apache/manual/misc/fin_wait_2.html +share/doc/apache/manual/misc/footer.html +share/doc/apache/manual/misc/header.html +share/doc/apache/manual/misc/howto.html +share/doc/apache/manual/misc/index.html +share/doc/apache/manual/misc/known_client_problems.html +share/doc/apache/manual/misc/nopgp.html +share/doc/apache/manual/misc/perf-bsd44.html +share/doc/apache/manual/misc/perf-dec.html +share/doc/apache/manual/misc/perf-hp.html +share/doc/apache/manual/misc/perf-tuning.html +share/doc/apache/manual/misc/perf.html +share/doc/apache/manual/misc/security_tips.html +share/doc/apache/manual/misc/vif-info.html +share/doc/apache/manual/misc/windoz_keepalive.html +share/doc/apache/manual/mod/core.html +share/doc/apache/manual/mod/directive-dict.html +share/doc/apache/manual/mod/directives.html +share/doc/apache/manual/mod/footer.html +share/doc/apache/manual/mod/header.html +share/doc/apache/manual/mod/index.html +share/doc/apache/manual/mod/mod_access.html +share/doc/apache/manual/mod/mod_actions.html +share/doc/apache/manual/mod/mod_alias.html +share/doc/apache/manual/mod/mod_asis.html +share/doc/apache/manual/mod/mod_auth.html +share/doc/apache/manual/mod/mod_auth_anon.html +share/doc/apache/manual/mod/mod_auth_db.html +share/doc/apache/manual/mod/mod_auth_dbm.html +share/doc/apache/manual/mod/mod_autoindex.html +share/doc/apache/manual/mod/mod_browser.html +share/doc/apache/manual/mod/mod_cern_meta.html +share/doc/apache/manual/mod/mod_cgi.html +share/doc/apache/manual/mod/mod_cookies.html +share/doc/apache/manual/mod/mod_digest.html +share/doc/apache/manual/mod/mod_dir.html +share/doc/apache/manual/mod/mod_dld.html +share/doc/apache/manual/mod/mod_dll.html +share/doc/apache/manual/mod/mod_env.html +share/doc/apache/manual/mod/mod_example.html +share/doc/apache/manual/mod/mod_expires.html +share/doc/apache/manual/mod/mod_headers.html +share/doc/apache/manual/mod/mod_imap.html +share/doc/apache/manual/mod/mod_include.html +share/doc/apache/manual/mod/mod_info.html +share/doc/apache/manual/mod/mod_isapi.html +share/doc/apache/manual/mod/mod_log_agent.html +share/doc/apache/manual/mod/mod_log_common.html +share/doc/apache/manual/mod/mod_log_config.html +share/doc/apache/manual/mod/mod_log_referer.html +share/doc/apache/manual/mod/mod_mime.html +share/doc/apache/manual/mod/mod_mime_magic.html +share/doc/apache/manual/mod/mod_mmap_static.html +share/doc/apache/manual/mod/mod_negotiation.html +share/doc/apache/manual/mod/mod_proxy.html +share/doc/apache/manual/mod/mod_rewrite.html +share/doc/apache/manual/mod/mod_setenvif.html +share/doc/apache/manual/mod/mod_so.html +share/doc/apache/manual/mod/mod_speling.html +share/doc/apache/manual/mod/mod_status.html +share/doc/apache/manual/mod/mod_unique_id.html +share/doc/apache/manual/mod/mod_userdir.html +share/doc/apache/manual/mod/mod_usertrack.html +share/doc/apache/manual/multilogs.html +share/doc/apache/manual/new_features_1_0.html +share/doc/apache/manual/new_features_1_1.html +share/doc/apache/manual/new_features_1_2.html +share/doc/apache/manual/new_features_1_3.html +share/doc/apache/manual/process-model.html +share/doc/apache/manual/sections.html +share/doc/apache/manual/sourcereorg.html +share/doc/apache/manual/stopping.html +share/doc/apache/manual/suexec.html +share/doc/apache/manual/unixware.html +share/doc/apache/manual/upgrading_to_1_3.html +share/doc/apache/manual/vhosts/details.html +share/doc/apache/manual/vhosts/details_1_2.html +share/doc/apache/manual/vhosts/examples.html +share/doc/apache/manual/vhosts/fd-limits.html +share/doc/apache/manual/vhosts/footer.html +share/doc/apache/manual/vhosts/header.html +share/doc/apache/manual/vhosts/host.html +share/doc/apache/manual/vhosts/index.html +share/doc/apache/manual/vhosts/ip-based.html +share/doc/apache/manual/vhosts/name-based.html +share/doc/apache/manual/vhosts/vhosts-in-depth.html +share/doc/apache/manual/vhosts/virtual-host.html +share/doc/apache/manual/windows.html www/cgi-bin.default/printenv www/cgi-bin.default/test-cgi -www/data.default/apache_pb.gif -www/data.default/index.html -www/data.default/manual/LICENSE -www/data.default/manual/bind.html -www/data.default/manual/cgi_path.html -www/data.default/manual/content-negotiation.html -www/data.default/manual/custom-error.html -www/data.default/manual/dns-caveats.html -www/data.default/manual/ebcdic.html -www/data.default/manual/env.html -www/data.default/manual/footer.html -www/data.default/manual/handler.html -www/data.default/manual/header.html -www/data.default/manual/images/custom_errordocs.gif -www/data.default/manual/images/home.gif -www/data.default/manual/images/index.gif -www/data.default/manual/images/mod_rewrite_fig1.fig -www/data.default/manual/images/mod_rewrite_fig1.gif -www/data.default/manual/images/mod_rewrite_fig2.fig -www/data.default/manual/images/mod_rewrite_fig2.gif -www/data.default/manual/images/sub.gif -www/data.default/manual/index.html -www/data.default/manual/install.html -www/data.default/manual/invoking.html -www/data.default/manual/keepalive.html -www/data.default/manual/location.html -www/data.default/manual/man-template.html -www/data.default/manual/misc/API.html -www/data.default/manual/misc/FAQ.html -www/data.default/manual/misc/client_block_api.html -www/data.default/manual/misc/compat_notes.html -www/data.default/manual/misc/custom_errordocs.html -www/data.default/manual/misc/descriptors.html -www/data.default/manual/misc/fin_wait_2.html -www/data.default/manual/misc/footer.html -www/data.default/manual/misc/header.html -www/data.default/manual/misc/howto.html -www/data.default/manual/misc/index.html -www/data.default/manual/misc/known_client_problems.html -www/data.default/manual/misc/nopgp.html -www/data.default/manual/misc/perf-bsd44.html -www/data.default/manual/misc/perf-dec.html -www/data.default/manual/misc/perf-hp.html -www/data.default/manual/misc/perf-tuning.html -www/data.default/manual/misc/perf.html -www/data.default/manual/misc/security_tips.html -www/data.default/manual/misc/vif-info.html -www/data.default/manual/misc/windoz_keepalive.html -www/data.default/manual/mod/core.html -www/data.default/manual/mod/directive-dict.html -www/data.default/manual/mod/directives.html -www/data.default/manual/mod/footer.html -www/data.default/manual/mod/header.html -www/data.default/manual/mod/index.html -www/data.default/manual/mod/mod_access.html -www/data.default/manual/mod/mod_actions.html -www/data.default/manual/mod/mod_alias.html -www/data.default/manual/mod/mod_asis.html -www/data.default/manual/mod/mod_auth.html -www/data.default/manual/mod/mod_auth_anon.html -www/data.default/manual/mod/mod_auth_db.html -www/data.default/manual/mod/mod_auth_dbm.html -www/data.default/manual/mod/mod_autoindex.html -www/data.default/manual/mod/mod_browser.html -www/data.default/manual/mod/mod_cern_meta.html -www/data.default/manual/mod/mod_cgi.html -www/data.default/manual/mod/mod_cookies.html -www/data.default/manual/mod/mod_digest.html -www/data.default/manual/mod/mod_dir.html -www/data.default/manual/mod/mod_dld.html -www/data.default/manual/mod/mod_dll.html -www/data.default/manual/mod/mod_env.html -www/data.default/manual/mod/mod_example.html -www/data.default/manual/mod/mod_expires.html -www/data.default/manual/mod/mod_headers.html -www/data.default/manual/mod/mod_imap.html -www/data.default/manual/mod/mod_include.html -www/data.default/manual/mod/mod_info.html -www/data.default/manual/mod/mod_isapi.html -www/data.default/manual/mod/mod_log_agent.html -www/data.default/manual/mod/mod_log_common.html -www/data.default/manual/mod/mod_log_config.html -www/data.default/manual/mod/mod_log_referer.html -www/data.default/manual/mod/mod_mime.html -www/data.default/manual/mod/mod_mime_magic.html -www/data.default/manual/mod/mod_mmap_static.html -www/data.default/manual/mod/mod_negotiation.html -www/data.default/manual/mod/mod_proxy.html -www/data.default/manual/mod/mod_rewrite.html -www/data.default/manual/mod/mod_setenvif.html -www/data.default/manual/mod/mod_so.html -www/data.default/manual/mod/mod_speling.html -www/data.default/manual/mod/mod_status.html -www/data.default/manual/mod/mod_unique_id.html -www/data.default/manual/mod/mod_userdir.html -www/data.default/manual/mod/mod_usertrack.html -www/data.default/manual/multilogs.html -www/data.default/manual/new_features_1_0.html -www/data.default/manual/new_features_1_1.html -www/data.default/manual/new_features_1_2.html -www/data.default/manual/new_features_1_3.html -www/data.default/manual/process-model.html -www/data.default/manual/sections.html -www/data.default/manual/sourcereorg.html -www/data.default/manual/stopping.html -www/data.default/manual/suexec.html -www/data.default/manual/unixware.html -www/data.default/manual/upgrading_to_1_3.html -www/data.default/manual/vhosts/details.html -www/data.default/manual/vhosts/details_1_2.html -www/data.default/manual/vhosts/examples.html -www/data.default/manual/vhosts/fd-limits.html -www/data.default/manual/vhosts/footer.html -www/data.default/manual/vhosts/header.html -www/data.default/manual/vhosts/host.html -www/data.default/manual/vhosts/index.html -www/data.default/manual/vhosts/ip-based.html -www/data.default/manual/vhosts/name-based.html -www/data.default/manual/vhosts/vhosts-in-depth.html -www/data.default/manual/vhosts/virtual-host.html -www/data.default/manual/windows.html www/icons/README www/icons/a.gif www/icons/alert.black.gif diff --git a/www/apache20/Makefile b/www/apache20/Makefile index 2497dc1461c8..28d9322e430c 100644 --- a/www/apache20/Makefile +++ b/www/apache20/Makefile @@ -1,17 +1,17 @@ # New ports collection makefile for: apache HTTPD -# Version required: 1.3 +# Version required: 1.3* # Date created: Fri Aug 25 16:42:36 CDT 1995 # Whom: ache@nagual.pp.ru # -# $Id: Makefile,v 1.57 1998/06/18 11:56:17 ache Exp $ +# $Id: Makefile,v 1.58 1998/06/24 19:54:05 ache Exp $ # -DISTNAME= apache_1.3.0 -PKGNAME= apache-1.3.0 +DISTNAME= apache_1.3.1 +PKGNAME= apache-1.3.1 CATEGORIES= www MASTER_SITES= ftp://www.apache.org/apache/dist/ -#PATCH_SITES= ftp://www.apache.org/apache/dist/patches/apply_to_1.3.0/ +#PATCH_SITES= ftp://www.apache.org/apache/dist/patches/apply_to_1.3.1/ MAINTAINER= ache@freebsd.org @@ -21,11 +21,14 @@ MAINTAINER= ache@freebsd.org GNU_CONFIGURE= yes CONFIGURE_ARGS= \ + --sysconfdir=${PREFIX}/etc/apache \ + --includedir=${PREFIX}/include/apache \ --logfiledir=/var/log \ --runtimedir=/var/run \ --datadir=${PREFIX}/www \ --proxycachedir=${PREFIX}/www/proxy \ --libexecdir=${PREFIX}/libexec/apache \ + --without-confadjust \ --enable-shared=remain \ --enable-module=most \ --enable-module=auth_db \ diff --git a/www/apache20/distinfo b/www/apache20/distinfo index 92422d9b2a7b..66c4b7a0722c 100644 --- a/www/apache20/distinfo +++ b/www/apache20/distinfo @@ -1 +1 @@ -MD5 (apache_1.3.0.tar.gz) = 99aa7c04ae284180f85cf05f839b4308 +MD5 (apache_1.3.1.tar.gz) = fd28c26f94451216a23f34f5fe22e2b4 diff --git a/www/apache20/files/patch-aa b/www/apache20/files/patch-aa new file mode 100644 index 000000000000..21ea6449f6ca --- /dev/null +++ b/www/apache20/files/patch-aa @@ -0,0 +1,40 @@ +*** configure.bak Sun Jul 12 13:25:46 1998 +--- configure Thu Jul 23 16:52:04 1998 +*************** +*** 877,884 **** + echo " DEFAULT_PIDLOG: ${runtimedir_relative}httpd.pid" + echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}httpd.scoreboard" + echo " DEFAULT_LOCKFILE: ${runtimedir_relative}httpd.lock" +! echo " DEFAULT_XFERLOG: ${logfiledir_relative}access_log" +! echo " DEFAULT_ERRORLOG: ${logfiledir_relative}error_log" + echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types" + echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}httpd.conf" + echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf" +--- 877,884 ---- + echo " DEFAULT_PIDLOG: ${runtimedir_relative}httpd.pid" + echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}httpd.scoreboard" + echo " DEFAULT_LOCKFILE: ${runtimedir_relative}httpd.lock" +! echo " DEFAULT_XFERLOG: ${logfiledir_relative}httpd-access.log" +! echo " DEFAULT_ERRORLOG: ${logfiledir_relative}httpd-error.log" + echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types" + echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}httpd.conf" + echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf" +*************** +*** 942,949 **** + echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}httpd.pid\"'" >>$src/apaci + echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}httpd.scoreboard\"'" >>$src/apaci + echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}httpd.lock\"'" >>$src/apaci +! echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}access_log\"'" >>$src/apaci +! echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}error_log\"'" >>$src/apaci + echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci + echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}httpd.conf\"'" >>$src/apaci + echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci +--- 942,949 ---- + echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}httpd.pid\"'" >>$src/apaci + echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}httpd.scoreboard\"'" >>$src/apaci + echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}httpd.lock\"'" >>$src/apaci +! echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}httpd-access.log\"'" >>$src/apaci +! echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}httpd-error.log\"'" >>$src/apaci + echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci + echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}httpd.conf\"'" >>$src/apaci + echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci diff --git a/www/apache20/files/patch-ab b/www/apache20/files/patch-ab index 55c4a50bbd3e..040690f9b1df 100644 --- a/www/apache20/files/patch-ab +++ b/www/apache20/files/patch-ab @@ -1,7 +1,17 @@ -*** Makefile.tmpl.orig Tue May 12 15:52:11 1998 ---- Makefile.tmpl Fri Jun 5 19:13:32 1998 +*** Makefile.tmpl.orig Wed Jul 15 21:03:25 1998 +--- Makefile.tmpl Thu Jul 23 16:14:15 1998 *************** -*** 161,167 **** +*** 107,112 **** +--- 107,113 ---- + runtimedir = @runtimedir@ + logfiledir = @logfiledir@ + proxycachedir = @proxycachedir@ ++ doc_prefix = $(prefix)/share/doc/apache + + libexecdir_relative = @libexecdir_relative@ + +*************** +*** 167,173 **** -DGID_MIN=$(suexec_gidmin) \ -DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \ -DLOG_EXEC=\"$(logfiledir)/suexec_log\" \ @@ -9,7 +19,7 @@ -DSAFE_PATH=\"$(suexec_safepath)\" \ ' \ suexec; \ ---- 161,167 ---- +--- 168,174 ---- -DGID_MIN=$(suexec_gidmin) \ -DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \ -DLOG_EXEC=\"$(logfiledir)/suexec_log\" \ @@ -18,7 +28,7 @@ ' \ suexec; \ *************** -*** 216,224 **** +*** 224,232 **** $(MKDIR) $(root)$(mandir)/man1 $(MKDIR) $(root)$(mandir)/man8 $(MKDIR) $(root)$(sysconfdir) @@ -28,18 +38,18 @@ $(MKDIR) $(root)$(includedir) $(MKDIR) $(root)$(runtimedir) $(MKDIR) $(root)$(logfiledir) ---- 216,224 ---- +--- 225,233 ---- $(MKDIR) $(root)$(mandir)/man1 $(MKDIR) $(root)$(mandir)/man8 $(MKDIR) $(root)$(sysconfdir) -! $(MKDIR) $(root)$(datadir)/data.default +! $(MKDIR) $(root)$(doc_prefix) $(MKDIR) $(root)$(datadir)/icons ! $(MKDIR) $(root)$(datadir)/cgi-bin.default $(MKDIR) $(root)$(includedir) $(MKDIR) $(root)$(runtimedir) $(MKDIR) $(root)$(logfiledir) *************** -*** 330,352 **** +*** 338,360 **** # icons and distributed CGI scripts. install-data: @echo "===> [data: Installing initial data files]" @@ -63,22 +73,23 @@ fi @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \ (cd $(TOP)/icons/ && $(TAR) cf - *) |\ ---- 330,358 ---- +--- 339,368 ---- # icons and distributed CGI scripts. install-data: @echo "===> [data: Installing initial data files]" ! # -@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \ ! # echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \ ! # else \ -! echo "Copying tree $(TOP)/htdocs/ -> $(root)$(datadir)/data.default/"; \ +! echo "Copying tree $(TOP)/htdocs/ -> $(root)$(doc_prefix)/"; \ (cd $(TOP)/htdocs/ && $(TAR) cf - *) |\ -! (cd $(root)$(datadir)/data.default/ && $(TAR) xf -); \ -! find $(root)$(datadir)/data.default/ -type d -exec chmod a+rx {} \; ; \ -! find $(root)$(datadir)/data.default/ -type f -exec chmod a+r {} \; ; \ +! (cd $(root)$(doc_prefix)/ && $(TAR) xf -); \ +! find $(root)$(doc_prefix)/ -type d -exec chmod a+rx {} \; ; \ +! find $(root)$(doc_prefix)/ -type f -exec chmod a+r {} \; ; \ ! # fi ! if [ ! -d $(root)$(datadir)/data ]; then \ -! $(CP) -Rp $(root)$(datadir)/data.default $(root)$(datadir)/data; \ +! $(LN) -s $(root)$(doc_prefix) $(root)$(datadir)/data; \ ! fi +! $(LN) -s $(root)$(doc_prefix) $(root)$(datadir)/data.default ! # -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \ ! # echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \ ! # else \ @@ -89,12 +100,12 @@ ! find $(root)$(datadir)/cgi-bin.default/ -type f -exec chmod a+r {} \; ; \ ! # fi ! if [ ! -d $(root)$(datadir)/cgi-bin ]; then \ -! $(CP) -Rp $(root)$(datadir)/cgi-bin.default $(root)$(datadir)/cgi-bin; \ +! $(LN) -s $(root)$(datadir)/cgi-bin.default $(root)$(datadir)/cgi-bin; \ fi @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \ (cd $(TOP)/icons/ && $(TAR) cf - *) |\ *************** -*** 366,373 **** +*** 374,381 **** echo ""; \ cat $(TOP)/conf/$${conf}-dist ) |\ sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \ @@ -103,7 +114,7 @@ -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \ -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \ -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \ ---- 372,379 ---- +--- 382,389 ---- echo ""; \ cat $(TOP)/conf/$${conf}-dist ) |\ sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \ @@ -113,7 +124,7 @@ -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \ -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \ *************** -*** 375,384 **** +*** 383,392 **** -e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \ -e 's;logs/apache_runtime_status;$(runtimedir)/httpd.scoreboard;' \ -e 's;logs/httpd.pid;$(runtimedir)/httpd.pid;' \ @@ -122,9 +133,9 @@ ! -e 's;logs/referer_log;$(logfiledir)/referer_log;' \ ! -e 's;logs/agent_log;$(logfiledir)/agent_log;' \ -e 's;conf/magic;$(sysconfdir)/magic;' \ - > $(TOP)/$(SRC)/.apaci.install.tmp && \ - echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${conf}.default"; \ ---- 381,390 ---- + -e 's;conf/mime.types;$(sysconfdir)/mime.types;' \ + -e 's;Group #-1;Group $(conf_group);' \ +--- 391,400 ---- -e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \ -e 's;logs/apache_runtime_status;$(runtimedir)/httpd.scoreboard;' \ -e 's;logs/httpd.pid;$(runtimedir)/httpd.pid;' \ @@ -133,5 +144,5 @@ ! -e 's;logs/referer_log;$(logfiledir)/httpd-referer.log;' \ ! -e 's;logs/agent_log;$(logfiledir)/httpd-agent.log;' \ -e 's;conf/magic;$(sysconfdir)/magic;' \ - > $(TOP)/$(SRC)/.apaci.install.tmp && \ - echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${conf}.default"; \ + -e 's;conf/mime.types;$(sysconfdir)/mime.types;' \ + -e 's;Group #-1;Group $(conf_group);' \ diff --git a/www/apache20/files/patch-ak b/www/apache20/files/patch-ak index a99c4343151c..e85e920f178e 100644 --- a/www/apache20/files/patch-ak +++ b/www/apache20/files/patch-ak @@ -1,13 +1,23 @@ -*** src/support/apachectl.orig Tue Mar 31 16:53:46 1998 ---- src/support/apachectl Tue Apr 21 17:15:55 1998 +*** src/support/apachectl.orig Fri Jul 17 01:25:54 1998 +--- src/support/apachectl Thu Jul 23 17:11:38 1998 *************** -*** 37,42 **** ---- 37,44 ---- - # +*** 39,44 **** +--- 39,46 ---- # -------------------- -------------------- # |||||||||||||||||||| END CONFIGURATION SECTION |||||||||||||||||||| -+ -+ eval `limits -e -C daemon` >/dev/null 2>&1 ++ eval `limits -e -C daemon` >/dev/null 2>&1 ++ ERROR=0 ARGV="$@" + if [ "x$ARGV" = "x" ] ; then +*************** +*** 82,87 **** +--- 84,90 ---- + fi + if kill $PID ; then + echo "$0 $ARG: httpd stopped" ++ rm $PIDFILE + else + echo "$0 $ARG: httpd could not be stopped" + ERROR=4 diff --git a/www/apache20/pkg-plist b/www/apache20/pkg-plist index 1fe027c6c207..32f5bc97e88e 100644 --- a/www/apache20/pkg-plist +++ b/www/apache20/pkg-plist @@ -9,7 +9,11 @@ etc/apache/srm.conf.default etc/rc.d/apache.sh include/apache/alloc.h include/apache/ap.h +include/apache/ap_compat.h include/apache/ap_config.h +include/apache/ap_config_auto.h +include/apache/ap_ctype.h +include/apache/ap_md5.h include/apache/buff.h include/apache/compat.h include/apache/conf.h @@ -62,129 +66,133 @@ sbin/apxs sbin/httpd sbin/logresolve sbin/rotatelogs +share/doc/apache/apache_pb.gif +@exec ln -fs %B %D/www/data.default +@unexec rm -f %D/www/data.default +share/doc/apache/index.html +share/doc/apache/manual/LICENSE +share/doc/apache/manual/bind.html +share/doc/apache/manual/cgi_path.html +share/doc/apache/manual/content-negotiation.html +share/doc/apache/manual/custom-error.html +share/doc/apache/manual/dns-caveats.html +share/doc/apache/manual/dso.html +share/doc/apache/manual/ebcdic.html +share/doc/apache/manual/env.html +share/doc/apache/manual/footer.html +share/doc/apache/manual/handler.html +share/doc/apache/manual/header.html +share/doc/apache/manual/images/custom_errordocs.gif +share/doc/apache/manual/images/home.gif +share/doc/apache/manual/images/index.gif +share/doc/apache/manual/images/mod_rewrite_fig1.fig +share/doc/apache/manual/images/mod_rewrite_fig1.gif +share/doc/apache/manual/images/mod_rewrite_fig2.fig +share/doc/apache/manual/images/mod_rewrite_fig2.gif +share/doc/apache/manual/images/sub.gif +share/doc/apache/manual/index.html +share/doc/apache/manual/install.html +share/doc/apache/manual/invoking.html +share/doc/apache/manual/keepalive.html +share/doc/apache/manual/location.html +share/doc/apache/manual/man-template.html +share/doc/apache/manual/misc/API.html +share/doc/apache/manual/misc/FAQ.html +share/doc/apache/manual/misc/HTTP_Features.tsv +share/doc/apache/manual/misc/client_block_api.html +share/doc/apache/manual/misc/compat_notes.html +share/doc/apache/manual/misc/custom_errordocs.html +share/doc/apache/manual/misc/descriptors.html +share/doc/apache/manual/misc/fin_wait_2.html +share/doc/apache/manual/misc/footer.html +share/doc/apache/manual/misc/header.html +share/doc/apache/manual/misc/howto.html +share/doc/apache/manual/misc/index.html +share/doc/apache/manual/misc/known_client_problems.html +share/doc/apache/manual/misc/nopgp.html +share/doc/apache/manual/misc/perf-bsd44.html +share/doc/apache/manual/misc/perf-dec.html +share/doc/apache/manual/misc/perf-hp.html +share/doc/apache/manual/misc/perf-tuning.html +share/doc/apache/manual/misc/perf.html +share/doc/apache/manual/misc/security_tips.html +share/doc/apache/manual/misc/vif-info.html +share/doc/apache/manual/misc/windoz_keepalive.html +share/doc/apache/manual/mod/core.html +share/doc/apache/manual/mod/directive-dict.html +share/doc/apache/manual/mod/directives.html +share/doc/apache/manual/mod/footer.html +share/doc/apache/manual/mod/header.html +share/doc/apache/manual/mod/index.html +share/doc/apache/manual/mod/mod_access.html +share/doc/apache/manual/mod/mod_actions.html +share/doc/apache/manual/mod/mod_alias.html +share/doc/apache/manual/mod/mod_asis.html +share/doc/apache/manual/mod/mod_auth.html +share/doc/apache/manual/mod/mod_auth_anon.html +share/doc/apache/manual/mod/mod_auth_db.html +share/doc/apache/manual/mod/mod_auth_dbm.html +share/doc/apache/manual/mod/mod_autoindex.html +share/doc/apache/manual/mod/mod_browser.html +share/doc/apache/manual/mod/mod_cern_meta.html +share/doc/apache/manual/mod/mod_cgi.html +share/doc/apache/manual/mod/mod_cookies.html +share/doc/apache/manual/mod/mod_digest.html +share/doc/apache/manual/mod/mod_dir.html +share/doc/apache/manual/mod/mod_dld.html +share/doc/apache/manual/mod/mod_dll.html +share/doc/apache/manual/mod/mod_env.html +share/doc/apache/manual/mod/mod_example.html +share/doc/apache/manual/mod/mod_expires.html +share/doc/apache/manual/mod/mod_headers.html +share/doc/apache/manual/mod/mod_imap.html +share/doc/apache/manual/mod/mod_include.html +share/doc/apache/manual/mod/mod_info.html +share/doc/apache/manual/mod/mod_isapi.html +share/doc/apache/manual/mod/mod_log_agent.html +share/doc/apache/manual/mod/mod_log_common.html +share/doc/apache/manual/mod/mod_log_config.html +share/doc/apache/manual/mod/mod_log_referer.html +share/doc/apache/manual/mod/mod_mime.html +share/doc/apache/manual/mod/mod_mime_magic.html +share/doc/apache/manual/mod/mod_mmap_static.html +share/doc/apache/manual/mod/mod_negotiation.html +share/doc/apache/manual/mod/mod_proxy.html +share/doc/apache/manual/mod/mod_rewrite.html +share/doc/apache/manual/mod/mod_setenvif.html +share/doc/apache/manual/mod/mod_so.html +share/doc/apache/manual/mod/mod_speling.html +share/doc/apache/manual/mod/mod_status.html +share/doc/apache/manual/mod/mod_unique_id.html +share/doc/apache/manual/mod/mod_userdir.html +share/doc/apache/manual/mod/mod_usertrack.html +share/doc/apache/manual/multilogs.html +share/doc/apache/manual/new_features_1_0.html +share/doc/apache/manual/new_features_1_1.html +share/doc/apache/manual/new_features_1_2.html +share/doc/apache/manual/new_features_1_3.html +share/doc/apache/manual/process-model.html +share/doc/apache/manual/sections.html +share/doc/apache/manual/sourcereorg.html +share/doc/apache/manual/stopping.html +share/doc/apache/manual/suexec.html +share/doc/apache/manual/unixware.html +share/doc/apache/manual/upgrading_to_1_3.html +share/doc/apache/manual/vhosts/details.html +share/doc/apache/manual/vhosts/details_1_2.html +share/doc/apache/manual/vhosts/examples.html +share/doc/apache/manual/vhosts/fd-limits.html +share/doc/apache/manual/vhosts/footer.html +share/doc/apache/manual/vhosts/header.html +share/doc/apache/manual/vhosts/host.html +share/doc/apache/manual/vhosts/index.html +share/doc/apache/manual/vhosts/ip-based.html +share/doc/apache/manual/vhosts/name-based.html +share/doc/apache/manual/vhosts/vhosts-in-depth.html +share/doc/apache/manual/vhosts/virtual-host.html +share/doc/apache/manual/windows.html www/cgi-bin.default/printenv www/cgi-bin.default/test-cgi -www/data.default/apache_pb.gif -www/data.default/index.html -www/data.default/manual/LICENSE -www/data.default/manual/bind.html -www/data.default/manual/cgi_path.html -www/data.default/manual/content-negotiation.html -www/data.default/manual/custom-error.html -www/data.default/manual/dns-caveats.html -www/data.default/manual/ebcdic.html -www/data.default/manual/env.html -www/data.default/manual/footer.html -www/data.default/manual/handler.html -www/data.default/manual/header.html -www/data.default/manual/images/custom_errordocs.gif -www/data.default/manual/images/home.gif -www/data.default/manual/images/index.gif -www/data.default/manual/images/mod_rewrite_fig1.fig -www/data.default/manual/images/mod_rewrite_fig1.gif -www/data.default/manual/images/mod_rewrite_fig2.fig -www/data.default/manual/images/mod_rewrite_fig2.gif -www/data.default/manual/images/sub.gif -www/data.default/manual/index.html -www/data.default/manual/install.html -www/data.default/manual/invoking.html -www/data.default/manual/keepalive.html -www/data.default/manual/location.html -www/data.default/manual/man-template.html -www/data.default/manual/misc/API.html -www/data.default/manual/misc/FAQ.html -www/data.default/manual/misc/client_block_api.html -www/data.default/manual/misc/compat_notes.html -www/data.default/manual/misc/custom_errordocs.html -www/data.default/manual/misc/descriptors.html -www/data.default/manual/misc/fin_wait_2.html -www/data.default/manual/misc/footer.html -www/data.default/manual/misc/header.html -www/data.default/manual/misc/howto.html -www/data.default/manual/misc/index.html -www/data.default/manual/misc/known_client_problems.html -www/data.default/manual/misc/nopgp.html -www/data.default/manual/misc/perf-bsd44.html -www/data.default/manual/misc/perf-dec.html -www/data.default/manual/misc/perf-hp.html -www/data.default/manual/misc/perf-tuning.html -www/data.default/manual/misc/perf.html -www/data.default/manual/misc/security_tips.html -www/data.default/manual/misc/vif-info.html -www/data.default/manual/misc/windoz_keepalive.html -www/data.default/manual/mod/core.html -www/data.default/manual/mod/directive-dict.html -www/data.default/manual/mod/directives.html -www/data.default/manual/mod/footer.html -www/data.default/manual/mod/header.html -www/data.default/manual/mod/index.html -www/data.default/manual/mod/mod_access.html -www/data.default/manual/mod/mod_actions.html -www/data.default/manual/mod/mod_alias.html -www/data.default/manual/mod/mod_asis.html -www/data.default/manual/mod/mod_auth.html -www/data.default/manual/mod/mod_auth_anon.html -www/data.default/manual/mod/mod_auth_db.html -www/data.default/manual/mod/mod_auth_dbm.html -www/data.default/manual/mod/mod_autoindex.html -www/data.default/manual/mod/mod_browser.html -www/data.default/manual/mod/mod_cern_meta.html -www/data.default/manual/mod/mod_cgi.html -www/data.default/manual/mod/mod_cookies.html -www/data.default/manual/mod/mod_digest.html -www/data.default/manual/mod/mod_dir.html -www/data.default/manual/mod/mod_dld.html -www/data.default/manual/mod/mod_dll.html -www/data.default/manual/mod/mod_env.html -www/data.default/manual/mod/mod_example.html -www/data.default/manual/mod/mod_expires.html -www/data.default/manual/mod/mod_headers.html -www/data.default/manual/mod/mod_imap.html -www/data.default/manual/mod/mod_include.html -www/data.default/manual/mod/mod_info.html -www/data.default/manual/mod/mod_isapi.html -www/data.default/manual/mod/mod_log_agent.html -www/data.default/manual/mod/mod_log_common.html -www/data.default/manual/mod/mod_log_config.html -www/data.default/manual/mod/mod_log_referer.html -www/data.default/manual/mod/mod_mime.html -www/data.default/manual/mod/mod_mime_magic.html -www/data.default/manual/mod/mod_mmap_static.html -www/data.default/manual/mod/mod_negotiation.html -www/data.default/manual/mod/mod_proxy.html -www/data.default/manual/mod/mod_rewrite.html -www/data.default/manual/mod/mod_setenvif.html -www/data.default/manual/mod/mod_so.html -www/data.default/manual/mod/mod_speling.html -www/data.default/manual/mod/mod_status.html -www/data.default/manual/mod/mod_unique_id.html -www/data.default/manual/mod/mod_userdir.html -www/data.default/manual/mod/mod_usertrack.html -www/data.default/manual/multilogs.html -www/data.default/manual/new_features_1_0.html -www/data.default/manual/new_features_1_1.html -www/data.default/manual/new_features_1_2.html -www/data.default/manual/new_features_1_3.html -www/data.default/manual/process-model.html -www/data.default/manual/sections.html -www/data.default/manual/sourcereorg.html -www/data.default/manual/stopping.html -www/data.default/manual/suexec.html -www/data.default/manual/unixware.html -www/data.default/manual/upgrading_to_1_3.html -www/data.default/manual/vhosts/details.html -www/data.default/manual/vhosts/details_1_2.html -www/data.default/manual/vhosts/examples.html -www/data.default/manual/vhosts/fd-limits.html -www/data.default/manual/vhosts/footer.html -www/data.default/manual/vhosts/header.html -www/data.default/manual/vhosts/host.html -www/data.default/manual/vhosts/index.html -www/data.default/manual/vhosts/ip-based.html -www/data.default/manual/vhosts/name-based.html -www/data.default/manual/vhosts/vhosts-in-depth.html -www/data.default/manual/vhosts/virtual-host.html -www/data.default/manual/windows.html www/icons/README www/icons/a.gif www/icons/alert.black.gif diff --git a/www/apache21/Makefile b/www/apache21/Makefile index 2497dc1461c8..28d9322e430c 100644 --- a/www/apache21/Makefile +++ b/www/apache21/Makefile @@ -1,17 +1,17 @@ # New ports collection makefile for: apache HTTPD -# Version required: 1.3 +# Version required: 1.3* # Date created: Fri Aug 25 16:42:36 CDT 1995 # Whom: ache@nagual.pp.ru # -# $Id: Makefile,v 1.57 1998/06/18 11:56:17 ache Exp $ +# $Id: Makefile,v 1.58 1998/06/24 19:54:05 ache Exp $ # -DISTNAME= apache_1.3.0 -PKGNAME= apache-1.3.0 +DISTNAME= apache_1.3.1 +PKGNAME= apache-1.3.1 CATEGORIES= www MASTER_SITES= ftp://www.apache.org/apache/dist/ -#PATCH_SITES= ftp://www.apache.org/apache/dist/patches/apply_to_1.3.0/ +#PATCH_SITES= ftp://www.apache.org/apache/dist/patches/apply_to_1.3.1/ MAINTAINER= ache@freebsd.org @@ -21,11 +21,14 @@ MAINTAINER= ache@freebsd.org GNU_CONFIGURE= yes CONFIGURE_ARGS= \ + --sysconfdir=${PREFIX}/etc/apache \ + --includedir=${PREFIX}/include/apache \ --logfiledir=/var/log \ --runtimedir=/var/run \ --datadir=${PREFIX}/www \ --proxycachedir=${PREFIX}/www/proxy \ --libexecdir=${PREFIX}/libexec/apache \ + --without-confadjust \ --enable-shared=remain \ --enable-module=most \ --enable-module=auth_db \ diff --git a/www/apache21/distinfo b/www/apache21/distinfo index 92422d9b2a7b..66c4b7a0722c 100644 --- a/www/apache21/distinfo +++ b/www/apache21/distinfo @@ -1 +1 @@ -MD5 (apache_1.3.0.tar.gz) = 99aa7c04ae284180f85cf05f839b4308 +MD5 (apache_1.3.1.tar.gz) = fd28c26f94451216a23f34f5fe22e2b4 diff --git a/www/apache21/files/patch-aa b/www/apache21/files/patch-aa new file mode 100644 index 000000000000..21ea6449f6ca --- /dev/null +++ b/www/apache21/files/patch-aa @@ -0,0 +1,40 @@ +*** configure.bak Sun Jul 12 13:25:46 1998 +--- configure Thu Jul 23 16:52:04 1998 +*************** +*** 877,884 **** + echo " DEFAULT_PIDLOG: ${runtimedir_relative}httpd.pid" + echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}httpd.scoreboard" + echo " DEFAULT_LOCKFILE: ${runtimedir_relative}httpd.lock" +! echo " DEFAULT_XFERLOG: ${logfiledir_relative}access_log" +! echo " DEFAULT_ERRORLOG: ${logfiledir_relative}error_log" + echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types" + echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}httpd.conf" + echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf" +--- 877,884 ---- + echo " DEFAULT_PIDLOG: ${runtimedir_relative}httpd.pid" + echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}httpd.scoreboard" + echo " DEFAULT_LOCKFILE: ${runtimedir_relative}httpd.lock" +! echo " DEFAULT_XFERLOG: ${logfiledir_relative}httpd-access.log" +! echo " DEFAULT_ERRORLOG: ${logfiledir_relative}httpd-error.log" + echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types" + echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}httpd.conf" + echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf" +*************** +*** 942,949 **** + echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}httpd.pid\"'" >>$src/apaci + echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}httpd.scoreboard\"'" >>$src/apaci + echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}httpd.lock\"'" >>$src/apaci +! echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}access_log\"'" >>$src/apaci +! echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}error_log\"'" >>$src/apaci + echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci + echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}httpd.conf\"'" >>$src/apaci + echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci +--- 942,949 ---- + echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}httpd.pid\"'" >>$src/apaci + echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}httpd.scoreboard\"'" >>$src/apaci + echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}httpd.lock\"'" >>$src/apaci +! echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}httpd-access.log\"'" >>$src/apaci +! echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}httpd-error.log\"'" >>$src/apaci + echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci + echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}httpd.conf\"'" >>$src/apaci + echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci diff --git a/www/apache21/files/patch-ab b/www/apache21/files/patch-ab index 55c4a50bbd3e..040690f9b1df 100644 --- a/www/apache21/files/patch-ab +++ b/www/apache21/files/patch-ab @@ -1,7 +1,17 @@ -*** Makefile.tmpl.orig Tue May 12 15:52:11 1998 ---- Makefile.tmpl Fri Jun 5 19:13:32 1998 +*** Makefile.tmpl.orig Wed Jul 15 21:03:25 1998 +--- Makefile.tmpl Thu Jul 23 16:14:15 1998 *************** -*** 161,167 **** +*** 107,112 **** +--- 107,113 ---- + runtimedir = @runtimedir@ + logfiledir = @logfiledir@ + proxycachedir = @proxycachedir@ ++ doc_prefix = $(prefix)/share/doc/apache + + libexecdir_relative = @libexecdir_relative@ + +*************** +*** 167,173 **** -DGID_MIN=$(suexec_gidmin) \ -DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \ -DLOG_EXEC=\"$(logfiledir)/suexec_log\" \ @@ -9,7 +19,7 @@ -DSAFE_PATH=\"$(suexec_safepath)\" \ ' \ suexec; \ ---- 161,167 ---- +--- 168,174 ---- -DGID_MIN=$(suexec_gidmin) \ -DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \ -DLOG_EXEC=\"$(logfiledir)/suexec_log\" \ @@ -18,7 +28,7 @@ ' \ suexec; \ *************** -*** 216,224 **** +*** 224,232 **** $(MKDIR) $(root)$(mandir)/man1 $(MKDIR) $(root)$(mandir)/man8 $(MKDIR) $(root)$(sysconfdir) @@ -28,18 +38,18 @@ $(MKDIR) $(root)$(includedir) $(MKDIR) $(root)$(runtimedir) $(MKDIR) $(root)$(logfiledir) ---- 216,224 ---- +--- 225,233 ---- $(MKDIR) $(root)$(mandir)/man1 $(MKDIR) $(root)$(mandir)/man8 $(MKDIR) $(root)$(sysconfdir) -! $(MKDIR) $(root)$(datadir)/data.default +! $(MKDIR) $(root)$(doc_prefix) $(MKDIR) $(root)$(datadir)/icons ! $(MKDIR) $(root)$(datadir)/cgi-bin.default $(MKDIR) $(root)$(includedir) $(MKDIR) $(root)$(runtimedir) $(MKDIR) $(root)$(logfiledir) *************** -*** 330,352 **** +*** 338,360 **** # icons and distributed CGI scripts. install-data: @echo "===> [data: Installing initial data files]" @@ -63,22 +73,23 @@ fi @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \ (cd $(TOP)/icons/ && $(TAR) cf - *) |\ ---- 330,358 ---- +--- 339,368 ---- # icons and distributed CGI scripts. install-data: @echo "===> [data: Installing initial data files]" ! # -@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \ ! # echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \ ! # else \ -! echo "Copying tree $(TOP)/htdocs/ -> $(root)$(datadir)/data.default/"; \ +! echo "Copying tree $(TOP)/htdocs/ -> $(root)$(doc_prefix)/"; \ (cd $(TOP)/htdocs/ && $(TAR) cf - *) |\ -! (cd $(root)$(datadir)/data.default/ && $(TAR) xf -); \ -! find $(root)$(datadir)/data.default/ -type d -exec chmod a+rx {} \; ; \ -! find $(root)$(datadir)/data.default/ -type f -exec chmod a+r {} \; ; \ +! (cd $(root)$(doc_prefix)/ && $(TAR) xf -); \ +! find $(root)$(doc_prefix)/ -type d -exec chmod a+rx {} \; ; \ +! find $(root)$(doc_prefix)/ -type f -exec chmod a+r {} \; ; \ ! # fi ! if [ ! -d $(root)$(datadir)/data ]; then \ -! $(CP) -Rp $(root)$(datadir)/data.default $(root)$(datadir)/data; \ +! $(LN) -s $(root)$(doc_prefix) $(root)$(datadir)/data; \ ! fi +! $(LN) -s $(root)$(doc_prefix) $(root)$(datadir)/data.default ! # -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \ ! # echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \ ! # else \ @@ -89,12 +100,12 @@ ! find $(root)$(datadir)/cgi-bin.default/ -type f -exec chmod a+r {} \; ; \ ! # fi ! if [ ! -d $(root)$(datadir)/cgi-bin ]; then \ -! $(CP) -Rp $(root)$(datadir)/cgi-bin.default $(root)$(datadir)/cgi-bin; \ +! $(LN) -s $(root)$(datadir)/cgi-bin.default $(root)$(datadir)/cgi-bin; \ fi @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \ (cd $(TOP)/icons/ && $(TAR) cf - *) |\ *************** -*** 366,373 **** +*** 374,381 **** echo ""; \ cat $(TOP)/conf/$${conf}-dist ) |\ sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \ @@ -103,7 +114,7 @@ -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \ -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \ -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \ ---- 372,379 ---- +--- 382,389 ---- echo ""; \ cat $(TOP)/conf/$${conf}-dist ) |\ sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \ @@ -113,7 +124,7 @@ -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \ -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \ *************** -*** 375,384 **** +*** 383,392 **** -e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \ -e 's;logs/apache_runtime_status;$(runtimedir)/httpd.scoreboard;' \ -e 's;logs/httpd.pid;$(runtimedir)/httpd.pid;' \ @@ -122,9 +133,9 @@ ! -e 's;logs/referer_log;$(logfiledir)/referer_log;' \ ! -e 's;logs/agent_log;$(logfiledir)/agent_log;' \ -e 's;conf/magic;$(sysconfdir)/magic;' \ - > $(TOP)/$(SRC)/.apaci.install.tmp && \ - echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${conf}.default"; \ ---- 381,390 ---- + -e 's;conf/mime.types;$(sysconfdir)/mime.types;' \ + -e 's;Group #-1;Group $(conf_group);' \ +--- 391,400 ---- -e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \ -e 's;logs/apache_runtime_status;$(runtimedir)/httpd.scoreboard;' \ -e 's;logs/httpd.pid;$(runtimedir)/httpd.pid;' \ @@ -133,5 +144,5 @@ ! -e 's;logs/referer_log;$(logfiledir)/httpd-referer.log;' \ ! -e 's;logs/agent_log;$(logfiledir)/httpd-agent.log;' \ -e 's;conf/magic;$(sysconfdir)/magic;' \ - > $(TOP)/$(SRC)/.apaci.install.tmp && \ - echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${conf}.default"; \ + -e 's;conf/mime.types;$(sysconfdir)/mime.types;' \ + -e 's;Group #-1;Group $(conf_group);' \ diff --git a/www/apache21/files/patch-ak b/www/apache21/files/patch-ak index a99c4343151c..e85e920f178e 100644 --- a/www/apache21/files/patch-ak +++ b/www/apache21/files/patch-ak @@ -1,13 +1,23 @@ -*** src/support/apachectl.orig Tue Mar 31 16:53:46 1998 ---- src/support/apachectl Tue Apr 21 17:15:55 1998 +*** src/support/apachectl.orig Fri Jul 17 01:25:54 1998 +--- src/support/apachectl Thu Jul 23 17:11:38 1998 *************** -*** 37,42 **** ---- 37,44 ---- - # +*** 39,44 **** +--- 39,46 ---- # -------------------- -------------------- # |||||||||||||||||||| END CONFIGURATION SECTION |||||||||||||||||||| -+ -+ eval `limits -e -C daemon` >/dev/null 2>&1 ++ eval `limits -e -C daemon` >/dev/null 2>&1 ++ ERROR=0 ARGV="$@" + if [ "x$ARGV" = "x" ] ; then +*************** +*** 82,87 **** +--- 84,90 ---- + fi + if kill $PID ; then + echo "$0 $ARG: httpd stopped" ++ rm $PIDFILE + else + echo "$0 $ARG: httpd could not be stopped" + ERROR=4 diff --git a/www/apache21/pkg-plist b/www/apache21/pkg-plist index 1fe027c6c207..32f5bc97e88e 100644 --- a/www/apache21/pkg-plist +++ b/www/apache21/pkg-plist @@ -9,7 +9,11 @@ etc/apache/srm.conf.default etc/rc.d/apache.sh include/apache/alloc.h include/apache/ap.h +include/apache/ap_compat.h include/apache/ap_config.h +include/apache/ap_config_auto.h +include/apache/ap_ctype.h +include/apache/ap_md5.h include/apache/buff.h include/apache/compat.h include/apache/conf.h @@ -62,129 +66,133 @@ sbin/apxs sbin/httpd sbin/logresolve sbin/rotatelogs +share/doc/apache/apache_pb.gif +@exec ln -fs %B %D/www/data.default +@unexec rm -f %D/www/data.default +share/doc/apache/index.html +share/doc/apache/manual/LICENSE +share/doc/apache/manual/bind.html +share/doc/apache/manual/cgi_path.html +share/doc/apache/manual/content-negotiation.html +share/doc/apache/manual/custom-error.html +share/doc/apache/manual/dns-caveats.html +share/doc/apache/manual/dso.html +share/doc/apache/manual/ebcdic.html +share/doc/apache/manual/env.html +share/doc/apache/manual/footer.html +share/doc/apache/manual/handler.html +share/doc/apache/manual/header.html +share/doc/apache/manual/images/custom_errordocs.gif +share/doc/apache/manual/images/home.gif +share/doc/apache/manual/images/index.gif +share/doc/apache/manual/images/mod_rewrite_fig1.fig +share/doc/apache/manual/images/mod_rewrite_fig1.gif +share/doc/apache/manual/images/mod_rewrite_fig2.fig +share/doc/apache/manual/images/mod_rewrite_fig2.gif +share/doc/apache/manual/images/sub.gif +share/doc/apache/manual/index.html +share/doc/apache/manual/install.html +share/doc/apache/manual/invoking.html +share/doc/apache/manual/keepalive.html +share/doc/apache/manual/location.html +share/doc/apache/manual/man-template.html +share/doc/apache/manual/misc/API.html +share/doc/apache/manual/misc/FAQ.html +share/doc/apache/manual/misc/HTTP_Features.tsv +share/doc/apache/manual/misc/client_block_api.html +share/doc/apache/manual/misc/compat_notes.html +share/doc/apache/manual/misc/custom_errordocs.html +share/doc/apache/manual/misc/descriptors.html +share/doc/apache/manual/misc/fin_wait_2.html +share/doc/apache/manual/misc/footer.html +share/doc/apache/manual/misc/header.html +share/doc/apache/manual/misc/howto.html +share/doc/apache/manual/misc/index.html +share/doc/apache/manual/misc/known_client_problems.html +share/doc/apache/manual/misc/nopgp.html +share/doc/apache/manual/misc/perf-bsd44.html +share/doc/apache/manual/misc/perf-dec.html +share/doc/apache/manual/misc/perf-hp.html +share/doc/apache/manual/misc/perf-tuning.html +share/doc/apache/manual/misc/perf.html +share/doc/apache/manual/misc/security_tips.html +share/doc/apache/manual/misc/vif-info.html +share/doc/apache/manual/misc/windoz_keepalive.html +share/doc/apache/manual/mod/core.html +share/doc/apache/manual/mod/directive-dict.html +share/doc/apache/manual/mod/directives.html +share/doc/apache/manual/mod/footer.html +share/doc/apache/manual/mod/header.html +share/doc/apache/manual/mod/index.html +share/doc/apache/manual/mod/mod_access.html +share/doc/apache/manual/mod/mod_actions.html +share/doc/apache/manual/mod/mod_alias.html +share/doc/apache/manual/mod/mod_asis.html +share/doc/apache/manual/mod/mod_auth.html +share/doc/apache/manual/mod/mod_auth_anon.html +share/doc/apache/manual/mod/mod_auth_db.html +share/doc/apache/manual/mod/mod_auth_dbm.html +share/doc/apache/manual/mod/mod_autoindex.html +share/doc/apache/manual/mod/mod_browser.html +share/doc/apache/manual/mod/mod_cern_meta.html +share/doc/apache/manual/mod/mod_cgi.html +share/doc/apache/manual/mod/mod_cookies.html +share/doc/apache/manual/mod/mod_digest.html +share/doc/apache/manual/mod/mod_dir.html +share/doc/apache/manual/mod/mod_dld.html +share/doc/apache/manual/mod/mod_dll.html +share/doc/apache/manual/mod/mod_env.html +share/doc/apache/manual/mod/mod_example.html +share/doc/apache/manual/mod/mod_expires.html +share/doc/apache/manual/mod/mod_headers.html +share/doc/apache/manual/mod/mod_imap.html +share/doc/apache/manual/mod/mod_include.html +share/doc/apache/manual/mod/mod_info.html +share/doc/apache/manual/mod/mod_isapi.html +share/doc/apache/manual/mod/mod_log_agent.html +share/doc/apache/manual/mod/mod_log_common.html +share/doc/apache/manual/mod/mod_log_config.html +share/doc/apache/manual/mod/mod_log_referer.html +share/doc/apache/manual/mod/mod_mime.html +share/doc/apache/manual/mod/mod_mime_magic.html +share/doc/apache/manual/mod/mod_mmap_static.html +share/doc/apache/manual/mod/mod_negotiation.html +share/doc/apache/manual/mod/mod_proxy.html +share/doc/apache/manual/mod/mod_rewrite.html +share/doc/apache/manual/mod/mod_setenvif.html +share/doc/apache/manual/mod/mod_so.html +share/doc/apache/manual/mod/mod_speling.html +share/doc/apache/manual/mod/mod_status.html +share/doc/apache/manual/mod/mod_unique_id.html +share/doc/apache/manual/mod/mod_userdir.html +share/doc/apache/manual/mod/mod_usertrack.html +share/doc/apache/manual/multilogs.html +share/doc/apache/manual/new_features_1_0.html +share/doc/apache/manual/new_features_1_1.html +share/doc/apache/manual/new_features_1_2.html +share/doc/apache/manual/new_features_1_3.html +share/doc/apache/manual/process-model.html +share/doc/apache/manual/sections.html +share/doc/apache/manual/sourcereorg.html +share/doc/apache/manual/stopping.html +share/doc/apache/manual/suexec.html +share/doc/apache/manual/unixware.html +share/doc/apache/manual/upgrading_to_1_3.html +share/doc/apache/manual/vhosts/details.html +share/doc/apache/manual/vhosts/details_1_2.html +share/doc/apache/manual/vhosts/examples.html +share/doc/apache/manual/vhosts/fd-limits.html +share/doc/apache/manual/vhosts/footer.html +share/doc/apache/manual/vhosts/header.html +share/doc/apache/manual/vhosts/host.html +share/doc/apache/manual/vhosts/index.html +share/doc/apache/manual/vhosts/ip-based.html +share/doc/apache/manual/vhosts/name-based.html +share/doc/apache/manual/vhosts/vhosts-in-depth.html +share/doc/apache/manual/vhosts/virtual-host.html +share/doc/apache/manual/windows.html www/cgi-bin.default/printenv www/cgi-bin.default/test-cgi -www/data.default/apache_pb.gif -www/data.default/index.html -www/data.default/manual/LICENSE -www/data.default/manual/bind.html -www/data.default/manual/cgi_path.html -www/data.default/manual/content-negotiation.html -www/data.default/manual/custom-error.html -www/data.default/manual/dns-caveats.html -www/data.default/manual/ebcdic.html -www/data.default/manual/env.html -www/data.default/manual/footer.html -www/data.default/manual/handler.html -www/data.default/manual/header.html -www/data.default/manual/images/custom_errordocs.gif -www/data.default/manual/images/home.gif -www/data.default/manual/images/index.gif -www/data.default/manual/images/mod_rewrite_fig1.fig -www/data.default/manual/images/mod_rewrite_fig1.gif -www/data.default/manual/images/mod_rewrite_fig2.fig -www/data.default/manual/images/mod_rewrite_fig2.gif -www/data.default/manual/images/sub.gif -www/data.default/manual/index.html -www/data.default/manual/install.html -www/data.default/manual/invoking.html -www/data.default/manual/keepalive.html -www/data.default/manual/location.html -www/data.default/manual/man-template.html -www/data.default/manual/misc/API.html -www/data.default/manual/misc/FAQ.html -www/data.default/manual/misc/client_block_api.html -www/data.default/manual/misc/compat_notes.html -www/data.default/manual/misc/custom_errordocs.html -www/data.default/manual/misc/descriptors.html -www/data.default/manual/misc/fin_wait_2.html -www/data.default/manual/misc/footer.html -www/data.default/manual/misc/header.html -www/data.default/manual/misc/howto.html -www/data.default/manual/misc/index.html -www/data.default/manual/misc/known_client_problems.html -www/data.default/manual/misc/nopgp.html -www/data.default/manual/misc/perf-bsd44.html -www/data.default/manual/misc/perf-dec.html -www/data.default/manual/misc/perf-hp.html -www/data.default/manual/misc/perf-tuning.html -www/data.default/manual/misc/perf.html -www/data.default/manual/misc/security_tips.html -www/data.default/manual/misc/vif-info.html -www/data.default/manual/misc/windoz_keepalive.html -www/data.default/manual/mod/core.html -www/data.default/manual/mod/directive-dict.html -www/data.default/manual/mod/directives.html -www/data.default/manual/mod/footer.html -www/data.default/manual/mod/header.html -www/data.default/manual/mod/index.html -www/data.default/manual/mod/mod_access.html -www/data.default/manual/mod/mod_actions.html -www/data.default/manual/mod/mod_alias.html -www/data.default/manual/mod/mod_asis.html -www/data.default/manual/mod/mod_auth.html -www/data.default/manual/mod/mod_auth_anon.html -www/data.default/manual/mod/mod_auth_db.html -www/data.default/manual/mod/mod_auth_dbm.html -www/data.default/manual/mod/mod_autoindex.html -www/data.default/manual/mod/mod_browser.html -www/data.default/manual/mod/mod_cern_meta.html -www/data.default/manual/mod/mod_cgi.html -www/data.default/manual/mod/mod_cookies.html -www/data.default/manual/mod/mod_digest.html -www/data.default/manual/mod/mod_dir.html -www/data.default/manual/mod/mod_dld.html -www/data.default/manual/mod/mod_dll.html -www/data.default/manual/mod/mod_env.html -www/data.default/manual/mod/mod_example.html -www/data.default/manual/mod/mod_expires.html -www/data.default/manual/mod/mod_headers.html -www/data.default/manual/mod/mod_imap.html -www/data.default/manual/mod/mod_include.html -www/data.default/manual/mod/mod_info.html -www/data.default/manual/mod/mod_isapi.html -www/data.default/manual/mod/mod_log_agent.html -www/data.default/manual/mod/mod_log_common.html -www/data.default/manual/mod/mod_log_config.html -www/data.default/manual/mod/mod_log_referer.html -www/data.default/manual/mod/mod_mime.html -www/data.default/manual/mod/mod_mime_magic.html -www/data.default/manual/mod/mod_mmap_static.html -www/data.default/manual/mod/mod_negotiation.html -www/data.default/manual/mod/mod_proxy.html -www/data.default/manual/mod/mod_rewrite.html -www/data.default/manual/mod/mod_setenvif.html -www/data.default/manual/mod/mod_so.html -www/data.default/manual/mod/mod_speling.html -www/data.default/manual/mod/mod_status.html -www/data.default/manual/mod/mod_unique_id.html -www/data.default/manual/mod/mod_userdir.html -www/data.default/manual/mod/mod_usertrack.html -www/data.default/manual/multilogs.html -www/data.default/manual/new_features_1_0.html -www/data.default/manual/new_features_1_1.html -www/data.default/manual/new_features_1_2.html -www/data.default/manual/new_features_1_3.html -www/data.default/manual/process-model.html -www/data.default/manual/sections.html -www/data.default/manual/sourcereorg.html -www/data.default/manual/stopping.html -www/data.default/manual/suexec.html -www/data.default/manual/unixware.html -www/data.default/manual/upgrading_to_1_3.html -www/data.default/manual/vhosts/details.html -www/data.default/manual/vhosts/details_1_2.html -www/data.default/manual/vhosts/examples.html -www/data.default/manual/vhosts/fd-limits.html -www/data.default/manual/vhosts/footer.html -www/data.default/manual/vhosts/header.html -www/data.default/manual/vhosts/host.html -www/data.default/manual/vhosts/index.html -www/data.default/manual/vhosts/ip-based.html -www/data.default/manual/vhosts/name-based.html -www/data.default/manual/vhosts/vhosts-in-depth.html -www/data.default/manual/vhosts/virtual-host.html -www/data.default/manual/windows.html www/icons/README www/icons/a.gif www/icons/alert.black.gif diff --git a/www/apache22/Makefile b/www/apache22/Makefile index 2497dc1461c8..28d9322e430c 100644 --- a/www/apache22/Makefile +++ b/www/apache22/Makefile @@ -1,17 +1,17 @@ # New ports collection makefile for: apache HTTPD -# Version required: 1.3 +# Version required: 1.3* # Date created: Fri Aug 25 16:42:36 CDT 1995 # Whom: ache@nagual.pp.ru # -# $Id: Makefile,v 1.57 1998/06/18 11:56:17 ache Exp $ +# $Id: Makefile,v 1.58 1998/06/24 19:54:05 ache Exp $ # -DISTNAME= apache_1.3.0 -PKGNAME= apache-1.3.0 +DISTNAME= apache_1.3.1 +PKGNAME= apache-1.3.1 CATEGORIES= www MASTER_SITES= ftp://www.apache.org/apache/dist/ -#PATCH_SITES= ftp://www.apache.org/apache/dist/patches/apply_to_1.3.0/ +#PATCH_SITES= ftp://www.apache.org/apache/dist/patches/apply_to_1.3.1/ MAINTAINER= ache@freebsd.org @@ -21,11 +21,14 @@ MAINTAINER= ache@freebsd.org GNU_CONFIGURE= yes CONFIGURE_ARGS= \ + --sysconfdir=${PREFIX}/etc/apache \ + --includedir=${PREFIX}/include/apache \ --logfiledir=/var/log \ --runtimedir=/var/run \ --datadir=${PREFIX}/www \ --proxycachedir=${PREFIX}/www/proxy \ --libexecdir=${PREFIX}/libexec/apache \ + --without-confadjust \ --enable-shared=remain \ --enable-module=most \ --enable-module=auth_db \ diff --git a/www/apache22/distinfo b/www/apache22/distinfo index 92422d9b2a7b..66c4b7a0722c 100644 --- a/www/apache22/distinfo +++ b/www/apache22/distinfo @@ -1 +1 @@ -MD5 (apache_1.3.0.tar.gz) = 99aa7c04ae284180f85cf05f839b4308 +MD5 (apache_1.3.1.tar.gz) = fd28c26f94451216a23f34f5fe22e2b4 diff --git a/www/apache22/files/patch-aa b/www/apache22/files/patch-aa new file mode 100644 index 000000000000..21ea6449f6ca --- /dev/null +++ b/www/apache22/files/patch-aa @@ -0,0 +1,40 @@ +*** configure.bak Sun Jul 12 13:25:46 1998 +--- configure Thu Jul 23 16:52:04 1998 +*************** +*** 877,884 **** + echo " DEFAULT_PIDLOG: ${runtimedir_relative}httpd.pid" + echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}httpd.scoreboard" + echo " DEFAULT_LOCKFILE: ${runtimedir_relative}httpd.lock" +! echo " DEFAULT_XFERLOG: ${logfiledir_relative}access_log" +! echo " DEFAULT_ERRORLOG: ${logfiledir_relative}error_log" + echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types" + echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}httpd.conf" + echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf" +--- 877,884 ---- + echo " DEFAULT_PIDLOG: ${runtimedir_relative}httpd.pid" + echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}httpd.scoreboard" + echo " DEFAULT_LOCKFILE: ${runtimedir_relative}httpd.lock" +! echo " DEFAULT_XFERLOG: ${logfiledir_relative}httpd-access.log" +! echo " DEFAULT_ERRORLOG: ${logfiledir_relative}httpd-error.log" + echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types" + echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}httpd.conf" + echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf" +*************** +*** 942,949 **** + echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}httpd.pid\"'" >>$src/apaci + echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}httpd.scoreboard\"'" >>$src/apaci + echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}httpd.lock\"'" >>$src/apaci +! echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}access_log\"'" >>$src/apaci +! echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}error_log\"'" >>$src/apaci + echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci + echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}httpd.conf\"'" >>$src/apaci + echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci +--- 942,949 ---- + echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}httpd.pid\"'" >>$src/apaci + echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}httpd.scoreboard\"'" >>$src/apaci + echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}httpd.lock\"'" >>$src/apaci +! echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}httpd-access.log\"'" >>$src/apaci +! echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}httpd-error.log\"'" >>$src/apaci + echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci + echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}httpd.conf\"'" >>$src/apaci + echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci diff --git a/www/apache22/files/patch-ab b/www/apache22/files/patch-ab index 55c4a50bbd3e..040690f9b1df 100644 --- a/www/apache22/files/patch-ab +++ b/www/apache22/files/patch-ab @@ -1,7 +1,17 @@ -*** Makefile.tmpl.orig Tue May 12 15:52:11 1998 ---- Makefile.tmpl Fri Jun 5 19:13:32 1998 +*** Makefile.tmpl.orig Wed Jul 15 21:03:25 1998 +--- Makefile.tmpl Thu Jul 23 16:14:15 1998 *************** -*** 161,167 **** +*** 107,112 **** +--- 107,113 ---- + runtimedir = @runtimedir@ + logfiledir = @logfiledir@ + proxycachedir = @proxycachedir@ ++ doc_prefix = $(prefix)/share/doc/apache + + libexecdir_relative = @libexecdir_relative@ + +*************** +*** 167,173 **** -DGID_MIN=$(suexec_gidmin) \ -DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \ -DLOG_EXEC=\"$(logfiledir)/suexec_log\" \ @@ -9,7 +19,7 @@ -DSAFE_PATH=\"$(suexec_safepath)\" \ ' \ suexec; \ ---- 161,167 ---- +--- 168,174 ---- -DGID_MIN=$(suexec_gidmin) \ -DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \ -DLOG_EXEC=\"$(logfiledir)/suexec_log\" \ @@ -18,7 +28,7 @@ ' \ suexec; \ *************** -*** 216,224 **** +*** 224,232 **** $(MKDIR) $(root)$(mandir)/man1 $(MKDIR) $(root)$(mandir)/man8 $(MKDIR) $(root)$(sysconfdir) @@ -28,18 +38,18 @@ $(MKDIR) $(root)$(includedir) $(MKDIR) $(root)$(runtimedir) $(MKDIR) $(root)$(logfiledir) ---- 216,224 ---- +--- 225,233 ---- $(MKDIR) $(root)$(mandir)/man1 $(MKDIR) $(root)$(mandir)/man8 $(MKDIR) $(root)$(sysconfdir) -! $(MKDIR) $(root)$(datadir)/data.default +! $(MKDIR) $(root)$(doc_prefix) $(MKDIR) $(root)$(datadir)/icons ! $(MKDIR) $(root)$(datadir)/cgi-bin.default $(MKDIR) $(root)$(includedir) $(MKDIR) $(root)$(runtimedir) $(MKDIR) $(root)$(logfiledir) *************** -*** 330,352 **** +*** 338,360 **** # icons and distributed CGI scripts. install-data: @echo "===> [data: Installing initial data files]" @@ -63,22 +73,23 @@ fi @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \ (cd $(TOP)/icons/ && $(TAR) cf - *) |\ ---- 330,358 ---- +--- 339,368 ---- # icons and distributed CGI scripts. install-data: @echo "===> [data: Installing initial data files]" ! # -@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \ ! # echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \ ! # else \ -! echo "Copying tree $(TOP)/htdocs/ -> $(root)$(datadir)/data.default/"; \ +! echo "Copying tree $(TOP)/htdocs/ -> $(root)$(doc_prefix)/"; \ (cd $(TOP)/htdocs/ && $(TAR) cf - *) |\ -! (cd $(root)$(datadir)/data.default/ && $(TAR) xf -); \ -! find $(root)$(datadir)/data.default/ -type d -exec chmod a+rx {} \; ; \ -! find $(root)$(datadir)/data.default/ -type f -exec chmod a+r {} \; ; \ +! (cd $(root)$(doc_prefix)/ && $(TAR) xf -); \ +! find $(root)$(doc_prefix)/ -type d -exec chmod a+rx {} \; ; \ +! find $(root)$(doc_prefix)/ -type f -exec chmod a+r {} \; ; \ ! # fi ! if [ ! -d $(root)$(datadir)/data ]; then \ -! $(CP) -Rp $(root)$(datadir)/data.default $(root)$(datadir)/data; \ +! $(LN) -s $(root)$(doc_prefix) $(root)$(datadir)/data; \ ! fi +! $(LN) -s $(root)$(doc_prefix) $(root)$(datadir)/data.default ! # -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \ ! # echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \ ! # else \ @@ -89,12 +100,12 @@ ! find $(root)$(datadir)/cgi-bin.default/ -type f -exec chmod a+r {} \; ; \ ! # fi ! if [ ! -d $(root)$(datadir)/cgi-bin ]; then \ -! $(CP) -Rp $(root)$(datadir)/cgi-bin.default $(root)$(datadir)/cgi-bin; \ +! $(LN) -s $(root)$(datadir)/cgi-bin.default $(root)$(datadir)/cgi-bin; \ fi @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \ (cd $(TOP)/icons/ && $(TAR) cf - *) |\ *************** -*** 366,373 **** +*** 374,381 **** echo ""; \ cat $(TOP)/conf/$${conf}-dist ) |\ sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \ @@ -103,7 +114,7 @@ -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \ -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \ -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \ ---- 372,379 ---- +--- 382,389 ---- echo ""; \ cat $(TOP)/conf/$${conf}-dist ) |\ sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \ @@ -113,7 +124,7 @@ -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \ -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \ *************** -*** 375,384 **** +*** 383,392 **** -e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \ -e 's;logs/apache_runtime_status;$(runtimedir)/httpd.scoreboard;' \ -e 's;logs/httpd.pid;$(runtimedir)/httpd.pid;' \ @@ -122,9 +133,9 @@ ! -e 's;logs/referer_log;$(logfiledir)/referer_log;' \ ! -e 's;logs/agent_log;$(logfiledir)/agent_log;' \ -e 's;conf/magic;$(sysconfdir)/magic;' \ - > $(TOP)/$(SRC)/.apaci.install.tmp && \ - echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${conf}.default"; \ ---- 381,390 ---- + -e 's;conf/mime.types;$(sysconfdir)/mime.types;' \ + -e 's;Group #-1;Group $(conf_group);' \ +--- 391,400 ---- -e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \ -e 's;logs/apache_runtime_status;$(runtimedir)/httpd.scoreboard;' \ -e 's;logs/httpd.pid;$(runtimedir)/httpd.pid;' \ @@ -133,5 +144,5 @@ ! -e 's;logs/referer_log;$(logfiledir)/httpd-referer.log;' \ ! -e 's;logs/agent_log;$(logfiledir)/httpd-agent.log;' \ -e 's;conf/magic;$(sysconfdir)/magic;' \ - > $(TOP)/$(SRC)/.apaci.install.tmp && \ - echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${conf}.default"; \ + -e 's;conf/mime.types;$(sysconfdir)/mime.types;' \ + -e 's;Group #-1;Group $(conf_group);' \ diff --git a/www/apache22/files/patch-ak b/www/apache22/files/patch-ak index a99c4343151c..e85e920f178e 100644 --- a/www/apache22/files/patch-ak +++ b/www/apache22/files/patch-ak @@ -1,13 +1,23 @@ -*** src/support/apachectl.orig Tue Mar 31 16:53:46 1998 ---- src/support/apachectl Tue Apr 21 17:15:55 1998 +*** src/support/apachectl.orig Fri Jul 17 01:25:54 1998 +--- src/support/apachectl Thu Jul 23 17:11:38 1998 *************** -*** 37,42 **** ---- 37,44 ---- - # +*** 39,44 **** +--- 39,46 ---- # -------------------- -------------------- # |||||||||||||||||||| END CONFIGURATION SECTION |||||||||||||||||||| -+ -+ eval `limits -e -C daemon` >/dev/null 2>&1 ++ eval `limits -e -C daemon` >/dev/null 2>&1 ++ ERROR=0 ARGV="$@" + if [ "x$ARGV" = "x" ] ; then +*************** +*** 82,87 **** +--- 84,90 ---- + fi + if kill $PID ; then + echo "$0 $ARG: httpd stopped" ++ rm $PIDFILE + else + echo "$0 $ARG: httpd could not be stopped" + ERROR=4 diff --git a/www/apache22/pkg-plist b/www/apache22/pkg-plist index 1fe027c6c207..32f5bc97e88e 100644 --- a/www/apache22/pkg-plist +++ b/www/apache22/pkg-plist @@ -9,7 +9,11 @@ etc/apache/srm.conf.default etc/rc.d/apache.sh include/apache/alloc.h include/apache/ap.h +include/apache/ap_compat.h include/apache/ap_config.h +include/apache/ap_config_auto.h +include/apache/ap_ctype.h +include/apache/ap_md5.h include/apache/buff.h include/apache/compat.h include/apache/conf.h @@ -62,129 +66,133 @@ sbin/apxs sbin/httpd sbin/logresolve sbin/rotatelogs +share/doc/apache/apache_pb.gif +@exec ln -fs %B %D/www/data.default +@unexec rm -f %D/www/data.default +share/doc/apache/index.html +share/doc/apache/manual/LICENSE +share/doc/apache/manual/bind.html +share/doc/apache/manual/cgi_path.html +share/doc/apache/manual/content-negotiation.html +share/doc/apache/manual/custom-error.html +share/doc/apache/manual/dns-caveats.html +share/doc/apache/manual/dso.html +share/doc/apache/manual/ebcdic.html +share/doc/apache/manual/env.html +share/doc/apache/manual/footer.html +share/doc/apache/manual/handler.html +share/doc/apache/manual/header.html +share/doc/apache/manual/images/custom_errordocs.gif +share/doc/apache/manual/images/home.gif +share/doc/apache/manual/images/index.gif +share/doc/apache/manual/images/mod_rewrite_fig1.fig +share/doc/apache/manual/images/mod_rewrite_fig1.gif +share/doc/apache/manual/images/mod_rewrite_fig2.fig +share/doc/apache/manual/images/mod_rewrite_fig2.gif +share/doc/apache/manual/images/sub.gif +share/doc/apache/manual/index.html +share/doc/apache/manual/install.html +share/doc/apache/manual/invoking.html +share/doc/apache/manual/keepalive.html +share/doc/apache/manual/location.html +share/doc/apache/manual/man-template.html +share/doc/apache/manual/misc/API.html +share/doc/apache/manual/misc/FAQ.html +share/doc/apache/manual/misc/HTTP_Features.tsv +share/doc/apache/manual/misc/client_block_api.html +share/doc/apache/manual/misc/compat_notes.html +share/doc/apache/manual/misc/custom_errordocs.html +share/doc/apache/manual/misc/descriptors.html +share/doc/apache/manual/misc/fin_wait_2.html +share/doc/apache/manual/misc/footer.html +share/doc/apache/manual/misc/header.html +share/doc/apache/manual/misc/howto.html +share/doc/apache/manual/misc/index.html +share/doc/apache/manual/misc/known_client_problems.html +share/doc/apache/manual/misc/nopgp.html +share/doc/apache/manual/misc/perf-bsd44.html +share/doc/apache/manual/misc/perf-dec.html +share/doc/apache/manual/misc/perf-hp.html +share/doc/apache/manual/misc/perf-tuning.html +share/doc/apache/manual/misc/perf.html +share/doc/apache/manual/misc/security_tips.html +share/doc/apache/manual/misc/vif-info.html +share/doc/apache/manual/misc/windoz_keepalive.html +share/doc/apache/manual/mod/core.html +share/doc/apache/manual/mod/directive-dict.html +share/doc/apache/manual/mod/directives.html +share/doc/apache/manual/mod/footer.html +share/doc/apache/manual/mod/header.html +share/doc/apache/manual/mod/index.html +share/doc/apache/manual/mod/mod_access.html +share/doc/apache/manual/mod/mod_actions.html +share/doc/apache/manual/mod/mod_alias.html +share/doc/apache/manual/mod/mod_asis.html +share/doc/apache/manual/mod/mod_auth.html +share/doc/apache/manual/mod/mod_auth_anon.html +share/doc/apache/manual/mod/mod_auth_db.html +share/doc/apache/manual/mod/mod_auth_dbm.html +share/doc/apache/manual/mod/mod_autoindex.html +share/doc/apache/manual/mod/mod_browser.html +share/doc/apache/manual/mod/mod_cern_meta.html +share/doc/apache/manual/mod/mod_cgi.html +share/doc/apache/manual/mod/mod_cookies.html +share/doc/apache/manual/mod/mod_digest.html +share/doc/apache/manual/mod/mod_dir.html +share/doc/apache/manual/mod/mod_dld.html +share/doc/apache/manual/mod/mod_dll.html +share/doc/apache/manual/mod/mod_env.html +share/doc/apache/manual/mod/mod_example.html +share/doc/apache/manual/mod/mod_expires.html +share/doc/apache/manual/mod/mod_headers.html +share/doc/apache/manual/mod/mod_imap.html +share/doc/apache/manual/mod/mod_include.html +share/doc/apache/manual/mod/mod_info.html +share/doc/apache/manual/mod/mod_isapi.html +share/doc/apache/manual/mod/mod_log_agent.html +share/doc/apache/manual/mod/mod_log_common.html +share/doc/apache/manual/mod/mod_log_config.html +share/doc/apache/manual/mod/mod_log_referer.html +share/doc/apache/manual/mod/mod_mime.html +share/doc/apache/manual/mod/mod_mime_magic.html +share/doc/apache/manual/mod/mod_mmap_static.html +share/doc/apache/manual/mod/mod_negotiation.html +share/doc/apache/manual/mod/mod_proxy.html +share/doc/apache/manual/mod/mod_rewrite.html +share/doc/apache/manual/mod/mod_setenvif.html +share/doc/apache/manual/mod/mod_so.html +share/doc/apache/manual/mod/mod_speling.html +share/doc/apache/manual/mod/mod_status.html +share/doc/apache/manual/mod/mod_unique_id.html +share/doc/apache/manual/mod/mod_userdir.html +share/doc/apache/manual/mod/mod_usertrack.html +share/doc/apache/manual/multilogs.html +share/doc/apache/manual/new_features_1_0.html +share/doc/apache/manual/new_features_1_1.html +share/doc/apache/manual/new_features_1_2.html +share/doc/apache/manual/new_features_1_3.html +share/doc/apache/manual/process-model.html +share/doc/apache/manual/sections.html +share/doc/apache/manual/sourcereorg.html +share/doc/apache/manual/stopping.html +share/doc/apache/manual/suexec.html +share/doc/apache/manual/unixware.html +share/doc/apache/manual/upgrading_to_1_3.html +share/doc/apache/manual/vhosts/details.html +share/doc/apache/manual/vhosts/details_1_2.html +share/doc/apache/manual/vhosts/examples.html +share/doc/apache/manual/vhosts/fd-limits.html +share/doc/apache/manual/vhosts/footer.html +share/doc/apache/manual/vhosts/header.html +share/doc/apache/manual/vhosts/host.html +share/doc/apache/manual/vhosts/index.html +share/doc/apache/manual/vhosts/ip-based.html +share/doc/apache/manual/vhosts/name-based.html +share/doc/apache/manual/vhosts/vhosts-in-depth.html +share/doc/apache/manual/vhosts/virtual-host.html +share/doc/apache/manual/windows.html www/cgi-bin.default/printenv www/cgi-bin.default/test-cgi -www/data.default/apache_pb.gif -www/data.default/index.html -www/data.default/manual/LICENSE -www/data.default/manual/bind.html -www/data.default/manual/cgi_path.html -www/data.default/manual/content-negotiation.html -www/data.default/manual/custom-error.html -www/data.default/manual/dns-caveats.html -www/data.default/manual/ebcdic.html -www/data.default/manual/env.html -www/data.default/manual/footer.html -www/data.default/manual/handler.html -www/data.default/manual/header.html -www/data.default/manual/images/custom_errordocs.gif -www/data.default/manual/images/home.gif -www/data.default/manual/images/index.gif -www/data.default/manual/images/mod_rewrite_fig1.fig -www/data.default/manual/images/mod_rewrite_fig1.gif -www/data.default/manual/images/mod_rewrite_fig2.fig -www/data.default/manual/images/mod_rewrite_fig2.gif -www/data.default/manual/images/sub.gif -www/data.default/manual/index.html -www/data.default/manual/install.html -www/data.default/manual/invoking.html -www/data.default/manual/keepalive.html -www/data.default/manual/location.html -www/data.default/manual/man-template.html -www/data.default/manual/misc/API.html -www/data.default/manual/misc/FAQ.html -www/data.default/manual/misc/client_block_api.html -www/data.default/manual/misc/compat_notes.html -www/data.default/manual/misc/custom_errordocs.html -www/data.default/manual/misc/descriptors.html -www/data.default/manual/misc/fin_wait_2.html -www/data.default/manual/misc/footer.html -www/data.default/manual/misc/header.html -www/data.default/manual/misc/howto.html -www/data.default/manual/misc/index.html -www/data.default/manual/misc/known_client_problems.html -www/data.default/manual/misc/nopgp.html -www/data.default/manual/misc/perf-bsd44.html -www/data.default/manual/misc/perf-dec.html -www/data.default/manual/misc/perf-hp.html -www/data.default/manual/misc/perf-tuning.html -www/data.default/manual/misc/perf.html -www/data.default/manual/misc/security_tips.html -www/data.default/manual/misc/vif-info.html -www/data.default/manual/misc/windoz_keepalive.html -www/data.default/manual/mod/core.html -www/data.default/manual/mod/directive-dict.html -www/data.default/manual/mod/directives.html -www/data.default/manual/mod/footer.html -www/data.default/manual/mod/header.html -www/data.default/manual/mod/index.html -www/data.default/manual/mod/mod_access.html -www/data.default/manual/mod/mod_actions.html -www/data.default/manual/mod/mod_alias.html -www/data.default/manual/mod/mod_asis.html -www/data.default/manual/mod/mod_auth.html -www/data.default/manual/mod/mod_auth_anon.html -www/data.default/manual/mod/mod_auth_db.html -www/data.default/manual/mod/mod_auth_dbm.html -www/data.default/manual/mod/mod_autoindex.html -www/data.default/manual/mod/mod_browser.html -www/data.default/manual/mod/mod_cern_meta.html -www/data.default/manual/mod/mod_cgi.html -www/data.default/manual/mod/mod_cookies.html -www/data.default/manual/mod/mod_digest.html -www/data.default/manual/mod/mod_dir.html -www/data.default/manual/mod/mod_dld.html -www/data.default/manual/mod/mod_dll.html -www/data.default/manual/mod/mod_env.html -www/data.default/manual/mod/mod_example.html -www/data.default/manual/mod/mod_expires.html -www/data.default/manual/mod/mod_headers.html -www/data.default/manual/mod/mod_imap.html -www/data.default/manual/mod/mod_include.html -www/data.default/manual/mod/mod_info.html -www/data.default/manual/mod/mod_isapi.html -www/data.default/manual/mod/mod_log_agent.html -www/data.default/manual/mod/mod_log_common.html -www/data.default/manual/mod/mod_log_config.html -www/data.default/manual/mod/mod_log_referer.html -www/data.default/manual/mod/mod_mime.html -www/data.default/manual/mod/mod_mime_magic.html -www/data.default/manual/mod/mod_mmap_static.html -www/data.default/manual/mod/mod_negotiation.html -www/data.default/manual/mod/mod_proxy.html -www/data.default/manual/mod/mod_rewrite.html -www/data.default/manual/mod/mod_setenvif.html -www/data.default/manual/mod/mod_so.html -www/data.default/manual/mod/mod_speling.html -www/data.default/manual/mod/mod_status.html -www/data.default/manual/mod/mod_unique_id.html -www/data.default/manual/mod/mod_userdir.html -www/data.default/manual/mod/mod_usertrack.html -www/data.default/manual/multilogs.html -www/data.default/manual/new_features_1_0.html -www/data.default/manual/new_features_1_1.html -www/data.default/manual/new_features_1_2.html -www/data.default/manual/new_features_1_3.html -www/data.default/manual/process-model.html -www/data.default/manual/sections.html -www/data.default/manual/sourcereorg.html -www/data.default/manual/stopping.html -www/data.default/manual/suexec.html -www/data.default/manual/unixware.html -www/data.default/manual/upgrading_to_1_3.html -www/data.default/manual/vhosts/details.html -www/data.default/manual/vhosts/details_1_2.html -www/data.default/manual/vhosts/examples.html -www/data.default/manual/vhosts/fd-limits.html -www/data.default/manual/vhosts/footer.html -www/data.default/manual/vhosts/header.html -www/data.default/manual/vhosts/host.html -www/data.default/manual/vhosts/index.html -www/data.default/manual/vhosts/ip-based.html -www/data.default/manual/vhosts/name-based.html -www/data.default/manual/vhosts/vhosts-in-depth.html -www/data.default/manual/vhosts/virtual-host.html -www/data.default/manual/windows.html www/icons/README www/icons/a.gif www/icons/alert.black.gif |