7 files changed, 64 insertions, 57 deletions
diff --git a/audio/wsoundprefs/Makefile b/audio/wsoundprefs/Makefile
index 34118449a141..93d8219029c1 100644
--- a/audio/wsoundprefs/Makefile
+++ b/audio/wsoundprefs/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	wsoundPrefs
+# New ports collection makefile for:	WSoundPrefs
 # Date created:		12 December 1998
 # Whom:			gljohns@bellsouth.net
 #
@@ -6,17 +6,18 @@
 #
 
 PORTNAME=	wsoundprefs
-PORTVERSION=	1.0.2
+PORTVERSION=	1.1.1
 CATEGORIES=	audio windowmaker
 MASTER_SITES=	ftp://shadowmere.student.utwente.nl/pub/WindowMaker/
 DISTNAME=	WSoundPrefs-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sobomax@FreeBSD.org
 
-BUILD_DEPENDS=	wmaker:${PORTSDIR}/x11-wm/windowmaker \
-		wmsound:${PORTSDIR}/audio/wmsound
+BUILD_DEPENDS=	wmaker:${PORTSDIR}/x11-wm/windowmaker
+LIB_DEPENDS=	PropList.2:${PORTSDIR}/devel/libPropList \
+		wsound.1:${PORTSDIR}/audio/wsoundserver
 
 USE_IMAKE=	yes
-NO_INSTALL_MANPAGES=	yes
+NO_INSTALL_MANPAGES=yes
 
 .include <bsd.port.mk>
diff --git a/audio/wsoundprefs/distinfo b/audio/wsoundprefs/distinfo
index a9fdaa45be3b..2dda1457e76f 100644
--- a/audio/wsoundprefs/distinfo
+++ b/audio/wsoundprefs/distinfo
@@ -1 +1 @@
-MD5 (WSoundPrefs-1.0.2.tar.gz) = 25a59cbe789ffc33d8dc927778103871
+MD5 (WSoundPrefs-1.1.1.tar.gz) = 34b004471154d3879a9d3f3155ab438a
diff --git a/audio/wsoundprefs/files/patch-aa b/audio/wsoundprefs/files/patch-aa
index b469313f235a..295bd276f1c8 100644
--- a/audio/wsoundprefs/files/patch-aa
+++ b/audio/wsoundprefs/files/patch-aa
@@ -1,15 +1,16 @@
---- Imakefile.orig	Sat Jun 19 02:08:06 1999
-+++ Imakefile	Sat Jun 19 23:19:31 1999
-@@ -1,10 +1,10 @@
- #define IHaveSubdirs
- #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
+--- Imakefile.orig	Fri Mar 31 17:16:47 2000
++++ Imakefile	Mon May 22 19:46:29 2000
+@@ -6,11 +6,11 @@
+ XCOMM Installation Path: $(PREFIX)/Apps/WSoundPrefs.app
+ XCOMM -------------------------------------------------
+ XCOMM PREFIX = /usr/GNUstep/Local
+-PREFIX = /usr/local/GNUstep
++XCOMM PREFIX = /usr/local/GNUstep
  
--PREFIX = /usr/X11R6
-+XCOMM PREFIX = /usr/X11R6
  
  XCOMM CDEBUGFLAGS = -Wall -ggdb -DDEBUG
--CDEBUGFLAGS ?= -O6 -m486 
-+XCOMM CDEBUGFLAGS ?= -O6 -m486 
+-CDEBUGFLAGS ?= -O2 -m486 
++XCOMM CDEBUGFLAGS ?= -O2 -m486 
  
  SUBDIRS = src
  
