Bug 186692 - [patch] audio/id3lib: fix iconv detection
Summary: [patch] audio/id3lib: fix iconv detection
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Tijl Coosemans
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-02-12 14:30 UTC by Tijl Coosemans
Modified: 2014-02-27 16:20 UTC (History)
0 users

See Also:


Attachments
id3lib.patch (4.65 KB, patch)
2014-02-12 14:30 UTC, Tijl Coosemans
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Tijl Coosemans freebsd_committer 2014-02-12 14:30:00 UTC
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/.
Comment 1 Edwin Groothuis freebsd_committer 2014-02-12 14:30:07 UTC
Maintainer of audio/id3lib,

Please note that PR ports/186692 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/186692

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 2 Edwin Groothuis freebsd_committer 2014-02-12 14:30:08 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 3 Tijl Coosemans freebsd_committer 2014-02-12 14:37:19 UTC
Responsible Changed
From-To: freebsd-ports-bugs->tijl

Take.
Comment 4 dfilter service freebsd_committer 2014-02-27 16:14:39 UTC
Author: tijl
Date: Thu Feb 27 16:14:30 2014
New Revision: 346378
URL: http://svnweb.freebsd.org/changeset/ports/346378
QAT: https://qat.redports.org/buildarchive/r346378/

Log:
  - 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)

Deleted:
  head/audio/id3lib/files/patch-examples-Makefile.in
  head/audio/id3lib/files/patch-src-Makefile.in
Modified:
  head/audio/id3lib/Makefile
  head/audio/id3lib/files/patch-configure   (contents, props changed)
  head/audio/id3lib/pkg-plist

Modified: head/audio/id3lib/Makefile
==============================================================================
--- head/audio/id3lib/Makefile	Thu Feb 27 16:06:53 2014	(r346377)
+++ head/audio/id3lib/Makefile	Thu Feb 27 16:14:30 2014	(r346378)
@@ -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

Modified: head/audio/id3lib/files/patch-configure
==============================================================================
--- head/audio/id3lib/files/patch-configure	Thu Feb 27 16:06:53 2014	(r346377)
+++ head/audio/id3lib/files/patch-configure	Thu Feb 27 16:14:30 2014	(r346378)
@@ -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

Modified: head/audio/id3lib/pkg-plist
==============================================================================
--- head/audio/id3lib/pkg-plist	Thu Feb 27 16:06:53 2014	(r346377)
+++ head/audio/id3lib/pkg-plist	Thu Feb 27 16:14:30 2014	(r346378)
@@ -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
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 5 Tijl Coosemans freebsd_committer 2014-02-27 16:14:50 UTC
State Changed
From-To: feedback->closed

Committed in r346378.