- Update to 0.8.4;

- use USE_LIBTOOL to prevent explicit linking with libc;
- link libintl.

Approved by:	maintainer

4 files changed, 27 insertions, 19 deletions

diff --git a/devel/libelf/Makefile b/devel/libelf/Makefile
index 709fbae8f730..71316c6ad4ae 100644
--- a/devel/libelf/Makefile
+++ b/devel/libelf/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libelf
-PORTVERSION=	0.8.2
+PORTVERSION=	0.8.4
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SUNSITE} \
 		http://www.stud.uni-hannover.de/~michael/software/ \
@@ -23,8 +23,7 @@ CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lintl"
 CONFIGURE_ARGS+=	--enable-shared --disable-compat
 INSTALLS_SHLIB=	yes
-PLIST_SUB+=	LIBVER=${PORTVERSION} \
-		LIBVER_SHORT=${PORTVERSION:R}
+PLIST_SUB+=	LIBVER=${PORTVERSION:R}
 
 NOMAN=		defined
 
diff --git a/devel/libelf/distinfo b/devel/libelf/distinfo
index 676ac72f9830..7d2fba8c1f62 100644
--- a/devel/libelf/distinfo
+++ b/devel/libelf/distinfo
@@ -1 +1 @@
-MD5 (libelf-0.8.2.tar.gz) = 0b153e51884e0da7e71523f223a11d3c
+MD5 (libelf-0.8.4.tar.gz) = 60b4cffdfea14e55c192f48f3f5440f2
diff --git a/devel/libelf/files/patch-configure b/devel/libelf/files/patch-configure
index b4699b52e8c9..0f99db8be042 100644
--- a/devel/libelf/files/patch-configure
+++ b/devel/libelf/files/patch-configure
@@ -1,5 +1,8 @@
---- configure.old	Thu Feb 20 16:26:13 2003
-+++ configure	Thu Feb 20 16:28:04 2003
+
+$FreeBSD$
+
+--- configure.orig	Wed May  7 21:28:06 2003
++++ configure	Sat Jul 12 13:54:26 2003
 @@ -1123,7 +1123,7 @@
  
  fi
@@ -9,21 +12,28 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-@@ -1220,7 +1220,7 @@
- # Check whether --enable-compat or --disable-compat was given.
- if test "${enable_compat+set}" = set; then
-   enableval="$enable_compat"
--  libelf_enable_compat="$enableval"
-+  DO_COMPAT="$enableval"
- else
-   
-   if test "$ac_cv_header_libelf_h$ac_cv_header_nlist_h$ac_cv_header_gelf_h" = yesyesyes
 @@ -3039,7 +3039,7 @@
  fi
  
      case "$host" in
--      *-linux*)
-+      *-linux*|*-freebsd*)
+-      *-linux*|*-gnu*)
++      *-linux*|*-gnu*|*-freebsd*)
  	if test "$GCC" = yes; then
  	  
    
+@@ -3096,13 +3096,12 @@
+ 	    then
+ 	      SHLIB='$(PACKAGE)-$(VERSION).so'
+ 	    else
+-	      SHLIB='$(PACKAGE).so.$(VERSION)'
++	      SHLIB='$(PACKAGE).so.$(MAJOR)'
+ 	    fi
+ 	    SHLINK='$(PACKAGE).so'
+ 	    SONAME='$(PACKAGE).so.$(MAJOR)'
+-	    LINK_SHLIB='$(CC) -shared -Wl,-soname,$(SONAME)'
++	    LINK_SHLIB='$(CC) -shared -Wl,-soname,$(SONAME) $(LDFLAGS)'
+ 	    INSTALL_SHLIB='$(INSTALL_PROGRAM)'
+-	    DEPSHLIBS='-lc'
+ 	  else
+ 	    echo "configure: warning: shared libraries not supported for $host" 1>&2
+ 	    mr_enable_shared=no
diff --git a/devel/libelf/pkg-plist b/devel/libelf/pkg-plist
index b3b74416c7b4..e5538a33018f 100644
--- a/devel/libelf/pkg-plist
+++ b/devel/libelf/pkg-plist
@@ -3,9 +3,8 @@ include/libelf/libelf.h
 include/libelf/nlist.h
 include/libelf/sys_elf.h
 include/libelf/elf_repl.h
-@dirrm include/libelf
 lib/libelf.a
 lib/libelf.so
-lib/libelf.so.%%LIBVER_SHORT%%
 lib/libelf.so.%%LIBVER%%
 share/locale/de/LC_MESSAGES/libelf.mo
+@dirrm include/libelf