From owner-svn-ports-all@FreeBSD.ORG Thu Feb 27 16:14:32 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.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 1592FBC; Thu, 27 Feb 2014 16:14:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DBC4D1692; Thu, 27 Feb 2014 16:14:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1RGEVsO043244; Thu, 27 Feb 2014 16:14:31 GMT (envelope-from tijl@svn.freebsd.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1RGEVWu043239; Thu, 27 Feb 2014 16:14:31 GMT (envelope-from tijl@svn.freebsd.org) Message-Id: <201402271614.s1RGEVWu043239@svn.freebsd.org> From: Tijl Coosemans Date: Thu, 27 Feb 2014 16:14:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r346378 - in head/audio/id3lib: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Feb 2014 16:14:32 -0000 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