head	1.5;
access;
symbols
	RELEASE_9_0_0:1.4
	RELEASE_7_4_0:1.4
	RELEASE_8_2_0:1.4
	RELEASE_6_EOL:1.4
	RELEASE_8_1_0:1.4
	RELEASE_7_3_0:1.4
	RELEASE_8_0_0:1.4
	RELEASE_7_2_0:1.4
	RELEASE_7_1_0:1.4
	RELEASE_6_4_0:1.4
	RELEASE_5_EOL:1.4
	RELEASE_7_0_0:1.4
	RELEASE_6_3_0:1.4
	PRE_XORG_7:1.4
	RELEASE_4_EOL:1.4
	RELEASE_6_2_0:1.4
	RELEASE_6_1_0:1.4
	RELEASE_5_5_0:1.4
	RELEASE_6_0_0:1.4
	RELEASE_5_4_0:1.4
	RELEASE_4_11_0:1.4
	RELEASE_5_3_0:1.4
	RELEASE_4_10_0:1.4
	RELEASE_5_2_1:1.4
	RELEASE_5_2_0:1.4
	RELEASE_4_9_0:1.4
	RELEASE_5_1_0:1.4
	RELEASE_4_8_0:1.4
	RELEASE_5_0_0:1.4
	RELEASE_4_7_0:1.4
	RELEASE_4_6_2:1.4
	RELEASE_4_6_1:1.4
	RELEASE_4_6_0:1.3
	RELEASE_5_0_DP1:1.3
	RELEASE_4_5_0:1.2;
locks; strict;
comment	@# @;


1.5
date	2012.01.01.19.30.37;	author ohauer;	state dead;
branches;
next	1.4;

1.4
date	2002.06.22.17.48.46;	author pat;	state Exp;
branches;
next	1.3;

1.3
date	2002.02.08.05.05.37;	author pat;	state Exp;
branches;
next	1.2;

1.2
date	2001.12.02.23.17.09;	author kuriyama;	state Exp;
branches;
next	1.1;

1.1
date	2001.10.22.17.43.30;	author ache;	state Exp;
branches;
next	;


desc
@@


1.5
log
@- remove apache13 and ports depending on apache13 from portstree
  ( EXPIRATION_DATE=2012-01-01 )

with hat apache@@
@
text
@--- Makefile.tmpl.orig	Sat Jun 22 12:55:54 2002
+++ Makefile.tmpl	Sat Jun 22 12:59:10 2002
@@@@ -329,10 +329,10 @@@@
 	$(MKDIR) $(root)$(sysconfdir)/ssl.csr
 	$(MKDIR) $(root)$(sysconfdir)/ssl.key
 	$(MKDIR) $(root)$(sysconfdir)/ssl.prm
-	$(MKDIR) $(root)$(htdocsdir)
+	$(MKDIR) $(root)$(htdocsdir)-dist
 	$(MKDIR) $(root)$(manualdir)
 	$(MKDIR) $(root)$(iconsdir)
-	$(MKDIR) $(root)$(cgidir)
+	$(MKDIR) $(root)$(cgidir)-dist
 	$(MKDIR) $(root)$(includedir)
 	$(MKDIR) $(root)$(includedir)/xml
 	$(MKDIR) $(root)$(runtimedir)
@@@@ -533,33 +533,29 @@@@
 #   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)/"; \
+		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)-dist/"; \
 		(cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - index* apache_pb.* ) |\
-		(cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \
-		find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
-		find $(root)$(htdocsdir)/ -type f -print | xargs chmod a+r ; \
-	fi
-	-@@if [ -d $(TOP)/htdocs/manual ]; then \
+		(cd $(root)$(htdocsdir)-dist/ && $(TAR) -xf -); \
+		find $(root)$(htdocsdir)-dist/ -type d -exec chmod a+rx {} \; ; \
+		find $(root)$(htdocsdir)-dist/ -type f -print | xargs chmod a+r ;
 		echo "Copying tree $(TOP)/htdocs/manual -> $(root)/$(manualdir)/"; \
 		(cd $(TOP)/htdocs/manual/ && $(TAR) $(TAROPT) - *) |\
 		(cd $(root)$(manualdir)/ && $(TAR) -xf -); \
 		find $(root)$(manualdir)/ -type d -exec chmod a+rx {} \; ; \
-		find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; \
+		find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ;
+	if [ ! -d $(root)$(htdocsdir)/ ]; then \
+		$(LN) -sf $(root)$(htdocsdir)-dist $(root)$(htdocsdir); \
 	fi
-	-@@if [ -f $(root)$(cgidir)/printenv ]; then \
-		echo "[PRESERVING EXISTING CGI 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}; \
-		done; \
-	fi
+			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)-dist/$${script}"; \
+			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)-dist/$${script}; \
+		done;
+	if [ ! -d $(root)$(cgidir)/ ]; then \
+		$(LN) -sf $(root)$(cgidir)-dist $(root)$(cgidir); \
+  	fi
 	@@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
 	(cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\
 	(cd $(root)$(iconsdir)/ && $(TAR) -xf -); \
@@@@ -607,10 +603,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);' \
@@@@ -623,8 +619,8 @@@@
 			-e 's;ServerName new.host.name;ServerName $(conf_servername);' \
 			-e 's;VirtualHost _default_:443;VirtualHost _default_:$(conf_port_ssl);' \
         	> $(TOP)/$(SRC)/.apaci.install.tmp && \
-		echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${target_conf}.default"; \
-		$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${target_conf}.default; \
+		echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${target_conf}-dist"; \
+		$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${target_conf}-dist; \
 		if [ ! -f "$(root)$(sysconfdir)/$${target_conf}" ]; then \
 			echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${target_conf}"; \
 			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${target_conf}; \
@@@@ -633,8 +629,8 @@@@
 		fi; \
 	done
 	-@@for conf in mime.types magic; do \
-		echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}.default"; \
-		$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}.default; \
+		echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}-dist"; \
+		$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}-dist; \
 		if [ ! -f "$(root)$(sysconfdir)/$${conf}" ]; then \
 			echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}"; \
 			$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}; \
@


1.4
log
@- Sync with www/apache13 a bit
- Fix clobbering ${PREFIX}/www on install and warnings coughing up
  on deinstall when ${PREFIX}/www is not empty
- Remove pkg-deinstall

PR:		ports/39645, ports/36804
Submitted by:	Charles Sprickman <freebsd@@fasttrackmonkey.com>,
		Peter C. Lai <sirmoo@@cowbert.2y.net>
@
text
@@


1.3
log
@Update to 1.3.23+2.8.6
@
text
@d1 3
a3 3
--- Makefile.tmpl.orig	Thu Feb  7 23:46:03 2002
+++ Makefile.tmpl	Thu Feb  7 23:47:53 2002
@@@@ -329,10 +329,12 @@@@
d8 1
a8 2
+	$(RM) -rf $(root)$(htdocsdir).default
+	$(MKDIR) $(root)$(htdocsdir).default
d12 1
a12 2
+	$(RM) -rf $(root)$(cgidir).default
+	$(MKDIR) $(root)$(cgidir).default
d16 1
a16 1
@@@@ -533,33 +535,40 @@@@
d24 1
a24 4
+#        -@@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).default/"; \
d31 3
a33 5
+		(cd $(root)$(htdocsdir).default/ && $(TAR) -xf -); \
+		find $(root)$(htdocsdir).default/ -type d -exec chmod a+rx {} \; ; \
+		find $(root)$(htdocsdir).default/ -type f -print | xargs chmod a+r ; \
+#        fi
+#        -@@if [ -d $(TOP)/htdocs/manual ]; then \
d38 2
a39 3
 		find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; \
+#        fi
+#	$(LN) -sf $(root)$(manualdir) $(root)$(htdocsdir).default/manual
d41 1
a41 1
+		$(LN) -sf $(root)$(htdocsdir).default $(root)$(htdocsdir); \
a45 3
+#        -@@if [ -f $(root)$(cgidir)/printenv ]; then \
+#                echo "[PRESERVING EXISTING CGI SUBDIR: $(root)$(cgidir)/]"; \
+#        else \
d52 1
a52 3
+			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir).default/$${script}"; \
+			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir).default/$${script}; \
 		done; \
d54 3
a56 1
+#        fi
d58 1
a58 1
+		$(LN) -sf $(root)$(cgidir).default $(root)$(cgidir); \
d63 1
a63 1
@@@@ -607,10 +616,10 @@@@
d78 22
@


1.2
log
@Merge from www/apache13:
  Don't put 'manual' link to the Apache manual.
@
text
@d1 2
a2 2
--- Makefile.tmpl.orig	Mon Oct 22 21:27:50 2001
+++ Makefile.tmpl	Mon Oct 22 21:30:58 2001
d18 1
a18 1
@@@@ -531,33 +533,40 @@@@
d74 1
a74 1
@@@@ -605,14 +614,14 @@@@
a88 5
-			-e 's;Group #-1;Group $(conf_group);' \
+			-e 's;Group "#-1";Group $(conf_group);' \
 			-e 's;Port 80;Port $(conf_port);' \
 			-e 's;Listen 80;Listen $(conf_port);' \
 			-e 's;Listen 443;Listen $(conf_port_ssl);' \
@


1.1
log
@Sync with main Apache port
@
text
@d47 1
a47 1
+	$(LN) -sf $(root)$(manualdir) $(root)$(htdocsdir).default/manual
@

