From a9a9f6c2e75228f1e42ad915704eb47c80515132 Mon Sep 17 00:00:00 2001
From: Eric Melville <eric@FreeBSD.org>
Date: Fri, 18 Oct 2002 03:48:26 +0000
Subject: [PATCH] Update to 1.4.10.

PR:		43961
---
 audio/wmusic/Makefile       | 21 +++++++++------------
 audio/wmusic/distinfo       |  2 +-
 audio/wmusic/files/patch-ab | 23 ++++++++++++++++++-----
 audio/wmusic/pkg-plist      |  1 -
 4 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/audio/wmusic/Makefile b/audio/wmusic/Makefile
index 71adfc2b9312..aa7fff7ad91f 100644
--- a/audio/wmusic/Makefile
+++ b/audio/wmusic/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wmusic
-PORTVERSION=	1.4.9
+PORTVERSION=	1.4.10
 CATEGORIES=	audio windowmaker
 MASTER_SITES=	http://home.jtan.com/~john/wmusic/downloads/
 DISTFILES=	${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFX}
@@ -16,22 +16,19 @@ MAINTAINER=	eric@FreeBSD.org
 BUILD_DEPENDS=	xmms:${PORTSDIR}/audio/xmms
 RUN_DEPENDS=	xmms:${PORTSDIR}/audio/xmms
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	PATH_GTKCONFIG=${PREFIX}/bin/gtk12-config
-
-USE_GMAKE=	yes
-USE_GNOMENG=	yes
-USE_GNOME=	gtk12
 USE_X_PREFIX=	yes
 USE_XPM=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	PATH_GTKCONFIG=${GTK_CONFIG}
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/src/wmusic ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/src/wmusic ${PREFIX}/bin
 .ifndef(NOPORTDOCS)
-	@${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} \
-		${PREFIX}/share/doc/${PORTNAME}
-	@${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/${PORTNAME}
-	@${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/doc/${PORTNAME}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/audio/wmusic/distinfo b/audio/wmusic/distinfo
index 78c3ea5fbbdb..90b0ad9911f8 100644
--- a/audio/wmusic/distinfo
+++ b/audio/wmusic/distinfo
@@ -1 +1 @@
-MD5 (wmusic-1.4.9-src.tar.gz) = 516feef656d8cef7850322a681a4cf22
+MD5 (wmusic-1.4.10-src.tar.gz) = 2c29ba3c5a04ad0f8f79e56e7a7e165b
diff --git a/audio/wmusic/files/patch-ab b/audio/wmusic/files/patch-ab
index 71601c501a91..0c30854389d5 100644
--- a/audio/wmusic/files/patch-ab
+++ b/audio/wmusic/files/patch-ab
@@ -1,11 +1,24 @@
---- 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 @@
+--- src/Makefile.in.orig	Fri Mar 16 06:15:07 2001
++++ src/Makefile.in	Sat Oct  5 00:39:47 2002
+@@ -9,10 +9,10 @@
  	../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` \
++CFLAGS = @CFLAGS@ -I. -I../libdockapp `@PATH_GTKCONFIG@ --cflags gthread` \
  	`@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` \
++LDFLAGS = @LIBS@ -lXpm `@PATH_GTKCONFIG@ --libs gthread` `@PATH_XMMSCONFIG@ --libs` \
+ 	@DGA_LIBS@ @VM_LIBS@
+ 
+ all:		wmusic
+@@ -25,7 +25,7 @@
+ 	@INSTALL@ -c -m 755 -s wmusic $(PREFIX)/bin
+ 
+ wmusic:		$(OBJS) $(IFLAGS)
+-	gcc -g -o wmusic $(OBJS) $(LDFLAGS)
++	$(CC) -o wmusic $(OBJS) $(LDFLAGS)
+ 
+ uninstall:	clean
+ 	rm -f $(PREFIX)/bin/wmusic
diff --git a/audio/wmusic/pkg-plist b/audio/wmusic/pkg-plist
index 9ccae7983b98..a6df3a8ba535 100644
--- a/audio/wmusic/pkg-plist
+++ b/audio/wmusic/pkg-plist
@@ -1,4 +1,3 @@
 bin/wmusic
 %%PORTDOCS%%share/doc/wmusic/README
-%%PORTDOCS%%share/doc/wmusic/COPYING
 %%PORTDOCS%%@dirrm share/doc/wmusic