Defuzzify, and while there, update to 1.8a31. Changes:

ALL:
-       libscg now got official version number 0.1 and allows version checking
-       libscg/scsi-aix.c compiles again - typo fixed.
-       libscg/scsi-bsd-os.c compiles again - typo fixed.
-       libscg/scsi-beos.c compiles again - typo fixed.
-       libscg/scsi-osf.c compiles again - typo fixed.
-       libscg/scsi-wnt.c compiles again - typo fixed.
-       libscg/scsiopen.c typecasts to make it compile without
        warnings on K&R systems.
-       usleep() emulation compiles again on SCO Openserver 3.x
-       align_test.c corrected
-       scg/scgcmd.h restructured
-       several macros to convert integers in network byte order to machine
        byte order modified to make them correct on 64 bit machines too.
-       usleep() prototype disabled in libport.h (needed for SCO Openserver)
-       New supported architecture 9000-777-hp-ux
-       Added support for the new smake source distribution.
-       Added new AUTOMAKE support for the makefile system when using smake.
        The makefile system will now support compilation on unknown platforms
        if compilation is done with smake.


cdrecord:
-       prints warning if an unofficial version of libscg is used
-       removed a bug that caused an endless loop if a TEAC-CDR 50 /55
        was present without a media.
        This bug has been introduced when tryint to find a workaround
        for a bug in the Ricoh 7040 firmware.
-       The Optima Dis Covery 650 CD-R is now recognised as Sony-CDU-924
-       typecasts in several files to make it compile without
        warnings on K&R systems.
-       Fixed a bug in the size computation that caused the media to loos 150
        sectors too large if cdrecord was run in DAO mode.
-       New updated macros in intcvt.h make cdrecord more correct on 64 bit
        machines.
-       Next_writable Address disabled for CD-ROM drives.
        This will abort is someone tries to do a cdrecord -msinfo on a CD-ROM
        drive. Before, this resulted in bad values now it results in an
        error message.
-       Sector size should now be restored in any case. Added 5 new cases.


cdda2wav:

 o new ioctl module for Solaris and FreeBSD ioctl methods (ATAPI drives).
   Untested yet.
 o soundcard support unified. Solaris sound interfaces might be used under
   other OS as well. Untested yet.
 o support of the cdindex system (see www.cdindex.org for details).
   For cd extra and cd-text formats the submission form is generated
   automatically.
 o Fixed a bug that caused the last *.inf file not to be written on OS/2

5 files changed, 35 insertions, 53 deletions

diff --git a/sysutils/cdrecord-current/Makefile b/sysutils/cdrecord-current/Makefile
index 285dd131111..d9ef300fe3b 100644
--- a/sysutils/cdrecord-current/Makefile
+++ b/sysutils/cdrecord-current/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 1999/10/07 17:41:58 tron Exp $
+# $NetBSD: Makefile,v 1.4 1999/11/16 00:00:24 hubertf Exp $
 
-DISTNAME=	cdrecord-1.8a28
+DISTNAME=	cdrecord-1.8a31
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/alpha/
 
diff --git a/sysutils/cdrecord-current/files/md5 b/sysutils/cdrecord-current/files/md5
index e3211b7ee0f..bc149d84118 100644
--- a/sysutils/cdrecord-current/files/md5
+++ b/sysutils/cdrecord-current/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1999/09/17 08:18:34 tron Exp $
+$NetBSD: md5,v 1.2 1999/11/16 00:00:26 hubertf Exp $
 
-MD5 (cdrecord-1.8a28.tar.gz) = 2df21b533db6ba3a2283eb2a2c3241b3
+MD5 (cdrecord-1.8a31.tar.gz) = 281c4edf8d9b9e4d2bc639f4df6ebcf5
diff --git a/sysutils/cdrecord-current/files/patch-sum b/sysutils/cdrecord-current/files/patch-sum
index 14a9843e41a..7fbc59acd3f 100644
--- a/sysutils/cdrecord-current/files/patch-sum
+++ b/sysutils/cdrecord-current/files/patch-sum
@@ -1,7 +1,7 @@
-$NetBSD: patch-sum,v 1.1.1.1 1999/09/17 08:18:34 tron Exp $
+$NetBSD: patch-sum,v 1.2 1999/11/16 00:00:26 hubertf Exp $
 
 MD5 (patch-aa) = ce1e36780a6289a44496d355e35da71c
-MD5 (patch-ab) = c9c1df507748e61533ddf34a26aba433
+MD5 (patch-ab) = 3a20ed15fd69037fc67d9d7172125c23
 MD5 (patch-ac) = ddbdfce08207bde25ecfbeee439ee1a8
 MD5 (patch-ad) = ec8aadadf88df2db7e4dfb5dd091498a
