git: 6feb1346512c - main - audio/musicpd: Update to upstream release 0.22.11
Thomas Zander
riggs at FreeBSD.org
Sat Aug 28 12:26:52 UTC 2021
The branch main has been updated by riggs:
URL: https://cgit.FreeBSD.org/ports/commit/?id=6feb1346512c6e28af69678790c2b05e7ff6a402
commit 6feb1346512c6e28af69678790c2b05e7ff6a402
Author: Thomas Zander <riggs at FreeBSD.org>
AuthorDate: 2021-08-28 11:15:43 +0000
Commit: Thomas Zander <riggs at FreeBSD.org>
CommitDate: 2021-08-28 12:26:50 +0000
audio/musicpd: Update to upstream release 0.22.11
Details:
- Bugfix release, see
https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.22.11/NEWS
MFH: 2021Q3
---
audio/musicpd/Makefile | 15 +---
audio/musicpd/distinfo | 6 +-
audio/musicpd/files/patch-doc_mpdconf.example | 106 ++++++++++++++++++++++++++
3 files changed, 112 insertions(+), 15 deletions(-)
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index 7f1276371af7..c61b89d46c15 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -1,5 +1,5 @@
PORTNAME= musicpd
-PORTVERSION= 0.22.10
+PORTVERSION= 0.22.11
CATEGORIES= audio
MASTER_SITES= https://www.musicpd.org/download/mpd/${PORTVERSION:R}/
DISTNAME= mpd-${PORTVERSION}
@@ -225,17 +225,8 @@ post-patch:
# Insert selected linker for clang
@${REINPLACE_CMD} -e 's|%%MPD_CLANG_LD%%|${MPD_CLANG_LD}|' \
${WRKSRC}/meson.build
-# Replace ~/ with /var/mpd/ and make musicpd run as mpd by default
- @${REINPLACE_CMD} -e 's,^#\([^"]*"\)~/,\1/var/mpd/,g' \
- -e 's,^#\(user[^"]*"\)nobody,\1${MPDUSER},g' \
- ${WRKSRC}/doc/mpdconf.example
-# Uncomment OSS audio output part from mpd.conf; dragons!
- start=$$(expr $$(${SED} -n '/^# type *"oss"/=' \
- ${WRKSRC}/doc/mpdconf.example) - 1); \
- finish=$$(for n in $$(${JOT} 10 $$start); do \
- [ "$$(${SED} -n $${n}p ${WRKSRC}/doc/mpdconf.example)" = \
- "#}" ] && ${ECHO_CMD} $$n || true; done); \
- ${REINPLACE_CMD} -e "$${start},$${finish}s,^#,," \
+# Make musicpd run as ${MPDUSER} by default
+ @${REINPLACE_CMD} -e 's|%%MPDUSER%%|${MPDUSER}|' \
${WRKSRC}/doc/mpdconf.example
# Fix man pages for executable names
@${REINPLACE_CMD} \
diff --git a/audio/musicpd/distinfo b/audio/musicpd/distinfo
index 5833087cb2c2..4cd117eeb383 100644
--- a/audio/musicpd/distinfo
+++ b/audio/musicpd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1628313364
-SHA256 (mpd-0.22.10.tar.xz) = 07c82535e9999c3d4a099d8e652c88724635125b3c9f265ba9b6f2974ff9e614
-SIZE (mpd-0.22.10.tar.xz) = 736456
+TIMESTAMP = 1629886055
+SHA256 (mpd-0.22.11.tar.xz) = 143f7f34aaee6e87888f3dd35d49aade6656052651b960ca42b46cbb518ca0a0
+SIZE (mpd-0.22.11.tar.xz) = 737184
diff --git a/audio/musicpd/files/patch-doc_mpdconf.example b/audio/musicpd/files/patch-doc_mpdconf.example
new file mode 100644
index 000000000000..1e22b8d12ced
--- /dev/null
+++ b/audio/musicpd/files/patch-doc_mpdconf.example
@@ -0,0 +1,106 @@
+--- doc/mpdconf.example.orig 2021-08-24 20:15:22 UTC
++++ doc/mpdconf.example
+@@ -10,14 +10,14 @@
+ # be disabled and audio files will only be accepted over ipc socket (using
+ # file:// protocol) or streaming files over an accepted protocol.
+ #
+-#music_directory "~/music"
++music_directory "/var/mpd/music"
+ #
+ # This setting sets the MPD internal playlist directory. The purpose of this
+ # directory is storage for playlists created by MPD. The server will use
+ # playlist files not created by the server but only if they are in the MPD
+ # format. This setting defaults to playlist saving being disabled.
+ #
+-#playlist_directory "~/.mpd/playlists"
++playlist_directory "/var/mpd/.mpd/playlists"
+ #
+ # This setting sets the location of the MPD database. This file is used to
+ # load the database at server start up and store the database while the
+@@ -25,7 +25,7 @@
+ # MPD to accept files over ipc socket (using file:// protocol) or streaming
+ # files over an accepted protocol.
+ #
+-#db_file "~/.mpd/database"
++db_file "/var/mpd/.mpd/database"
+ #
+ # These settings are the locations for the daemon log files for the daemon.
+ # These logs are great for troubleshooting, depending on your log_level
+@@ -34,25 +34,25 @@
+ # The special value "syslog" makes MPD use the local syslog daemon. This
+ # setting defaults to logging to syslog.
+ #
+-#log_file "~/.mpd/log"
++log_file "/var/mpd/.mpd/log"
+ #
+ # This setting sets the location of the file which stores the process ID
+ # for use of mpd --kill and some init scripts. This setting is disabled by
+ # default and the pid file will not be stored.
+ #
+-#pid_file "~/.mpd/pid"
++pid_file "/var/mpd/.mpd/pid"
+ #
+ # This setting sets the location of the file which contains information about
+ # most variables to get MPD back into the same general shape it was in before
+ # it was brought down. This setting is disabled by default and the server
+ # state will be reset on server start up.
+ #
+-#state_file "~/.mpd/state"
++state_file "/var/mpd/.mpd/state"
+ #
+ # The location of the sticker database. This is a database which
+ # manages dynamic information attached to songs.
+ #
+-#sticker_file "~/.mpd/sticker.sql"
++sticker_file "/var/mpd/.mpd/sticker.sql"
+ #
+ ###############################################################################
+
+@@ -64,7 +64,7 @@
+ # initialization. This setting is disabled by default and MPD is run as the
+ # current user.
+ #
+-#user "nobody"
++user "%%MPDUSER%%"
+ #
+ # This setting specifies the group that MPD will run as. If not specified
+ # primary group of user specified with "user" setting will be used (if set).
+@@ -82,7 +82,7 @@
+ #bind_to_address "any"
+ #
+ # And for Unix Socket
+-#bind_to_address "~/.mpd/socket"
++#bind_to_address "/var/mpd/.mpd/socket"
+ #
+ # This setting is the TCP port that is desired for the daemon to get assigned
+ # to.
+@@ -178,8 +178,8 @@
+ #
+ #database {
+ # plugin "simple"
+-# path "~/.local/share/mpd/db
+-# cache_directory "~/.local/share/mpd/cache"
++# path "/var/mpd/.local/share/mpd/db
++# cache_directory "/var/mpd/.local/share/mpd/cache"
+ #}
+ #
+ # An example of database config for a sattelite setup
+@@ -224,14 +224,14 @@ input {
+ #
+ # An example of an OSS output:
+ #
+-#audio_output {
+-# type "oss"
+-# name "My OSS Device"
++audio_output {
++ type "oss"
++ name "Default OSS Device"
+ ## device "/dev/dsp" # optional
+ ## mixer_type "hardware" # optional
+ ## mixer_device "/dev/mixer" # optional
+ ## mixer_control "PCM" # optional
+-#}
++}
+ #
+ # An example of a shout output (for streaming to Icecast):
+ #
More information about the dev-commits-ports-main
mailing list