Update to latest (and recommended by msp430 maintainers) version 3.4.1

10 files changed, 174 insertions, 148 deletions

diff --git a/devel/msp430-gcc/Makefile b/devel/msp430-gcc/Makefile
index 729bac601a9f..e405fc9656d5 100644
--- a/devel/msp430-gcc/Makefile
+++ b/devel/msp430-gcc/Makefile
@@ -17,15 +17,15 @@ DISTFILES=	${PORTNAME}-core-${GCCVERSION}${EXTRACT_SUFX} \
 		${PKGNAMEPREFIX}${PORTNAME}-${GCCVERSION}.${PATCHVERSION}${EXTRACT_SUFX}:patches
 
 MAINTAINER=	lev@FreeBSD.org
-COMMENT=	FSF gcc-3.2 for TI's msp430 MCUs cross-development
+COMMENT=	FSF gcc-3.4 for TI's msp430 MCUs cross-development
 
 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
 
-GCCVERSION=	3.2.3
-PATCHVERSION=	20040329
+GCCVERSION=	3.4.1
+PATCHVERSION=	20040723
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${GCCVERSION}
 
@@ -34,7 +34,9 @@ USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 USE_INC_LIBTOOL_VER=	13
 CONFIGURE_ARGS=	--target=${PKGNAMEPREFIX:S/-$//} \
-		--enable-languages=c --disable-nls
+		--with-gcc --with-gnu-ld --with-gnu-as \
+		--enable-languages=c --disable-nls \
+		--infodir=${PREFIX}/${PKGNAMEPREFIX:S/-$//}/info
 MAKE_ENV=	PATH=${PREFIX}/bin:${PATH}
 LIBTOOLFILES=	configure gcc/configure
 MAN1=		${PKGNAMEPREFIX}gcc.1 ${PKGNAMEPREFIX}cpp.1 ${PKGNAMEPREFIX}gcov.1
@@ -42,7 +44,10 @@ MAN1=		${PKGNAMEPREFIX}gcc.1 ${PKGNAMEPREFIX}cpp.1 ${PKGNAMEPREFIX}gcov.1
 PLIST_SUB+=	PORTVERSION=${PORTVERSION} GCC_TARG=${PKGNAMEPREFIX:S/-$//} \
 		GCC_REV=${GCCVERSION}
 
-BINARIES=	gcc cpp
+INFO=		cpp cppinternals gcc gccinstall gccint
+INFO_PATH=	${PKGNAMEPREFIX:S/-$//}/info
+
+BINARIES=	gcc gcc-${GCCVERSION} gcov cpp
 
 .include <bsd.port.pre.mk>
 
@@ -53,11 +58,10 @@ BROKEN=		"Does not compile on amd64 due to platform rename"
 
 post-configure:
 	@${PERL} -pi.bak -e 's,^(TARGET_CONFIGDIRS\s*=).+$$,\1,' ${WRKSRC}/Makefile
-	@${PERL} -pi.bak -e 's,^(install-info:),\1\ndonot-\1,' ${WRKSRC}/gcc/Makefile
+#	@${PERL} -pi.bak -e 's,^(install-info:),\1\ndonot-\1,' ${WRKSRC}/gcc/Makefile
 
 post-install:
 .for F in ${BINARIES}
-	@${STRIP_CMD} ${PREFIX}/bin/${PKGNAMEPREFIX}$F
 	@${LN} -f ${PREFIX}/bin/${PKGNAMEPREFIX}$F \
 		${PREFIX}/${PKGNAMEPREFIX:S/-$//}/bin/$F
 .endfor
diff --git a/devel/msp430-gcc/distinfo b/devel/msp430-gcc/distinfo
index 28df2d384b08..f25fc7fcda1d 100644
--- a/devel/msp430-gcc/distinfo
+++ b/devel/msp430-gcc/distinfo
@@ -1,4 +1,4 @@
-MD5 (gcc-core-3.2.3.tar.bz2) = 66664a84b383ba8d68612cd89b9478b2
-SIZE (gcc-core-3.2.3.tar.bz2) = 10324429
-MD5 (msp430-gcc-3.2.3.20040329.tar.bz2) = 04d01f3252dd1ee07fef454dc49be5c5
-SIZE (msp430-gcc-3.2.3.20040329.tar.bz2) = 102461
+MD5 (gcc-core-3.4.1.tar.bz2) = 4b05b134baf92457494a0f4a28aa5213
+SIZE (gcc-core-3.4.1.tar.bz2) = 12862544
+MD5 (msp430-gcc-3.4.1.20040723.tar.bz2) = d600065fb644113a72ed6897f0b38e1c
+SIZE (msp430-gcc-3.4.1.20040723.tar.bz2) = 139467
diff --git a/devel/msp430-gcc/files/patch-Makefile.in b/devel/msp430-gcc/files/patch-Makefile.in
index b59814de68d5..02ba348652f8 100644
--- a/devel/msp430-gcc/files/patch-Makefile.in
+++ b/devel/msp430-gcc/files/patch-Makefile.in
@@ -1,10 +1,17 @@
---- Makefile.in.orig	Wed Oct 15 18:17:00 2003
-+++ Makefile.in	Wed Oct 15 18:17:28 2003
-@@ -715,7 +715,6 @@
- 	install-itcl \
- 	install-ld \
- 	install-libgui \
--	install-libiberty \
- 	install-libtool \
- 	install-m4 \
- 	install-make \
+--- Makefile.in.orig	Tue Aug  3 13:53:30 2004
++++ Makefile.in	Tue Aug  3 13:53:56 2004
+@@ -19885,10 +19885,10 @@
+ maybe-install-libiberty:
+ 
+ install-libiberty: installdirs
+-	@r=`${PWD_COMMAND}`; export r; \
+-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+-	$(SET_LIB_PATH) \
+-	(cd libiberty && $(MAKE) $(FLAGS_TO_PASS) install)
++#	@r=`${PWD_COMMAND}`; export r; \
++#	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++#	$(SET_LIB_PATH) \
++#	(cd libiberty && $(MAKE) $(FLAGS_TO_PASS) install)
+ 
+ 
+ .PHONY: configure-libtool maybe-configure-libtool
diff --git a/devel/msp430-gcc/files/patch-gcc-Makefile.in b/devel/msp430-gcc/files/patch-gcc-Makefile.in
index 98a721e599fd..e27352523b1b 100644
--- a/devel/msp430-gcc/files/patch-gcc-Makefile.in
+++ b/devel/msp430-gcc/files/patch-gcc-Makefile.in
@@ -1,30 +1,12 @@
---- gcc/Makefile.in.orig	Fri Oct 17 16:22:44 2003
-+++ gcc/Makefile.in	Fri Oct 17 16:24:38 2003
-@@ -2685,21 +2685,12 @@
- 	  $(INSTALL_DATA) $(docdir)/gcc.1 $(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext); \
- 	  chmod a-x $(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext); \
- 	fi
--	-rm -f $(DESTDIR)$(man1dir)/cpp$(man1ext)
--	-$(INSTALL_DATA) $(docdir)/cpp.1 $(DESTDIR)$(man1dir)/cpp$(man1ext)
--	-chmod a-x $(DESTDIR)$(man1dir)/cpp$(man1ext)
--	-rm -f $(DESTDIR)$(man1dir)/gcov$(man1ext)
--	-$(INSTALL_DATA) $(docdir)/gcov.1 $(DESTDIR)$(man1dir)/gcov$(man1ext)
--	-chmod a-x $(DESTDIR)$(man1dir)/gcov$(man1ext)
--	-rm -f $(DESTDIR)$(man7dir)/fsf-funding$(man7ext)
--	-$(INSTALL_DATA) $(docdir)/fsf-funding.7 $(DESTDIR)$(man7dir)/fsf-funding$(man7ext)
--	-chmod a-x $(DESTDIR)$(man7dir)/fsf-funding$(man7ext)
--	-rm -f $(DESTDIR)$(man7dir)/gfdl$(man7ext)
--	-$(INSTALL_DATA) $(docdir)/gfdl.7 $(DESTDIR)$(man7dir)/gfdl$(man7ext)
--	-chmod a-x $(DESTDIR)$(man7dir)/gfdl$(man7ext)
--	-rm -f $(DESTDIR)$(man7dir)/gpl$(man7ext)
--	-$(INSTALL_DATA) $(docdir)/gpl.7 $(DESTDIR)$(man7dir)/gpl$(man7ext)
--	-chmod a-x $(DESTDIR)$(man7dir)/gpl$(man7ext)
-+	-rm -f $(DESTDIR)$(man1dir)/$(CPP_CROSS_NAME)$(man1ext)
-+	-$(INSTALL_DATA) $(docdir)/cpp.1 $(DESTDIR)$(man1dir)/$(CPP_CROSS_NAME)$(man1ext)
-+	-chmod a-x $(DESTDIR)$(man1dir)/$(CPP_CROSS_NAME)$(man1ext)
-+	-rm -f $(DESTDIR)$(man1dir)/$(GCOV_INSTALL_NAME)$(man1ext)
-+	-$(INSTALL_DATA) $(docdir)/gcov.1 $(DESTDIR)$(man1dir)/$(GCOV_INSTALL_NAME)$(man1ext)
-+	-chmod a-x $(DESTDIR)$(man1dir)/$(GCOV_INSTALL_NAME)$(man1ext)
+--- gcc/Makefile.in.orig	Tue Aug  3 13:57:27 2004
++++ gcc/Makefile.in	Tue Aug  3 13:57:39 2004
+@@ -2963,9 +2963,6 @@
+ 	$(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext) \
+ 	$(DESTDIR)$(man1dir)/$(CPP_INSTALL_NAME)$(man1ext) \
+ 	$(DESTDIR)$(man1dir)/$(GCOV_INSTALL_NAME)$(man1ext) \
+-	$(DESTDIR)$(man7dir)/fsf-funding$(man7ext) \
+-	$(DESTDIR)$(man7dir)/gfdl$(man7ext) \
+-	$(DESTDIR)$(man7dir)/gpl$(man7ext)
  
- # Install the library.
- install-libgcc: libgcc.mk libgcc.a installdirs
+ $(DESTDIR)$(man7dir)/%$(man7ext): doc/%.7
+ 	-rm -f $@
diff --git a/devel/msp430-gcc/pkg-plist b/devel/msp430-gcc/pkg-plist
index 2a9e59815353..76c3d450c83f 100644
--- a/devel/msp430-gcc/pkg-plist
+++ b/devel/msp430-gcc/pkg-plist
@@ -1,30 +1,50 @@
 %%GCC_TARG%%/bin/cpp
 %%GCC_TARG%%/bin/gcc
+%%GCC_TARG%%/bin/gcc-%%GCC_REV%%
+%%GCC_TARG%%/bin/gcov
 bin/%%GCC_TARG%%-cpp
 bin/%%GCC_TARG%%-gcc
+bin/%%GCC_TARG%%-gcc-%%GCC_REV%%
 bin/%%GCC_TARG%%-gccbug
 bin/%%GCC_TARG%%-gcov
-lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/cc1
-lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/collect2
-lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/cpp0
-lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/include/README
-lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/include/fixed
-lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/include/float.h
-lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/include/iso646.h
-lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/include/limits.h
-lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/include/stdarg.h
-lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/include/stdbool.h
-lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/include/syslimits.h
-lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/include/stddef.h
-lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/include/varargs.h
-lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/libgcc.a
-lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/msp1/libgcc.a
-lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/msp2/libgcc.a
-lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/tradcpp0
-lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/specs
-@dirrm lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/include
-@dirrm lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/msp1
-@dirrm lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/msp2
-@dirrm lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%
-@dirrm lib/gcc-lib/%%GCC_TARG%%
-@unexec rmdir %D/lib/gcc-lib 2> /dev/null || true
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/include/README
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/include/float.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/include/iso646.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/include/limits.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/include/stdarg.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/include/stdbool.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/include/stddef.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/include/unwind.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/include/varargs.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/mkheaders.conf
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include/float.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include/iso646.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include/limits.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include/stdarg.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include/stdbool.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include/stddef.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include/unwind.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include/varargs.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/libgcc.a
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/libgcov.a
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/msp1/libgcc.a
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/msp1/libgcov.a
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/msp2/libgcc.a
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/msp2/libgcov.a
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/specs
+libexec/gcc/%%GCC_TARG%%/%%GCC_REV%%/cc1
+libexec/gcc/%%GCC_TARG%%/%%GCC_REV%%/collect2
+libexec/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/mkheaders
+@dirrm lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/include
+@dirrm lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include
+@dirrm lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools
+@dirrm lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/msp1
+@dirrm lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/msp2
+@dirrm lib/gcc/%%GCC_TARG%%/%%GCC_REV%%
+@dirrm lib/gcc/%%GCC_TARG%%
+@unexec rmdir %D/lib/gcc 2> /dev/null || true
+@dirrm libexec/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools
+@dirrm libexec/gcc/%%GCC_TARG%%/%%GCC_REV%%
+@dirrm libexec/gcc/%%GCC_TARG%%
+@unexec rmdir %D/libexec/gcc 2> /dev/null || true
+
diff --git a/devel/msp430-gcc3/Makefile b/devel/msp430-gcc3/Makefile
index 729bac601a9f..e405fc9656d5 100644
--- a/devel/msp430-gcc3/Makefile
+++ b/devel/msp430-gcc3/Makefile
@@ -17,15 +17,15 @@ DISTFILES=	${PORTNAME}-core-${GCCVERSION}${EXTRACT_SUFX} \
 		${PKGNAMEPREFIX}${PORTNAME}-${GCCVERSION}.${PATCHVERSION}${EXTRACT_SUFX}:patches
 
 MAINTAINER=	lev@FreeBSD.org
-COMMENT=	FSF gcc-3.2 for TI's msp430 MCUs cross-development
+COMMENT=	FSF gcc-3.4 for TI's msp430 MCUs cross-development
 
 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
 
-GCCVERSION=	3.2.3
-PATCHVERSION=	20040329
+GCCVERSION=	3.4.1
+PATCHVERSION=	20040723
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${GCCVERSION}
 
@@ -34,7 +34,9 @@ USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 USE_INC_LIBTOOL_VER=	13
 CONFIGURE_ARGS=	--target=${PKGNAMEPREFIX:S/-$//} \
-		--enable-languages=c --disable-nls
+		--with-gcc --with-gnu-ld --with-gnu-as \
+		--enable-languages=c --disable-nls \
+		--infodir=${PREFIX}/${PKGNAMEPREFIX:S/-$//}/info
 MAKE_ENV=	PATH=${PREFIX}/bin:${PATH}
 LIBTOOLFILES=	configure gcc/configure
 MAN1=		${PKGNAMEPREFIX}gcc.1 ${PKGNAMEPREFIX}cpp.1 ${PKGNAMEPREFIX}gcov.1
@@ -42,7 +44,10 @@ MAN1=		${PKGNAMEPREFIX}gcc.1 ${PKGNAMEPREFIX}cpp.1 ${PKGNAMEPREFIX}gcov.1
 PLIST_SUB+=	PORTVERSION=${PORTVERSION} GCC_TARG=${PKGNAMEPREFIX:S/-$//} \
 		GCC_REV=${GCCVERSION}
 
-BINARIES=	gcc cpp
+INFO=		cpp cppinternals gcc gccinstall gccint
+INFO_PATH=	${PKGNAMEPREFIX:S/-$//}/info
+
+BINARIES=	gcc gcc-${GCCVERSION} gcov cpp
 
 .include <bsd.port.pre.mk>
 
@@ -53,11 +58,10 @@ BROKEN=		"Does not compile on amd64 due to platform rename"
 
 post-configure:
 	@${PERL} -pi.bak -e 's,^(TARGET_CONFIGDIRS\s*=).+$$,\1,' ${WRKSRC}/Makefile
-	@${PERL} -pi.bak -e 's,^(install-info:),\1\ndonot-\1,' ${WRKSRC}/gcc/Makefile
+#	@${PERL} -pi.bak -e 's,^(install-info:),\1\ndonot-\1,' ${WRKSRC}/gcc/Makefile
 
 post-install:
 .for F in ${BINARIES}
-	@${STRIP_CMD} ${PREFIX}/bin/${PKGNAMEPREFIX}$F
 	@${LN} -f ${PREFIX}/bin/${PKGNAMEPREFIX}$F \
 		${PREFIX}/${PKGNAMEPREFIX:S/-$//}/bin/$F
 .endfor
diff --git a/devel/msp430-gcc3/distinfo b/devel/msp430-gcc3/distinfo
index 28df2d384b08..f25fc7fcda1d 100644
--- a/devel/msp430-gcc3/distinfo
+++ b/devel/msp430-gcc3/distinfo
@@ -1,4 +1,4 @@
-MD5 (gcc-core-3.2.3.tar.bz2) = 66664a84b383ba8d68612cd89b9478b2
-SIZE (gcc-core-3.2.3.tar.bz2) = 10324429
-MD5 (msp430-gcc-3.2.3.20040329.tar.bz2) = 04d01f3252dd1ee07fef454dc49be5c5
-SIZE (msp430-gcc-3.2.3.20040329.tar.bz2) = 102461
+MD5 (gcc-core-3.4.1.tar.bz2) = 4b05b134baf92457494a0f4a28aa5213
+SIZE (gcc-core-3.4.1.tar.bz2) = 12862544
+MD5 (msp430-gcc-3.4.1.20040723.tar.bz2) = d600065fb644113a72ed6897f0b38e1c
+SIZE (msp430-gcc-3.4.1.20040723.tar.bz2) = 139467
diff --git a/devel/msp430-gcc3/files/patch-Makefile.in b/devel/msp430-gcc3/files/patch-Makefile.in
index b59814de68d5..02ba348652f8 100644
--- a/devel/msp430-gcc3/files/patch-Makefile.in
+++ b/devel/msp430-gcc3/files/patch-Makefile.in
@@ -1,10 +1,17 @@
---- Makefile.in.orig	Wed Oct 15 18:17:00 2003
-+++ Makefile.in	Wed Oct 15 18:17:28 2003
-@@ -715,7 +715,6 @@
- 	install-itcl \
- 	install-ld \
- 	install-libgui \
--	install-libiberty \
- 	install-libtool \
- 	install-m4 \
- 	install-make \
+--- Makefile.in.orig	Tue Aug  3 13:53:30 2004
++++ Makefile.in	Tue Aug  3 13:53:56 2004
+@@ -19885,10 +19885,10 @@
+ maybe-install-libiberty:
+ 
+ install-libiberty: installdirs
+-	@r=`${PWD_COMMAND}`; export r; \
+-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+-	$(SET_LIB_PATH) \
+-	(cd libiberty && $(MAKE) $(FLAGS_TO_PASS) install)
++#	@r=`${PWD_COMMAND}`; export r; \
++#	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++#	$(SET_LIB_PATH) \
++#	(cd libiberty && $(MAKE) $(FLAGS_TO_PASS) install)
+ 
+ 
+ .PHONY: configure-libtool maybe-configure-libtool
diff --git a/devel/msp430-gcc3/files/patch-gcc-Makefile.in b/devel/msp430-gcc3/files/patch-gcc-Makefile.in
index 98a721e599fd..e27352523b1b 100644
--- a/devel/msp430-gcc3/files/patch-gcc-Makefile.in
+++ b/devel/msp430-gcc3/files/patch-gcc-Makefile.in
@@ -1,30 +1,12 @@
---- gcc/Makefile.in.orig	Fri Oct 17 16:22:44 2003
-+++ gcc/Makefile.in	Fri Oct 17 16:24:38 2003
-@@ -2685,21 +2685,12 @@
- 	  $(INSTALL_DATA) $(docdir)/gcc.1 $(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext); \
- 	  chmod a-x $(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext); \
- 	fi
--	-rm -f $(DESTDIR)$(man1dir)/cpp$(man1ext)
--	-$(INSTALL_DATA) $(docdir)/cpp.1 $(DESTDIR)$(man1dir)/cpp$(man1ext)
--	-chmod a-x $(DESTDIR)$(man1dir)/cpp$(man1ext)
--	-rm -f $(DESTDIR)$(man1dir)/gcov$(man1ext)
--	-$(INSTALL_DATA) $(docdir)/gcov.1 $(DESTDIR)$(man1dir)/gcov$(man1ext)
--	-chmod a-x $(DESTDIR)$(man1dir)/gcov$(man1ext)
--	-rm -f $(DESTDIR)$(man7dir)/fsf-funding$(man7ext)
--	-$(INSTALL_DATA) $(docdir)/fsf-funding.7 $(DESTDIR)$(man7dir)/fsf-funding$(man7ext)
--	-chmod a-x $(DESTDIR)$(man7dir)/fsf-funding$(man7ext)
--	-rm -f $(DESTDIR)$(man7dir)/gfdl$(man7ext)
--	-$(INSTALL_DATA) $(docdir)/gfdl.7 $(DESTDIR)$(man7dir)/gfdl$(man7ext)
--	-chmod a-x $(DESTDIR)$(man7dir)/gfdl$(man7ext)
--	-rm -f $(DESTDIR)$(man7dir)/gpl$(man7ext)
--	-$(INSTALL_DATA) $(docdir)/gpl.7 $(DESTDIR)$(man7dir)/gpl$(man7ext)
--	-chmod a-x $(DESTDIR)$(man7dir)/gpl$(man7ext)
-+	-rm -f $(DESTDIR)$(man1dir)/$(CPP_CROSS_NAME)$(man1ext)
-+	-$(INSTALL_DATA) $(docdir)/cpp.1 $(DESTDIR)$(man1dir)/$(CPP_CROSS_NAME)$(man1ext)
-+	-chmod a-x $(DESTDIR)$(man1dir)/$(CPP_CROSS_NAME)$(man1ext)
-+	-rm -f $(DESTDIR)$(man1dir)/$(GCOV_INSTALL_NAME)$(man1ext)
-+	-$(INSTALL_DATA) $(docdir)/gcov.1 $(DESTDIR)$(man1dir)/$(GCOV_INSTALL_NAME)$(man1ext)
-+	-chmod a-x $(DESTDIR)$(man1dir)/$(GCOV_INSTALL_NAME)$(man1ext)
+--- gcc/Makefile.in.orig	Tue Aug  3 13:57:27 2004
++++ gcc/Makefile.in	Tue Aug  3 13:57:39 2004
+@@ -2963,9 +2963,6 @@
+ 	$(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext) \
+ 	$(DESTDIR)$(man1dir)/$(CPP_INSTALL_NAME)$(man1ext) \
+ 	$(DESTDIR)$(man1dir)/$(GCOV_INSTALL_NAME)$(man1ext) \
+-	$(DESTDIR)$(man7dir)/fsf-funding$(man7ext) \
+-	$(DESTDIR)$(man7dir)/gfdl$(man7ext) \
+-	$(DESTDIR)$(man7dir)/gpl$(man7ext)
  
- # Install the library.
- install-libgcc: libgcc.mk libgcc.a installdirs
+ $(DESTDIR)$(man7dir)/%$(man7ext): doc/%.7
+ 	-rm -f $@
diff --git a/devel/msp430-gcc3/pkg-plist b/devel/msp430-gcc3/pkg-plist
index 2a9e59815353..76c3d450c83f 100644
--- a/devel/msp430-gcc3/pkg-plist
+++ b/devel/msp430-gcc3/pkg-plist
@@ -1,30 +1,50 @@
 %%GCC_TARG%%/bin/cpp
 %%GCC_TARG%%/bin/gcc
+%%GCC_TARG%%/bin/gcc-%%GCC_REV%%
+%%GCC_TARG%%/bin/gcov
 bin/%%GCC_TARG%%-cpp
 bin/%%GCC_TARG%%-gcc
+bin/%%GCC_TARG%%-gcc-%%GCC_REV%%
 bin/%%GCC_TARG%%-gccbug
 bin/%%GCC_TARG%%-gcov
-lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/cc1
-lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/collect2
-lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/cpp0
-lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/include/README
-lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/include/fixed
-lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/include/float.h
-lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/include/iso646.h
-lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/include/limits.h
-lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/include/stdarg.h
-lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/include/stdbool.h
-lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/include/syslimits.h
-lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/include/stddef.h
-lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/include/varargs.h
-lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/libgcc.a
-lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/msp1/libgcc.a
-lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/msp2/libgcc.a
-lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/tradcpp0
-lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/specs
-@dirrm lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/include
-@dirrm lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/msp1
-@dirrm lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/msp2
-@dirrm lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%
-@dirrm lib/gcc-lib/%%GCC_TARG%%
-@unexec rmdir %D/lib/gcc-lib 2> /dev/null || true
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/include/README
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/include/float.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/include/iso646.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/include/limits.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/include/stdarg.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/include/stdbool.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/include/stddef.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/include/unwind.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/include/varargs.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/mkheaders.conf
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include/float.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include/iso646.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include/limits.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include/stdarg.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include/stdbool.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include/stddef.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include/unwind.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include/varargs.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/libgcc.a
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/libgcov.a
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/msp1/libgcc.a
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/msp1/libgcov.a
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/msp2/libgcc.a
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/msp2/libgcov.a
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/specs
+libexec/gcc/%%GCC_TARG%%/%%GCC_REV%%/cc1
+libexec/gcc/%%GCC_TARG%%/%%GCC_REV%%/collect2
+libexec/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/mkheaders
+@dirrm lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/include
+@dirrm lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include
+@dirrm lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools
+@dirrm lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/msp1
+@dirrm lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/msp2
+@dirrm lib/gcc/%%GCC_TARG%%/%%GCC_REV%%
+@dirrm lib/gcc/%%GCC_TARG%%
+@unexec rmdir %D/lib/gcc 2> /dev/null || true
+@dirrm libexec/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools
+@dirrm libexec/gcc/%%GCC_TARG%%/%%GCC_REV%%
+@dirrm libexec/gcc/%%GCC_TARG%%
+@unexec rmdir %D/libexec/gcc 2> /dev/null || true
+