From c90eb5c0bd338d1b801d5a405d4c00c4004cf6cb Mon Sep 17 00:00:00 2001
From: Meitar M <meitarm@gmail.com>
Date: Tue, 26 Dec 2017 17:48:41 -0500
Subject: [PATCH 1/3] Add MusikCube and Beets under the "audio" heading.

This commit also adds the `BSD-3-Clause` license, as that is the license
for MusikCube.
---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 4fd93156a1..3f3f254e5b 100644
--- a/README.md
+++ b/README.md
@@ -776,6 +776,7 @@ See also <https://en.wikipedia.org/wiki/List_of_streaming_media_systems>, <https
 ### Audio Streaming
 
 - [Ampache](http://ampache.org/) - A web based audio/video streaming application. ([Demo](http://play.dogmazic.net/), [Source Code](https://github.com/ampache/ampache)) `AGPL-3.0` `PHP`
+- [Beets](http://beets.io/) - Music library manager and MusicBrainz tagger (command-line & web interface). ([Source code](https://github.com/beetbox/beets)) `MIT` `Python`
 - [CherryMusic](http://www.fomori.org/cherrymusic/) - Minimalistic Web-Mediaplayer. ([Source Code](https://github.com/devsnd/cherrymusic)) `GPL-3.0` `Python`
 - [cloudtunes](https://github.com/jkbrzt/cloudtunes) `⚠` - Web-based music player for the cloud. `MIT` `Python`
 - [Compactd](https://github.com/compactd/compactd) - A remote music player that supports adding content. `MIT` `Nodejs`
@@ -794,6 +795,7 @@ See also <https://en.wikipedia.org/wiki/List_of_streaming_media_systems>, <https
   - [ympd](http://www.ympd.org/) - Standalone MPD Web GUI written in C, utilizing Websockets and Bootstrap/JS. ([Source Code](https://github.com/notandy/ympd)) `GPL-2.0` `C`
 - [mStream](http://mstream.io/) - Music streaming server with GUI management tools. Runs on Mac, Windows, and Linux. ([Demo](https://darncoyotes.mstream.io/), [Source Code](https://github.com/IrosTheBeggar/mStream)) `GPL-2.0` `Nodejs`
 - [Music Browser](https://github.com/henrik242/musicbrowser) - Browser and streamer for your music collection. It is runs on most operating systems, and is light enough to run flawlessly on NAS devices. `GPL-3.0` `PHP`
+- [musikcube](https://musikcube.com/) - Streaming audio server with Linux/macOS/Windows/Android clients. ([Source code](https://github.com/clangen/musikcube)) `BSD-3-Clause` `C++`
 - [Sonerezh](https://www.sonerezh.bzh/) - A self-hosted, web-based application for stream your music, everywhere. ([Demo](https://www.sonerezh.bzh/demo/), [Source Code](https://github.com/sonerezh/sonerezh)) `GPL-3.0` `PHP`
 
 ### Video Streaming
@@ -1280,6 +1282,7 @@ See also [Documentation Generators](#documentation-generators), [Wikimatrix](htt
 - `Beerware` - [Beerware License](https://spdx.org/licenses/Beerware.html)
 - `BSD` - [FreeBSD License](https://www.freebsd.org/copyright/license.html)
 - `BSD` - [BSD 2-Clause](https://opensource.org/licenses/BSD-3-Clause) or [BSD 3-Clause](https://opensource.org/licenses/BSD-3-Clause) license
+- `BSD-3-Clause` - [BSD 3-clause "New" or "Revised" License](https://opensource.org/licenses/BSD-3-Clause)
 - `CC-BY-SA-4.0`  - [Creative Commons Attribution-ShareAlike International License](https://creativecommons.org/licenses/by-sa/4.0/)
 - `CC0-1.0` - [Public Domain](https://creativecommons.org/about/cc0/)
 - `CDDL-1.0` - [Common Development and Distribution License](https://opensource.org/licenses/CDDL-1.0)

From 05b4ab4549d140cf4b869a757d1e44362d7246f6 Mon Sep 17 00:00:00 2001
From: nodiscc <nodiscc@gmail.com>
Date: Thu, 28 Dec 2017 12:59:58 +0100
Subject: [PATCH 2/3] revert BSD-2/3-clause/FreeBSD distinction all three
 licenses will be identified as 'BSD' since we have no track record of which
 entry has which one user should read the specific license terms of each
 program for more details

---
 README.md | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 3f3f254e5b..e8f74bb450 100644
--- a/README.md
+++ b/README.md
@@ -795,7 +795,7 @@ See also <https://en.wikipedia.org/wiki/List_of_streaming_media_systems>, <https
   - [ympd](http://www.ympd.org/) - Standalone MPD Web GUI written in C, utilizing Websockets and Bootstrap/JS. ([Source Code](https://github.com/notandy/ympd)) `GPL-2.0` `C`
 - [mStream](http://mstream.io/) - Music streaming server with GUI management tools. Runs on Mac, Windows, and Linux. ([Demo](https://darncoyotes.mstream.io/), [Source Code](https://github.com/IrosTheBeggar/mStream)) `GPL-2.0` `Nodejs`
 - [Music Browser](https://github.com/henrik242/musicbrowser) - Browser and streamer for your music collection. It is runs on most operating systems, and is light enough to run flawlessly on NAS devices. `GPL-3.0` `PHP`
-- [musikcube](https://musikcube.com/) - Streaming audio server with Linux/macOS/Windows/Android clients. ([Source code](https://github.com/clangen/musikcube)) `BSD-3-Clause` `C++`
+- [musikcube](https://musikcube.com/) - Streaming audio server with Linux/macOS/Windows/Android clients. ([Source code](https://github.com/clangen/musikcube)) `BSD` `C++`
 - [Sonerezh](https://www.sonerezh.bzh/) - A self-hosted, web-based application for stream your music, everywhere. ([Demo](https://www.sonerezh.bzh/demo/), [Source Code](https://github.com/sonerezh/sonerezh)) `GPL-3.0` `PHP`
 
 ### Video Streaming
@@ -1280,9 +1280,7 @@ See also [Documentation Generators](#documentation-generators), [Wikimatrix](htt
 - `APSL-2.0` - [Apple Public Source License, Version 2.0](https://opensource.org/licenses/APSL-2.0)
 - `Artistic-2.0` - [Artistic License Version 2.0](http://opensource.org/licenses/Artistic-2.0)
 - `Beerware` - [Beerware License](https://spdx.org/licenses/Beerware.html)
-- `BSD` - [FreeBSD License](https://www.freebsd.org/copyright/license.html)
-- `BSD` - [BSD 2-Clause](https://opensource.org/licenses/BSD-3-Clause) or [BSD 3-Clause](https://opensource.org/licenses/BSD-3-Clause) license
-- `BSD-3-Clause` - [BSD 3-clause "New" or "Revised" License](https://opensource.org/licenses/BSD-3-Clause)
+- `BSD` - [FreeBSD](https://www.freebsd.org/copyright/license.html) or [BSD 2-Clause](https://opensource.org/licenses/BSD-3-Clause) or [BSD 3-Clause "New" or "Revised"](https://opensource.org/licenses/BSD-3-Clause) license
 - `CC-BY-SA-4.0`  - [Creative Commons Attribution-ShareAlike International License](https://creativecommons.org/licenses/by-sa/4.0/)
 - `CC0-1.0` - [Public Domain](https://creativecommons.org/about/cc0/)
 - `CDDL-1.0` - [Common Development and Distribution License](https://opensource.org/licenses/CDDL-1.0)

From bc8bef5601fd5efbe4dd6ed6bd60f44110c2b8e3 Mon Sep 17 00:00:00 2001
From: nodiscc <nodiscc@gmail.com>
Date: Thu, 28 Dec 2017 13:05:47 +0100
Subject: [PATCH 3/3] fix link to BSD-2-Clause license

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e8f74bb450..e54d51e875 100644
--- a/README.md
+++ b/README.md
@@ -1280,7 +1280,7 @@ See also [Documentation Generators](#documentation-generators), [Wikimatrix](htt
 - `APSL-2.0` - [Apple Public Source License, Version 2.0](https://opensource.org/licenses/APSL-2.0)
 - `Artistic-2.0` - [Artistic License Version 2.0](http://opensource.org/licenses/Artistic-2.0)
 - `Beerware` - [Beerware License](https://spdx.org/licenses/Beerware.html)
-- `BSD` - [FreeBSD](https://www.freebsd.org/copyright/license.html) or [BSD 2-Clause](https://opensource.org/licenses/BSD-3-Clause) or [BSD 3-Clause "New" or "Revised"](https://opensource.org/licenses/BSD-3-Clause) license
+- `BSD` - [FreeBSD](https://www.freebsd.org/copyright/license.html) or [BSD 2-Clause](https://opensource.org/licenses/BSD-2-Clause) or [BSD 3-Clause "New" or "Revised"](https://opensource.org/licenses/BSD-3-Clause) license
 - `CC-BY-SA-4.0`  - [Creative Commons Attribution-ShareAlike International License](https://creativecommons.org/licenses/by-sa/4.0/)
 - `CC0-1.0` - [Public Domain](https://creativecommons.org/about/cc0/)
 - `CDDL-1.0` - [Common Development and Distribution License](https://opensource.org/licenses/CDDL-1.0)