CVS commit: pkgsrc/audio

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Sun Mar 29 18:30:06 UTC 2020

Modified Files:
        pkgsrc/audio/libmpcdec: Makefile
        pkgsrc/audio/musepack: Makefile

Log Message:
libmpcdec & musepack: note these packages conflict

Both of these packages install lib/libmpcdec.so. (libmpcdec seems like
a potential candidate for removal, if the remaining packages that
depend on it can either be switched to musepack or removed themselves.)


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/audio/libmpcdec/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/audio/musepack/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/libmpcdec/Makefile
diff -u pkgsrc/audio/libmpcdec/Makefile:1.7 pkgsrc/audio/libmpcdec/Makefile:1.8
--- pkgsrc/audio/libmpcdec/Makefile:1.7 Sun Jan 26 17:30:43 2020
+++ pkgsrc/audio/libmpcdec/Makefile     Sun Mar 29 18:30:06 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2020/01/26 17:30:43 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2020/03/29 18:30:06 gutteridge Exp $
 
 DISTNAME=      libmpcdec-1.2.6
 CATEGORIES=    audio
@@ -10,6 +10,8 @@ HOMEPAGE=     https://www.musepack.net/
 COMMENT=       Portable Musepack decoder library (V7)
 LICENSE=       modified-bsd
 
+CONFLICTS=     musepack-[0-9]*
+
 GNU_CONFIGURE= yes
 USE_LANGUAGES= c c++
 USE_LIBTOOL=   yes

Index: pkgsrc/audio/musepack/Makefile
diff -u pkgsrc/audio/musepack/Makefile:1.4 pkgsrc/audio/musepack/Makefile:1.5
--- pkgsrc/audio/musepack/Makefile:1.4  Sun Jan 26 17:30:44 2020
+++ pkgsrc/audio/musepack/Makefile      Sun Mar 29 18:30:06 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2020/01/26 17:30:44 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2020/03/29 18:30:06 gutteridge Exp $
 
 DISTNAME=      musepack_src_r475
 PKGNAME=       musepack-0rc475
@@ -11,6 +11,8 @@ HOMEPAGE=     https://www.musepack.net/
 COMMENT=       MPEG-Plus and MusePack decoder (V8)
 LICENSE=       modified-bsd
 
+CONFLICTS=     libmpcdec-[0-9]*
+
 USE_CMAKE=             yes
 
 post-install: