aumix requires curses, not ncurses.

6 files changed, 39 insertions, 8 deletions

diff --git a/audio/aumix-gtk/Makefile b/audio/aumix-gtk/Makefile
index 8c490bd4907..b61cd2831e0 100644
--- a/audio/aumix-gtk/Makefile
+++ b/audio/aumix-gtk/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.25 2013/10/10 14:41:57 ryoon Exp $
+# $NetBSD: Makefile,v 1.26 2013/10/14 13:02:39 roy Exp $
 
 .include "../../audio/aumix/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/aumix/aumix-gtk/}
 PKGREVISION=	9
 
-COMMENT+=	(ncurses and GTK+ 2.0 interfaces)
+COMMENT+=	(curses and GTK+ 2.0 interfaces)
 
 CONFLICTS=	aumix-[0-9]*
 
diff --git a/audio/aumix/Makefile b/audio/aumix/Makefile
index 0bcbdbc7131..213e954fff6 100644
--- a/audio/aumix/Makefile
+++ b/audio/aumix/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2012/07/17 21:26:47 cheusov Exp $
+# $NetBSD: Makefile,v 1.27 2013/10/14 13:02:39 roy Exp $
 
 .include "Makefile.common"
 
-COMMENT+=	(ncurses interface only)
+COMMENT+=	(curses interface only)
 
 CONFLICTS=	aumix-gtk-[0-9]*
 
diff --git a/audio/aumix/Makefile.common b/audio/aumix/Makefile.common
index b5ea75976f4..362cf8844f2 100644
--- a/audio/aumix/Makefile.common
+++ b/audio/aumix/Makefile.common
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile.common,v 1.9 2012/09/11 23:59:25 asau Exp $
+# $NetBSD: Makefile.common,v 1.10 2013/10/14 13:02:39 roy Exp $
 # used by audio/aumix/Makefile
 # used by audio/aumix-gtk/Makefile
 
 DISTNAME=	aumix-2.9.1
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=aumix/} \
 		http://jpj.net/~trevor/aumix/ \
@@ -31,4 +32,4 @@ LIBS.SunOS+=		-lintl
 REPLACE_SH+=		src/mute src/xaumix
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/ncurses/buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
diff --git a/audio/aumix/distinfo b/audio/aumix/distinfo
index a0f2eecc8b2..f969e50bcba 100644
--- a/audio/aumix/distinfo
+++ b/audio/aumix/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.7 2012/07/17 21:26:47 cheusov Exp $
+$NetBSD: distinfo,v 1.8 2013/10/14 13:02:39 roy Exp $
 
 SHA1 (aumix-2.9.1.tar.bz2) = 1b84054cfb74d3513b254d05c2fb08f6a6a3edc7
 RMD160 (aumix-2.9.1.tar.bz2) = a68d2e1da251edad721e997099d8149075f07449
 Size (aumix-2.9.1.tar.bz2) = 231622 bytes
-SHA1 (patch-src_common.h) = 55106984552fb769cca82d847095351e1d8cec4e
+SHA1 (patch-src_Makefile.am) = 88dc267fab364a48fed5ca735371da60ea80a113
+SHA1 (patch-src_Makefile.in) = 1706f0d2d40f43416e941f42ea456daf99579775
+SHA1 (patch-src_common.h) = 0fae29aa3d185d23cd3101d6f56e80547655be89
diff --git a/audio/aumix/patches/patch-src_Makefile.am b/audio/aumix/patches/patch-src_Makefile.am
new file mode 100644
index 00000000000..7e9f5bcf7d2
--- /dev/null
+++ b/audio/aumix/patches/patch-src_Makefile.am
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_Makefile.am,v 1.1 2013/10/14 13:02:39 roy Exp $
+
+Allow local curses.h and system curses.h to work
+
+--- src/Makefile.am.orig	2013-10-14 12:53:38.000000000 +0000
++++ src/Makefile.am
+@@ -1,4 +1,6 @@
+ # $Aumix: aumix/src/Makefile.am,v 1.5 2010/04/26 10:07:27 trevor Exp $
++AUTOMAKE_OPTIONS= nostdinc
++
+ bin_PROGRAMS	= aumix
+ if CURSES
+ bin_SCRIPTS	= mute xaumix
diff --git a/audio/aumix/patches/patch-src_Makefile.in b/audio/aumix/patches/patch-src_Makefile.in
new file mode 100644
index 00000000000..2557d05f7af
--- /dev/null
+++ b/audio/aumix/patches/patch-src_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_Makefile.in,v 1.1 2013/10/14 13:02:39 roy Exp $
+
+Allow local curses.h and system curses.h to work
+
+--- src/Makefile.in.orig	2013-10-14 12:54:32.000000000 +0000
++++ src/Makefile.in
+@@ -59,7 +59,7 @@ aumix_LDADD = $(LDADD)
+ aumix_DEPENDENCIES =
+ binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+ SCRIPTS = $(bin_SCRIPTS)
+-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES =
+ depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \