head	1.17;
access;
symbols
	old_RELEASE_4_2_0:1.16
	old_RELEASE_4_1_1:1.16
	old_RELEASE_4_1_0:1.16
	old_RELEASE_3_5_0:1.16
	old_RELEASE_4_0_0:1.16
	old_RELEASE_3_4_0:1.15
	old_RELEASE_3_3_0:1.15
	old_RELEASE_3_2_0:1.14
	old_RELEASE_3_1_0:1.13
	old_RELEASE_2_2_8:1.12
	old_RELEASE_3_0_0:1.12
	old_RELEASE_2_2_7:1.9
	old_RELEASE_2_2_5:1.5
	old_RELEASE_2_2_1:1.4
	old_RELEASE_2_2_2:1.4;
locks; strict;
comment	@# @;


1.17
date	2001.04.13.04.43.48;	author will;	state dead;
branches;
next	1.16;

1.16
date	2000.01.24.17.58.27;	author ache;	state Exp;
branches;
next	1.15;

1.15
date	99.09.03.16.07.51;	author ache;	state Exp;
branches;
next	1.14;

1.14
date	99.03.25.22.25.56;	author ache;	state Exp;
branches;
next	1.13;

1.13
date	99.01.15.00.26.26;	author ache;	state Exp;
branches;
next	1.12;

1.12
date	98.09.24.01.06.26;	author ache;	state Exp;
branches;
next	1.11;

1.11
date	98.08.05.04.45.28;	author asami;	state Exp;
branches;
next	1.10;

1.10
date	98.07.23.13.16.06;	author ache;	state Exp;
branches;
next	1.9;

1.9
date	98.06.05.17.16.21;	author ache;	state Exp;
branches;
next	1.8;

1.8
date	98.04.21.21.57.55;	author ache;	state Exp;
branches;
next	1.7;

1.7
date	97.10.23.16.40.02;	author ache;	state dead;
branches;
next	1.6;

1.6
date	97.10.22.23.51.33;	author ache;	state Exp;
branches;
next	1.5;

1.5
date	97.05.31.20.16.08;	author ache;	state Exp;
branches;
next	1.4;

1.4
date	96.08.22.20.15.51;	author ache;	state Exp;
branches;
next	1.3;

1.3
date	96.08.11.14.49.45;	author markm;	state Exp;
branches;
next	1.2;

1.2
date	96.07.11.11.04.01;	author ache;	state Exp;
branches;
next	1.1;

1.1
date	95.09.29.17.01.18;	author pst;	state Exp;
branches;
next	;


desc
@@


1.17
log
@Bring in Apache 2.0.16-beta.  Just in time for the release...

PR:		26410
Submitted by:	Chang, Hye-Shik <perky@@python.or.kr>
Repocopied by:	asami
@
text
@--- 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@@
 
@@@@ -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)
@@@@ -452,25 +453,33 @@@@
 #   icons and distributed CGI scripts.
 install-data:
 	@@echo "===> [data: Installing initial data files]"
