Index: head/www/apache13/Makefile =================================================================== --- head/www/apache13/Makefile (revision 25033) +++ head/www/apache13/Makefile (revision 25034) @@ -1,70 +1,71 @@ # New ports collection makefile for: apache HTTPD # Version required: 1.3* # Date created: Fri Aug 25 16:42:36 CDT 1995 # Whom: ache@freebsd.org # # $FreeBSD$ # -DISTNAME= apache_1.3.9 -PKGNAME= apache-1.3.9 +DISTNAME= apache_1.3.11 +PKGNAME= apache-1.3.11 CATEGORIES= www MASTER_SITES= http://www.apache.org/dist/ \ ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \ ftp://ftp.rge.com/pub/infosystems/apache/dist/ \ ftp://apache.compuex.com/pub/apache/dist/ \ ftp://apache.arctic.org/pub/apache/dist/ \ ftp://ftp.epix.net/pub/apache/dist/ \ ftp://ftp.ameth.org/pub/mirrors/ftp.apache.org/apache/dist/ \ ftp://ftp.connectnet.com/pub/www/apache/ \ ftp://apache.technomancer.com/mirrors/apache/dist/ \ ftp://ftp.raver.net/pub/ftp.apache.org/ \ ftp://www3.service.digital.com/apache/dist/ \ ftp://galileo.galilei.com/pub/apache/ \ ftp://ftp.mtnranch.net/pub/apache/dist/ \ ftp://ftp.iodynamics.com/pub/mirror/apache/dist/ \ ftp://apache.nextpath.com/pub/apache/dist/ MAINTAINER= ache@freebsd.org Y2K= http://www.apache.org/docs/misc/FAQ.html#year2000 # # Set APACHE_PERF_TUNING env. variable to YES to get maximum performance # HAS_CONFIGURE= yes CONFIGURE_ARGS= \ --prefix=${PREFIX} \ + --server-gid=nogroup \ --with-perl=${PERL} \ --with-layout=${FILESDIR}/FreeBSD.layout:FreeBSD \ --suexec-docroot=${PREFIX}/www/data \ --without-confadjust \ --enable-shared=remain \ --enable-module=most \ --enable-module=auth_db \ --disable-module=auth_dbm OPTIM=-DHARD_SERVER_LIMIT=512 \ -DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \ -DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\" .if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES OPTIM+= -DBUFFERED_LOGS CFLAGS+= -O6 -fomit-frame-pointer .endif CONFIGURE_ENV= OPTIM='${OPTIM}' MAN1= dbmmanage.1 htdigest.1 htpasswd.1 MAN8= ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 post-install: @if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \ ${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \ ${ECHO} "[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start > /dev/null && ${ECHO} -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \ ${CHMOD} 751 ${PREFIX}/etc/rc.d/apache.sh; \ fi .include Property changes on: head/www/apache13/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.75 \ No newline at end of property +1.76 \ No newline at end of property Index: head/www/apache13/distinfo =================================================================== --- head/www/apache13/distinfo (revision 25033) +++ head/www/apache13/distinfo (revision 25034) @@ -1 +1 @@ -MD5 (apache_1.3.9.tar.gz) = 880af89251943c67e3614bf2ffb89b32 +MD5 (apache_1.3.11.tar.gz) = 8e0e4c9b410d4d4c4f5832fc0662b9e1 Property changes on: head/www/apache13/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.35 \ No newline at end of property +1.36 \ No newline at end of property Index: head/www/apache13/files/patch-aa =================================================================== --- head/www/apache13/files/patch-aa (revision 25033) +++ head/www/apache13/files/patch-aa (revision 25034) @@ -1,33 +1,24 @@ ---- configure.orig Sat Aug 14 12:29:05 1999 -+++ configure Fri Sep 3 15:38:10 1999 -@@ -1084,7 +1084,7 @@ - ## UID/GID as production oriented as a web server in NIS anyway. - ## - conf_user="nobody" --conf_group="#-1" -+conf_group="nogroup" - conf_port="80" - conf_serveradmin="you@your.address" - conf_servername="new.host.name" -@@ -1153,8 +1153,8 @@ +--- configure.orig Tue Jan 18 01:53:17 2000 ++++ configure Mon Jan 24 19:37:21 2000 +@@ -1232,8 +1232,8 @@ echo " DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid" echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}${thetarget}.scoreboard" echo " DEFAULT_LOCKFILE: ${runtimedir_relative}${thetarget}.lock" - echo " DEFAULT_XFERLOG: ${logfiledir_relative}access_log" - echo " DEFAULT_ERRORLOG: ${logfiledir_relative}error_log" + 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}${thetarget}.conf" echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf" -@@ -1244,8 +1244,8 @@ +@@ -1330,8 +1330,8 @@ echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}${thetarget}.pid\"'" >>$src/apaci echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}${thetarget}.scoreboard\"'" >>$src/apaci echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}${thetarget}.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 '-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}${thetarget}.conf\"'" >>$src/apaci echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci Property changes on: head/www/apache13/files/patch-aa ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/www/apache13/files/patch-ab =================================================================== --- head/www/apache13/files/patch-ab (revision 25033) +++ head/www/apache13/files/patch-ab (revision 25034) @@ -1,85 +1,84 @@ ---- Makefile.tmpl.orig Fri Aug 13 10:58:18 1999 -+++ Makefile.tmpl Fri Sep 3 14:57:01 1999 -@@ -120,6 +120,7 @@ +--- Makefile.tmpl.orig Tue Jan 11 22:47:41 2000 ++++ Makefile.tmpl Mon Jan 24 19:50:42 2000 +@@ -123,6 +123,7 @@ runtimedir = @runtimedir@ logfiledir = @logfiledir@ proxycachedir = @proxycachedir@ +doc_prefix = $(prefix)/share/doc/apache libexecdir_relative = @libexecdir_relative@ -@@ -255,9 +256,9 @@ +@@ -266,9 +267,9 @@ $(MKDIR) $(root)$(mandir)/man1 $(MKDIR) $(root)$(mandir)/man8 $(MKDIR) $(root)$(sysconfdir) - $(MKDIR) $(root)$(htdocsdir) + $(MKDIR) $(root)$(doc_prefix) $(MKDIR) $(root)$(iconsdir) - $(MKDIR) $(root)$(cgidir) + $(MKDIR) $(root)$(cgidir).default $(MKDIR) $(root)$(includedir) $(MKDIR) $(root)$(includedir)/xml $(MKDIR) $(root)$(runtimedir) -@@ -441,26 +442,34 @@ +@@ -452,25 +453,33 @@ # icons and distributed CGI scripts. install-data: @echo "===> [data: Installing initial data files]" -- -@if [ -f $(root)$(htdocsdir)/index.html ]; then \ +- -@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \ - echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \ - else \ - echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \ -+# -@if [ -f $(root)$(htdocsdir)/index.html ]; then \ -+# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \ -+# else \ ++# -@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \ ++# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \ ++# else \ + echo "Copying tree $(TOP)/htdocs/ -> $(root)$(doc_prefix)/"; \ (cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - *) |\ - (cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \ - find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \ - find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \ +- fi +- -@if [ -f $(root)$(cgidir)/printenv ]; then \ +- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \ +- else \ + (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 ++# fi + if [ ! -d $(root)$(htdocsdir) ]; then \ -+ $(LN) -sf $(root)$(doc_prefix) $(root)$(htdocsdir); \ - fi -- -@if [ -f $(root)$(cgidir)/printenv ]; then \ -- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \ -- else \ ++ $(LN) -sf $(root)$(doc_prefix) $(root)$(htdocsdir); \ ++ fi + $(RM) $(root)$(htdocsdir).default + $(LN) -s $(root)$(doc_prefix) $(root)$(htdocsdir).default -+# -@if [ -f $(root)$(cgidir)/printenv ]; then \ -+# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \ -+# else \ ++# -@if [ -f $(root)$(cgidir)/printenv ]; then \ ++# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \ ++# else \ for script in printenv test-cgi; do \ cat $(TOP)/cgi-bin/$${script} |\ sed -e 's;^#!/.*perl;#!$(PERL);' \ > $(TOP)/$(SRC)/.apaci.install.tmp; \ - echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \ - $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \ + echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir).default/$${script}"; \ + $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir).default/$${script}; \ done; \ -- fi -+# fi ++# fi + if [ ! -d $(root)$(cgidir) ]; then \ + $(LN) -sf $(root)$(cgidir).default $(root)$(cgidir); \ -+ fi + fi @echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \ (cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\ - (cd $(root)$(iconsdir)/ && $(TAR) -xf -); \ -@@ -498,10 +507,10 @@ +@@ -509,10 +518,10 @@ -e 's;logs/accept\.lock;$(runtimedir)/$(TARGET).lock;' \ -e 's;logs/apache_runtime_status;$(runtimedir)/$(TARGET).scoreboard;' \ -e 's;logs/httpd\.pid;$(runtimedir)/$(TARGET).pid;' \ - -e "s;logs/access_log;$(logfiledir)/$${target_prefix}access_log;" \ - -e "s;logs/error_log;$(logfiledir)/$${target_prefix}error_log;" \ - -e "s;logs/referer_log;$(logfiledir)/$${target_prefix}referer_log;" \ - -e "s;logs/agent_log;$(logfiledir)/$${target_prefix}agent_log;" \ + -e "s;logs/access_log;$(logfiledir)/$${target_prefix}httpd-access.log;" \ + -e "s;logs/error_log;$(logfiledir)/$${target_prefix}httpd-error.log;" \ + -e "s;logs/referer_log;$(logfiledir)/$${target_prefix}httpd-referer.log;" \ + -e "s;logs/agent_log;$(logfiledir)/$${target_prefix}httpd-agent.log;" \ -e 's;conf/magic;$(sysconfdir)/magic;' \ -e 's;conf/mime\.types;$(sysconfdir)/mime.types;' \ -e 's;User nobody;User $(conf_user);' \ Property changes on: head/www/apache13/files/patch-ab ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.15 \ No newline at end of property +1.16 \ No newline at end of property Index: head/www/apache13/pkg-plist =================================================================== --- head/www/apache13/pkg-plist (revision 25033) +++ head/www/apache13/pkg-plist (revision 25034) @@ -1,342 +1,356 @@ bin/dbmmanage bin/htdigest bin/htpasswd etc/apache/access.conf.default @exec [ ! -f %B/access.conf ] && cp %B/%f %B/access.conf etc/apache/httpd.conf.default @exec [ ! -f %B/httpd.conf ] && cp %B/%f %B/httpd.conf etc/apache/magic.default @exec [ ! -f %B/magic ] && cp %B/%f %B/magic etc/apache/mime.types.default @exec [ ! -f %B/mime.types ] && cp %B/%f %B/mime.types etc/apache/srm.conf.default @exec [ ! -f %B/srm.conf ] && cp %B/%f %B/srm.conf 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/ap_mmn.h include/apache/ap_sha1.h include/apache/buff.h include/apache/compat.h include/apache/conf.h include/apache/explain.h include/apache/fnmatch.h include/apache/hsregex.h include/apache/http_conf_globals.h include/apache/http_config.h include/apache/http_core.h include/apache/http_log.h include/apache/http_main.h include/apache/http_protocol.h include/apache/http_request.h include/apache/http_vhost.h include/apache/httpd.h include/apache/multithread.h include/apache/os-inline.c include/apache/os.h include/apache/rfc1413.h include/apache/scoreboard.h include/apache/util_date.h include/apache/util_md5.h include/apache/util_script.h include/apache/util_uri.h include/apache/xml/asciitab.h include/apache/xml/hashtable.h include/apache/xml/iasciitab.h include/apache/xml/latin1tab.h include/apache/xml/nametab.h include/apache/xml/utf8tab.h include/apache/xml/xmldef.h include/apache/xml/xmlparse.h include/apache/xml/xmlrole.h include/apache/xml/xmltok.h include/apache/xml/xmltok_impl.h libexec/apache/httpd.exp libexec/apache/libproxy.so libexec/apache/mod_auth_anon.so libexec/apache/mod_auth_db.so libexec/apache/mod_cern_meta.so libexec/apache/mod_digest.so libexec/apache/mod_expires.so libexec/apache/mod_headers.so libexec/apache/mod_info.so libexec/apache/mod_mime_magic.so libexec/apache/mod_rewrite.so libexec/apache/mod_speling.so libexec/apache/mod_unique_id.so libexec/apache/mod_usertrack.so libexec/apache/mod_vhost_alias.so sbin/ab sbin/apachectl sbin/apxs sbin/httpd sbin/logresolve sbin/rotatelogs share/doc/apache/apache_pb.gif @exec mkdir -p %D/www @exec ln -fs %B %D/www/data.default @unexec rm -f %D/www/data.default @exec [ ! -d %D/www/data ] && ln -fs %B %D/www/data @exec [ ! -d %D/www/cgi-bin ] && ln -fs %D/www/cgi-bin.default %D/www/cgi-bin -share/doc/apache/index.html +share/doc/apache/index.html.ca +share/doc/apache/index.html.cz +share/doc/apache/index.html.de +share/doc/apache/index.html.dk +share/doc/apache/index.html.ee +share/doc/apache/index.html.en +share/doc/apache/index.html.es +share/doc/apache/index.html.fr +share/doc/apache/index.html.it +share/doc/apache/index.html.lu +share/doc/apache/index.html.nl +share/doc/apache/index.html.pt +share/doc/apache/index.html.se 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-tpf.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/rewriteguide.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_auth_digest.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/mod/mod_vhost_alias.html share/doc/apache/manual/multilogs.html +share/doc/apache/manual/netware.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/readme-tpf.html share/doc/apache/manual/search/manual-index.cgi 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/suexec_1_2.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/mass.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/icons/README www/icons/a.gif www/icons/alert.black.gif www/icons/alert.red.gif www/icons/apache_pb.gif www/icons/back.gif www/icons/ball.gray.gif www/icons/ball.red.gif www/icons/binary.gif www/icons/binhex.gif www/icons/blank.gif www/icons/bomb.gif www/icons/box1.gif www/icons/box2.gif www/icons/broken.gif www/icons/burst.gif www/icons/c.gif www/icons/comp.blue.gif www/icons/comp.gray.gif www/icons/compressed.gif www/icons/continued.gif www/icons/dir.gif www/icons/down.gif www/icons/dvi.gif www/icons/f.gif www/icons/folder.gif www/icons/folder.open.gif www/icons/folder.sec.gif www/icons/forward.gif www/icons/generic.gif www/icons/generic.red.gif www/icons/generic.sec.gif www/icons/hand.right.gif www/icons/hand.up.gif www/icons/icon.sheet.gif www/icons/image1.gif www/icons/image2.gif www/icons/image3.gif www/icons/index.gif www/icons/layout.gif www/icons/left.gif www/icons/link.gif www/icons/movie.gif www/icons/p.gif www/icons/patch.gif www/icons/pdf.gif www/icons/pie0.gif www/icons/pie1.gif www/icons/pie2.gif www/icons/pie3.gif www/icons/pie4.gif www/icons/pie5.gif www/icons/pie6.gif www/icons/pie7.gif www/icons/pie8.gif www/icons/portal.gif www/icons/ps.gif www/icons/quill.gif www/icons/right.gif www/icons/screw1.gif www/icons/screw2.gif www/icons/script.gif www/icons/small/README.txt www/icons/small/back.gif www/icons/small/binary.gif www/icons/small/binhex.gif www/icons/small/blank.gif www/icons/small/broken.gif www/icons/small/burst.gif www/icons/small/comp1.gif www/icons/small/comp2.gif www/icons/small/compressed.gif www/icons/small/continued.gif www/icons/small/dir.gif www/icons/small/dir2.gif www/icons/small/doc.gif www/icons/small/forward.gif www/icons/small/generic.gif www/icons/small/generic2.gif www/icons/small/generic3.gif www/icons/small/image.gif www/icons/small/image2.gif www/icons/small/index.gif www/icons/small/key.gif www/icons/small/movie.gif www/icons/small/patch.gif www/icons/small/ps.gif www/icons/small/rainbow.gif www/icons/small/sound.gif www/icons/small/sound2.gif www/icons/small/tar.gif www/icons/small/text.gif www/icons/small/transfer.gif www/icons/small/unknown.gif www/icons/small/uu.gif www/icons/sound1.gif www/icons/sound2.gif www/icons/sphere1.gif www/icons/sphere2.gif www/icons/tar.gif www/icons/tex.gif www/icons/text.gif www/icons/transfer.gif www/icons/unknown.gif www/icons/up.gif www/icons/uu.gif www/icons/uuencoded.gif www/icons/world1.gif www/icons/world2.gif @exec mkdir -p %D/www/proxy @dirrm etc/apache @dirrm include/apache/xml @dirrm include/apache @dirrm libexec/apache @dirrm share/doc/apache/manual/images @dirrm share/doc/apache/manual/misc @dirrm share/doc/apache/manual/mod @dirrm share/doc/apache/manual/search @dirrm share/doc/apache/manual/vhosts @dirrm share/doc/apache/manual @dirrm share/doc/apache @dirrm www/cgi-bin.default @dirrm www/icons/small @dirrm www/icons @dirrm www/proxy @dirrm www Property changes on: head/www/apache13/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.25 \ No newline at end of property +1.26 \ No newline at end of property Index: head/www/apache2/Makefile =================================================================== --- head/www/apache2/Makefile (revision 25033) +++ head/www/apache2/Makefile (revision 25034) @@ -1,70 +1,71 @@ # New ports collection makefile for: apache HTTPD # Version required: 1.3* # Date created: Fri Aug 25 16:42:36 CDT 1995 # Whom: ache@freebsd.org # # $FreeBSD$ # -DISTNAME= apache_1.3.9 -PKGNAME= apache-1.3.9 +DISTNAME= apache_1.3.11 +PKGNAME= apache-1.3.11 CATEGORIES= www MASTER_SITES= http://www.apache.org/dist/ \ ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \ ftp://ftp.rge.com/pub/infosystems/apache/dist/ \ ftp://apache.compuex.com/pub/apache/dist/ \ ftp://apache.arctic.org/pub/apache/dist/ \ ftp://ftp.epix.net/pub/apache/dist/ \ ftp://ftp.ameth.org/pub/mirrors/ftp.apache.org/apache/dist/ \ ftp://ftp.connectnet.com/pub/www/apache/ \ ftp://apache.technomancer.com/mirrors/apache/dist/ \ ftp://ftp.raver.net/pub/ftp.apache.org/ \ ftp://www3.service.digital.com/apache/dist/ \ ftp://galileo.galilei.com/pub/apache/ \ ftp://ftp.mtnranch.net/pub/apache/dist/ \ ftp://ftp.iodynamics.com/pub/mirror/apache/dist/ \ ftp://apache.nextpath.com/pub/apache/dist/ MAINTAINER= ache@freebsd.org Y2K= http://www.apache.org/docs/misc/FAQ.html#year2000 # # Set APACHE_PERF_TUNING env. variable to YES to get maximum performance # HAS_CONFIGURE= yes CONFIGURE_ARGS= \ --prefix=${PREFIX} \ + --server-gid=nogroup \ --with-perl=${PERL} \ --with-layout=${FILESDIR}/FreeBSD.layout:FreeBSD \ --suexec-docroot=${PREFIX}/www/data \ --without-confadjust \ --enable-shared=remain \ --enable-module=most \ --enable-module=auth_db \ --disable-module=auth_dbm OPTIM=-DHARD_SERVER_LIMIT=512 \ -DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \ -DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\" .if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES OPTIM+= -DBUFFERED_LOGS CFLAGS+= -O6 -fomit-frame-pointer .endif CONFIGURE_ENV= OPTIM='${OPTIM}' MAN1= dbmmanage.1 htdigest.1 htpasswd.1 MAN8= ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 post-install: @if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \ ${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \ ${ECHO} "[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start > /dev/null && ${ECHO} -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \ ${CHMOD} 751 ${PREFIX}/etc/rc.d/apache.sh; \ fi .include Property changes on: head/www/apache2/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.75 \ No newline at end of property +1.76 \ No newline at end of property Index: head/www/apache2/distinfo =================================================================== --- head/www/apache2/distinfo (revision 25033) +++ head/www/apache2/distinfo (revision 25034) @@ -1 +1 @@ -MD5 (apache_1.3.9.tar.gz) = 880af89251943c67e3614bf2ffb89b32 +MD5 (apache_1.3.11.tar.gz) = 8e0e4c9b410d4d4c4f5832fc0662b9e1 Property changes on: head/www/apache2/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.35 \ No newline at end of property +1.36 \ No newline at end of property Index: head/www/apache2/files/patch-aa =================================================================== --- head/www/apache2/files/patch-aa (revision 25033) +++ head/www/apache2/files/patch-aa (revision 25034) @@ -1,33 +1,24 @@ ---- configure.orig Sat Aug 14 12:29:05 1999 -+++ configure Fri Sep 3 15:38:10 1999 -@@ -1084,7 +1084,7 @@ - ## UID/GID as production oriented as a web server in NIS anyway. - ## - conf_user="nobody" --conf_group="#-1" -+conf_group="nogroup" - conf_port="80" - conf_serveradmin="you@your.address" - conf_servername="new.host.name" -@@ -1153,8 +1153,8 @@ +--- configure.orig Tue Jan 18 01:53:17 2000 ++++ configure Mon Jan 24 19:37:21 2000 +@@ -1232,8 +1232,8 @@ echo " DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid" echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}${thetarget}.scoreboard" echo " DEFAULT_LOCKFILE: ${runtimedir_relative}${thetarget}.lock" - echo " DEFAULT_XFERLOG: ${logfiledir_relative}access_log" - echo " DEFAULT_ERRORLOG: ${logfiledir_relative}error_log" + 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}${thetarget}.conf" echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf" -@@ -1244,8 +1244,8 @@ +@@ -1330,8 +1330,8 @@ echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}${thetarget}.pid\"'" >>$src/apaci echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}${thetarget}.scoreboard\"'" >>$src/apaci echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}${thetarget}.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 '-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}${thetarget}.conf\"'" >>$src/apaci echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci Property changes on: head/www/apache2/files/patch-aa ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/www/apache2/files/patch-ab =================================================================== --- head/www/apache2/files/patch-ab (revision 25033) +++ head/www/apache2/files/patch-ab (revision 25034) @@ -1,85 +1,84 @@ ---- Makefile.tmpl.orig Fri Aug 13 10:58:18 1999 -+++ Makefile.tmpl Fri Sep 3 14:57:01 1999 -@@ -120,6 +120,7 @@ +--- Makefile.tmpl.orig Tue Jan 11 22:47:41 2000 ++++ Makefile.tmpl Mon Jan 24 19:50:42 2000 +@@ -123,6 +123,7 @@ runtimedir = @runtimedir@ logfiledir = @logfiledir@ proxycachedir = @proxycachedir@ +doc_prefix = $(prefix)/share/doc/apache libexecdir_relative = @libexecdir_relative@ -@@ -255,9 +256,9 @@ +@@ -266,9 +267,9 @@ $(MKDIR) $(root)$(mandir)/man1 $(MKDIR) $(root)$(mandir)/man8 $(MKDIR) $(root)$(sysconfdir) - $(MKDIR) $(root)$(htdocsdir) + $(MKDIR) $(root)$(doc_prefix) $(MKDIR) $(root)$(iconsdir) - $(MKDIR) $(root)$(cgidir) + $(MKDIR) $(root)$(cgidir).default $(MKDIR) $(root)$(includedir) $(MKDIR) $(root)$(includedir)/xml $(MKDIR) $(root)$(runtimedir) -@@ -441,26 +442,34 @@ +@@ -452,25 +453,33 @@ # icons and distributed CGI scripts. install-data: @echo "===> [data: Installing initial data files]" -- -@if [ -f $(root)$(htdocsdir)/index.html ]; then \ +- -@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \ - echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \ - else \ - echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \ -+# -@if [ -f $(root)$(htdocsdir)/index.html ]; then \ -+# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \ -+# else \ ++# -@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \ ++# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \ ++# else \ + echo "Copying tree $(TOP)/htdocs/ -> $(root)$(doc_prefix)/"; \ (cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - *) |\ - (cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \ - find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \ - find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \ +- fi +- -@if [ -f $(root)$(cgidir)/printenv ]; then \ +- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \ +- else \ + (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 ++# fi + if [ ! -d $(root)$(htdocsdir) ]; then \ -+ $(LN) -sf $(root)$(doc_prefix) $(root)$(htdocsdir); \ - fi -- -@if [ -f $(root)$(cgidir)/printenv ]; then \ -- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \ -- else \ ++ $(LN) -sf $(root)$(doc_prefix) $(root)$(htdocsdir); \ ++ fi + $(RM) $(root)$(htdocsdir).default + $(LN) -s $(root)$(doc_prefix) $(root)$(htdocsdir).default -+# -@if [ -f $(root)$(cgidir)/printenv ]; then \ -+# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \ -+# else \ ++# -@if [ -f $(root)$(cgidir)/printenv ]; then \ ++# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \ ++# else \ for script in printenv test-cgi; do \ cat $(TOP)/cgi-bin/$${script} |\ sed -e 's;^#!/.*perl;#!$(PERL);' \ > $(TOP)/$(SRC)/.apaci.install.tmp; \ - echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \ - $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \ + echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir).default/$${script}"; \ + $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir).default/$${script}; \ done; \ -- fi -+# fi ++# fi + if [ ! -d $(root)$(cgidir) ]; then \ + $(LN) -sf $(root)$(cgidir).default $(root)$(cgidir); \ -+ fi + fi @echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \ (cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\ - (cd $(root)$(iconsdir)/ && $(TAR) -xf -); \ -@@ -498,10 +507,10 @@ +@@ -509,10 +518,10 @@ -e 's;logs/accept\.lock;$(runtimedir)/$(TARGET).lock;' \ -e 's;logs/apache_runtime_status;$(runtimedir)/$(TARGET).scoreboard;' \ -e 's;logs/httpd\.pid;$(runtimedir)/$(TARGET).pid;' \ - -e "s;logs/access_log;$(logfiledir)/$${target_prefix}access_log;" \ - -e "s;logs/error_log;$(logfiledir)/$${target_prefix}error_log;" \ - -e "s;logs/referer_log;$(logfiledir)/$${target_prefix}referer_log;" \ - -e "s;logs/agent_log;$(logfiledir)/$${target_prefix}agent_log;" \ + -e "s;logs/access_log;$(logfiledir)/$${target_prefix}httpd-access.log;" \ + -e "s;logs/error_log;$(logfiledir)/$${target_prefix}httpd-error.log;" \ + -e "s;logs/referer_log;$(logfiledir)/$${target_prefix}httpd-referer.log;" \ + -e "s;logs/agent_log;$(logfiledir)/$${target_prefix}httpd-agent.log;" \ -e 's;conf/magic;$(sysconfdir)/magic;' \ -e 's;conf/mime\.types;$(sysconfdir)/mime.types;' \ -e 's;User nobody;User $(conf_user);' \ Property changes on: head/www/apache2/files/patch-ab ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.15 \ No newline at end of property +1.16 \ No newline at end of property Index: head/www/apache2/pkg-plist =================================================================== --- head/www/apache2/pkg-plist (revision 25033) +++ head/www/apache2/pkg-plist (revision 25034) @@ -1,342 +1,356 @@ bin/dbmmanage bin/htdigest bin/htpasswd etc/apache/access.conf.default @exec [ ! -f %B/access.conf ] && cp %B/%f %B/access.conf etc/apache/httpd.conf.default @exec [ ! -f %B/httpd.conf ] && cp %B/%f %B/httpd.conf etc/apache/magic.default @exec [ ! -f %B/magic ] && cp %B/%f %B/magic etc/apache/mime.types.default @exec [ ! -f %B/mime.types ] && cp %B/%f %B/mime.types etc/apache/srm.conf.default @exec [ ! -f %B/srm.conf ] && cp %B/%f %B/srm.conf 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/ap_mmn.h include/apache/ap_sha1.h include/apache/buff.h include/apache/compat.h include/apache/conf.h include/apache/explain.h include/apache/fnmatch.h include/apache/hsregex.h include/apache/http_conf_globals.h include/apache/http_config.h include/apache/http_core.h include/apache/http_log.h include/apache/http_main.h include/apache/http_protocol.h include/apache/http_request.h include/apache/http_vhost.h include/apache/httpd.h include/apache/multithread.h include/apache/os-inline.c include/apache/os.h include/apache/rfc1413.h include/apache/scoreboard.h include/apache/util_date.h include/apache/util_md5.h include/apache/util_script.h include/apache/util_uri.h include/apache/xml/asciitab.h include/apache/xml/hashtable.h include/apache/xml/iasciitab.h include/apache/xml/latin1tab.h include/apache/xml/nametab.h include/apache/xml/utf8tab.h include/apache/xml/xmldef.h include/apache/xml/xmlparse.h include/apache/xml/xmlrole.h include/apache/xml/xmltok.h include/apache/xml/xmltok_impl.h libexec/apache/httpd.exp libexec/apache/libproxy.so libexec/apache/mod_auth_anon.so libexec/apache/mod_auth_db.so libexec/apache/mod_cern_meta.so libexec/apache/mod_digest.so libexec/apache/mod_expires.so libexec/apache/mod_headers.so libexec/apache/mod_info.so libexec/apache/mod_mime_magic.so libexec/apache/mod_rewrite.so libexec/apache/mod_speling.so libexec/apache/mod_unique_id.so libexec/apache/mod_usertrack.so libexec/apache/mod_vhost_alias.so sbin/ab sbin/apachectl sbin/apxs sbin/httpd sbin/logresolve sbin/rotatelogs share/doc/apache/apache_pb.gif @exec mkdir -p %D/www @exec ln -fs %B %D/www/data.default @unexec rm -f %D/www/data.default @exec [ ! -d %D/www/data ] && ln -fs %B %D/www/data @exec [ ! -d %D/www/cgi-bin ] && ln -fs %D/www/cgi-bin.default %D/www/cgi-bin -share/doc/apache/index.html +share/doc/apache/index.html.ca +share/doc/apache/index.html.cz +share/doc/apache/index.html.de +share/doc/apache/index.html.dk +share/doc/apache/index.html.ee +share/doc/apache/index.html.en +share/doc/apache/index.html.es +share/doc/apache/index.html.fr +share/doc/apache/index.html.it +share/doc/apache/index.html.lu +share/doc/apache/index.html.nl +share/doc/apache/index.html.pt +share/doc/apache/index.html.se 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-tpf.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/rewriteguide.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_auth_digest.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/mod/mod_vhost_alias.html share/doc/apache/manual/multilogs.html +share/doc/apache/manual/netware.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/readme-tpf.html share/doc/apache/manual/search/manual-index.cgi 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/suexec_1_2.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/mass.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/icons/README www/icons/a.gif www/icons/alert.black.gif www/icons/alert.red.gif www/icons/apache_pb.gif www/icons/back.gif www/icons/ball.gray.gif www/icons/ball.red.gif www/icons/binary.gif www/icons/binhex.gif www/icons/blank.gif www/icons/bomb.gif www/icons/box1.gif www/icons/box2.gif www/icons/broken.gif www/icons/burst.gif www/icons/c.gif www/icons/comp.blue.gif www/icons/comp.gray.gif www/icons/compressed.gif www/icons/continued.gif www/icons/dir.gif www/icons/down.gif www/icons/dvi.gif www/icons/f.gif www/icons/folder.gif www/icons/folder.open.gif www/icons/folder.sec.gif www/icons/forward.gif www/icons/generic.gif www/icons/generic.red.gif www/icons/generic.sec.gif www/icons/hand.right.gif www/icons/hand.up.gif www/icons/icon.sheet.gif www/icons/image1.gif www/icons/image2.gif www/icons/image3.gif www/icons/index.gif www/icons/layout.gif www/icons/left.gif www/icons/link.gif www/icons/movie.gif www/icons/p.gif www/icons/patch.gif www/icons/pdf.gif www/icons/pie0.gif www/icons/pie1.gif www/icons/pie2.gif www/icons/pie3.gif www/icons/pie4.gif www/icons/pie5.gif www/icons/pie6.gif www/icons/pie7.gif www/icons/pie8.gif www/icons/portal.gif www/icons/ps.gif www/icons/quill.gif www/icons/right.gif www/icons/screw1.gif www/icons/screw2.gif www/icons/script.gif www/icons/small/README.txt www/icons/small/back.gif www/icons/small/binary.gif www/icons/small/binhex.gif www/icons/small/blank.gif www/icons/small/broken.gif www/icons/small/burst.gif www/icons/small/comp1.gif www/icons/small/comp2.gif www/icons/small/compressed.gif www/icons/small/continued.gif www/icons/small/dir.gif www/icons/small/dir2.gif www/icons/small/doc.gif www/icons/small/forward.gif www/icons/small/generic.gif www/icons/small/generic2.gif www/icons/small/generic3.gif www/icons/small/image.gif www/icons/small/image2.gif www/icons/small/index.gif www/icons/small/key.gif www/icons/small/movie.gif www/icons/small/patch.gif www/icons/small/ps.gif www/icons/small/rainbow.gif www/icons/small/sound.gif www/icons/small/sound2.gif www/icons/small/tar.gif www/icons/small/text.gif www/icons/small/transfer.gif www/icons/small/unknown.gif www/icons/small/uu.gif www/icons/sound1.gif www/icons/sound2.gif www/icons/sphere1.gif www/icons/sphere2.gif www/icons/tar.gif www/icons/tex.gif www/icons/text.gif www/icons/transfer.gif www/icons/unknown.gif www/icons/up.gif www/icons/uu.gif www/icons/uuencoded.gif www/icons/world1.gif www/icons/world2.gif @exec mkdir -p %D/www/proxy @dirrm etc/apache @dirrm include/apache/xml @dirrm include/apache @dirrm libexec/apache @dirrm share/doc/apache/manual/images @dirrm share/doc/apache/manual/misc @dirrm share/doc/apache/manual/mod @dirrm share/doc/apache/manual/search @dirrm share/doc/apache/manual/vhosts @dirrm share/doc/apache/manual @dirrm share/doc/apache @dirrm www/cgi-bin.default @dirrm www/icons/small @dirrm www/icons @dirrm www/proxy @dirrm www Property changes on: head/www/apache2/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.25 \ No newline at end of property +1.26 \ No newline at end of property Index: head/www/apache20/Makefile =================================================================== --- head/www/apache20/Makefile (revision 25033) +++ head/www/apache20/Makefile (revision 25034) @@ -1,70 +1,71 @@ # New ports collection makefile for: apache HTTPD # Version required: 1.3* # Date created: Fri Aug 25 16:42:36 CDT 1995 # Whom: ache@freebsd.org # # $FreeBSD$ # -DISTNAME= apache_1.3.9 -PKGNAME= apache-1.3.9 +DISTNAME= apache_1.3.11 +PKGNAME= apache-1.3.11 CATEGORIES= www MASTER_SITES= http://www.apache.org/dist/ \ ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \ ftp://ftp.rge.com/pub/infosystems/apache/dist/ \ ftp://apache.compuex.com/pub/apache/dist/ \ ftp://apache.arctic.org/pub/apache/dist/ \ ftp://ftp.epix.net/pub/apache/dist/ \ ftp://ftp.ameth.org/pub/mirrors/ftp.apache.org/apache/dist/ \ ftp://ftp.connectnet.com/pub/www/apache/ \ ftp://apache.technomancer.com/mirrors/apache/dist/ \ ftp://ftp.raver.net/pub/ftp.apache.org/ \ ftp://www3.service.digital.com/apache/dist/ \ ftp://galileo.galilei.com/pub/apache/ \ ftp://ftp.mtnranch.net/pub/apache/dist/ \ ftp://ftp.iodynamics.com/pub/mirror/apache/dist/ \ ftp://apache.nextpath.com/pub/apache/dist/ MAINTAINER= ache@freebsd.org Y2K= http://www.apache.org/docs/misc/FAQ.html#year2000 # # Set APACHE_PERF_TUNING env. variable to YES to get maximum performance # HAS_CONFIGURE= yes CONFIGURE_ARGS= \ --prefix=${PREFIX} \ + --server-gid=nogroup \ --with-perl=${PERL} \ --with-layout=${FILESDIR}/FreeBSD.layout:FreeBSD \ --suexec-docroot=${PREFIX}/www/data \ --without-confadjust \ --enable-shared=remain \ --enable-module=most \ --enable-module=auth_db \ --disable-module=auth_dbm OPTIM=-DHARD_SERVER_LIMIT=512 \ -DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \ -DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\" .if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES OPTIM+= -DBUFFERED_LOGS CFLAGS+= -O6 -fomit-frame-pointer .endif CONFIGURE_ENV= OPTIM='${OPTIM}' MAN1= dbmmanage.1 htdigest.1 htpasswd.1 MAN8= ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 post-install: @if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \ ${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \ ${ECHO} "[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start > /dev/null && ${ECHO} -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \ ${CHMOD} 751 ${PREFIX}/etc/rc.d/apache.sh; \ fi .include Property changes on: head/www/apache20/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.75 \ No newline at end of property +1.76 \ No newline at end of property Index: head/www/apache20/distinfo =================================================================== --- head/www/apache20/distinfo (revision 25033) +++ head/www/apache20/distinfo (revision 25034) @@ -1 +1 @@ -MD5 (apache_1.3.9.tar.gz) = 880af89251943c67e3614bf2ffb89b32 +MD5 (apache_1.3.11.tar.gz) = 8e0e4c9b410d4d4c4f5832fc0662b9e1 Property changes on: head/www/apache20/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.35 \ No newline at end of property +1.36 \ No newline at end of property Index: head/www/apache20/files/patch-aa =================================================================== --- head/www/apache20/files/patch-aa (revision 25033) +++ head/www/apache20/files/patch-aa (revision 25034) @@ -1,33 +1,24 @@ ---- configure.orig Sat Aug 14 12:29:05 1999 -+++ configure Fri Sep 3 15:38:10 1999 -@@ -1084,7 +1084,7 @@ - ## UID/GID as production oriented as a web server in NIS anyway. - ## - conf_user="nobody" --conf_group="#-1" -+conf_group="nogroup" - conf_port="80" - conf_serveradmin="you@your.address" - conf_servername="new.host.name" -@@ -1153,8 +1153,8 @@ +--- configure.orig Tue Jan 18 01:53:17 2000 ++++ configure Mon Jan 24 19:37:21 2000 +@@ -1232,8 +1232,8 @@ echo " DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid" echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}${thetarget}.scoreboard" echo " DEFAULT_LOCKFILE: ${runtimedir_relative}${thetarget}.lock" - echo " DEFAULT_XFERLOG: ${logfiledir_relative}access_log" - echo " DEFAULT_ERRORLOG: ${logfiledir_relative}error_log" + 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}${thetarget}.conf" echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf" -@@ -1244,8 +1244,8 @@ +@@ -1330,8 +1330,8 @@ echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}${thetarget}.pid\"'" >>$src/apaci echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}${thetarget}.scoreboard\"'" >>$src/apaci echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}${thetarget}.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 '-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}${thetarget}.conf\"'" >>$src/apaci echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci Property changes on: head/www/apache20/files/patch-aa ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/www/apache20/files/patch-ab =================================================================== --- head/www/apache20/files/patch-ab (revision 25033) +++ head/www/apache20/files/patch-ab (revision 25034) @@ -1,85 +1,84 @@ ---- Makefile.tmpl.orig Fri Aug 13 10:58:18 1999 -+++ Makefile.tmpl Fri Sep 3 14:57:01 1999 -@@ -120,6 +120,7 @@ +--- Makefile.tmpl.orig Tue Jan 11 22:47:41 2000 ++++ Makefile.tmpl Mon Jan 24 19:50:42 2000 +@@ -123,6 +123,7 @@ runtimedir = @runtimedir@ logfiledir = @logfiledir@ proxycachedir = @proxycachedir@ +doc_prefix = $(prefix)/share/doc/apache libexecdir_relative = @libexecdir_relative@ -@@ -255,9 +256,9 @@ +@@ -266,9 +267,9 @@ $(MKDIR) $(root)$(mandir)/man1 $(MKDIR) $(root)$(mandir)/man8 $(MKDIR) $(root)$(sysconfdir) - $(MKDIR) $(root)$(htdocsdir) + $(MKDIR) $(root)$(doc_prefix) $(MKDIR) $(root)$(iconsdir) - $(MKDIR) $(root)$(cgidir) + $(MKDIR) $(root)$(cgidir).default $(MKDIR) $(root)$(includedir) $(MKDIR) $(root)$(includedir)/xml $(MKDIR) $(root)$(runtimedir) -@@ -441,26 +442,34 @@ +@@ -452,25 +453,33 @@ # icons and distributed CGI scripts. install-data: @echo "===> [data: Installing initial data files]" -- -@if [ -f $(root)$(htdocsdir)/index.html ]; then \ +- -@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \ - echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \ - else \ - echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \ -+# -@if [ -f $(root)$(htdocsdir)/index.html ]; then \ -+# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \ -+# else \ ++# -@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \ ++# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \ ++# else \ + echo "Copying tree $(TOP)/htdocs/ -> $(root)$(doc_prefix)/"; \ (cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - *) |\ - (cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \ - find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \ - find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \ +- fi +- -@if [ -f $(root)$(cgidir)/printenv ]; then \ +- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \ +- else \ + (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 ++# fi + if [ ! -d $(root)$(htdocsdir) ]; then \ -+ $(LN) -sf $(root)$(doc_prefix) $(root)$(htdocsdir); \ - fi -- -@if [ -f $(root)$(cgidir)/printenv ]; then \ -- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \ -- else \ ++ $(LN) -sf $(root)$(doc_prefix) $(root)$(htdocsdir); \ ++ fi + $(RM) $(root)$(htdocsdir).default + $(LN) -s $(root)$(doc_prefix) $(root)$(htdocsdir).default -+# -@if [ -f $(root)$(cgidir)/printenv ]; then \ -+# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \ -+# else \ ++# -@if [ -f $(root)$(cgidir)/printenv ]; then \ ++# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \ ++# else \ for script in printenv test-cgi; do \ cat $(TOP)/cgi-bin/$${script} |\ sed -e 's;^#!/.*perl;#!$(PERL);' \ > $(TOP)/$(SRC)/.apaci.install.tmp; \ - echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \ - $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \ + echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir).default/$${script}"; \ + $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir).default/$${script}; \ done; \ -- fi -+# fi ++# fi + if [ ! -d $(root)$(cgidir) ]; then \ + $(LN) -sf $(root)$(cgidir).default $(root)$(cgidir); \ -+ fi + fi @echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \ (cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\ - (cd $(root)$(iconsdir)/ && $(TAR) -xf -); \ -@@ -498,10 +507,10 @@ +@@ -509,10 +518,10 @@ -e 's;logs/accept\.lock;$(runtimedir)/$(TARGET).lock;' \ -e 's;logs/apache_runtime_status;$(runtimedir)/$(TARGET).scoreboard;' \ -e 's;logs/httpd\.pid;$(runtimedir)/$(TARGET).pid;' \ - -e "s;logs/access_log;$(logfiledir)/$${target_prefix}access_log;" \ - -e "s;logs/error_log;$(logfiledir)/$${target_prefix}error_log;" \ - -e "s;logs/referer_log;$(logfiledir)/$${target_prefix}referer_log;" \ - -e "s;logs/agent_log;$(logfiledir)/$${target_prefix}agent_log;" \ + -e "s;logs/access_log;$(logfiledir)/$${target_prefix}httpd-access.log;" \ + -e "s;logs/error_log;$(logfiledir)/$${target_prefix}httpd-error.log;" \ + -e "s;logs/referer_log;$(logfiledir)/$${target_prefix}httpd-referer.log;" \ + -e "s;logs/agent_log;$(logfiledir)/$${target_prefix}httpd-agent.log;" \ -e 's;conf/magic;$(sysconfdir)/magic;' \ -e 's;conf/mime\.types;$(sysconfdir)/mime.types;' \ -e 's;User nobody;User $(conf_user);' \ Property changes on: head/www/apache20/files/patch-ab ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.15 \ No newline at end of property +1.16 \ No newline at end of property Index: head/www/apache20/pkg-plist =================================================================== --- head/www/apache20/pkg-plist (revision 25033) +++ head/www/apache20/pkg-plist (revision 25034) @@ -1,342 +1,356 @@ bin/dbmmanage bin/htdigest bin/htpasswd etc/apache/access.conf.default @exec [ ! -f %B/access.conf ] && cp %B/%f %B/access.conf etc/apache/httpd.conf.default @exec [ ! -f %B/httpd.conf ] && cp %B/%f %B/httpd.conf etc/apache/magic.default @exec [ ! -f %B/magic ] && cp %B/%f %B/magic etc/apache/mime.types.default @exec [ ! -f %B/mime.types ] && cp %B/%f %B/mime.types etc/apache/srm.conf.default @exec [ ! -f %B/srm.conf ] && cp %B/%f %B/srm.conf 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/ap_mmn.h include/apache/ap_sha1.h include/apache/buff.h include/apache/compat.h include/apache/conf.h include/apache/explain.h include/apache/fnmatch.h include/apache/hsregex.h include/apache/http_conf_globals.h include/apache/http_config.h include/apache/http_core.h include/apache/http_log.h include/apache/http_main.h include/apache/http_protocol.h include/apache/http_request.h include/apache/http_vhost.h include/apache/httpd.h include/apache/multithread.h include/apache/os-inline.c include/apache/os.h include/apache/rfc1413.h include/apache/scoreboard.h include/apache/util_date.h include/apache/util_md5.h include/apache/util_script.h include/apache/util_uri.h include/apache/xml/asciitab.h include/apache/xml/hashtable.h include/apache/xml/iasciitab.h include/apache/xml/latin1tab.h include/apache/xml/nametab.h include/apache/xml/utf8tab.h include/apache/xml/xmldef.h include/apache/xml/xmlparse.h include/apache/xml/xmlrole.h include/apache/xml/xmltok.h include/apache/xml/xmltok_impl.h libexec/apache/httpd.exp libexec/apache/libproxy.so libexec/apache/mod_auth_anon.so libexec/apache/mod_auth_db.so libexec/apache/mod_cern_meta.so libexec/apache/mod_digest.so libexec/apache/mod_expires.so libexec/apache/mod_headers.so libexec/apache/mod_info.so libexec/apache/mod_mime_magic.so libexec/apache/mod_rewrite.so libexec/apache/mod_speling.so libexec/apache/mod_unique_id.so libexec/apache/mod_usertrack.so libexec/apache/mod_vhost_alias.so sbin/ab sbin/apachectl sbin/apxs sbin/httpd sbin/logresolve sbin/rotatelogs share/doc/apache/apache_pb.gif @exec mkdir -p %D/www @exec ln -fs %B %D/www/data.default @unexec rm -f %D/www/data.default @exec [ ! -d %D/www/data ] && ln -fs %B %D/www/data @exec [ ! -d %D/www/cgi-bin ] && ln -fs %D/www/cgi-bin.default %D/www/cgi-bin -share/doc/apache/index.html +share/doc/apache/index.html.ca +share/doc/apache/index.html.cz +share/doc/apache/index.html.de +share/doc/apache/index.html.dk +share/doc/apache/index.html.ee +share/doc/apache/index.html.en +share/doc/apache/index.html.es +share/doc/apache/index.html.fr +share/doc/apache/index.html.it +share/doc/apache/index.html.lu +share/doc/apache/index.html.nl +share/doc/apache/index.html.pt +share/doc/apache/index.html.se 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-tpf.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/rewriteguide.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_auth_digest.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/mod/mod_vhost_alias.html share/doc/apache/manual/multilogs.html +share/doc/apache/manual/netware.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/readme-tpf.html share/doc/apache/manual/search/manual-index.cgi 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/suexec_1_2.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/mass.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/icons/README www/icons/a.gif www/icons/alert.black.gif www/icons/alert.red.gif www/icons/apache_pb.gif www/icons/back.gif www/icons/ball.gray.gif www/icons/ball.red.gif www/icons/binary.gif www/icons/binhex.gif www/icons/blank.gif www/icons/bomb.gif www/icons/box1.gif www/icons/box2.gif www/icons/broken.gif www/icons/burst.gif www/icons/c.gif www/icons/comp.blue.gif www/icons/comp.gray.gif www/icons/compressed.gif www/icons/continued.gif www/icons/dir.gif www/icons/down.gif www/icons/dvi.gif www/icons/f.gif www/icons/folder.gif www/icons/folder.open.gif www/icons/folder.sec.gif www/icons/forward.gif www/icons/generic.gif www/icons/generic.red.gif www/icons/generic.sec.gif www/icons/hand.right.gif www/icons/hand.up.gif www/icons/icon.sheet.gif www/icons/image1.gif www/icons/image2.gif www/icons/image3.gif www/icons/index.gif www/icons/layout.gif www/icons/left.gif www/icons/link.gif www/icons/movie.gif www/icons/p.gif www/icons/patch.gif www/icons/pdf.gif www/icons/pie0.gif www/icons/pie1.gif www/icons/pie2.gif www/icons/pie3.gif www/icons/pie4.gif www/icons/pie5.gif www/icons/pie6.gif www/icons/pie7.gif www/icons/pie8.gif www/icons/portal.gif www/icons/ps.gif www/icons/quill.gif www/icons/right.gif www/icons/screw1.gif www/icons/screw2.gif www/icons/script.gif www/icons/small/README.txt www/icons/small/back.gif www/icons/small/binary.gif www/icons/small/binhex.gif www/icons/small/blank.gif www/icons/small/broken.gif www/icons/small/burst.gif www/icons/small/comp1.gif www/icons/small/comp2.gif www/icons/small/compressed.gif www/icons/small/continued.gif www/icons/small/dir.gif www/icons/small/dir2.gif www/icons/small/doc.gif www/icons/small/forward.gif www/icons/small/generic.gif www/icons/small/generic2.gif www/icons/small/generic3.gif www/icons/small/image.gif www/icons/small/image2.gif www/icons/small/index.gif www/icons/small/key.gif www/icons/small/movie.gif www/icons/small/patch.gif www/icons/small/ps.gif www/icons/small/rainbow.gif www/icons/small/sound.gif www/icons/small/sound2.gif www/icons/small/tar.gif www/icons/small/text.gif www/icons/small/transfer.gif www/icons/small/unknown.gif www/icons/small/uu.gif www/icons/sound1.gif www/icons/sound2.gif www/icons/sphere1.gif www/icons/sphere2.gif www/icons/tar.gif www/icons/tex.gif www/icons/text.gif www/icons/transfer.gif www/icons/unknown.gif www/icons/up.gif www/icons/uu.gif www/icons/uuencoded.gif www/icons/world1.gif www/icons/world2.gif @exec mkdir -p %D/www/proxy @dirrm etc/apache @dirrm include/apache/xml @dirrm include/apache @dirrm libexec/apache @dirrm share/doc/apache/manual/images @dirrm share/doc/apache/manual/misc @dirrm share/doc/apache/manual/mod @dirrm share/doc/apache/manual/search @dirrm share/doc/apache/manual/vhosts @dirrm share/doc/apache/manual @dirrm share/doc/apache @dirrm www/cgi-bin.default @dirrm www/icons/small @dirrm www/icons @dirrm www/proxy @dirrm www Property changes on: head/www/apache20/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.25 \ No newline at end of property +1.26 \ No newline at end of property Index: head/www/apache21/Makefile =================================================================== --- head/www/apache21/Makefile (revision 25033) +++ head/www/apache21/Makefile (revision 25034) @@ -1,70 +1,71 @@ # New ports collection makefile for: apache HTTPD # Version required: 1.3* # Date created: Fri Aug 25 16:42:36 CDT 1995 # Whom: ache@freebsd.org # # $FreeBSD$ # -DISTNAME= apache_1.3.9 -PKGNAME= apache-1.3.9 +DISTNAME= apache_1.3.11 +PKGNAME= apache-1.3.11 CATEGORIES= www MASTER_SITES= http://www.apache.org/dist/ \ ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \ ftp://ftp.rge.com/pub/infosystems/apache/dist/ \ ftp://apache.compuex.com/pub/apache/dist/ \ ftp://apache.arctic.org/pub/apache/dist/ \ ftp://ftp.epix.net/pub/apache/dist/ \ ftp://ftp.ameth.org/pub/mirrors/ftp.apache.org/apache/dist/ \ ftp://ftp.connectnet.com/pub/www/apache/ \ ftp://apache.technomancer.com/mirrors/apache/dist/ \ ftp://ftp.raver.net/pub/ftp.apache.org/ \ ftp://www3.service.digital.com/apache/dist/ \ ftp://galileo.galilei.com/pub/apache/ \ ftp://ftp.mtnranch.net/pub/apache/dist/ \ ftp://ftp.iodynamics.com/pub/mirror/apache/dist/ \ ftp://apache.nextpath.com/pub/apache/dist/ MAINTAINER= ache@freebsd.org Y2K= http://www.apache.org/docs/misc/FAQ.html#year2000 # # Set APACHE_PERF_TUNING env. variable to YES to get maximum performance # HAS_CONFIGURE= yes CONFIGURE_ARGS= \ --prefix=${PREFIX} \ + --server-gid=nogroup \ --with-perl=${PERL} \ --with-layout=${FILESDIR}/FreeBSD.layout:FreeBSD \ --suexec-docroot=${PREFIX}/www/data \ --without-confadjust \ --enable-shared=remain \ --enable-module=most \ --enable-module=auth_db \ --disable-module=auth_dbm OPTIM=-DHARD_SERVER_LIMIT=512 \ -DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \ -DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\" .if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES OPTIM+= -DBUFFERED_LOGS CFLAGS+= -O6 -fomit-frame-pointer .endif CONFIGURE_ENV= OPTIM='${OPTIM}' MAN1= dbmmanage.1 htdigest.1 htpasswd.1 MAN8= ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 post-install: @if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \ ${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \ ${ECHO} "[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start > /dev/null && ${ECHO} -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \ ${CHMOD} 751 ${PREFIX}/etc/rc.d/apache.sh; \ fi .include Property changes on: head/www/apache21/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.75 \ No newline at end of property +1.76 \ No newline at end of property Index: head/www/apache21/distinfo =================================================================== --- head/www/apache21/distinfo (revision 25033) +++ head/www/apache21/distinfo (revision 25034) @@ -1 +1 @@ -MD5 (apache_1.3.9.tar.gz) = 880af89251943c67e3614bf2ffb89b32 +MD5 (apache_1.3.11.tar.gz) = 8e0e4c9b410d4d4c4f5832fc0662b9e1 Property changes on: head/www/apache21/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.35 \ No newline at end of property +1.36 \ No newline at end of property Index: head/www/apache21/files/patch-aa =================================================================== --- head/www/apache21/files/patch-aa (revision 25033) +++ head/www/apache21/files/patch-aa (revision 25034) @@ -1,33 +1,24 @@ ---- configure.orig Sat Aug 14 12:29:05 1999 -+++ configure Fri Sep 3 15:38:10 1999 -@@ -1084,7 +1084,7 @@ - ## UID/GID as production oriented as a web server in NIS anyway. - ## - conf_user="nobody" --conf_group="#-1" -+conf_group="nogroup" - conf_port="80" - conf_serveradmin="you@your.address" - conf_servername="new.host.name" -@@ -1153,8 +1153,8 @@ +--- configure.orig Tue Jan 18 01:53:17 2000 ++++ configure Mon Jan 24 19:37:21 2000 +@@ -1232,8 +1232,8 @@ echo " DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid" echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}${thetarget}.scoreboard" echo " DEFAULT_LOCKFILE: ${runtimedir_relative}${thetarget}.lock" - echo " DEFAULT_XFERLOG: ${logfiledir_relative}access_log" - echo " DEFAULT_ERRORLOG: ${logfiledir_relative}error_log" + 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}${thetarget}.conf" echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf" -@@ -1244,8 +1244,8 @@ +@@ -1330,8 +1330,8 @@ echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}${thetarget}.pid\"'" >>$src/apaci echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}${thetarget}.scoreboard\"'" >>$src/apaci echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}${thetarget}.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 '-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}${thetarget}.conf\"'" >>$src/apaci echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci Property changes on: head/www/apache21/files/patch-aa ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/www/apache21/files/patch-ab =================================================================== --- head/www/apache21/files/patch-ab (revision 25033) +++ head/www/apache21/files/patch-ab (revision 25034) @@ -1,85 +1,84 @@ ---- Makefile.tmpl.orig Fri Aug 13 10:58:18 1999 -+++ Makefile.tmpl Fri Sep 3 14:57:01 1999 -@@ -120,6 +120,7 @@ +--- Makefile.tmpl.orig Tue Jan 11 22:47:41 2000 ++++ Makefile.tmpl Mon Jan 24 19:50:42 2000 +@@ -123,6 +123,7 @@ runtimedir = @runtimedir@ logfiledir = @logfiledir@ proxycachedir = @proxycachedir@ +doc_prefix = $(prefix)/share/doc/apache libexecdir_relative = @libexecdir_relative@ -@@ -255,9 +256,9 @@ +@@ -266,9 +267,9 @@ $(MKDIR) $(root)$(mandir)/man1 $(MKDIR) $(root)$(mandir)/man8 $(MKDIR) $(root)$(sysconfdir) - $(MKDIR) $(root)$(htdocsdir) + $(MKDIR) $(root)$(doc_prefix) $(MKDIR) $(root)$(iconsdir) - $(MKDIR) $(root)$(cgidir) + $(MKDIR) $(root)$(cgidir).default $(MKDIR) $(root)$(includedir) $(MKDIR) $(root)$(includedir)/xml $(MKDIR) $(root)$(runtimedir) -@@ -441,26 +442,34 @@ +@@ -452,25 +453,33 @@ # icons and distributed CGI scripts. install-data: @echo "===> [data: Installing initial data files]" -- -@if [ -f $(root)$(htdocsdir)/index.html ]; then \ +- -@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \ - echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \ - else \ - echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \ -+# -@if [ -f $(root)$(htdocsdir)/index.html ]; then \ -+# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \ -+# else \ ++# -@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \ ++# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \ ++# else \ + echo "Copying tree $(TOP)/htdocs/ -> $(root)$(doc_prefix)/"; \ (cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - *) |\ - (cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \ - find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \ - find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \ +- fi +- -@if [ -f $(root)$(cgidir)/printenv ]; then \ +- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \ +- else \ + (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 ++# fi + if [ ! -d $(root)$(htdocsdir) ]; then \ -+ $(LN) -sf $(root)$(doc_prefix) $(root)$(htdocsdir); \ - fi -- -@if [ -f $(root)$(cgidir)/printenv ]; then \ -- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \ -- else \ ++ $(LN) -sf $(root)$(doc_prefix) $(root)$(htdocsdir); \ ++ fi + $(RM) $(root)$(htdocsdir).default + $(LN) -s $(root)$(doc_prefix) $(root)$(htdocsdir).default -+# -@if [ -f $(root)$(cgidir)/printenv ]; then \ -+# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \ -+# else \ ++# -@if [ -f $(root)$(cgidir)/printenv ]; then \ ++# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \ ++# else \ for script in printenv test-cgi; do \ cat $(TOP)/cgi-bin/$${script} |\ sed -e 's;^#!/.*perl;#!$(PERL);' \ > $(TOP)/$(SRC)/.apaci.install.tmp; \ - echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \ - $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \ + echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir).default/$${script}"; \ + $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir).default/$${script}; \ done; \ -- fi -+# fi ++# fi + if [ ! -d $(root)$(cgidir) ]; then \ + $(LN) -sf $(root)$(cgidir).default $(root)$(cgidir); \ -+ fi + fi @echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \ (cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\ - (cd $(root)$(iconsdir)/ && $(TAR) -xf -); \ -@@ -498,10 +507,10 @@ +@@ -509,10 +518,10 @@ -e 's;logs/accept\.lock;$(runtimedir)/$(TARGET).lock;' \ -e 's;logs/apache_runtime_status;$(runtimedir)/$(TARGET).scoreboard;' \ -e 's;logs/httpd\.pid;$(runtimedir)/$(TARGET).pid;' \ - -e "s;logs/access_log;$(logfiledir)/$${target_prefix}access_log;" \ - -e "s;logs/error_log;$(logfiledir)/$${target_prefix}error_log;" \ - -e "s;logs/referer_log;$(logfiledir)/$${target_prefix}referer_log;" \ - -e "s;logs/agent_log;$(logfiledir)/$${target_prefix}agent_log;" \ + -e "s;logs/access_log;$(logfiledir)/$${target_prefix}httpd-access.log;" \ + -e "s;logs/error_log;$(logfiledir)/$${target_prefix}httpd-error.log;" \ + -e "s;logs/referer_log;$(logfiledir)/$${target_prefix}httpd-referer.log;" \ + -e "s;logs/agent_log;$(logfiledir)/$${target_prefix}httpd-agent.log;" \ -e 's;conf/magic;$(sysconfdir)/magic;' \ -e 's;conf/mime\.types;$(sysconfdir)/mime.types;' \ -e 's;User nobody;User $(conf_user);' \ Property changes on: head/www/apache21/files/patch-ab ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.15 \ No newline at end of property +1.16 \ No newline at end of property Index: head/www/apache21/pkg-plist =================================================================== --- head/www/apache21/pkg-plist (revision 25033) +++ head/www/apache21/pkg-plist (revision 25034) @@ -1,342 +1,356 @@ bin/dbmmanage bin/htdigest bin/htpasswd etc/apache/access.conf.default @exec [ ! -f %B/access.conf ] && cp %B/%f %B/access.conf etc/apache/httpd.conf.default @exec [ ! -f %B/httpd.conf ] && cp %B/%f %B/httpd.conf etc/apache/magic.default @exec [ ! -f %B/magic ] && cp %B/%f %B/magic etc/apache/mime.types.default @exec [ ! -f %B/mime.types ] && cp %B/%f %B/mime.types etc/apache/srm.conf.default @exec [ ! -f %B/srm.conf ] && cp %B/%f %B/srm.conf 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/ap_mmn.h include/apache/ap_sha1.h include/apache/buff.h include/apache/compat.h include/apache/conf.h include/apache/explain.h include/apache/fnmatch.h include/apache/hsregex.h include/apache/http_conf_globals.h include/apache/http_config.h include/apache/http_core.h include/apache/http_log.h include/apache/http_main.h include/apache/http_protocol.h include/apache/http_request.h include/apache/http_vhost.h include/apache/httpd.h include/apache/multithread.h include/apache/os-inline.c include/apache/os.h include/apache/rfc1413.h include/apache/scoreboard.h include/apache/util_date.h include/apache/util_md5.h include/apache/util_script.h include/apache/util_uri.h include/apache/xml/asciitab.h include/apache/xml/hashtable.h include/apache/xml/iasciitab.h include/apache/xml/latin1tab.h include/apache/xml/nametab.h include/apache/xml/utf8tab.h include/apache/xml/xmldef.h include/apache/xml/xmlparse.h include/apache/xml/xmlrole.h include/apache/xml/xmltok.h include/apache/xml/xmltok_impl.h libexec/apache/httpd.exp libexec/apache/libproxy.so libexec/apache/mod_auth_anon.so libexec/apache/mod_auth_db.so libexec/apache/mod_cern_meta.so libexec/apache/mod_digest.so libexec/apache/mod_expires.so libexec/apache/mod_headers.so libexec/apache/mod_info.so libexec/apache/mod_mime_magic.so libexec/apache/mod_rewrite.so libexec/apache/mod_speling.so libexec/apache/mod_unique_id.so libexec/apache/mod_usertrack.so libexec/apache/mod_vhost_alias.so sbin/ab sbin/apachectl sbin/apxs sbin/httpd sbin/logresolve sbin/rotatelogs share/doc/apache/apache_pb.gif @exec mkdir -p %D/www @exec ln -fs %B %D/www/data.default @unexec rm -f %D/www/data.default @exec [ ! -d %D/www/data ] && ln -fs %B %D/www/data @exec [ ! -d %D/www/cgi-bin ] && ln -fs %D/www/cgi-bin.default %D/www/cgi-bin -share/doc/apache/index.html +share/doc/apache/index.html.ca +share/doc/apache/index.html.cz +share/doc/apache/index.html.de +share/doc/apache/index.html.dk +share/doc/apache/index.html.ee +share/doc/apache/index.html.en +share/doc/apache/index.html.es +share/doc/apache/index.html.fr +share/doc/apache/index.html.it +share/doc/apache/index.html.lu +share/doc/apache/index.html.nl +share/doc/apache/index.html.pt +share/doc/apache/index.html.se 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-tpf.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/rewriteguide.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_auth_digest.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/mod/mod_vhost_alias.html share/doc/apache/manual/multilogs.html +share/doc/apache/manual/netware.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/readme-tpf.html share/doc/apache/manual/search/manual-index.cgi 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/suexec_1_2.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/mass.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/icons/README www/icons/a.gif www/icons/alert.black.gif www/icons/alert.red.gif www/icons/apache_pb.gif www/icons/back.gif www/icons/ball.gray.gif www/icons/ball.red.gif www/icons/binary.gif www/icons/binhex.gif www/icons/blank.gif www/icons/bomb.gif www/icons/box1.gif www/icons/box2.gif www/icons/broken.gif www/icons/burst.gif www/icons/c.gif www/icons/comp.blue.gif www/icons/comp.gray.gif www/icons/compressed.gif www/icons/continued.gif www/icons/dir.gif www/icons/down.gif www/icons/dvi.gif www/icons/f.gif www/icons/folder.gif www/icons/folder.open.gif www/icons/folder.sec.gif www/icons/forward.gif www/icons/generic.gif www/icons/generic.red.gif www/icons/generic.sec.gif www/icons/hand.right.gif www/icons/hand.up.gif www/icons/icon.sheet.gif www/icons/image1.gif www/icons/image2.gif www/icons/image3.gif www/icons/index.gif www/icons/layout.gif www/icons/left.gif www/icons/link.gif www/icons/movie.gif www/icons/p.gif www/icons/patch.gif www/icons/pdf.gif www/icons/pie0.gif www/icons/pie1.gif www/icons/pie2.gif www/icons/pie3.gif www/icons/pie4.gif www/icons/pie5.gif www/icons/pie6.gif www/icons/pie7.gif www/icons/pie8.gif www/icons/portal.gif www/icons/ps.gif www/icons/quill.gif www/icons/right.gif www/icons/screw1.gif www/icons/screw2.gif www/icons/script.gif www/icons/small/README.txt www/icons/small/back.gif www/icons/small/binary.gif www/icons/small/binhex.gif www/icons/small/blank.gif www/icons/small/broken.gif www/icons/small/burst.gif www/icons/small/comp1.gif www/icons/small/comp2.gif www/icons/small/compressed.gif www/icons/small/continued.gif www/icons/small/dir.gif www/icons/small/dir2.gif www/icons/small/doc.gif www/icons/small/forward.gif www/icons/small/generic.gif www/icons/small/generic2.gif www/icons/small/generic3.gif www/icons/small/image.gif www/icons/small/image2.gif www/icons/small/index.gif www/icons/small/key.gif www/icons/small/movie.gif www/icons/small/patch.gif www/icons/small/ps.gif www/icons/small/rainbow.gif www/icons/small/sound.gif www/icons/small/sound2.gif www/icons/small/tar.gif www/icons/small/text.gif www/icons/small/transfer.gif www/icons/small/unknown.gif www/icons/small/uu.gif www/icons/sound1.gif www/icons/sound2.gif www/icons/sphere1.gif www/icons/sphere2.gif www/icons/tar.gif www/icons/tex.gif www/icons/text.gif www/icons/transfer.gif www/icons/unknown.gif www/icons/up.gif www/icons/uu.gif www/icons/uuencoded.gif www/icons/world1.gif www/icons/world2.gif @exec mkdir -p %D/www/proxy @dirrm etc/apache @dirrm include/apache/xml @dirrm include/apache @dirrm libexec/apache @dirrm share/doc/apache/manual/images @dirrm share/doc/apache/manual/misc @dirrm share/doc/apache/manual/mod @dirrm share/doc/apache/manual/search @dirrm share/doc/apache/manual/vhosts @dirrm share/doc/apache/manual @dirrm share/doc/apache @dirrm www/cgi-bin.default @dirrm www/icons/small @dirrm www/icons @dirrm www/proxy @dirrm www Property changes on: head/www/apache21/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.25 \ No newline at end of property +1.26 \ No newline at end of property Index: head/www/apache22/Makefile =================================================================== --- head/www/apache22/Makefile (revision 25033) +++ head/www/apache22/Makefile (revision 25034) @@ -1,70 +1,71 @@ # New ports collection makefile for: apache HTTPD # Version required: 1.3* # Date created: Fri Aug 25 16:42:36 CDT 1995 # Whom: ache@freebsd.org # # $FreeBSD$ # -DISTNAME= apache_1.3.9 -PKGNAME= apache-1.3.9 +DISTNAME= apache_1.3.11 +PKGNAME= apache-1.3.11 CATEGORIES= www MASTER_SITES= http://www.apache.org/dist/ \ ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \ ftp://ftp.rge.com/pub/infosystems/apache/dist/ \ ftp://apache.compuex.com/pub/apache/dist/ \ ftp://apache.arctic.org/pub/apache/dist/ \ ftp://ftp.epix.net/pub/apache/dist/ \ ftp://ftp.ameth.org/pub/mirrors/ftp.apache.org/apache/dist/ \ ftp://ftp.connectnet.com/pub/www/apache/ \ ftp://apache.technomancer.com/mirrors/apache/dist/ \ ftp://ftp.raver.net/pub/ftp.apache.org/ \ ftp://www3.service.digital.com/apache/dist/ \ ftp://galileo.galilei.com/pub/apache/ \ ftp://ftp.mtnranch.net/pub/apache/dist/ \ ftp://ftp.iodynamics.com/pub/mirror/apache/dist/ \ ftp://apache.nextpath.com/pub/apache/dist/ MAINTAINER= ache@freebsd.org Y2K= http://www.apache.org/docs/misc/FAQ.html#year2000 # # Set APACHE_PERF_TUNING env. variable to YES to get maximum performance # HAS_CONFIGURE= yes CONFIGURE_ARGS= \ --prefix=${PREFIX} \ + --server-gid=nogroup \ --with-perl=${PERL} \ --with-layout=${FILESDIR}/FreeBSD.layout:FreeBSD \ --suexec-docroot=${PREFIX}/www/data \ --without-confadjust \ --enable-shared=remain \ --enable-module=most \ --enable-module=auth_db \ --disable-module=auth_dbm OPTIM=-DHARD_SERVER_LIMIT=512 \ -DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \ -DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\" .if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES OPTIM+= -DBUFFERED_LOGS CFLAGS+= -O6 -fomit-frame-pointer .endif CONFIGURE_ENV= OPTIM='${OPTIM}' MAN1= dbmmanage.1 htdigest.1 htpasswd.1 MAN8= ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 post-install: @if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \ ${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \ ${ECHO} "[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start > /dev/null && ${ECHO} -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \ ${CHMOD} 751 ${PREFIX}/etc/rc.d/apache.sh; \ fi .include Property changes on: head/www/apache22/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.75 \ No newline at end of property +1.76 \ No newline at end of property Index: head/www/apache22/distinfo =================================================================== --- head/www/apache22/distinfo (revision 25033) +++ head/www/apache22/distinfo (revision 25034) @@ -1 +1 @@ -MD5 (apache_1.3.9.tar.gz) = 880af89251943c67e3614bf2ffb89b32 +MD5 (apache_1.3.11.tar.gz) = 8e0e4c9b410d4d4c4f5832fc0662b9e1 Property changes on: head/www/apache22/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.35 \ No newline at end of property +1.36 \ No newline at end of property Index: head/www/apache22/files/patch-aa =================================================================== --- head/www/apache22/files/patch-aa (revision 25033) +++ head/www/apache22/files/patch-aa (revision 25034) @@ -1,33 +1,24 @@ ---- configure.orig Sat Aug 14 12:29:05 1999 -+++ configure Fri Sep 3 15:38:10 1999 -@@ -1084,7 +1084,7 @@ - ## UID/GID as production oriented as a web server in NIS anyway. - ## - conf_user="nobody" --conf_group="#-1" -+conf_group="nogroup" - conf_port="80" - conf_serveradmin="you@your.address" - conf_servername="new.host.name" -@@ -1153,8 +1153,8 @@ +--- configure.orig Tue Jan 18 01:53:17 2000 ++++ configure Mon Jan 24 19:37:21 2000 +@@ -1232,8 +1232,8 @@ echo " DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid" echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}${thetarget}.scoreboard" echo " DEFAULT_LOCKFILE: ${runtimedir_relative}${thetarget}.lock" - echo " DEFAULT_XFERLOG: ${logfiledir_relative}access_log" - echo " DEFAULT_ERRORLOG: ${logfiledir_relative}error_log" + 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}${thetarget}.conf" echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf" -@@ -1244,8 +1244,8 @@ +@@ -1330,8 +1330,8 @@ echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}${thetarget}.pid\"'" >>$src/apaci echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}${thetarget}.scoreboard\"'" >>$src/apaci echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}${thetarget}.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 '-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}${thetarget}.conf\"'" >>$src/apaci echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci Property changes on: head/www/apache22/files/patch-aa ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/www/apache22/files/patch-ab =================================================================== --- head/www/apache22/files/patch-ab (revision 25033) +++ head/www/apache22/files/patch-ab (revision 25034) @@ -1,85 +1,84 @@ ---- Makefile.tmpl.orig Fri Aug 13 10:58:18 1999 -+++ Makefile.tmpl Fri Sep 3 14:57:01 1999 -@@ -120,6 +120,7 @@ +--- Makefile.tmpl.orig Tue Jan 11 22:47:41 2000 ++++ Makefile.tmpl Mon Jan 24 19:50:42 2000 +@@ -123,6 +123,7 @@ runtimedir = @runtimedir@ logfiledir = @logfiledir@ proxycachedir = @proxycachedir@ +doc_prefix = $(prefix)/share/doc/apache libexecdir_relative = @libexecdir_relative@ -@@ -255,9 +256,9 @@ +@@ -266,9 +267,9 @@ $(MKDIR) $(root)$(mandir)/man1 $(MKDIR) $(root)$(mandir)/man8 $(MKDIR) $(root)$(sysconfdir) - $(MKDIR) $(root)$(htdocsdir) + $(MKDIR) $(root)$(doc_prefix) $(MKDIR) $(root)$(iconsdir) - $(MKDIR) $(root)$(cgidir) + $(MKDIR) $(root)$(cgidir).default $(MKDIR) $(root)$(includedir) $(MKDIR) $(root)$(includedir)/xml $(MKDIR) $(root)$(runtimedir) -@@ -441,26 +442,34 @@ +@@ -452,25 +453,33 @@ # icons and distributed CGI scripts. install-data: @echo "===> [data: Installing initial data files]" -- -@if [ -f $(root)$(htdocsdir)/index.html ]; then \ +- -@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \ - echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \ - else \ - echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \ -+# -@if [ -f $(root)$(htdocsdir)/index.html ]; then \ -+# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \ -+# else \ ++# -@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \ ++# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \ ++# else \ + echo "Copying tree $(TOP)/htdocs/ -> $(root)$(doc_prefix)/"; \ (cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - *) |\ - (cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \ - find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \ - find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \ +- fi +- -@if [ -f $(root)$(cgidir)/printenv ]; then \ +- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \ +- else \ + (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 ++# fi + if [ ! -d $(root)$(htdocsdir) ]; then \ -+ $(LN) -sf $(root)$(doc_prefix) $(root)$(htdocsdir); \ - fi -- -@if [ -f $(root)$(cgidir)/printenv ]; then \ -- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \ -- else \ ++ $(LN) -sf $(root)$(doc_prefix) $(root)$(htdocsdir); \ ++ fi + $(RM) $(root)$(htdocsdir).default + $(LN) -s $(root)$(doc_prefix) $(root)$(htdocsdir).default -+# -@if [ -f $(root)$(cgidir)/printenv ]; then \ -+# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \ -+# else \ ++# -@if [ -f $(root)$(cgidir)/printenv ]; then \ ++# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \ ++# else \ for script in printenv test-cgi; do \ cat $(TOP)/cgi-bin/$${script} |\ sed -e 's;^#!/.*perl;#!$(PERL);' \ > $(TOP)/$(SRC)/.apaci.install.tmp; \ - echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \ - $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \ + echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir).default/$${script}"; \ + $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir).default/$${script}; \ done; \ -- fi -+# fi ++# fi + if [ ! -d $(root)$(cgidir) ]; then \ + $(LN) -sf $(root)$(cgidir).default $(root)$(cgidir); \ -+ fi + fi @echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \ (cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\ - (cd $(root)$(iconsdir)/ && $(TAR) -xf -); \ -@@ -498,10 +507,10 @@ +@@ -509,10 +518,10 @@ -e 's;logs/accept\.lock;$(runtimedir)/$(TARGET).lock;' \ -e 's;logs/apache_runtime_status;$(runtimedir)/$(TARGET).scoreboard;' \ -e 's;logs/httpd\.pid;$(runtimedir)/$(TARGET).pid;' \ - -e "s;logs/access_log;$(logfiledir)/$${target_prefix}access_log;" \ - -e "s;logs/error_log;$(logfiledir)/$${target_prefix}error_log;" \ - -e "s;logs/referer_log;$(logfiledir)/$${target_prefix}referer_log;" \ - -e "s;logs/agent_log;$(logfiledir)/$${target_prefix}agent_log;" \ + -e "s;logs/access_log;$(logfiledir)/$${target_prefix}httpd-access.log;" \ + -e "s;logs/error_log;$(logfiledir)/$${target_prefix}httpd-error.log;" \ + -e "s;logs/referer_log;$(logfiledir)/$${target_prefix}httpd-referer.log;" \ + -e "s;logs/agent_log;$(logfiledir)/$${target_prefix}httpd-agent.log;" \ -e 's;conf/magic;$(sysconfdir)/magic;' \ -e 's;conf/mime\.types;$(sysconfdir)/mime.types;' \ -e 's;User nobody;User $(conf_user);' \ Property changes on: head/www/apache22/files/patch-ab ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.15 \ No newline at end of property +1.16 \ No newline at end of property Index: head/www/apache22/pkg-plist =================================================================== --- head/www/apache22/pkg-plist (revision 25033) +++ head/www/apache22/pkg-plist (revision 25034) @@ -1,342 +1,356 @@ bin/dbmmanage bin/htdigest bin/htpasswd etc/apache/access.conf.default @exec [ ! -f %B/access.conf ] && cp %B/%f %B/access.conf etc/apache/httpd.conf.default @exec [ ! -f %B/httpd.conf ] && cp %B/%f %B/httpd.conf etc/apache/magic.default @exec [ ! -f %B/magic ] && cp %B/%f %B/magic etc/apache/mime.types.default @exec [ ! -f %B/mime.types ] && cp %B/%f %B/mime.types etc/apache/srm.conf.default @exec [ ! -f %B/srm.conf ] && cp %B/%f %B/srm.conf 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/ap_mmn.h include/apache/ap_sha1.h include/apache/buff.h include/apache/compat.h include/apache/conf.h include/apache/explain.h include/apache/fnmatch.h include/apache/hsregex.h include/apache/http_conf_globals.h include/apache/http_config.h include/apache/http_core.h include/apache/http_log.h include/apache/http_main.h include/apache/http_protocol.h include/apache/http_request.h include/apache/http_vhost.h include/apache/httpd.h include/apache/multithread.h include/apache/os-inline.c include/apache/os.h include/apache/rfc1413.h include/apache/scoreboard.h include/apache/util_date.h include/apache/util_md5.h include/apache/util_script.h include/apache/util_uri.h include/apache/xml/asciitab.h include/apache/xml/hashtable.h include/apache/xml/iasciitab.h include/apache/xml/latin1tab.h include/apache/xml/nametab.h include/apache/xml/utf8tab.h include/apache/xml/xmldef.h include/apache/xml/xmlparse.h include/apache/xml/xmlrole.h include/apache/xml/xmltok.h include/apache/xml/xmltok_impl.h libexec/apache/httpd.exp libexec/apache/libproxy.so libexec/apache/mod_auth_anon.so libexec/apache/mod_auth_db.so libexec/apache/mod_cern_meta.so libexec/apache/mod_digest.so libexec/apache/mod_expires.so libexec/apache/mod_headers.so libexec/apache/mod_info.so libexec/apache/mod_mime_magic.so libexec/apache/mod_rewrite.so libexec/apache/mod_speling.so libexec/apache/mod_unique_id.so libexec/apache/mod_usertrack.so libexec/apache/mod_vhost_alias.so sbin/ab sbin/apachectl sbin/apxs sbin/httpd sbin/logresolve sbin/rotatelogs share/doc/apache/apache_pb.gif @exec mkdir -p %D/www @exec ln -fs %B %D/www/data.default @unexec rm -f %D/www/data.default @exec [ ! -d %D/www/data ] && ln -fs %B %D/www/data @exec [ ! -d %D/www/cgi-bin ] && ln -fs %D/www/cgi-bin.default %D/www/cgi-bin -share/doc/apache/index.html +share/doc/apache/index.html.ca +share/doc/apache/index.html.cz +share/doc/apache/index.html.de +share/doc/apache/index.html.dk +share/doc/apache/index.html.ee +share/doc/apache/index.html.en +share/doc/apache/index.html.es +share/doc/apache/index.html.fr +share/doc/apache/index.html.it +share/doc/apache/index.html.lu +share/doc/apache/index.html.nl +share/doc/apache/index.html.pt +share/doc/apache/index.html.se 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-tpf.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/rewriteguide.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_auth_digest.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/mod/mod_vhost_alias.html share/doc/apache/manual/multilogs.html +share/doc/apache/manual/netware.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/readme-tpf.html share/doc/apache/manual/search/manual-index.cgi 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/suexec_1_2.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/mass.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/icons/README www/icons/a.gif www/icons/alert.black.gif www/icons/alert.red.gif www/icons/apache_pb.gif www/icons/back.gif www/icons/ball.gray.gif www/icons/ball.red.gif www/icons/binary.gif www/icons/binhex.gif www/icons/blank.gif www/icons/bomb.gif www/icons/box1.gif www/icons/box2.gif www/icons/broken.gif www/icons/burst.gif www/icons/c.gif www/icons/comp.blue.gif www/icons/comp.gray.gif www/icons/compressed.gif www/icons/continued.gif www/icons/dir.gif www/icons/down.gif www/icons/dvi.gif www/icons/f.gif www/icons/folder.gif www/icons/folder.open.gif www/icons/folder.sec.gif www/icons/forward.gif www/icons/generic.gif www/icons/generic.red.gif www/icons/generic.sec.gif www/icons/hand.right.gif www/icons/hand.up.gif www/icons/icon.sheet.gif www/icons/image1.gif www/icons/image2.gif www/icons/image3.gif www/icons/index.gif www/icons/layout.gif www/icons/left.gif www/icons/link.gif www/icons/movie.gif www/icons/p.gif www/icons/patch.gif www/icons/pdf.gif www/icons/pie0.gif www/icons/pie1.gif www/icons/pie2.gif www/icons/pie3.gif www/icons/pie4.gif www/icons/pie5.gif www/icons/pie6.gif www/icons/pie7.gif www/icons/pie8.gif www/icons/portal.gif www/icons/ps.gif www/icons/quill.gif www/icons/right.gif www/icons/screw1.gif www/icons/screw2.gif www/icons/script.gif www/icons/small/README.txt www/icons/small/back.gif www/icons/small/binary.gif www/icons/small/binhex.gif www/icons/small/blank.gif www/icons/small/broken.gif www/icons/small/burst.gif www/icons/small/comp1.gif www/icons/small/comp2.gif www/icons/small/compressed.gif www/icons/small/continued.gif www/icons/small/dir.gif www/icons/small/dir2.gif www/icons/small/doc.gif www/icons/small/forward.gif www/icons/small/generic.gif www/icons/small/generic2.gif www/icons/small/generic3.gif www/icons/small/image.gif www/icons/small/image2.gif www/icons/small/index.gif www/icons/small/key.gif www/icons/small/movie.gif www/icons/small/patch.gif www/icons/small/ps.gif www/icons/small/rainbow.gif www/icons/small/sound.gif www/icons/small/sound2.gif www/icons/small/tar.gif www/icons/small/text.gif www/icons/small/transfer.gif www/icons/small/unknown.gif www/icons/small/uu.gif www/icons/sound1.gif www/icons/sound2.gif www/icons/sphere1.gif www/icons/sphere2.gif www/icons/tar.gif www/icons/tex.gif www/icons/text.gif www/icons/transfer.gif www/icons/unknown.gif www/icons/up.gif www/icons/uu.gif www/icons/uuencoded.gif www/icons/world1.gif www/icons/world2.gif @exec mkdir -p %D/www/proxy @dirrm etc/apache @dirrm include/apache/xml @dirrm include/apache @dirrm libexec/apache @dirrm share/doc/apache/manual/images @dirrm share/doc/apache/manual/misc @dirrm share/doc/apache/manual/mod @dirrm share/doc/apache/manual/search @dirrm share/doc/apache/manual/vhosts @dirrm share/doc/apache/manual @dirrm share/doc/apache @dirrm www/cgi-bin.default @dirrm www/icons/small @dirrm www/icons @dirrm www/proxy @dirrm www Property changes on: head/www/apache22/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.25 \ No newline at end of property +1.26 \ No newline at end of property