Update to 2.17.

PR:		153607
Submitted by:	Pedro Giffuni <giffunip@tutopia.com>
Approved by:	maintainer timeout (~8 months)

7 files changed, 65 insertions, 14 deletions

diff --git a/devel/djgpp-binutils/Makefile b/devel/djgpp-binutils/Makefile
index a52960e38fa..f5085dcf823 100644
--- a/devel/djgpp-binutils/Makefile
+++ b/devel/djgpp-binutils/Makefile
@@ -6,28 +6,29 @@
 #
 
 PORTNAME=	binutils
-PORTVERSION=	${BINUTILVERSION}.${PATCHVERSION}
+PORTVERSION=	${BINUTILVERSION}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
 MASTER_SITE_SUBDIR=	binutils/releases
 PKGNAMEPREFIX=	djgpp-
-DISTNAME=	${PORTNAME}-${BINUTILVERSION}.${PATCHVERSION}
+DISTNAME=	${PORTNAME}-${BINUTILVERSION}
 
 MAINTAINER=	johnson.peter@gmail.com
 COMMENT=	FSF binutils-2.16 for DJGPP cross-development
 
-BINUTILVERSION=	2.16
-PATCHVERSION=	1
+LICENSE=	GPLv2
+
+BINUTILVERSION=	2.17
 
 TARGET=		i586-pc-msdosdjgpp
 
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
 
-#USE_BZIP2=	yes
+USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-SRCDIR=		${WRKDIR}/binutils-${BINUTILVERSION}.${PATCHVERSION}
+SRCDIR=		${WRKDIR}/binutils-${BINUTILVERSION}
 WRKSRC=		${WRKDIR}/build
 CONFIGURE_ARGS=	--target=${TARGET} \
 		--with-gcc --with-gnu-ld --with-gnu-as \
diff --git a/devel/djgpp-binutils/distinfo b/devel/djgpp-binutils/distinfo
index 3315cf56668..930910a6950 100644
--- a/devel/djgpp-binutils/distinfo
+++ b/devel/djgpp-binutils/distinfo
@@ -1,2 +1,2 @@
-SHA256 (binutils-2.16.1.tar.gz) = 13360c72d01411078f4f9b2b28cca87d5e258e38d2e006f8ece97db8be14c9b9
-SIZE (binutils-2.16.1.tar.gz) = 16378360
+SHA256 (binutils-2.17.tar.bz2) = e2c33ce6f23c9a366f109ced295626cb2f8bd6b2f08ff9df6dafb5448505a25e
+SIZE (binutils-2.17.tar.bz2) = 13795751
diff --git a/devel/djgpp-binutils/files/patch-Makefile.in b/devel/djgpp-binutils/files/patch-Makefile.in
index bb55c0ff0fa..be4ef81874e 100644
--- a/devel/djgpp-binutils/files/patch-Makefile.in
+++ b/devel/djgpp-binutils/files/patch-Makefile.in
@@ -1,18 +1,18 @@
---- Makefile.in.orig	Sun Jun 12 12:30:54 2005
-+++ Makefile.in	Sat Jan 27 13:15:06 2007
-@@ -13934,12 +13934,12 @@
+--- Makefile.in.orig	2011-01-01 16:15:19.000000000 +0000
++++ Makefile.in	2011-01-01 16:17:27.000000000 +0000
+@@ -19256,12 +19256,12 @@
  maybe-install-libiberty: install-libiberty
  
  install-libiberty: installdirs
+-	@: $(MAKE); $(unstage)
 -	@r=`${PWD_COMMAND}`; export r; \
 -	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
--	$(SET_LIB_PATH) \
 -	$(HOST_EXPORTS) \
 -	(cd $(HOST_SUBDIR)/libiberty && \
 -	  $(MAKE) $(FLAGS_TO_PASS)  install)
++#	@: $(MAKE); $(unstage)
 +#	@r=`${PWD_COMMAND}`; export r; \
 +#	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+#	$(SET_LIB_PATH) \
 +#	$(HOST_EXPORTS) \
 +#	(cd $(HOST_SUBDIR)/libiberty && \
 +#	  $(MAKE) $(FLAGS_TO_PASS)  install)
