From 358fd93272dcd69191b25f027084daefb4f13ff7 Mon Sep 17 00:00:00 2001 From: dcoppa Date: Sun, 4 Mar 2012 16:57:19 +0000 Subject: [PATCH] Updates for musicpd ports: libmpdclient 2.6 -> 2.7 mpc 0.21 -> 0.22 mpd 0.16.5 -> 0.16.7 ncmpc 0.19 -> 0.20 Ok Tobias Ulmer (maintainer) who also requested to give maintainership to me Ok landry@ --- audio/libmpdclient/Makefile | 8 ++++---- audio/libmpdclient/distinfo | 10 +++++----- audio/mpc/Makefile | 6 +++--- audio/mpc/distinfo | 10 +++++----- audio/mpc/patches/patch-Makefile_in | 8 ++++---- audio/mpc/pkg/PLIST | 3 +-- audio/mpd/Makefile | 6 +++--- audio/mpd/distinfo | 10 +++++----- audio/mpd/patches/patch-Makefile_in | 8 ++++---- audio/mpd/patches/patch-configure | 14 +++++++------- audio/ncmpc/Makefile | 9 +++++---- audio/ncmpc/distinfo | 10 +++++----- audio/ncmpc/patches/patch-configure | 22 ++++++++++++++++++++++ audio/ncmpc/patches/patch-src_screen_c | 8 ++++---- 14 files changed, 77 insertions(+), 55 deletions(-) create mode 100644 audio/ncmpc/patches/patch-configure diff --git a/audio/libmpdclient/Makefile b/audio/libmpdclient/Makefile index be39e62f49e..84df1d90cc0 100644 --- a/audio/libmpdclient/Makefile +++ b/audio/libmpdclient/Makefile @@ -1,13 +1,13 @@ -# $OpenBSD: Makefile,v 1.6 2011/11/07 12:36:08 sthen Exp $ +# $OpenBSD: Makefile,v 1.7 2012/03/04 16:57:19 dcoppa Exp $ COMMENT= library for interfacing MPD -DISTNAME= libmpdclient-2.6 -SHARED_LIBS= mpdclient 1.1 # 2.5 +DISTNAME= libmpdclient-2.7 +SHARED_LIBS= mpdclient 1.2 # 2.5 CATEGORIES= audio HOMEPAGE= http://mpd.wikia.com/wiki/ClientLib:libmpdclient -MAINTAINER= Tobias Ulmer +MAINTAINER= David Coppa # 3-BSD PERMIT_PACKAGE_CDROM= Yes diff --git a/audio/libmpdclient/distinfo b/audio/libmpdclient/distinfo index f7f480c4239..faf94da97ca 100644 --- a/audio/libmpdclient/distinfo +++ b/audio/libmpdclient/distinfo @@ -1,5 +1,5 @@ -MD5 (libmpdclient-2.6.tar.gz) = qzh/Uy/QvZlTD3fw9b/PFA== -RMD160 (libmpdclient-2.6.tar.gz) = lCmE6y8eH21Z/+3W8AxRWSbgFFo= -SHA1 (libmpdclient-2.6.tar.gz) = Ob3PU5n7mONLi2EQBXtk9NGUUzM= -SHA256 (libmpdclient-2.6.tar.gz) = evpUdow1fbuWyIMlmd4+8BeXTXwDlJnC3oucWHUj4Go= -SIZE (libmpdclient-2.6.tar.gz) = 357982 +MD5 (libmpdclient-2.7.tar.gz) = 8ajLu01SrOh98PahCX58ig== +RMD160 (libmpdclient-2.7.tar.gz) = Mg0WaNcQYveHDiETeoyx76FsiZg= +SHA1 (libmpdclient-2.7.tar.gz) = +X41UlhR6xktN5nw2r4ykVxWuWs= +SHA256 (libmpdclient-2.7.tar.gz) = tSCEqP4Xwh5CANvAo+D36xrvcEip3wZm8uBQ0rijCio= +SIZE (libmpdclient-2.7.tar.gz) = 356853 diff --git a/audio/mpc/Makefile b/audio/mpc/Makefile index bda4236f22e..06ae3ae997b 100644 --- a/audio/mpc/Makefile +++ b/audio/mpc/Makefile @@ -1,13 +1,13 @@ -# $OpenBSD: Makefile,v 1.11 2011/10/13 12:10:16 jasper Exp $ +# $OpenBSD: Makefile,v 1.12 2012/03/04 16:57:19 dcoppa Exp $ COMMENT= command line client for mpd -DISTNAME= mpc-0.21 +DISTNAME= mpc-0.22 CATEGORIES= audio HOMEPAGE= http://mpd.wikia.com/wiki/Client:Mpc -MAINTAINER= Tobias Ulmer +MAINTAINER= David Coppa # GPLv2 PERMIT_PACKAGE_CDROM= Yes diff --git a/audio/mpc/distinfo b/audio/mpc/distinfo index 1bac172b18f..1918d2d2863 100644 --- a/audio/mpc/distinfo +++ b/audio/mpc/distinfo @@ -1,5 +1,5 @@ -MD5 (mpc-0.21.tar.gz) = yc3m41eeLC0R5h48QU6BWw== -RMD160 (mpc-0.21.tar.gz) = b5PV6TOQTwtFsH+dOEMhazHlNSk= -SHA1 (mpc-0.21.tar.gz) = LbdqgAgiJIZPL0jZD7SRwTUv2EE= -SHA256 (mpc-0.21.tar.gz) = 32/yUoRiS5iV1711kyIjKxIFZrSPVnnqgYlxm11+4qI= -SIZE (mpc-0.21.tar.gz) = 119447 +MD5 (mpc-0.22.tar.gz) = +WtV93JK246LtGuBUmWFLA== +RMD160 (mpc-0.22.tar.gz) = 7V5Ww094pjzTC0umb0QYR+zq6tA= +SHA1 (mpc-0.22.tar.gz) = 41QUwfWyX05QDOrhJa21u5BjsCk= +SHA256 (mpc-0.22.tar.gz) = grx+3zjU2W/wu4E5E78aDnZGogJKzfV6/GQ3soi1LZM= +SIZE (mpc-0.22.tar.gz) = 122184 diff --git a/audio/mpc/patches/patch-Makefile_in b/audio/mpc/patches/patch-Makefile_in index d878c05fb50..bdc7dc0e918 100644 --- a/audio/mpc/patches/patch-Makefile_in +++ b/audio/mpc/patches/patch-Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-Makefile_in,v 1.3 2011/10/13 12:10:16 jasper Exp $ ---- Makefile.in.orig Sat Jun 4 19:16:27 2011 -+++ Makefile.in Sun Oct 9 16:07:16 2011 -@@ -220,9 +220,7 @@ top_srcdir = @top_srcdir@ +$OpenBSD: patch-Makefile_in,v 1.4 2012/03/04 16:57:19 dcoppa Exp $ +--- Makefile.in.orig Sat Feb 4 23:29:55 2012 ++++ Makefile.in Fri Mar 2 10:58:56 2012 +@@ -222,9 +222,7 @@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I m4 AUTOMAKE_OPTIONS = foreign 1.10 dist-bzip2 man_MANS = doc/mpc.1 diff --git a/audio/mpc/pkg/PLIST b/audio/mpc/pkg/PLIST index 1ba6aaa36e7..0d01ed60c9b 100644 --- a/audio/mpc/pkg/PLIST +++ b/audio/mpc/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.2 2010/05/26 13:59:38 jasper Exp $ +@comment $OpenBSD: PLIST,v 1.3 2012/03/04 16:57:19 dcoppa Exp $ @bin bin/mpc @man man/man1/mpc.1 share/doc/mpc/ @@ -7,7 +7,6 @@ share/doc/mpc/COPYING share/doc/mpc/NEWS share/doc/mpc/README share/examples/mpc/ -@comment share/mpc/ share/examples/mpc/mpc-completion.bash share/examples/mpc/mpd-m3u-handler.sh share/examples/mpc/mpd-pls-handler.sh diff --git a/audio/mpd/Makefile b/audio/mpd/Makefile index 2b1217528c4..8d69336cbce 100644 --- a/audio/mpd/Makefile +++ b/audio/mpd/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.42 2011/10/30 11:46:18 dcoppa Exp $ +# $OpenBSD: Makefile,v 1.43 2012/03/04 16:57:19 dcoppa Exp $ COMMENT = Music Player Daemon -DISTNAME = mpd-0.16.5 +DISTNAME = mpd-0.16.7 CATEGORIES = audio HOMEPAGE = http://www.musicpd.org/ -MAINTAINER = Tobias Ulmer +MAINTAINER = David Coppa # GPLv2+ PERMIT_PACKAGE_CDROM = Yes diff --git a/audio/mpd/distinfo b/audio/mpd/distinfo index ccb071f6b7f..f79db9579fa 100644 --- a/audio/mpd/distinfo +++ b/audio/mpd/distinfo @@ -1,5 +1,5 @@ -MD5 (mpd-0.16.5.tar.gz) = X7TJdiPsom0ti5aIaOLxPw== -RMD160 (mpd-0.16.5.tar.gz) = reTqWhiFa1rVXSgh+WiOkzrMalU= -SHA1 (mpd-0.16.5.tar.gz) = a0sHXkFw0HPD/AAq4Uu15TSuKwg= -SHA256 (mpd-0.16.5.tar.gz) = KPYhXkXM5ZA7ab3BpU0t/R+fJC5SQto8EfAlv+tcTKA= -SIZE (mpd-0.16.5.tar.gz) = 658239 +MD5 (mpd-0.16.7.tar.gz) = y+CVcf4dCz6DrDjVt2KbFg== +RMD160 (mpd-0.16.7.tar.gz) = rnbVFUWi4FUMeBDDTQXPONxLuQY= +SHA1 (mpd-0.16.7.tar.gz) = 9Z/ifYY7vnbgPFWPGsdlHY6icKU= +SHA256 (mpd-0.16.7.tar.gz) = lfIWoRXL63PfLOtGWnMKydTKNWnJa9GJpnzMwr1a2Hs= +SIZE (mpd-0.16.7.tar.gz) = 643632 diff --git a/audio/mpd/patches/patch-Makefile_in b/audio/mpd/patches/patch-Makefile_in index 8dbcc64e6c2..fca921ccf9f 100644 --- a/audio/mpd/patches/patch-Makefile_in +++ b/audio/mpd/patches/patch-Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-Makefile_in,v 1.4 2011/10/30 11:46:18 dcoppa Exp $ ---- Makefile.in.orig Sun Oct 9 13:44:12 2011 -+++ Makefile.in Thu Oct 13 16:42:40 2011 -@@ -2268,7 +2268,7 @@ SPARSE_CPPFLAGS = $(DEFAULT_INCLUDES) -I$(shell $(CC) +$OpenBSD: patch-Makefile_in,v 1.5 2012/03/04 16:57:19 dcoppa Exp $ +--- Makefile.in.orig Sat Feb 4 23:31:35 2012 ++++ Makefile.in Fri Mar 2 10:43:25 2012 +@@ -2291,7 +2291,7 @@ SPARSE_CPPFLAGS = $(DEFAULT_INCLUDES) -I$(shell $(CC) # Documentation # man_MANS = doc/mpd.1 doc/mpd.conf.5 diff --git a/audio/mpd/patches/patch-configure b/audio/mpd/patches/patch-configure index 839aedf32c5..de8cc9e4ed2 100644 --- a/audio/mpd/patches/patch-configure +++ b/audio/mpd/patches/patch-configure @@ -1,10 +1,10 @@ -$OpenBSD: patch-configure,v 1.14 2011/10/30 11:46:18 dcoppa Exp $ +$OpenBSD: patch-configure,v 1.15 2012/03/04 16:57:19 dcoppa Exp $ Don't reset CPPFLAGS...stupid configure. ---- configure.orig Sun Oct 9 13:44:12 2011 -+++ configure Thu Oct 13 16:42:40 2011 -@@ -8830,7 +8830,7 @@ if test x$enable_aac = xyes; then +--- configure.orig Sat Feb 4 23:31:35 2012 ++++ configure Fri Mar 2 10:43:25 2012 +@@ -8840,7 +8840,7 @@ if test x$enable_aac = xyes; then oldcppflags=$CPPFLAGS CFLAGS="$CFLAGS $MPD_CFLAGS $FAAD_CFLAGS -I." LIBS="$LIBS $MPD_LIBS $FAAD_LIBS" @@ -13,7 +13,7 @@ Don't reset CPPFLAGS...stupid configure. 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 : -@@ -9084,7 +9084,7 @@ if test x$enable_aac = xyes; then +@@ -9094,7 +9094,7 @@ if test x$enable_aac = xyes; then oldcppflags=$CPPFLAGS CFLAGS="$CFLAGS $MPD_CFLAGS $FAAD_CFLAGS -Werror" LIBS="$LIBS $MPD_LIBS $FAAD_LIBS" @@ -22,7 +22,7 @@ Don't reset CPPFLAGS...stupid configure. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken libfaad headers" >&5 $as_echo_n "checking for broken libfaad headers... " >&6; } -@@ -9130,7 +9130,7 @@ if test x$enable_aac = xyes; then +@@ -9140,7 +9140,7 @@ if test x$enable_aac = xyes; then oldcppflags=$CPPFLAGS CFLAGS="$CFLAGS $FAAD_CFLAGS" LIBS="$LIBS $FAAD_LIBS $MP4FF_LIBS" @@ -31,7 +31,7 @@ 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 : -@@ -10637,7 +10637,7 @@ if test x$enable_mpc = xyes; then +@@ -10647,7 +10647,7 @@ if test x$enable_mpc = xyes; then oldcppflags=$CPPFLAGS CFLAGS="$CFLAGS $MPD_CFLAGS $MPCDEC_CFLAGS -I." LIBS="$LIBS $MPD_LIBS $MPCDEC_LIBS" diff --git a/audio/ncmpc/Makefile b/audio/ncmpc/Makefile index 7d65e4b81b5..70d9388198c 100644 --- a/audio/ncmpc/Makefile +++ b/audio/ncmpc/Makefile @@ -1,14 +1,14 @@ -# $OpenBSD: Makefile,v 1.22 2011/09/17 13:30:15 jasper Exp $ +# $OpenBSD: Makefile,v 1.23 2012/03/04 16:57:19 dcoppa Exp $ COMMENT= curses based frontend for mpd -DISTNAME= ncmpc-0.19 +DISTNAME= ncmpc-0.20 EPOCH= 0 CATEGORIES= audio HOMEPAGE= http://mpd.wikia.com/wiki/Client:Ncmpc -MAINTAINER= Tobias Ulmer +MAINTAINER= David Coppa # GPLv2 PERMIT_PACKAGE_CDROM= Yes @@ -24,7 +24,8 @@ MODULES= devel/gettext MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=musicpd/} CONFIGURE_STYLE= gnu -CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \ +CONFIGURE_ENV= CPP=${CPP} \ + CPPFLAGS=-I${LOCALBASE}/include \ LDFLAGS=-L${LOCALBASE}/lib post-install: diff --git a/audio/ncmpc/distinfo b/audio/ncmpc/distinfo index 883c0ed8ab1..77297d8ef4a 100644 --- a/audio/ncmpc/distinfo +++ b/audio/ncmpc/distinfo @@ -1,5 +1,5 @@ -MD5 (ncmpc-0.19.tar.gz) = XTCxAUoq5RAbSYAaNZIG2A== -RMD160 (ncmpc-0.19.tar.gz) = AC3RFnfeI3owwHAqkOWO7ANnT7E= -SHA1 (ncmpc-0.19.tar.gz) = xRVWFr+HGPaRg86AHTg3fbo51a4= -SHA256 (ncmpc-0.19.tar.gz) = O7etdu4bwozN93ZcN5wt5a0y40CtOE/6U32+L2qT9W8= -SIZE (ncmpc-0.19.tar.gz) = 412348 +MD5 (ncmpc-0.20.tar.gz) = eIPR6b8VRCPmMd777eDvyw== +RMD160 (ncmpc-0.20.tar.gz) = lxSZQ/s4L+ypzUKAt4VLE8FDGTk= +SHA1 (ncmpc-0.20.tar.gz) = yd2lDXuaz3pFAgfQC+NsL04p6Xk= +SHA256 (ncmpc-0.20.tar.gz) = ftOx49MyGFWyByWn3cmx7eZId2Bkd1W65eTnmZ5mEgU= +SIZE (ncmpc-0.20.tar.gz) = 437453 diff --git a/audio/ncmpc/patches/patch-configure b/audio/ncmpc/patches/patch-configure new file mode 100644 index 00000000000..781a128af09 --- /dev/null +++ b/audio/ncmpc/patches/patch-configure @@ -0,0 +1,22 @@ +$OpenBSD: patch-configure,v 1.1 2012/03/04 16:57:19 dcoppa Exp $ +--- configure.orig Fri Mar 2 11:50:55 2012 ++++ configure Fri Mar 2 11:50:28 2012 +@@ -6805,14 +6805,14 @@ fi + + + +-as_ac_Lib=`$as_echo "ac_cv_lib_$(expr substr $CURSES_LIB 3 99)''_getmouse" | $as_tr_sh` +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getmouse in -l$(expr substr $CURSES_LIB 3 99)" >&5 +-$as_echo_n "checking for getmouse in -l$(expr substr $CURSES_LIB 3 99)... " >&6; } ++as_ac_Lib=`$as_echo "ac_cv_lib_$(echo ${CURSES_LIB#??})''_getmouse" | $as_tr_sh` ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getmouse in -l$(echo ${CURSES_LIB#??})" >&5 ++$as_echo_n "checking for getmouse in -l$(echo ${CURSES_LIB#??})... " >&6; } + if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-l$(expr substr $CURSES_LIB 3 99) $LIBS" ++LIBS="-l$(echo ${CURSES_LIB#??}) $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + diff --git a/audio/ncmpc/patches/patch-src_screen_c b/audio/ncmpc/patches/patch-src_screen_c index 23d83e4d473..a378e1530c9 100644 --- a/audio/ncmpc/patches/patch-src_screen_c +++ b/audio/ncmpc/patches/patch-src_screen_c @@ -1,6 +1,6 @@ -$OpenBSD: patch-src_screen_c,v 1.3 2010/08/31 20:50:33 jasper Exp $ ---- src/screen.c.orig Thu Jul 15 04:01:30 2010 -+++ src/screen.c Tue Aug 31 22:49:26 2010 +$OpenBSD: patch-src_screen_c,v 1.4 2012/03/04 16:57:19 dcoppa Exp $ +--- src/screen.c.orig Sun Feb 5 20:04:22 2012 ++++ src/screen.c Fri Mar 2 13:18:26 2012 @@ -40,6 +40,8 @@ #include "screen_lyrics.h" #include "screen_outputs.h" @@ -31,4 +31,4 @@ $OpenBSD: patch-src_screen_c,v 1.3 2010/08/31 20:50:33 jasper Exp $ + if (COLS