Index: head/devel/elfutils/Makefile
===================================================================
--- head/devel/elfutils/Makefile	(revision 418677)
+++ head/devel/elfutils/Makefile	(revision 418678)
@@ -1,46 +1,56 @@
 # Created by: Conrad Meyer <cem@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	elfutils
 PORTVERSION=	0.163
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel
 MASTER_SITES=	https://fedorahosted.org/releases/e/l/elfutils/$(PORTVERSION)/
 
 MAINTAINER=	cem@FreeBSD.org
 COMMENT=	Library for manipulating ELF files and partial implementation of binutils
 
 LICENSE=	LGPL3 GPLv2 GPLv3
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING-GPLV2
 LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING-LGPLV3
 
 LIB_DEPENDS=	libargp.so:devel/argp-standalone
 PATCH_DEPENDS=	gnulib>=0:devel/gnulib
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext
 NLS_CONFIGURE_ENABLE=	nls
 
 USES=		gmake libtool tar:bzip2
 USE_AUTOTOOLS=	automake:env
-USE_GCC=	4.9+
+USE_GCC=	4.8+
 GNU_CONFIGURE=	yes
 
+CFLAGS+=	-Wno-unused-parameter
+# Give i386 a prayer of building, and we can fix the warnings later:
+CFLAGS_i386+=	-Wno-error
+
 # Avoid conflict with binutils / elftoolchain programs with the same names:
 CONFIGURE_ARGS+=	--program-prefix=eu-
 
 post-patch:
 	@${CP} -a \
 	    $(LOCALBASE)/share/gnulib/lib/obstack.c \
 	    $(LOCALBASE)/share/gnulib/lib/obstack.h \
 	    $(LOCALBASE)/share/gnulib/lib/obstack_printf.c \
 	    $(WRKSRC)/lib
 
 pre-configure:
 	@cd $(WRKSRC) && ${AUTOMAKE}
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1000000
+IGNORE=		requires FreeBSD 10.0 (strchrnul)
+.endif
+
+.include <bsd.port.post.mk>
Index: head/devel/elfutils/files/patch-libdw_dwarf__getsrclines.c
===================================================================
--- head/devel/elfutils/files/patch-libdw_dwarf__getsrclines.c	(nonexistent)
+++ head/devel/elfutils/files/patch-libdw_dwarf__getsrclines.c	(revision 418678)
@@ -0,0 +1,11 @@
+--- libdw/dwarf_getsrclines.c.orig	2015-06-10 19:44:33 UTC
++++ libdw/dwarf_getsrclines.c
+@@ -188,7 +188,7 @@ read_srclines (Dwarf *dbg,
+   /* Remember array with the standard opcode length (-1 to account for
+      the opcode with value zero not being mentioned).  */
+   const uint8_t *standard_opcode_lengths = linep - 1;
+-  if (unlikely (lineendp - linep < opcode_base - 1))
++  if (unlikely (lineendp - linep < (ptrdiff_t)opcode_base - 1))
+     goto invalid_data;
+   linep += opcode_base - 1;
+ 

Property changes on: head/devel/elfutils/files/patch-libdw_dwarf__getsrclines.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/devel/elfutils/files/patch-src_Makefile.am
===================================================================
--- head/devel/elfutils/files/patch-src_Makefile.am	(revision 418677)
+++ head/devel/elfutils/files/patch-src_Makefile.am	(revision 418678)
@@ -1,54 +1,62 @@
 --- src/Makefile.am.orig	2015-06-11 11:38:55 UTC
 +++ src/Makefile.am
 @@ -72,11 +72,11 @@ CLEANFILES += make-debug-archive
  
  if BUILD_STATIC
  libasm = ../libasm/libasm.a
 -libdw = ../libdw/libdw.a $(zip_LIBS) $(libelf) $(libebl) -ldl
 +libdw = ../libdw/libdw.a $(zip_LIBS) $(libelf) $(libebl) $(libeu)
  libelf = ../libelf/libelf.a
  else
  libasm = ../libasm/libasm.so
 -libdw = ../libdw/libdw.so
 +libdw = ../libdw/libdw.so $(libeu)
  libelf = ../libelf/libelf.so
  endif
  libebl = ../libebl/libebl.a
-@@ -103,27 +103,27 @@ ranlib_no_Wstack_usage = yes
+@@ -89,6 +89,7 @@ endif
+ # XXX While the file is not finished, don't warn about this
+ ldgeneric_no_Wunused = yes
+ ldgeneric_no_Wstack_usage = yes
++ldgeneric_no_Werror = yes
+ 
+ # Bad, bad stack usage...
+ readelf_no_Wstack_usage = yes
+@@ -103,27 +104,27 @@ ranlib_no_Wstack_usage = yes
  ar_no_Wstack_usage = yes
  unstrip_no_Wstack_usage = yes
  
 -readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl
 -nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl \
 +readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(argp_LDADD)
 +nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(argp_LDADD) \
  	   $(demanglelib)
  size_LDADD = $(libelf) $(libeu) $(argp_LDADD)
 -strip_LDADD = $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl
 -ld_LDADD = $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl
 +strip_LDADD = $(libebl) $(libelf) $(libeu) $(argp_LDADD)
 +ld_LDADD = $(libebl) $(libelf) $(libeu) $(argp_LDADD)
  if NATIVE_LD
 -# -ldl is always needed for libebl.
 +# is always needed for libebl.
  ld_LDADD += libld_elf.a
  endif
  ld_LDFLAGS = -rdynamic
 -elflint_LDADD  = $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl
 +elflint_LDADD  = $(libebl) $(libelf) $(libeu) $(argp_LDADD)
  findtextrel_LDADD = $(libdw) $(libelf) $(argp_LDADD)
  addr2line_LDADD = $(libdw) $(libelf) $(argp_LDADD) $(demanglelib)
 -elfcmp_LDADD = $(libebl) $(libelf) $(argp_LDADD) -ldl
 -objdump_LDADD  = $(libasm) $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl
 +elfcmp_LDADD = $(libebl) $(libelf) $(libeu) $(argp_LDADD)
 +objdump_LDADD  = $(libasm) $(libebl) $(libelf) $(libeu) $(argp_LDADD)
  ranlib_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD)
  strings_LDADD = $(libelf) $(libeu) $(argp_LDADD)
  ar_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD)
 -unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) -ldl
 -stack_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) -ldl $(demanglelib)
 +unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD)
 +stack_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) $(demanglelib)
  
  ldlex.o: ldscript.c
  ldlex_no_Werror = yes