diff --git a/devel/djgpp-binutils/files/patch-binutils-objcopy.c b/devel/djgpp-binutils/files/patch-binutils-objcopy.c
new file mode 100644
index 00000000000..201ecb2b8a2
--- /dev/null
+++ b/devel/djgpp-binutils/files/patch-binutils-objcopy.c
@@ -0,0 +1,12 @@
+--- binutils/objcopy.c	2007/06/29 00:34:14	1.115
++++ binutils/objcopy.c	2007/07/02 08:05:06	1.116
+@@ -910,8 +910,7 @@
+ {
+   asymbol **from = isyms, **to = osyms;
+   long src_count = 0, dst_count = 0;
+-  int relocatable = (abfd->flags & (HAS_RELOC | EXEC_P | DYNAMIC))
+-		    == HAS_RELOC;
++  int relocatable = (abfd->flags & (EXEC_P | DYNAMIC)) == 0;
+ 
+   for (; src_count < symcount; src_count++)
+     {
diff --git a/devel/djgpp-binutils/files/patch-ld-elf.sc b/devel/djgpp-binutils/files/patch-ld-elf.sc
new file mode 100644
index 00000000000..3fcde5f7be6
--- /dev/null
+++ b/devel/djgpp-binutils/files/patch-ld-elf.sc
@@ -0,0 +1,23 @@
+RCS file: /cvs/src/src/ld/scripttempl/elf.sc,v
+retrieving revision 1.81
+retrieving revision 1.82
+diff -u -r1.81 -r1.82
+--- ld/scripttempl/elf.sc	2007/06/29 16:29:17	1.81
++++ ld/scripttempl/elf.sc	2007/07/10 04:53:13	1.82
+@@ -124,7 +124,7 @@
+ DYNAMIC=".dynamic      ${RELOCATING-0} : { *(.dynamic) }"
+ RODATA=".rodata       ${RELOCATING-0} : { *(.rodata${RELOCATING+ .rodata.* .gnu.linkonce.r.*}) }"
+ DATARELRO=".data.rel.ro : { *(.data.rel.ro.local* .gnu.linkonce.d.rel.ro.local.*) *(.data.rel.ro* .gnu.linkonce.d.rel.ro.*) }"
+-STACKNOTE="/DISCARD/ : { *(.note.GNU-stack) }"
++DISCARDED="/DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) }"
+ if test -z "${NO_SMALL_DATA}"; then
+   SBSS=".sbss         ${RELOCATING-0} :
+   {
+@@ -518,6 +518,6 @@
+   ${ATTRS_SECTIONS}
+   ${OTHER_SECTIONS}
+   ${RELOCATING+${OTHER_SYMBOLS}}
+-  ${RELOCATING+${STACKNOTE}}
++  ${RELOCATING+${DISCARDED}}
+ }
+ EOF
diff --git a/devel/djgpp-binutils/files/patch-ld-ldlang.c b/devel/djgpp-binutils/files/patch-ld-ldlang.c
new file mode 100644
index 00000000000..6793469b732
--- /dev/null
+++ b/devel/djgpp-binutils/files/patch-ld-ldlang.c
@@ -0,0 +1,15 @@
+RCS file: /cvs/src/src/ld/ldlang.c,v
+retrieving revision 1.218
+diff -u -p -r1.218 ldlang.c
+--- ld/ldlang.c	17 May 2006 16:46:54 -0000	1.218
++++ ld/ldlang.c	19 May 2006 02:39:55 -0000
+@@ -4198,7 +4198,8 @@ lang_size_sections_1
+ 		    /* If a loadable section is using the default memory
+ 		       region, and some non default memory regions were
+ 		       defined, issue an error message.  */
+-		    if (!IGNORE_SECTION (os->bfd_section)
++		    if (!os->ignored
++			&& !IGNORE_SECTION (os->bfd_section)
+ 			&& ! link_info.relocatable
+ 			&& check_regions
+ 			&& strcmp (os->region->name,
diff --git a/devel/djgpp-binutils/pkg-plist b/devel/djgpp-binutils/pkg-plist
index 2c9333336df..4d6b25dac36 100644
--- a/devel/djgpp-binutils/pkg-plist
+++ b/devel/djgpp-binutils/pkg-plist
@@ -16,7 +16,7 @@ i586-pc-msdosdjgpp/lib/ldscripts/i386go32.xbn
 i586-pc-msdosdjgpp/lib/ldscripts/i386go32.xn
 i586-pc-msdosdjgpp/lib/ldscripts/i386go32.xr
 i586-pc-msdosdjgpp/lib/ldscripts/i386go32.xu
-i586-pc-msdosdjgpp/info
+i586-pc-msdosdjgpp/info/dir
 bin/i586-pc-msdosdjgpp-addr2line
 bin/i586-pc-msdosdjgpp-ar
 bin/i586-pc-msdosdjgpp-as