7 files changed, 103 insertions, 65 deletions

diff --git a/devel/m6811-binutils/Makefile b/devel/m6811-binutils/Makefile
index 0061843ce147..f491779e907c 100644
--- a/devel/m6811-binutils/Makefile
+++ b/devel/m6811-binutils/Makefile
@@ -6,31 +6,80 @@
 #
 
 PORTNAME=	binutils
-PORTVERSION=	2.11.2
-PORTREVISION=	1
+PORTVERSION=	2.15
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	binutils
 PKGNAMEPREFIX=	m6811-
 
 PATCH_SITES=	http://stephane.carrez.free.fr/snapshots/
-PATCHFILES=	${PORTNAME}-${PORTVERSION}-m68hc1x-20020203.diffs.gz
+PATCHFILES=	${PORTNAME}-${PORTVERSION}-m68hc1x-20040801.diffs.gz
 PATCH_DIST_STRIP=	-p1
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	The binutils-2.9.1 cross-toolchain for the 6811
+MAINTAINER=	andrew+ports@fubar.geek.nz
+COMMENT=	The binutils cross-toolchain for the 6811
 
 NOT_FOR_ARCHS=	amd64
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX} --target=m6811-elf	\
-			--program-prefix=m6811-elf-
-
-MAN1=		m6811-elf-ar.1 m6811-elf-nlmconv.1 m6811-elf-c++filt.1	\
-		m6811-elf-nm.1 m6811-elf-objdump.1 m6811-elf-ranlib.1	\
-		m6811-elf-size.1 m6811-elf-strings.1 m6811-elf-strip.1	\
-		m6811-elf-objcopy.1 m6811-elf-addr2line.1		\
-		m6811-elf-as.1 m6811-elf-ld.1 \
-		m6811-elf-dlltool.1 m6811-elf-readelf.1 m6811-elf-windres.1
+
+M68_TARGET=	m6811-elf
+
+CONFIGURE_ARGS=	--prefix=${PREFIX} \
+		--target=${M68_TARGET} \
+		--program-prefix=${M68_TARGET}- \
+		--disable-nls
+
+MAN1=		${M68_TARGET}-addr2line.1 \
+		${M68_TARGET}-ar.1 \
+		${M68_TARGET}-as.1 \
+		${M68_TARGET}-c++filt.1 \
+		${M68_TARGET}-dlltool.1 \
+		${M68_TARGET}-ld.1 \
+		${M68_TARGET}-nlmconv.1 \
+		${M68_TARGET}-nm.1 \
+		${M68_TARGET}-objcopy.1 \
+		${M68_TARGET}-objdump.1 \
+		${M68_TARGET}-ranlib.1 \
+		${M68_TARGET}-readelf.1 \
+		${M68_TARGET}-size.1 \
+		${M68_TARGET}-strings.1 \
+		${M68_TARGET}-strip.1 \
+		${M68_TARGET}-windres.1
+
+INFO=		${M68_TARGET}-as \
+		${M68_TARGET}-bfd \
+		${M68_TARGET}-binutils \
+		${M68_TARGET}-ld \
+
+post-patch:
+	# as.info -> ${M68_TARGET}-as.info
+	@${REINPLACE_CMD} -e 's|setfilename as.info|setfilename ${M68_TARGET}-as.info|' ${WRKSRC}/gas/doc/as.texinfo
+	@${REINPLACE_CMD} -e 's|(as)|(${M68_TARGET}-as)|' ${WRKSRC}/gas/doc/as.texinfo
+	@${REINPLACE_CMD} -e 's|@file{as}|@file{${M68_TARGET}-as}|' ${WRKSRC}/gas/doc/as.texinfo
+	@${REINPLACE_CMD} -e 's|as.info|${M68_TARGET}-as.info|' ${WRKSRC}/gas/doc/Makefile.in
+	@${REINPLACE_CMD} -e 's|as.texinfo|${M68_TARGET}-as.texinfo|' ${WRKSRC}/gas/doc/Makefile.in
+	@${MV} ${WRKSRC}/gas/doc/as.texinfo ${WRKSRC}/gas/doc/${M68_TARGET}-as.texinfo
+	# bfd.info -> ${M68_TARGET}-bfd.info
+	@${REINPLACE_CMD} -e 's|setfilename bfd.info|setfilename ${M68_TARGET}-bfd.info|' ${WRKSRC}/bfd/doc/bfd.texinfo
+	@${REINPLACE_CMD} -e 's|(bfd)|(${M68_TARGET}-bfd)|' ${WRKSRC}/bfd/doc/bfd.texinfo
+	@${REINPLACE_CMD} -e 's|@file{bfd}|@file{${M68_TARGET}-bfd}|' ${WRKSRC}/bfd/doc/bfd.texinfo
+	@${REINPLACE_CMD} -e 's|bfd.info|${M68_TARGET}-bfd.info|' ${WRKSRC}/bfd/doc/Makefile.in
+	@${REINPLACE_CMD} -e 's|bfd.texinfo|${M68_TARGET}-bfd.texinfo|' ${WRKSRC}/bfd/doc/Makefile.in
+	@${MV} ${WRKSRC}/bfd/doc/bfd.texinfo ${WRKSRC}/bfd/doc/${M68_TARGET}-bfd.texinfo
+	# binutils.info -> ${M68_TARGET}-binutils.info
+	@${REINPLACE_CMD} -e 's|setfilename binutils.info|setfilename ${M68_TARGET}-binutils.info|' ${WRKSRC}/binutils/doc/binutils.texi
+	@${REINPLACE_CMD} -e 's|(binutils)|(${M68_TARGET}-binutils)|' ${WRKSRC}/binutils/doc/binutils.texi
+	@${REINPLACE_CMD} -e 's|@file{binutils}|@file{${M68_TARGET}-binutils}|' ${WRKSRC}/binutils/doc/binutils.texi
+	@${REINPLACE_CMD} -e 's|binutils.info|${M68_TARGET}-binutils.info|' ${WRKSRC}/binutils/doc/Makefile.in
+	@${REINPLACE_CMD} -e 's|binutils.texi|${M68_TARGET}-binutils.texi|' ${WRKSRC}/binutils/doc/Makefile.in
+	@${MV} ${WRKSRC}/binutils/doc/binutils.texi ${WRKSRC}/binutils/doc/${M68_TARGET}-binutils.texi
+	# ld.info -> ${M68_TARGET}-ld.info
+	@${REINPLACE_CMD} -e 's|setfilename ld.info|setfilename ${M68_TARGET}-ld.info|' ${WRKSRC}/ld/ld.texinfo
+	@${REINPLACE_CMD} -e 's|(ld)|(${M68_TARGET}-ld)|' ${WRKSRC}/ld/ld.texinfo
+	@${REINPLACE_CMD} -e 's|@file{ld}|@file{${M68_TARGET}-ld}|' ${WRKSRC}/ld/ld.texinfo
+	@${REINPLACE_CMD} -e 's|ld.info|${M68_TARGET}-ld.info|' ${WRKSRC}/ld/Makefile.in
+	@${REINPLACE_CMD} -e 's|ld.texinfo|${M68_TARGET}-ld.texinfo|' ${WRKSRC}/ld/Makefile.in
+	@${MV} ${WRKSRC}/ld/ld.texinfo ${WRKSRC}/ld/${M68_TARGET}-ld.texinfo
 
 .include <bsd.port.mk>