Index: head/devel/elfutils/files/patch-src_ldlex.c
===================================================================
--- head/devel/elfutils/files/patch-src_ldlex.c	(nonexistent)
+++ head/devel/elfutils/files/patch-src_ldlex.c	(revision 418678)
@@ -0,0 +1,11 @@
+--- src/ldlex.c.orig	2014-08-26 08:58:02 UTC
++++ src/ldlex.c
+@@ -1629,7 +1629,7 @@ YY_RULE_SETUP
+ #line 149 "/home/mark/src/elfutils/src/ldlex.l"
+ { int cnt = 1 ;
+ 				  ldlval.num = 0;
+-				  while (cnt < ldleng - 1)
++				  while (cnt < (int)ldleng - 1)
+ 				    ldlval.num |= attrib_convert (ldtext[cnt++]);
+ 				  return kMODE; }
+ 	YY_BREAK

Property changes on: head/devel/elfutils/files/patch-src_ldlex.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/devel/elfutils/files/patch-src_ldlex.l
===================================================================
--- head/devel/elfutils/files/patch-src_ldlex.l	(nonexistent)
+++ head/devel/elfutils/files/patch-src_ldlex.l	(revision 418678)
@@ -0,0 +1,11 @@
+--- src/ldlex.l.orig	2014-02-05 00:21:44 UTC
++++ src/ldlex.l
+@@ -148,7 +148,7 @@ VERSION				{ return kVERSION; }
+ 
+ "["([RWX]){0,3}"]"		{ int cnt = 1 ;
+ 				  ldlval.num = 0;
+-				  while (cnt < yyleng - 1)
++				  while (cnt < (int)yyleng - 1)
+ 				    ldlval.num |= attrib_convert (yytext[cnt++]);
+ 				  return kMODE; }
+ 

Property changes on: head/devel/elfutils/files/patch-src_ldlex.l
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/devel/elfutils/files/patch-src_readelf.c
===================================================================
--- head/devel/elfutils/files/patch-src_readelf.c	(nonexistent)
+++ head/devel/elfutils/files/patch-src_readelf.c	(revision 418678)
@@ -0,0 +1,10 @@
+--- src/readelf.c.orig	2015-06-19 11:17:42 UTC
++++ src/readelf.c
+@@ -7911,6 +7911,7 @@ print_debug_exception_table (Dwfl_Module
+ 	  break;
+ 	default:
+ 	  error (1, 0, gettext ("invalid TType encoding"));
++	  abort();
+ 	}
+ 
+       if (max_ar_filter

Property changes on: head/devel/elfutils/files/patch-src_readelf.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property