9 files changed, 243 insertions, 9 deletions

diff --git a/audio/libmusicbrainz3/Makefile b/audio/libmusicbrainz3/Makefile
index e3da4b1ea641..0821ba484f8f 100644
--- a/audio/libmusicbrainz3/Makefile
+++ b/audio/libmusicbrainz3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libmusicbrainz3
 PORTVERSION=	3.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.musicbrainz.org/pub/musicbrainz/ \
     		http://uk.musicbrainz.org/pub/musicbrainz/ \
@@ -24,10 +24,12 @@ USE_CMAKE=	yes
 USE_GNOME=	pkgconfig
 USE_LDCONFIG=	yes
 
+MAKE_JOBS_SAFE=	yes
+
 .include <bsd.port.pre.mk>
 
 pre-configure:
-	${REINPLACE_CMD} -e 's|$${LIB_INSTALL_DIR}\/pkgconfig|libdata\/pkgconfig|' \
-		${WRKSRC}/CMakeLists.txt
+	${REINPLACE_CMD} -e '/pkgconfig/s|$${LIB_INSTALL_DIR}|libdata|' \
+		-e '/CppUnit/d' ${WRKSRC}/CMakeLists.txt
 
 .include <bsd.port.post.mk>
diff --git a/audio/libmusicbrainz3/files/patch-cmake__modules__FindDiscId.cmake b/audio/libmusicbrainz3/files/patch-cmake__modules__FindDiscId.cmake
new file mode 100644
index 000000000000..43f75538ecae
--- /dev/null
+++ b/audio/libmusicbrainz3/files/patch-cmake__modules__FindDiscId.cmake
@@ -0,0 +1,38 @@
+--- ./cmake/modules/FindDiscId.cmake.orig	2007-05-12 07:09:24.000000000 -0400
++++ ./cmake/modules/FindDiscId.cmake	2009-05-20 06:39:11.000000000 -0400
+@@ -1,28 +1,10 @@
+-INCLUDE(UsePkgConfig)
+-PKGCONFIG(libdiscid _DiscIdIncDir _DiscIdLinkDir _DiscIdLinkFlags _DiscIdCflags)
+-
+-FIND_PATH(DISCID_INCLUDE_DIR discid/discid.h
+-    ${_DiscIdIncDir}
+-    /usr/include
+-    /usr/local/include
+-)
++FIND_PATH(DISCID_INCLUDE_DIR NAMES discid/discid.h)
+ 
+-FIND_LIBRARY(DISCID_LIBRARIES discid
+-    ${_DiscIdLinkDir}
+-    /usr/lib
+-    /usr/local/lib
+-)
++FIND_LIBRARY(DISCID_LIBRARY NAMES discid)
+ 
+-IF (DISCID_INCLUDE_DIR AND DISCID_LIBRARIES)
+-    SET(DISCID_FOUND TRUE)
+-ENDIF (DISCID_INCLUDE_DIR AND DISCID_LIBRARIES)
++INCLUDE(FindPackageHandleStandardArgs)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(DISCID DEFAULT_MSG DISCID_LIBRARY DISCID_INCLUDE_DIR)
+ 
+-IF (DISCID_FOUND)
+-    IF (NOT DiscId_FIND_QUIETLY)
+-	MESSAGE(STATUS "Found DiscId: ${DISCID_LIBRARIES}")
+-    ENDIF (NOT DiscId_FIND_QUIETLY)
+-ELSE (DISCID_FOUND)
+-    IF (DiscId_FIND_REQUIRED)
+-	MESSAGE(FATAL_ERROR "Could not find DiscId")
+-    ENDIF (DiscId_FIND_REQUIRED)
+-ENDIF (DISCID_FOUND)
++IF(DISCID_FOUND)
++  SET(DISCID_LIBRARIES ${DISCID_LIBRARY})
++ENDIF(DISCID_FOUND)
diff --git a/audio/libmusicbrainz3/files/patch-cmake__modules__FindNeon.cmake b/audio/libmusicbrainz3/files/patch-cmake__modules__FindNeon.cmake
new file mode 100644
index 000000000000..4fce459456f1
--- /dev/null
+++ b/audio/libmusicbrainz3/files/patch-cmake__modules__FindNeon.cmake
@@ -0,0 +1,38 @@
+--- ./cmake/modules/FindNeon.cmake.orig	2007-05-12 07:09:24.000000000 -0400
++++ ./cmake/modules/FindNeon.cmake	2009-05-20 06:44:50.000000000 -0400
+@@ -1,28 +1,10 @@
+-INCLUDE(UsePkgConfig)
+-PKGCONFIG(neon _NeonIncDir _NeonLinkDir _NeonLinkFlags _NeonCflags)
+-
+-FIND_PATH(NEON_INCLUDE_DIR ne_request.h
+-    ${_NeonIncDir}
+-    /usr/include/neon
+-    /usr/local/include/neon
+-)
++FIND_PATH(NEON_INCLUDE_DIR NAMES ne_request.h PATH_SUFFIXES neon)
+ 
+-FIND_LIBRARY(NEON_LIBRARIES neon
+-    ${_NeonLinkDir}
+-    /usr/lib
+-    /usr/local/lib
+-)
++FIND_LIBRARY(NEON_LIBRARY NAMES neon)
+ 
+-IF (NEON_INCLUDE_DIR AND NEON_LIBRARIES)
+-    SET(NEON_FOUND TRUE)
+-ENDIF (NEON_INCLUDE_DIR AND NEON_LIBRARIES)
++INCLUDE(FindPackageHandleStandardArgs)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(NEON DEFAULT_MSG NEON_LIBRARY NEON_INCLUDE_DIR)
+ 
+-IF (NEON_FOUND)
+-    IF (NOT Neon_FIND_QUIETLY)
+-	MESSAGE(STATUS "Found Neon: ${NEON_LIBRARIES}")
+-    ENDIF (NOT Neon_FIND_QUIETLY)
+-ELSE (NEON_FOUND)
+-    IF (Neon_FIND_REQUIRED)
+-	MESSAGE(FATAL_ERROR "Could not find Neon")
+-    ENDIF (Neon_FIND_REQUIRED)
+-ENDIF (NEON_FOUND)
++IF(NEON_FOUND)
++  SET(NEON_LIBRARIES ${NEON_LIBRARY})
++ENDIF(NEON_FOUND)
diff --git a/audio/libmusicbrainz4/Makefile b/audio/libmusicbrainz4/Makefile
index e3da4b1ea641..0821ba484f8f 100644
--- a/audio/libmusicbrainz4/Makefile
+++ b/audio/libmusicbrainz4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libmusicbrainz3
 PORTVERSION=	3.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.musicbrainz.org/pub/musicbrainz/ \
     		http://uk.musicbrainz.org/pub/musicbrainz/ \
