10 files changed, 63 insertions, 47 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
diff --git a/devel/msp430-gcc/Makefile b/devel/msp430-gcc/Makefile
index ace86c6597e8..efb7857a84e9 100644
--- a/devel/msp430-gcc/Makefile
+++ b/devel/msp430-gcc/Makefile
@@ -7,19 +7,26 @@
 
 PORTNAME=	gcc
 PORTVERSION=	${GCCVERSION}.${MSPGCCVERSION}
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	devel
-DISTNAME=	${PORTNAME}-${GCCVERSION}
 MASTER_SITES=	${MASTER_SITE_SOURCEWARE} \
 		SF/mspgcc/mspgcc:mspgcc
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${PORTNAME}-${GCCVERSION}
 PKGNAMEPREFIX=	msp430-
+DISTNAME=	${PORTNAME}-${GCCVERSION}
 DISTFILES=	${PORTNAME}-core-${GCCVERSION}${EXTRACT_SUFX} \
 		${PORTNAME}-g++-${GCCVERSION}${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=	FSF gcc-4.5 for TI's msp430 MCUs cross-development
+
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	${PKGNAMEPREFIX}as:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils \
@@ -35,9 +42,11 @@ CONFLICTS=	msp430-gcc-3.*
 GCCVERSION=	4.5.3
 MSPGCCVERSION=	20110716
 PATCHVERSION=	20110706
+BUGS_FIXED=	3370978
+LTS_PATCHES!=	for bugid in ${BUGS_FIXED} ; do echo ${PKGNAMEPREFIX}${PORTNAME}-${GCCVERSION}-${PATCHVERSION}-sf$${bugid}.patch ; done
 
-SRCDIR=         ${WRKDIR}/${PORTNAME}-${GCCVERSION}
-WRKSRC=         ${WRKDIR}/build
+SRCDIR=		${WRKDIR}/${PORTNAME}-${GCCVERSION}
+WRKSRC=		${WRKDIR}/build
 PATCH_WRKSRC=	${SRCDIR}
 
 USE_BZIP2=	yes
diff --git a/devel/msp430-gcc/distinfo b/devel/msp430-gcc/distinfo
index deb01c567712..6c8688af986b 100644
--- a/devel/msp430-gcc/distinfo
+++ b/devel/msp430-gcc/distinfo
@@ -4,3 +4,5 @@ SHA256 (gcc-g++-4.5.3.tar.bz2) = e088b9fe0016070da921f353ef8c0c2f81fd11d21e3aeb0
 SIZE (gcc-g++-4.5.3.tar.bz2) = 6475820
 SHA256 (mspgcc-20110716.tar.bz2) = 6e28c2f4976933fc2663751192bc365c68705071908c1c92c03dad2667d74044
 SIZE (mspgcc-20110716.tar.bz2) = 371880
+SHA256 (msp430-gcc-4.5.3-20110706-sf3370978.patch) = d375b9f5c4497d6a8ec5548abdc0f51c2cf464791833668dd1cbf5bbe753c7a4
+SIZE (msp430-gcc-4.5.3-20110706-sf3370978.patch) = 884
diff --git a/devel/msp430-gcc/pkg-plist b/devel/msp430-gcc/pkg-plist
index a9462e31ca1c..1a72aff14639 100644
--- a/devel/msp430-gcc/pkg-plist
+++ b/devel/msp430-gcc/pkg-plist
@@ -203,3 +203,5 @@ libexec/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/mkinstalldirs
 @dirrm libexec/gcc/%%GCC_TARG%%/%%GCC_REV%%
 @dirrmtry libexec/gcc/%%GCC_TARG%%
 @dirrmtry libexec/gcc
+@dirrmtry %%GCC_TARG%%/bin
+@dirrmtry %%GCC_TARG%%/info
diff --git a/devel/msp430-gcc3/Makefile b/devel/msp430-gcc3/Makefile
index 9f1775f8da82..313a167d9039 100644
--- a/devel/msp430-gcc3/Makefile
+++ b/devel/msp430-gcc3/Makefile
@@ -7,8 +7,8 @@
 
 PORTNAME=	gcc
 PORTVERSION=	${GCCVERSION}.${PATCHVERSION}
-PORTEPOCH=	2
 PORTREVISION=	1
+PORTEPOCH=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEWARE} \
 		http://lev.serebryakov.spb.ru/download/msp430/:patches
