From e725445cb101c266a1355828dbc5fb780277e0f2 Mon Sep 17 00:00:00 2001
From: Ruslan Makhmatkhanov <rm@FreeBSD.org>
Date: Tue, 4 Mar 2014 11:44:05 +0000
Subject: [PATCH] devel/mingw32-binutils: update to 2.24 and support staging

- update to 2.24
- support staging

PR:		187236
Submitted by:	Naram Qashat <cyberbotx@cyberbotx.com> (maintainer)
---
 devel/mingw32-binutils/Makefile               | 21 ++------------
 devel/mingw32-binutils/distinfo               |  4 +--
 .../files/patch-binutils-windres.c            | 29 -------------------
 devel/mingw32-binutils/pkg-plist              | 19 ++++++++++++
 4 files changed, 24 insertions(+), 49 deletions(-)
 delete mode 100644 devel/mingw32-binutils/files/patch-binutils-windres.c

diff --git a/devel/mingw32-binutils/Makefile b/devel/mingw32-binutils/Makefile
index 3a18098bc101..d3a219bbb3f5 100644
--- a/devel/mingw32-binutils/Makefile
+++ b/devel/mingw32-binutils/Makefile
@@ -13,7 +13,7 @@ PKGNAMEPREFIX=	mingw32-
 MAINTAINER=	cyberbotx@cyberbotx.com
 COMMENT=	GNU Binutils for Windows cross-development
 
-BINUTILVERSION=	2.23.1
+BINUTILVERSION=	2.24
 
 USE_BZIP2=	yes
 USES=		gmake iconv
@@ -24,17 +24,6 @@ CONFIGURE_ARGS=	--target=${PKGNAMEPREFIX:S/-$//} \
 		--disable-shared --disable-werror
 INFO_PATH=	${PKGNAMEPREFIX:S/-$//}/info
 
-MAN1=	${PKGNAMEPREFIX}addr2line.1 ${PKGNAMEPREFIX}ar.1    \
-	${PKGNAMEPREFIX}as.1 ${PKGNAMEPREFIX}c++filt.1      \
-	${PKGNAMEPREFIX}dlltool.1 ${PKGNAMEPREFIX}elfedit.1 \
-	${PKGNAMEPREFIX}gprof.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}windmc.1    \
-	${PKGNAMEPREFIX}windres.1
-
 INFO=		as bfd binutils ld configure gprof standards
 INFO_PATH=	${PKGNAMEPREFIX:S/-$//}/info
 
@@ -43,14 +32,10 @@ PLIST_SUB+=	BINUTILS_TARG=${PKGNAMEPREFIX:S/-$//}
 BINARIES=	addr2line ar as c++filt gprof ld nm objcopy objdump ranlib \
 		readelf size strings strip dlltool dllwrap windmc windres
 
-NO_STAGE=	yes
-pre-configure:
-	${CHMOD} 755 ${WRKSRC}/configure
-
 post-install:
 .for F in ${BINARIES}
-	@${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
 
 #
diff --git a/devel/mingw32-binutils/distinfo b/devel/mingw32-binutils/distinfo
index 5e013a46f608..642e3ea78d48 100644
--- a/devel/mingw32-binutils/distinfo
+++ b/devel/mingw32-binutils/distinfo
@@ -1,2 +1,2 @@
-SHA256 (binutils-2.23.1.tar.bz2) = 2ab2e5b03e086d12c6295f831adad46b3e1410a3a234933a2e8fac66cb2e7a19
-SIZE (binutils-2.23.1.tar.bz2) = 21455321
+SHA256 (binutils-2.24.tar.bz2) = e5e8c5be9664e7f7f96e0d09919110ab5ad597794f5b1809871177a0f0f14137
+SIZE (binutils-2.24.tar.bz2) = 22716802
diff --git a/devel/mingw32-binutils/files/patch-binutils-windres.c b/devel/mingw32-binutils/files/patch-binutils-windres.c
deleted file mode 100644
index 1677253a7772..000000000000
--- a/devel/mingw32-binutils/files/patch-binutils-windres.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- binutils/winduni.c.orig	Fri Jun  8 01:15:17 2012
-+++ binutils/winduni.c	Fri Jun  8 01:17:33 2012
-@@ -85,7 +85,7 @@
-   { 1258, "WINDOWS-1258" },
-   { CP_UTF7, "UTF-7" },
-   { CP_UTF8, "UTF-8" },
--  { CP_UTF16, "UTF-16" },
-+  { CP_UTF16, "UTF-16LE" },
-   { (rc_uint_type) -1, NULL }
- };
- 
-@@ -682,7 +682,7 @@
- 
-   if (!mb || !iconv_name)
-     return 0;
--  iconv_t cd = iconv_open ("UTF-16", iconv_name);
-+  iconv_t cd = iconv_open ("UTF-16LE", iconv_name);
- 
-   while (1)
-     {
-@@ -755,7 +755,7 @@
- 
-   if (!u || !iconv_name)
-     return 0;
--  iconv_t cd = iconv_open (iconv_name, "UTF-16");
-+  iconv_t cd = iconv_open (iconv_name, "UTF-16LE");
- 
-   while (1)
-     {
diff --git a/devel/mingw32-binutils/pkg-plist b/devel/mingw32-binutils/pkg-plist
index bc8383bd6412..dd7539711bff 100644
--- a/devel/mingw32-binutils/pkg-plist
+++ b/devel/mingw32-binutils/pkg-plist
@@ -1,3 +1,22 @@
+man/man1/mingw32-addr2line.1.gz
+man/man1/mingw32-ar.1.gz
+man/man1/mingw32-as.1.gz
+man/man1/mingw32-c++filt.1.gz
+man/man1/mingw32-dlltool.1.gz
+man/man1/mingw32-elfedit.1.gz
+man/man1/mingw32-gprof.1.gz
+man/man1/mingw32-ld.1.gz
+man/man1/mingw32-nlmconv.1.gz
+man/man1/mingw32-nm.1.gz
+man/man1/mingw32-objcopy.1.gz
+man/man1/mingw32-objdump.1.gz
+man/man1/mingw32-ranlib.1.gz
+man/man1/mingw32-readelf.1.gz
+man/man1/mingw32-size.1.gz
+man/man1/mingw32-strings.1.gz
+man/man1/mingw32-strip.1.gz
+man/man1/mingw32-windmc.1.gz
+man/man1/mingw32-windres.1.gz
 %%BINUTILS_TARG%%/bin/addr2line
 %%BINUTILS_TARG%%/bin/ar
 %%BINUTILS_TARG%%/bin/as