8 files changed, 30 insertions, 63 deletions

diff --git a/devel/dwarfdump/Makefile b/devel/dwarfdump/Makefile
index 9a05e5046e27..c9b40eaf0a88 100644
--- a/devel/dwarfdump/Makefile
+++ b/devel/dwarfdump/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dwarfdump
-PORTVERSION=	20100204
+PORTVERSION=	20130207
 CATEGORIES=	devel
 MASTER_SITES=	http://reality.sgiweb.org/davea/
 DISTNAME=	libdwarf-${PORTVERSION}
diff --git a/devel/dwarfdump/distinfo b/devel/dwarfdump/distinfo
index 9f319d8c52d1..f6585677066c 100644
--- a/devel/dwarfdump/distinfo
+++ b/devel/dwarfdump/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libdwarf-20100204.tar.gz) = b517d083a9b066b252922df722e7a9eaac4ea5a8a2d6a66e2419829563901a86
-SIZE (libdwarf-20100204.tar.gz) = 1286741
+SHA256 (libdwarf-20130207.tar.gz) = 5cb81459f0a1f6a2a10ef4635faddc2fa5e1a9e36901018c017759e491e708b8
+SIZE (libdwarf-20130207.tar.gz) = 1534527
diff --git a/devel/dwarfdump/files/patch-Makefile.in b/devel/dwarfdump/files/patch-Makefile.in
new file mode 100644
index 000000000000..80682d70d24c
--- /dev/null
+++ b/devel/dwarfdump/files/patch-Makefile.in
@@ -0,0 +1,24 @@
+--- Makefile.in~	2013-02-02 20:13:55.000000000 +0100
++++ Makefile.in	2013-04-10 09:11:17.000000000 +0200
+@@ -98,7 +98,7 @@
+ 
+ # gennames should use a static libdwarf.
+ gennames: $(srcdir)/gennames.c $(DIRINC)/dwarf.h $(HEADERS) common.o
+-	$(CC) $(CFLAGS) $(srcdir)/gennames.c common.o ../libdwarf/libdwarf.a $(LDFLAGS) -o gennames
++	$(CC) $(CFLAGS) $(srcdir)/gennames.c common.o $(LDFLAGS) -ldwarf -o gennames
+ naming.o:  $(srcdir)/naming.c $(srcdir)/naming.h
+ 	$(CC) $(CFLAGS) -c $(srcdir)/naming.c
+ 
+@@ -109,10 +109,10 @@
+ 
+ # Use static libdwarf.a
+ tag_tree_build:  $(srcdir)/tag_tree.c $(DIRINC)/dwarf.h $(HEADERS) tag_common.o makename.o common.o trivial_naming.o
+-	$(CC) $(CFLAGS) $(srcdir)/tag_tree.c tag_common.o common.o makename.o trivial_naming.o ../libdwarf/libdwarf.a $(LDFLAGS) -o tag_tree_build 
++	$(CC) $(CFLAGS) $(srcdir)/tag_tree.c tag_common.o common.o makename.o trivial_naming.o $(LDFLAGS) -ldwarf -o tag_tree_build 
+ 
+ tag_attr_build:  $(srcdir)/tag_attr.c $(DIRINC)/dwarf.h $(HEADERS) tag_common.o makename.o common.o trivial_naming.o
+-	$(CC) $(CFLAGS) $(srcdir)/tag_attr.c tag_common.o common.o makename.o trivial_naming.o ../libdwarf/libdwarf.a $(LDFLAGS) -o tag_attr_build 
++	$(CC) $(CFLAGS) $(srcdir)/tag_attr.c tag_common.o common.o makename.o trivial_naming.o $(LDFLAGS) -ldwarf -o tag_attr_build 
+ 
+ tmp-tt-table.c tmp-tt-ext-table.c: $(srcdir)/tag_tree_ext.list $(srcdir)/tag_tree.list tag_tree_build
+ 	# gcc -E tag_tree.list does not work, so use a .c name
diff --git a/devel/libdwarf/Makefile b/devel/libdwarf/Makefile
index 50860201c43d..ef3c9b5f6cfe 100644
--- a/devel/libdwarf/Makefile
+++ b/devel/libdwarf/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libdwarf
-PORTVERSION=	20100204
-PORTREVISION=	1
+PORTVERSION=	20130207
 CATEGORIES=	devel
 MASTER_SITES=	http://reality.sgiweb.org/davea/
 
