Update of wmusic from package maintainer, joel@carnat.net.

This is now wmusic-1.5.0.
From README's ChangeLog:

- 1.5.0
* Added -R option to start xmms when wmusic is started, and to exit wmusic
  when xmms exits.
  (Thanks to Mateusz Greszta)
* Incremented the minor version number, getting sick of 1.4.xx releases :)

- 1.4.14
* Fixed the configure/manpage issue from 1.4.13 :)

- 1.4.13
* Added Russian/Ukrainian glyph support.
  (Thanks to Alexey Voinov <voins@voins.program.ru>,
   Michael Shigorin <mike@altlinux.ru>)

- 1.4.12
* Added patch to make sure xmms is running before calling some functions.
  (Thanks to Michael Cohrs <<michael@cohrs.de>)
* Added patch to fix volume slider overdrawing.
  (Thanks to Zdik Kudrle <zdik.kudrle@borg.cz>)
* Added patch to treat main window just like playlist, equalizer, with regard
  to visibility after right-clicking the wmusic app.
  (Thanks to Nicolas Hinz <nicolas-hinz@gmx.de>)

- 1.4.11
* Added patch to show volume slider (-b flag), allowing volume control
  without a scroll mouse.
  (Thanks to Alessandro Budai <budai@ingsun1.univ.trieste.it>)

- 1.4.10
* Added patch to fix segfaults caused by wrong size of displayRect array
  (Thanks to Alexey Voinov <voins@voins.program.ru>)

- 1.4.9
* Added patch to stop rotating arrow when XMMS is paused (-a flag)
* Added patch to switch between time left and time elapsed display
  (-l flag to start with time left)
* Changed docs to reflect new maintainership (John Chapin)

- 1.4.8
* Corrected e-mail addresses

Changes to package include:
 Removed patch-ab and added patch-aa.
 Changed homepage and MASTER_SITES.
 Removed include of x11/gtk/buildlink3.mk.

My changes to this package:
 Removed @ from install steps so they would be displayed.
 Capitalized XMMS in COMMENT.

(TODO: the README should list the switches/options. And it appears the
-V option is broken.)

4 files changed, 27 insertions, 29 deletions

diff --git a/audio/wmusic/Makefile b/audio/wmusic/Makefile
index b111854fa98..44bef4147d2 100644
--- a/audio/wmusic/Makefile
+++ b/audio/wmusic/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.8 2004/08/31 21:48:55 reed Exp $
+# $NetBSD: Makefile,v 1.9 2004/09/01 15:00:59 reed Exp $
 
-DISTNAME=	wmusic-1.4.7
-PKGREVISION=	3
+DISTNAME=	wmusic-1.5.0
 CATEGORIES=	audio windowmaker
-MASTER_SITES=	http://hadess.net/files/attic/wmusic/
+MASTER_SITES=	http://home.jtan.com/~john/wmusic/
 
 MAINTAINER=	joel@carnat.net
-HOMEPAGE=	http://hadess.net/code.shtml
-COMMENT=	WindowMaker dockable remote for xmms
+HOMEPAGE=	http://home.jtan.com/~john/wmusic/
+COMMENT=	WindowMaker dockable remote for XMMS
 
 GNU_CONFIGURE=	yes
 USE_BUILDLINK3=	yes
@@ -15,13 +14,11 @@ USE_GNU_TOOLS+=	make
 USE_X11=	yes
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/src/wmusic ${PREFIX}/bin
-	@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/wmusic
-	@${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/wmusic
-	@${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/doc/wmusic
+	${INSTALL_PROGRAM} ${WRKSRC}/src/wmusic ${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/wmusic
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/wmusic
+	${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/doc/wmusic
 
 .include "../../audio/xmms/buildlink3.mk"
 .include "../../graphics/xpm/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/wmusic/distinfo b/audio/wmusic/distinfo
index 797e96407ed..9ebc60043ed 100644
--- a/audio/wmusic/distinfo
+++ b/audio/wmusic/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2002/07/21 15:38:32 wiz Exp $
+$NetBSD: distinfo,v 1.3 2004/09/01 15:00:59 reed Exp $
 
-SHA1 (wmusic-1.4.7.tar.gz) = 2045dc9a3cf20fc2278d1a0ebbed961befdf468b
-Size (wmusic-1.4.7.tar.gz) = 42399 bytes
-SHA1 (patch-ab) = 09d3a444a69b077c4145af45361ab3a257f104af
+SHA1 (wmusic-1.5.0.tar.gz) = 7cbf62e23b200a7e07ea458034144f44cfae256a
+Size (wmusic-1.5.0.tar.gz) = 46276 bytes
+SHA1 (patch-aa) = 3c23078841f0c7dffde427050ac1cfcfa67f53cd
diff --git a/audio/wmusic/patches/patch-aa b/audio/wmusic/patches/patch-aa
new file mode 100644
index 00000000000..c548eccf9bb
--- /dev/null
+++ b/audio/wmusic/patches/patch-aa
@@ -0,0 +1,14 @@
+$NetBSD: patch-aa,v 1.1 2004/09/01 15:00:59 reed Exp $
+--- src/Makefile.in.orig	2004-02-27 03:53:10.000000000 +0100
++++ src/Makefile.in	2004-08-31 21:18:09.000000000 +0200
+@@ -10,8 +10,8 @@
+ OBJS = $(SRCS:.c=.o)
+ 
+-CFLAGS = -Wall -g -O2 -I. -I../libdockapp `@PATH_GTKCONFIG@ --cflags` \
++CFLAGS += -Wall -g -O2 -I. -I../libdockapp `@PATH_GTKCONFIG@ --cflags` \
+ 	`@PATH_XMMSCONFIG@ --cflags` \
+ 	-DDATA_DIR=\"`@PATH_XMMSCONFIG@ --data-dir`\"
+-LDFLAGS = @LIBS@ -lXpm `@PATH_GTKCONFIG@ --libs` `@PATH_XMMSCONFIG@ --libs` \
++LDFLAGS += @LIBS@ -lXpm `@PATH_GTKCONFIG@ --libs` `@PATH_XMMSCONFIG@ --libs` \
+ 	@DGA_LIBS@ @VM_LIBS@
+ 
diff --git a/audio/wmusic/patches/patch-ab b/audio/wmusic/patches/patch-ab
deleted file mode 100644
index 43346cf2077..00000000000
--- a/audio/wmusic/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/06/19 13:06:01 agc Exp $
-
---- src/Makefile.in.orig	Mon Apr 30 00:59:12 2001
-+++ src/Makefile.in	Mon Apr 30 00:59:20 2001
-@@ -9,7 +9,7 @@
- 	../libdockapp/dapixmap.c ../libdockapp/darect.c
- OBJS = $(SRCS:.c=.o)
- 
--CFLAGS = -Wall -g -O2 -I. -I../libdockapp `@PATH_GTKCONFIG@ --cflags` \
-+CFLAGS += -Wall -g -I. -I../libdockapp `@PATH_GTKCONFIG@ --cflags` \
- 	`@PATH_XMMSCONFIG@ --cflags` \
- 	-DDATA_DIR=\"`@PATH_XMMSCONFIG@ --data-dir`\"
- LDFLAGS = @LIBS@ -lXpm `@PATH_GTKCONFIG@ --libs` `@PATH_XMMSCONFIG@ --libs` \