diff options
| -rw-r--r-- | audio/emixer/Makefile | 8 | ||||
| -rw-r--r-- | audio/emixer/distinfo | 4 | ||||
| -rw-r--r-- | audio/emixer/files/Makefile | 12 | ||||
| -rw-r--r-- | audio/emixer/patches/patch-ab | 13 |
4 files changed, 12 insertions, 25 deletions
diff --git a/audio/emixer/Makefile b/audio/emixer/Makefile index f6ecbea7c29..8df7559f747 100644 --- a/audio/emixer/Makefile +++ b/audio/emixer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/02/16 13:30:35 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2001/06/19 15:57:39 jlam Exp $ # DISTNAME= emixer-0.05.5 @@ -12,11 +12,11 @@ COMMENT= mpg123-frontend that can mix two mp3 streams, and fade between them DEPENDS+= mpg123-0.59*:../../audio/mpg123 -USE_CURSES= YES -REPLACE_NCURSES=${WRKSRC}/nctgui.h -MAKE_ENV+= NEED_NCURSES="${NEED_NCURSES}" +#USE_CURSES= YES +USE_BUILDLINK_ONLY= YES post-extract: ${CP} ${FILESDIR}/Makefile ${WRKSRC} +.include "../../devel/ncurses/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/emixer/distinfo b/audio/emixer/distinfo index eb70ca781e0..b785bccb3d5 100644 --- a/audio/emixer/distinfo +++ b/audio/emixer/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.2 2001/04/18 13:04:20 agc Exp $ +$NetBSD: distinfo,v 1.3 2001/06/19 15:57:39 jlam Exp $ SHA1 (emixer-0.05.5.tar.gz) = acae7acf3cd11633d1f800047287d9f52e8e7d02 Size (emixer-0.05.5.tar.gz) = 19609 bytes SHA1 (patch-aa) = f6039822d61548ba93ec9db9b31380f14c36cdd8 -SHA1 (patch-ab) = aa861305a5ddc9734e6ffb7a6638f86155d1a766 +SHA1 (patch-ab) = a782737118c0ba6ae704a1839d93047a6f7e568e SHA1 (patch-ac) = 453d5510e1a0c342b7a69fe3033c4677f9f77db5 SHA1 (patch-ad) = 7f4dcc7574c418c411efa8910961e5e6cf0b5fcb SHA1 (patch-ae) = 237b10820c528aa4fbcdef31331cd1b4d1098968 diff --git a/audio/emixer/files/Makefile b/audio/emixer/files/Makefile index 9c78873dc3e..818aebd5a5f 100644 --- a/audio/emixer/files/Makefile +++ b/audio/emixer/files/Makefile @@ -1,16 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2001/01/07 03:10:50 wiz Exp $ - -.if defined(NEED_NCURSES) && ${NEED_NCURSES} == "YES" -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lm -CURSESLIBS= -lncurses -.else -CURSESLIBS= -lcurses -.endif +# $NetBSD: Makefile,v 1.5 2001/06/19 15:57:39 jlam Exp $ all: emixer emixer: main.o - ${CC} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} ${CURSESLIBS} -lossaudio + ${CC} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} -lncurses -lossaudio install: ${BSD_INSTALL_PROGRAM} emixer ${PREFIX}/bin/emixer diff --git a/audio/emixer/patches/patch-ab b/audio/emixer/patches/patch-ab index 2aa43ee9e67..1927222eba5 100644 --- a/audio/emixer/patches/patch-ab +++ b/audio/emixer/patches/patch-ab @@ -1,17 +1,12 @@ -$NetBSD: patch-ab,v 1.2 2000/04/16 02:57:22 mycroft Exp $ +$NetBSD: patch-ab,v 1.3 2001/06/19 15:57:39 jlam Exp $ ---- nctgui.h.orig Sun Dec 5 21:40:20 1999 -+++ nctgui.h Sat Apr 15 22:16:51 2000 -@@ -8,8 +8,11 @@ - */ +--- nctgui.h.orig Mon Dec 27 19:47:02 1999 ++++ nctgui.h +@@ -9,7 +9,6 @@ /* include files used by gui.c and main.c */ -+#ifdef __NetBSD__ -+#include <ncurses.h> -+#else #include <ncurses.h> -#include <slang/slang.h> -+#endif #include <string.h> /* defines used by gui.c and main.c */ |