Remove some now unneeded patches and related code.

5 files changed, 2 insertions, 60 deletions

diff --git a/sysutils/cdrtools/Makefile b/sysutils/cdrtools/Makefile
index af4925cbf26..088a92a0885 100644
--- a/sysutils/cdrtools/Makefile
+++ b/sysutils/cdrtools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2009/10/31 00:55:03 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2009/10/31 00:58:42 wiz Exp $
 
 DISTNAME=	cdrtools-2.01.01a66
 PKGNAME=	${DISTNAME:S/a/alpha/:S/-pre/pre/}
@@ -130,22 +130,5 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/cdrecord/cdrecord.dfl \
 		${DESTDIR}${PREFIX}/share/examples/cdrtools/cdrecord
 
-CONFIGURE_ENV+= librt=${NETBSDLIB.rt:U:Q}
-
-.if ${OPSYS} == "NetBSD"
-netbsd-posix-sched-check-cookie: netbsd-posix-sched-check
-###
-### Check for POSIX priority scheduling in NetBSD
-###
-
-.PHONY: netbsd-posix-sched-check
-netbsd-posix-sched-check:
-NETBSDLIB.rt!=\
-	if ( /sbin/sysctl -n kern.posix_sched >/dev/null 2>&1 ); then \
-	    lib=-lrt; \
-	fi || ${TRUE}; \
-	echo "$$lib"
-.endif
-
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/cdrtools/distinfo b/sysutils/cdrtools/distinfo
index 35fc97a9acf..1c12242f3de 100644
--- a/sysutils/cdrtools/distinfo
+++ b/sysutils/cdrtools/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.42 2009/10/31 00:55:03 wiz Exp $
+$NetBSD: distinfo,v 1.43 2009/10/31 00:58:42 wiz Exp $
 
 SHA1 (cdrtools-2.01.01a66.tar.bz2) = caef4828b7cea14e68a11388d011dc97b70219a7
 RMD160 (cdrtools-2.01.01a66.tar.bz2) = 150461c3bd140ac00afafc5bd2359c571e5deb4f
 Size (cdrtools-2.01.01a66.tar.bz2) = 1842467 bytes
-SHA1 (patch-aa) = 1f3461ae34071c20672025575bbb0abe7b128ef8
-SHA1 (patch-ab) = bc6e2ccd371dcd2ae9c8d7caee89b937c9e36893
-SHA1 (patch-ad) = 08230fc203325916d4604576401da048dc108637
 SHA1 (patch-ae) = 9b58bfb2e394cd5e710d1fa407a887dbdaacd756
diff --git a/sysutils/cdrtools/patches/patch-aa b/sysutils/cdrtools/patches/patch-aa
deleted file mode 100644
index f5c7394ca0e..00000000000
--- a/sysutils/cdrtools/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.9 2009/09/09 20:30:57 wiz Exp $
-
---- autoconf/configure.orig	2008-03-27 18:58:21.000000000 +0000
-+++ autoconf/configure
-@@ -14702,6 +14702,7 @@ fi
- 
- if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
-+    lib_rt="$librt"
-     ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-   cat >> confdefs.h <<EOF
- #define $ac_tr_func 1
diff --git a/sysutils/cdrtools/patches/patch-ab b/sysutils/cdrtools/patches/patch-ab
deleted file mode 100644
index b60c2c26e9f..00000000000
--- a/sysutils/cdrtools/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.8 2009/09/09 20:30:57 wiz Exp $
-
---- cdda2wav/Makefile.orig	2009-08-03 22:26:58.000000000 +0000
-+++ cdda2wav/Makefile
-@@ -38,7 +38,7 @@ HFILES=		cdda2wav.h interface.h semshm.h
- 		base64.h mmsystem.h cd_text.c cd_extra.c \
- 		parse.h version.h
- 
--LIBS=		-lscgcmd -lrscg -lscg $(LIB_VOLMGT) -lparanoia -lcdrdeflt -ldeflt -lmdigest -lschily $(SCSILIB) $(EXTRALIB) $(LIB_SOCKET)
-+LIBS=		-lscgcmd -lrscg -lscg $(LIB_VOLMGT) -lparanoia -lcdrdeflt -ldeflt -lmdigest -lschily $(SCSILIB) $(EXTRALIB) $(LIB_SOCKET) $(LIB_RT)
- XMK_FILE=	Makefile.man Makefile.rd cdda2ogg.mk1
- # cdda2ogg.mk1 fehlt noch für make rel
- 
diff --git a/sysutils/cdrtools/patches/patch-ad b/sysutils/cdrtools/patches/patch-ad
deleted file mode 100644
index db5eebe2a32..00000000000
--- a/sysutils/cdrtools/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.7 2009/09/09 20:30:57 wiz Exp $
-
---- cdrecord/Makefile.orig	2008-10-26 21:43:44.000000000 +0000
-+++ cdrecord/Makefile
-@@ -45,7 +45,7 @@ HFILES=		cdrecord.h iso9660.h auheader.h
- HFILES_TAG=	../include/scg/scgio.h ../include/scg/scsidefs.h \
- 		../include/scg/scsireg.h ../include/scg/scsitransp.h
- #LIBS=		-lschily $(LIB_SOCKET)
--LIBS=		-lscgcmd -lrscg -lscg $(LIB_VOLMGT) -ledc_ecc -lcdrdeflt -ldeflt -lschily $(SCSILIB) $(LIB_SOCKET)
-+LIBS=		-lscgcmd -lrscg -lscg $(LIB_VOLMGT) -ledc_ecc -lcdrdeflt -ldeflt -lschily $(SCSILIB) $(LIB_SOCKET) $(LIB_RT)
- XMK_FILE=	Makefile.man Makefile.dfl Makefile.doc
- 
-