diff options
| author | itojun <itojun> | 2001-02-06 12:50:19 +0000 |
|---|---|---|
| committer | itojun <itojun> | 2001-02-06 12:50:19 +0000 |
| commit | fdc52af16c5032aa2aa6679c669745fd5a543f71 (patch) | |
| tree | 764a5145a6bc8adebc39d5cba3e970e4010cbbea /www | |
| parent | 714df4c394d86d7b1edc697c4f146cc9b2202d71 (diff) | |
| download | pkgsrc-fdc52af16c5032aa2aa6679c669745fd5a543f71.tar.gz | |
pull official patch from apache.org. make it 1.3.17.1
Diffstat (limited to 'www')
| -rw-r--r-- | www/apache6/Makefile | 24 | ||||
| -rw-r--r-- | www/apache6/files/md5 | 3 |
2 files changed, 20 insertions, 7 deletions
diff --git a/www/apache6/Makefile b/www/apache6/Makefile index a11dab3b58e..f4e130f859c 100644 --- a/www/apache6/Makefile +++ b/www/apache6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2001/02/06 12:43:06 itojun Exp $ +# $NetBSD: Makefile,v 1.23 2001/02/06 12:50:19 itojun Exp $ # # The fourth number in the PKGNAME version indicates a NetBSD pkg revision # (to indicate changes in the shipped third party patches such as the mod_ssl @@ -11,16 +11,18 @@ # DISTNAME= apache_1.3.17 -PKGNAME= apache6-1.3.17 +PKGNAME= apache6-1.3.17.1 CATEGORIES= www MASTER_SITES= http://httpd.apache.org/dist/ \ http://www.netbsd.org/images/logos/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ sitedrivenby.gif +# IPv6 patch, needs -p1 +MASTER_SITES+= ftp://ftp.kame.net/pub/kame/misc/ +DISTFILES+= apache-1.3.17-v6-20010206a.diff.gz -PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/ -PATCHFILES= apache-1.3.17-v6-20010206a.diff.gz -PATCH_DIST_STRIP= -p1 +PATCH_SITES= http://httpd.apache.org/dist/ +PATCHFILES= apache_1.3.17-fix.diff MAINTAINER= jlam@netbsd.org HOMEPAGE= http://httpd.apache.org/ @@ -28,7 +30,13 @@ HOMEPAGE= http://httpd.apache.org/ CONFLICTS= apache-*modssl-* apache6-* CONFLICTS= apache-* -EXTRACT_ONLY= ${DISTFILES:N*.gif} +.if defined(PATCH_DEBUG) || defined(PKG_VERBOSE) +PATCH_DIST_ARGS1= -d ${WRKSRC} -E -p1 +.else +PATCH_DIST_ARGS1= -d ${WRKSRC} --forward --quiet -E -p1 +.endif + +EXTRACT_ONLY= ${DISTFILES:N*.gif:N*.diff.gz} HAS_CONFIGURE= # defined CONFIGURE_SCRIPT= ${WRKSRC}/configure.v6 CONFIGURE_ARGS+= --prefix=${PREFIX} \ @@ -102,6 +110,10 @@ pre-patch: ${FIND} ${WRKSRC} -name '*.orig' -exec ${RM} -f {} \; post-patch: + for i in apache-1.3.17-v6-20010206a.diff.gz; do \ + ${GZCAT} ${_DISTDIR}/$$i | ${PATCH} ${PATCH_DIST_ARGS1} \ + || ( ${ECHO} Patch $$i failed ; exit 1 ) ; \ + done ${CHMOD} +x ${CONFIGURE_SCRIPT} post-build: diff --git a/www/apache6/files/md5 b/www/apache6/files/md5 index 69a1fddaf6b..754f2bbab96 100644 --- a/www/apache6/files/md5 +++ b/www/apache6/files/md5 @@ -1,5 +1,6 @@ -$NetBSD: md5,v 1.9 2001/02/06 10:58:18 itojun Exp $ +$NetBSD: md5,v 1.10 2001/02/06 12:50:21 itojun Exp $ MD5 (apache_1.3.17.tar.gz) = bcb3c0db956709ad8f04655fd75621e6 MD5 (sitedrivenby.gif) = ad0647dceb931d02bfd046e55915f7b1 MD5 (apache-1.3.17-v6-20010206a.diff.gz) = ca39f4d1238ff2a499367c9d2e79b524 +MD5 (apache_1.3.17-fix.diff) = 92ad88730918bcd04763b99fe4493a41 |