Update to 1.1.1. Completely rewritten, now modified-BSDL instead of GPL,

and works with WSoundServer instead of WMSound.

9 files changed, 88 insertions, 67 deletions

diff --git a/audio/wsoundprefs/Makefile b/audio/wsoundprefs/Makefile
index 49216b68177..6914d4da433 100644
--- a/audio/wsoundprefs/Makefile
+++ b/audio/wsoundprefs/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.4 2001/03/12 10:51:47 tron Exp $
+# $NetBSD: Makefile,v 1.5 2001/03/12 21:19:09 wiz Exp $
 
-DISTNAME=	WSoundPrefs-0.9.3
-PKGNAME=	wsoundprefs-0.9.3
-CATEGORIES=	audio x11
+DISTNAME=	WSoundPrefs-1.1.1
+PKGNAME=	wsoundprefs-1.1.1
+CATEGORIES=	audio wm
 MASTER_SITES=	ftp://shadowmere.student.utwente.nl/pub/WindowMaker/
 
 MAINTAINER=	lamj@stat.cmu.edu
 HOMEPAGE=	http://shadowmere.student.utwente.nl/
-COMMENT=	WMSound configuration utility
+COMMENT=	WSoundServer configuration utility
 
-DEPENDS+=	wmsound-0.9.4:../../audio/wmsound
+DEPENDS+=	wsoundserver-0.4.0:../../audio/wsoundserver
 
 USE_X11BASE=	YES
 USE_IMAKE=	YES
diff --git a/audio/wsoundprefs/files/md5 b/audio/wsoundprefs/files/md5
index a0adad71eb8..ff399d5c86e 100644
--- a/audio/wsoundprefs/files/md5
+++ b/audio/wsoundprefs/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1999/04/06 17:39:40 tron Exp $
+$NetBSD: md5,v 1.2 2001/03/12 21:19:09 wiz Exp $
 
-MD5 (WSoundPrefs-0.9.3.tar.gz) = d52267ebc0dcf0ce2cb714aa436b199b
+SHA1 (WSoundPrefs-1.1.1.tar.gz) = 444571543e7a076cc49ee484dbcfd0aefc184316
diff --git a/audio/wsoundprefs/files/patch-sum b/audio/wsoundprefs/files/patch-sum
index 18a69e8b883..fb03e8b94f2 100644
--- a/audio/wsoundprefs/files/patch-sum
+++ b/audio/wsoundprefs/files/patch-sum
@@ -1,5 +1,7 @@
-$NetBSD: patch-sum,v 1.2 2001/03/12 10:51:48 tron Exp $
+$NetBSD: patch-sum,v 1.3 2001/03/12 21:19:09 wiz Exp $
 
-SHA1 (patch-aa) = efab4772b33028635ad13d25a581a07bf4efc199
-SHA1 (patch-ab) = 73c54cba5a998c85154e2f27de8c12bcfe89de24
-SHA1 (patch-ac) = b378d0c523128c50b1b48ed8b4d0cbf7bdec1286
+SHA1 (patch-aa) = 8ae650bc0a79ee02dbbefc5519eff735a02a722b
+SHA1 (patch-ab) = 7dc8c4a507972a37cfafb0b15ba2793dd40ae16b
+SHA1 (patch-ac) = 592155f98fa0b51690e766eb75bde69531313533
+SHA1 (patch-ad) = 5d37585aea3950f2d01d66333cbd6fd59d3a42c8
+SHA1 (patch-ae) = 675b6b8039016f99b7bdb744eb01747f5f5f8c31
diff --git a/audio/wsoundprefs/patches/patch-aa b/audio/wsoundprefs/patches/patch-aa
index 1372bf4a37a..67520551a16 100644
--- a/audio/wsoundprefs/patches/patch-aa
+++ b/audio/wsoundprefs/patches/patch-aa
@@ -1,18 +1,24 @@
-$NetBSD: patch-aa,v 1.2 1999/04/06 19:33:20 tron Exp $
+$NetBSD: patch-aa,v 1.3 2001/03/12 21:19:10 wiz Exp $
 
