From 96a6dfc31b3dfe6bea96b2aa7998f6d2ea7f5eaf Mon Sep 17 00:00:00 2001 From: jasper Date: Mon, 23 Aug 2010 14:46:55 +0000 Subject: [PATCH] - update mpd to 0.15.12 * from tobias ulmer (MAINTAINER) some tweaks by me: - set license version - new-style WANTLIB/LIB_DEPENDS - fix MODULES and MASTER_SITES --- audio/mpd/Makefile | 34 ++++++++++++++--------------- audio/mpd/distinfo | 10 ++++----- audio/mpd/patches/patch-Makefile_in | 8 +++---- audio/mpd/patches/patch-configure | 14 ++++++------ 4 files changed, 33 insertions(+), 33 deletions(-) diff --git a/audio/mpd/Makefile b/audio/mpd/Makefile index 9bdd35fac7c..25dad68a7f9 100644 --- a/audio/mpd/Makefile +++ b/audio/mpd/Makefile @@ -1,34 +1,34 @@ -# $OpenBSD: Makefile,v 1.23 2010/06/03 16:06:07 pea Exp $ +# $OpenBSD: Makefile,v 1.24 2010/08/23 14:46:55 jasper Exp $ COMMENT = Music Player Daemon -DISTNAME = mpd-0.15.9 -PKGNAME = ${DISTNAME}p1 +DISTNAME = mpd-0.15.12 CATEGORIES = audio HOMEPAGE = http://www.musicpd.org/ MAINTAINER = Tobias Ulmer -# GPL +# GPLv2+ PERMIT_PACKAGE_CDROM = Yes PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM =Yes PERMIT_DISTFILES_FTP = Yes -WANTLIB = c m pthread ogg z intl stdc++ sndio +WANTLIB = c m pthread ogg z stdc++ sndio curl glib-2.0 gthread-2.0 +WANTLIB += audiofile ao samplerate FLAC id3tag mad mikmod -MASTER_SITES = ${HOMEPAGE}uploads/files/ -MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=musicpd/} +MASTER_SITES = ${HOMEPAGE}/uploads/files/ \ + ${MASTER_SITE_SOURCEFORGE:=musicpd/} -MODULES = converters/libiconv +MODULES = devel/gettext -LIB_DEPENDS = audiofile::devel/libaudiofile \ - ao::audio/libao \ - samplerate::audio/libsamplerate \ - FLAC::audio/flac \ - id3tag::audio/libid3tag \ - mad::audio/libmad \ - mikmod::audio/libmikmod \ - curl::net/curl \ - glib-2.0,gthread-2.0::devel/glib2 \ +LIB_DEPENDS = ::devel/libaudiofile \ + ::audio/libao \ + ::audio/libsamplerate \ + ::audio/flac \ + ::audio/libid3tag \ + ::audio/libmad \ + ::audio/libmikmod \ + ::net/curl \ + ::devel/glib2 FLAVORS = tremor FLAVOR ?= diff --git a/audio/mpd/distinfo b/audio/mpd/distinfo index 64ac01c75ef..c449ed3947d 100644 --- a/audio/mpd/distinfo +++ b/audio/mpd/distinfo @@ -1,5 +1,5 @@ -MD5 (mpd-0.15.9.tar.gz) = LL0ieicmUv3qzkKhoivwyw== -RMD160 (mpd-0.15.9.tar.gz) = Nf36W4HDq6I6KvTVi26cX5ep+Mo= -SHA1 (mpd-0.15.9.tar.gz) = 5RGDouU/68bBXbGTlHfBJezoD8k= -SHA256 (mpd-0.15.9.tar.gz) = /jmP7yP0l8SS0vLJoSDrvCHMFfOAjGfT8XIoFOzV0pY= -SIZE (mpd-0.15.9.tar.gz) = 482909 +MD5 (mpd-0.15.12.tar.gz) = W9YcISTUOIsTmLMvLHFDig== +RMD160 (mpd-0.15.12.tar.gz) = QUgnNCADCYPdKuKiN6qiOc9kO9M= +SHA1 (mpd-0.15.12.tar.gz) = fZObgk2YmjG+NmA/jVA+N3RJxj8= +SHA256 (mpd-0.15.12.tar.gz) = p2oa1OAxLL2EwJ9S0/eLpcEvLrmRRSSJsEsXlkrftBc= +SIZE (mpd-0.15.12.tar.gz) = 483928 diff --git a/audio/mpd/patches/patch-Makefile_in b/audio/mpd/patches/patch-Makefile_in index 9710a2cdce8..62f89d75117 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.1 2010/01/12 18:58:26 wcmaier Exp $ ---- Makefile.in.orig Wed Nov 18 20:48:14 2009 -+++ Makefile.in Thu Dec 17 16:11:52 2009 -@@ -1525,7 +1525,7 @@ SPARSE_CPPFLAGS = $(DEFAULT_INCLUDES) -I$(shell $(CC) +$OpenBSD: patch-Makefile_in,v 1.2 2010/08/23 14:46:55 jasper Exp $ +--- Makefile.in.orig Wed Jul 21 02:42:27 2010 ++++ Makefile.in Sun Aug 22 18:45:03 2010 +@@ -1447,7 +1447,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 59f88523d9d..bdd0f3fef1f 100644 --- a/audio/mpd/patches/patch-configure +++ b/audio/mpd/patches/patch-configure @@ -1,10 +1,10 @@ -$OpenBSD: patch-configure,v 1.11 2010/05/22 11:10:09 jasper Exp $ +$OpenBSD: patch-configure,v 1.12 2010/08/23 14:46:55 jasper Exp $ Don't reset CPPFLAGS...stupid configure. ---- configure.orig Mon Mar 22 01:24:53 2010 -+++ configure Fri May 21 16:51:51 2010 -@@ -8979,7 +8979,7 @@ if test x$enable_mpc = xyes; then +--- configure.orig Wed Jul 21 02:42:27 2010 ++++ configure Sun Aug 22 18:45:03 2010 +@@ -8990,7 +8990,7 @@ if test x$enable_mpc = xyes; then oldcppflags=$CPPFLAGS CFLAGS="$CFLAGS $MPD_CFLAGS $MPCDEC_CFLAGS -I." LIBS="$LIBS $MPD_LIBS $MPCDEC_LIBS" @@ -13,7 +13,7 @@ Don't reset CPPFLAGS...stupid configure. 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" = x""yes; then : old_mpcdec=no -@@ -9203,7 +9203,7 @@ if test x$enable_aac = xyes; then +@@ -9214,7 +9214,7 @@ if test x$enable_aac = xyes; then oldcppflags=$CPPFLAGS CFLAGS="$CFLAGS $MPD_CFLAGS $FAAD_CFLAGS -I." LIBS="$LIBS $MPD_LIBS $FAAD_LIBS" @@ -22,7 +22,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" = x""yes; then : -@@ -9457,7 +9457,7 @@ if test x$enable_aac = xyes; then +@@ -9468,7 +9468,7 @@ if test x$enable_aac = xyes; then oldcppflags=$CPPFLAGS CFLAGS="$CFLAGS $MPD_CFLAGS $FAAD_CFLAGS -Werror" LIBS="$LIBS $MPD_LIBS $FAAD_LIBS" @@ -31,7 +31,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; } -@@ -9503,7 +9503,7 @@ if test x$enable_aac = xyes; then +@@ -9514,7 +9514,7 @@ if test x$enable_aac = xyes; then oldcppflags=$CPPFLAGS CFLAGS="$CFLAGS $FAAD_CFLAGS" LIBS="$LIBS $FAAD_LIBS $MP4FF_LIBS"