-	-@@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 ] || [ -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
+	if [ ! -d $(root)$(htdocsdir) ]; then \
+		$(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 \
 		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
+	if [ ! -d $(root)$(cgidir) ]; then \
+		$(LN) -sf $(root)$(cgidir).default $(root)$(cgidir); \
 	fi
 	@@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
 	(cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\
@@@@ -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);' \
@


1.16
log
@upgrade to 1.3.11
@
text
@@


1.15
log
@upgrade to 1.3.9
@
text
@d1 3
a3 3
--- Makefile.tmpl.orig	Fri Aug 13 10:58:18 1999
+++ Makefile.tmpl	Fri Sep  3 14:57:01 1999
@@@@ -120,6 +120,7 @@@@
d11 1
a11 1
@@@@ -255,9 +256,9 @@@@
d23 1
a23 1
@@@@ -441,26 +442,34 @@@@
d27 1
a27 1
-	-@@if [ -f $(root)$(htdocsdir)/index.html ]; then \
d31 3
a33 3
+#       -@@if [ -f $(root)$(htdocsdir)/index.html ]; then \
+#               echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
+#       else \
d39 4
d46 1
a46 1
+#       fi
d48 2
a49 5
+	       $(LN) -sf $(root)$(doc_prefix) $(root)$(htdocsdir); \
 	fi
-	-@@if [ -f $(root)$(cgidir)/printenv ]; then \
-		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
-	else \
d52 3
a54 3
+#       -@@if [ -f $(root)$(cgidir)/printenv ]; then \
+#               echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
+#       else \
d64 1
a64 2
-	fi
+#       fi
d67 1
a67 1
+  	fi
d70 1
a70 2
 	(cd $(root)$(iconsdir)/ && $(TAR) -xf -); \
@@@@ -498,10 +507,10 @@@@
@


1.14
log
@upgrade to 1.3.6
@
text
@d1 3
a3 11
--- Makefile.tmpl.orig	Tue Mar 16 03:38:46 1999
+++ Makefile.tmpl	Thu Mar 25 23:53:46 1999
@@@@ -113,13 +113,14 @@@@
 sysconfdir      = @@sysconfdir@@
 datadir         = @@datadir@@
 iconsdir        = $(datadir)/icons
-htdocsdir       = $(datadir)/htdocs
+htdocsdir       = $(datadir)/data
 cgidir          = $(datadir)/cgi-bin
 includedir      = @@includedir@@
 localstatedir   = @@localstatedir@@
d11 1
a11 1
@@@@ -249,9 +250,9 @@@@
d21 1
d23 1
a23 2
 	$(MKDIR) $(root)$(logfiledir)
@@@@ -379,26 +380,34 @@@@
d71 2
a72 2
@@@@ -436,10 +445,10 @@@@
 			-e 's;logs/accept.lock;$(runtimedir)/$(TARGET).lock;' \
d74 1
a74 1
 			-e 's;logs/httpd.pid;$(runtimedir)/$(TARGET).pid;' \
d79 4
a82 4
+			-e 's;logs/access_log;$(logfiledir)/httpd-access.log;' \
+			-e 's;logs/error_log;$(logfiledir)/httpd-error.log;' \
+			-e 's;logs/referer_log;$(logfiledir)/httpd-referer.log;' \
+			-e 's;logs/agent_log;$(logfiledir)/httpd-agent.log;' \
d84 2
a85 2
 			-e 's;conf/mime.types;$(sysconfdir)/mime.types;' \
 			-e 's;Group #-1;Group $(conf_group);' \
@


1.13
log
@upgrade to 1.3.4
@
text
@d1 11
a11 3
--- Makefile.tmpl.orig	Thu Jan  7 14:50:45 1999
+++ Makefile.tmpl	Fri Jan 15 02:39:17 1999
@@@@ -110,6 +110,7 @@@@
d19 1
a19 1
@@@@ -239,9 +240,9 @@@@
d23 1
a23 1
-	$(MKDIR) $(root)$(datadir)/htdocs
d25 3
a27 3
 	$(MKDIR) $(root)$(datadir)/icons
-	$(MKDIR) $(root)$(datadir)/cgi-bin
+	$(MKDIR) $(root)$(datadir)/cgi-bin.default
d31 1
a31 1
@@@@ -363,25 +364,33 @@@@
d35 2
a36 2
-	-@@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \
-		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \
d38 4
a41 4
-		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(datadir)/htdocs/"; \
+#        -@@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \
+#                echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \
+#        else \
d43 13
a55 7
 		(cd $(TOP)/htdocs/ && $(TAR) -hcf - *) |\
-		(cd $(root)$(datadir)/htdocs/ && $(TAR) -xf -); \
-		find $(root)$(datadir)/htdocs/ -type d -exec chmod a+rx {} \; ; \
-		find $(root)$(datadir)/htdocs/ -type f -exec chmod a+r {} \; ; \
-	fi
-	-@@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \
-		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \
d57 5
a61 12
+		(cd $(root)$(doc_prefix)/ && $(TAR) xf -); \
+		find $(root)$(doc_prefix)/ -type d -exec chmod a+rx {} \; ; \
+		find $(root)$(doc_prefix)/ -type f -exec chmod a+r {} \; ;
+#        fi
+	 if [ ! -d $(root)$(datadir)/data ]; then \
+		$(LN) -sf $(root)$(doc_prefix) $(root)$(datadir)/data; \
+	 fi
+	 $(RM) $(root)$(datadir)/data.default
+	 $(LN) -s $(root)$(doc_prefix) $(root)$(datadir)/data.default
+#        -@@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \
+#                echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \
+#        else \
d66 14
a79 22
-			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(datadir)/cgi-bin/$${script}"; \
-			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(datadir)/cgi-bin/$${script}; \
-		done; \
+			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(datadir)/cgi-bin.default/$${script}"; \
+			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(datadir)/cgi-bin.default/$${script}; \
+		done;
+#        fi
+	if [ ! -d $(root)$(datadir)/cgi-bin ]; then \
+		$(LN) -sf $(root)$(datadir)/cgi-bin.default $(root)$(datadir)/cgi-bin; \
 	fi
 	@@echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \
 	(cd $(TOP)/icons/ && $(TAR) -hcf - *) |\
@@@@ -411,7 +420,7 @@@@
 		 echo ""; \
 		 cat $(TOP)/conf/$${conf}-dist ) |\
 		 sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \
-			-e 's;@@@@ServerRoot@@@@/htdocs;$(datadir)/htdocs;' \
+			-e 's;@@@@ServerRoot@@@@/htdocs;$(datadir)/data;' \
 			-e 's;@@@@ServerRoot@@@@/icons;$(datadir)/icons;' \
 			-e 's;@@@@ServerRoot@@@@/cgi-bin;$(datadir)/cgi-bin;' \
 			-e 's;@@@@ServerRoot@@@@/proxy;$(proxycachedir);' \
@@@@ -419,10 +428,10 @@@@
@


1.12
log
@upgrade to 1.3.2
@
text
@d1 94
a94 152
*** Makefile.tmpl.orig	Sat Sep 19 16:41:48 1998
--- Makefile.tmpl	Thu Sep 24 04:07:49 1998
***************
*** 107,112 ****
--- 107,113 ----
  runtimedir      = @@runtimedir@@
  logfiledir      = @@logfiledir@@
  proxycachedir   = @@proxycachedir@@
+ doc_prefix      = $(prefix)/share/doc/apache
  
  libexecdir_relative   = @@libexecdir_relative@@
  
***************
*** 167,173 ****
  			-DGID_MIN=$(suexec_gidmin) \
  			-DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \
  			-DLOG_EXEC=\"$(logfiledir)/suexec_log\" \
! 			-DDOC_ROOT=\"$(datadir)/htdocs\" \
  			-DSAFE_PATH=\"$(suexec_safepath)\" \
  		' \
  		suexec; \
--- 168,174 ----
  			-DGID_MIN=$(suexec_gidmin) \
  			-DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \
  			-DLOG_EXEC=\"$(logfiledir)/suexec_log\" \
! 			-DDOC_ROOT=\"$(datadir)/data\" \
  			-DSAFE_PATH=\"$(suexec_safepath)\" \
  		' \
  		suexec; \
***************
*** 224,232 ****
  	$(MKDIR) $(root)$(mandir)/man1
  	$(MKDIR) $(root)$(mandir)/man8
  	$(MKDIR) $(root)$(sysconfdir)
! 	$(MKDIR) $(root)$(datadir)/htdocs
  	$(MKDIR) $(root)$(datadir)/icons
! 	$(MKDIR) $(root)$(datadir)/cgi-bin
  	$(MKDIR) $(root)$(includedir)
  	$(MKDIR) $(root)$(runtimedir)
  	$(MKDIR) $(root)$(logfiledir)
--- 225,233 ----
  	$(MKDIR) $(root)$(mandir)/man1
  	$(MKDIR) $(root)$(mandir)/man8
  	$(MKDIR) $(root)$(sysconfdir)
! 	$(MKDIR) $(root)$(doc_prefix)
  	$(MKDIR) $(root)$(datadir)/icons
! 	$(MKDIR) $(root)$(datadir)/cgi-bin.default
  	$(MKDIR) $(root)$(includedir)
  	$(MKDIR) $(root)$(runtimedir)
  	$(MKDIR) $(root)$(logfiledir)
***************
*** 340,365 ****
  #   icons and distributed CGI scripts.
  install-data:
  	@@echo "===> [data: Installing initial data files]"
! 	-@@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \
! 		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \
! 	else \
! 		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(datadir)/htdocs/"; \
  		(cd $(TOP)/htdocs/ && $(TAR) cf - *) |\
! 		(cd $(root)$(datadir)/htdocs/ && $(TAR) xf -); \
! 		find $(root)$(datadir)/htdocs/ -type d -exec chmod a+rx {} \; ; \
! 		find $(root)$(datadir)/htdocs/ -type f -exec chmod a+r {} \; ; \
! 	fi
! 	-@@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \
! 		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \
! 	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)$(datadir)/cgi-bin/$${script}"; \
! 			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(datadir)/cgi-bin/$${script}; \
  		done; \
! 	fi
  	@@echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \
  	(cd $(TOP)/icons/ && $(TAR) cf - *) |\
  	(cd $(root)$(datadir)/icons/ && $(TAR) xf -); \