---- Imakefile.orig	Mon Mar  8 09:17:43 1999
-+++ Imakefile	Tue Apr  6 21:23:08 1999
-@@ -1,10 +1,11 @@
- #define IHaveSubdirs
- #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
+--- Imakefile.orig	Fri Mar 31 16:16:47 2000
++++ Imakefile
+@@ -6,15 +6,16 @@
+ 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 
 +CDEBUGFLAGS = -DPREFIX=\\\"$(PREFIX)\\\"
  
  SUBDIRS = src
  
+-DESTDIR = $(PREFIX)
++DESTDIR = $(PREFIX)/GNUstep
+ 
+ MakeSubdirs($(SUBDIRS))
+ DependSubdirs($(SUBDIRS))
diff --git a/audio/wsoundprefs/patches/patch-ab b/audio/wsoundprefs/patches/patch-ab
index 09853f02c4c..8626b6c7f1a 100644
--- a/audio/wsoundprefs/patches/patch-ab
+++ b/audio/wsoundprefs/patches/patch-ab
@@ -1,32 +1,10 @@
-$NetBSD: patch-ab,v 1.3 2001/03/12 10:51:48 tron Exp $
+$NetBSD: patch-ab,v 1.4 2001/03/12 21:19:10 wiz Exp $
 
---- src/Imakefile.orig	Tue Mar  2 14:06:36 1999
-+++ src/Imakefile	Mon Mar 12 11:49:41 2001
-@@ -13,11 +13,18 @@
- XCOMM EFENCELIB = -lefence
- EFENCELIB =
- 
--WMSOUNDLIB = -lwmsnd
--WRASTERCFLAGS = `get-wraster-flags --cflags`
-+XCOMM NetBSD requires -lossaudio for Linux OSS interface compatibility.
-+#ifdef NetBSDArchitecture
-+  OSSLIB = -lossaudio
-+#else
-+  OSSLIB =
-+#endif
-+
-+WMSOUNDLIB = -lwmsnd $(OSSLIB)
-+WRASTERCFLAGS = `get-wraster-flags --cflags` -I${PREFIX}/include/WINGs
- WRASTERLFLAGS = `get-wraster-flags --lflags`
- WRASTERLIBS = `get-wraster-flags --libs`
--WINGSLIBS = -lWINGs -lPropList
-+WINGSLIBS = -lWINGs -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lPropList
- 
- STD_INCLUDES = $(WRASTERCFLAGS)
- DEPLIBS = $(DEPXLIB) 
-@@ -29,7 +36,7 @@
- SRCS = PLFunctions.c SoundEvents.c SoundPaths.c WSoundPrefs.c main.c
- OBJS = PLFunctions.o SoundEvents.o SoundPaths.o WSoundPrefs.o main.o
+--- src/Imakefile.orig	Mon Oct 18 10:35:58 1999
++++ src/Imakefile
+@@ -30,7 +30,7 @@
+ 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
  
 -ComplexProgramTarget(WSoundPrefs)
 +ComplexProgramTargetNoMan(WSoundPrefs)
diff --git a/audio/wsoundprefs/patches/patch-ac b/audio/wsoundprefs/patches/patch-ac
index 305c07b5e7e..0812144a406 100644
--- a/audio/wsoundprefs/patches/patch-ac
+++ b/audio/wsoundprefs/patches/patch-ac
@@ -1,13 +1,22 @@
-$NetBSD: patch-ac,v 1.1 1999/04/06 19:33:20 tron Exp $
+$NetBSD: patch-ac,v 1.2 2001/03/12 21:19:10 wiz Exp $
 
