From 04e49ed49a2d3e4cd6446eb0cd12197f664f2362 Mon Sep 17 00:00:00 2001
From: itojun <itojun>
Date: Tue, 6 Feb 2001 12:55:42 +0000
Subject: slightly better way to handle -p1 patches

---
 www/apache6/Makefile | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'www/apache6')

diff --git a/www/apache6/Makefile b/www/apache6/Makefile
index f4e130f859c..ba8f0b3efc1 100644
--- a/www/apache6/Makefile
+++ b/www/apache6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2001/02/06 12:50:19 itojun Exp $
+# $NetBSD: Makefile,v 1.24 2001/02/06 12:55:42 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
@@ -30,12 +30,6 @@ HOMEPAGE=		http://httpd.apache.org/
 CONFLICTS=		apache-*modssl-* apache6-*
 CONFLICTS=		apache-*
 
-.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
@@ -111,8 +105,9 @@ pre-patch:
 
 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 ) ; \
+		${GZCAT} ${_DISTDIR}/$$i | \
+		    ${PATCH} ${PATCH_DIST_ARGS:C/-p0/-p1/} \
+		    || ( ${ECHO} Patch $$i failed ; exit 1 ) ; \
 	done
 	${CHMOD} +x ${CONFIGURE_SCRIPT}
 
-- 
cgit v1.2.3