- Update from 2.23.2 to 2.24

- Remove NLS support to avoid conflicts with other binutils ports
- Add stage support

Approved by:	kientzle (maintainer)

4 files changed, 35 insertions, 140 deletions

diff --git a/devel/arm-eabi-binutils/Makefile b/devel/arm-eabi-binutils/Makefile
index 67a29d741a70..02c9a940fb7c 100644
--- a/devel/arm-eabi-binutils/Makefile
+++ b/devel/arm-eabi-binutils/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	binutils
-PORTVERSION=	2.23.2
+PORTVERSION=	2.24
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
 MASTER_SITE_SUBDIR=	binutils/releases
@@ -10,36 +10,19 @@ PKGNAMEPREFIX=	arm-eabi-
 MAINTAINER=	kientzle@FreeBSD.org
 COMMENT=	GNU binutils for vanilla ARM cross-development
 
-OPTIONS_DEFINE=	NLS
-OPTIONS_SUB=	yes
-
 GNU_CONFIGURE=	yes
 USES=		gmake
-NLS_USES=	gettext
-NLS_CONFIGURE_ENABLE=	nls
-CFLAGS=		-I${PREFIX}/include
 
 USE_BZIP2=	yes
-CONFIGURE_ARGS=	--target=${PKGNAMEPREFIX:S/-$//} --enable-werror=no
+CONFIGURE_ARGS=	--disable-nls --target=${PKGNAMEPREFIX:S/-$//} --enable-werror=no
 INFO_PATH=	${PKGNAMEPREFIX:S/-$//}/info
-MAN1=		${PKGNAMEPREFIX}addr2line.1 ${PKGNAMEPREFIX}as.1 \
-		${PKGNAMEPREFIX}ar.1 ${PKGNAMEPREFIX}c++filt.1 \
-		${PKGNAMEPREFIX}dlltool.1 ${PKGNAMEPREFIX}ld.1 \
-		${PKGNAMEPREFIX}nlmconv.1 ${PKGNAMEPREFIX}nm.1 \
-		${PKGNAMEPREFIX}objcopy.1 ${PKGNAMEPREFIX}objdump.1 \
-		${PKGNAMEPREFIX}ranlib.1 ${PKGNAMEPREFIX}readelf.1 \
-		${PKGNAMEPREFIX}size.1 ${PKGNAMEPREFIX}strings.1 \
-		${PKGNAMEPREFIX}strip.1 ${PKGNAMEPREFIX}windres.1 \
-		${PKGNAMEPREFIX}elfedit.1 ${PKGNAMEPREFIX}windmc.1 \
-		${PKGNAMEPREFIX}gprof.1
 
-NO_STAGE=	yes
 post-install:
 .for F in addr2line c++filt elfedit gprof objcopy objdump readelf size strings
-	${LN} -f ${PREFIX}/bin/${PKGNAMEPREFIX}$F  \
-		${PREFIX}/${PKGNAMEPREFIX:S/-$//}/bin/$F
+	${LN} -f ${STAGEDIR}${PREFIX}/bin/${PKGNAMEPREFIX}$F  \
+		${STAGEDIR}${PREFIX}/${PKGNAMEPREFIX:S/-$//}/bin/$F
 .endfor
-	${RM} ${PREFIX}/${PKGNAMEPREFIX:S/-$//}/info/*
-	${RMDIR} ${PREFIX}/${PKGNAMEPREFIX:S/-$//}/info
+	${RM} -f ${STAGEDIR}${PREFIX}/${PKGNAMEPREFIX:S/-$//}/info/*
+	${RMDIR} ${STAGEDIR}${PREFIX}/${PKGNAMEPREFIX:S/-$//}/info
 
 .include <bsd.port.mk>
diff --git a/devel/arm-eabi-binutils/distinfo b/devel/arm-eabi-binutils/distinfo
index cb953194f9c8..642e3ea78d48 100644
--- a/devel/arm-eabi-binutils/distinfo
+++ b/devel/arm-eabi-binutils/distinfo
@@ -1,2 +1,2 @@
-SHA256 (binutils-2.23.2.tar.bz2) = fe914e56fed7a9ec2eb45274b1f2e14b0d8b4f41906a5194eac6883cfe5c1097
-SIZE (binutils-2.23.2.tar.bz2) = 21440347
+SHA256 (binutils-2.24.tar.bz2) = e5e8c5be9664e7f7f96e0d09919110ab5ad597794f5b1809871177a0f0f14137
+SIZE (binutils-2.24.tar.bz2) = 22716802
diff --git a/devel/arm-eabi-binutils/files/patch-binutils_readelf.c b/devel/arm-eabi-binutils/files/patch-binutils_readelf.c
deleted file mode 100644
index f8448ea97948..000000000000
--- a/devel/arm-eabi-binutils/files/patch-binutils_readelf.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- binutils/readelf.c.orig	2013-06-23 18:48:14.000000000 -0700
-+++ binutils/readelf.c	2013-06-23 18:48:36.000000000 -0700
-@@ -9043,7 +9043,7 @@
- 
-   n = print_vma (si, DEC_5);
-   if (n < 5)
--    fputs ("     " + n, stdout);
-+    fputs (&"     "[n], stdout);
-   printf (" %3lu: ", hn);
-   print_vma (psym->st_value, LONG_HEX);
-   putchar (' ');
diff --git a/devel/arm-eabi-binutils/pkg-plist b/devel/arm-eabi-binutils/pkg-plist
index 28547604c862..21e8a68da0c4 100644
--- a/devel/arm-eabi-binutils/pkg-plist
+++ b/devel/arm-eabi-binutils/pkg-plist
@@ -2,7 +2,10 @@ arm-eabi/bin/addr2line
 arm-eabi/bin/ar
 arm-eabi/bin/as
 arm-eabi/bin/c++filt
+arm-eabi/bin/elfedit
+arm-eabi/bin/gprof
 arm-eabi/bin/ld
+arm-eabi/bin/ld.bfd
 arm-eabi/bin/nm
 arm-eabi/bin/objcopy
 arm-eabi/bin/objdump
@@ -11,9 +14,6 @@ arm-eabi/bin/readelf
 arm-eabi/bin/size
 arm-eabi/bin/strings
 arm-eabi/bin/strip
-arm-eabi/bin/ld.bfd
-arm-eabi/bin/elfedit
-arm-eabi/bin/gprof
 arm-eabi/lib/ldscripts/armelf.x
 arm-eabi/lib/ldscripts/armelf.xbn
 arm-eabi/lib/ldscripts/armelf.xc
@@ -28,7 +28,10 @@ bin/arm-eabi-addr2line
 bin/arm-eabi-ar
 bin/arm-eabi-as
 bin/arm-eabi-c++filt
+bin/arm-eabi-elfedit
+bin/arm-eabi-gprof
 bin/arm-eabi-ld
+bin/arm-eabi-ld.bfd
 bin/arm-eabi-nm
 bin/arm-eabi-objcopy
 bin/arm-eabi-objdump
@@ -37,106 +40,26 @@ bin/arm-eabi-readelf
 bin/arm-eabi-size
 bin/arm-eabi-strings
 bin/arm-eabi-strip
-bin/arm-eabi-elfedit
-bin/arm-eabi-gprof
-bin/arm-eabi-ld.bfd
-lib/libiberty.a
-%%NLS%%share/locale/bg/LC_MESSAGES/binutils.mo
-%%NLS%%share/locale/bg/LC_MESSAGES/gprof.mo
-%%NLS%%share/locale/bg/LC_MESSAGES/ld.mo
-%%NLS%%share/locale/da/LC_MESSAGES/bfd.mo
-%%NLS%%share/locale/da/LC_MESSAGES/opcodes.mo
-%%NLS%%share/locale/da/LC_MESSAGES/binutils.mo
-%%NLS%%share/locale/da/LC_MESSAGES/gprof.mo
-%%NLS%%share/locale/da/LC_MESSAGES/ld.mo
-%%NLS%%share/locale/de/LC_MESSAGES/opcodes.mo
-%%NLS%%share/locale/de/LC_MESSAGES/gprof.mo
-%%NLS%%share/locale/eo/LC_MESSAGES/gprof.mo
-%%NLS%%share/locale/es/LC_MESSAGES/bfd.mo
-%%NLS%%share/locale/es/LC_MESSAGES/opcodes.mo
-%%NLS%%share/locale/es/LC_MESSAGES/binutils.mo
-%%NLS%%share/locale/es/LC_MESSAGES/gas.mo
-%%NLS%%share/locale/es/LC_MESSAGES/gprof.mo
-%%NLS%%share/locale/es/LC_MESSAGES/ld.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/bfd.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/opcodes.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/binutils.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/gas.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/gprof.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/ld.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/bfd.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/opcodes.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/binutils.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/gas.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/gprof.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/ld.mo
-%%NLS%%share/locale/ga/LC_MESSAGES/opcodes.mo
-%%NLS%%share/locale/ga/LC_MESSAGES/gprof.mo
-%%NLS%%share/locale/ga/LC_MESSAGES/ld.mo
-%%NLS%%share/locale/id/LC_MESSAGES/bfd.mo
-%%NLS%%share/locale/id/LC_MESSAGES/opcodes.mo
-%%NLS%%share/locale/id/LC_MESSAGES/binutils.mo
-%%NLS%%share/locale/id/LC_MESSAGES/gas.mo
-%%NLS%%share/locale/id/LC_MESSAGES/gprof.mo
-%%NLS%%share/locale/id/LC_MESSAGES/ld.mo
-%%NLS%%share/locale/it/LC_MESSAGES/opcodes.mo
-%%NLS%%share/locale/it/LC_MESSAGES/binutils.mo
-%%NLS%%share/locale/it/LC_MESSAGES/gprof.mo
-%%NLS%%share/locale/it/LC_MESSAGES/ld.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/bfd.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/binutils.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/gas.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/gprof.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/ld.mo
-%%NLS%%share/locale/ms/LC_MESSAGES/gprof.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/opcodes.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/gprof.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/opcodes.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/gprof.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/bfd.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/opcodes.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/binutils.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/gprof.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/bfd.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/binutils.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/gas.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/gprof.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/binutils.mo
-%%NLS%%share/locale/sr/LC_MESSAGES/gprof.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/bfd.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/opcodes.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/binutils.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/gprof.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/ld.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/bfd.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/opcodes.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/binutils.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/gas.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/gprof.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/ld.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/bfd.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/opcodes.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/binutils.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/gprof.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/ld.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/bfd.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/opcodes.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/binutils.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/gprof.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/ld.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/bfd.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/opcodes.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/binutils.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/ld.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/binutils.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/ld.mo
-%%NLS%%share/locale/rw/LC_MESSAGES/bfd.mo
-%%NLS%%share/locale/rw/LC_MESSAGES/binutils.mo
-%%NLS%%share/locale/rw/LC_MESSAGES/gas.mo
-%%NLS%%share/locale/rw/LC_MESSAGES/gprof.mo
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrm arm-eabi/bin
-@dirrm arm-eabi/lib/ldscripts
+man/man1/arm-eabi-addr2line.1.gz
+man/man1/arm-eabi-ar.1.gz
+man/man1/arm-eabi-as.1.gz
+man/man1/arm-eabi-c++filt.1.gz
+man/man1/arm-eabi-dlltool.1.gz
+man/man1/arm-eabi-elfedit.1.gz
+man/man1/arm-eabi-gprof.1.gz
+man/man1/arm-eabi-ld.1.gz
+man/man1/arm-eabi-nlmconv.1.gz
+man/man1/arm-eabi-nm.1.gz
+man/man1/arm-eabi-objcopy.1.gz
+man/man1/arm-eabi-objdump.1.gz
+man/man1/arm-eabi-ranlib.1.gz
+man/man1/arm-eabi-readelf.1.gz
+man/man1/arm-eabi-size.1.gz
+man/man1/arm-eabi-strings.1.gz
+man/man1/arm-eabi-strip.1.gz
+man/man1/arm-eabi-windmc.1.gz
+man/man1/arm-eabi-windres.1.gz
+@dirrmtry arm-eabi/lib/ldscripts
 @dirrmtry arm-eabi/lib
+@dirrmtry arm-eabi/bin
 @dirrmtry arm-eabi