Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 16 Jun 2015 13:18:04 +0000 (UTC)
From:      "Jason E. Hale" <jhale@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r389841 - in head/audio/libmusicbrainz5: . files
Message-ID:  <201506161318.t5GDI4n2066137@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <alval@alval.net>, Luca Pizzamiglio <luca.pizzamiglio@gmail.com>

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506161318.t5GDI4n2066137>