--- 341,373 ----
  #   icons and distributed CGI scripts.
  install-data:
  	@@echo "===> [data: Installing initial data files]"
! #        -@@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \
! #                echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \
! #        else \
! 		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(doc_prefix)/"; \
  		(cd $(TOP)/htdocs/ && $(TAR) cf - *) |\
! 		(cd $(root)$(doc_prefix)/ && $(TAR) xf -); \
! 		find $(root)$(doc_prefix)/ -type d -exec chmod a+rx {} \; ; \
! 		find $(root)$(doc_prefix)/ -type f -exec chmod a+r {} \; ; \
! #        fi
! 	 if [ ! -d $(root)$(datadir)/data ]; then \
! 		$(LN) -sf $(root)$(doc_prefix) $(root)$(datadir)/data; \
! 	 fi
! 	 $(LN) -sf $(root)$(doc_prefix) $(root)$(datadir)/data.default
! #        -@@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \
! #                echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \
! #        else \
  		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)$(datadir)/cgi-bin.default/$${script}"; \
! 			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(datadir)/cgi-bin.default/$${script}; \
  		done; \
! #        fi
! 	if [ ! -d $(root)$(datadir)/cgi-bin ]; then \
! 		$(LN) -sf $(root)$(datadir)/cgi-bin.default $(root)$(datadir)/cgi-bin; \
!   	fi
  	@@echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \
  	(cd $(TOP)/icons/ && $(TAR) cf - *) |\
  	(cd $(root)$(datadir)/icons/ && $(TAR) xf -); \
***************
*** 378,384 ****
  		 echo ""; \
  		 cat $(TOP)/conf/$${conf}-dist ) |\
  		 sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \
