The code to support real-time scheduling on NetBSD in the package

Makefile did not work; add something which does (it's a far better
check, too).

Bump rev.

5 files changed, 67 insertions, 4 deletions

diff --git a/sysutils/cdrtools/Makefile b/sysutils/cdrtools/Makefile
index 06e99ecce01..948321da19e 100644
--- a/sysutils/cdrtools/Makefile
+++ b/sysutils/cdrtools/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2008/02/05 21:13:01 drochner Exp $
+# $NetBSD: Makefile,v 1.31 2008/02/11 13:05:14 bjs Exp $
 
 DISTNAME=	cdrtools-2.01.01a37
 PKGNAME=	cdrtools-2.01.01.37
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.berlios.de/pub/cdrecord/alpha/
 EXTRACT_SUFX=	.tar.bz2
@@ -122,8 +123,22 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/mkisofs/README* \
 		${DESTDIR}${PREFIX}/share/doc/cdrtools/mkisofs
 
-.if ${OPSYS} == "NetBSD" && exists(/usr/include/sys/pset.h)
-LDFLAGS+=	-lrt
+
+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"
diff --git a/sysutils/cdrtools/distinfo b/sysutils/cdrtools/distinfo
index 3d045306e70..d678cbeab5b 100644
--- a/sysutils/cdrtools/distinfo
+++ b/sysutils/cdrtools/distinfo
@@ -1,9 +1,12 @@
-$NetBSD: distinfo,v 1.12 2008/01/15 22:45:11 wiz Exp $
+$NetBSD: distinfo,v 1.13 2008/02/11 13:05:14 bjs Exp $
 
 SHA1 (cdrtools-2.01.01a37.tar.bz2) = c6bbce4959a12c81a5944d7896959077002851b5
 RMD160 (cdrtools-2.01.01a37.tar.bz2) = d8d7b5e411dbaf371c67179443c1ba6517110ab6
 Size (cdrtools-2.01.01a37.tar.bz2) = 1667934 bytes
+SHA1 (patch-aa) = d0c9ad53f4bd45fc4fd9680436ffceaf9f10f92f
+SHA1 (patch-ab) = 04a52760204f266ab42ec3eb19fc1e4c82546617
 SHA1 (patch-ac) = cde9bd57eef040d27734f6c86c55ac6153025d4f
+SHA1 (patch-ad) = ef1413689b9d6f0f47f80840f20af3edd34159dd
 SHA1 (patch-ah) = fb6abfd0a2e92370f1fc8c00426852fb5f83ae18
 SHA1 (patch-ai) = 5d46fd425fdac880ea8037f8a2f18094d6765336
 SHA1 (patch-aj) = 28bc6a616647a895b6f42566080faf5c1173d698
diff --git a/sysutils/cdrtools/patches/patch-aa b/sysutils/cdrtools/patches/patch-aa
new file mode 100644
index 00000000000..ab3767dd869
--- /dev/null
+++ b/sysutils/cdrtools/patches/patch-aa
@@ -0,0 +1,19 @@
+--- conf/configure.orig	2008-02-11 07:56:04.000000000 -0500
++++ conf/configure	2008-02-11 07:56:33.000000000 -0500
+@@ -14378,7 +14378,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:14382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:14382: \"$ac_link\") 1>&5; (eval "$ac_link $librt") 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -14392,6 +14392,7 @@
+ 
+ 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
new file mode 100644
index 00000000000..27fd0e7ad0b
--- /dev/null
+++ b/sysutils/cdrtools/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.3 2008/02/11 13:05:14 bjs Exp $
+
+--- cdda2wav/Makefile.orig	2007-06-15 11:43:04.000000000 -0400
++++ cdda2wav/Makefile
+@@ -24,7 +24,7 @@ HFILES=		cdda2wav.h interface.h semshm.h
+ 		sndconfig.h scsi_cmds.h lowlevel.h byteorder.h mycdrom.h \
+ 		base64.h sha.h mmsystem.h cd_text.c cd_extra.c \
+ 		defaults.h version.h
+-LIBS=		-lrscg -lscg $(LIB_VOLMGT) -lparanoia -ldeflt -lschily $(SCSILIB) $(EXTRALIB) $(LIB_SOCKET)
++LIBS=		-lrscg -lscg $(LIB_VOLMGT) -lparanoia -ldeflt -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
new file mode 100644
index 00000000000..c12f2886862
--- /dev/null
+++ b/sysutils/cdrtools/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.3 2008/02/11 13:05:14 bjs Exp $
+
+--- cdrecord/Makefile.orig	2008-01-02 16:38:49.000000000 -0500
++++ cdrecord/Makefile
+@@ -42,7 +42,7 @@ HFILES=		cdrecord.h iso9660.h auheader.h
+ 		../include/scg/scgio.h ../include/scg/scsidefs.h \
+ 		../include/scg/scsireg.h ../include/scg/scsitransp.h
+ #LIBS=		-lschily $(LIB_SOCKET)
+-LIBS=		-lrscg -lscg $(LIB_VOLMGT) -ledc_ecc -ldeflt -lschily $(SCSILIB) $(LIB_SOCKET)
++LIBS=		-lrscg -lscg $(LIB_VOLMGT) -ledc_ecc -ldeflt -lschily $(SCSILIB) $(LIB_SOCKET) $(LIB_RT)
+ XMK_FILE=	Makefile.man Makefile.dfl Makefile.doc
+ 
+