diff -urN --exclude=CVS libelf.orig/Makefile libelf/Makefile
--- libelf.orig/Makefile	Mon May  9 12:52:34 2005
+++ libelf/Makefile	Fri Aug 19 16:38:23 2005
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	libelf
-PORTVERSION=	0.8.5
-PORTREVISION=	1
+PORTVERSION=	0.8.6
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_SUNSITE} \
-		http://www.mr511.de/software/
+MASTER_SITES=	http://www.mr511.de/software/ \
+		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	libs .
 
 MAINTAINER=	roam@FreeBSD.org
@@ -25,5 +24,15 @@
 USE_GETTEXT=	yes
 
 NOMAN=		defined
+
+USE_REINPLACE=	yes
+
+FILES_TO_PATCH=lib/32.fsize.c lib/64.xlatetof.c lib/cook.c lib/gelf.h lib/gelftrans.c
+
+post-patch:
+	@(cd ${WRKSRC} && ${REINPLACE_CMD} \
+	-e 's/Elf64_Xword/Elf64_Word/g' \
+	-e 's/Elf64_Sxword/Elf64_Sword/g' \
+	${FILES_TO_PATCH})
 
 .include <bsd.port.mk>
diff -urN --exclude=CVS libelf.orig/distinfo libelf/distinfo
--- libelf.orig/distinfo	Wed Mar 31 06:07:00 2004
+++ libelf/distinfo	Fri Aug 19 15:53:48 2005
@@ -1,2 +1,2 @@
-MD5 (libelf-0.8.5.tar.gz) = c1daf069367871350ece779b7de20047
-SIZE (libelf-0.8.5.tar.gz) = 132111
+MD5 (libelf-0.8.6.tar.gz) = d444fb0068cdfed01bb1fd1e91d29270
+SIZE (libelf-0.8.6.tar.gz) = 144198
diff -urN --exclude=CVS libelf.orig/files/patch-Makefile.in libelf/files/patch-Makefile.in
--- libelf.orig/files/patch-Makefile.in	Thu Jan  1 02:00:00 1970
+++ libelf/files/patch-Makefile.in	Fri Aug 19 16:52:34 2005
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Fri Aug 19 16:51:51 2005
++++ Makefile.in	Fri Aug 19 16:52:13 2005
+@@ -23,7 +23,7 @@
+ exec_prefix = @exec_prefix@
+ libdir = @libdir@
+ 
+-pkgdir = $(libdir)/pkgconfig
++pkgdir = $(prefix)/libdata/pkgconfig
+ 
+ MV = mv -f
+ RM = rm -f
diff -urN --exclude=CVS libelf.orig/files/patch-configure libelf/files/patch-configure
--- libelf.orig/files/patch-configure	Sun Dec 14 16:35:46 2003
+++ libelf/files/patch-configure	Fri Aug 19 16:05:58 2005
@@ -1,18 +1,15 @@
-
-$FreeBSD: ports/devel/libelf/files/patch-configure,v 1.4 2003/12/14 14:35:46 roam Exp $
-
---- configure.old	Sun Dec 14 14:11:54 2003
-+++ configure	Sun Dec 14 14:13:28 2003
-@@ -1139,7 +1139,7 @@
+--- configure.orig	Fri Aug 19 16:00:37 2005
++++ configure	Fri Aug 19 16:05:31 2005
+@@ -1142,7 +1142,7 @@
  
  fi
  
--for ac_hdr in unistd.h fcntl.h elf.h sys/elf.h link.h sys/link.h
-+for ac_hdr in unistd.h fcntl.h sys/elf.h link.h sys/link.h
+-for ac_hdr in unistd.h stdint.h fcntl.h
++for ac_hdr in unistd.h stdint.h fcntl.h elf.h
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-@@ -3055,7 +3055,7 @@
+@@ -3218,7 +3218,7 @@
  fi
  
      case "$host" in
@@ -21,12 +18,12 @@
  	if test "$GCC" = yes; then
  	  
    
-@@ -3112,13 +3112,12 @@
- 	    then
- 	      SHLIB_SFX='-$(VERSION).so'
- 	    else
--	      SHLIB_SFX='.so.$(VERSION)'
-+	      SHLIB_SFX='.so.$(MAJOR)'
+@@ -3273,13 +3273,12 @@
+ 	    PICFLAGS='-fPIC -DPIC'
+ 	    if test "$mr_enable_gnu_names" = yes
+ 	    then SHLIB_SFX='-$(VERSION).so'
+-	    else SHLIB_SFX='.so.$(VERSION)'
++	    else SHLIB_SFX='.so.$(MAJOR)'
  	    fi
  	    SHLINK_SFX='.so'
  	    SONAME_SFX='.so.$(MAJOR)'
diff -urN --exclude=CVS libelf.orig/pkg-plist libelf/pkg-plist
--- libelf.orig/pkg-plist	Wed Jul 16 16:39:31 2003
+++ libelf/pkg-plist	Fri Aug 19 16:54:24 2005
@@ -6,5 +6,6 @@
 lib/libelf.a
 lib/libelf.so
 lib/libelf.so.%%LIBVER%%
+libdata/pkgconfig/libelf.pc
 share/locale/de/LC_MESSAGES/libelf.mo
 @dirrm include/libelf