Allow for emulation-specific patches for binary-only packages. The

patches are named emul-${EMUL_PLATFORM}-patch-* and are located in
${PATCHDIR}.

4 files changed, 12 insertions, 8 deletions

diff --git a/mk/checksum/checksum.mk b/mk/checksum/checksum.mk
index 692c52a8650..c08f705c497 100644
--- a/mk/checksum/checksum.mk
+++ b/mk/checksum/checksum.mk
@@ -1,4 +1,4 @@
-# $NetBSD: checksum.mk,v 1.6 2007/08/15 13:56:24 jlam Exp $
+# $NetBSD: checksum.mk,v 1.7 2007/08/16 16:29:27 jlam Exp $
 #
 # See bsd.checksum.mk for helpful comments.
 #
@@ -66,6 +66,7 @@ _DISTINFO_ARGS_DISTSUM+=	${_IGNOREFILES:S/^/-i /}
 .endif
 
 _DISTINFO_ARGS_PATCHSUM+=	${PATCHDIR}/patch-*
+_DISTINFO_ARGS_PATCHSUM+=	${PATCHDIR}/emul-*-patch-*
 
 distinfo:
 	${RUN}set -e;							\
diff --git a/mk/checksum/distinfo.awk b/mk/checksum/distinfo.awk
index d119c4a97c1..ebb22e07aac 100644
--- a/mk/checksum/distinfo.awk
+++ b/mk/checksum/distinfo.awk
@@ -1,6 +1,6 @@
 #!/usr/bin/awk -f
 #
-# $NetBSD: distinfo.awk,v 1.3 2007/08/14 19:22:31 jlam Exp $
+# $NetBSD: distinfo.awk,v 1.4 2007/08/16 16:29:27 jlam Exp $
 #
 # Copyright (c) 2007 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -57,7 +57,7 @@
 #
 #	For example:
 #
-#	$NetBSD: distinfo.awk,v 1.3 2007/08/14 19:22:31 jlam Exp $
+#	$NetBSD: distinfo.awk,v 1.4 2007/08/16 16:29:27 jlam Exp $
 #
 #	SHA1 (make-3.81.tar.gz) = cd4fa5a3184176492bf0799593a8f250a728210c
 #	RMD160 (make-3.81.tar.gz) = a713a72875cb9a29568677c98022465c6f55cbbf
@@ -280,7 +280,7 @@ function header() {
 ###
 function is_patch(file) {
 	if (file ~ /^patch-local-|[.]orig$|[.]rej$|~$/) return 0
-	if (file ~ /^patch-/) return 1
+	if (file ~ /^patch-|^emul-.*-patch-/) return 1
 	return 0
 }
 
diff --git a/mk/patch/bsd.patch-vars.mk b/mk/patch/bsd.patch-vars.mk
index 8df24b6afdb..b34d9a2d2b2 100644
--- a/mk/patch/bsd.patch-vars.mk
+++ b/mk/patch/bsd.patch-vars.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.patch-vars.mk,v 1.5 2007/08/13 09:22:21 rillig Exp $
+# $NetBSD: bsd.patch-vars.mk,v 1.6 2007/08/16 16:29:27 jlam Exp $
 #
 # This Makefile fragment is included separately by bsd.pkg.mk and
 # defines some variables which must be defined earlier than where
@@ -27,7 +27,7 @@
 
 PATCHFILES?=	# none
 
-pkgsrc_patches=	${:!echo ${PATCHDIR}/patch-*!:N*\*}
+pkgsrc_patches=	${:!echo ${PATCHDIR}/patch-* ${PATCHDIR}/emul-*-patch-*!:N*\*}
 local_patches=	${:!echo ${LOCALPATCHES}/${PKGPATH}/*!:N*/CVS:N*/\*}
 
 .if !empty(PATCHFILES) || !empty(pkgsrc_patches) || !empty(local_patches)
diff --git a/mk/patch/patch.mk b/mk/patch/patch.mk
index 4bb0a685f63..1ff9af10091 100644
--- a/mk/patch/patch.mk
+++ b/mk/patch/patch.mk
@@ -1,4 +1,4 @@
-# $NetBSD: patch.mk,v 1.14 2007/08/15 13:56:25 jlam Exp $
+# $NetBSD: patch.mk,v 1.15 2007/08/16 16:29:27 jlam Exp $
 #
 # The following variables may be set in a package Makefile and control
 # how pkgsrc patches are applied.
@@ -256,6 +256,9 @@ do-distribution-patch:
 
 .if defined(PATCHDIR) && exists(${PATCHDIR})
 _PKGSRC_PATCHES+=	${PATCHDIR}/patch-*
+.  if defined(EMUL_PLATFORM)
+_PKGSRC_PATCHES+=	${PATCHDIR}/emul-${EMUL_PLATFORM}-patch-*
+.  endif
 .endif
 .if defined(LOCALPATCHES) && exists(${LOCALPATCHES}/${PKGPATH})
 _PKGSRC_PATCHES+=	${LOCALPATCHES}/${PKGPATH}/*
@@ -282,7 +285,7 @@ do-pkgsrc-patch:
 			;;						\
 		${PATCHDIR}/patch-local-*) 				\
 			;;						\
-		${PATCHDIR}/patch-*) 					\
+		${PATCHDIR}/patch-*|${PATCHDIR}/emul-*-patch-*)		\
 			if ${TEST} ! -f ${DISTINFO_FILE:Q}; then	\
 				patch_warning "Ignoring patch file $$i: distinfo not found"; \
 				continue;				\