diff options
Diffstat (limited to 'www/apache2/patches/patch-af')
| -rw-r--r-- | www/apache2/patches/patch-af | 83 |
1 files changed, 51 insertions, 32 deletions
diff --git a/www/apache2/patches/patch-af b/www/apache2/patches/patch-af index 31fcb8850fd..b65883df195 100644 --- a/www/apache2/patches/patch-af +++ b/www/apache2/patches/patch-af @@ -1,33 +1,52 @@ -$NetBSD: patch-af,v 1.1.1.1 2002/03/05 23:24:07 jlam Exp $ +$NetBSD: patch-af,v 1.2 2002/03/05 23:56:24 jlam Exp $ ---- Makefile.in.orig Mon Oct 22 12:46:29 2001 -+++ Makefile.in Thu Jan 3 18:19:40 2002 -@@ -39,7 +39,7 @@ - ( \ - n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \ - if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" = "x"; then \ -- sed -e 's#@@ServerRoot@@#$(prefix)#g' \ -+ sed -e 's#@@ServerRoot@@#$(datadir)#g' \ - -e 's#@@Port@@#$(PORT)#g' \ - -e '/@@LoadModule@@/d' \ - < $$i; \ -@@ -67,7 +67,7 @@ - file=`echo $$file|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \ - fi; \ - if test "$$file" != "$$i" && test ! -f $(sysconfdir)/$$file; then \ -- $(INSTALL_DATA) $(sysconfdir)/$$i $(sysconfdir)/$$file; \ -+ : $(INSTALL_DATA) $(sysconfdir)/$$i $(sysconfdir)/$$file; \ - fi; \ - done - -@@ -95,8 +95,8 @@ - @echo Installing HTML documents - @test -d $(htdocsdir) || $(MKINSTALLDIRS) $(htdocsdir) - @test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(htdocsdir)) -- @test -d $(prefix)/manual || $(MKINSTALLDIRS) $(prefix)/manual -- @test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(prefix)/manual) -+ @test -d $(manualdir) || $(MKINSTALLDIRS) $(manualdir) -+ @test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(manualdir)) - @(cd $(htdocsdir) && find . -name "CVS" -print | xargs rm -rf {} \;) - - install-error: +--- configure.orig Thu Feb 14 03:15:01 2002 ++++ configure +@@ -10890,6 +10890,10 @@ + + + ++ APACHE_VAR_SUBST="$APACHE_VAR_SUBST runtimedir" ++ ++ ++ + APACHE_VAR_SUBST="$APACHE_VAR_SUBST other_targets" + + +@@ -11095,10 +11099,6 @@ + EOF + + cat >> confdefs.h <<EOF +-#define SERVER_CONFIG_FILE "conf/$progname.conf" +-EOF +- +-cat >> confdefs.h <<EOF + #define APACHE_MPM_DIR "$MPM_DIR" + EOF + +@@ -11223,7 +11223,7 @@ + ac_given_srcdir=$srcdir + ac_given_INSTALL="$INSTALL" + +-trap 'rm -fr `echo "$APACHE_OUTPUT_FILES support/apxs support/apachectl support/dbmmanage support/envvars-std support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk include/ap_config_auto.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 ++trap 'rm -fr `echo "$APACHE_OUTPUT_FILES support/apxs.pl support/apachectl.sh support/dbmmanage.pl support/envvars-std support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk include/ap_config_auto.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 + EOF + cat >> $CONFIG_STATUS <<EOF + +@@ -11317,6 +11317,7 @@ + s%@errordir@%$errordir%g + s%@iconsdir@%$iconsdir%g + s%@installbuilddir@%$installbuilddir%g ++s%@runtimedir@%$runtimedir%g + s%@other_targets@%$other_targets%g + s%@CXX@%$CXX%g + s%@LTFLAGS@%$LTFLAGS%g +@@ -11383,7 +11384,7 @@ + + cat >> $CONFIG_STATUS <<EOF + +-CONFIG_FILES=\${CONFIG_FILES-"$APACHE_OUTPUT_FILES support/apxs support/apachectl support/dbmmanage support/envvars-std support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk"} ++CONFIG_FILES=\${CONFIG_FILES-"$APACHE_OUTPUT_FILES support/apxs.pl support/apachectl.sh support/dbmmanage.pl support/envvars-std support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk"} + EOF + cat >> $CONFIG_STATUS <<\EOF + for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then |