@@ -19,13 +19,14 @@ DISTFILES=	${PORTNAME}-core-${GCCVERSION}${EXTRACT_SUFX} \
 
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	FSF gcc-3.4 for TI's msp430 MCUs cross-development
+
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${PKGNAMEPREFIX}as:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils \
 		${PKGNAMEPREFIX}ld:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils
 RUN_DEPENDS=	${PKGNAMEPREFIX}as:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils \
 		${PKGNAMEPREFIX}ld:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils
-		
+
 CONFLICTS=	msp430-gcc-4.*
 LATEST_LINK=	${PKGBASE}3
 
diff --git a/devel/msp430-gdb/Makefile b/devel/msp430-gdb/Makefile
index 5a016e78e714..3c8d7b487e43 100644
--- a/devel/msp430-gdb/Makefile
+++ b/devel/msp430-gdb/Makefile
@@ -8,16 +8,17 @@
 PORTNAME=	gdb
 PORTVERSION=	${GDBVERSION}.${PATCHVERSION}
 CATEGORIES=	devel
-DISTNAME=	${PORTNAME}-${GDBVERSION}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		mspgcc-${MSPGCCVERSION}${EXTRACT_SUFX}:mspgcc
 MASTER_SITES=	${MASTER_SITE_GNU} \
 		SF/mspgcc/mspgcc:mspgcc
 MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	msp430-
+DISTNAME=	${PORTNAME}-${GDBVERSION}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		mspgcc-${MSPGCCVERSION}${EXTRACT_SUFX}:mspgcc
 
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	FSF GDB for TI's msp430 MCUs cross-development
+
 LICENSE=	GPLv3
 
 GDBVERSION=	7.2
diff --git a/devel/msp430-libc/Makefile b/devel/msp430-libc/Makefile
index e3ca26b2c796..6be9caae7b3a 100644
--- a/devel/msp430-libc/Makefile
+++ b/devel/msp430-libc/Makefile
@@ -8,18 +8,20 @@
 PORTNAME=	libc
 PORTVERSION=	1.0.${LIBCVERSION}
 CATEGORIES=	devel
-PKGNAMEPREFIX=	${LIBCTARGET}-
 MASTER_SITES=	SF/mspgcc/${PKGNAMEPREFIX}${PORTNAME}
-DISTFILES=	${PKGNAMEPREFIX}${PORTNAME}-${LIBCVERSION}${EXTRACT_SUFX}
+PKGNAMEPREFIX=	${LIBCTARGET}-
+PKGNAMESUFFIX=	-gcc${NEEDGCCVERSION}
+DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${LIBCVERSION}
 
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	Libc for TI's msp430 MCUs cross-development
 
-LIBCVERSION=	20110612
-LIBCTARGET=	msp430
+BUILD_DEPENDS=	${LOCALBASE}/${LIBCTARGET}/include/${LIBCTARGET}.h:${PORTSDIR}/devel/${LIBCTARGET}mcu \
+		${PKGNAMEPREFIX}gcc:${PORTSDIR}/devel/${PKGNAMEPREFIX}gcc${PORTGCCVERSION}
+RUN_DEPENDS=	${LOCALBASE}/${LIBCTARGET}/include/${LIBCTARGET}.h:${PORTSDIR}/devel/${LIBCTARGET}mcu \
+		${PKGNAMEPREFIX}gcc:${PORTSDIR}/devel/${PKGNAMEPREFIX}gcc${PORTGCCVERSION}
 
-BUILD_DEPENDS=	${PREFIX}/${LIBCTARGET}/include/${LIBCTARGET}.h:${PORTSDIR}/devel/${LIBCTARGET}mcu
-RUN_DEPENDS=	${BUILD_DEPENDS}
+CONFLICTS=	${PKGNAMEPREFIX}${PORTNAME}-gcc${OTHERGCCVERSION}-[0-9]*
 
 OPTIONS=	GCC4 "Use new msp430-gcc4 compiler" on \
 		GCC3 "Use old msp430-gcc3 compiler" off