diff --git a/devel/libdwarf/distinfo b/devel/libdwarf/distinfo
index 9f319d8c52d1..f6585677066c 100644
--- a/devel/libdwarf/distinfo
+++ b/devel/libdwarf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libdwarf-20100204.tar.gz) = b517d083a9b066b252922df722e7a9eaac4ea5a8a2d6a66e2419829563901a86
-SIZE (libdwarf-20100204.tar.gz) = 1286741
+SHA256 (libdwarf-20130207.tar.gz) = 5cb81459f0a1f6a2a10ef4635faddc2fa5e1a9e36901018c017759e491e708b8
+SIZE (libdwarf-20130207.tar.gz) = 1534527
diff --git a/devel/libdwarf/files/patch-pro_alloc.c b/devel/libdwarf/files/patch-pro_alloc.c
deleted file mode 100644
index b34aa82b9a0b..000000000000
--- a/devel/libdwarf/files/patch-pro_alloc.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- pro_alloc.c.orig	Wed Jul  4 01:37:21 2007
-+++ pro_alloc.c	Wed Nov  7 12:35:05 2007
-@@ -40,11 +40,12 @@
- #include "pro_incl.h"
- #ifdef HAVE_STDLIB_H
- #include <stdlib.h>
-+#else
-+#include <malloc.h>
- #endif /* HAVE_STDLIB_H */
- #ifdef HAVE_STRING_H
- #include <string.h>
- #endif /* HAVE_STRING_H */
--#include <malloc.h>
- 
- /*
-  When each block is allocated, there is a two-word structure
diff --git a/devel/libdwarf/files/patch-pro_incl.h b/devel/libdwarf/files/patch-pro_incl.h
deleted file mode 100644
index e0fb402f9bf0..000000000000
--- a/devel/libdwarf/files/patch-pro_incl.h
+++ /dev/null
@@ -1,17 +0,0 @@
---- pro_incl.h.orig	2008-06-16 10:06:57.000000000 -0500
-+++ pro_incl.h	2008-07-05 10:15:46.000000000 -0500
-@@ -43,6 +43,14 @@
-    type defined (a required type). */
- #include <libelf.h>
- #endif
-+#ifdef HAVE_LIBELF_H
-+#include <libelf.h>
-+#else
-+#ifdef HAVE_LIBELF_LIBELF_H
-+#include <libelf/libelf.h>
-+#endif
-+#endif
-+
- 
- #if defined(sun)
- #include <sys/elf_SPARC.h>
diff --git a/devel/libdwarf/files/patch-pro_util.h b/devel/libdwarf/files/patch-pro_util.h
deleted file mode 100644
index 67478561ef56..000000000000
--- a/devel/libdwarf/files/patch-pro_util.h
+++ /dev/null
@@ -1,23 +0,0 @@
---- pro_util.h.orig	2011-06-18 08:46:00.000000000 +0200
-+++ pro_util.h	2011-06-18 14:45:59.000000000 +0200
-@@ -34,6 +34,9 @@
- 
- */
- 
-+#if defined(__FreeBSD__)
-+# include <osreldate.h>
-+#endif
- 
- 
- 
-@@ -120,7 +123,9 @@
- #define Get_REL_SEGREL_isa(dbg)    (R_386_NONE) /* I don't know! */
- #endif /* sparc || i386 */
- #else  /* !sun */
--#ifdef HAVE_SYS_IA64_ELF_H
-+#if defined(HAVE_SYS_IA64_ELF_H) ||\
-+   /* FreeBSD 7.x and above always have these */ \
-+   (defined(__FreeBSD__) && __FreeBSD_version > 700000)
- #define Get_REL64_isa(dbg)         (ISA_IA64(dbg) ? \
-     DWARF_PRO_R_IA64_DIR64LSB : R_MIPS_64)
- #define Get_REL32_isa(dbg)         (ISA_IA64(dbg) ? \