3 files changed, 58 insertions, 22 deletions

diff --git a/devel/msp430-binutils/Makefile b/devel/msp430-binutils/Makefile
index 964d0aab8d25..6f0fd7512072 100644
--- a/devel/msp430-binutils/Makefile
+++ b/devel/msp430-binutils/Makefile
@@ -6,20 +6,16 @@
 #
 
 PORTNAME=	binutils
-PORTVERSION=	${BINUTILVERSION}.${PATCHVERSION}
+PORTVERSION=	${BINUTILVERSION}
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_SOURCEWARE} \
-		http://lev.serebryakov.spb.ru/download/msp430/:patches
+MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
 MASTER_SITE_SUBDIR=	binutils/releases
 PKGNAMEPREFIX=	msp430-
-DISTFILES=	${PORTNAME}-${BINUTILVERSION}${EXTRACT_SUFX} \
-		${PKGNAMEPREFIX}${PORTNAME}-${BINUTILVERSION}.${PATCHVERSION}${EXTRACT_SUFX}:patches
 
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	GNU binutils for TI's msp430 MCUs cross-development
 
-BINUTILVERSION=	2.11
-PATCHVERSION=	20021220
+BINUTILVERSION=	2.14
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${BINUTILVERSION}
 
@@ -27,7 +23,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--target=${PKGNAMEPREFIX:S/-$//} \
 		--with-gcc --with-gnu-ld --with-gnu-as \
-		--disable-nls
+		--disable-nls --infodir=${PREFIX}/${PKGNAMEPREFIX:S/-$//}/info
 USE_LIBTOOL=	yes
 LIBTOOLFILES=	configure bfd/configure binutils/configure etc/configure \
 		gas/configure gprof/configure ld/configure opcodes/configure
@@ -37,20 +33,25 @@ MAN1=		${PKGNAMEPREFIX}ar.1 ${PKGNAMEPREFIX}nm.1 \
 		${PKGNAMEPREFIX}strip.1 ${PKGNAMEPREFIX}objcopy.1 \
 		${PKGNAMEPREFIX}addr2line.1 ${PKGNAMEPREFIX}nlmconv.1 \
 		${PKGNAMEPREFIX}c++filt.1 ${PKGNAMEPREFIX}as.1 \
-		${PKGNAMEPREFIX}ld.1
+		${PKGNAMEPREFIX}ld.1 ${PKGNAMEPREFIX}dlltool.1 \
+		${PKGNAMEPREFIX}readelf.1 ${PKGNAMEPREFIX}windres.1
 
 PLIST_SUB+=	BINUTILS_TARG=${PKGNAMEPREFIX:S/-$//}
 
-BINARIES=	addr2line ar as c++filt gasp ld nm objcopy objdump ranlib \
+BINARIES=	addr2line ar as c++filt ld nm objcopy objdump ranlib \
 		readelf size strings strip
 
+INFO=		bfd.info binutils.info as.info ld.info \
+		standards.info configure.info
+
 post-install:
 .for F in ${BINARIES}
 	@strip ${PREFIX}/bin/${PKGNAMEPREFIX}$F
 	@${LN} -f ${PREFIX}/bin/${PKGNAMEPREFIX}$F \
 		${PREFIX}/${PKGNAMEPREFIX:S/-$//}/bin/$F
 .endfor
-	@cd ${PREFIX}/lib ; ${MV} libbfd.a lib${PKGNAMEPREFIX}bfd.a
-	@cd ${PREFIX}/lib ; ${MV} libopcodes.a lib${PKGNAMEPREFIX}opcodes.a
+.for F in ${INFO}
+	install-info ${PREFIX}/${PKGNAMEPREFIX:S/-$//}/info/${F} ${PREFIX}/info/dir
+.endfor
 
 .include <bsd.port.mk>
diff --git a/devel/msp430-binutils/distinfo b/devel/msp430-binutils/distinfo
index f94750fa74b9..964a3b0c6c52 100644
--- a/devel/msp430-binutils/distinfo
+++ b/devel/msp430-binutils/distinfo
@@ -1,2 +1 @@
-MD5 (binutils-2.11.tar.bz2) = 51fed4d711f0ceabff40cb7050fb1ca7
-MD5 (msp430-binutils-2.11.20021220.tar.bz2) = 8cbdf17ffda2e0a65b600f943e90dc71
+MD5 (binutils-2.14.tar.bz2) = 2da8def15d28af3ec6af0982709ae90a
diff --git a/devel/msp430-binutils/pkg-plist b/devel/msp430-binutils/pkg-plist
index 1c98e1a5133f..0a8f840e3d83 100644
--- a/devel/msp430-binutils/pkg-plist
+++ b/devel/msp430-binutils/pkg-plist
@@ -1,9 +1,8 @@
-@comment $FreeBSD: /tmp/pcvs/ports/devel/msp430-binutils/pkg-plist,v 1.2 2002-11-11 01:13:27 sada Exp $
+@comment $FreeBSD: /tmp/pcvs/ports/devel/msp430-binutils/pkg-plist,v 1.3 2003-06-25 11:16:23 lev Exp $
 %%BINUTILS_TARG%%/bin/addr2line
 %%BINUTILS_TARG%%/bin/ar
 %%BINUTILS_TARG%%/bin/as
 %%BINUTILS_TARG%%/bin/c++filt
-%%BINUTILS_TARG%%/bin/gasp
 %%BINUTILS_TARG%%/bin/ld
 %%BINUTILS_TARG%%/bin/nm
 %%BINUTILS_TARG%%/bin/objcopy
@@ -13,9 +12,6 @@
 %%BINUTILS_TARG%%/bin/strip
 %%BINUTILS_TARG%%/bin/size
 %%BINUTILS_TARG%%/bin/strings
-include/ansidecl.h
-include/bfd.h
-include/bfdlink.h
 %%BINUTILS_TARG%%/lib/ldscripts/msp430x110.x
 %%BINUTILS_TARG%%/lib/ldscripts/msp430x110.xbn
 %%BINUTILS_TARG%%/lib/ldscripts/msp430x110.xn
@@ -41,6 +37,16 @@ include/bfdlink.h
 %%BINUTILS_TARG%%/lib/ldscripts/msp430x1121.xn
 %%BINUTILS_TARG%%/lib/ldscripts/msp430x1121.xr
 %%BINUTILS_TARG%%/lib/ldscripts/msp430x1121.xu
+%%BINUTILS_TARG%%/lib/ldscripts/msp430x1122.x
+%%BINUTILS_TARG%%/lib/ldscripts/msp430x1122.xbn
+%%BINUTILS_TARG%%/lib/ldscripts/msp430x1122.xn
+%%BINUTILS_TARG%%/lib/ldscripts/msp430x1122.xr
+%%BINUTILS_TARG%%/lib/ldscripts/msp430x1122.xu
+%%BINUTILS_TARG%%/lib/ldscripts/msp430x1132.x
+%%BINUTILS_TARG%%/lib/ldscripts/msp430x1132.xbn
+%%BINUTILS_TARG%%/lib/ldscripts/msp430x1132.xn
+%%BINUTILS_TARG%%/lib/ldscripts/msp430x1132.xr
+%%BINUTILS_TARG%%/lib/ldscripts/msp430x1132.xu
 %%BINUTILS_TARG%%/lib/ldscripts/msp430x122.x
 %%BINUTILS_TARG%%/lib/ldscripts/msp430x122.xbn
 %%BINUTILS_TARG%%/lib/ldscripts/msp430x122.xn
@@ -211,13 +217,11 @@ include/bfdlink.h
 %%BINUTILS_TARG%%/lib/ldscripts/msp430x449.xn
 %%BINUTILS_TARG%%/lib/ldscripts/msp430x449.xr
 %%BINUTILS_TARG%%/lib/ldscripts/msp430x449.xu
-lib/lib%%BINUTILS_TARG%%-bfd.a
-lib/lib%%BINUTILS_TARG%%-opcodes.a
+lib/libiberty.a
 bin/%%BINUTILS_TARG%%-addr2line
 bin/%%BINUTILS_TARG%%-ar
 bin/%%BINUTILS_TARG%%-as
 bin/%%BINUTILS_TARG%%-c++filt
-bin/%%BINUTILS_TARG%%-gasp
 bin/%%BINUTILS_TARG%%-ld
 bin/%%BINUTILS_TARG%%-nm
 bin/%%BINUTILS_TARG%%-objcopy
@@ -227,7 +231,39 @@ bin/%%BINUTILS_TARG%%-readelf
 bin/%%BINUTILS_TARG%%-strip
 bin/%%BINUTILS_TARG%%-size
 bin/%%BINUTILS_TARG%%-strings
+@unexec install-info --delete %D/%%BINUTILS_TARG%%/info/bfd.info %D/info/dir
+@unexec install-info --delete %D/%%BINUTILS_TARG%%/info/binutils.info %D/info/dir
+@unexec install-info --delete %D/%%BINUTILS_TARG%%/info/as.info %D/info/dir
+@unexec install-info --delete %D/%%BINUTILS_TARG%%/info/ld.info %D/info/dir
+@unexec install-info --delete %D/%%BINUTILS_TARG%%/info/standards.info %D/info/dir
+@unexec install-info --delete %D/%%BINUTILS_TARG%%/info/configure.info %D/info/dir
+%%BINUTILS_TARG%%/info/bfd.info
+%%BINUTILS_TARG%%/info/bfd.info-1
+%%BINUTILS_TARG%%/info/bfd.info-2
+%%BINUTILS_TARG%%/info/bfd.info-3
+%%BINUTILS_TARG%%/info/bfd.info-4
+%%BINUTILS_TARG%%/info/bfd.info-5
+%%BINUTILS_TARG%%/info/bfd.info-6
+%%BINUTILS_TARG%%/info/bfd.info-7
+%%BINUTILS_TARG%%/info/bfd.info-8
+%%BINUTILS_TARG%%/info/bfd.info-9
+%%BINUTILS_TARG%%/info/binutils.info
+%%BINUTILS_TARG%%/info/as.info
+%%BINUTILS_TARG%%/info/ld.info
+%%BINUTILS_TARG%%/info/standards.info
+%%BINUTILS_TARG%%/info/configure.info
+%%BINUTILS_TARG%%/info/configure.info-1
+%%BINUTILS_TARG%%/info/configure.info-2
+%%BINUTILS_TARG%%/info/configure.info-3
+%%BINUTILS_TARG%%/info/dir
+@exec install-info %D/%%BINUTILS_TARG%%/info/bfd.info %D/info/dir
+@exec install-info %D/%%BINUTILS_TARG%%/info/binutils.info %D/info/dir
+@exec install-info %D/%%BINUTILS_TARG%%/info/as.info %D/info/dir
+@exec install-info %D/%%BINUTILS_TARG%%/info/ld.info %D/info/dir
+@exec install-info %D/%%BINUTILS_TARG%%/info/standards.info %D/info/dir
+@exec install-info %D/%%BINUTILS_TARG%%/info/configure.info %D/info/dir
 @dirrm %%BINUTILS_TARG%%/bin
 @dirrm %%BINUTILS_TARG%%/lib/ldscripts
 @dirrm %%BINUTILS_TARG%%/lib
+@dirrm %%BINUTILS_TARG%%/info
 @dirrm %%BINUTILS_TARG%%