From 204ea86b6a7603bf4051106360e4262af1722ead Mon Sep 17 00:00:00 2001
From: jasper <jasper@openbsd.org>
Date: Fri, 11 Nov 2011 17:23:04 +0000
Subject: [PATCH] - make a clear distinction between the regular PATCHFILES
 which are for the msp430 config files and the LTS patches.

---
 devel/msp430/Makefile.inc       |  6 +++++-
 devel/msp430/binutils/Makefile  | 14 +++++++-------
 devel/msp430/gcc/Makefile       | 20 ++++++++++----------
 devel/msp430/libc/Makefile      |  6 +++---
 devel/msp430/msp430mcu/Makefile |  8 ++++----
 5 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/devel/msp430/Makefile.inc b/devel/msp430/Makefile.inc
index ca0387ff13c..5b565f72125 100644
--- a/devel/msp430/Makefile.inc
+++ b/devel/msp430/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.9 2011/10/02 18:26:32 jasper Exp $
+# $OpenBSD: Makefile.inc,v 1.10 2011/11/11 17:23:04 jasper Exp $
 
 TARGET=			msp430
 
@@ -30,6 +30,10 @@ MASTER_SITES0=		http://distfiles.nl/mspgcc/
 # These are the patches intended for the LTS releases.
 MASTER_SITES1= ${MASTER_SITE_SOURCEFORGE:=mspgcc/Patches/LTS/20110716/}
 
+.for p in ${LTS_PATCHES}
+PATCHFILES += $p:1
+.endfor
+
 PATCH_DIST_STRIP?=	-p1
 
 EXTRACT_SUFX?=		.tar.bz2
diff --git a/devel/msp430/binutils/Makefile b/devel/msp430/binutils/Makefile
index 0b90039ff57..b35c78d8691 100644
--- a/devel/msp430/binutils/Makefile
+++ b/devel/msp430/binutils/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2011/10/02 18:26:32 jasper Exp $
+# $OpenBSD: Makefile,v 1.7 2011/11/11 17:23:05 jasper Exp $
 
 COMMENT=		GNU binutils for msp430
 
@@ -9,12 +9,12 @@ REVISION=		1
 PKGNAME=		${TARGET}-${DISTNAME}
 
 MASTER_SITES=		${MASTER_SITE_GNU:=binutils/}
-PATCHFILES=		msp430-binutils-${V}-${R}.patch:0 \
-			msp430-binutils-2.21.1-20110716-sf3143071.patch:1 \
-			msp430-binutils-2.21.1-20110716-sf3379341.patch:1 \
-			msp430-binutils-2.21.1-20110716-sf3386145.patch:1 \
-			msp430-binutils-2.21.1-20110716-sf3400711.patch:1 \
-			msp430-binutils-2.21.1-20110716-sf3400750.patch:1
+PATCHFILES=		msp430-binutils-${V}-${R}.patch:0
+LTS_PATCHES=		msp430-binutils-2.21.1-20110716-sf3143071.patch \
+			msp430-binutils-2.21.1-20110716-sf3379341.patch \
+			msp430-binutils-2.21.1-20110716-sf3386145.patch \
+			msp430-binutils-2.21.1-20110716-sf3400711.patch \
+			msp430-binutils-2.21.1-20110716-sf3400750.patch
 
 WANTLIB=		c z
 
diff --git a/devel/msp430/gcc/Makefile b/devel/msp430/gcc/Makefile
index 318c4ba097d..43240cf84f0 100644
--- a/devel/msp430/gcc/Makefile
+++ b/devel/msp430/gcc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2011/11/06 19:07:09 jasper Exp $
+# $OpenBSD: Makefile,v 1.13 2011/11/11 17:23:05 jasper Exp $
 
 COMMENT=		GNU Compiler Collection for msp430
 
