Update to 0.2.1

PR:		ports/69682
Submitted by:	maintainer

4 files changed, 9 insertions, 34 deletions

diff --git a/devel/libopendaap/Makefile b/devel/libopendaap/Makefile
index da1d82e68776..93c5d0a01c3d 100644
--- a/devel/libopendaap/Makefile
+++ b/devel/libopendaap/Makefile
@@ -6,30 +6,31 @@
 #
 
 PORTNAME=	libopendaap
-PORTVERSION=	0.2.0
+PORTVERSION=	0.2.1
 CATEGORIES=	devel net
 MASTER_SITES=	http://crazney.net/programs/itunes/files/
 
 MAINTAINER=	ahze@ahze.net
 COMMENT=	C lib used to connect to iTunes(R) music shares
 
-SHLIB_VER=	1
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_INC_LIBTOOL_VER=15
 USE_GCC=	3.3
-PLIST_SUB=	SHLIB_VER="${SHLIB_VER}"
 
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}"
 
 INSTALLS_SHLIB=	yes
 
+pre-configure:
+# Broken libtool fix
+	@cd ${WRKSRC} && \
+		${LIBTOOLIZE} --force
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' \
 		${WRKSRC}/Makefile.am \
 		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|%%SHLIB_VER%%|.${SHLIB_VER}|' \
-		${WRKSRC}/ltmain.sh
 
 .include <bsd.port.mk>
diff --git a/devel/libopendaap/distinfo b/devel/libopendaap/distinfo
index 360ca8cf6576..85454dec10c3 100644
--- a/devel/libopendaap/distinfo
+++ b/devel/libopendaap/distinfo
@@ -1,2 +1,2 @@
-MD5 (libopendaap-0.2.0.tar.bz2) = 7d5085ae1f7173760b69dbbfe6112b02
-SIZE (libopendaap-0.2.0.tar.bz2) = 338569
+MD5 (libopendaap-0.2.1.tar.bz2) = 539ad7ec4c55b3d3e63c2bdc4e4ed485
+SIZE (libopendaap-0.2.1.tar.bz2) = 325586
diff --git a/devel/libopendaap/files/patch-ltmain.sh b/devel/libopendaap/files/patch-ltmain.sh
deleted file mode 100644
index 3824af448152..000000000000
--- a/devel/libopendaap/files/patch-ltmain.sh
+++ /dev/null
@@ -1,26 +0,0 @@
---- ltmain.sh.orig	Tue Apr 13 09:05:11 2004
-+++ ltmain.sh	Thu Apr 29 22:49:03 2004
-@@ -2980,8 +2980,8 @@
- 	  ;;
- 
- 	freebsd-elf)
--	  major=".$current"
--	  versuffix=".$current";
-+	  major=".1"
-+	  versuffix=".1";
- 	  ;;
- 
- 	irix | nonstopux)
-@@ -5528,10 +5528,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/devel/libopendaap/pkg-plist b/devel/libopendaap/pkg-plist
index 399b97358a29..56f2d07cd212 100644
--- a/devel/libopendaap/pkg-plist
+++ b/devel/libopendaap/pkg-plist
@@ -1,6 +1,6 @@
 include/daap/client.h
 lib/libopendaap.a
 lib/libopendaap.so
-lib/libopendaap.so.%%SHLIB_VER%%
+lib/libopendaap.so.0
 libdata/pkgconfig/opendaap.pc
 @dirrm include/daap