Date: Wed, 12 Feb 2014 15:23:08 +0100 (CET) From: Tijl Coosemans <tijl@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/186692: [patch] audio/id3lib: fix iconv detection Message-ID: <201402121423.s1CEN82R025806@kalimero.tijl.coosemans.org> Resent-Message-ID: <201402121430.s1CEU0GJ038994@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 186692
>Category: ports
>Synopsis: [patch] audio/id3lib: fix iconv detection
>Confidential: no
>Severity: non-critical
>Priority: high
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Feb 12 14:30:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Tijl Coosemans
>Release: FreeBSD 11.0-CURRENT i386
>Organization:
>Environment:
>Description:
The configure script prefers to use iconv from libiconv over libc but
on FreeBSD 10 libc iconv should be used. The attached patch changes
files/patch-configure to fix this.
This patch also replaces USE_AUTOTOOLS=libtool with USES=libtool. This
allows removing some libtool related patches from files/.
>How-To-Repeat:
>Fix:
--- id3lib.patch begins here ---
Index: audio/id3lib/Makefile
===================================================================
--- audio/id3lib/Makefile (revision 343867)
+++ audio/id3lib/Makefile (working copy)
@@ -3,15 +3,14 @@
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
+USES= iconv libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
Index: audio/id3lib/files/patch-configure
===================================================================
--- audio/id3lib/files/patch-configure (revision 343867)
+++ audio/id3lib/files/patch-configure (working copy)
@@ -1,6 +1,5 @@
-# $FreeBSD$
---- configure.orig Sun Aug 14 11:21:37 2005
-+++ configure Sun Aug 14 11:29:43 2005
+--- configure.orig
++++ configure
@@ -9134,6 +9134,7 @@
else
ID3_NEEDZLIB_TRUE='#'
@@ -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
Index: audio/id3lib/files/patch-examples-Makefile.in
===================================================================
--- audio/id3lib/files/patch-examples-Makefile.in (revision 343867)
+++ audio/id3lib/files/patch-examples-Makefile.in (working copy)
@@ -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) \
Index: audio/id3lib/files/patch-src-Makefile.in
===================================================================
--- audio/id3lib/files/patch-src-Makefile.in (revision 343867)
+++ audio/id3lib/files/patch-src-Makefile.in (working copy)
@@ -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)
Index: audio/id3lib/pkg-plist
===================================================================
--- audio/id3lib/pkg-plist (revision 343867)
+++ audio/id3lib/pkg-plist (working copy)
@@ -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
--- id3lib.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402121423.s1CEN82R025806>