From 46bce4ac74b6d455b7e1c0b70d47a76bb8473d65 Mon Sep 17 00:00:00 2001
From: Satoshi Asami <asami@FreeBSD.org>
Date: Wed, 13 Sep 1995 10:14:31 +0000
Subject: Ignore patchfiles that end with ".orig" or "~".

Suggested by:	paul, joerg among others
---
 share/mk/bsd.port.mk | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

(limited to 'share/mk')

diff --git a/share/mk/bsd.port.mk b/share/mk/bsd.port.mk
index 312c0a482e9a..8a5fc4c8f6c6 100644
--- a/share/mk/bsd.port.mk
+++ b/share/mk/bsd.port.mk
@@ -3,7 +3,7 @@
 #	bsd.port.mk - 940820 Jordan K. Hubbard.
 #	This file is in the public domain.
 #
-# $Id: bsd.port.mk,v 1.175 1995/08/18 10:06:28 asami Exp $
+# $Id: bsd.port.mk,v 1.177 1995/08/29 11:57:40 asami Exp $
 #
 # Please view me with 4 column tabs!
 
@@ -538,15 +538,29 @@ do-patch:
 	@if [ -d ${PATCHDIR} ]; then \
 		${ECHO_MSG} "===>  Applying FreeBSD patches for ${PKGNAME}" ; \
 		for i in ${PATCHDIR}/patch-*; do \
-			${ECHO_MSG} "===>   Applying FreeBSD patch $$i" ; \
-			${PATCH} ${PATCH_ARGS} < $$i; \
+			case $$i in \
+				*.orig|*~) \
+					${ECHO_MSG} "===>   Ignoring patchfile $$i" ; \
+					;; \
+				*) \
+					${ECHO_MSG} "===>   Applying FreeBSD patch $$i" ; \
+					${PATCH} ${PATCH_ARGS} < $$i; \
+					;; \
+			esac; \
 		done; \
 	fi
 .else
 	@if [ -d ${PATCHDIR} ]; then \
 		${ECHO_MSG} "===>  Applying FreeBSD patches for ${PKGNAME}" ; \
-		for i in ${PATCHDIR}/patch-*; \
-			do ${PATCH} ${PATCH_ARGS} < $$i; \
+		for i in ${PATCHDIR}/patch-*; do \
+			case $$i in \
+				*.orig|*~) \
+					${ECHO_MSG} "===>   Ignoring patchfile $$i" ; \
+					;; \
+				*) \
+					${PATCH} ${PATCH_ARGS} < $$i; \
+					;; \
+			esac; \
 		done;\
 	fi
 .endif
-- 
cgit v1.2.3