diff --git a/devel/m6811-binutils/distinfo b/devel/m6811-binutils/distinfo
index 5e1edc456a87..c05fe8c75946 100644
--- a/devel/m6811-binutils/distinfo
+++ b/devel/m6811-binutils/distinfo
@@ -1,6 +1,6 @@
-MD5 (binutils-2.11.2.tar.gz) = 7a3df361177d491069cb5edbdc15e57c
-SHA256 (binutils-2.11.2.tar.gz) = 5d600829fa397c6be7f3c51cb6ee135da50b39c3628d7f9fa660171ea4700f11
-SIZE (binutils-2.11.2.tar.gz) = 9934295
-MD5 (binutils-2.11.2-m68hc1x-20020203.diffs.gz) = 18037c3c83fdcee754b14fd2874a9918
-SHA256 (binutils-2.11.2-m68hc1x-20020203.diffs.gz) = 39b2e6e23a6542e6899faca856c438132c98c07cbc223ecec88225936d7c5928
-SIZE (binutils-2.11.2-m68hc1x-20020203.diffs.gz) = 278467
+MD5 (binutils-2.15.tar.gz) = ea140e23ae50a61a79902aa67da5214e
+SHA256 (binutils-2.15.tar.gz) = 0a4be462aa8d10a85f7cfb60c85aed34d37de285799106f2015e6ae03d4d8c17
+SIZE (binutils-2.15.tar.gz) = 15134701
+MD5 (binutils-2.15-m68hc1x-20040801.diffs.gz) = 2db793b6820b625c1340394abcbde76d
+SHA256 (binutils-2.15-m68hc1x-20040801.diffs.gz) = b1b5daca325ea8033b9f979026b35ac86856519de3a19254a8404a18f719dc58
+SIZE (binutils-2.15-m68hc1x-20040801.diffs.gz) = 3748
diff --git a/devel/m6811-binutils/files/patch-etc-Makefile.in b/devel/m6811-binutils/files/patch-etc-Makefile.in
new file mode 100644
index 000000000000..403319d7ea12
--- /dev/null
+++ b/devel/m6811-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:
+ 
diff --git a/devel/m6811-binutils/files/patch-libiberty-Makefile.in b/devel/m6811-binutils/files/patch-libiberty-Makefile.in
new file mode 100644
index 000000000000..df63fdc1efb5
--- /dev/null
+++ b/devel/m6811-binutils/files/patch-libiberty-Makefile.in
@@ -0,0 +1,11 @@
+--- libiberty/Makefile.in.orig	Fri Jan 23 08:34:11 2004
++++ libiberty/Makefile.in	Wed Jul 19 23:58:35 2006
+@@ -266,7 +266,7 @@
+ @MAINT@	echo stamp > stamp-functions
+ 
+ INSTALL_DEST = @INSTALL_DEST@
+-install: install_to_$(INSTALL_DEST) install-subdir
++install:
+ 
+ install_to_libdir: all
+ 	${mkinstalldirs} $(DESTDIR)$(libdir)$(MULTISUBDIR)
diff --git a/devel/m6811-binutils/files/patch-libiberty-strerror.c b/devel/m6811-binutils/files/patch-libiberty-strerror.c
deleted file mode 100644
index e6532458c516..000000000000
--- a/devel/m6811-binutils/files/patch-libiberty-strerror.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- libiberty/strerror.c.orig	Mon May 29 13:45:32 2000
-+++ libiberty/strerror.c	Wed Dec 11 21:03:00 2002
-@@ -465,8 +465,8 @@
- 
- #else
- 
--extern int sys_nerr;
--extern char *sys_errlist[];
-+extern const int sys_nerr;
-+extern const char *sys_errlist[];
- 
- #endif
- 
diff --git a/devel/m6811-binutils/files/patch-libiberty-strsignal.c b/devel/m6811-binutils/files/patch-libiberty-strsignal.c
deleted file mode 100644
index fa635baf14b1..000000000000
--- a/devel/m6811-binutils/files/patch-libiberty-strsignal.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libiberty/strsignal.c.orig	Mon May 29 13:45:32 2000
-+++ libiberty/strsignal.c	Wed Dec 11 21:04:43 2002
-@@ -247,7 +247,7 @@
- #else
- 
- #ifdef NSIG
--static int sys_nsig = NSIG;
-+static const int sys_nsig = NSIG;
- #else
- #ifdef _NSIG
- static int sys_nsig = _NSIG;
diff --git a/devel/m6811-binutils/pkg-plist b/devel/m6811-binutils/pkg-plist
index cb9ab962a319..2556d2079e63 100644
--- a/devel/m6811-binutils/pkg-plist
+++ b/devel/m6811-binutils/pkg-plist
@@ -1,31 +1,22 @@
-bin/m6811-elf-size
-bin/m6811-elf-objdump
-bin/m6811-elf-ar
-bin/m6811-elf-strings
-bin/m6811-elf-ranlib
-bin/m6811-elf-c++filt
-bin/m6811-elf-objcopy
 bin/m6811-elf-addr2line
