5 files changed, 41 insertions, 18 deletions

diff --git a/devel/libdwarf/Makefile b/devel/libdwarf/Makefile
index 4bf51109277e..e613b021bd64 100644
--- a/devel/libdwarf/Makefile
+++ b/devel/libdwarf/Makefile
@@ -6,15 +6,18 @@
 #
 
 PORTNAME=	libdwarf
-PORTVERSION=	20070703
-PORTREVISION=	1
+PORTVERSION=	20080615
 CATEGORIES=	devel
 MASTER_SITES=	http://reality.sgiweb.org/davea/
 
 MAINTAINER=	joerg@FreeBSD.org
 COMMENT=	A library to analyze DWARF debugging information in ELF files
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libelf.so.0:${PORTSDIR}/devel/libelf
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 700000
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libelf.so.0:${PORTSDIR}/devel/libelf
+.endif
 
 WRKSRC=		${WRKDIR}/dwarf-${PORTVERSION}/libdwarf
 
@@ -22,6 +25,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+USE_DOS2UNIX=	*.h
+
 PS_FILES=	dwarf.v2.pdf index.v2.pdf libdwarf2.1.pdf libdwarf2p.1.pdf mips_extensions.pdf
 
 do-install:
@@ -33,4 +38,4 @@ do-install:
 			${INSTALL_DATA} ${WRKSRC}/$$f ${PREFIX}/share/doc/libdwarf ; \
 		done
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/libdwarf/distinfo b/devel/libdwarf/distinfo
index 85399c2faeea..6bca632a1efd 100644
--- a/devel/libdwarf/distinfo
+++ b/devel/libdwarf/distinfo
@@ -1,3 +1,3 @@
-MD5 (libdwarf-20070703.tar.gz) = 3c67d1df89f05421267ede59feec8152
-SHA256 (libdwarf-20070703.tar.gz) = 6e2194156928285bc192f6ac02f3be924c2980801e55e987c1051275b8dc9681
-SIZE (libdwarf-20070703.tar.gz) = 1064669
+MD5 (libdwarf-20080615.tar.gz) = 4ee8f6bcc5d7dfd58373dea387a9b957
+SHA256 (libdwarf-20080615.tar.gz) = f787bb48ecebdaadbfd3ebc5d01121decaaf00c11125d9c7636376ecf1daa988
+SIZE (libdwarf-20080615.tar.gz) = 1092542
diff --git a/devel/libdwarf/files/patch-dwarf_error.c b/devel/libdwarf/files/patch-dwarf_error.c
new file mode 100644
index 000000000000..30be6ee0a10b
--- /dev/null
+++ b/devel/libdwarf/files/patch-dwarf_error.c
@@ -0,0 +1,11 @@
+--- dwarf_error.c.orig	2008-08-30 20:32:21.000000000 -0500
++++ dwarf_error.c	2008-08-30 20:33:23.000000000 -0500
+@@ -281,7 +281,7 @@
+     "DW_DLE_DF_FRAME_DECODING_ERROR(193)",
+     "DW_DLE_DEBUG_LOC_SECTION_SHORT(194)",
+     "DW_DLE_FRAME_AUGMENTATION_UNKNOWN(195)",
+-    "DW_DLA_PUBTYPE_CONTEXT(196)",
++    "DW_DLE_PUBTYPE_CONTEXT(196)",
+     "DW_DLE_DEBUG_PUBTYPES_LENGTH_BAD(197)",
+     "DW_DLE_DEBUG_PUBTYPES_VERSION_ERROR(198)",
+     "DW_DLE_DEBUG_PUBTYPES_DUPLICATE(199)",
diff --git a/devel/libdwarf/files/patch-libdwarf.h b/devel/libdwarf/files/patch-libdwarf.h
new file mode 100644
index 000000000000..a984dbd16f36
--- /dev/null
+++ b/devel/libdwarf/files/patch-libdwarf.h
@@ -0,0 +1,11 @@
+--- libdwarf.h.orig	2008-08-30 20:32:29.000000000 -0500
++++ libdwarf.h	2008-08-30 20:33:43.000000000 -0500
+@@ -897,7 +897,7 @@
+ #define DW_DLE_DF_FRAME_DECODING_ERROR         193
+ #define DW_DLE_DEBUG_LOC_SECTION_SHORT         194
+ #define DW_DLE_FRAME_AUGMENTATION_UNKNOWN      195
+-#define DW_DLA_PUBTYPE_CONTEXT                 196
++#define DW_DLE_PUBTYPE_CONTEXT                 196
+ #define DW_DLE_DEBUG_PUBTYPES_LENGTH_BAD       197
+ #define DW_DLE_DEBUG_PUBTYPES_VERSION_ERROR    198
+ #define DW_DLE_DEBUG_PUBTYPES_DUPLICATE        199
diff --git a/devel/libdwarf/files/patch-pro_incl.h b/devel/libdwarf/files/patch-pro_incl.h
index 15cbdef76982..e0fb402f9bf0 100644
--- a/devel/libdwarf/files/patch-pro_incl.h
+++ b/devel/libdwarf/files/patch-pro_incl.h
@@ -1,12 +1,9 @@
---- pro_incl.h.orig	Mon Nov 22 19:20:35 2004
-+++ pro_incl.h	Sat Feb 12 22:17:11 2005
-@@ -38,6 +38,18 @@
- #ifdef HAVE_ELF_H
- #include <elf.h>
+--- 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 __SGI_FAST_LIBELF
-+#include <libelf_sgi.h>
-+#else
 +#ifdef HAVE_LIBELF_H
 +#include <libelf.h>
 +#else
@@ -14,8 +11,7 @@
 +#include <libelf/libelf.h>
 +#endif
 +#endif
-+#endif /* !defined(__SGI_FAST_LIBELF) */
 +
  
- /* The target address is given: the place in the source integer
-    is to be determined.
+ #if defined(sun)
+ #include <sys/elf_SPARC.h>