-MD5 (patch-ae) = 1c66b1c3c8e77d5ba9c0ac34f6a08b3b
+MD5 (patch-ae) = 3b26826ccceee3a89aea7e49e46a86a1
diff --git a/sysutils/cdrecord-current/patches/patch-ab b/sysutils/cdrecord-current/patches/patch-ab
index c23645e7d1e..643568f76c9 100644
--- a/sysutils/cdrecord-current/patches/patch-ab
+++ b/sysutils/cdrecord-current/patches/patch-ab
@@ -1,38 +1,22 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/09/17 08:18:34 tron Exp $
+$NetBSD: patch-ab,v 1.2 1999/11/16 00:00:27 hubertf Exp $
 
-*** DEFAULTS/Defaults.netbsd.orig	Wed Nov 12 23:52:33 1997
---- DEFAULTS/Defaults.netbsd	Wed Nov 12 23:55:30 1997
-***************
-*** 19,25 ****
-  CWARNOPTS=
-  
-  DEFINCDIRS=	$(SRCROOT)/include
-! LDPATH=		-L/opt/schily/lib
-  #RUNPATH=	-R /opt/schily/lib -R $(OLIBSDIR)	Will probably not work
-  
-  ###########################################################################
---- 19,25 ----
-  CWARNOPTS=
-  
-  DEFINCDIRS=	$(SRCROOT)/include
-! LDPATH=		-L$(SRCROOT)/lib
-  #RUNPATH=	-R /opt/schily/lib -R $(OLIBSDIR)	Will probably not work
-  
-  ###########################################################################
-***************
-*** 27,33 ****
-  # Installation config stuff
-  #
-  ###########################################################################
-! INS_BASE=	/opt/schily
-  INS_KBASE=	/
-  #
-  DEFUMASK=	002
---- 27,33 ----
-  # Installation config stuff
-  #
-  ###########################################################################
-! INS_BASE=	$(PREFIX)
-  INS_KBASE=	/
-  #
-  DEFUMASK=	002
+--- DEFAULTS/Defaults.netbsd.orig	Tue Nov  2 12:41:03 1999
++++ DEFAULTS/Defaults.netbsd	Mon Nov 15 20:29:31 1999
+@@ -19,7 +19,7 @@
+ CWARNOPTS=
+ 
+ DEFINCDIRS=	$(SRCROOT)/include
+-LDPATH=		-L/opt/schily/lib
++LDPATH=		-L$(SRCROOT)/lib
+ #RUNPATH=	-R $(INS_BASE)/lib -R /opt/schily/lib -R $(OLIBSDIR)	Will probably not work
+ 
+ ###########################################################################
+@@ -27,7 +27,7 @@
+ # Installation config stuff
+ #
+ ###########################################################################
+-INS_BASE=	/opt/schily
++INS_BASE=	$(PREFIX)
+ INS_KBASE=	/
+ #
+ DEFUMASK=	002
diff --git a/sysutils/cdrecord-current/patches/patch-ae b/sysutils/cdrecord-current/patches/patch-ae
index aa4b71462cd..36289a307bb 100644
--- a/sysutils/cdrecord-current/patches/patch-ae
+++ b/sysutils/cdrecord-current/patches/patch-ae
@@ -1,7 +1,5 @@
-$NetBSD: patch-ae,v 1.1.1.1 1999/09/17 08:18:34 tron Exp $
-
---- cdda2wav/Makefile.orig	Mon Aug 30 17:07:31 1999
-+++ cdda2wav/Makefile	Fri Sep 17 09:52:39 1999
+--- cdda2wav/Makefile.orig	Tue Nov 16 00:48:52 1999
++++ cdda2wav/Makefile	Tue Nov 16 00:49:23 1999
 @@ -7,7 +7,8 @@
  
  INSDIR=		bin
@@ -12,12 +10,12 @@ $NetBSD: patch-ae,v 1.1.1.1 1999/09/17 08:18:34 tron Exp $
  CFILES=		cdda2wav.c interface.c semshm.c resample.c \
  		toc.c wav.c sun.c raw.c md5c.c setuid.c ringbuff.c \
  		sndconfig.c scsi_cmds.c aiff.c aifc.c \
-@@ -17,7 +19,7 @@
+@@ -17,7 +18,7 @@
  		config.h saveargs.h sndfile.h aiff.h aifc.h \
- 		sndconfig.h scsi_cmds.h lowlevel.h byteorder.h mycdrom.h
- #LIBS=		-lschily $(LIB_SOCKET)
--LIBS=		-lscg -lschily $(SCSILIB)
-+LIBS=		-lscg -lschily $(SCSILIB) -lossaudio
+ 		sndconfig.h scsi_cmds.h lowlevel.h byteorder.h mycdrom.h \
+ 		base64.h sha.h mmsystem.h
+-LIBS=		-lscg -lschily $(SCSILIB) $(EXTRALIB)
++LIBS=		-lscg -lschily $(SCSILIB) $(EXTRALIB) -lossaudio
  XMK_FILE=	Makefile.man
  
  LCONFIG=	local.cnf