Annotate two patches, and remove three that are not needed on

NetBSD-5.99.16/amd64.

6 files changed, 9 insertions, 46 deletions

diff --git a/sysutils/cdrtools/distinfo b/sysutils/cdrtools/distinfo
index a2f11e953c5..14052f36158 100644
--- a/sysutils/cdrtools/distinfo
+++ b/sysutils/cdrtools/distinfo
@@ -1,12 +1,9 @@
-$NetBSD: distinfo,v 1.38 2009/09/09 13:45:13 wiz Exp $
+$NetBSD: distinfo,v 1.39 2009/09/09 13:57:52 wiz Exp $
 
 SHA1 (cdrtools-2.01.01a64.tar.bz2) = 2e4af9079527bd5683dc778d1400ef68b595fd36
 RMD160 (cdrtools-2.01.01a64.tar.bz2) = d609abe707c41d1a66bec7bb1ff4ae7967e5b355
 Size (cdrtools-2.01.01a64.tar.bz2) = 1836328 bytes
-SHA1 (patch-aa) = 1f3461ae34071c20672025575bbb0abe7b128ef8
-SHA1 (patch-ab) = bc6e2ccd371dcd2ae9c8d7caee89b937c9e36893
 SHA1 (patch-ac) = eedad8bd2a3705c33dd6640ba0556f5dd3927739
-SHA1 (patch-ad) = 08230fc203325916d4604576401da048dc108637
 SHA1 (patch-ai) = a65625831d88a97547c4e0a03075711bee0dc373
-SHA1 (patch-ch) = 65397614fe196709b26a789bdd34ed6776b4ef46
-SHA1 (patch-ci) = ff0d14544b0958f581a37c1b007fae581f871021
+SHA1 (patch-ch) = f64e026c66451df814bf848cf73b513a25cc1311
+SHA1 (patch-ci) = 5c7912aed94253b3ba8208a91c04c34da6345083
diff --git a/sysutils/cdrtools/patches/patch-aa b/sysutils/cdrtools/patches/patch-aa
deleted file mode 100644
index 18707c71bba..00000000000
--- a/sysutils/cdrtools/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2008/08/12 21:07:05 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 1e6f35f0f79..00000000000
--- a/sysutils/cdrtools/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2009/08/15 21:03:25 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 7854f395692..00000000000
--- a/sysutils/cdrtools/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2008/11/05 19:46:44 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
- 
- 
diff --git a/sysutils/cdrtools/patches/patch-ch b/sysutils/cdrtools/patches/patch-ch
index e2deb41053a..4cdc862ad5e 100644
--- a/sysutils/cdrtools/patches/patch-ch
+++ b/sysutils/cdrtools/patches/patch-ch
@@ -1,4 +1,6 @@
-$NetBSD: patch-ch,v 1.3 2007/06/21 18:16:16 wiz Exp $
+$NetBSD: patch-ch,v 1.4 2009/09/09 13:57:52 wiz Exp $
+
+for getrawpartition in patch-ai
 
 --- RULES/i386-netbsd-cc.rul.orig	2007-05-09 12:25:30.000000000 +0000
 +++ RULES/i386-netbsd-cc.rul
diff --git a/sysutils/cdrtools/patches/patch-ci b/sysutils/cdrtools/patches/patch-ci
index a5729135fe1..f62ac409edd 100644
--- a/sysutils/cdrtools/patches/patch-ci
+++ b/sysutils/cdrtools/patches/patch-ci
@@ -1,4 +1,6 @@
-$NetBSD: patch-ci,v 1.3 2007/06/21 18:16:16 wiz Exp $
+$NetBSD: patch-ci,v 1.4 2009/09/09 13:57:52 wiz Exp $
+
+for getrawpartition in patch-ai
 
 --- RULES/i386-netbsd-gcc.rul.orig	2007-05-09 12:25:30.000000000 +0000
 +++ RULES/i386-netbsd-gcc.rul