diff options
author | roy <roy@pkgsrc.org> | 2013-10-14 13:20:06 +0000 |
---|---|---|
committer | roy <roy@pkgsrc.org> | 2013-10-14 13:20:06 +0000 |
commit | a339716a396dbced52708ea37346d0c00491229c (patch) | |
tree | b9a1e2c5c9d4f3a4cd4a09db3b94fe2473bef934 /audio/cmp3 | |
parent | cd011227a86b36081231cb8d9598b8054591b5e7 (diff) | |
download | pkgsrc-a339716a396dbced52708ea37346d0c00491229c.tar.gz |
aumix can work with any curses.
Diffstat (limited to 'audio/cmp3')
-rw-r--r-- | audio/cmp3/Makefile | 6 | ||||
-rw-r--r-- | audio/cmp3/distinfo | 6 | ||||
-rw-r--r-- | audio/cmp3/patches/patch-aa | 4 | ||||
-rw-r--r-- | audio/cmp3/patches/patch-ab | 26 |
4 files changed, 21 insertions, 21 deletions
diff --git a/audio/cmp3/Makefile b/audio/cmp3/Makefile index b5a5a03b0a2..ce500a3dce0 100644 --- a/audio/cmp3/Makefile +++ b/audio/cmp3/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.27 2012/09/11 23:59:28 asau Exp $ +# $NetBSD: Makefile,v 1.28 2013/10/14 13:20:06 roy Exp $ # DISTNAME= cmp3-2.0pre6 PKGNAME= cmp3-2.0.p6 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cmp3/} @@ -30,5 +30,5 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/cmp3rc \ ${DESTDIR}${PREFIX}/share/doc/cmp3/sample.cmp3rc -.include "../../devel/ncurses/buildlink3.mk" +.include "../../mk/curses.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/cmp3/distinfo b/audio/cmp3/distinfo index 80e0caf8240..bdfe164a4c9 100644 --- a/audio/cmp3/distinfo +++ b/audio/cmp3/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.10 2012/01/11 14:57:25 hans Exp $ +$NetBSD: distinfo,v 1.11 2013/10/14 13:20:06 roy Exp $ SHA1 (cmp3-2.0pre6.tar.gz) = 5c1454117be282cf673de7a701f8d08f6224d2f8 RMD160 (cmp3-2.0pre6.tar.gz) = c7d5f774c05734e8fca8ec8d536b2843cb99ad80 Size (cmp3-2.0pre6.tar.gz) = 183749 bytes -SHA1 (patch-aa) = 548d88ed8c8132f2362984ef4ed76ef4a36209ef -SHA1 (patch-ab) = 9852698d12be03c971e2ad1da0ffa018c5de771d +SHA1 (patch-aa) = e31bc4ba77b769ae3a45c21d90b87b46322233cc +SHA1 (patch-ab) = e9875ca0ef595f55170f288bcf1df34d79930cec SHA1 (patch-ac) = 03a9b0660a6167dd2b8ef3c58f16ec0c95a9921a SHA1 (patch-ad) = a50d87140e557eb3bef1a5d68ad3e18bba73e03e SHA1 (patch-ae) = 4ddb74587d34dc2698c2a49ca7c476b5b90540d9 diff --git a/audio/cmp3/patches/patch-aa b/audio/cmp3/patches/patch-aa index 5ee418cc4bb..21a369d6f99 100644 --- a/audio/cmp3/patches/patch-aa +++ b/audio/cmp3/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.4 2011/08/29 13:11:39 joerg Exp $ +$NetBSD: patch-aa,v 1.5 2013/10/14 13:20:06 roy Exp $ --- Makefile.orig 2001-07-29 05:43:49.000000000 +0000 +++ Makefile @@ -50,7 +50,7 @@ $NetBSD: patch-aa,v 1.4 2011/08/29 13:11:39 joerg Exp $ -LIBS= -lform -lncurses -CFLAGS= -g -O -Inevlib -CC= gcc -+LIBS= $(LDFLAGS) -lform -lncurses ++LIBS= $(LDFLAGS) -lform -lcurses +CFLAGS+= -Inevlib +CC?= clang OBJS= cmp3common.o cmp3fileio.o cmp3manager.o cmp3curses.o \ diff --git a/audio/cmp3/patches/patch-ab b/audio/cmp3/patches/patch-ab index 0f11c3cfd69..3bdb78db7cb 100644 --- a/audio/cmp3/patches/patch-ab +++ b/audio/cmp3/patches/patch-ab @@ -1,23 +1,23 @@ -$NetBSD: patch-ab,v 1.5 2012/01/11 14:57:25 hans Exp $ - ---- cmp3.h.orig 2001-07-01 12:38:08.000000000 +0800 -+++ cmp3.h -@@ -1,7 +1,7 @@ +--- cmp3.h.orig 2001-07-01 05:38:08.000000000 +0100 ++++ cmp3.h 2013-10-14 14:11:00.000000000 +0100 +@@ -1,17 +1,10 @@ #ifndef _CMP3_H #define _CMP3_H -#if defined(__FreeBSD__) -+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__sun) - #include <ncurses.h> - #include <termios.h> - #else -@@ -9,9 +9,6 @@ - #endif - - +-#include <ncurses.h> +-#include <termios.h> +-#else ++/* pkgsrc will link ncurses.h to curses.h correctly ++ * as configure doesn't work this out */ + #include <curses.h> +-#endif +- +- -#ifndef NCURSES_VERSION - #error "This program requires ncurses to function" -#endif ++#include <termios.h> #include <signal.h> #include <dirent.h> |