! 			-e 's;@@@@ServerRoot@@@@/htdocs;$(datadir)/htdocs;' \
  			-e 's;@@@@ServerRoot@@@@/icons;$(datadir)/icons;' \
  			-e 's;@@@@ServerRoot@@@@/cgi-bin;$(datadir)/cgi-bin;' \
  			-e 's;@@@@ServerRoot@@@@/proxy;$(proxycachedir);' \
--- 386,392 ----
  		 echo ""; \
  		 cat $(TOP)/conf/$${conf}-dist ) |\
  		 sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \
! 			-e 's;@@@@ServerRoot@@@@/htdocs;$(datadir)/data;' \
  			-e 's;@@@@ServerRoot@@@@/icons;$(datadir)/icons;' \
  			-e 's;@@@@ServerRoot@@@@/cgi-bin;$(datadir)/cgi-bin;' \
  			-e 's;@@@@ServerRoot@@@@/proxy;$(proxycachedir);' \
***************
*** 386,395 ****
  			-e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \
  			-e 's;logs/apache_runtime_status;$(runtimedir)/httpd.scoreboard;' \
  			-e 's;logs/httpd.pid;$(runtimedir)/httpd.pid;' \
! 			-e 's;logs/access_log;$(logfiledir)/access_log;' \
! 			-e 's;logs/error_log;$(logfiledir)/error_log;' \
! 			-e 's;logs/referer_log;$(logfiledir)/referer_log;' \
! 			-e 's;logs/agent_log;$(logfiledir)/agent_log;' \
  			-e 's;conf/magic;$(sysconfdir)/magic;' \
  			-e 's;conf/mime.types;$(sysconfdir)/mime.types;' \
  			-e 's;Group #-1;Group $(conf_group);' \
--- 394,403 ----
  			-e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \
  			-e 's;logs/apache_runtime_status;$(runtimedir)/httpd.scoreboard;' \
  			-e 's;logs/httpd.pid;$(runtimedir)/httpd.pid;' \
! 			-e 's;logs/access_log;$(logfiledir)/httpd-access.log;' \
! 			-e 's;logs/error_log;$(logfiledir)/httpd-error.log;' \
! 			-e 's;logs/referer_log;$(logfiledir)/httpd-referer.log;' \
! 			-e 's;logs/agent_log;$(logfiledir)/httpd-agent.log;' \
  			-e 's;conf/magic;$(sysconfdir)/magic;' \
  			-e 's;conf/mime.types;$(sysconfdir)/mime.types;' \
  			-e 's;Group #-1;Group $(conf_group);' \
@


1.11
log
@"ln -s" -> "ln -sf" to make this port reinstall-friendly.
@
text
@d1 2
a2 2
*** Makefile.tmpl.orig	Wed Jul 15 21:03:25 1998
--- Makefile.tmpl	Thu Jul 23 16:14:15 1998
d52 1
a52 1
*** 338,360 ****
d68 8
a75 6
! 		echo "Copying tree $(TOP)/cgi-bin/ -> $(root)$(datadir)/cgi-bin/"; \
  		(cd $(TOP)/cgi-bin/ && $(TAR) cf - *) |\
! 		(cd $(root)$(datadir)/cgi-bin/ && $(TAR) xf -); \
! 		find $(root)$(datadir)/cgi-bin/ -type d -exec chmod a+rx {} \; ; \
! 		find $(root)$(datadir)/cgi-bin/ -type f -exec chmod a+r {} \; ; \
  	fi
d78 2
a79 1
--- 339,368 ----
d99 7
a105 5
! 		echo "Copying tree $(TOP)/cgi-bin/ -> $(root)$(datadir)/cgi-bin.default/"; \
  		(cd $(TOP)/cgi-bin/ && $(TAR) cf - *) |\
! 		(cd $(root)$(datadir)/cgi-bin.default/ && $(TAR) xf -); \
! 		find $(root)$(datadir)/cgi-bin.default/ -type d -exec chmod a+rx {} \; ; \
! 		find $(root)$(datadir)/cgi-bin.default/ -type f -exec chmod a+r {} \; ; \
d109 1
a109 1
  	fi
d112 1
d114 1
a114 1
*** 374,381 ****
a118 1
! 			-e 's;@@@@ServerRoot@@@@/htdocs;$(datadir)/htdocs;' \
d122 1
a122 1
--- 382,389 ----
a126 1
! 			-e 's;@@@@ServerRoot@@@@/htdocs;$(datadir)/data;' \
d131 1
a131 1
*** 383,392 ****
d142 1
a142 1
--- 391,400 ----
@


1.10
log
@Upgrade to 1.3.1
@
text
@d90 1
a90 1
! 		$(LN) -s $(root)$(doc_prefix) $(root)$(datadir)/data; \
d92 1
a92 1
! 	 $(LN) -s $(root)$(doc_prefix) $(root)$(datadir)/data.default
d103 1
a103 1
! 		$(LN) -s $(root)$(datadir)/cgi-bin.default $(root)$(datadir)/cgi-bin; \
@