@@ -29,23 +31,25 @@ USE_GMAKE=	yes
 MAKE_ENV=	PATH=${PREFIX}/bin:${PATH} PREFIX=${PREFIX}
 WRKSRC=		${WRKDIR}/${PKGNAMEPREFIX}libc-${LIBCVERSION}/src
 
+LIBCVERSION=	20110612
+LIBCTARGET=	msp430
+
 .include <bsd.port.options.mk>
 
 .if defined(WITH_GCC4)
 .if defined(WITH_GCC3)
 BROKEN=	Please, select msp430-gcc-4 or msp430-gcc-3, not both
 .endif
-PKGNAMESUFFIX=	-gcc4
 BUILD_DEPENDS+=	${PKGNAMEPREFIX}gcc:${PORTSDIR}/devel/${PKGNAMEPREFIX}gcc
-CONFLICTS=	${PKGNAMEPREFIX}${PORTNAME}-gcc3-*
 PLIST_SUB+=	GCC3="@comment " GCC4=""
 NEEDGCCVERSION=	4
+PORTGCCVERSION=	""
+OTHEGCCVERSION=	3
 .elif defined(WITH_GCC3)
-PKGNAMESUFFIX=	-gcc3
-BUILD_DEPENDS+=	${PKGNAMEPREFIX}gcc:${PORTSDIR}/devel/${PKGNAMEPREFIX}gcc3
-CONFLICTS=	${PKGNAMEPREFIX}${PORTNAME}-gcc4-*
 PLIST_SUB+=	GCC3="" GCC4="@comment "
 NEEDGCCVERSION=	3
+PORTGCCVERSION=	${NEEDGCCVERSION}
+OTHEGCCVERSION=	4
 .else
 BROKEN=	Please, select msp430-gcc-4 either msp430-gcc-3
 .endif
@@ -60,5 +64,4 @@ pre-configure:
 	 	${FALSE} ; \
 	 fi
 
-
 .include <bsd.port.mk>
diff --git a/devel/msp430mcu/Makefile b/devel/msp430mcu/Makefile
index 8c0dba3ca2b2..b5f826db1ebc 100644
--- a/devel/msp430mcu/Makefile
+++ b/devel/msp430mcu/Makefile
@@ -7,10 +7,10 @@
 
 PORTNAME=	${MCUTARGET}mcu
 PORTVERSION=	1.0.${MCUVERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	SF/mspgcc/${PORTNAME}
-DISTFILES=	${PORTNAME}-${MCUVERSION}${EXTRACT_SUFX}
+DISTNAME=	${PORTNAME}-${MCUVERSION}
 
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	Header files for TI's msp430 MCUs cross-development
@@ -33,9 +33,11 @@ pre-install:
 	@cd ${WRKSRC}/analysis/ldscripts && ${FIND} . ! -type d | ${SORT}    | ${SED} 's,^.,${MCULIBPATH}/ldscripts,'         >> ${PLIST}
 	@cd ${WRKSRC}/analysis/ldscripts && ${FIND} . -type d ! -name '.' | ${SORT} -r | ${SED} 's,^.,@dirrm ${MCULIBPATH}/ldscripts,'  >> ${PLIST}
 	@${ECHO} "@dirrm ${MCUINCPATH}" >> ${PLIST}
-	
+	@${ECHO} "@dirrmtry ${MCUINCPATH}" >> ${PLIST}
+	@${ECHO} "@dirrmtry ${MCULIBPATH}/ldscripts" >> ${PLIST}
+	@${ECHO} "@dirrmtry ${MCULIBPATH}" >> ${PLIST}
 
 do-install:
-	@cd ${WRKSRC} && MSP430MCU_ROOT=${WRKSRC} sh scripts/install.sh ${PREFIX}
+	@cd ${WRKSRC} && MSP430MCU_ROOT=${WRKSRC} ${SH} scripts/install.sh ${PREFIX}
 
 .include <bsd.port.mk>