- Patch configure so it prefers libc iconv over libiconv.

- Replace USE_AUTOTOOLS=libtool with USES=libtool.  This allows removing
  some libtool related patches.

PR:		ports/186692
Approved by:	maintainer timeout (2 weeks)

5 files changed, 22 insertions, 47 deletions

diff --git a/audio/id3lib/Makefile b/audio/id3lib/Makefile
index e03d9d9570d6..bd4b8e121ec4 100644
--- a/audio/id3lib/Makefile
+++ b/audio/id3lib/Makefile
@@ -3,16 +3,15 @@
 
 PORTNAME=	id3lib
 PORTVERSION=	3.8.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio
 MASTER_SITES=	SF
 
 MAINTAINER=	kaeru@inigo-tech.com
 COMMENT=	Library for manipulating ID3v1/v1.1 and ID3v2 tags
 
-USE_AUTOTOOLS=	libtool
-USES=		iconv
 GNU_CONFIGURE=	yes
+USES=		iconv libtool
 USE_LDCONFIG=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/audio/id3lib/files/patch-configure b/audio/id3lib/files/patch-configure
index 0641b2704f6b..41890681bf41 100644
--- a/audio/id3lib/files/patch-configure
+++ b/audio/id3lib/files/patch-configure
@@ -1,4 +1,3 @@
-# $FreeBSD$
 --- configure.orig	Sun Aug 14 11:21:37 2005
 +++ configure	Sun Aug 14 11:29:43 2005
 @@ -9134,6 +9134,7 @@
@@ -9,3 +8,22 @@
  fi
  
  
+@@ -9730,14 +9731,13 @@
+   if test ! x$silent = xyes; then
+     exec 6>&1
+   fi
+-  #standalone library rules over libc
+-  if test $iconv_in_iconv = 1 -o $libiconv_in_iconv = 1; then
++  if test $iconv_in_libc = 1; then
++    echo "$as_me:$LINENO: result: libc" >&5
++echo "${ECHO_T}libc" >&6
++  elif test $iconv_in_iconv = 1 -o $libiconv_in_iconv = 1; then
+     echo "$as_me:$LINENO: result: libiconv" >&5
+ echo "${ECHO_T}libiconv" >&6
+     ICONV_LIB=-liconv
+-  elif test $iconv_in_libc = 1; then
+-    echo "$as_me:$LINENO: result: libc" >&5
+-echo "${ECHO_T}libc" >&6
+   else
+     echo "$as_me:$LINENO: result: not found (panic)" >&5
+ echo "${ECHO_T}not found (panic)" >&6
diff --git a/audio/id3lib/files/patch-examples-Makefile.in b/audio/id3lib/files/patch-examples-Makefile.in
deleted file mode 100644
index b234eb8cffbe..000000000000
--- a/audio/id3lib/files/patch-examples-Makefile.in
+++ /dev/null
@@ -1,26 +0,0 @@
---- examples/Makefile.in.orig	2007-10-31 00:27:29.000000000 +0100
-+++ examples/Makefile.in	2007-10-31 00:27:55.000000000 +0100
-@@ -647,19 +647,19 @@
- @AMDEP_TRUE@	./$(DEPDIR)/test_unicode.Po
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-+LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
- 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- CFLAGS = @CFLAGS@
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- CXXLD = $(CXX)
--CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- CXXFLAGS = @CXXFLAGS@
- DIST_SOURCES = $(findeng_SOURCES) $(findstr_SOURCES) $(get_pic_SOURCES) \
diff --git a/audio/id3lib/files/patch-src-Makefile.in b/audio/id3lib/files/patch-src-Makefile.in
deleted file mode 100644
index 62e12dfd08c2..000000000000
--- a/audio/id3lib/files/patch-src-Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/Makefile.in.orig	2007-10-31 00:26:59.000000000 +0100
-+++ src/Makefile.in	2007-10-31 00:27:25.000000000 +0100
-@@ -236,11 +236,11 @@
- @AMDEP_TRUE@	./$(DEPDIR)/writers.Plo
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- CXXLD = $(CXX)
--CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- CXXFLAGS = @CXXFLAGS@
- DIST_SOURCES = $(libid3_la_SOURCES)
diff --git a/audio/id3lib/pkg-plist b/audio/id3lib/pkg-plist
index 6fe27586307b..abdecf429d5d 100644
--- a/audio/id3lib/pkg-plist
+++ b/audio/id3lib/pkg-plist
@@ -16,8 +16,8 @@ include/id3/tag.h
 include/id3/utils.h
 include/id3/writer.h
 include/id3/writers.h
-lib/libid3-3.8.so
 lib/libid3-3.8.so.3
+lib/libid3-3.8.so.3.0.0
 lib/libid3.a
 lib/libid3.la
 lib/libid3.so