4 files changed, 40 insertions, 35 deletions

diff --git a/audio/wsoundserver/Makefile b/audio/wsoundserver/Makefile
index 42c6e6b55411..b407037e773c 100644
--- a/audio/wsoundserver/Makefile
+++ b/audio/wsoundserver/Makefile
@@ -1,28 +1,35 @@
-# New ports collection makefile for:	wmsound
+# New ports collection makefile for:	wsoundserver
 # Date created:		9 December 1998
 # Whom:			gljohns@bellsouth.net
 #
 # $FreeBSD$
 #
 
-PORTNAME=	wmsound
-PORTVERSION=	0.9.5
+PORTNAME=	wsoundserver
+PORTVERSION=	0.4.0
 CATEGORIES=	audio windowmaker
 MASTER_SITES=	ftp://shadowmere.student.utwente.nl/pub/WindowMaker/
+DISTNAME=	WSoundServer-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sobomax@FreeBSD.org
 
 BUILD_DEPENDS=	wmaker:${PORTSDIR}/x11-wm/windowmaker
-LIB_DEPENDS=	PropList.2:${PORTSDIR}/devel/libPropList
+LIB_DEPENDS=	PropList.2:${PORTSDIR}/devel/libPropList \
+		audiofile.0:${PORTSDIR}/audio/libaudiofile \
+		dockapp.1:${PORTSDIR}/x11-wm/libdockapp
 
-USE_IMAKE=	yes
-NO_INSTALL_MANPAGES=	yes
+USE_X_PREFIX=	yes
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+MAKE_ARGS=	"-E CFLAGS"
+
+MAN1=		get-wsound-flags.1x getsoundset.1x setsoundset.1x \
+			wsoundplay.1x wsoundserver.1x
 
 post-install:
 	${SH} ${FILESDIR}/configure > ${WRKDIR}/WMSound
-	${MKDIR} ${PREFIX}/share/WindowMaker/Defaults
+	${MKDIR} ${PREFIX}/etc/WindowMaker
 	${INSTALL_DATA} ${WRKDIR}/WMSound \
-		${PREFIX}/share/WindowMaker/Defaults/WMSound
-	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+		${PREFIX}/etc/WindowMaker/WMSound
 
 .include <bsd.port.mk>
diff --git a/audio/wsoundserver/distinfo b/audio/wsoundserver/distinfo
index 5bac56de9ca8..e7d99566c397 100644
--- a/audio/wsoundserver/distinfo
+++ b/audio/wsoundserver/distinfo
@@ -1 +1 @@
-MD5 (wmsound-0.9.5.tar.gz) = 86f9b19ca0ca1daa072d76d02943dd3e
+MD5 (WSoundServer-0.4.0.tar.gz) = af100367a491673663e3d5c3016d8e12
diff --git a/audio/wsoundserver/pkg-descr b/audio/wsoundserver/pkg-descr
index dd6a0c3e9a6c..dee010845043 100644
--- a/audio/wsoundserver/pkg-descr
+++ b/audio/wsoundserver/pkg-descr
@@ -1,17 +1,12 @@
-This is the sound server for Window Maker. To use it, execute "wmsound &" from 
-an xterm, then dock the application icon. This package comes with a utility 
-called nmaker that can be used to play .wav files. You can set nmaker to be 
-the application to play .au and .wav files that you drop onto the docked 
-wmsound icon.
-
-Recent versions of Window Maker are built with sound enabled by default. If 
-you are using an older version of Window Maker, you will have to add the 
-following argument to configure: "--enable-sound" and rebuild and reinstall 
-Window Maker, or upgrade to a newer version.
-
-You must set up your sounds to use for various events, ie., iconification. You 
-can get preset SoundSets from:
-
-http://www.frontiernet.net/~southgat/wmsound/sounds/index.shtml
-
-WWW: http://www.frontiernet.net/~southgat/
+WSoundServer is a rewritten from scratch reimplementation of a sound server
+for WindowMaker, intended as a replacement for wmsound. To use it, execute
+"wsoundserver &" from an xterm, then dock the application icon. This package
+comes with a utility called wsoundplay that can be used to play .wav files.
+You can set wsoundplay to be the application to play .au and .wav files that
+you drop onto the docked wmsound icon.
+
+A GUI configuration tool called WSoundPrefs coded in WINGs exists, which allows
+to configure WSoundServer. WSoundPrefs available as a separate port named
+wsoundprefs.
+
+WWW: http://shadowmere.student.utwente.nl/modules.php3
diff --git a/audio/wsoundserver/pkg-plist b/audio/wsoundserver/pkg-plist
index 44e6aec25c45..466f70608190 100644
--- a/audio/wsoundserver/pkg-plist
+++ b/audio/wsoundserver/pkg-plist
@@ -1,9 +1,12 @@
-bin/wmsound
-bin/nmaker
-bin/getsounds
-bin/setsounds
-include/wmsnd.h
-share/WindowMaker/Defaults/WMSound
-lib/libwmsnd.a
+etc/WindowMaker/WMSound
+bin/get-wsound-flags
+bin/getsoundset
+bin/setsoundset
+bin/wsoundplay
+bin/wsoundserver
+include/wsound.h
+lib/libwsound.a
+lib/libwsound.so
+lib/libwsound.so.1
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R