@@ -24,10 +24,12 @@ USE_CMAKE=	yes
 USE_GNOME=	pkgconfig
 USE_LDCONFIG=	yes
 
+MAKE_JOBS_SAFE=	yes
+
 .include <bsd.port.pre.mk>
 
 pre-configure:
-	${REINPLACE_CMD} -e 's|$${LIB_INSTALL_DIR}\/pkgconfig|libdata\/pkgconfig|' \
-		${WRKSRC}/CMakeLists.txt
+	${REINPLACE_CMD} -e '/pkgconfig/s|$${LIB_INSTALL_DIR}|libdata|' \
+		-e '/CppUnit/d' ${WRKSRC}/CMakeLists.txt
 
 .include <bsd.port.post.mk>
diff --git a/audio/libmusicbrainz4/files/patch-cmake__modules__FindDiscId.cmake b/audio/libmusicbrainz4/files/patch-cmake__modules__FindDiscId.cmake
new file mode 100644
index 000000000000..43f75538ecae
--- /dev/null
+++ b/audio/libmusicbrainz4/files/patch-cmake__modules__FindDiscId.cmake
@@ -0,0 +1,38 @@
+--- ./cmake/modules/FindDiscId.cmake.orig	2007-05-12 07:09:24.000000000 -0400
++++ ./cmake/modules/FindDiscId.cmake	2009-05-20 06:39:11.000000000 -0400
+@@ -1,28 +1,10 @@
+-INCLUDE(UsePkgConfig)
+-PKGCONFIG(libdiscid _DiscIdIncDir _DiscIdLinkDir _DiscIdLinkFlags _DiscIdCflags)
+-
+-FIND_PATH(DISCID_INCLUDE_DIR discid/discid.h
+-    ${_DiscIdIncDir}
+-    /usr/include
+-    /usr/local/include
+-)
++FIND_PATH(DISCID_INCLUDE_DIR NAMES discid/discid.h)
+ 
+-FIND_LIBRARY(DISCID_LIBRARIES discid
+-    ${_DiscIdLinkDir}
+-    /usr/lib
+-    /usr/local/lib
+-)
++FIND_LIBRARY(DISCID_LIBRARY NAMES discid)
+ 
+-IF (DISCID_INCLUDE_DIR AND DISCID_LIBRARIES)
+-    SET(DISCID_FOUND TRUE)
+-ENDIF (DISCID_INCLUDE_DIR AND DISCID_LIBRARIES)
++INCLUDE(FindPackageHandleStandardArgs)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(DISCID DEFAULT_MSG DISCID_LIBRARY DISCID_INCLUDE_DIR)
+ 
+-IF (DISCID_FOUND)
+-    IF (NOT DiscId_FIND_QUIETLY)
+-	MESSAGE(STATUS "Found DiscId: ${DISCID_LIBRARIES}")
+-    ENDIF (NOT DiscId_FIND_QUIETLY)
+-ELSE (DISCID_FOUND)
+-    IF (DiscId_FIND_REQUIRED)
+-	MESSAGE(FATAL_ERROR "Could not find DiscId")
+-    ENDIF (DiscId_FIND_REQUIRED)
+-ENDIF (DISCID_FOUND)
++IF(DISCID_FOUND)
++  SET(DISCID_LIBRARIES ${DISCID_LIBRARY})
++ENDIF(DISCID_FOUND)
diff --git a/audio/libmusicbrainz4/files/patch-cmake__modules__FindNeon.cmake b/audio/libmusicbrainz4/files/patch-cmake__modules__FindNeon.cmake
new file mode 100644
index 000000000000..4fce459456f1
--- /dev/null
+++ b/audio/libmusicbrainz4/files/patch-cmake__modules__FindNeon.cmake
@@ -0,0 +1,38 @@
+--- ./cmake/modules/FindNeon.cmake.orig	2007-05-12 07:09:24.000000000 -0400
++++ ./cmake/modules/FindNeon.cmake	2009-05-20 06:44:50.000000000 -0400
+@@ -1,28 +1,10 @@
+-INCLUDE(UsePkgConfig)
+-PKGCONFIG(neon _NeonIncDir _NeonLinkDir _NeonLinkFlags _NeonCflags)
+-
+-FIND_PATH(NEON_INCLUDE_DIR ne_request.h
+-    ${_NeonIncDir}
+-    /usr/include/neon
+-    /usr/local/include/neon
+-)
++FIND_PATH(NEON_INCLUDE_DIR NAMES ne_request.h PATH_SUFFIXES neon)
+ 
+-FIND_LIBRARY(NEON_LIBRARIES neon
+-    ${_NeonLinkDir}
+-    /usr/lib
+-    /usr/local/lib
+-)
++FIND_LIBRARY(NEON_LIBRARY NAMES neon)
+ 
+-IF (NEON_INCLUDE_DIR AND NEON_LIBRARIES)
+-    SET(NEON_FOUND TRUE)
+-ENDIF (NEON_INCLUDE_DIR AND NEON_LIBRARIES)
++INCLUDE(FindPackageHandleStandardArgs)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(NEON DEFAULT_MSG NEON_LIBRARY NEON_INCLUDE_DIR)
+ 
+-IF (NEON_FOUND)
+-    IF (NOT Neon_FIND_QUIETLY)
+-	MESSAGE(STATUS "Found Neon: ${NEON_LIBRARIES}")
+-    ENDIF (NOT Neon_FIND_QUIETLY)
+-ELSE (NEON_FOUND)
+-    IF (Neon_FIND_REQUIRED)
+-	MESSAGE(FATAL_ERROR "Could not find Neon")
+-    ENDIF (Neon_FIND_REQUIRED)
+-ENDIF (NEON_FOUND)
++IF(NEON_FOUND)
++  SET(NEON_LIBRARIES ${NEON_LIBRARY})
++ENDIF(NEON_FOUND)
diff --git a/audio/libmusicbrainz5/Makefile b/audio/libmusicbrainz5/Makefile
index e3da4b1ea641..0821ba484f8f 100644
--- a/audio/libmusicbrainz5/Makefile
+++ b/audio/libmusicbrainz5/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libmusicbrainz3
 PORTVERSION=	3.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.musicbrainz.org/pub/musicbrainz/ \
     		http://uk.musicbrainz.org/pub/musicbrainz/ \
