5 files changed, 26 insertions, 30 deletions

diff --git a/audio/wsoundprefs/Makefile b/audio/wsoundprefs/Makefile
index b1f24d29a8a4..299b0f506b0e 100644
--- a/audio/wsoundprefs/Makefile
+++ b/audio/wsoundprefs/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   wsoundPrefs
-# Version required:    0.9.1
+# Version required:    1.0.2
 # Date created:        12 December 1998
 # Whom:                gljohns@bellsouth.net
 #
-# $Id: Makefile,v 1.2 1999/01/28 10:14:03 asami Exp $
+# $Id: Makefile,v 1.3 1999/04/02 03:36:26 steve Exp $
 #
 
-DISTNAME=	WSoundPrefs-0.9.3
+DISTNAME=	WSoundPrefs-1.0.2
 CATEGORIES=	audio windowmaker
 MASTER_SITES=	ftp://shadowmere.student.utwente.nl/pub/WindowMaker/
 
diff --git a/audio/wsoundprefs/distinfo b/audio/wsoundprefs/distinfo
index 97110a61eea3..a9fdaa45be3b 100644
--- a/audio/wsoundprefs/distinfo
+++ b/audio/wsoundprefs/distinfo
@@ -1 +1 @@
-MD5 (WSoundPrefs-0.9.3.tar.gz) = d52267ebc0dcf0ce2cb714aa436b199b
+MD5 (WSoundPrefs-1.0.2.tar.gz) = 25a59cbe789ffc33d8dc927778103871
diff --git a/audio/wsoundprefs/files/patch-aa b/audio/wsoundprefs/files/patch-aa
index dc6de4308213..b469313f235a 100644
--- a/audio/wsoundprefs/files/patch-aa
+++ b/audio/wsoundprefs/files/patch-aa
@@ -1,5 +1,5 @@
---- Imakefile.orig	Wed Dec 23 23:17:56 1998
-+++ Imakefile	Wed Dec 23 23:18:22 1998
+--- 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)"
@@ -8,8 +8,8 @@
 +XCOMM PREFIX = /usr/X11R6
  
  XCOMM CDEBUGFLAGS = -Wall -ggdb -DDEBUG
--CDEBUGFLAGS = -O6 -m486 
-+XCOMM CDEBUGFLAGS = -O6 -m486 
+-CDEBUGFLAGS ?= -O6 -m486 
++XCOMM CDEBUGFLAGS ?= -O6 -m486 
  
  SUBDIRS = src
  
diff --git a/audio/wsoundprefs/files/patch-ac b/audio/wsoundprefs/files/patch-ac
index f9cd6cb76e96..3d64875eb10c 100644
--- a/audio/wsoundprefs/files/patch-ac
+++ b/audio/wsoundprefs/files/patch-ac
@@ -1,18 +1,18 @@
---- src/SoundPaths.c.orig	Sun May 30 00:08:59 1999
-+++ src/SoundPaths.c	Sun May 30 00:13:22 1999
-@@ -82,6 +82,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");
-+	addPathToList(panel->sndL, -1, "/usr/X11R6/share/WindowMaker/Sounds");
-     } else {
- 	for (i=0; i<PLGetNumberOfElements(array); i++) {
- 	    val = PLGetArrayElement(array, i);
-@@ -95,6 +96,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);
+--- 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 @@
+ 			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, "/usr/X11R6/share/WindowMaker/Sounds");
+ 	} 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);
diff --git a/audio/wsoundprefs/pkg-plist b/audio/wsoundprefs/pkg-plist
index 01f0c07c5eb7..5d16367e9030 100644
--- a/audio/wsoundprefs/pkg-plist
+++ b/audio/wsoundprefs/pkg-plist
@@ -1,12 +1,8 @@
 GNUstep/Apps/WSoundPrefs.app/WSoundPrefs
 GNUstep/Apps/WSoundPrefs.app/WSoundPrefs.xpm
 GNUstep/Apps/WSoundPrefs.app/WSoundPrefs.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
-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
 @dirrm GNUstep/Apps/WSoundPrefs.app/tiff