From tijl@coosemans.org  Wed Feb 12 14:23:19 2014
Return-Path: <tijl@coosemans.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id E907E29A
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 12 Feb 2014 14:23:18 +0000 (UTC)
Received: from mailrelay007.isp.belgacom.be (mailrelay007.isp.belgacom.be [195.238.6.173])
	by mx1.freebsd.org (Postfix) with ESMTP id 6FE2E1834
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 12 Feb 2014 14:23:18 +0000 (UTC)
Received: from 37.145-176-91.adsl-dyn.isp.belgacom.be (HELO kalimero.tijl.coosemans.org) ([91.176.145.37])
  by relay.skynet.be with ESMTP; 12 Feb 2014 15:23:09 +0100
Received: from kalimero.tijl.coosemans.org (kalimero.tijl.coosemans.org [127.0.0.1])
	by kalimero.tijl.coosemans.org (8.14.7/8.14.7) with ESMTP id s1CEN8Jh025807
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO)
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 12 Feb 2014 15:23:10 +0100 (CET)
	(envelope-from tijl@kalimero.tijl.coosemans.org)
Received: (from tijl@localhost)
	by kalimero.tijl.coosemans.org (8.14.7/8.14.7/Submit) id s1CEN82R025806;
	Wed, 12 Feb 2014 15:23:08 +0100 (CET)
	(envelope-from tijl)
Message-Id: <201402121423.s1CEN82R025806@kalimero.tijl.coosemans.org>
Date: Wed, 12 Feb 2014 15:23:08 +0100 (CET)
From: Tijl Coosemans <tijl@FreeBSD.org>
Reply-To: Tijl Coosemans <tijl@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] audio/id3lib: fix iconv detection
X-Send-Pr-Version: 3.114
X-GNATS-Notify: kaeru@inigo-tech.com

>Number:         186692
>Category:       ports
>Synopsis:       [patch] audio/id3lib: fix iconv detection
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    tijl
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Feb 12 14:30:00 UTC 2014
>Closed-Date:    Thu Feb 27 17:15:14 CET 2014
>Last-Modified:  Thu Feb 27 16:20:00 UTC 2014
>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:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Wed Feb 12 14:30:08 UTC 2014 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=186692 
Responsible-Changed-From-To: freebsd-ports-bugs->tijl 
Responsible-Changed-By: tijl 
Responsible-Changed-When: Wed Feb 12 15:37:19 CET 2014 
Responsible-Changed-Why:  
Take. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=186692 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: kaeru@inigo-tech.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/186692: [patch] audio/id3lib: fix iconv detection
Date: Wed, 12 Feb 2014 14:30:07 UT

 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
State-Changed-From-To: feedback->closed 
State-Changed-By: tijl 
State-Changed-When: Thu Feb 27 17:14:50 CET 2014 
State-Changed-Why:  
Committed in r346378. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=186692 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/186692: commit references a PR
Date: Thu, 27 Feb 2014 16:14:39 +0000 (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"
 
>Unformatted:
