* Use ossaudio.buildlink.mk.

* Include <ctype.h> for tolower() prototype.
* Fix pkg/16755 with patch from rxg (thanks!).
* Bump PKGREVISION (PLIST change).

5 files changed, 34 insertions, 5 deletions

diff --git a/audio/xanalyser/Makefile b/audio/xanalyser/Makefile
index 40c37cb84c8..cd498dabef9 100644
--- a/audio/xanalyser/Makefile
+++ b/audio/xanalyser/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/04/23 03:33:26 schmonz Exp $
+# $NetBSD: Makefile,v 1.2 2002/05/12 14:47:11 schmonz Exp $
 #
 
 DISTNAME=	xanalyser-1.21
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.suse.com/pub/people/arvin/private/
 EXTRACT_SUFX=	.tar.bz2
@@ -15,5 +16,6 @@ GNU_CONFIGURE=		# defined
 
 .include "../../graphics/xpm/buildlink.mk"
 .include "../../mk/motif.buildlink.mk"
+.include "../../mk/ossaudio.buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xanalyser/PLIST b/audio/xanalyser/PLIST
index 4ea41c402af..ccbb72fcf1f 100644
--- a/audio/xanalyser/PLIST
+++ b/audio/xanalyser/PLIST
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/04/23 03:33:26 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/05/12 14:47:11 schmonz Exp $
 bin/xanalyser
+lib/X11/app-defaults/XAnalyser
 man/man1/xanalyser.1
diff --git a/audio/xanalyser/distinfo b/audio/xanalyser/distinfo
index 6da44a91e9f..909b66b7099 100644
--- a/audio/xanalyser/distinfo
+++ b/audio/xanalyser/distinfo
@@ -4,9 +4,10 @@ Size (xanalyser-1.21.tar.bz2) = 58542 bytes
 SHA1 (patch-aa) = 29651c643550679f647b54726fb8d25579cdaaf7
 SHA1 (patch-ab) = bee615a58bd041c2b31645d3d312798c1dd5606d
 SHA1 (patch-ac) = 78f5f22951a918291c7ab5c61110c4ec2e9cf8b8
-SHA1 (patch-ad) = c37bac9f9630ad63618cbad58af89f051c1fe5d8
+SHA1 (patch-ad) = 7cfcc00ad3bc221264e0480020cfab613b01c359
 SHA1 (patch-ae) = db464b9a91db329473e7d774b7fb53d977b258af
 SHA1 (patch-af) = bf6af0c140a802fb98e82e82ecbfb7240696db09
 SHA1 (patch-ag) = 0ae5680df966e534d76d04cddf6a78259d87cbfe
 SHA1 (patch-ah) = a8bae5da6db1098ce1520cc49e167fc5999b0dda
 SHA1 (patch-ai) = 6805fc79e0c3135f6f22eb0b91c68cacd96c483c
+SHA1 (patch-aj) = 2a6549638be3d3d25126b0938a11572ffe1c6564
diff --git a/audio/xanalyser/patches/patch-ad b/audio/xanalyser/patches/patch-ad
index dd9895b094a..f70406a0161 100644
--- a/audio/xanalyser/patches/patch-ad
+++ b/audio/xanalyser/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/04/23 03:33:27 schmonz Exp $
+$NetBSD: patch-ad,v 1.2 2002/05/12 14:47:12 schmonz Exp $
 
---- src/Makefile.in.orig	Wed Jan 23 14:49:25 2002
+--- src/Makefile.in.orig	Thu Jan 24 03:49:25 2002
 +++ src/Makefile.in
 @@ -73,7 +73,7 @@
  xanalyser_SOURCES =  	Analyser.cc Analyser.h			DSP.cc DSP.h				Sample.cc Sample.h			Scope.cc Scope.h			XAnalyser.ad.h				control.cc control.h			fft.cc fft.h				help.cc help.h help.txt.h		main.cc main.h				utils.cc utils.h			Trans.h
@@ -22,3 +22,16 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/04/23 03:33:27 schmonz Exp $
  
  help.cc: help.txt.h
  
+@@ -311,8 +311,8 @@
+ 	txt2c help.txt > help.txt.h
+ 
+ install-data-hook:
+-	mkdir -p $(DESTDIR)/usr/X11R6/lib/X11/app-defaults
+-	cp XAnalyser.ad $(DESTDIR)/usr/X11R6/lib/X11/app-defaults/XAnalyser
++	mkdir -p $(DESTDIR)$(prefix)/lib/X11/app-defaults
++	cp XAnalyser.ad $(DESTDIR)$(prefix)/lib/X11/app-defaults/XAnalyser
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+
+
diff --git a/audio/xanalyser/patches/patch-aj b/audio/xanalyser/patches/patch-aj
new file mode 100644
index 00000000000..36f2229d15a
--- /dev/null
+++ b/audio/xanalyser/patches/patch-aj
@@ -0,0 +1,12 @@
+$NetBSD: patch-aj,v 1.1 2002/05/12 14:47:12 schmonz Exp $
+
+--- src/utils.cc.orig	Sat Dec  1 19:37:13 2001
++++ src/utils.cc
+@@ -7,6 +7,7 @@
+ 
+ #include <stdio.h>
+ #include <math.h>
++#include <ctype.h>
+ 
+ #include <X11/Xlib.h>
+ #include <Xm/Xm.h>