From e7aa0ee3bbbe3e166a9f50d83686d7d26ca55281 Mon Sep 17 00:00:00 2001
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Fri, 15 Aug 2014 17:01:12 +0000
Subject: [PATCH] Fix build on -current.

---
 devel/elf/Makefile                     |  3 +++
 devel/elf/files/patch-src__Makefile.in | 18 +++++++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/devel/elf/Makefile b/devel/elf/Makefile
index 2704ed7bb80a..acb66764464d 100644
--- a/devel/elf/Makefile
+++ b/devel/elf/Makefile
@@ -18,4 +18,7 @@ PLIST_FILES=	bin/elf man/man1/elf.1.gz
 post-patch:
 	@${REINPLACE_CMD} -e 's/gcc/${CC}/g' ${WRKSRC}/src/Makefile.in
 
+do-build:
+	${DO_MAKE_BUILD} -C ${WRKSRC}/src
+
 .include <bsd.port.mk>
diff --git a/devel/elf/files/patch-src__Makefile.in b/devel/elf/files/patch-src__Makefile.in
index 414cdb6b471d..d6bc0d078c6a 100644
--- a/devel/elf/files/patch-src__Makefile.in
+++ b/devel/elf/files/patch-src__Makefile.in
@@ -1,6 +1,18 @@
---- src/Makefile.in.orig	2014-06-07 13:35:52.417434266 +0800
-+++ src/Makefile.in	2014-06-07 13:36:02.841435177 +0800
-@@ -16,7 +16,7 @@ main.o:		main.c ../include/sehdr.h ../in
+--- src/Makefile.in.orig	2003-09-20 10:23:28.000000000 -0400
++++ src/Makefile.in	2014-08-15 12:59:59.000000000 -0400
+@@ -1,9 +1,9 @@
+ CC=gcc
+-INC=-I../include
++INC=-I../include ${CPPFLAGS}
+ CFLAGS=@CFLAGS@
+ PREFIX=@prefix@
+ BINDIR=$(PREFIX)/bin
+-LIBS=@LIBS@
++LIBS=@LIBS@ ${LDFLAGS}
+ 
+ elf:		main.o elf.o
+ 		$(CC) $(CFLAGS) $(INC) main.o elf.o -o elf $(LIBS)
+@@ -16,7 +16,7 @@
  		$(CC) $(CFLAGS) $(INC) -c main.c
  
  install:	elf