From owner-svn-ports-all@FreeBSD.ORG Tue Jun 16 13:18:04 2015 Return-Path: Delivered-To: svn-ports-all@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AECA5FCF; Tue, 16 Jun 2015 13:18:04 +0000 (UTC) (envelope-from jhale@FreeBSD.org) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 82A226C1; Tue, 16 Jun 2015 13:18:04 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5GDI4JV066139; Tue, 16 Jun 2015 13:18:04 GMT (envelope-from jhale@FreeBSD.org) Received: (from jhale@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5GDI4n2066137; Tue, 16 Jun 2015 13:18:04 GMT (envelope-from jhale@FreeBSD.org) Message-Id: <201506161318.t5GDI4n2066137@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jhale set sender to jhale@FreeBSD.org using -f From: "Jason E. Hale" Date: Tue, 16 Jun 2015 13:18:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r389841 - in head/audio/libmusicbrainz5: . 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.20 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: Tue, 16 Jun 2015 13:18:04 -0000 Author: jhale Date: Tue Jun 16 13:18:03 2015 New Revision: 389841 URL: https://svnweb.freebsd.org/changeset/ports/389841 Log: - Fix build for systems without iconv in the base Reported by: Alan Valentine , Luca Pizzamiglio Added: head/audio/libmusicbrainz5/files/patch-src_CMakeLists.txt (contents, props changed) Modified: head/audio/libmusicbrainz5/Makefile Modified: head/audio/libmusicbrainz5/Makefile ============================================================================== --- head/audio/libmusicbrainz5/Makefile Tue Jun 16 13:03:46 2015 (r389840) +++ head/audio/libmusicbrainz5/Makefile Tue Jun 16 13:18:03 2015 (r389841) @@ -12,7 +12,7 @@ LICENSE= LGPL21 LIB_DEPENDS= libneon.so:${PORTSDIR}/www/neon -USES= cmake +USES= cmake iconv:build USE_GNOME= libxml2 USE_LDCONFIG= yes @@ -23,6 +23,8 @@ GH_TAGNAME= release-${PORTVERSION} post-patch: ${REINPLACE_CMD} -e '/pkgconfig/s|$${LIB_INSTALL_DIR}|libdata|' \ ${WRKSRC}/CMakeLists.txt + ${REINPLACE_CMD} -e 's|%%ICONV_PREFIX%%|${ICONV_PREFIX}|g' \ + ${WRKSRC}/src/CMakeLists.txt ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/cmake/modules/*.cmake ${RM} -f ${WRKSRC}/cmake/modules/FindLibXml2.cmake Added: head/audio/libmusicbrainz5/files/patch-src_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/libmusicbrainz5/files/patch-src_CMakeLists.txt Tue Jun 16 13:18:03 2015 (r389841) @@ -0,0 +1,10 @@ +--- src/CMakeLists.txt.orig 2015-06-16 13:01:35 UTC ++++ src/CMakeLists.txt +@@ -5,6 +5,7 @@ INCLUDE_DIRECTORIES( + ${CMAKE_CURRENT_BINARY_DIR}/../include + ${NEON_INCLUDE_DIR} + ${LIBXML2_INCLUDE_DIR} ++ %%ICONV_PREFIX%%/include + ) + + SET(_sources Alias.cc Annotation.cc Artist.cc ArtistCredit.cc Attribute.cc CDStub.cc Collection.cc