2 files changed, 42 insertions, 3 deletions

diff --git a/devel/i386-rtems-binutils/Makefile b/devel/i386-rtems-binutils/Makefile
index 475c295043b4..0fb5a93ad80b 100644
--- a/devel/i386-rtems-binutils/Makefile
+++ b/devel/i386-rtems-binutils/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	binutils
 PORTVERSION=	2.13.2.1
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
 MASTER_SITE_SUBDIR=	binutils/releases
@@ -30,6 +30,7 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 ALL_TARGET=	all info
 NO_CPUCFLAGS=	yes
+USE_REINPLACE=	yes
 
 CONFIGURE_TARGET?=	--target=${LCLTARGET}
 CONFIGURE_ARGS?=	--verbose
@@ -44,8 +45,35 @@ MAN1=		${LCLTARGET}-ar.1 ${LCLTARGET}-nm.1 ${LCLTARGET}-objdump.1 \
 		${LCLTARGET}-objcopy.1 ${LCLTARGET}-addr2line.1 \
 		${LCLTARGET}-nlmconv.1 ${LCLTARGET}-as.1 ${LCLTARGET}-ld.1 \
 		${LCLTARGET}-dlltool.1 ${LCLTARGET}-readelf.1 \
-		${LCLTARGET}-windres.1
-INFO=		bfd binutils as ld
+		${LCLTARGET}-windres.1 ${LCLTARGET}-c++filt.1
+INFO=		${LCLTARGET}-as ${LCLTARGET}-bfd ${LCLTARGET}-binutils \
+		${LCLTARGET}-ld
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|setfilename as.info|setfilename ${LCLTARGET}-as.info|' ${WRKSRC}/gas/doc/as.texinfo
+	@${REINPLACE_CMD} -e 's|(as)|(${LCLTARGET}-as)|' ${WRKSRC}/gas/doc/as.texinfo 
+	@${REINPLACE_CMD} -e 's|@file{as}|@file{${LCLTARGET}-as}|' ${WRKSRC}/gas/doc/as.texinfo
+	@${REINPLACE_CMD} -e 's|as.info|${LCLTARGET}-as.info|' ${WRKSRC}/gas/doc/Makefile.in
+	@${REINPLACE_CMD} -e 's|as.texinfo|${LCLTARGET}-as.texinfo|' ${WRKSRC}/gas/doc/Makefile.in
+	@${MV} ${WRKSRC}/gas/doc/as.texinfo ${WRKSRC}/gas/doc/${LCLTARGET}-as.texinfo
+	@${REINPLACE_CMD} -e 's|setfilename bfd.info|setfilename ${LCLTARGET}-bfd.info|' ${WRKSRC}/bfd/doc/bfd.texinfo
+	@${REINPLACE_CMD} -e 's|(bfd)|(${LCLTARGET}-bfd)|' ${WRKSRC}/bfd/doc/bfd.texinfo 
+	@${REINPLACE_CMD} -e 's|@file{bfd}|@file{${LCLTARGET}-bfd}|' ${WRKSRC}/bfd/doc/bfd.texinfo
+	@${REINPLACE_CMD} -e 's|bfd.info|${LCLTARGET}-bfd.info|' ${WRKSRC}/bfd/doc/Makefile.in
+	@${REINPLACE_CMD} -e 's|bfd.texinfo|${LCLTARGET}-bfd.texinfo|' ${WRKSRC}/bfd/doc/Makefile.in
+	@${MV} ${WRKSRC}/bfd/doc/bfd.texinfo ${WRKSRC}/bfd/doc/${LCLTARGET}-bfd.texinfo
+	@${REINPLACE_CMD} -e 's|setfilename binutils.info|setfilename ${LCLTARGET}-binutils.info|' ${WRKSRC}/binutils/doc/binutils.texi
+	@${REINPLACE_CMD} -e 's|(binutils)|(${LCLTARGET}-binutils)|' ${WRKSRC}/binutils/doc/binutils.texi 
+	@${REINPLACE_CMD} -e 's|@file{binutils}|@file{${LCLTARGET}-binutils}|' ${WRKSRC}/binutils/doc/binutils.texi
+	@${REINPLACE_CMD} -e 's|binutils.info|${LCLTARGET}-binutils.info|' ${WRKSRC}/binutils/doc/Makefile.in
+	@${REINPLACE_CMD} -e 's|binutils.texi|${LCLTARGET}-binutils.texi|' ${WRKSRC}/binutils/doc/Makefile.in
+	@${MV} ${WRKSRC}/binutils/doc/binutils.texi ${WRKSRC}/binutils/doc/${LCLTARGET}-binutils.texi
+	@${REINPLACE_CMD} -e 's|setfilename ld.info|setfilename ${LCLTARGET}-ld.info|' ${WRKSRC}/ld/ld.texinfo
+	@${REINPLACE_CMD} -e 's|(ld)|(${LCLTARGET}-ld)|' ${WRKSRC}/ld/ld.texinfo 
+	@${REINPLACE_CMD} -e 's|@file{ld}|@file{${LCLTARGET}-ld}|' ${WRKSRC}/ld/ld.texinfo
+	@${REINPLACE_CMD} -e 's|ld.info|${LCLTARGET}-ld.info|' ${WRKSRC}/ld/Makefile.in
+	@${REINPLACE_CMD} -e 's|ld.texinfo|${LCLTARGET}-ld.texinfo|' ${WRKSRC}/ld/Makefile.in
+	@${MV} ${WRKSRC}/ld/ld.texinfo ${WRKSRC}/ld/${LCLTARGET}-ld.texinfo
 
 pre-configure:
 	@(cd ${WRKDIR} ; ${MKDIR} build-${LCLTARGET})
diff --git a/devel/i386-rtems-binutils/files/patch-etc::Makefile.in b/devel/i386-rtems-binutils/files/patch-etc::Makefile.in
new file mode 100644
index 000000000000..403319d7ea12
--- /dev/null
+++ b/devel/i386-rtems-binutils/files/patch-etc::Makefile.in
@@ -0,0 +1,11 @@
+--- etc/Makefile.in.orig	Sat Nov 15 12:15:31 2003
++++ etc/Makefile.in	Sat Nov 15 12:15:46 2003
+@@ -52,7 +52,7 @@
+ all:
+ 
+ # We want install to imply install-info as per GNU standards.
+-install: install-info
++install:
+ 
+ uninstall:
+