Fix dependencies to please ninja.

While here, merge PFRAG.shared into PLIST.

audio/musepack/Makefile

@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.4 2013/03/10 22:55:04 espie Exp $
+# $OpenBSD: Makefile,v 1.5 2013/06/23 14:30:51 dcoppa Exp $
 
 COMMENT =		decoder, encoder and replaygain for musepack files
 
 V =			475
 DISTNAME =		musepack_src_r${V}
 PKGNAME =		musepack-${V}
-REVISION =		0
+REVISION =		1
 CATEGORIES =		audio
 
 HOMEPAGE =		http://www.musepack.net/

audio/musepack/patches/patch-mpc2sv8_CMakeLists_txt

@@ -1,12 +1,30 @@
-$OpenBSD: patch-mpc2sv8_CMakeLists_txt,v 1.1.1.1 2012/05/24 18:25:56 shadchin Exp $
+$OpenBSD: patch-mpc2sv8_CMakeLists_txt,v 1.2 2013/06/23 14:30:51 dcoppa Exp $
---- mpc2sv8/CMakeLists.txt.orig	Fri Jun 18 18:45:01 2010
+--- mpc2sv8/CMakeLists.txt.orig	Sat Aug 21 17:55:01 2010
-+++ mpc2sv8/CMakeLists.txt	Fri Jun 18 18:45:10 2010
++++ mpc2sv8/CMakeLists.txt	Sun Jun 23 15:32:42 2013
-@@ -28,8 +28,4 @@ if(NOT MSVC)
+@@ -13,12 +13,15 @@ endif(MSVC)
+ add_executable(mpc2sv8 mpc2sv8.c)
+ 
+ if(SHARED)
+-  target_link_libraries(mpc2sv8 mpcdec)
++  target_link_libraries(mpc2sv8 mpcdec_shared)
++  add_dependencies(mpc2sv8 mpcdec_shared)
+ else(SHARED)
+   target_link_libraries(mpc2sv8 mpcdec_static)
++  add_dependencies(mpc2sv8 mpcdec_static)
+ endif(SHARED)
+ 
+ target_link_libraries(mpc2sv8 mpcenc_static)
++add_dependencies(mpc2sv8 mpcenc_static)
+ 
+ if(WIN32)
+ target_link_libraries(mpc2sv8 winmm)
+@@ -27,9 +30,5 @@ endif(WIN32)
+ if(NOT MSVC)
  target_link_libraries(mpc2sv8 m)
  endif(NOT MSVC)
- 
+-
 -if(CMAKE_SYSTEM_NAME STREQUAL OpenBSD)
 -target_link_libraries(mpc2sv8 ossaudio)
 -endif(CMAKE_SYSTEM_NAME STREQUAL OpenBSD)
--
+ 
  install(TARGETS mpc2sv8 RUNTIME DESTINATION bin)

audio/musepack/patches/patch-mpcchap_CMakeLists_txt