---- src/SoundPaths.c.orig	Tue Mar  2 14:13:40 1999
-+++ src/SoundPaths.c	Tue Apr  6 21:18:06 1999
-@@ -81,7 +81,7 @@
- 	if (array)
- 	    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");
-+	addPathToList(panel->sndL, -1, PREFIX "/share/WindowMaker/Sounds");
-     } else {
- 	for (i=0; i<PLGetNumberOfElements(array); i++) {
- 	    val = PLGetArrayElement(array, i);
+--- src/SoundPaths.c.orig	Mon Jun 14 09:28:21 1999
++++ src/SoundPaths.c
+@@ -70,7 +70,7 @@
+ 		if (array)
+ 			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");
++		addPathToList(panel->sndL, -1, PREFIX "/share/WindowMaker/Sounds");
+ 	} else {
+ 		for (i=0; i<PLGetNumberOfElements(array); i++) {
+ 			val = PLGetArrayElement(array, i);
+@@ -90,7 +90,7 @@
+ 		if (array)
+ 			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, PREFIX "/share/WindowMaker/SoundSets");
+ 	} else {
+ 		for (i=0; i<PLGetNumberOfElements(array); i++) {
+ 			val = PLGetArrayElement(array, i);
diff --git a/audio/wsoundprefs/patches/patch-ad b/audio/wsoundprefs/patches/patch-ad
new file mode 100644
index 00000000000..4dc90cb3b9a
--- /dev/null
+++ b/audio/wsoundprefs/patches/patch-ad
@@ -0,0 +1,15 @@
+$NetBSD: patch-ad,v 1.1 2001/03/12 21:19:10 wiz Exp $
+
+--- src/SystemInfo.c.orig	Wed Jun 16 11:53:35 1999
++++ src/SystemInfo.c
+@@ -32,8 +32,8 @@
+ #include <sys/types.h>
+ #include <sys/utsname.h>
+ #include <pwd.h>
+-#include <WINGs.h>
+-#include <WUtil.h>
++#include <WINGs/WINGs.h>
++#include <WINGs/WUtil.h>
+ 
+ #include "WSoundPrefs.h"
+ #include "SystemInfo.h"
diff --git a/audio/wsoundprefs/patches/patch-ae b/audio/wsoundprefs/patches/patch-ae
new file mode 100644
index 00000000000..895d4cd80dd
--- /dev/null
+++ b/audio/wsoundprefs/patches/patch-ae
@@ -0,0 +1,15 @@
+$NetBSD: patch-ae,v 1.1 2001/03/12 21:19:10 wiz Exp $
+
+--- src/WSoundPrefs.h.orig	Thu Nov 18 10:57:21 1999
++++ src/WSoundPrefs.h
+@@ -42,8 +42,8 @@
+ 
+ #include <wraster.h>
+ 
+-#include <WINGs.h>
+-#include <WUtil.h>
++#include <WINGs/WINGs.h>
++#include <WINGs/WUtil.h>
+ 
+ #include <wsound.h>
+ 
diff --git a/audio/wsoundprefs/pkg/PLIST b/audio/wsoundprefs/pkg/PLIST
index 9fa7a92857c..2d6eae164e3 100644
--- a/audio/wsoundprefs/pkg/PLIST
+++ b/audio/wsoundprefs/pkg/PLIST
@@ -1,13 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/04/06 17:39:40 tron Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/03/12 21:19:10 wiz Exp $
 GNUstep/Apps/WSoundPrefs.app/WSoundPrefs
 GNUstep/Apps/WSoundPrefs.app/WSoundPrefs.tiff
 GNUstep/Apps/WSoundPrefs.app/WSoundPrefs.xpm
-GNUstep/Apps/WSoundPrefs.app/tiff/events.tiff
-GNUstep/Apps/WSoundPrefs.app/tiff/paths.tiff
 GNUstep/Apps/WSoundPrefs.app/tiff/loadset.tiff
 GNUstep/Apps/WSoundPrefs.app/tiff/saveset.tiff
-GNUstep/Apps/WSoundPrefs.app/xpm/events.xpm
-GNUstep/Apps/WSoundPrefs.app/xpm/paths.xpm
 GNUstep/Apps/WSoundPrefs.app/xpm/loadset.xpm
 GNUstep/Apps/WSoundPrefs.app/xpm/saveset.xpm
 @dirrm GNUstep/Apps/WSoundPrefs.app/tiff