diff options
| author | Peter Wemm <peter@FreeBSD.org> | 1997-08-12 18:20:06 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 1997-08-12 18:20:06 +0000 |
| commit | c481926ccdf67d20332578a2bd991203ee32af63 (patch) | |
| tree | 6e11b798b0df09d3b58c668ad8b4bf46bfa658c3 /www/apache22 | |
| parent | activated japanese/plain2. (diff) | |
Update the repository copied (with history) apache 1.2.1 to 1.3a1 from the
original apache-current port.
Notes
Notes:
svn path=/head/; revision=7549
Diffstat (limited to 'www/apache22')
| -rw-r--r-- | www/apache22/Makefile | 26 | ||||
| -rw-r--r-- | www/apache22/distinfo | 3 | ||||
| -rw-r--r-- | www/apache22/files/patch-ag | 12 | ||||
| -rw-r--r-- | www/apache22/pkg-plist | 1 |
4 files changed, 19 insertions, 23 deletions
diff --git a/www/apache22/Makefile b/www/apache22/Makefile index 6fb5c8770b4f..a1bbebd1ec00 100644 --- a/www/apache22/Makefile +++ b/www/apache22/Makefile @@ -1,28 +1,21 @@ # New ports collection makefile for: apache HTTPD -# Version required: 1.2.1 +# Version required: 1.3a1 # Date created: Fri Aug 25 16:42:36 CDT 1995 -# Whom: erich@rrnet.com +# Whom: ache@nagual.pp.ru # -# $Id: Makefile,v 1.35 1997/07/08 13:04:09 ache Exp $ +# $Id: Makefile,v 1.1.1.1 1997/07/26 17:14:02 ache Exp $ # -DISTNAME= apache_1.2.1 -PKGNAME= apache-1.2.1 +DISTNAME= apache_1.3a1 +PKGNAME= apache-1.3a1 CATEGORIES= www MASTER_SITES= ftp://www.apache.org/apache/dist/ MAINTAINER= ache@freebsd.org -# User-controlled variables list -# DIR_ACHE - add SuppressHTMLPreamble option to directory index -# see http://www.nagual.ru/~ache/apache_dir.html -# SECURE_SERVER - build Apache with SSL - -.if defined(DIR_ACHE) -PATCH_SITES+= http://www.nagual.pp.ru/~ache/ -PATCHFILES+= dir.patch -VERS_ID= dir/ache -.endif +# User-controlled variable: +# Set it for local-supplied patch, f.e. +# VERS_ID = mods-1.0/me .if defined(VERS_ID) post-patch: @@ -32,6 +25,9 @@ post-patch: < Configuration.old > Configuration .endif +post-patch: + ${CP} /usr/include/md5.h ${WRKSRC}/src/md5.h + post-install: @if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \ echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \ diff --git a/www/apache22/distinfo b/www/apache22/distinfo index 5229ef58f766..369481c867b1 100644 --- a/www/apache22/distinfo +++ b/www/apache22/distinfo @@ -1,2 +1 @@ -MD5 (apache_1.2.1.tar.gz) = 387add2881934555b2d2fed1172849ec -MD5 (dir.patch) = d4024889d191c936be088616a3076942 +MD5 (apache_1.3a1.tar.gz) = 638fad5c69178d2a92407900547e8732 diff --git a/www/apache22/files/patch-ag b/www/apache22/files/patch-ag index c3080c8c4c24..de274fe1b0e2 100644 --- a/www/apache22/files/patch-ag +++ b/www/apache22/files/patch-ag @@ -1,5 +1,5 @@ -*** src/util_md5.h.bak Wed Jan 1 21:10:46 1997 ---- src/util_md5.h Fri May 2 21:46:06 1997 +*** src/util_md5.h.orig Wed Jul 16 01:39:59 1997 +--- src/util_md5.h Thu Jul 24 05:09:25 1997 *************** *** 50,56 **** * @@ -7,13 +7,13 @@ ! #include "md5.h" - char *md5(pool *a, unsigned char *string); - char *md5contextTo64(pool *p, MD5_CTX *context); + API_EXPORT(char *) md5(pool *a, unsigned char *string); + API_EXPORT(char *) md5contextTo64(pool *p, MD5_CTX *context); --- 50,56 ---- * */ ! #include <md5.h> - char *md5(pool *a, unsigned char *string); - char *md5contextTo64(pool *p, MD5_CTX *context); + API_EXPORT(char *) md5(pool *a, unsigned char *string); + API_EXPORT(char *) md5contextTo64(pool *p, MD5_CTX *context); diff --git a/www/apache22/pkg-plist b/www/apache22/pkg-plist index c60ce6b20139..dcbdfbe13c8b 100644 --- a/www/apache22/pkg-plist +++ b/www/apache22/pkg-plist @@ -4,6 +4,7 @@ etc/apache/httpd.conf-dist etc/apache/srm.conf-dist etc/apache/access.conf-dist etc/apache/mime.types-dist +etc/apache/magic-dist sbin/httpd www/icons/README www/icons/a.gif |