3 files changed, 19 insertions, 23 deletions

diff --git a/devel/msp430-binutils/Makefile b/devel/msp430-binutils/Makefile
index 26436894378a..4b6c5d2f3834 100644
--- a/devel/msp430-binutils/Makefile
+++ b/devel/msp430-binutils/Makefile
@@ -7,34 +7,40 @@
 
 PORTNAME=	binutils
 PORTVERSION=	${BINUTILVERSION}.${MSPGCCVERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
-DISTNAME=	${PORTNAME}-${BINUTILVERSION}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		mspgcc-${MSPGCCVERSION}${EXTRACT_SUFX}:mspgcc
 MASTER_SITES=	${MASTER_SITE_SOURCEWARE} \
 		SF/mspgcc/mspgcc:mspgcc
 MASTER_SITE_SUBDIR=	binutils/releases
-
 PKGNAMEPREFIX=	msp430-
+DISTNAME=	${PORTNAME}-${BINUTILVERSION}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		mspgcc-${MSPGCCVERSION}${EXTRACT_SUFX}:mspgcc
+
+PATCH_SITES=		${MASTER_SITE_SOURCEFORGE}
+PATCH_SITE_SUBDIR=	mspgcc/Patches/LTS/${MSPGCCVERSION}
+PATCHFILES=		${LTS_PATCHES}
+PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	GNU binutils for TI's msp430 MCUs cross-development
+
 LICENSE=	GPLv3
 
 BINUTILVERSION=	2.21.1
 MSPGCCVERSION=	20110716
 PATCHVERSION=	20110716
-
-MAKE_JOBS_SAFE=	yes
+BUGS_FIXED=	3379341
+LTS_PATCHES!=	for bugid in ${BUGS_FIXED} ; do echo ${PKGNAMEPREFIX}${PORTNAME}-${BINUTILVERSION}-${PATCHVERSION}-sf$${bugid}.patch ; done
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+MAKE_JOBS_SAFE=	yes
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--target=${PKGNAMEPREFIX:S/-$//} \
 		--with-gcc --with-gnu-ld --with-gnu-as \
 		--disable-nls --disable-werror
-MAKE_ARGS+=	ARCH=""
 
 MAN1=		${PKGNAMEPREFIX}addr2line.1 ${PKGNAMEPREFIX}ar.1 \
 		${PKGNAMEPREFIX}as.1 ${PKGNAMEPREFIX}c++filt.1 \
@@ -47,7 +53,6 @@ MAN1=		${PKGNAMEPREFIX}addr2line.1 ${PKGNAMEPREFIX}ar.1 \
 		${PKGNAMEPREFIX}strip.1 ${PKGNAMEPREFIX}windmc.1 \
 		${PKGNAMEPREFIX}windres.1
 
-
 INFO=		as bfd binutils configure gprof ld standards
 INFO_PATH=	${PKGNAMEPREFIX:S/-$//}/info
 
@@ -58,7 +63,7 @@ BINARIES=	addr2line ar as c++filt elfedit gprof ld nm objcopy objdump \
 
 pre-patch:
 	@cd ${WRKSRC} && ${PATCH} -s -p1 < ../mspgcc-${MSPGCCVERSION}/${PKGNAMEPREFIX}${PORTNAME}-${BINUTILVERSION}-${PATCHVERSION}.patch
-		
+
 pre-configure:
 	${CHMOD} 755 ${WRKSRC}/configure
 
@@ -68,16 +73,4 @@ post-install:
 		${PREFIX}/${PKGNAMEPREFIX:S/-$//}/bin/$F
 .endfor
 
-#
-# UGLY HACK
-#
-add-plist-post:
-	@${ECHO_CMD} "@unexec rmdir -p %D/${PKGNAMEPREFIX:S/-$//}/info 2> /dev/null || true" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec rmdir -p %D/${PKGNAMEPREFIX:S/-$//} 2> /dev/null || true" >> ${TMPPLIST}
-.if (defined(PREFIX) && ${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${LINUXBASE} && ${PREFIX} != "/usr")
-	@${ECHO_CMD} "@unexec rmdir %D 2> /dev/null || true" >> ${TMPPLIST}
-.else
-	@${DO_NADA}
-.endif
-
 .include <bsd.port.mk>
diff --git a/devel/msp430-binutils/distinfo b/devel/msp430-binutils/distinfo
index 0a66eb5d9a73..f7335b2d6106 100644
--- a/devel/msp430-binutils/distinfo
+++ b/devel/msp430-binutils/distinfo
@@ -2,3 +2,5 @@ SHA256 (binutils-2.21.1.tar.bz2) = f769b64350a02fbee009e1582cc12b6ed43b41985de65
 SIZE (binutils-2.21.1.tar.bz2) = 18890094
 SHA256 (mspgcc-20110716.tar.bz2) = 6e28c2f4976933fc2663751192bc365c68705071908c1c92c03dad2667d74044
 SIZE (mspgcc-20110716.tar.bz2) = 371880
+SHA256 (msp430-binutils-2.21.1-20110716-sf3379341.patch) = a7555ec75f631e46ad12e70743e5a540792283820edf02dbe68f3c823772fd6d
+SIZE (msp430-binutils-2.21.1-20110716-sf3379341.patch) = 688
diff --git a/devel/msp430-binutils/pkg-plist b/devel/msp430-binutils/pkg-plist
index c104bc697617..cfd56c99b702 100644
--- a/devel/msp430-binutils/pkg-plist
+++ b/devel/msp430-binutils/pkg-plist
@@ -1,4 +1,4 @@
-@comment $FreeBSD: /tmp/pcvs/ports/devel/msp430-binutils/pkg-plist,v 1.10 2011-07-26 16:26:05 lev Exp $
+@comment $FreeBSD: /tmp/pcvs/ports/devel/msp430-binutils/pkg-plist,v 1.11 2011-07-28 11:52:42 lev Exp $
 bin/%%BINUTILS_TARG%%-addr2line
 bin/%%BINUTILS_TARG%%-ar
 bin/%%BINUTILS_TARG%%-as
@@ -39,3 +39,4 @@ bin/%%BINUTILS_TARG%%-strip
 @dirrm %%BINUTILS_TARG%%/bin
 @dirrm %%BINUTILS_TARG%%/lib/ldscripts
 @dirrm %%BINUTILS_TARG%%/lib
+@dirrmtry %%BINUTILS_TARG%%/info