Hi, The diff below updates audio/mpd to the latest version.
I've also updated and sorted CONFIGURE_ARGS. Tested on amd64. Ok? Index: Makefile =================================================================== RCS file: /cvs/ports/audio/mpd/Makefile,v retrieving revision 1.46 diff -u -p -r1.46 Makefile --- Makefile 24 May 2012 18:36:45 -0000 1.46 +++ Makefile 13 Jul 2012 07:10:52 -0000 @@ -1,8 +1,7 @@ # $OpenBSD: Makefile,v 1.46 2012/05/24 18:36:45 shadchin Exp $ COMMENT = Music Player Daemon -DISTNAME = mpd-0.16.8 -REVISION = 1 +DISTNAME = mpd-0.17 CATEGORIES = audio HOMEPAGE = http://www.musicpd.org/ MAINTAINER = David Coppa <dco...@openbsd.org> @@ -34,32 +33,37 @@ FLAVORS = tremor FLAVOR ?= CONFIGURE_STYLE = gnu -CONFIGURE_ARGS += --enable-ao \ - --enable-pipe-output \ +CONFIGURE_ARGS += --bindir=${PREFIX}/sbin \ --disable-alsa \ - --disable-oss \ - --disable-pulse \ + --disable-cdio-paranoia \ + --disable-ffmpeg \ + --disable-gme \ --disable-jack \ - --enable-mikmod \ - --enable-curl \ - --disable-wavpack \ - --bindir=${PREFIX}/sbin \ - --with-zeroconf=no \ - --disable-cue \ - --disable-sqlite \ + --disable-libwrap \ --disable-mms \ --disable-modplug \ + --disable-mpg123 \ + --disable-oss \ + --disable-pulse \ + --disable-roar \ --disable-sidplay \ - --disable-ffmpeg \ - --enable-mpc \ - --disable-libwrap \ - --enable-lsr \ + --disable-soundcloud \ + --disable-soup \ + --disable-sqlite \ + --disable-systemd-daemon \ + --disable-twolame-encoder \ + --disable-wavpack \ + --enable-ao \ --enable-audiofile \ - --disable-gme \ + --enable-curl \ + --enable-lsr \ --enable-mad \ - --disable-mpg123 \ + --enable-mikmod \ + --enable-mpc \ + --enable-pipe-output \ --enable-sndfile \ - --disable-twolame-encoder + --with-zeroconf=no \ + --without-systemdsystemunitdir # OggFLAC and tremor tests, initgroups(3) CONFIGURE_ENV = LDFLAGS="-L${LOCALBASE}/lib" \ Index: distinfo =================================================================== RCS file: /cvs/ports/audio/mpd/distinfo,v retrieving revision 1.14 diff -u -p -r1.14 distinfo --- distinfo 10 Apr 2012 15:12:54 -0000 1.14 +++ distinfo 13 Jul 2012 07:10:52 -0000 @@ -1,5 +1,2 @@ -MD5 (mpd-0.16.8.tar.gz) = fwdEYhXTWjFmudGGv9DJTw== -RMD160 (mpd-0.16.8.tar.gz) = B5UvP47xiDMxMUFmKIomm5F+jOw= -SHA1 (mpd-0.16.8.tar.gz) = 1s7p2RrXHYJnneSPr/SakQd8wmw= -SHA256 (mpd-0.16.8.tar.gz) = wSmYf2AsaY84Awv7oLeuLhli77Z+Tdj/Lbl+rrmlzHs= -SIZE (mpd-0.16.8.tar.gz) = 648114 +SHA256 (mpd-0.17.tar.gz) = CjlvZBdioj17pYUqjVv1rzP5vFa0tN1g1MjBEPhzMhk= +SIZE (mpd-0.17.tar.gz) = 723143 Index: patches/patch-Makefile_in =================================================================== RCS file: /cvs/ports/audio/mpd/patches/patch-Makefile_in,v retrieving revision 1.6 diff -u -p -r1.6 patch-Makefile_in --- patches/patch-Makefile_in 10 Apr 2012 15:12:54 -0000 1.6 +++ patches/patch-Makefile_in 13 Jul 2012 07:10:52 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-Makefile_in,v 1.6 2012/04/10 15:12:54 dcoppa Exp $ ---- Makefile.in.orig Thu Apr 5 03:37:06 2012 -+++ Makefile.in Tue Apr 10 17:05:49 2012 -@@ -2361,7 +2361,7 @@ SPARSE_CPPFLAGS = $(DEFAULT_INCLUDES) -I$(shell $(CC) +--- Makefile.in.orig Wed Jun 27 11:39:46 2012 ++++ Makefile.in Thu Jul 12 16:44:29 2012 +@@ -2470,7 +2470,7 @@ SPARSE_SRC = $(addprefix $(top_srcdir)/,$(filter %.c,$ # Documentation # man_MANS = doc/mpd.1 doc/mpd.conf.5 Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/audio/mpd/patches/patch-configure,v retrieving revision 1.16 diff -u -p -r1.16 patch-configure --- patches/patch-configure 10 Apr 2012 15:12:54 -0000 1.16 +++ patches/patch-configure 13 Jul 2012 07:10:52 -0000 @@ -2,27 +2,27 @@ $OpenBSD: patch-configure,v 1.16 2012/04 Don't reset CPPFLAGS...stupid configure. ---- configure.orig Thu Apr 5 03:37:06 2012 -+++ configure Tue Apr 10 17:05:50 2012 -@@ -8844,7 +8844,7 @@ if test x$enable_aac = xyes; then +--- configure.orig Thu Jul 12 16:46:10 2012 ++++ configure Thu Jul 12 16:46:58 2012 +@@ -9766,7 +9766,7 @@ if test x$enable_aac = xyes; then oldcppflags=$CPPFLAGS - CFLAGS="$CFLAGS $MPD_CFLAGS $FAAD_CFLAGS -I." - LIBS="$LIBS $MPD_LIBS $FAAD_LIBS" + CFLAGS="$CFLAGS $FAAD_CFLAGS -I." + LIBS="$LIBS $FAAD_LIBS" - CPPFLAGS=$CFLAGS + CPPFLAGS="$CPPFLAGS $CFLAGS" ac_fn_c_check_header_mongrel "$LINENO" "faad.h" "ac_cv_header_faad_h" "$ac_includes_default" if test "x$ac_cv_header_faad_h" = xyes; then : -@@ -9098,7 +9098,7 @@ if test x$enable_aac = xyes; then +@@ -10030,7 +10030,7 @@ if test x$enable_aac = xyes; then oldcppflags=$CPPFLAGS - CFLAGS="$CFLAGS $MPD_CFLAGS $FAAD_CFLAGS -Werror" - LIBS="$LIBS $MPD_LIBS $FAAD_LIBS" + CFLAGS="$CFLAGS $FAAD_CFLAGS -Werror" + LIBS="$LIBS $FAAD_LIBS" - CPPFLAGS=$CFLAGS + CPPFLAGS="$CPPFLAGS $CFLAGS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken libfaad headers" >&5 $as_echo_n "checking for broken libfaad headers... " >&6; } -@@ -9144,7 +9144,7 @@ if test x$enable_aac = xyes; then +@@ -10076,7 +10076,7 @@ if test x$enable_aac = xyes; then oldcppflags=$CPPFLAGS CFLAGS="$CFLAGS $FAAD_CFLAGS" LIBS="$LIBS $FAAD_LIBS $MP4FF_LIBS" @@ -31,12 +31,3 @@ Don't reset CPPFLAGS...stupid configure. ac_fn_c_check_header_mongrel "$LINENO" "mp4ff.h" "ac_cv_header_mp4ff_h" "$ac_includes_default" if test "x$ac_cv_header_mp4ff_h" = xyes; then : -@@ -10651,7 +10651,7 @@ if test x$enable_mpc = xyes; then - oldcppflags=$CPPFLAGS - CFLAGS="$CFLAGS $MPD_CFLAGS $MPCDEC_CFLAGS -I." - LIBS="$LIBS $MPD_LIBS $MPCDEC_LIBS" -- CPPFLAGS=$CFLAGS -+ CPPFLAGS="$CPPFLAGS $CFLAGS" - ac_fn_c_check_header_mongrel "$LINENO" "mpc/mpcdec.h" "ac_cv_header_mpc_mpcdec_h" "$ac_includes_default" - if test "x$ac_cv_header_mpc_mpcdec_h" = xyes; then : - old_mpcdec=no Index: patches/patch-doc_mpdconf_example =================================================================== RCS file: /cvs/ports/audio/mpd/patches/patch-doc_mpdconf_example,v retrieving revision 1.8 diff -u -p -r1.8 patch-doc_mpdconf_example --- patches/patch-doc_mpdconf_example 30 Oct 2011 11:46:19 -0000 1.8 +++ patches/patch-doc_mpdconf_example 13 Jul 2012 07:10:52 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-doc_mpdconf_example,v 1.8 2011/10/30 11:46:19 dcoppa Exp $ ---- doc/mpdconf.example.orig Sun Oct 9 13:43:52 2011 -+++ doc/mpdconf.example Thu Oct 13 16:42:40 2011 +--- doc/mpdconf.example.orig Wed Jun 27 09:51:00 2012 ++++ doc/mpdconf.example Thu Jul 12 16:44:29 2012 @@ -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. @@ -69,7 +69,7 @@ $OpenBSD: patch-doc_mpdconf_example,v 1. # This setting is the TCP port that is desired for the daemon to get assigned # to. # -@@ -296,6 +298,14 @@ input { +@@ -302,6 +304,14 @@ input { # name "My Null Output" # mixer_type "none" # optional #}