@@ -1,6 +1,6 @@
-$OpenBSD: patch-mpcchap_CMakeLists_txt,v 1.1.1.1 2012/05/24 18:25:56 shadchin Exp $
+$OpenBSD: patch-mpcchap_CMakeLists_txt,v 1.2 2013/06/23 14:30:52 dcoppa Exp $
---- mpcchap/CMakeLists.txt.orig	Sat Aug 21 21:55:01 2010
+--- mpcchap/CMakeLists.txt.orig	Sat Aug 21 17:55:01 2010
-+++ mpcchap/CMakeLists.txt	Fri Dec  2 04:20:27 2011
++++ mpcchap/CMakeLists.txt	Sun Jun 23 15:33:01 2013
 @@ -1,8 +1,8 @@
 -FIND_PATH(CUEFILE_INCLUDE_DIR cuetools/cuefile.h
 +FIND_PATH(CUEFILE_INCLUDE_DIR libcue/libcue.h
@@ -12,3 +12,22 @@ $OpenBSD: patch-mpcchap_CMakeLists_txt,v 1.1.1.1 2012/05/24 18:25:56 shadchin Ex
  	${CUEFILE_INCLUDE_DIR}/../src
  )
  
+@@ -15,13 +15,15 @@ link_directories(${libmpc_BINARY_DIR}/libmpcenc)
+ add_executable(mpcchap mpcchap.c dictionary.c iniparser.c ${libmpc_SOURCE_DIR}/common/tags.c)
+ 
+ if(SHARED)
+-  target_link_libraries(mpcchap mpcdec)
++  target_link_libraries(mpcchap mpcdec_shared)
++  add_dependencies(mpcchap mpcdec_shared)
+ else(SHARED)
+   target_link_libraries(mpcchap mpcdec_static)
++  add_dependencies(mpcchap mpcdec_static)
+ endif(SHARED)
+ 
+-target_link_libraries(mpcchap mpcenc_static)
+-target_link_libraries(mpcchap ${CUEFILE_LIBRARY})
++target_link_libraries(mpcchap mpcenc_static ${CUEFILE_LIBRARY})
++add_dependencies(mpcchap mpcenc_static)
+ 
+ if(NOT MSVC)
+ target_link_libraries(mpcchap m)

audio/musepack/patches/patch-mpccut_CMakeLists_txt

@@ -0,0 +1,20 @@
+$OpenBSD: patch-mpccut_CMakeLists_txt,v 1.1 2013/06/23 14:30:52 dcoppa Exp $
+--- mpccut/CMakeLists.txt.orig	Sat Aug 21 17:55:01 2010
++++ mpccut/CMakeLists.txt	Sun Jun 23 15:33:17 2013
+@@ -13,12 +13,15 @@ endif(MSVC)
+ add_executable(mpccut mpccut.c)
+ 
+ if(SHARED)
+-  target_link_libraries(mpccut mpcdec)
++  target_link_libraries(mpccut mpcdec_shared)
++  add_dependencies(mpccut mpcdec_shared)
+ else(SHARED)
+   target_link_libraries(mpccut mpcdec_static)
++  add_dependencies(mpccut mpcdec_static)
+ endif(SHARED)
+ 
+ target_link_libraries(mpccut mpcenc_static)
++add_dependencies(mpccut mpcenc_static)
+ 
+ if(NOT MSVC)
+ target_link_libraries(mpccut m)

audio/musepack/patches/patch-mpcdec_CMakeLists_txt

@@ -0,0 +1,19 @@
+$OpenBSD: patch-mpcdec_CMakeLists_txt,v 1.1 2013/06/23 14:30:52 dcoppa Exp $
+--- mpcdec/CMakeLists.txt.orig	Sat Aug 21 17:55:01 2010
++++ mpcdec/CMakeLists.txt	Sun Jun 23 16:07:24 2013
+@@ -17,11 +17,14 @@ target_link_libraries(mpcdec_cmd m)
+ endif(NOT MSVC)
+ 
+ target_link_libraries(mpcdec_cmd wavformat_static)
++add_dependencies(mpcdec_cmd wavformat_static)
+ 
+ if(SHARED)
+-  target_link_libraries(mpcdec_cmd mpcdec)
++  target_link_libraries(mpcdec_cmd mpcdec_shared)
++  add_dependencies(mpcdec_cmd mpcdec_shared)
+ else(SHARED)
+   target_link_libraries(mpcdec_cmd mpcdec_static)
++  add_dependencies(mpcdec_cmd mpcdec_static)
+ endif(SHARED)
+ 
+ SET_TARGET_PROPERTIES(mpcdec_cmd PROPERTIES OUTPUT_NAME "mpcdec")

audio/musepack/patches/patch-mpcenc_CMakeLists_txt

@@ -1,12 +1,24 @@
-$OpenBSD: patch-mpcenc_CMakeLists_txt,v 1.1.1.1 2012/05/24 18:25:56 shadchin Exp $
+$OpenBSD: patch-mpcenc_CMakeLists_txt,v 1.2 2013/06/23 14:30:52 dcoppa Exp $
---- mpcenc/CMakeLists.txt.orig	Fri Jun 18 18:43:29 2010
+--- mpcenc/CMakeLists.txt.orig	Tue Jul 13 11:30:09 2010
-+++ mpcenc/CMakeLists.txt	Fri Jun 18 18:43:37 2010
++++ mpcenc/CMakeLists.txt	Sun Jun 23 15:33:36 2013
-@@ -22,8 +22,4 @@ if(NOT MSVC)
+@@ -11,8 +11,8 @@ link_directories(${libmpc_BINARY_DIR}/libmpcenc)
+ 
+ add_executable(mpcenc keyboard.c mpcenc.c pipeopen.c stderr.c ${libmpc_SOURCE_DIR}/common/tags.c wave_in.c winmsg.c)
+ 
+-target_link_libraries(mpcenc mpcpsy_static)
+-target_link_libraries(mpcenc mpcenc_static)
++target_link_libraries(mpcenc mpcpsy_static mpcenc_static)
++add_dependencies(mpcenc mpcpsy_static mpcenc_static)
+ 
+ if(WIN32)
+ target_link_libraries(mpcenc winmm)
+@@ -21,9 +21,5 @@ endif(WIN32)
+ if(NOT MSVC)
  target_link_libraries(mpcenc m)
  endif(NOT MSVC)
- 
+-
 -if(CMAKE_SYSTEM_NAME STREQUAL OpenBSD)
 -target_link_libraries(mpcenc ossaudio)
 -endif(CMAKE_SYSTEM_NAME STREQUAL OpenBSD)
--
+ 
  install(TARGETS mpcenc RUNTIME DESTINATION bin)

audio/musepack/patches/patch-mpcgain_CMakeLists_txt

@@ -1,7 +1,7 @@
-$OpenBSD: patch-mpcgain_CMakeLists_txt,v 1.1.1.1 2012/05/24 18:25:56 shadchin Exp $
+$OpenBSD: patch-mpcgain_CMakeLists_txt,v 1.2 2013/06/23 14:30:52 dcoppa Exp $
---- mpcgain/CMakeLists.txt.orig	Fri Dec  2 02:10:28 2011
+--- mpcgain/CMakeLists.txt.orig	Sat Aug 21 17:55:01 2010
-+++ mpcgain/CMakeLists.txt	Fri Dec  2 02:11:07 2011
++++ mpcgain/CMakeLists.txt	Sun Jun 23 15:01:31 2013
-@@ -1,23 +1,8 @@
+@@ -1,28 +1,15 @@
 -FIND_PATH(REPLAY_GAIN_INCLUDE_DIR replaygain/gain_analysis.h
 -	/usr/include
 -	/usr/local/include
@@ -20,9 +20,17 @@ $OpenBSD: patch-mpcgain_CMakeLists_txt,v 1.1.1.1 2012/05/24 18:25:56 shadchin Ex
  link_directories(${libmpc_BINARY_DIR}/libmpcdec)
  
 -add_executable(mpcgain mpcgain.c)
--
--target_link_libraries(mpcgain ${REPLAY_GAIN_LIBRARY})
 +add_executable(mpcgain mpcgain.c gain_analysis.c)
  
+-target_link_libraries(mpcgain ${REPLAY_GAIN_LIBRARY})
+-
  if(SHARED)
-   target_link_libraries(mpcgain mpcdec)
+-  target_link_libraries(mpcgain mpcdec)
++  target_link_libraries(mpcgain mpcdec_shared)
++  add_dependencies(mpcgain mpcdec_shared)
+ else(SHARED)
+   target_link_libraries(mpcgain mpcdec_static)
++  add_dependencies(mpcgain mpcdec_static)
+ endif(SHARED)
+ 
+ if(NOT MSVC)

audio/musepack/patches/patch-wavcmp_CMakeLists_txt

@@ -0,0 +1,10 @@
+$OpenBSD: patch-wavcmp_CMakeLists_txt,v 1.1 2013/06/23 14:30:52 dcoppa Exp $
+--- wavcmp/CMakeLists.txt.orig	Sun Jun 23 15:25:39 2013
++++ wavcmp/CMakeLists.txt	Sun Jun 23 15:33:49 2013
+@@ -4,5 +4,6 @@ link_directories(${libmpc_BINARY_DIR}/libwavformat)
+ add_executable(wavcmp wavcmp.c)
+ 
+ target_link_libraries(wavcmp wavformat_static)
++add_dependencies(wavcmp wavformat_static)
+ 
+ install(TARGETS wavcmp RUNTIME DESTINATION bin)

audio/musepack/pkg/PFRAG.shared

@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2012/05/24 18:25:56 shadchin Exp $
-@lib lib/libmpcdec.so.${LIBmpcdec_VERSION}

audio/musepack/pkg/PLIST

@@ -1,8 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.2 2012/05/25 12:51:06 fgsch Exp $
+@comment $OpenBSD: PLIST,v 1.3 2013/06/23 14:30:53 dcoppa Exp $
 @pkgpath audio/libmpcdec
 @pkgpath audio/mppenc
 @conflict libmpcdec-*
-%%SHARED%%
 @bin bin/mpc2sv8
 @bin bin/mpcchap
 @bin bin/mpccut
@@ -19,3 +18,4 @@ include/mpc/mpcmath.h
 include/mpc/reader.h
 include/mpc/streaminfo.h
 lib/libmpcdec.a
+@lib lib/libmpcdec.so.${LIBmpcdec_VERSION}