diff options
author | Andrey A. Chernov <ache@FreeBSD.org> | 1998-09-24 01:06:28 +0000 |
---|---|---|
committer | Andrey A. Chernov <ache@FreeBSD.org> | 1998-09-24 01:06:28 +0000 |
commit | ac5616e6767eae958824f49bb1d650dde4f61d76 (patch) | |
tree | d90b4bc4d127cdccf334a4b55f245cc74c533db2 /www | |
parent | Change guileobjc's directory. (diff) |
upgrade to 1.3.2
Notes
Notes:
svn path=/head/; revision=13373
Diffstat (limited to 'www')
-rw-r--r-- | www/apache13/Makefile | 10 | ||||
-rw-r--r-- | www/apache13/distinfo | 2 | ||||
-rw-r--r-- | www/apache13/files/patch-aa | 12 | ||||
-rw-r--r-- | www/apache13/files/patch-ab | 48 | ||||
-rw-r--r-- | www/apache13/pkg-plist | 2 | ||||
-rw-r--r-- | www/apache2/Makefile | 10 | ||||
-rw-r--r-- | www/apache2/distinfo | 2 | ||||
-rw-r--r-- | www/apache2/files/patch-aa | 12 | ||||
-rw-r--r-- | www/apache2/files/patch-ab | 48 | ||||
-rw-r--r-- | www/apache2/pkg-plist | 2 | ||||
-rw-r--r-- | www/apache20/Makefile | 10 | ||||
-rw-r--r-- | www/apache20/distinfo | 2 | ||||
-rw-r--r-- | www/apache20/files/patch-aa | 12 | ||||
-rw-r--r-- | www/apache20/files/patch-ab | 48 | ||||
-rw-r--r-- | www/apache20/pkg-plist | 2 | ||||
-rw-r--r-- | www/apache21/Makefile | 10 | ||||
-rw-r--r-- | www/apache21/distinfo | 2 | ||||
-rw-r--r-- | www/apache21/files/patch-aa | 12 | ||||
-rw-r--r-- | www/apache21/files/patch-ab | 48 | ||||
-rw-r--r-- | www/apache21/pkg-plist | 2 | ||||
-rw-r--r-- | www/apache22/Makefile | 10 | ||||
-rw-r--r-- | www/apache22/distinfo | 2 | ||||
-rw-r--r-- | www/apache22/files/patch-aa | 12 | ||||
-rw-r--r-- | www/apache22/files/patch-ab | 48 | ||||
-rw-r--r-- | www/apache22/pkg-plist | 2 |
25 files changed, 195 insertions, 175 deletions
diff --git a/www/apache13/Makefile b/www/apache13/Makefile index d63c05b48052..197c3e1a761d 100644 --- a/www/apache13/Makefile +++ b/www/apache13/Makefile @@ -3,15 +3,15 @@ # Date created: Fri Aug 25 16:42:36 CDT 1995 # Whom: ache@nagual.pp.ru # -# $Id: Makefile,v 1.59 1998/07/23 13:15:57 ache Exp $ +# $Id: Makefile,v 1.60 1998/09/20 23:55:38 ache Exp $ # -DISTNAME= apache_1.3.1 -PKGNAME= apache-1.3.1 +DISTNAME= apache_1.3.2 +PKGNAME= apache-1.3.2 CATEGORIES= www MASTER_SITES= ftp://www.apache.org/apache/dist/ -#PATCH_SITES= ftp://www.apache.org/apache/dist/patches/apply_to_1.3.1/ +#PATCH_SITES= ftp://www.apache.org/apache/dist/patches/apply_to_1.3.2/ MAINTAINER= ache@freebsd.org @@ -28,6 +28,7 @@ CONFIGURE_ARGS= \ --datadir=${PREFIX}/www \ --proxycachedir=${PREFIX}/www/proxy \ --libexecdir=${PREFIX}/libexec/apache \ + --with-perl=${PERL5} \ --without-confadjust \ --enable-shared=remain \ --enable-module=most \ @@ -39,7 +40,6 @@ OPTIM=-DHARD_SERVER_LIMIT=512 \ -DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\" .if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES -CONFIGURE_ARGS+= --disable-rule=STATUS OPTIM+= -DBUFFERED_LOGS CFLAGS+= -O6 -fomit-frame-pointer .endif diff --git a/www/apache13/distinfo b/www/apache13/distinfo index 66c4b7a0722c..fbf77f6084be 100644 --- a/www/apache13/distinfo +++ b/www/apache13/distinfo @@ -1 +1 @@ -MD5 (apache_1.3.1.tar.gz) = fd28c26f94451216a23f34f5fe22e2b4 +MD5 (apache_1.3.2.tar.gz) = a86e38366bcd9797400818ae6eb1400f diff --git a/www/apache13/files/patch-aa b/www/apache13/files/patch-aa index 21ea6449f6ca..95661a056d8d 100644 --- a/www/apache13/files/patch-aa +++ b/www/apache13/files/patch-aa @@ -1,7 +1,7 @@ -*** configure.bak Sun Jul 12 13:25:46 1998 ---- configure Thu Jul 23 16:52:04 1998 +*** configure.orig Thu Sep 17 12:07:53 1998 +--- configure Thu Sep 24 03:57:33 1998 *************** -*** 877,884 **** +*** 870,877 **** echo " DEFAULT_PIDLOG: ${runtimedir_relative}httpd.pid" echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}httpd.scoreboard" echo " DEFAULT_LOCKFILE: ${runtimedir_relative}httpd.lock" @@ -10,7 +10,7 @@ echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types" echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}httpd.conf" echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf" ---- 877,884 ---- +--- 870,877 ---- echo " DEFAULT_PIDLOG: ${runtimedir_relative}httpd.pid" echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}httpd.scoreboard" echo " DEFAULT_LOCKFILE: ${runtimedir_relative}httpd.lock" @@ -20,7 +20,7 @@ echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}httpd.conf" echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf" *************** -*** 942,949 **** +*** 935,942 **** echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}httpd.pid\"'" >>$src/apaci echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}httpd.scoreboard\"'" >>$src/apaci echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}httpd.lock\"'" >>$src/apaci @@ -29,7 +29,7 @@ echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}httpd.conf\"'" >>$src/apaci echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci ---- 942,949 ---- +--- 935,942 ---- echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}httpd.pid\"'" >>$src/apaci echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}httpd.scoreboard\"'" >>$src/apaci echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}httpd.lock\"'" >>$src/apaci diff --git a/www/apache13/files/patch-ab b/www/apache13/files/patch-ab index de82b962be4a..50e0de52fc30 100644 --- a/www/apache13/files/patch-ab +++ b/www/apache13/files/patch-ab @@ -1,5 +1,5 @@ -*** Makefile.tmpl.orig Wed Jul 15 21:03:25 1998 ---- Makefile.tmpl Thu Jul 23 16:14:15 1998 +*** Makefile.tmpl.orig Sat Sep 19 16:41:48 1998 +--- Makefile.tmpl Thu Sep 24 04:07:49 1998 *************** *** 107,112 **** --- 107,113 ---- @@ -49,7 +49,7 @@ $(MKDIR) $(root)$(runtimedir) $(MKDIR) $(root)$(logfiledir) *************** -*** 338,360 **** +*** 340,365 **** # icons and distributed CGI scripts. install-data: @echo "===> [data: Installing initial data files]" @@ -65,15 +65,18 @@ ! -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \ ! echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \ ! else \ -! 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 + 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 - *) |\ ---- 339,368 ---- + (cd $(root)$(datadir)/icons/ && $(TAR) xf -); \ +--- 341,373 ---- # icons and distributed CGI scripts. install-data: @echo "===> [data: Installing initial data files]" @@ -93,38 +96,39 @@ ! # -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \ ! # echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \ ! # else \ -! 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 {} \; ; \ + 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 +! fi @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \ (cd $(TOP)/icons/ && $(TAR) cf - *) |\ + (cd $(root)$(datadir)/icons/ && $(TAR) xf -); \ *************** -*** 374,381 **** +*** 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@@/htdocs;$(datadir)/htdocs;' \ -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \ -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \ -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \ ---- 382,389 ---- +--- 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@@/htdocs;$(datadir)/data;' \ -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \ -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \ -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \ *************** -*** 383,392 **** +*** 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;' \ @@ -135,7 +139,7 @@ -e 's;conf/magic;$(sysconfdir)/magic;' \ -e 's;conf/mime.types;$(sysconfdir)/mime.types;' \ -e 's;Group #-1;Group $(conf_group);' \ ---- 391,400 ---- +--- 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;' \ diff --git a/www/apache13/pkg-plist b/www/apache13/pkg-plist index 82e5c12f4baa..3579a0e937ce 100644 --- a/www/apache13/pkg-plist +++ b/www/apache13/pkg-plist @@ -14,6 +14,7 @@ include/apache/ap_config.h include/apache/ap_config_auto.h include/apache/ap_ctype.h include/apache/ap_md5.h +include/apache/ap_mmn.h include/apache/buff.h include/apache/compat.h include/apache/conf.h @@ -48,7 +49,6 @@ libexec/apache/mod_info.so libexec/apache/mod_mime_magic.so libexec/apache/mod_rewrite.so libexec/apache/mod_speling.so -libexec/apache/mod_status.so libexec/apache/mod_unique_id.so libexec/apache/mod_usertrack.so sbin/ab diff --git a/www/apache2/Makefile b/www/apache2/Makefile index d63c05b48052..197c3e1a761d 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -3,15 +3,15 @@ # Date created: Fri Aug 25 16:42:36 CDT 1995 # Whom: ache@nagual.pp.ru # -# $Id: Makefile,v 1.59 1998/07/23 13:15:57 ache Exp $ +# $Id: Makefile,v 1.60 1998/09/20 23:55:38 ache Exp $ # -DISTNAME= apache_1.3.1 -PKGNAME= apache-1.3.1 +DISTNAME= apache_1.3.2 +PKGNAME= apache-1.3.2 CATEGORIES= www MASTER_SITES= ftp://www.apache.org/apache/dist/ -#PATCH_SITES= ftp://www.apache.org/apache/dist/patches/apply_to_1.3.1/ +#PATCH_SITES= ftp://www.apache.org/apache/dist/patches/apply_to_1.3.2/ MAINTAINER= ache@freebsd.org @@ -28,6 +28,7 @@ CONFIGURE_ARGS= \ --datadir=${PREFIX}/www \ --proxycachedir=${PREFIX}/www/proxy \ --libexecdir=${PREFIX}/libexec/apache \ + --with-perl=${PERL5} \ --without-confadjust \ --enable-shared=remain \ --enable-module=most \ @@ -39,7 +40,6 @@ OPTIM=-DHARD_SERVER_LIMIT=512 \ -DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\" .if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES -CONFIGURE_ARGS+= --disable-rule=STATUS OPTIM+= -DBUFFERED_LOGS CFLAGS+= -O6 -fomit-frame-pointer .endif diff --git a/www/apache2/distinfo b/www/apache2/distinfo index 66c4b7a0722c..fbf77f6084be 100644 --- a/www/apache2/distinfo +++ b/www/apache2/distinfo @@ -1 +1 @@ -MD5 (apache_1.3.1.tar.gz) = fd28c26f94451216a23f34f5fe22e2b4 +MD5 (apache_1.3.2.tar.gz) = a86e38366bcd9797400818ae6eb1400f diff --git a/www/apache2/files/patch-aa b/www/apache2/files/patch-aa index 21ea6449f6ca..95661a056d8d 100644 --- a/www/apache2/files/patch-aa +++ b/www/apache2/files/patch-aa @@ -1,7 +1,7 @@ -*** configure.bak Sun Jul 12 13:25:46 1998 ---- configure Thu Jul 23 16:52:04 1998 +*** configure.orig Thu Sep 17 12:07:53 1998 +--- configure Thu Sep 24 03:57:33 1998 *************** -*** 877,884 **** +*** 870,877 **** echo " DEFAULT_PIDLOG: ${runtimedir_relative}httpd.pid" echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}httpd.scoreboard" echo " DEFAULT_LOCKFILE: ${runtimedir_relative}httpd.lock" @@ -10,7 +10,7 @@ echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types" echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}httpd.conf" echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf" ---- 877,884 ---- +--- 870,877 ---- echo " DEFAULT_PIDLOG: ${runtimedir_relative}httpd.pid" echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}httpd.scoreboard" echo " DEFAULT_LOCKFILE: ${runtimedir_relative}httpd.lock" @@ -20,7 +20,7 @@ echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}httpd.conf" echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf" *************** -*** 942,949 **** +*** 935,942 **** echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}httpd.pid\"'" >>$src/apaci echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}httpd.scoreboard\"'" >>$src/apaci echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}httpd.lock\"'" >>$src/apaci @@ -29,7 +29,7 @@ echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}httpd.conf\"'" >>$src/apaci echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci ---- 942,949 ---- +--- 935,942 ---- echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}httpd.pid\"'" >>$src/apaci echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}httpd.scoreboard\"'" >>$src/apaci echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}httpd.lock\"'" >>$src/apaci diff --git a/www/apache2/files/patch-ab b/www/apache2/files/patch-ab index de82b962be4a..50e0de52fc30 100644 --- a/www/apache2/files/patch-ab +++ b/www/apache2/files/patch-ab @@ -1,5 +1,5 @@ -*** Makefile.tmpl.orig Wed Jul 15 21:03:25 1998 ---- Makefile.tmpl Thu Jul 23 16:14:15 1998 +*** Makefile.tmpl.orig Sat Sep 19 16:41:48 1998 +--- Makefile.tmpl Thu Sep 24 04:07:49 1998 *************** *** 107,112 **** --- 107,113 ---- @@ -49,7 +49,7 @@ $(MKDIR) $(root)$(runtimedir) $(MKDIR) $(root)$(logfiledir) *************** -*** 338,360 **** +*** 340,365 **** # icons and distributed CGI scripts. install-data: @echo "===> [data: Installing initial data files]" @@ -65,15 +65,18 @@ ! -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \ ! echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \ ! else \ -! 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 + 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 - *) |\ ---- 339,368 ---- + (cd $(root)$(datadir)/icons/ && $(TAR) xf -); \ +--- 341,373 ---- # icons and distributed CGI scripts. install-data: @echo "===> [data: Installing initial data files]" @@ -93,38 +96,39 @@ ! # -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \ ! # echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \ ! # else \ -! 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 {} \; ; \ + 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 +! fi @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \ (cd $(TOP)/icons/ && $(TAR) cf - *) |\ + (cd $(root)$(datadir)/icons/ && $(TAR) xf -); \ *************** -*** 374,381 **** +*** 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@@/htdocs;$(datadir)/htdocs;' \ -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \ -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \ -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \ ---- 382,389 ---- +--- 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@@/htdocs;$(datadir)/data;' \ -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \ -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \ -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \ *************** -*** 383,392 **** +*** 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;' \ @@ -135,7 +139,7 @@ -e 's;conf/magic;$(sysconfdir)/magic;' \ -e 's;conf/mime.types;$(sysconfdir)/mime.types;' \ -e 's;Group #-1;Group $(conf_group);' \ ---- 391,400 ---- +--- 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;' \ diff --git a/www/apache2/pkg-plist b/www/apache2/pkg-plist index 82e5c12f4baa..3579a0e937ce 100644 --- a/www/apache2/pkg-plist +++ b/www/apache2/pkg-plist @@ -14,6 +14,7 @@ include/apache/ap_config.h include/apache/ap_config_auto.h include/apache/ap_ctype.h include/apache/ap_md5.h +include/apache/ap_mmn.h include/apache/buff.h include/apache/compat.h include/apache/conf.h @@ -48,7 +49,6 @@ libexec/apache/mod_info.so libexec/apache/mod_mime_magic.so libexec/apache/mod_rewrite.so libexec/apache/mod_speling.so -libexec/apache/mod_status.so libexec/apache/mod_unique_id.so libexec/apache/mod_usertrack.so sbin/ab diff --git a/www/apache20/Makefile b/www/apache20/Makefile index d63c05b48052..197c3e1a761d 100644 --- a/www/apache20/Makefile +++ b/www/apache20/Makefile @@ -3,15 +3,15 @@ # Date created: Fri Aug 25 16:42:36 CDT 1995 # Whom: ache@nagual.pp.ru # -# $Id: Makefile,v 1.59 1998/07/23 13:15:57 ache Exp $ +# $Id: Makefile,v 1.60 1998/09/20 23:55:38 ache Exp $ # -DISTNAME= apache_1.3.1 -PKGNAME= apache-1.3.1 +DISTNAME= apache_1.3.2 +PKGNAME= apache-1.3.2 CATEGORIES= www MASTER_SITES= ftp://www.apache.org/apache/dist/ -#PATCH_SITES= ftp://www.apache.org/apache/dist/patches/apply_to_1.3.1/ +#PATCH_SITES= ftp://www.apache.org/apache/dist/patches/apply_to_1.3.2/ MAINTAINER= ache@freebsd.org @@ -28,6 +28,7 @@ CONFIGURE_ARGS= \ --datadir=${PREFIX}/www \ --proxycachedir=${PREFIX}/www/proxy \ --libexecdir=${PREFIX}/libexec/apache \ + --with-perl=${PERL5} \ --without-confadjust \ --enable-shared=remain \ --enable-module=most \ @@ -39,7 +40,6 @@ OPTIM=-DHARD_SERVER_LIMIT=512 \ -DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\" .if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES -CONFIGURE_ARGS+= --disable-rule=STATUS OPTIM+= -DBUFFERED_LOGS CFLAGS+= -O6 -fomit-frame-pointer .endif diff --git a/www/apache20/distinfo b/www/apache20/distinfo index 66c4b7a0722c..fbf77f6084be 100644 --- a/www/apache20/distinfo +++ b/www/apache20/distinfo @@ -1 +1 @@ -MD5 (apache_1.3.1.tar.gz) = fd28c26f94451216a23f34f5fe22e2b4 +MD5 (apache_1.3.2.tar.gz) = a86e38366bcd9797400818ae6eb1400f diff --git a/www/apache20/files/patch-aa b/www/apache20/files/patch-aa index 21ea6449f6ca..95661a056d8d 100644 --- a/www/apache20/files/patch-aa +++ b/www/apache20/files/patch-aa @@ -1,7 +1,7 @@ -*** configure.bak Sun Jul 12 13:25:46 1998 ---- configure Thu Jul 23 16:52:04 1998 +*** configure.orig Thu Sep 17 12:07:53 1998 +--- configure Thu Sep 24 03:57:33 1998 *************** -*** 877,884 **** +*** 870,877 **** echo " DEFAULT_PIDLOG: ${runtimedir_relative}httpd.pid" echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}httpd.scoreboard" echo " DEFAULT_LOCKFILE: ${runtimedir_relative}httpd.lock" @@ -10,7 +10,7 @@ echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types" echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}httpd.conf" echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf" ---- 877,884 ---- +--- 870,877 ---- echo " DEFAULT_PIDLOG: ${runtimedir_relative}httpd.pid" echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}httpd.scoreboard" echo " DEFAULT_LOCKFILE: ${runtimedir_relative}httpd.lock" @@ -20,7 +20,7 @@ echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}httpd.conf" echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf" *************** -*** 942,949 **** +*** 935,942 **** echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}httpd.pid\"'" >>$src/apaci echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}httpd.scoreboard\"'" >>$src/apaci echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}httpd.lock\"'" >>$src/apaci @@ -29,7 +29,7 @@ echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}httpd.conf\"'" >>$src/apaci echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci ---- 942,949 ---- +--- 935,942 ---- echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}httpd.pid\"'" >>$src/apaci echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}httpd.scoreboard\"'" >>$src/apaci echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}httpd.lock\"'" >>$src/apaci diff --git a/www/apache20/files/patch-ab b/www/apache20/files/patch-ab index de82b962be4a..50e0de52fc30 100644 --- a/www/apache20/files/patch-ab +++ b/www/apache20/files/patch-ab @@ -1,5 +1,5 @@ -*** Makefile.tmpl.orig Wed Jul 15 21:03:25 1998 ---- Makefile.tmpl Thu Jul 23 16:14:15 1998 +*** Makefile.tmpl.orig Sat Sep 19 16:41:48 1998 +--- Makefile.tmpl Thu Sep 24 04:07:49 1998 *************** *** 107,112 **** --- 107,113 ---- @@ -49,7 +49,7 @@ $(MKDIR) $(root)$(runtimedir) $(MKDIR) $(root)$(logfiledir) *************** -*** 338,360 **** +*** 340,365 **** # icons and distributed CGI scripts. install-data: @echo "===> [data: Installing initial data files]" @@ -65,15 +65,18 @@ ! -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \ ! echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \ ! else \ -! 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 + 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 - *) |\ ---- 339,368 ---- + (cd $(root)$(datadir)/icons/ && $(TAR) xf -); \ +--- 341,373 ---- # icons and distributed CGI scripts. install-data: @echo "===> [data: Installing initial data files]" @@ -93,38 +96,39 @@ ! # -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \ ! # echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \ ! # else \ -! 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 {} \; ; \ + 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 +! fi @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \ (cd $(TOP)/icons/ && $(TAR) cf - *) |\ + (cd $(root)$(datadir)/icons/ && $(TAR) xf -); \ *************** -*** 374,381 **** +*** 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@@/htdocs;$(datadir)/htdocs;' \ -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \ -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \ -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \ ---- 382,389 ---- +--- 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@@/htdocs;$(datadir)/data;' \ -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \ -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \ -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \ *************** -*** 383,392 **** +*** 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;' \ @@ -135,7 +139,7 @@ -e 's;conf/magic;$(sysconfdir)/magic;' \ -e 's;conf/mime.types;$(sysconfdir)/mime.types;' \ -e 's;Group #-1;Group $(conf_group);' \ ---- 391,400 ---- +--- 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;' \ diff --git a/www/apache20/pkg-plist b/www/apache20/pkg-plist index 82e5c12f4baa..3579a0e937ce 100644 --- a/www/apache20/pkg-plist +++ b/www/apache20/pkg-plist @@ -14,6 +14,7 @@ include/apache/ap_config.h include/apache/ap_config_auto.h include/apache/ap_ctype.h include/apache/ap_md5.h +include/apache/ap_mmn.h include/apache/buff.h include/apache/compat.h include/apache/conf.h @@ -48,7 +49,6 @@ libexec/apache/mod_info.so libexec/apache/mod_mime_magic.so libexec/apache/mod_rewrite.so libexec/apache/mod_speling.so -libexec/apache/mod_status.so libexec/apache/mod_unique_id.so libexec/apache/mod_usertrack.so sbin/ab diff --git a/www/apache21/Makefile b/www/apache21/Makefile index d63c05b48052..197c3e1a761d 100644 --- a/www/apache21/Makefile +++ b/www/apache21/Makefile @@ -3,15 +3,15 @@ # Date created: Fri Aug 25 16:42:36 CDT 1995 # Whom: ache@nagual.pp.ru # -# $Id: Makefile,v 1.59 1998/07/23 13:15:57 ache Exp $ +# $Id: Makefile,v 1.60 1998/09/20 23:55:38 ache Exp $ # -DISTNAME= apache_1.3.1 -PKGNAME= apache-1.3.1 +DISTNAME= apache_1.3.2 +PKGNAME= apache-1.3.2 CATEGORIES= www MASTER_SITES= ftp://www.apache.org/apache/dist/ -#PATCH_SITES= ftp://www.apache.org/apache/dist/patches/apply_to_1.3.1/ +#PATCH_SITES= ftp://www.apache.org/apache/dist/patches/apply_to_1.3.2/ MAINTAINER= ache@freebsd.org @@ -28,6 +28,7 @@ CONFIGURE_ARGS= \ --datadir=${PREFIX}/www \ --proxycachedir=${PREFIX}/www/proxy \ --libexecdir=${PREFIX}/libexec/apache \ + --with-perl=${PERL5} \ --without-confadjust \ --enable-shared=remain \ --enable-module=most \ @@ -39,7 +40,6 @@ OPTIM=-DHARD_SERVER_LIMIT=512 \ -DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\" .if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES -CONFIGURE_ARGS+= --disable-rule=STATUS OPTIM+= -DBUFFERED_LOGS CFLAGS+= -O6 -fomit-frame-pointer .endif diff --git a/www/apache21/distinfo b/www/apache21/distinfo index 66c4b7a0722c..fbf77f6084be 100644 --- a/www/apache21/distinfo +++ b/www/apache21/distinfo @@ -1 +1 @@ -MD5 (apache_1.3.1.tar.gz) = fd28c26f94451216a23f34f5fe22e2b4 +MD5 (apache_1.3.2.tar.gz) = a86e38366bcd9797400818ae6eb1400f diff --git a/www/apache21/files/patch-aa b/www/apache21/files/patch-aa index 21ea6449f6ca..95661a056d8d 100644 --- a/www/apache21/files/patch-aa +++ b/www/apache21/files/patch-aa @@ -1,7 +1,7 @@ -*** configure.bak Sun Jul 12 13:25:46 1998 ---- configure Thu Jul 23 16:52:04 1998 +*** configure.orig Thu Sep 17 12:07:53 1998 +--- configure Thu Sep 24 03:57:33 1998 *************** -*** 877,884 **** +*** 870,877 **** echo " DEFAULT_PIDLOG: ${runtimedir_relative}httpd.pid" echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}httpd.scoreboard" echo " DEFAULT_LOCKFILE: ${runtimedir_relative}httpd.lock" @@ -10,7 +10,7 @@ echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types" echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}httpd.conf" echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf" ---- 877,884 ---- +--- 870,877 ---- echo " DEFAULT_PIDLOG: ${runtimedir_relative}httpd.pid" echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}httpd.scoreboard" echo " DEFAULT_LOCKFILE: ${runtimedir_relative}httpd.lock" @@ -20,7 +20,7 @@ echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}httpd.conf" echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf" *************** -*** 942,949 **** +*** 935,942 **** echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}httpd.pid\"'" >>$src/apaci echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}httpd.scoreboard\"'" >>$src/apaci echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}httpd.lock\"'" >>$src/apaci @@ -29,7 +29,7 @@ echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}httpd.conf\"'" >>$src/apaci echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci ---- 942,949 ---- +--- 935,942 ---- echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}httpd.pid\"'" >>$src/apaci echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}httpd.scoreboard\"'" >>$src/apaci echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}httpd.lock\"'" >>$src/apaci diff --git a/www/apache21/files/patch-ab b/www/apache21/files/patch-ab index de82b962be4a..50e0de52fc30 100644 --- a/www/apache21/files/patch-ab +++ b/www/apache21/files/patch-ab @@ -1,5 +1,5 @@ -*** Makefile.tmpl.orig Wed Jul 15 21:03:25 1998 ---- Makefile.tmpl Thu Jul 23 16:14:15 1998 +*** Makefile.tmpl.orig Sat Sep 19 16:41:48 1998 +--- Makefile.tmpl Thu Sep 24 04:07:49 1998 *************** *** 107,112 **** --- 107,113 ---- @@ -49,7 +49,7 @@ $(MKDIR) $(root)$(runtimedir) $(MKDIR) $(root)$(logfiledir) *************** -*** 338,360 **** +*** 340,365 **** # icons and distributed CGI scripts. install-data: @echo "===> [data: Installing initial data files]" @@ -65,15 +65,18 @@ ! -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \ ! echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \ ! else \ -! 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 + 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 - *) |\ ---- 339,368 ---- + (cd $(root)$(datadir)/icons/ && $(TAR) xf -); \ +--- 341,373 ---- # icons and distributed CGI scripts. install-data: @echo "===> [data: Installing initial data files]" @@ -93,38 +96,39 @@ ! # -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \ ! # echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \ ! # else \ -! 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 {} \; ; \ + 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 +! fi @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \ (cd $(TOP)/icons/ && $(TAR) cf - *) |\ + (cd $(root)$(datadir)/icons/ && $(TAR) xf -); \ *************** -*** 374,381 **** +*** 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@@/htdocs;$(datadir)/htdocs;' \ -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \ -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \ -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \ ---- 382,389 ---- +--- 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@@/htdocs;$(datadir)/data;' \ -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \ -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \ -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \ *************** -*** 383,392 **** +*** 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;' \ @@ -135,7 +139,7 @@ -e 's;conf/magic;$(sysconfdir)/magic;' \ -e 's;conf/mime.types;$(sysconfdir)/mime.types;' \ -e 's;Group #-1;Group $(conf_group);' \ ---- 391,400 ---- +--- 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;' \ diff --git a/www/apache21/pkg-plist b/www/apache21/pkg-plist index 82e5c12f4baa..3579a0e937ce 100644 --- a/www/apache21/pkg-plist +++ b/www/apache21/pkg-plist @@ -14,6 +14,7 @@ include/apache/ap_config.h include/apache/ap_config_auto.h include/apache/ap_ctype.h include/apache/ap_md5.h +include/apache/ap_mmn.h include/apache/buff.h include/apache/compat.h include/apache/conf.h @@ -48,7 +49,6 @@ libexec/apache/mod_info.so libexec/apache/mod_mime_magic.so libexec/apache/mod_rewrite.so libexec/apache/mod_speling.so -libexec/apache/mod_status.so libexec/apache/mod_unique_id.so libexec/apache/mod_usertrack.so sbin/ab diff --git a/www/apache22/Makefile b/www/apache22/Makefile index d63c05b48052..197c3e1a761d 100644 --- a/www/apache22/Makefile +++ b/www/apache22/Makefile @@ -3,15 +3,15 @@ # Date created: Fri Aug 25 16:42:36 CDT 1995 # Whom: ache@nagual.pp.ru # -# $Id: Makefile,v 1.59 1998/07/23 13:15:57 ache Exp $ +# $Id: Makefile,v 1.60 1998/09/20 23:55:38 ache Exp $ # -DISTNAME= apache_1.3.1 -PKGNAME= apache-1.3.1 +DISTNAME= apache_1.3.2 +PKGNAME= apache-1.3.2 CATEGORIES= www MASTER_SITES= ftp://www.apache.org/apache/dist/ -#PATCH_SITES= ftp://www.apache.org/apache/dist/patches/apply_to_1.3.1/ +#PATCH_SITES= ftp://www.apache.org/apache/dist/patches/apply_to_1.3.2/ MAINTAINER= ache@freebsd.org @@ -28,6 +28,7 @@ CONFIGURE_ARGS= \ --datadir=${PREFIX}/www \ --proxycachedir=${PREFIX}/www/proxy \ --libexecdir=${PREFIX}/libexec/apache \ + --with-perl=${PERL5} \ --without-confadjust \ --enable-shared=remain \ --enable-module=most \ @@ -39,7 +40,6 @@ OPTIM=-DHARD_SERVER_LIMIT=512 \ -DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\" .if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES -CONFIGURE_ARGS+= --disable-rule=STATUS OPTIM+= -DBUFFERED_LOGS CFLAGS+= -O6 -fomit-frame-pointer .endif diff --git a/www/apache22/distinfo b/www/apache22/distinfo index 66c4b7a0722c..fbf77f6084be 100644 --- a/www/apache22/distinfo +++ b/www/apache22/distinfo @@ -1 +1 @@ -MD5 (apache_1.3.1.tar.gz) = fd28c26f94451216a23f34f5fe22e2b4 +MD5 (apache_1.3.2.tar.gz) = a86e38366bcd9797400818ae6eb1400f diff --git a/www/apache22/files/patch-aa b/www/apache22/files/patch-aa index 21ea6449f6ca..95661a056d8d 100644 --- a/www/apache22/files/patch-aa +++ b/www/apache22/files/patch-aa @@ -1,7 +1,7 @@ -*** configure.bak Sun Jul 12 13:25:46 1998 ---- configure Thu Jul 23 16:52:04 1998 +*** configure.orig Thu Sep 17 12:07:53 1998 +--- configure Thu Sep 24 03:57:33 1998 *************** -*** 877,884 **** +*** 870,877 **** echo " DEFAULT_PIDLOG: ${runtimedir_relative}httpd.pid" echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}httpd.scoreboard" echo " DEFAULT_LOCKFILE: ${runtimedir_relative}httpd.lock" @@ -10,7 +10,7 @@ echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types" echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}httpd.conf" echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf" ---- 877,884 ---- +--- 870,877 ---- echo " DEFAULT_PIDLOG: ${runtimedir_relative}httpd.pid" echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}httpd.scoreboard" echo " DEFAULT_LOCKFILE: ${runtimedir_relative}httpd.lock" @@ -20,7 +20,7 @@ echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}httpd.conf" echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf" *************** -*** 942,949 **** +*** 935,942 **** echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}httpd.pid\"'" >>$src/apaci echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}httpd.scoreboard\"'" >>$src/apaci echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}httpd.lock\"'" >>$src/apaci @@ -29,7 +29,7 @@ echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}httpd.conf\"'" >>$src/apaci echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci ---- 942,949 ---- +--- 935,942 ---- echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}httpd.pid\"'" >>$src/apaci echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}httpd.scoreboard\"'" >>$src/apaci echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}httpd.lock\"'" >>$src/apaci diff --git a/www/apache22/files/patch-ab b/www/apache22/files/patch-ab index de82b962be4a..50e0de52fc30 100644 --- a/www/apache22/files/patch-ab +++ b/www/apache22/files/patch-ab @@ -1,5 +1,5 @@ -*** Makefile.tmpl.orig Wed Jul 15 21:03:25 1998 ---- Makefile.tmpl Thu Jul 23 16:14:15 1998 +*** Makefile.tmpl.orig Sat Sep 19 16:41:48 1998 +--- Makefile.tmpl Thu Sep 24 04:07:49 1998 *************** *** 107,112 **** --- 107,113 ---- @@ -49,7 +49,7 @@ $(MKDIR) $(root)$(runtimedir) $(MKDIR) $(root)$(logfiledir) *************** -*** 338,360 **** +*** 340,365 **** # icons and distributed CGI scripts. install-data: @echo "===> [data: Installing initial data files]" @@ -65,15 +65,18 @@ ! -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \ ! echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \ ! else \ -! 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 + 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 - *) |\ ---- 339,368 ---- + (cd $(root)$(datadir)/icons/ && $(TAR) xf -); \ +--- 341,373 ---- # icons and distributed CGI scripts. install-data: @echo "===> [data: Installing initial data files]" @@ -93,38 +96,39 @@ ! # -@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \ ! # echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \ ! # else \ -! 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 {} \; ; \ + 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 +! fi @echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \ (cd $(TOP)/icons/ && $(TAR) cf - *) |\ + (cd $(root)$(datadir)/icons/ && $(TAR) xf -); \ *************** -*** 374,381 **** +*** 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@@/htdocs;$(datadir)/htdocs;' \ -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \ -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \ -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \ ---- 382,389 ---- +--- 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@@/htdocs;$(datadir)/data;' \ -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \ -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \ -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \ *************** -*** 383,392 **** +*** 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;' \ @@ -135,7 +139,7 @@ -e 's;conf/magic;$(sysconfdir)/magic;' \ -e 's;conf/mime.types;$(sysconfdir)/mime.types;' \ -e 's;Group #-1;Group $(conf_group);' \ ---- 391,400 ---- +--- 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;' \ diff --git a/www/apache22/pkg-plist b/www/apache22/pkg-plist index 82e5c12f4baa..3579a0e937ce 100644 --- a/www/apache22/pkg-plist +++ b/www/apache22/pkg-plist @@ -14,6 +14,7 @@ include/apache/ap_config.h include/apache/ap_config_auto.h include/apache/ap_ctype.h include/apache/ap_md5.h +include/apache/ap_mmn.h include/apache/buff.h include/apache/compat.h include/apache/conf.h @@ -48,7 +49,6 @@ libexec/apache/mod_info.so libexec/apache/mod_mime_magic.so libexec/apache/mod_rewrite.so libexec/apache/mod_speling.so -libexec/apache/mod_status.so libexec/apache/mod_unique_id.so libexec/apache/mod_usertrack.so sbin/ab |