@@ -9,15 +9,15 @@ REVISION=		4
 PKGNAME=		${TARGET}-${DISTNAME}
 
 MASTER_SITES= 		${MASTER_SITE_GCC:=releases/gcc-$(VERSION)/}
-PATCHFILES=		msp430-gcc-${VERSION}-${R}.patch:0 \
-			msp430-gcc-4.5.3-20110706-sf3370978.patch:1 \
-			msp430-gcc-4.5.3-20110706-sf3390964.patch:1 \
-			msp430-gcc-4.5.3-20110706-sf3394176.patch:1 \
-			msp430-gcc-4.5.3-20110706-sf3396639.patch:1 \
-			msp430-gcc-4.5.3-20110706-sf3409864.patch:1 \
-			msp430-gcc-4.5.3-20110706-sf3417263.patch:1 \
-			msp430-gcc-4.5.3-20110706-sf3431602.patch:1 \
-			msp430-gcc-4.5.3-20110706-sf3433730.patch:1
+PATCHFILES=		msp430-gcc-${VERSION}-${R}.patch:0
+LTS_PATCHES=		msp430-gcc-4.5.3-20110706-sf3370978.patch \
+			msp430-gcc-4.5.3-20110706-sf3390964.patch \
+			msp430-gcc-4.5.3-20110706-sf3394176.patch \
+			msp430-gcc-4.5.3-20110706-sf3396639.patch \
+			msp430-gcc-4.5.3-20110706-sf3409864.patch \
+			msp430-gcc-4.5.3-20110706-sf3417263.patch \
+			msp430-gcc-4.5.3-20110706-sf3431602.patch \
+			msp430-gcc-4.5.3-20110706-sf3433730.patch
 
 DISTFILES=		gcc-core-${VERSION}${EXTRACT_SUFX} \
 			gcc-g++-${VERSION}${EXTRACT_SUFX}
diff --git a/devel/msp430/libc/Makefile b/devel/msp430/libc/Makefile
index d1b92579d38..67c5c3abcec 100644
--- a/devel/msp430/libc/Makefile
+++ b/devel/msp430/libc/Makefile
@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.6 2011/09/27 19:20:25 jasper Exp $
+# $OpenBSD: Makefile,v 1.7 2011/11/11 17:23:05 jasper Exp $
 
 COMMENT=		GNU libc for msp430
 
 DISTNAME=		${TARGET}-libc-20110612
 REVISION=		0
 
-PATCHFILES=		msp430-libc-20110612-sf3387164.patch:1 \
-			msp430-libc-20110612-sf3402836.patch:1
+LTS_PATCHES=		msp430-libc-20110612-sf3387164.patch \
+			msp430-libc-20110612-sf3402836.patch
 
 RUN_DEPENDS=		devel/msp430/gcc>=4.5.3
 BUILD_DEPENDS=		${RUN_DEPENDS}
diff --git a/devel/msp430/msp430mcu/Makefile b/devel/msp430/msp430mcu/Makefile
index 837f8718a4e..79743a2a8b3 100644
--- a/devel/msp430/msp430mcu/Makefile
+++ b/devel/msp430/msp430mcu/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2011/10/21 16:23:45 espie Exp $
+# $OpenBSD: Makefile,v 1.6 2011/11/11 17:23:05 jasper Exp $
 
 PKG_ARCH=	*
 
@@ -7,9 +7,9 @@ COMMENT=	C headers and binutils linker scripts for msp430
 DISTNAME=	msp430mcu-20110613
 REVISION=	0
 
-PATCHFILES=	msp430mcu-20110613-sf3379189.patch:1 \
-		msp430mcu-20110613-sf3384550.patch:1 \
-		msp430mcu-20110613-sf3400714.patch:1
+LTS_PATCHES=	msp430mcu-20110613-sf3379189.patch \
+		msp430mcu-20110613-sf3384550.patch \
+		msp430mcu-20110613-sf3400714.patch
 
 CONFIGURE_STYLE=#empty