Index: Makefile
===================================================================
RCS file: /home/ncvs/FreeBSD/ports/audio/wsoundprefs/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- Makefile	18 Nov 2004 08:05:42 -0000	1.18
+++ Makefile	10 Apr 2005 11:31:09 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	wsoundprefs
 PORTVERSION=	1.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio windowmaker
 MASTER_SITES=	${MASTER_SITE_NETBSD}
 DISTNAME=	WSoundPrefs-${PORTVERSION}
@@ -15,8 +15,6 @@
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A utility for configuring sounds to play for Window Maker events
 
-BROKEN=		"Does not build with new version of windowmaker"
-
 BUILD_DEPENDS=	wmaker:${PORTSDIR}/x11-wm/windowmaker
 LIB_DEPENDS=	PropList.2:${PORTSDIR}/devel/libPropList \
 		wsound.1:${PORTSDIR}/audio/wsoundserver
Index: files/patch-ab
===================================================================
RCS file: /home/ncvs/FreeBSD/ports/audio/wsoundprefs/files/patch-ab,v
retrieving revision 1.5
diff -u -r1.5 patch-ab
--- files/patch-ab	12 Mar 2001 09:29:49 -0000	1.5
+++ files/patch-ab	9 Apr 2005 07:20:47 -0000
@@ -1,5 +1,5 @@
---- src/Imakefile.orig	Mon Oct 18 17:35:58 1999
-+++ src/Imakefile	Sun Dec 10 17:09:01 2000
+--- src/Imakefile.orig	Mon Oct 18 18:35:58 1999
++++ src/Imakefile	Sat Apr  9 17:20:36 2005
 @@ -5,9 +5,9 @@
  
  ICONS = WSoundPrefs.xpm WSoundPrefs.tiff
@@ -12,7 +12,7 @@
  
  XCOMM EFENCELIB = -lefence
  EFENCELIB =
-@@ -18,9 +18,9 @@
+@@ -18,19 +18,19 @@
  WRASTERCFLAGS = `get-wraster-flags --cflags`
  WRASTERLFLAGS = `get-wraster-flags --lflags`
  WRASTERLIBS = `get-wraster-flags --libs`
@@ -24,8 +24,11 @@
 +STD_INCLUDES = $(WRASTERCFLAGS) -I${LOCALBASE}/include -I${X11BASE}/include -I${X11BASE}/include/WINGs
  DEPLIBS = $(DEPXLIB) 
  
- LOCAL_LIBRARIES =	$(XLIB) $(WINGSLIBS) $(WSOUNDLFLAGS) $(WSOUNDLIBS) $(WRASTERLFLAGS) $(WRASTERLIBS) $(EFENCELIB)
-@@ -30,7 +30,7 @@
+-LOCAL_LIBRARIES =	$(XLIB) $(WINGSLIBS) $(WSOUNDLFLAGS) $(WSOUNDLIBS) $(WRASTERLFLAGS) $(WRASTERLIBS) $(EFENCELIB)
++LOCAL_LIBRARIES =	$(XLIB) $(WINGSLIBS) $(WSOUNDLFLAGS) $(WSOUNDLIBS) $(WRASTERLFLAGS) $(WRASTERLIBS) $(EFENCELIB) $(FONTCONFIGLIB) $(XFTLIB)
+ 
+ LINTLIBS = $(LINTXLIB)
+ 
  SRCS = PLFunctions.c SoundEvents.c SoundPaths.c SystemInfo.c WSoundPrefs.c main.c
  OBJS = PLFunctions.o SoundEvents.o SoundPaths.o SystemInfo.o WSoundPrefs.o main.o
  
Index: files/patch-ac
===================================================================
RCS file: /home/ncvs/FreeBSD/ports/audio/wsoundprefs/files/patch-ac,v
retrieving revision 1.2
diff -u -r1.2 patch-ac
--- files/patch-ac	22 Jun 1999 15:27:37 -0000	1.2
+++ files/patch-ac	10 Apr 2005 11:41:30 -0000
@@ -1,6 +1,37 @@
---- src/SoundPaths.c.orig	Sat Jun 19 02:08:04 1999
-+++ src/SoundPaths.c	Sat Jun 19 23:23:41 1999
-@@ -71,6 +71,7 @@
+--- src/SoundPaths.c.orig	Mon Jun 14 17:28:21 1999
++++ src/SoundPaths.c	Sun Apr 10 21:41:00 2005
+@@ -42,7 +42,8 @@
+ 	Panel		*panel = (Panel*)WMGetHangedData(lPtr);
+ 	WMScreen	*scr = WMWidgetScreen(lPtr);
+ 	Display		*dpy = WMScreenDisplay(scr);
+-	
++	WMColor		*gray = WMGrayColor(scr);
++
+ 	width = rect->size.width;
+ 	height = rect->size.height;
+ 	x = rect->pos.x;
+@@ -50,13 +51,16 @@
+ 	
+ 	if (state & WLDSSelected)
+ 		XFillRectangle(dpy, d, WMColorGC(panel->white), x, y, width, height);
+-	else
+-		XClearArea(dpy, d, x, y, width, height, False);
++	else 
++		XFillRectangle(dpy, d, WMColorGC(gray), x, y, width, height);
++	
+ 
+ 	if (state & 1)
+-		WMDrawString(scr, d, WMColorGC(panel->red), panel->font, x+4, y, text, strlen(text));
++		WMDrawString(scr, d, panel->red, panel->font, x+4, y, text, strlen(text));
+ 	else
+-		WMDrawString(scr, d, WMColorGC(panel->black), panel->font, x+4, y,text, strlen(text));
++		WMDrawString(scr, d, panel->black, panel->font, x+4, y,text, strlen(text));
++
++	WMReleaseColor(gray);
+ }
+ 
+ void
+@@ -71,6 +75,7 @@
  			wwarning(_("bad value in option SoundPath. Using default path list"));
  		addPathToList(panel->sndL, -1, "~/GNUstep/Library/WindowMaker/Sounds");
  		addPathToList(panel->sndL, -1, "/usr/local/share/WindowMaker/Sounds");
@@ -8,11 +39,3 @@
  	} else {
  		for (i=0; i<PLGetNumberOfElements(array); i++) {
  			val = PLGetArrayElement(array, i);
-@@ -91,6 +92,7 @@
- 			wwarning(_("bad value in option SoundSetPath. Using default path list"));
- 		addPathToList(panel->sndsetL, -1, "~/GNUstep/Library/WindowMaker/SoundSets");
- 		addPathToList(panel->sndsetL, -1, "/usr/local/share/WindowMaker/SoundSets");
-+		addPathToList(panel->sndsetL, -1, "/usr/X11R6/share/WindowMaker/SoundSets");
- 	} else {
- 		for (i=0; i<PLGetNumberOfElements(array); i++) {
- 			val = PLGetArrayElement(array, i);