diff --git a/audio/wsoundprefs/files/patch-ab b/audio/wsoundprefs/files/patch-ab
index a468162535ea..ef4d81c316cf 100644
--- a/audio/wsoundprefs/files/patch-ab
+++ b/audio/wsoundprefs/files/patch-ab
@@ -1,40 +1,27 @@
-*** src/Imakefile.orig	Tue Mar  2 07:06:36 1999
---- src/Imakefile	Sat Mar 27 22:51:32 1999
-***************
-*** 5,11 ****
-  
-  ICONS = WSoundPrefs.xpm WSoundPrefs.tiff
-  
-! CC = gcc
-  
-  BINDIR = /GNUstep/Apps/WSoundPrefs.app
-  
---- 5,11 ----
-  
-  ICONS = WSoundPrefs.xpm WSoundPrefs.tiff
-  
-! XCOMM CC = gcc
-  
-  BINDIR = /GNUstep/Apps/WSoundPrefs.app
-  
-***************
-*** 17,25 ****
-  WRASTERCFLAGS = `get-wraster-flags --cflags`
-  WRASTERLFLAGS = `get-wraster-flags --lflags`
-  WRASTERLIBS = `get-wraster-flags --libs`
-! WINGSLIBS = -lWINGs -lPropList
-  
-! STD_INCLUDES = $(WRASTERCFLAGS)
-  DEPLIBS = $(DEPXLIB) 
-  
-  LOCAL_LIBRARIES =	$(XLIB) $(WINGSLIBS) $(WMSOUNDLIB) $(WRASTERLFLAGS) $(WRASTERLIBS) $(EFENCELIB)
---- 17,25 ----
-  WRASTERCFLAGS = `get-wraster-flags --cflags`
-  WRASTERLFLAGS = `get-wraster-flags --lflags`
-  WRASTERLIBS = `get-wraster-flags --libs`
-! WINGSLIBS = -lWINGs -L/$(LOCALBASE)/lib -lPropList
-  
-! STD_INCLUDES = $(WRASTERCFLAGS) -I/usr/local/include -I/usr/X11R6/include
-  DEPLIBS = $(DEPXLIB) 
-  
-  LOCAL_LIBRARIES =	$(XLIB) $(WINGSLIBS) $(WMSOUNDLIB) $(WRASTERLFLAGS) $(WRASTERLIBS) $(EFENCELIB)
+--- src/Imakefile.orig	Mon Oct 18 11:35:58 1999
++++ src/Imakefile	Mon May 22 20:01:17 2000
+@@ -5,9 +5,9 @@
+ 
+ ICONS = WSoundPrefs.xpm WSoundPrefs.tiff
+ 
+-CC = gcc
++XCOMM CC = gcc
+ 
+-BINDIR = /Apps/WSoundPrefs.app
++BINDIR = /GNUstep/Apps/WSoundPrefs.app
+ 
+ XCOMM EFENCELIB = -lefence
+ EFENCELIB =
+@@ -18,9 +18,9 @@
+ WRASTERCFLAGS = `get-wraster-flags --cflags`
+ WRASTERLFLAGS = `get-wraster-flags --lflags`
+ WRASTERLIBS = `get-wraster-flags --libs`
+-WINGSLIBS = -lWINGs -lPropList
+-
+-STD_INCLUDES = $(WRASTERCFLAGS) $(WSOUNDCFLAGS)
++WINGSLIBS = -lWINGs -L/$(LOCALBASE)/lib -lPropList
++  
++STD_INCLUDES = $(WRASTERCFLAGS) -I${LOCALBASE}/include -I${X11BASE}/include
+ DEPLIBS = $(DEPXLIB) 
+ 
+ LOCAL_LIBRARIES =	$(XLIB) $(WINGSLIBS) $(WSOUNDLFLAGS) $(WSOUNDLIBS) $(WRASTERLFLAGS) $(WRASTERLIBS) $(EFENCELIB)
diff --git a/audio/wsoundprefs/files/patch-ad b/audio/wsoundprefs/files/patch-ad
new file mode 100644
index 000000000000..d2d771dcb823
--- /dev/null
+++ b/audio/wsoundprefs/files/patch-ad
@@ -0,0 +1,8 @@
+--- src/tiff/Imakefile.orig	Mon May 22 20:04:49 2000
++++ src/tiff/Imakefile	Mon May 22 20:04:52 2000
+@@ -1,4 +1,4 @@
+-TIFFDIR = /Apps/WSoundPrefs.app/tiff/
++TIFFDIR = /GNUstep/Apps/WSoundPrefs.app/tiff/
+ 
+ TIFFS = loadset.tiff saveset.tiff
+ 
diff --git a/audio/wsoundprefs/files/patch-ae b/audio/wsoundprefs/files/patch-ae
new file mode 100644
index 000000000000..5b8a91f96572
--- /dev/null
+++ b/audio/wsoundprefs/files/patch-ae
@@ -0,0 +1,8 @@
+--- src/xpm/Imakefile.orig	Mon May 22 20:05:03 2000
++++ src/xpm/Imakefile	Mon May 22 20:06:04 2000
+@@ -1,4 +1,4 @@
+-XPMDIR = /Apps/WSoundPrefs.app/xpm/
++XPMDIR = /GNUstep/Apps/WSoundPrefs.app/xpm/
+ 
+ XPMS = loadset.xpm saveset.xpm
+ 
diff --git a/audio/wsoundprefs/pkg-descr b/audio/wsoundprefs/pkg-descr
index e0626b92a392..9a9259392a65 100644
--- a/audio/wsoundprefs/pkg-descr
+++ b/audio/wsoundprefs/pkg-descr
@@ -1,4 +1,4 @@
-This utility allows you to configure wmsound for Window Maker. It provides 
+This utility allows you to configure wsoundserver for Window Maker. It provides 
 a browse list for selecting the SoundSets and the Sounds that are installed. 
 It allows you to save your own SoundSets and load them or other preconfigured 
 SoundSets.
@@ -11,3 +11,5 @@ ${X11BASE}/GNUstep/Apps/WSoundPrefs.app/WSoundPrefs
 
 The following icon is recommended for the dock or clip of Window Maker:
 ${X11BASE}/GNUstep/Apps/WSoundPrefs.app/WSoundPrefs.tiff
+
+WWW: http://shadowmere.student.utwente.nl/modules.php3