1.9
log
@upgrade to 1.3b7
@
text
@d1 2
a2 2
*** Makefile.tmpl.orig	Tue May 12 15:52:11 1998
--- Makefile.tmpl	Fri Jun  5 19:13:32 1998
d4 11
a14 1
*** 161,167 ****
d22 1
a22 1
--- 161,167 ----
d31 1
a31 1
*** 216,224 ****
d41 1
a41 1
--- 216,224 ----
d45 1
a45 1
! 	$(MKDIR) $(root)$(datadir)/data.default
d52 1
a52 1
*** 330,352 ****
d76 1
a76 1
--- 330,358 ----
d83 1
a83 1
! 		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(datadir)/data.default/"; \
d85 3
a87 3
! 		(cd $(root)$(datadir)/data.default/ && $(TAR) xf -); \
! 		find $(root)$(datadir)/data.default/ -type d -exec chmod a+rx {} \; ; \
! 		find $(root)$(datadir)/data.default/ -type f -exec chmod a+r {} \; ; \
d90 1
a90 1
! 		$(CP) -Rp $(root)$(datadir)/data.default $(root)$(datadir)/data; \
d92 1
d103 1
a103 1
! 		$(CP) -Rp $(root)$(datadir)/cgi-bin.default $(root)$(datadir)/cgi-bin; \
d108 1
a108 1
*** 366,373 ****
d117 1
a117 1
--- 372,379 ----
d127 1
a127 1
*** 375,384 ****
d136 3
a138 3
          	> $(TOP)/$(SRC)/.apaci.install.tmp && \
  		echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${conf}.default"; \
--- 381,390 ----
d147 2
a148 2
          	> $(TOP)/$(SRC)/.apaci.install.tmp && \
  		echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${conf}.default"; \
@


1.8
log
@Upgrade to 1.3b6, now with loadable modules!
@
text
@d1 2
a2 2
*** Makefile.tmpl.orig	Tue Apr 14 23:17:36 1998
--- Makefile.tmpl	Tue Apr 21 23:48:17 1998
d4 16
a19 26
*** 207,218 ****
  	$(MKDIR) $(mandir)/man1
  	$(MKDIR) $(mandir)/man8
  	$(MKDIR) $(sysconfdir)
! 	$(MKDIR) $(datadir)/htdocs
  	$(MKDIR) $(datadir)/icons
! 	$(MKDIR) $(datadir)/cgi-bin
  	$(MKDIR) $(localstatedir)/$(localstatesubdir_logs)
  	$(MKDIR) $(localstatedir)/$(localstatesubdir_run)
! 	$(MKDIR) $(localstatedir)/proxy
  	$(MKDIR) $(includedir)
  	@@echo "<=== [mktree]"
  
--- 207,218 ----
  	$(MKDIR) $(mandir)/man1
  	$(MKDIR) $(mandir)/man8
  	$(MKDIR) $(sysconfdir)
! 	$(MKDIR) $(datadir)/data.default
  	$(MKDIR) $(datadir)/icons
! 	$(MKDIR) $(datadir)/cgi-bin.default
  	$(MKDIR) $(localstatedir)/$(localstatesubdir_logs)
  	$(MKDIR) $(localstatedir)/$(localstatesubdir_run)
! 	$(MKDIR) $(datadir)/proxy
  	$(MKDIR) $(includedir)
  	@@echo "<=== [mktree]"
  
d21 33
a53 38
*** 311,327 ****
  install-docroot:
  	@@echo "===> [docroot: Installing initial DocumentRoot files]"
  	-(cd $(ROOT)/htdocs/ && $(TAR) cf - *) |\
! 	 (cd $(datadir)/htdocs/ && $(TAR) xf -)
! 	-find $(datadir)/htdocs/ -type d -exec chmod a+rx {} \;
! 	-find $(datadir)/htdocs/ -type f -exec chmod a+r {} \;
  	-(cd $(ROOT)/icons/ && $(TAR) cf - *) |\
  	 (cd $(datadir)/icons/ && $(TAR) xf -)
  	-find $(datadir)/icons/ -type d -exec chmod a+rx {} \;
  	-find $(datadir)/icons/ -type f -exec chmod a+r {} \;
  	-(cd $(ROOT)/cgi-bin/ && $(TAR) cf - *) |\
! 	 (cd $(datadir)/cgi-bin/ && $(TAR) xf -)
! 	-find $(datadir)/cgi-bin/ -type d -exec chmod a+rx {} \;
! 	-find $(datadir)/cgi-bin/ -type f -exec chmod a+r {} \;
  	@@echo "<=== [docroot]"
  
  #   create the initial configuration by providing default files
--- 311,333 ----
  install-docroot:
  	@@echo "===> [docroot: Installing initial DocumentRoot files]"
  	-(cd $(ROOT)/htdocs/ && $(TAR) cf - *) |\