-bin/m6811-elf-nm
-bin/m6811-elf-strip
+bin/m6811-elf-ar
 bin/m6811-elf-as
-bin/m6811-elf-gasp
+bin/m6811-elf-c++filt
 bin/m6811-elf-ld
+bin/m6811-elf-nm
+bin/m6811-elf-objcopy
+bin/m6811-elf-objdump
+bin/m6811-elf-ranlib
 bin/m6811-elf-readelf
-include/bfd.h
-include/ansidecl.h
-include/bfdlink.h
-lib/libiberty.a
-lib/libbfd.la
-lib/libbfd.a
-lib/libopcodes.la
-lib/libopcodes.a
-m6811-elf/bin/nm
-m6811-elf/bin/strip
+bin/m6811-elf-size
+bin/m6811-elf-strings
+bin/m6811-elf-strip
 m6811-elf/bin/ar
-m6811-elf/bin/ranlib
 m6811-elf/bin/as
 m6811-elf/bin/ld
+m6811-elf/bin/nm
+m6811-elf/bin/ranlib
+m6811-elf/bin/strip
 m6811-elf/lib/ldscripts/m68hc11elf.x
 m6811-elf/lib/ldscripts/m68hc11elf.xbn
 m6811-elf/lib/ldscripts/m68hc11elf.xn