CVS commit: pkgsrc/audio

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun May  9 09:12:09 UTC 2021

Modified Files:
        pkgsrc/audio/ossinfo: Makefile Makefile.common
        pkgsrc/audio/ossmix: Makefile
        pkgsrc/audio/ossplay: Makefile
        pkgsrc/audio/osstest: Makefile
        pkgsrc/audio/ossxmix: Makefile

Log Message:
oss*: simplify version handling


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/audio/ossinfo/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/ossinfo/Makefile.common
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/ossmix/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/ossplay/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/osstest/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/audio/ossxmix/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/ossinfo/Makefile
diff -u pkgsrc/audio/ossinfo/Makefile:1.4 pkgsrc/audio/ossinfo/Makefile:1.5
--- pkgsrc/audio/ossinfo/Makefile:1.4   Sun May  9 09:10:01 2021
+++ pkgsrc/audio/ossinfo/Makefile       Sun May  9 09:12:08 2021
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2021/05/09 09:10:01 nia Exp $
+# $NetBSD: Makefile,v 1.5 2021/05/09 09:12:08 nia Exp $
 
 .include "Makefile.common"
 
-PKGNAME=       ossinfo-${DISTNAME:S/oss-v//1:S/-src-bsd//1:S/-/./g}
+PKGNAME=       ossinfo-${OSS_CMD_VER}
 PKGREVISION=   1
 CATEGORIES=    audio
 

Index: pkgsrc/audio/ossinfo/Makefile.common
diff -u pkgsrc/audio/ossinfo/Makefile.common:1.1 pkgsrc/audio/ossinfo/Makefile.common:1.2
--- pkgsrc/audio/ossinfo/Makefile.common:1.1    Sun May  9 08:38:20 2021
+++ pkgsrc/audio/ossinfo/Makefile.common        Sun May  9 09:12:08 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2021/05/09 08:38:20 nia Exp $
+# $NetBSD: Makefile.common,v 1.2 2021/05/09 09:12:08 nia Exp $
 # Common Makefile logic for commands included with the OSSv4 distribution.
 
 # used by audio/ossinfo/Makefile
@@ -7,6 +7,7 @@
 # used by audio/ossxmix/Makefile
 
 DISTNAME=      oss-v4.2-build2019-src-bsd
+OSS_CMD_VER=   ${DISTNAME:S/oss-v//1:S/-src-bsd//1:S/-/./g}
 MASTER_SITES=  http://www.opensound.com/developer/sources/stable/bsd/
 EXTRACT_SUFX=  .tar.bz2
 

Index: pkgsrc/audio/ossmix/Makefile
diff -u pkgsrc/audio/ossmix/Makefile:1.3 pkgsrc/audio/ossmix/Makefile:1.4
--- pkgsrc/audio/ossmix/Makefile:1.3    Sun May  9 09:10:01 2021
+++ pkgsrc/audio/ossmix/Makefile        Sun May  9 09:12:09 2021
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2021/05/09 09:10:01 nia Exp $
+# $NetBSD: Makefile,v 1.4 2021/05/09 09:12:09 nia Exp $
 
 .include "../../audio/ossinfo/Makefile.common"
 
-PKGNAME=       ossmix-${DISTNAME:S/oss-v//1:S/-src-bsd//1:S/-/./g}
+PKGNAME=       ossmix-${OSS_CMD_VER}
 CATEGORIES=    audio
 
 MAINTAINER=    nia%NetBSD.org@localhost

Index: pkgsrc/audio/ossplay/Makefile
diff -u pkgsrc/audio/ossplay/Makefile:1.1 pkgsrc/audio/ossplay/Makefile:1.2
--- pkgsrc/audio/ossplay/Makefile:1.1   Sun May  9 09:06:58 2021
+++ pkgsrc/audio/ossplay/Makefile       Sun May  9 09:12:09 2021
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2021/05/09 09:06:58 nia Exp $
+# $NetBSD: Makefile,v 1.2 2021/05/09 09:12:09 nia Exp $
 
 .include "../../audio/ossinfo/Makefile.common"
 
-PKGNAME=       ossplay-${DISTNAME:S/oss-v//1:S/-src-bsd//1:S/-/./g}
+PKGNAME=       ossplay-${OSS_CMD_VER}
 CATEGORIES=    audio
 
 MAINTAINER=    nia%NetBSD.org@localhost

Index: pkgsrc/audio/osstest/Makefile
diff -u pkgsrc/audio/osstest/Makefile:1.3 pkgsrc/audio/osstest/Makefile:1.4
--- pkgsrc/audio/osstest/Makefile:1.3   Sun May  9 09:10:01 2021
+++ pkgsrc/audio/osstest/Makefile       Sun May  9 09:12:09 2021
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2021/05/09 09:10:01 nia Exp $
+# $NetBSD: Makefile,v 1.4 2021/05/09 09:12:09 nia Exp $
 
 .include "../../audio/ossinfo/Makefile.common"
 
-PKGNAME=       osstest-${DISTNAME:S/oss-v//1:S/-src-bsd//1:S/-/./g}
+PKGNAME=       osstest-${OSS_CMD_VER}
 CATEGORIES=    audio
 
 MAINTAINER=    nia%NetBSD.org@localhost

Index: pkgsrc/audio/ossxmix/Makefile
diff -u pkgsrc/audio/ossxmix/Makefile:1.2 pkgsrc/audio/ossxmix/Makefile:1.3
--- pkgsrc/audio/ossxmix/Makefile:1.2   Sun May  9 08:38:20 2021
+++ pkgsrc/audio/ossxmix/Makefile       Sun May  9 09:12:09 2021
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2021/05/09 08:38:20 nia Exp $
+# $NetBSD: Makefile,v 1.3 2021/05/09 09:12:09 nia Exp $
 
 .include "../../audio/ossinfo/Makefile.common"
 
-PKGNAME=       ossxmix-${DISTNAME:S/oss-v//1:S/-src-bsd//1:S/-/./g}
+PKGNAME=       ossxmix-${OSS_CMD_VER}
 CATEGORIES=    audio
 
 MAINTAINER=    nia%NetBSD.org@localhost