! 	 (cd $(datadir)/data.default/ && $(TAR) xf -)
! 	-find $(datadir)/data.default/ -type d -exec chmod a+rx {} \;
! 	-find $(datadir)/data.default/ -type f -exec chmod a+r {} \;
! 	if [ ! -d $(datadir)/data ]; then \
! 		$(CP) -Rp $(datadir)/data.default $(datadir)/data; \
! 	fi
  	-(cd $(ROOT)/icons/ && $(TAR) cf - *) |\
  	 (cd $(datadir)/icons/ && $(TAR) xf -)
  	-find $(datadir)/icons/ -type d -exec chmod a+rx {} \;
  	-find $(datadir)/icons/ -type f -exec chmod a+r {} \;
  	-(cd $(ROOT)/cgi-bin/ && $(TAR) cf - *) |\
! 	 (cd $(datadir)/cgi-bin.default/ && $(TAR) xf -)
! 	-find $(datadir)/cgi-bin.default/ -type d -exec chmod a+rx {} \;
! 	-find $(datadir)/cgi-bin.default/ -type f -exec chmod a+r {} \;
! 	if [ ! -d $(datadir)/cgi-bin ]; then \
! 		$(CP) -Rp $(datadir)/cgi-bin.default $(datadir)/cgi-bin; \
d55 41
a95 3
  	@@echo "<=== [docroot]"
  
  #   create the initial configuration by providing default files
d97 1
a97 1
*** 335,351 ****
d99 8
a106 17
  		 cat $(ROOT)/conf/$$conf-dist ) |\
      	sed -e '/# LoadModule/r .install.conf' \
!     	    -e 's;@@@@ServerRoot@@@@/htdocs;$(datadir)/htdocs;' \
!     	    -e 's;@@@@ServerRoot@@@@/htdocs;$(datadir)/htdocs;' \
          	-e 's;@@@@ServerRoot@@@@/icons;$(datadir)/icons;' \
          	-e 's;@@@@ServerRoot@@@@/cgi-bin;$(datadir)/cgi-bin;' \
!         	-e 's;@@@@ServerRoot@@@@/proxy;$(localstatedir)/proxy;' \
          	-e 's;@@@@ServerRoot@@@@;$(prefix);' \
          	-e 's;logs/accept.lock;$(localstatedir)/$(localstatesubdir_run)/httpd.lock;' \
          	-e 's;logs/apache_status;$(localstatedir)/$(localstatesubdir_run)/httpd.scoreboard;' \
          	-e 's;logs/httpd.pid;$(localstatedir)/$(localstatesubdir_run)/httpd.pid;' \
!         	-e 's;logs/access_log;$(localstatedir)/$(localstatesubdir_logs)/access_log;' \
!         	-e 's;logs/error_log;$(localstatedir)/$(localstatesubdir_logs)/error_log;' \
          	>.install.tmp && \
  		echo "$(INSTALL_DATA) .install.tmp $(sysconfdir)/$$conf.default"; \
  		$(INSTALL_DATA) .install.tmp $(sysconfdir)/$$conf.default; \
--- 341,356 ----
d108 7
a114 15
  		 cat $(ROOT)/conf/$$conf-dist ) |\
      	sed -e '/# LoadModule/r .install.conf' \
! 	    -e 's;@@@@ServerRoot@@@@/htdocs;$(datadir)/data;' \
          	-e 's;@@@@ServerRoot@@@@/icons;$(datadir)/icons;' \
          	-e 's;@@@@ServerRoot@@@@/cgi-bin;$(datadir)/cgi-bin;' \
! 		-e 's;@@@@ServerRoot@@@@/proxy;$(datadir)/proxy;' \
          	-e 's;@@@@ServerRoot@@@@;$(prefix);' \
          	-e 's;logs/accept.lock;$(localstatedir)/$(localstatesubdir_run)/httpd.lock;' \
          	-e 's;logs/apache_status;$(localstatedir)/$(localstatesubdir_run)/httpd.scoreboard;' \
          	-e 's;logs/httpd.pid;$(localstatedir)/$(localstatesubdir_run)/httpd.pid;' \
! 		-e 's;logs/access_log;$(localstatedir)/$(localstatesubdir_logs)/httpd-access.log;' \
! 		-e 's;logs/error_log;$(localstatedir)/$(localstatesubdir_logs)/httpd-error.log;' \
          	>.install.tmp && \
  		echo "$(INSTALL_DATA) .install.tmp $(sysconfdir)/$$conf.default"; \
  		$(INSTALL_DATA) .install.tmp $(sysconfdir)/$$conf.default; \
d116 22
a137 24
*** 356,363 ****
  			echo "[PRESERVING EXISTING CONFIG FILE: $(sysconfdir)/$$conf]"; \
  		fi; \
  	done
! 	$(CP) $(ROOT)/conf/mime.types $(sysconfdir)/mime.types
! 	$(CP) $(ROOT)/conf/magic $(sysconfdir)/magic
  	@@echo "<=== [config]"
  
  
--- 361,374 ----
  			echo "[PRESERVING EXISTING CONFIG FILE: $(sysconfdir)/$$conf]"; \
  		fi; \
  	done
