head	1.5;
access;
symbols
	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_4_0:1.1
	RELEASE_4_3_0:1.1
	RELEASE_4_2_0:1.1;
locks; strict;
comment	@# @;


1.5
date	2007.09.16.20.05.49;	author dinoex;	state dead;
branches;
next	1.4;

1.4
date	2002.12.08.01.52.23;	author kris;	state Exp;
branches;
next	1.3;

1.3
date	2001.10.22.17.43.30;	author ache;	state dead;
branches;
next	1.2;

1.2
date	2001.10.22.15.38.49;	author rse;	state Exp;
branches;
next	1.1;

1.1
date	2000.11.15.16.10.38;	author ade;	state Exp;
branches;
next	;


desc
@@


1.5
log
@- update to 2.8.28-1.3.37
- merge Configure patches
@
text
@--- src/Configure.orig	Sat Dec  7 17:30:28 2002
+++ src/Configure	Sat Dec  7 17:29:43 2002
@@@@ -1112,7 +1112,7 @@@@
 	    ;;
 	*-freebsd[3-9]*)
 		LD_SHLIB="gcc"
-	    CFLAGS_SHLIB="-fpic"
+	    CFLAGS_SHLIB="-fPIC"
 	    LDFLAGS_SHLIB="-shared"
 	    LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB
 	    OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` 
@


1.4
log
@Fix build on sparc64 (-fpic -> -fPIC)
@
text
@@


1.3
log
@Sync with main Apache port
@
text
@d1 11
a11 87
--- Makefile.tmpl.orig	Thu Oct 18 14:14:44 2001
+++ Makefile.tmpl	Thu Oct 18 14:18:07 2001
@@@@ -127,6 +127,7 @@@@
 runtimedir      = @@runtimedir@@
 logfiledir      = @@logfiledir@@
 proxycachedir   = @@proxycachedir@@
+doc_prefix	= $(prefix)/share/doc/apache
 
 libexecdir_relative   = @@libexecdir_relative@@
 
@@@@ -329,10 +330,10 @@@@
 	$(MKDIR) $(root)$(sysconfdir)/ssl.csr
 	$(MKDIR) $(root)$(sysconfdir)/ssl.key
 	$(MKDIR) $(root)$(sysconfdir)/ssl.prm
-	$(MKDIR) $(root)$(htdocsdir)
+	$(MKDIR) $(root)$(doc_prefix)
 	$(MKDIR) $(root)$(manualdir)
 	$(MKDIR) $(root)$(iconsdir)
-	$(MKDIR) $(root)$(cgidir)
+	$(MKDIR) $(root)$(cgidir).default
 	$(MKDIR) $(root)$(includedir)
 	$(MKDIR) $(root)$(includedir)/xml
 	$(MKDIR) $(root)$(runtimedir)
@@@@ -531,14 +532,17 @@@@
 #   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 \
+#	-@@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)/"; \
 		(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 ; \
+		(cd $(root)$(doc_prefix)/ && $(TAR) -xf -); \
+		find $(root)$(doc_prefix)/ -type d -exec chmod a+rx {} \; ; \
+		find $(root)$(doc_prefix)/ -type f -print | xargs chmod a+r ; \
+#	fi
+	if [ ! -d $(root)$(htdocsdir) ]; then \
+		$(LN) -sf $(root)$(doc_prefix) $(root)$(htdocsdir); \
 	fi
 	-@@if [ -d $(TOP)/htdocs/manual ]; then \
 		echo "Copying tree $(TOP)/htdocs/manual -> $(root)/$(manualdir)/"; \
@@@@ -547,16 +551,19 @@@@
 		find $(root)$(manualdir)/ -type d -exec chmod a+rx {} \; ; \
 		find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; \
 	fi
-	-@@if [ -f $(root)$(cgidir)/printenv ]; then \
-		echo "[PRESERVING EXISTING CGI SUBDIR: $(root)$(cgidir)/]"; \
-	else \
+#	-@@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}; \
+			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) - *) |\
@@@@ -605,10 +612,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.2
log
@Upgrade to Apache 1.3.22 + mod_ssl 2.8.5

Submitted by: Masahiro TAKEMURA <mastake@@msel.t.u-tokyo.ac.jp>
@
text
@@


1.1
log
@Gently persuade apache13-modssl to install in the same filesystem
space as www/apache13 does, so that other apache-dependendent ports
DTRT regardless of which one is installed.

Nothing concrete (other than we're working on a real cleanup of the
apache ports) has been heard from any of the maintainers.  Obviously
that is the best solution, but with 4.2-RELEASE just around the
corner, we have an opportunity here to at least remove a few bogons.

Both times I've raised this issue on -ports, however, there has been
significant interest in the patches, and now plenty of confirmations
that the modifications do not break the port in other ways.
@
text
@d1 5
a5 3
--- Makefile.tmpl.orig	Thu Oct 19 11:30:46 2000
+++ Makefile.tmpl	Thu Oct 19 11:43:48 2000
@@@@ -125,2 +125,3 @@@@
d9 5
a13 1
@@@@ -327,5 +328,5 @@@@
d17 1
d22 5
a26 1
@@@@ -528,14 +529,18 @@@@
d35 1
a35 1
 		(cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - *) |\
d38 1
a38 5
-		find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \
-	fi
-	-@@if [ -f $(root)$(cgidir)/printenv ]; then \
-		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
-	else \
d41 1
a41 1
+		find $(root)$(doc_prefix)/ -type f -exec chmod a+r {} \; ; \
d45 10
a54 2
+	fi
+	$(LN) -s $(root)$(doc_prefix) $(root)$(htdocsdir).default
d56 1
a56 1
+#		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
d59 2
a60 1
@@@@ -544,5 +549,8 @@@@
d71 5
a75 1
@@@@ -594,6 +602,6 @@@@
d86 2
@

