diff options
Diffstat (limited to 'www/apache6/Makefile')
| -rw-r--r-- | www/apache6/Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/www/apache6/Makefile b/www/apache6/Makefile index 53caff2d4fe..8abf582d2d1 100644 --- a/www/apache6/Makefile +++ b/www/apache6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.80 2003/09/13 23:37:06 itojun Exp $ +# $NetBSD: Makefile,v 1.81 2003/09/17 19:41:19 grant Exp $ # # This package does not compile in mod_ssl support hooks, as it conflicts # with IPv6-enable patch. @@ -8,7 +8,12 @@ DISTNAME= apache_${APACHE_VERSION} PKGNAME= apache6-${APACHE_VERSION} +<<<<<<< Makefile +#PKGREVISION= 3 APACHE_VERSION= 1.3.28 +======= +APACHE_VERSION= 1.3.28 +>>>>>>> 1.79 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \ ${MASTER_SITE_APACHE:=httpd/old/} |