Received: by mail.netbsd.org (Postfix, from userid 605) id E905F8513D; Sun, 9 May 2021 08:38:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 2EE928513B for ; Sun, 9 May 2021 08:38:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 8qL_OouJ8-U6 for ; Sun, 9 May 2021 08:38:21 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 3871E84CDA for ; Sun, 9 May 2021 08:38:21 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 2B058FA95; Sun, 9 May 2021 08:38:21 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1620549501100400" MIME-Version: 1.0 Date: Sun, 9 May 2021 08:38:21 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/audio To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20210509083821.2B058FA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1620549501100400 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Sun May 9 08:38:21 UTC 2021 Modified Files: pkgsrc/audio/ossinfo: Makefile pkgsrc/audio/ossmix: Makefile pkgsrc/audio/osstest: Makefile pkgsrc/audio/ossxmix: Makefile Added Files: pkgsrc/audio/ossinfo: Makefile.common Log Message: audio/oss*: convert to Makefile.common To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/ossinfo/Makefile cvs rdiff -u -r0 -r1.1 pkgsrc/audio/ossinfo/Makefile.common cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/ossmix/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/osstest/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/ossxmix/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1620549501100400 Content-Disposition: inline Content-Length: 9463 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/audio/ossinfo/Makefile diff -u pkgsrc/audio/ossinfo/Makefile:1.1 pkgsrc/audio/ossinfo/Makefile:1.2 --- pkgsrc/audio/ossinfo/Makefile:1.1 Sun May 9 08:27:21 2021 +++ pkgsrc/audio/ossinfo/Makefile Sun May 9 08:38:20 2021 @@ -1,50 +1,11 @@ -# $NetBSD: Makefile,v 1.1 2021/05/09 08:27:21 nia Exp $ +# $NetBSD: Makefile,v 1.2 2021/05/09 08:38:20 nia Exp $ + +.include "Makefile.common" -DISTNAME= oss-v4.2-build2019-src-bsd PKGNAME= ossinfo-${DISTNAME:S/oss-v//1:S/-src-bsd//1:S/-/./g} CATEGORIES= audio -MASTER_SITES= http://www.opensound.com/developer/sources/stable/bsd/ -EXTRACT_SUFX= .tar.bz2 MAINTAINER= nia@NetBSD.org -HOMEPAGE= http://www.opensound.com/ COMMENT= Display OSSv4 device information -LICENSE= 2-clause-bsd - -BUILD_DIRS= cmd/${PKGBASE} - -# NOTE: Linux support will require an OSSv4 package integrated into -# oss.buildlink3.mk -ONLY_FOR_PLATFORM+= FreeBSD-*-* -ONLY_FOR_PLATFORM+= NetBSD-*-* -ONLY_FOR_PLATFORM+= SunOS-*-* - -.include "../../mk/oss.buildlink3.mk" - -LDFLAGS+= ${LIBOSSAUDIO} - -.if ${OPSYS} == "NetBSD" && \ - (!empty(OS_VERSION:M[5-9].*) && empty(OS_VERSION:M9.99.*)) -PKG_SKIP_REASON+= "Requires OSSv4 support" -.endif - -SUBST_CLASSES+= paths -SUBST_STAGE.paths= pre-configure -SUBST_FILES.paths= cmd/${PKGBASE}/${PKGBASE}.man -SUBST_SED.paths= -e 's,/usr/bin,${PREFIX}/bin,g' - -INSTALLATION_DIRS+= bin -INSTALLATION_DIRS+= share/doc/${PKGBASE} - -pre-build: - ${CP} ${FILESDIR}/Makefile ${WRKSRC}/cmd/${PKGBASE}/Makefile - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/cmd/${PKGBASE}/${PKGBASE} \ - ${DESTDIR}${PREFIX}/bin/${PKGBASE} - ${INSTALL_DATA} ${WRKSRC}/COPYING \ - ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}/COPYING - ${INSTALL_DATA} ${WRKSRC}/cmd/${PKGBASE}/${PKGBASE}.man \ - ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}/${PKGBASE}.man .include "../../mk/bsd.pkg.mk" Index: pkgsrc/audio/ossmix/Makefile diff -u pkgsrc/audio/ossmix/Makefile:1.1 pkgsrc/audio/ossmix/Makefile:1.2 --- pkgsrc/audio/ossmix/Makefile:1.1 Sun May 9 08:02:03 2021 +++ pkgsrc/audio/ossmix/Makefile Sun May 9 08:38:20 2021 @@ -1,50 +1,11 @@ -# $NetBSD: Makefile,v 1.1 2021/05/09 08:02:03 nia Exp $ +# $NetBSD: Makefile,v 1.2 2021/05/09 08:38:20 nia Exp $ + +.include "../../audio/ossinfo/Makefile.common" -DISTNAME= oss-v4.2-build2019-src-bsd PKGNAME= ossmix-${DISTNAME:S/oss-v//1:S/-src-bsd//1:S/-/./g} CATEGORIES= audio -MASTER_SITES= http://www.opensound.com/developer/sources/stable/bsd/ -EXTRACT_SUFX= .tar.bz2 MAINTAINER= nia@NetBSD.org -HOMEPAGE= http://www.opensound.com/ COMMENT= Command line mixer from OSSv4 -LICENSE= 2-clause-bsd - -BUILD_DIRS= cmd/${PKGBASE} - -# NOTE: Linux support will require an OSSv4 package integrated into -# oss.buildlink3.mk -ONLY_FOR_PLATFORM+= FreeBSD-*-* -ONLY_FOR_PLATFORM+= NetBSD-*-* -ONLY_FOR_PLATFORM+= SunOS-*-* - -.include "../../mk/oss.buildlink3.mk" - -LDFLAGS+= ${LIBOSSAUDIO} - -.if ${OPSYS} == "NetBSD" && \ - (!empty(OS_VERSION:M[5-9].*) && empty(OS_VERSION:M9.99.*)) -PKG_SKIP_REASON+= "Requires OSSv4 support" -.endif - -SUBST_CLASSES+= paths -SUBST_STAGE.paths= pre-configure -SUBST_FILES.paths= cmd/${PKGBASE}/${PKGBASE}.man -SUBST_SED.paths= -e 's,/usr/bin,${PREFIX}/bin,g' - -INSTALLATION_DIRS+= bin -INSTALLATION_DIRS+= share/doc/${PKGBASE} - -pre-build: - ${CP} ${FILESDIR}/Makefile ${WRKSRC}/cmd/${PKGBASE}/Makefile - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/cmd/${PKGBASE}/${PKGBASE} \ - ${DESTDIR}${PREFIX}/bin/${PKGBASE} - ${INSTALL_DATA} ${WRKSRC}/COPYING \ - ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}/COPYING - ${INSTALL_DATA} ${WRKSRC}/cmd/${PKGBASE}/${PKGBASE}.man \ - ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}/${PKGBASE}.man .include "../../mk/bsd.pkg.mk" Index: pkgsrc/audio/osstest/Makefile diff -u pkgsrc/audio/osstest/Makefile:1.1 pkgsrc/audio/osstest/Makefile:1.2 --- pkgsrc/audio/osstest/Makefile:1.1 Sun May 9 08:14:51 2021 +++ pkgsrc/audio/osstest/Makefile Sun May 9 08:38:20 2021 @@ -1,50 +1,11 @@ -# $NetBSD: Makefile,v 1.1 2021/05/09 08:14:51 nia Exp $ +# $NetBSD: Makefile,v 1.2 2021/05/09 08:38:20 nia Exp $ + +.include "../../audio/ossinfo/Makefile.common" -DISTNAME= oss-v4.2-build2019-src-bsd PKGNAME= osstest-${DISTNAME:S/oss-v//1:S/-src-bsd//1:S/-/./g} CATEGORIES= audio -MASTER_SITES= http://www.opensound.com/developer/sources/stable/bsd/ -EXTRACT_SUFX= .tar.bz2 MAINTAINER= nia@NetBSD.org -HOMEPAGE= http://www.opensound.com/ COMMENT= Application for testing OSSv4 sound devices -LICENSE= 2-clause-bsd - -BUILD_DIRS= cmd/${PKGBASE} - -# NOTE: Linux support will require an OSSv4 package integrated into -# oss.buildlink3.mk -ONLY_FOR_PLATFORM+= FreeBSD-*-* -ONLY_FOR_PLATFORM+= NetBSD-*-* -ONLY_FOR_PLATFORM+= SunOS-*-* - -.include "../../mk/oss.buildlink3.mk" - -LDFLAGS+= ${LIBOSSAUDIO} - -.if ${OPSYS} == "NetBSD" && \ - (!empty(OS_VERSION:M[5-9].*) && empty(OS_VERSION:M9.99.*)) -PKG_SKIP_REASON+= "Requires OSSv4 support" -.endif - -SUBST_CLASSES+= paths -SUBST_STAGE.paths= pre-configure -SUBST_FILES.paths= cmd/${PKGBASE}/${PKGBASE}.man -SUBST_SED.paths= -e 's,/usr/bin,${PREFIX}/bin,g' - -INSTALLATION_DIRS+= bin -INSTALLATION_DIRS+= share/doc/${PKGBASE} - -pre-build: - ${CP} ${FILESDIR}/Makefile ${WRKSRC}/cmd/${PKGBASE}/Makefile - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/cmd/${PKGBASE}/${PKGBASE} \ - ${DESTDIR}${PREFIX}/bin/${PKGBASE} - ${INSTALL_DATA} ${WRKSRC}/COPYING \ - ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}/COPYING - ${INSTALL_DATA} ${WRKSRC}/cmd/${PKGBASE}/${PKGBASE}.man \ - ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}/${PKGBASE}.man .include "../../mk/bsd.pkg.mk" Index: pkgsrc/audio/ossxmix/Makefile diff -u pkgsrc/audio/ossxmix/Makefile:1.1 pkgsrc/audio/ossxmix/Makefile:1.2 --- pkgsrc/audio/ossxmix/Makefile:1.1 Sun May 9 07:54:42 2021 +++ pkgsrc/audio/ossxmix/Makefile Sun May 9 08:38:20 2021 @@ -1,56 +1,22 @@ -# $NetBSD: Makefile,v 1.1 2021/05/09 07:54:42 nia Exp $ +# $NetBSD: Makefile,v 1.2 2021/05/09 08:38:20 nia Exp $ + +.include "../../audio/ossinfo/Makefile.common" -DISTNAME= oss-v4.2-build2019-src-bsd PKGNAME= ossxmix-${DISTNAME:S/oss-v//1:S/-src-bsd//1:S/-/./g} CATEGORIES= audio -MASTER_SITES= http://www.opensound.com/developer/sources/stable/bsd/ -EXTRACT_SUFX= .tar.bz2 MAINTAINER= nia@NetBSD.org -HOMEPAGE= http://www.opensound.com/ COMMENT= Audio mixer GUI from OSSv4 -LICENSE= 2-clause-bsd USE_TOOLS+= pkg-config -BUILD_DIRS= cmd/ossxmix - -# NOTE: Linux support will require an OSSv4 package integrated into -# oss.buildlink3.mk -ONLY_FOR_PLATFORM+= FreeBSD-*-* -ONLY_FOR_PLATFORM+= NetBSD-*-* -ONLY_FOR_PLATFORM+= SunOS-*-* - -.include "../../mk/oss.buildlink3.mk" - -LDFLAGS+= ${LIBOSSAUDIO} - -.if ${OPSYS} == "NetBSD" && \ - (!empty(OS_VERSION:M[5-9].*) && empty(OS_VERSION:M9.99.*)) -PKG_SKIP_REASON+= "Requires OSSv4 support" -.endif - -SUBST_CLASSES+= paths -SUBST_STAGE.paths= pre-configure -SUBST_FILES.paths= cmd/${PKGBASE}/ossxmix.man -SUBST_SED.paths= -e 's,/usr/bin,${PREFIX}/bin,g' - -INSTALLATION_DIRS+= bin INSTALLATION_DIRS+= share/applications -INSTALLATION_DIRS+= share/doc/${PKGBASE} -pre-build: - ${CP} ${FILESDIR}/Makefile ${WRKSRC}/cmd/${PKGBASE}/Makefile - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/cmd/${PKGBASE}/ossxmix \ - ${DESTDIR}${PREFIX}/bin/ossxmix +install-desktop-file: .PHONY ${INSTALL_DATA} ${FILESDIR}/ossxmix.desktop \ ${DESTDIR}${PREFIX}/share/applications - ${INSTALL_DATA} ${WRKSRC}/COPYING \ - ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} - ${INSTALL_DATA} ${WRKSRC}/cmd/${PKGBASE}/ossxmix.man \ - ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} + +do-install: install-desktop-file .include "../../sysutils/desktop-file-utils/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" Added files: Index: pkgsrc/audio/ossinfo/Makefile.common diff -u /dev/null pkgsrc/audio/ossinfo/Makefile.common:1.1 --- /dev/null Sun May 9 08:38:21 2021 +++ pkgsrc/audio/ossinfo/Makefile.common Sun May 9 08:38:20 2021 @@ -0,0 +1,50 @@ +# $NetBSD: Makefile.common,v 1.1 2021/05/09 08:38:20 nia Exp $ +# Common Makefile logic for commands included with the OSSv4 distribution. + +# used by audio/ossinfo/Makefile +# used by audio/ossmix/Makefile +# used by audio/osstest/Makefile +# used by audio/ossxmix/Makefile + +DISTNAME= oss-v4.2-build2019-src-bsd +MASTER_SITES= http://www.opensound.com/developer/sources/stable/bsd/ +EXTRACT_SUFX= .tar.bz2 + +HOMEPAGE= http://www.opensound.com/ +LICENSE= 2-clause-bsd + +BUILD_DIRS= cmd/${PKGBASE} + +# NOTE: Linux support will require an OSSv4 package integrated into +# oss.buildlink3.mk +ONLY_FOR_PLATFORM+= FreeBSD-*-* +ONLY_FOR_PLATFORM+= NetBSD-*-* +ONLY_FOR_PLATFORM+= SunOS-*-* + +.include "../../mk/oss.buildlink3.mk" + +LDFLAGS+= ${LIBOSSAUDIO} + +.if ${OPSYS} == "NetBSD" && \ + (!empty(OS_VERSION:M[5-9].*) && empty(OS_VERSION:M9.99.*)) +PKG_SKIP_REASON+= "Requires OSSv4 support" +.endif + +SUBST_CLASSES+= paths +SUBST_STAGE.paths= pre-configure +SUBST_FILES.paths= cmd/${PKGBASE}/${PKGBASE}.man +SUBST_SED.paths= -e 's,/usr/bin,${PREFIX}/bin,g' + +INSTALLATION_DIRS+= bin +INSTALLATION_DIRS+= share/doc/${PKGBASE} + +pre-build: + ${CP} ${FILESDIR}/Makefile ${WRKSRC}/cmd/${PKGBASE}/Makefile + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/cmd/${PKGBASE}/${PKGBASE} \ + ${DESTDIR}${PREFIX}/bin/${PKGBASE} + ${INSTALL_DATA} ${WRKSRC}/COPYING \ + ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}/COPYING + ${INSTALL_DATA} ${WRKSRC}/cmd/${PKGBASE}/${PKGBASE}.man \ + ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}/${PKGBASE}.man --_----------=_1620549501100400--