From bc70ce4d578796539d5ca80c7b347076deac22fb Mon Sep 17 00:00:00 2001
From: drochner <drochner>
Date: Tue, 20 Jan 2009 22:52:17 +0000
Subject: update to 0.14.1 This release features fixes for jack instability,
 many streaming issues, solaris build, cross fading audio defects, improvement
 in software volume and non-distribution building. This releases adds
 writer/composer tag support and disables oggvorbis seeking on remote files,
 which fixes slow ogg file streaming playback.

---
 audio/musicpd/Makefile         | 10 ++++++----
 audio/musicpd/PLIST            |  7 +++++--
 audio/musicpd/distinfo         | 10 ++++------
 audio/musicpd/patches/patch-aa | 24 ------------------------
 audio/musicpd/patches/patch-ab | 13 -------------
 5 files changed, 15 insertions(+), 49 deletions(-)
 delete mode 100644 audio/musicpd/patches/patch-aa
 delete mode 100644 audio/musicpd/patches/patch-ab

(limited to 'audio')

diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index c4a21526ccb..28dcfff8459 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.32 2009/01/11 20:57:20 ahoka Exp $
+# $NetBSD: Makefile,v 1.33 2009/01/20 22:52:17 drochner Exp $
 
-DISTNAME=		mpd-0.13.1
+DISTNAME=		mpd-0.14.1
 PKGNAME=		${DISTNAME:S/mpd/musicpd/}
-PKGREVISION=		3
 CATEGORIES=		audio
-MASTER_SITES=		http://musicpd.org/uploads/files/
+#MASTER_SITES=		http://musicpd.org/uploads/files/
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=musicpd/}
 EXTRACT_SUFX=		.tar.bz2
 
 CONFLICTS=		mpd-[0-9]*
@@ -15,6 +15,7 @@ COMMENT=		Remote controllable audio player
 
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
+USE_TOOLS+=		pkg-config
 
 .include "options.mk"
 
@@ -39,6 +40,7 @@ post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/mpd.conf ${EGDIR}
 
+.include "../../devel/glib2/buildlink3.mk"
 .include "../../audio/libao/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
 
diff --git a/audio/musicpd/PLIST b/audio/musicpd/PLIST
index 2eee0ece19a..fba94e5c8ad 100644
--- a/audio/musicpd/PLIST
+++ b/audio/musicpd/PLIST
@@ -1,9 +1,12 @@
-@comment $NetBSD: PLIST,v 1.3 2007/01/09 23:19:26 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/01/20 22:52:17 drochner Exp $
 bin/mpd
 man/man1/mpd.1
 man/man5/mpd.conf.5
-share/doc/mpd/COMMANDS
+share/doc/mpd/AUTHORS
+share/doc/mpd/COPYING
+share/doc/mpd/NEWS
 share/doc/mpd/README
+share/doc/mpd/TODO
 share/doc/mpd/UPGRADING
 share/doc/mpd/mpdconf.example
 share/examples/mpd/mpd.conf
diff --git a/audio/musicpd/distinfo b/audio/musicpd/distinfo
index 1d052ecdd28..93bb20ee462 100644
--- a/audio/musicpd/distinfo
+++ b/audio/musicpd/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.14 2008/11/02 22:25:09 snj Exp $
+$NetBSD: distinfo,v 1.15 2009/01/20 22:52:17 drochner Exp $
 
-SHA1 (mpd-0.13.1.tar.bz2) = 0a760bafb608ea5ecde28433dfef8f25a4a12a56
-RMD160 (mpd-0.13.1.tar.bz2) = 30416258a750c4238443c5d2fe895bcb70fa9daa
-Size (mpd-0.13.1.tar.bz2) = 435425 bytes
-SHA1 (patch-aa) = 246424791365a3a9a29c2efe36bbbcd40416ae48
-SHA1 (patch-ab) = 867ed205669efe40bd6debf3f7d82380cb8090fc
+SHA1 (mpd-0.14.1.tar.bz2) = e87424caafca366c15744a31cbc34197474862f9
+RMD160 (mpd-0.14.1.tar.bz2) = b3ae29717f22e4e7bf03a0356b6ca3a0c96bbb60
+Size (mpd-0.14.1.tar.bz2) = 286850 bytes
diff --git a/audio/musicpd/patches/patch-aa b/audio/musicpd/patches/patch-aa
deleted file mode 100644
index b2f4e0512fe..00000000000
--- a/audio/musicpd/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2007/01/09 23:19:26 wiz Exp $
-
-http://www.musicpd.org/mantis/view.php?id=1379
-
-setenv() doesn't exist on all systems (e.g. solaris 9)
-
---- src/main.c.orig	2006-10-10 23:56:58.000000000 +0000
-+++ src/main.c
-@@ -279,7 +279,14 @@ static void changeToUser(void)
- 
- 		/* this is needed by libs such as arts */
- 		if (userpwd->pw_dir) {
--			setenv("HOME", userpwd->pw_dir, 1);
-+			char *tmps;
-+			/* HOME=%s so we need 5 for HOME= and 1 for the terminating \0 */
-+			tmps = (char *) malloc (strlen(userpwd->pw_dir) + 6);
-+			if (tmps != NULL) {
-+				sprintf (tmps, "HOME=%s", userpwd->pw_dir);
-+				putenv (tmps);
-+				free (tmps);
-+			}
- 		}
- 	}
- }
diff --git a/audio/musicpd/patches/patch-ab b/audio/musicpd/patches/patch-ab
deleted file mode 100644
index ef95fda268b..00000000000
--- a/audio/musicpd/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2008/11/02 22:25:09 snj Exp $
-
---- src/audioOutputs/audioOutput_oss.c.orig	2008-11-02 12:53:23.000000000 -0800
-+++ src/audioOutputs/audioOutput_oss.c	2008-11-02 12:53:46.000000000 -0800
-@@ -405,7 +405,7 @@
- 	freeOssData(od);
- }
- 
--static int setParam(OssData * od, int param, int *value)
-+static int setParam(OssData * od, unsigned long param, int *value)
- {
- 	int val = *value;
- 	int copy;
-- 
cgit v1.2.3