! 	$(INSTALL_DATA) $(ROOT)/conf/mime.types $(sysconfdir)/mime.types.default
! 	if [ ! -f "$(sysconfdir)/mime.types" ]; then \
! 		$(INSTALL_DATA) $(ROOT)/conf/mime.types $(sysconfdir)/mime.types; \
! 	fi
! 	$(INSTALL_DATA) $(ROOT)/conf/magic $(sysconfdir)/magic.default
! 	if [ ! -f "$(sysconfdir)/magic" ]; then \
! 		$(INSTALL_DATA) $(ROOT)/conf/magic $(sysconfdir)/magic; \
! 	fi
  	@@echo "<=== [config]"
  
  
@


1.7
log
@Compile with -funsigned-char instead of (unsigned char) cast
and not replace Apache functions now
@
text
@d1 2
a2 2
*** src/main/fnmatch.h.orig	Thu Oct 16 22:57:01 1997
--- src/main/fnmatch.h	Wed Oct 22 22:44:12 1997
d4 25
a28 2
*** 35,40 ****
--- 35,44 ----
d30 41
a70 8
  /* This file has been modified by the Apache Group. */
  
+ #ifdef __FreeBSD__
+ #include "freebsd_fnmatch.h"
+ extern int is_fnmatch(const char *);
+ #else
  #ifndef	_FNMATCH_H_
  #define	_FNMATCH_H_
d72 1
d74 35
a108 8
*** 50,52 ****
--- 54,57 ----
  extern int is_fnmatch(const char *);
  
  #endif /* !_FNMATCH_H_ */
+ #endif /* !FreeBSD */
*** src/main/fnmatch.c.orig	Thu Oct 16 22:57:01 1997
--- src/main/fnmatch.c	Wed Oct 22 22:40:52 1997
d110 23
a132 23
*** 34,39 ****
--- 34,40 ----
   * SUCH DAMAGE.
   */
  
+ #ifndef __FreeBSD__
  #if defined(LIBC_SCCS) && !defined(lint)
  static char sccsid[] = "@@(#)fnmatch.c	8.2 (Berkeley) 4/16/94";
  #endif /* LIBC_SCCS and not lint */
***************
*** 169,175 ****
      }
      return (ok == negate ? NULL : pattern);
  }
! 
  
  /* This function is an Apache addition */
  /* return non-zero if pattern has any glob chars in it */
--- 170,176 ----
      }
      return (ok == negate ? NULL : pattern);
  }
! #endif /* !FreeBSD */
a133 2
  /* This function is an Apache addition */
  /* return non-zero if pattern has any glob chars in it */
@


1.6
log
@Upgrade to 1.3b2, now with support files and docs installed
@
text
@@


1.5
log
@Upgrade to 1.2b11
@
text
@d1 2
a2 2
*** conf/access.conf-dist.orig	Wed Jul  3 21:18:11 1996
--- conf/access.conf-dist	Fri Jul  5 06:32:54 1996
d4 2
a5 1
*** 12,18 ****
d7 1
a7 1
  # This should be changed to whatever you set DocumentRoot to.
d9 6
a14 1
! <Directory /usr/local/etc/httpd/htdocs>
d16 33
a48 3
  # This may also be "None", "All", or any combination of "Indexes",
  # "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews".
--- 12,18 ----
d50 2
a51 23
  # This should be changed to whatever you set DocumentRoot to.
  
! <Directory /usr/local/www/data>
  
  # This may also be "None", "All", or any combination of "Indexes",
  # "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews".
***************
*** 38,44 ****
  # /usr/local/etc/httpd/cgi-bin should be changed to whatever your ScriptAliased
  # CGI directory exists, if you have that configured.
  
! <Directory /usr/local/etc/httpd/cgi-bin>
  AllowOverride None
  Options None
  </Directory>
--- 38,44 ----
  # /usr/local/etc/httpd/cgi-bin should be changed to whatever your ScriptAliased
  # CGI directory exists, if you have that configured.
  
! <Directory /usr/local/www/cgi-bin>
  AllowOverride None
  Options None
  </Directory>
@


