diff options
Diffstat (limited to 'www/apache22/files')
| -rw-r--r-- | www/apache22/files/apache.sh | 54 | ||||
| -rw-r--r-- | www/apache22/files/patch-Makefile.in | 92 | ||||
| -rw-r--r-- | www/apache22/files/patch-config.layout | 17 |
3 files changed, 46 insertions, 117 deletions
diff --git a/www/apache22/files/apache.sh b/www/apache22/files/apache.sh index f305bf576143..cfaeddd59624 100644 --- a/www/apache22/files/apache.sh +++ b/www/apache22/files/apache.sh @@ -1,66 +1,66 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/www/apache22/files/Attic/apache.sh,v 1.8 2005-01-11 13:45:05 clement Exp $ +# $FreeBSD: /tmp/pcvs/ports/www/apache22/files/Attic/apache.sh,v 1.9 2005-12-03 22:02:58 clement Exp $ # -# PROVIDE: apache21 +# PROVIDE: apache22 # REQUIRE: NETWORKING SERVERS # BEFORE: DAEMON # KEYWORD: FreeBSD shutdown # -# Add the following lines to /etc/rc.conf to enable apache21: -# apache21_enable (bool): Set to "NO" by default. -# Set it to "YES" to enable apache21 -# apache21ssl_enable (bool): Set to "NO" by default. +# Add the following lines to /etc/rc.conf to enable apache22: +# apache22_enable (bool): Set to "NO" by default. +# Set it to "YES" to enable apache22 +# apache22ssl_enable (bool): Set to "NO" by default. # Set it to "YES" to start apache with SSL # (if <IfDefined SSL> exists in httpd.conf) -# apache21limits_enable (bool):Set to "NO" by default. +# apache22limits_enable (bool):Set to "NO" by default. # Set it to yes to run `limits $limits_args` # just before apache starts. -# apache21_flags (str): Set to "" by default. +# apache22_flags (str): Set to "" by default. # Extra flags passed to start command. -# apache21limits_args (str): Default to "-e -C daemon" +# apache22limits_args (str): Default to "-e -C daemon" # Arguments of pre-start limits run. # . %%RC_SUBR%% -name="apache21" +name="apache22" rcvar=`set_rcvar` -start_precmd="apache21_precmd" -restart_precmd="apache21_checkconfig" -reload_precmd="apache21_checkconfig" +start_precmd="apache22_precmd" +restart_precmd="apache22_checkconfig" +reload_precmd="apache22_checkconfig" command="%%PREFIX%%/sbin/httpd" pidfile="/var/run/httpd.pid" -required_files=%%PREFIX%%/etc/apache21/httpd.conf +required_files=%%PREFIX%%/etc/apache22/httpd.conf -[ -z "$apache21_enable" ] && apache21_enable="NO" -[ -z "$apache21ssl_enable" ] && apache21ssl_enable="NO" -[ -z "$apache21_flags" ] && apache21_flags="" -[ -z "$apache21limits_enable" ] && apache21limits_enable="NO" -[ -z "$apache21limits_args" ] && apache21limits_args="-e -C daemon" +[ -z "$apache22_enable" ] && apache22_enable="NO" +[ -z "$apache22ssl_enable" ] && apache22ssl_enable="NO" +[ -z "$apache22_flags" ] && apache22_flags="" +[ -z "$apache22limits_enable" ] && apache22limits_enable="NO" +[ -z "$apache22limits_args" ] && apache22limits_args="-e -C daemon" load_rc_config $name -checkyesno apache21ssl_enable && \ - apache21_flags="-DSSL $apache21_flags" +checkyesno apache22ssl_enable && \ + apache22_flags="-DSSL $apache22_flags" -apache21_checkconfig() +apache22_checkconfig() { - echo "Performing sanity check on apache21 configuration:" - ${command} ${apache21_flags} -t + echo "Performing sanity check on apache22 configuration:" + ${command} ${apache22_flags} -t } -apache21_precmd() +apache22_precmd() { if test -f %%PREFIX%%/sbin/envvars then . %%PREFIX%%/sbin/envvars fi - if checkyesno apache21limits_enable + if checkyesno apache22limits_enable then - eval `/usr/bin/limits ${apache21limits_args}` 2>/dev/null + eval `/usr/bin/limits ${apache22limits_args}` 2>/dev/null else return 0 fi diff --git a/www/apache22/files/patch-Makefile.in b/www/apache22/files/patch-Makefile.in index 9ca0cfb52183..9950f566999e 100644 --- a/www/apache22/files/patch-Makefile.in +++ b/www/apache22/files/patch-Makefile.in @@ -1,5 +1,5 @@ ---- Makefile.in.orig Sun Sep 25 23:07:27 2005 -+++ Makefile.in Sun Oct 30 19:31:59 2005 +--- Makefile.in.orig Sun Nov 13 06:33:15 2005 ++++ Makefile.in Sat Dec 3 22:10:42 2005 @@ -31,9 +31,11 @@ install-conf: @echo Installing configuration files @@ -31,89 +31,17 @@ fi; \ fi; \ done ; \ -@@ -117,44 +119,40 @@ - doxygen $(top_srcdir)/docs/doxygen.conf - - install-htdocs: -- -@if [ -d $(DESTDIR)$(htdocsdir) ]; then \ -- echo "[PRESERVING EXISTING HTDOCS SUBDIR: $(DESTDIR)$(htdocsdir)]"; \ -- else \ -- echo Installing HTML documents ; \ -- $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir) ; \ -- test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) ; \ -- cd $(DESTDIR)$(htdocsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \ -- fi -+.if !defined(NO_WWWDATA) -+ @echo Installing HTML documents -+ @test -d $(DESTDIR)$(htdocsdir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir)-dist -+ @test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR) $(htdocsdir)-dist) -+ @test -e $(DESTDIR)$(htdocsdir) || ln -sf $(DESTDIR)$(htdocsdir)-dist $(DESTDIR)$(htdocsdir) -+ -@test "x$(htdocsdir)" != "x" && cd $(DESTDIR)$(htdocsdir)-dist && find . -name "CVS" -print | xargs rm -rf -+.endif - - install-error: -- -@if [ -d $(DESTDIR)$(errordir) ]; then \ -- echo "[PRESERVING EXISTING ERROR SUBDIR: $(DESTDIR)$(errordir)]"; \ -- else \ -- echo Installing error documents ; \ -- $(MKINSTALLDIRS) $(DESTDIR)$(errordir) ; \ -- cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir) ; \ -- test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \ -- fi -+.if !defined(NO_ERROR) -+ @echo Installing error documents -+ @test -d $(DESTDIR)$(errordir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(errordir)-dist -+ cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir)-dist -+ -@test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir)-dist && find . -name "CVS" -print | xargs rm -rf -+ @test -e $(DESTDIR)$(errordir) || ln -sf $(DESTDIR)$(errordir)-dist $(DESTDIR)$(errordir) -+.endif - - install-icons: -- -@if [ -d $(DESTDIR)$(iconsdir) ]; then \ -- echo "[PRESERVING EXISTING ICONS SUBDIR: $(DESTDIR)$(iconsdir)]"; \ -- else \ -- echo Installing icons ; \ -- $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir) ; \ -- cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir) ; \ -- test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \ -- fi -+.if !defined(NO_ICONS) -+ @echo Installing icons -+ @test -d $(DESTDIR)$(iconsdir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir)-dist -+ cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir)-dist -+ -@test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir)-dist && find . -name "CVS" -print | xargs rm -rf -+ @test -e $(DESTDIR)$(iconsdir) || ln -sf $(DESTDIR)$(iconsdir)-dist $(DESTDIR)$(iconsdir) -+.endif - - install-cgi: -- -@if [ -d $(DESTDIR)$(cgidir) ];then \ -- echo "[PRESERVING EXISTING CGI SUBDIR: $(DESTDIR)$(cgidir)]"; \ -- else \ -- echo Installing CGIs ; \ -- $(MKINSTALLDIRS) $(DESTDIR)$(cgidir) ; \ -- cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir) ; \ -- test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \ -- fi -+.if !defined(NO_CGI) -+ @echo Installing CGIs -+ @test -d $(DESTDIR)$(cgidir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(cgidir)-dist -+ cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir)-dist -+ -@test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir)-dist && find . -name "CVS" -print | xargs rm -rf -+ @test -e $(DESTDIR)$(cgidir) || ln -sf $(DESTDIR)$(cgidir)-dist $(DESTDIR)$(cgidir) -+.endif - - install-other: - @test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir) -@@ -198,11 +196,13 @@ - @test -d $(DESTDIR)$(mandir) || $(MKINSTALLDIRS) $(DESTDIR)$(mandir) - @test -d $(DESTDIR)$(mandir)/man1 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1 - @test -d $(DESTDIR)$(mandir)/man8 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man8 -+.if !defined(NOPORTDOCS) +@@ -206,12 +208,14 @@ @test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir) @cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1 @cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8 - @(cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir)) - @(cd $(DESTDIR)$(manualdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null ) || true ++.if !defined(NOPORTDOCS) + @if test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \ + $(RSYNC) --exclude .svn -rlpt --numeric-ids $(top_srcdir)/docs/manual/ $(DESTDIR)$(manualdir)/; \ + else \ + cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir); \ + cd $(DESTDIR)$(manualdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null; \ + fi +.endif install-suexec: diff --git a/www/apache22/files/patch-config.layout b/www/apache22/files/patch-config.layout index 3724aa43c9a4..eeba5df21b36 100644 --- a/www/apache22/files/patch-config.layout +++ b/www/apache22/files/patch-config.layout @@ -1,25 +1,26 @@ ---- config.layout.orig Sun Nov 21 19:50:36 2004 -+++ config.layout Sat Dec 11 17:56:14 2004 +--- config.layout.orig Sun Nov 21 18:50:36 2004 ++++ config.layout Sat Dec 3 22:07:46 2005 @@ -281,17 +281,17 @@ bindir: ${exec_prefix}/bin sbindir: ${exec_prefix}/sbin libdir: ${exec_prefix}/lib - libexecdir: ${exec_prefix}/libexec/apache2 -+ libexecdir: ${exec_prefix}/libexec/apache21 ++ libexecdir: ${exec_prefix}/libexec/apache22 mandir: ${prefix}/man - sysconfdir: ${prefix}/etc/apache2 -+ sysconfdir: ${prefix}/etc/apache21 - datadir: ${prefix}/www +- datadir: ${prefix}/www - installbuilddir: ${prefix}/share/apache2/build -+ installbuilddir: ${prefix}/share/apache21/build ++ sysconfdir: ${prefix}/etc/apache22 ++ datadir: ${prefix}/www/apache22 ++ installbuilddir: ${prefix}/share/apache22/build errordir: ${datadir}/error iconsdir: ${datadir}/icons htdocsdir: ${datadir}/data - manualdir: ${prefix}/share/doc/apache2 -+ manualdir: ${prefix}/share/doc/apache21 ++ manualdir: ${prefix}/share/doc/apache22 cgidir: ${datadir}/cgi-bin - includedir: ${prefix}/include/apache2 -+ includedir: ${prefix}/include/apache21 ++ includedir: ${prefix}/include/apache22 localstatedir: /var runtimedir: ${localstatedir}/run logfiledir: ${localstatedir}/log |