The diff below makes cmake stop shouting about obsolete macros
("WARNING: you are using the obsolete 'PKGCONFIG' macro, use
FindPkgConfig") during configure stage.
Also, do not check for libdiscid, since it's not in our ports
tree.
No pkg change, no bump.
OK?
cheers!
David
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/audio/libmusicbrainz/patches/patch-CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -r1.2 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 25 May 2009 13:59:09 -0000 1.2
+++ patches/patch-CMakeLists_txt 3 Jan 2012 12:29:26 -0000
@@ -1,11 +1,12 @@
$OpenBSD: patch-CMakeLists_txt,v 1.2 2009/05/25 13:59:09 ajacoutot Exp $
--- CMakeLists.txt.orig Sat Sep 13 10:53:16 2008
-+++ CMakeLists.txt Mon May 25 14:24:45 2009
-@@ -20,7 +20,6 @@ SET(musicbrainz3_SOVERSION ${musicbrainz3_SOVERSION_MA
++++ CMakeLists.txt Tue Jan 3 13:23:32 2012
+@@ -20,8 +20,6 @@ SET(musicbrainz3_SOVERSION ${musicbrainz3_SOVERSION_MA
SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
FIND_PACKAGE(Neon REQUIRED)
-FIND_PACKAGE(CppUnit)
- FIND_PACKAGE(DiscId)
+-FIND_PACKAGE(DiscId)
SET(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)")
+ SET(EXEC_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Installation
prefix for executables and object code libraries" FORCE)
Index: patches/patch-cmake_modules_FindNeon_cmake
===================================================================
RCS file: patches/patch-cmake_modules_FindNeon_cmake
diff -N patches/patch-cmake_modules_FindNeon_cmake
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-cmake_modules_FindNeon_cmake 3 Jan 2012 12:29:26 -0000
@@ -0,0 +1,22 @@
+$OpenBSD$
+--- cmake/modules/FindNeon.cmake.orig Tue Jan 3 13:13:58 2012
++++ cmake/modules/FindNeon.cmake Tue Jan 3 13:15:44 2012
+@@ -1,14 +1,14 @@
+-INCLUDE(UsePkgConfig)
+-PKGCONFIG(neon _NeonIncDir _NeonLinkDir _NeonLinkFlags _NeonCflags)
++FIND_PACKAGE(PkgConfig)
++PKG_CHECK_MODULES(_Neon neon)
+
+ FIND_PATH(NEON_INCLUDE_DIR ne_request.h
+- ${_NeonIncDir}
++ ${_Neon_INCLUDE_DIRS}
+ /usr/include/neon
+ /usr/local/include/neon
+ )
+
+ FIND_LIBRARY(NEON_LIBRARIES neon
+- ${_NeonLinkDir}
++ ${_Neon_LIBRARY_DIRS}
+ /usr/lib
+ /usr/local/lib
+ )
