- Update to 0.15.1b [1]

- While here, fix library major version number

[1]:
PR:		ports/87405
Submitted by:	Rodrigo Graeff <delphus@gmail.com>
Approved by:	maintainer timeout (15 days)

6 files changed, 36 insertions, 88 deletions

diff --git a/audio/libid3tag/Makefile b/audio/libid3tag/Makefile
index b59cd04e446b..75ab0bb11712 100644
--- a/audio/libid3tag/Makefile
+++ b/audio/libid3tag/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libid3tag
-PORTVERSION=	0.15.0b
-PORTREVISION=	2
+PORTVERSION=	0.15.1b
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.mars.org/pub/mpeg/
@@ -17,7 +16,13 @@ MAINTAINER=	asa@gascom.ru
 COMMENT=	ID3 tags library (part of MAD project)
 
 USE_GNOME=	pkgconfig
-USE_INC_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	15
 INSTALLS_SHLIB=	yes
 
+post-build:
+	cd ${WRKSRC} && CONFIG_FILES=id3tag.pc CONFIG_HEADERS= ${SH} ./config.status
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/id3tag.pc ${PREFIX}/libdata/pkgconfig
+
 .include <bsd.port.mk>
diff --git a/audio/libid3tag/distinfo b/audio/libid3tag/distinfo
index ec514aad0ef3..3163ca8853c5 100644
--- a/audio/libid3tag/distinfo
+++ b/audio/libid3tag/distinfo
@@ -1,2 +1,2 @@
-MD5 (libid3tag-0.15.0b.tar.gz) = a625307d2cda4f3c609b79c1e3a93d87
-SIZE (libid3tag-0.15.0b.tar.gz) = 240656
+MD5 (libid3tag-0.15.1b.tar.gz) = e5808ad997ba32c498803822078748c3
+SIZE (libid3tag-0.15.1b.tar.gz) = 338143
diff --git a/audio/libid3tag/files/patch-Makefile.in b/audio/libid3tag/files/patch-Makefile.in
deleted file mode 100644
index a77a836f942a..000000000000
--- a/audio/libid3tag/files/patch-Makefile.in
+++ /dev/null
@@ -1,72 +0,0 @@
---- Makefile.in.orig	Thu Jun  5 02:48:25 2003
-+++ Makefile.in	Wed Dec 24 10:31:59 2003
-@@ -133,9 +133,12 @@
- 
- version_info = $(version_current):$(version_revision):$(version_age)
- 
--EXTRA_DIST = genre.dat.sed  \
-+EXTRA_DIST = genre.dat.sed  id3tag.pc.in \
- 			CHANGES COPYRIGHT CREDITS README TODO VERSION
- 
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
-+pkgconfig_DATA = id3tag.pc
-+
- @DEBUG_FALSE@debug = 
- 
- @DEBUG_TRUE@debug = debug.c debug.h
-@@ -210,7 +213,7 @@
- DIST_COMMON = README $(include_HEADERS) COPYING INSTALL Makefile.am \
- 	Makefile.in TODO aclocal.m4 config.guess config.h.in config.sub \
- 	configure configure.ac depcomp install-sh libid3tag.list.in \
--	ltmain.sh missing mkinstalldirs
-+	ltmain.sh missing mkinstalldirs id3tag.pc.in
- SOURCES = $(libid3tag_la_SOURCES) $(EXTRA_libid3tag_la_SOURCES)
- 
- all: $(BUILT_SOURCES) config.h
-@@ -249,6 +252,28 @@
- 	cd $(top_srcdir) && $(AUTOHEADER)
- 	touch $(srcdir)/config.h.in
- 
-+id3tag.pc: $(top_builddir)/config.status id3tag.pc.in
-+	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-+
-+install-pkgconfigDATA: $(pkgconfig_DATA)
-+	@$(NORMAL_INSTALL)
-+	$(mkinstalldirs) $(DESTDIR)$(pkgconfigdir)
-+	@list='$(pkgconfig_DATA)'; for p in $$list; do \
-+	  if test -f $(srcdir)/$$p; then \
-+	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfigdir)/$$p"; \
-+	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfigdir)/$$p; \
-+	  else if test -f $$p; then \
-+	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfigdir)/$$p"; \
-+	    $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfigdir)/$$p; \
-+	  fi; fi; \
-+	done
-+
-+uninstall-pkgconfigDATA:
-+	@$(NORMAL_UNINSTALL)
-+	list='$(pkgconfig_DATA)'; for p in $$list; do \
-+	  rm -f $(DESTDIR)$(pkgconfigdir)/$$p; \
-+	done
-+
- distclean-hdr:
- 	-rm -f config.h stamp-h1
- libid3tag.list: $(top_builddir)/config.status libid3tag.list.in
-@@ -674,7 +699,7 @@
- 
- info-am:
- 
--install-data-am: install-includeHEADERS
-+install-data-am: install-includeHEADERS install-pkgconfigDATA
- 
- install-exec-am: install-libLTLIBRARIES
- 
-@@ -703,7 +728,7 @@
- ps-am:
- 
- uninstall-am: uninstall-includeHEADERS uninstall-info-am \
--	uninstall-libLTLIBRARIES
-+	uninstall-libLTLIBRARIES install-pkgconfigDATA
- 
- uninstall-info: uninstall-info-recursive
- 
diff --git a/audio/libid3tag/files/patch-configure b/audio/libid3tag/files/patch-configure
deleted file mode 100644
index f195f07b43c6..000000000000
--- a/audio/libid3tag/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Wed Dec 11 18:31:51 2002
-+++ configure	Thu Dec 12 12:07:17 2002
-@@ -7414,6 +7414,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/audio/libid3tag/files/patch-ltmain.sh b/audio/libid3tag/files/patch-ltmain.sh
new file mode 100644
index 000000000000..f533ca97d342
--- /dev/null
+++ b/audio/libid3tag/files/patch-ltmain.sh
@@ -0,0 +1,25 @@
+--- ltmain.sh.orig	Tue Feb 17 02:52:36 2004
++++ ltmain.sh	Fri Oct 28 09:34:46 2005
+@@ -2980,8 +2980,8 @@
+ 	  ;;
+ 
+ 	freebsd-elf)
+-	  major=".$current"
+-	  versuffix=".$current";
++	  major=.`expr $current - $age`
++	  versuffix="$major";
+ 	  ;;
+ 
+ 	irix | nonstopux)
+@@ -5527,11 +5527,6 @@
+ 	  IFS="$save_ifs"
+ 	fi
+ 
+-	# Install the pseudo-library for information purposes.
+-	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 $?
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/audio/libid3tag/pkg-plist b/audio/libid3tag/pkg-plist
index aeff958d8d3e..c69be47c0b31 100644
--- a/audio/libid3tag/pkg-plist
+++ b/audio/libid3tag/pkg-plist
@@ -1,5 +1,5 @@
 include/id3tag.h
 lib/libid3tag.a
 lib/libid3tag.so
-lib/libid3tag.so.2
+lib/libid3tag.so.0
 libdata/pkgconfig/id3tag.pc