Convert to use buildlink.mk files and mark as USE_BUILDLINK_ONLY. Remove

the unnecessary patches that manipulated things for curses/ncurses.  Add
patch to remove -I$(includedir) and -L$(libdir) from the compiler flags.

4 files changed, 16 insertions, 50 deletions

diff --git a/audio/aumix/patches/patch-aa b/audio/aumix/patches/patch-aa
deleted file mode 100644
index 675cd6ab0c0..00000000000
--- a/audio/aumix/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2001/04/05 13:50:43 wiz Exp $
-
---- src/common.h.orig	Tue Jun 27 07:51:42 2000
-+++ src/common.h
-@@ -61,14 +61,14 @@
-  * Our `LOCAL_TEXT(STRING)' macro stands in for gettext (STRING)' when using
-  * NLS, and simply returns STRING otherwise.
-  */
--#ifdef HAVE_NLS
-+#if 1
- #define LOCAL_TEXT(string) gettext (string)
- #ifdef gettext_noop
- #define LOCAL_TEXT_NOOP(string) gettext_noop(string)
- #else
- #define LOCAL_TEXT_NOOP(string) (string)
- #endif				/* gettext_noop */
--#ifdef HAVE_LIBINTL_H
-+#if 1
- #include <libintl.h>
- #include <locale.h>
- #endif				/* HAVE_LIBINTL_H */
diff --git a/audio/aumix/patches/patch-ab b/audio/aumix/patches/patch-ab
deleted file mode 100644
index d97545a36d0..00000000000
--- a/audio/aumix/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2001/04/05 13:50:43 wiz Exp $
-
---- src/curses.h.orig	Tue Jun 27 07:51:42 2000
-+++ src/curses.h
-@@ -4,7 +4,7 @@
- #include <signal.h>		/* updates only needed in interactive modes */
- #define XOFFSET 0		/* blank columns to leave at the left */
- #define YOFFSET 0		/* blank lines to leave at the top */
--#if HAVE_NCURSES_H
-+#if 1
- #include <ncurses.h>
- #else
- #include <curses.h>
diff --git a/audio/aumix/patches/patch-ac b/audio/aumix/patches/patch-ac
deleted file mode 100644
index a07d3f7abc9..00000000000
--- a/audio/aumix/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2001/04/05 13:50:44 wiz Exp $
-
---- src/gpm-xterm.h.orig	Wed Apr 12 17:02:04 2000
-+++ src/gpm-xterm.h
-@@ -24,11 +24,7 @@
- #ifndef _GPM_XTERM_H_
- #define _GPM_XTERM_H_
- 
--#ifdef HAVE_NCURSES_H
- #include <ncurses.h>
--#else
--#include <curses.h>
--#endif				/* HAVE_CURSES */
- 
- /* Xtermish stuff */
- #define GPM_XTERM_ON \
diff --git a/audio/aumix/patches/patch-ad b/audio/aumix/patches/patch-ad
new file mode 100644
index 00000000000..5d368f7fef6
--- /dev/null
+++ b/audio/aumix/patches/patch-ad
@@ -0,0 +1,16 @@
+$NetBSD: patch-ad,v 1.1 2001/06/19 15:55:09 jlam Exp $
+
+--- src/Makefile.in.orig	Tue Jun 19 06:09:52 2001
++++ src/Makefile.in
+@@ -88,9 +88,9 @@
+ aumix_SOURCES = common.c curses.c dummy.c gpm-xterm.c gtk.c interactive.c 		mouse.c common.h curses.h gpm-xterm.h gtk.h interactive.h  		mouse.h play.xpm record.xpm
+ 
+ localedir = $(datadir)/locale
+-INCLUDES = -I../intl -DLOCALEDIR=\"$(localedir)\" -I@includedir@
++INCLUDES = -I../intl -DLOCALEDIR=\"$(localedir)\"
+ CFLAGS = @CFLAGS@ @GLIB_CFLAGS@ @GTK_CFLAGS@
+-LDADD = -L@libdir@
++LDADD = 
+ LIBS = @LIBS@ @GTK_LIBS@ @INTLLIBS@
+ DEFS = @DEFS@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs