[pkgsrc/trunk]: pkgsrc/net/kiax Remove superfluous patch (was already include...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9423af446b77
branches:  trunk
changeset: 543036:9423af446b77
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Jun 01 15:25:37 2008 +0000

description:
Remove superfluous patch (was already included in upstream).
Fix build on NetBSD-current (with librt).

diffstat:

 net/kiax/Makefile         |  10 ++++++++-
 net/kiax/distinfo         |   3 +-
 net/kiax/patches/patch-aa |  49 -----------------------------------------------
 3 files changed, 10 insertions(+), 52 deletions(-)

diffs (91 lines):

diff -r 64ebbe891887 -r 9423af446b77 net/kiax/Makefile
--- a/net/kiax/Makefile Sun Jun 01 15:15:40 2008 +0000
+++ b/net/kiax/Makefile Sun Jun 01 15:25:37 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/01/11 11:14:11 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2008/06/01 15:25:37 wiz Exp $
 
 DISTNAME=      kiax-0.8.51-src
 PKGNAME=       kiax-0.8.51
@@ -29,6 +29,14 @@
 SUBST_FILES.path=      src/src.pro bin/Makefile
 SUBST_SED.path=                -e 's:/usr/local:${PREFIX}:g'
 
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "NetBSD" && exists(/usr/include/sys/pset.h)
+RT_LIB_SCHED=          -lrt
+.else
+RT_LIB_SCHED=          # empty
+.endif
+LDFLAGS+=              ${RT_LIB_SCHED}
+
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../x11/qt3-tools/buildlink3.mk"
diff -r 64ebbe891887 -r 9423af446b77 net/kiax/distinfo
--- a/net/kiax/distinfo Sun Jun 01 15:15:40 2008 +0000
+++ b/net/kiax/distinfo Sun Jun 01 15:25:37 2008 +0000
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.6 2007/08/05 18:37:01 joerg Exp $
+$NetBSD: distinfo,v 1.7 2008/06/01 15:25:37 wiz Exp $
 
 SHA1 (kiax-0.8.51-src.tar.gz) = 5a67df17d478f4f1f5d802e126e6c38fb0834a6b
 RMD160 (kiax-0.8.51-src.tar.gz) = 8019d742867d0af339210363c42f1c46df422dd2
 Size (kiax-0.8.51-src.tar.gz) = 1493268 bytes
-SHA1 (patch-aa) = eadfd5525e7f1c18de8c9178905ec40dd7bb651f
 SHA1 (patch-ab) = 0c0ef51b9f4b0e26e354b15568359022a5cf7db0
 SHA1 (patch-ac) = f3f98e74209ab6a5a06e387cae494c08ad7e3238
 SHA1 (patch-ad) = 358978a9999d5ab268c65da5bee812d449dc2f92
diff -r 64ebbe891887 -r 9423af446b77 net/kiax/patches/patch-aa
--- a/net/kiax/patches/patch-aa Sun Jun 01 15:15:40 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2006/04/14 09:56:03 adam Exp $
-
---- lib/Makefile.orig  2006-02-05 01:34:34.000000000 +0100
-+++ lib/Makefile
-@@ -183,6 +183,12 @@ OBJS_NETBSD=\
-       portaudio/pa_unix_oss/pa_unix.o 
- 
- 
-+OBJS_NETBSD=\
-+      unixfuncs.o \
-+      portmixer/px_unix_oss/px_unix_oss.o \
-+      portaudio/pa_unix_oss/pa_unix_oss.o \
-+      portaudio/pa_unix_oss/pa_unix.o 
-+
- OBJS_SOLARIS=\
-       unixfuncs.o \
-       portmixer/px_solaris/px_solaris.o \
-@@ -229,6 +235,9 @@ else
- ifneq (,$(findstring NetBSD,$(shell uname)))
- OSTYPE=NETBSD
- else
-+ifneq (,$(findstring NetBSD,$(shell uname)))
-+OSTYPE=NETBSD
-+else
- $(warning OSTYPE cannot be detected, assuming Linux)
- OSTYPE=LINUX
- endif
-@@ -237,6 +246,7 @@ endif
- endif
- endif
- endif
-+endif
- 
- # Setup platform-specific stuff based on gleaning
- ifeq ($(OSTYPE),WIN32)
-@@ -254,6 +264,13 @@ DYNCFLAGS=-fPIC
- DYNLIB=libiaxclient.so
- endif
- 
-+ifeq ($(OSTYPE),NETBSD)
-+OBJS:= $(OBJS) $(OBJS_NETBSD) 
-+DYNCFLAGS=-fPIC
-+DYNLIB=libiaxclient.so
-+DYNLDFLAGS= -lossaudio
-+endif
-+
- ifeq ($(OSTYPE),SOLARIS)
- OBJS:= $(OBJS) $(OBJS_SOLARIS) 
- # only SPARC solaris machines need the alignment stuff