1.4
log
@Split /usr/local/etc/apache/* in more reasonable way
Warning: SSL part not updated completely
@
text
@a36 46
*** conf/srm.conf-dist.orig	Thu Jun 13 06:04:43 1996
--- conf/srm.conf-dist	Fri Jul  5 06:37:24 1996
***************
*** 12,18 ****
  # documents. By default, all requests are taken from this directory, but
  # symbolic links and aliases may be used to point to other locations.
  
! DocumentRoot /usr/local/etc/httpd/htdocs
  
  # UserDir: The name of the directory which is appended onto a user's home
  # directory if a ~user request is recieved.
--- 12,18 ----
  # documents. By default, all requests are taken from this directory, but
  # symbolic links and aliases may be used to point to other locations.
  
! DocumentRoot /usr/local/www/data
  
  # UserDir: The name of the directory which is appended onto a user's home
  # directory if a ~user request is recieved.
***************
*** 131,142 ****
  # Aliases: Add here as many aliases as you need (with no limit). The format is 
  # Alias fakename realname
  
! #Alias /icons/ /usr/local/etc/httpd/icons/
  
  # ScriptAlias: This controls which directories contain server scripts.
  # Format: ScriptAlias fakename realname
  
! #ScriptAlias /cgi-bin/ /usr/local/etc/httpd/cgi-bin/
  
  # If you want to use server side includes, or CGI outside
  # ScriptAliased directories, uncomment the following lines.
--- 131,142 ----
  # Aliases: Add here as many aliases as you need (with no limit). The format is 
  # Alias fakename realname
  
! Alias /icons/ /usr/local/www/icons/
  
  # ScriptAlias: This controls which directories contain server scripts.
  # Format: ScriptAlias fakename realname
  
! ScriptAlias /cgi-bin/ /usr/local/www/cgi-bin/
  
  # If you want to use server side includes, or CGI outside
  # ScriptAliased directories, uncomment the following lines.
@


1.3
log
@1) Add the ability to build a secure (SSL'ed) server, conditionalised
   on the presence of SECURE_SERVER.

2) Clean up the installation in accordance with BSD religion:
   Now all the configs go in ${PREFIX}/etc/apache and the
   data (documents) stay in ${PREFIX}/www.
@
text
@a36 46
*** conf/httpd.conf-dist.orig	Sat Jun  8 00:56:47 1996
--- conf/httpd.conf-dist	Fri Jul  5 06:25:42 1996
***************
*** 33,44 ****
  # ServerAdmin: Your address, where problems with the server should be
  # e-mailed.
  
! ServerAdmin you@@your.address
  
  # ServerRoot: The directory the server's config, error, and log files
  # are kept in
  
! ServerRoot /usr/local/etc/httpd
  
  # BindAddress: You can support virtual hosts with this option. This option
  # is used to tell the server which IP address to listen to. It can either
--- 33,44 ----
  # ServerAdmin: Your address, where problems with the server should be
  # e-mailed.
  
! ServerAdmin you@@your.address.domain
  
  # ServerRoot: The directory the server's config, error, and log files
  # are kept in
  
! ServerRoot /usr/local/etc/apache
  
  # BindAddress: You can support virtual hosts with this option. This option
  # is used to tell the server which IP address to listen to. It can either
***************
*** 161,167 ****
   
  #<VirtualHost host.foo.com>
  #ServerAdmin webmaster@@host.foo.com
! #DocumentRoot /www/docs/host.foo.com
  #ServerName host.foo.com
  #ErrorLog logs/host.foo.com-error_log
  #TransferLog logs/host.foo.com-access_log
--- 161,167 ----
   
  #<VirtualHost host.foo.com>
  #ServerAdmin webmaster@@host.foo.com
! #DocumentRoot /usr/local/www/host.foo.com/data
  #ServerName host.foo.com
  #ErrorLog logs/host.foo.com-error_log
  #TransferLog logs/host.foo.com-access_log
@


1.2
log
@Upgrade to 1.1.1
OK-ed by: gpalmer
@
text
@d62 1
a62 1
! ServerRoot /usr/local/www/server
@


1.1
log
@Don't try to install mime.types twice.

Patch up the distributed configuration files to match /usr/local/www
convention.  We really should be patching them to meta-values and then
running sed over them to home them to the right prefix.
@
text
@d1 2
a2 2
*** conf/access.conf-dist	Fri Sep 29 09:50:58 1995
--- conf/access.conf-dist	Fri Sep 29 09:51:50 1995
d4 1
a4 8
*** 10,23 ****
  
  # Originally by Rob McCool
  
! # /usr/local/etc/httpd/ should be changed to whatever you set ServerRoot to.
! <Directory /usr/local/etc/httpd/cgi-bin>
  Options Indexes FollowSymLinks
  </Directory>
d12 1
a12 8
--- 10,23 ----
  
  # Originally by Rob McCool
  
! # /usr/local/www/ should be changed to whatever you set ServerRoot to.
! <Directory /usr/local/www/cgi-bin>
  Options Indexes FollowSymLinks
  </Directory>
a19 2
*** conf/httpd.conf-dist.orig	Tue Aug  1 04:45:22 1995
--- conf/httpd.conf-dist	Fri Sep 29 09:52:42 1995
d21 20
a40 1
*** 29,40 ****
d53 1
a53 1
--- 29,40 ----
d67 1
a67 1
*** 124,130 ****
d75 1
a75 1
--- 124,130 ----
d83 2
a84 2
*** conf/srm.conf-dist	Sun Aug 20 18:23:53 1995
--- conf/srm.conf-dist	Fri Sep 29 09:50:45 1995
d103 1
a103 1
*** 118,129 ****
d107 1
a107 1
! Alias /icons/ /usr/local/etc/httpd/icons/
d112 1
a112 1
! ScriptAlias /cgi-bin/ /usr/local/etc/httpd/cgi-bin/
d116 1
a116 1
--- 118,129 ----
@