@@ -24,10 +24,12 @@ USE_CMAKE=	yes
 USE_GNOME=	pkgconfig
 USE_LDCONFIG=	yes
 
+MAKE_JOBS_SAFE=	yes
+
 .include <bsd.port.pre.mk>
 
 pre-configure:
-	${REINPLACE_CMD} -e 's|$${LIB_INSTALL_DIR}\/pkgconfig|libdata\/pkgconfig|' \
-		${WRKSRC}/CMakeLists.txt
+	${REINPLACE_CMD} -e '/pkgconfig/s|$${LIB_INSTALL_DIR}|libdata|' \
+		-e '/CppUnit/d' ${WRKSRC}/CMakeLists.txt
 
 .include <bsd.port.post.mk>
diff --git a/audio/libmusicbrainz5/files/patch-cmake__modules__FindDiscId.cmake b/audio/libmusicbrainz5/files/patch-cmake__modules__FindDiscId.cmake
new file mode 100644
index 000000000000..43f75538ecae
--- /dev/null
+++ b/audio/libmusicbrainz5/files/patch-cmake__modules__FindDiscId.cmake
@@ -0,0 +1,38 @@
+--- ./cmake/modules/FindDiscId.cmake.orig	2007-05-12 07:09:24.000000000 -0400
++++ ./cmake/modules/FindDiscId.cmake	2009-05-20 06:39:11.000000000 -0400
+@@ -1,28 +1,10 @@
+-INCLUDE(UsePkgConfig)
+-PKGCONFIG(libdiscid _DiscIdIncDir _DiscIdLinkDir _DiscIdLinkFlags _DiscIdCflags)
+-
+-FIND_PATH(DISCID_INCLUDE_DIR discid/discid.h
+-    ${_DiscIdIncDir}
+-    /usr/include
+-    /usr/local/include
+-)
++FIND_PATH(DISCID_INCLUDE_DIR NAMES discid/discid.h)
+ 
+-FIND_LIBRARY(DISCID_LIBRARIES discid
+-    ${_DiscIdLinkDir}
+-    /usr/lib
+-    /usr/local/lib
+-)
++FIND_LIBRARY(DISCID_LIBRARY NAMES discid)
+ 
+-IF (DISCID_INCLUDE_DIR AND DISCID_LIBRARIES)
+-    SET(DISCID_FOUND TRUE)
+-ENDIF (DISCID_INCLUDE_DIR AND DISCID_LIBRARIES)
++INCLUDE(FindPackageHandleStandardArgs)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(DISCID DEFAULT_MSG DISCID_LIBRARY DISCID_INCLUDE_DIR)
+ 
+-IF (DISCID_FOUND)
+-    IF (NOT DiscId_FIND_QUIETLY)
+-	MESSAGE(STATUS "Found DiscId: ${DISCID_LIBRARIES}")
+-    ENDIF (NOT DiscId_FIND_QUIETLY)
+-ELSE (DISCID_FOUND)
+-    IF (DiscId_FIND_REQUIRED)
+-	MESSAGE(FATAL_ERROR "Could not find DiscId")
+-    ENDIF (DiscId_FIND_REQUIRED)
+-ENDIF (DISCID_FOUND)
++IF(DISCID_FOUND)
++  SET(DISCID_LIBRARIES ${DISCID_LIBRARY})
++ENDIF(DISCID_FOUND)
diff --git a/audio/libmusicbrainz5/files/patch-cmake__modules__FindNeon.cmake b/audio/libmusicbrainz5/files/patch-cmake__modules__FindNeon.cmake
new file mode 100644
index 000000000000..4fce459456f1
--- /dev/null
+++ b/audio/libmusicbrainz5/files/patch-cmake__modules__FindNeon.cmake
@@ -0,0 +1,38 @@
+--- ./cmake/modules/FindNeon.cmake.orig	2007-05-12 07:09:24.000000000 -0400
++++ ./cmake/modules/FindNeon.cmake	2009-05-20 06:44:50.000000000 -0400
+@@ -1,28 +1,10 @@
+-INCLUDE(UsePkgConfig)
+-PKGCONFIG(neon _NeonIncDir _NeonLinkDir _NeonLinkFlags _NeonCflags)
+-
+-FIND_PATH(NEON_INCLUDE_DIR ne_request.h
+-    ${_NeonIncDir}
+-    /usr/include/neon
+-    /usr/local/include/neon
+-)
++FIND_PATH(NEON_INCLUDE_DIR NAMES ne_request.h PATH_SUFFIXES neon)
+ 
+-FIND_LIBRARY(NEON_LIBRARIES neon
+-    ${_NeonLinkDir}
+-    /usr/lib
+-    /usr/local/lib
+-)
++FIND_LIBRARY(NEON_LIBRARY NAMES neon)
+ 
+-IF (NEON_INCLUDE_DIR AND NEON_LIBRARIES)
+-    SET(NEON_FOUND TRUE)
+-ENDIF (NEON_INCLUDE_DIR AND NEON_LIBRARIES)
++INCLUDE(FindPackageHandleStandardArgs)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(NEON DEFAULT_MSG NEON_LIBRARY NEON_INCLUDE_DIR)
+ 
+-IF (NEON_FOUND)
+-    IF (NOT Neon_FIND_QUIETLY)
+-	MESSAGE(STATUS "Found Neon: ${NEON_LIBRARIES}")
+-    ENDIF (NOT Neon_FIND_QUIETLY)
+-ELSE (NEON_FOUND)
+-    IF (Neon_FIND_REQUIRED)
+-	MESSAGE(FATAL_ERROR "Could not find Neon")
+-    ENDIF (Neon_FIND_REQUIRED)
+-ENDIF (NEON_FOUND)
++IF(NEON_FOUND)
++  SET(NEON_LIBRARIES ${NEON_LIBRARY})
++ENDIF(NEON_FOUND)