*** empty log message ***

16 files changed, 13 insertions, 556 deletions

diff --git a/audio/bladeenc/patches/patch-aa b/audio/bladeenc/patches/patch-aa
deleted file mode 100644
index 71ecf71951d..00000000000
--- a/audio/bladeenc/patches/patch-aa
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-aa,v 1.3 1999/09/20 09:30:19 agc Exp $
-
---- Makefile.orig	Fri Jul 23 22:50:33 1999
-+++ Makefile	Mon Sep 20 10:23:16 1999
-@@ -4,7 +4,7 @@
- # Modified a number of times by Tord Jansson <tord.jansson@swipnet.se>
- 
- # >>> Compiler options for GCC on i586 <<<
--CFLAGS=-O2 -m486 -malign-jumps=2 -malign-loops=2 -funroll-all-loops
-+CFLAGS=-O2 -funroll-all-loops
- LIBS=-lm
- 
- # >>> Compiler options for GCC on SuperSparc Solaris <<<
-@@ -21,11 +21,18 @@
- 	huffman.o l3bitstream.o l3psy.o loop.o main.o mdct.o reservoir.o \
- 	samplein.o strupr.o subs.o tables.o
- 
-+all: bladeenc
-+
-+install: all
-+	$(BSD_INSTALL_PROGRAM) bladeenc $(PREFIX)/bin
-+	mkdir $(PREFIX)/share/doc/bladeenc
-+	$(BSD_INSTALL_MAN) bladeenc.html $(PREFIX)/share/doc/bladeenc
-+
- bladeenc: $(OBJS)
--	gcc -o $@ $^ $(LIBS)
-+	gcc -g -o $@ ${OBJS} $(LIBS)
- 
- %.o: %.c
--	gcc $(CFLAGS) -c -o $@ $^
-+	gcc $(CFLAGS) -c -o $@ $<
- 
- codec.o: codec.c
--	gcc -O1 -c -o $@ $^
-+	gcc -g -c -o $@ $<
diff --git a/audio/bladeenc/patches/patch-ab b/audio/bladeenc/patches/patch-ab
deleted file mode 100644
index 2348b2e25d8..00000000000
--- a/audio/bladeenc/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 1999/09/13 03:33:34 simonb Exp $
-
---- bladesys.c.orig	Sat Jul 24 07:50:33 1999
-+++ bladesys.c	Mon Sep 13 12:54:54 1999
-@@ -294,7 +294,7 @@
- #ifdef  MSWIN
- 
- static struct   _finddata_t sFind;
--static long             hFind;
-+static int             hFind;
- 
- /*____ findFirstMatch() - MSWIN version ______________________________________*/
- 
diff --git a/audio/bladeenc/patches/patch-ac b/audio/bladeenc/patches/patch-ac
deleted file mode 100644
index 497eec37240..00000000000
--- a/audio/bladeenc/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.1 1999/09/13 03:33:34 simonb Exp $
-
---- codec.c.orig	Sat Jul 24 07:50:33 1999
-+++ codec.c	Mon Sep 13 12:52:18 1999
-@@ -54,7 +54,7 @@
-     double avg_slots_per_frame, frac_SpF, slot_lag;
-     int stereo, error_protection;
- 
-- 		unsigned long samplesPerFrame;
-+ 		unsigned int samplesPerFrame;
- 
- 
- extern int	fInit_L3psycho_anal;
-@@ -227,7 +227,7 @@
- }
- 
- 
--void rebuffer_audio( short buffer[2][1152], short * insamp, unsigned long samples_read, int stereo );
-+void rebuffer_audio( short buffer[2][1152], short * insamp, unsigned int samples_read, int stereo );
- 
- /*____ codecEncodeChunk() _____________________________________________________*/
- 
diff --git a/audio/bladeenc/patches/patch-ad b/audio/bladeenc/patches/patch-ad
deleted file mode 100644
index dcb7ed2c329..00000000000
--- a/audio/bladeenc/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 1999/09/13 03:33:34 simonb Exp $
-
---- common.c.orig	Sat Jul 24 07:50:33 1999
-+++ common.c	Mon Sep 13 12:52:24 1999
-@@ -75,7 +75,7 @@
- *

- *******************************************************************************/

- 

--void  *mem_alloc(unsigned long block, char *item)

-+void  *mem_alloc(unsigned int block, char *item)

- {

- 

-     void    *ptr;

diff --git a/audio/bladeenc/patches/patch-ae b/audio/bladeenc/patches/patch-ae
deleted file mode 100644
index a9b8284b6f2..00000000000
--- a/audio/bladeenc/patches/patch-ae
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ae,v 1.2 1999/09/20 09:30:19 agc Exp $
-
---- common.h.orig	Fri Jul 23 22:50:33 1999
-+++ common.h	Mon Sep 20 10:16:42 1999
-@@ -172,12 +172,17 @@
- extern enum byte_order NativeByteOrder;

- 

- /* "bit_stream.h" Type Definitions */

-+
-+#if defined(__sun__) && defined(__svr4__)
-+typedef unsigned char	u_int8_t;
-+#endif
-+
- 

- typedef struct  bit_stream_struc {

-     FILE        *pt;            /* pointer to bit stream device */

--    unsigned char *buf;         /* bit stream buffer */

-+    u_int8_t *buf;         /* bit stream buffer */

-     int         buf_size;       /* size of buffer (in number of bytes) */

--    long        totbit;         /* bit counter of bit stream */

-+    int        totbit;         /* bit counter of bit stream */

- 

-     int         buf_byte_idx;   /* pointer to top byte in buffer */

-     int         buf_bit_idx;    /* pointer to top bit of top byte in buffer */

-@@ -212,7 +217,7 @@
- /* The following functions are in the file "common.c" */

- 

- extern void 					hdr_to_frps(frame_params *fr_ps); /* interpret data in hdr str to fields in fr_ps */

--extern void  				 *mem_alloc(unsigned long block, char *item);

-+extern void  				 *mem_alloc(unsigned int block, char *item);

- extern void    				mem_free( void **ptr_addr);

- extern void           read_absthr();

- 

diff --git a/audio/bladeenc/patches/patch-af b/audio/bladeenc/patches/patch-af
deleted file mode 100644
index 18e5df6be3c..00000000000
--- a/audio/bladeenc/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 1999/09/13 03:33:35 simonb Exp $
-
---- encode.c.orig	Sat Jul 24 07:50:33 1999
-+++ encode.c	Mon Sep 13 12:52:31 1999
-@@ -25,7 +25,7 @@
- 

- /*____ rebuffer_audio() __________________________________________________*/

- 

--void rebuffer_audio( short buffer[2][1152], short * insamp, unsigned long samples_read, int stereo )

-+void rebuffer_audio( short buffer[2][1152], short * insamp, unsigned int samples_read, int stereo )

- {

-   int j;

- 

diff --git a/audio/bladeenc/patches/patch-ag b/audio/bladeenc/patches/patch-ag
deleted file mode 100644
index 8dc7af3af5f..00000000000
--- a/audio/bladeenc/patches/patch-ag
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ag,v 1.1 1999/09/13 03:33:35 simonb Exp $
-
---- encoder.h.orig	Sat Jul 24 07:50:33 1999
-+++ encoder.h	Mon Sep 13 12:52:54 1999
-@@ -118,9 +118,9 @@
- 
- /* The following functions are in the file "musicin.c" */
- 
--extern void   obtain_parameters(frame_params*, int*, unsigned long*,
-+extern void   obtain_parameters(frame_params*, int*, unsigned int*,
-                            char[MAX_NAME_SIZE], char[MAX_NAME_SIZE]);
--extern void   parse_args(int, char**, frame_params*, int*, unsigned long*,
-+extern void   parse_args(int, char**, frame_params*, int*, unsigned int*,
-                            char[MAX_NAME_SIZE], char[MAX_NAME_SIZE]);
- extern void   print_config(frame_params*, int*,
-                            char[MAX_NAME_SIZE], char[MAX_NAME_SIZE]);
-@@ -129,9 +129,9 @@
- 
- /* The following functions are in the file "encode.c" */
- 
--extern unsigned long    read_samples(FILE*, short[2304], unsigned long,
--                           unsigned long);
--extern unsigned long    get_audio(FILE*, short[2][1152], unsigned long,
-+extern unsigned int    read_samples(FILE*, short[2304], unsigned int,
-+                           unsigned int);
-+extern unsigned int    get_audio(FILE*, short[2][1152], unsigned int,
-                            int, layer* info);
- extern void   read_ana_window(double[HAN_SIZE]);
- extern void   window_subband(short**, double[HAN_SIZE], int);
diff --git a/audio/bladeenc/patches/patch-ah b/audio/bladeenc/patches/patch-ah
deleted file mode 100644
index 9e48e5da382..00000000000
--- a/audio/bladeenc/patches/patch-ah
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ah,v 1.1 1999/09/13 03:33:35 simonb Exp $
-
---- huffman.c.orig	Sat Jul 24 07:50:33 1999
-+++ huffman.c	Mon Sep 13 12:53:06 1999
-@@ -111,9 +111,9 @@
-          return (-4);

-       }

- #ifdef NO_ZERO_CALLOC

--      ht[n].hlen=(unsigned char *) calloc((xl*yl)+1,sizeof(unsigned char));

-+      ht[n].hlen=(u_int8_t *) calloc((xl*yl)+1,sizeof(u_int8_t));

- #else

--      ht[n].hlen=(unsigned char *) calloc(xl*yl,sizeof(unsigned char));

-+      ht[n].hlen=(u_int8_t *) calloc(xl*yl,sizeof(u_int8_t));

- #endif

-       if (ht[n].hlen == NULL) {

-          fprintf(stderr,"unsufficient heap error\n");

-@@ -143,7 +143,7 @@
-                n,i,j);

-           };

-           ht[n].table[i*xl+j] = h;

--          ht[n].hlen[i*xl+j] = (unsigned char) len;

-+          ht[n].hlen[i*xl+j] = (u_int8_t) len;

-           do {

-             strcpy( line, aHuffcode[index++] );

- /*                                      fgets(line,99,fi); */

diff --git a/audio/bladeenc/patches/patch-ai b/audio/bladeenc/patches/patch-ai
deleted file mode 100644
index d11227c667c..00000000000
--- a/audio/bladeenc/patches/patch-ai
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ai,v 1.1 1999/09/13 03:33:35 simonb Exp $
-
---- huffman.h.orig	Sat Jul 24 07:50:33 1999
-+++ huffman.h	Mon Sep 13 12:53:13 1999
-@@ -41,7 +41,7 @@
-  *				removed				      *

-  *********************************************************************/	

-  

--#define HUFFBITS unsigned long int

-+#define HUFFBITS unsigned int

- #define HTN	34

- #define MXOFF	250

-  

-@@ -53,8 +53,8 @@
-   unsigned int linmax;	/*max number to be stored in linbits	*/

-   int ref;		/*a positive value indicates a reference*/

-   HUFFBITS *table;	/*pointer to array[xlen][ylen]		*/

--  unsigned char *hlen;	/*pointer to array[xlen][ylen]		*/

--  unsigned char(*val)[2];/*decoder tree				*/ 

-+  u_int8_t *hlen;	/*pointer to array[xlen][ylen]		*/

-+  u_int8_t(*val)[2];/*decoder tree				*/ 

-   unsigned int treelen;	/*length of decoder tree		*/

- };

- 

diff --git a/audio/bladeenc/patches/patch-aj b/audio/bladeenc/patches/patch-aj
deleted file mode 100644
index 7511ce5a277..00000000000
--- a/audio/bladeenc/patches/patch-aj
+++ /dev/null
@@ -1,80 +0,0 @@
-$NetBSD: patch-aj,v 1.1 1999/09/13 03:33:35 simonb Exp $
-
---- l3bitstream.c.orig	Sat Jul 24 07:50:33 1999
-+++ l3bitstream.c	Mon Sep 13 12:53:24 1999
-@@ -160,8 +160,8 @@
-  /*	BF_FlushBitstream( frameData, frameResults ); */
- }
- 
--static unsigned slen1_tab[16] = { 0, 0, 0, 0, 3, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4 };
--static unsigned slen2_tab[16] = { 0, 1, 2, 3, 0, 1, 2, 3, 1, 2, 3, 1, 2, 3, 2, 3 };
-+static unsigned int slen1_tab[16] = { 0, 0, 0, 0, 3, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4 };
-+static unsigned int slen2_tab[16] = { 0, 1, 2, 3, 0, 1, 2, 3, 1, 2, 3, 1, 2, 3, 2, 3 };
- 
- static void encodeMainData( int l3_enc[2][2][576],
- 														III_side_info_t  *si,
-@@ -185,8 +185,8 @@
- 	  {
- 			BitHolder **pph = &scaleFactorsPH[gr][ch];		
- 			gr_info *gi = &(si->gr[gr].ch[ch].tt);
--			unsigned slen1 = slen1_tab[ gi->scalefac_compress ];
--			unsigned slen2 = slen2_tab[ gi->scalefac_compress ];
-+			unsigned int slen1 = slen1_tab[ gi->scalefac_compress ];
-+			unsigned int slen2 = slen2_tab[ gi->scalefac_compress ];
- 			int *ix = &l3_enc[gr][ch][0];
- 
- 			if ( (gi->window_switching_flag == 1) && (gi->block_type == 2) )
-@@ -349,7 +349,7 @@
-      */
-   int bytesToSend = lengthInBits / 8;
-   int remainingBits = lengthInBits % 8;
--  unsigned wrd;
-+  unsigned int wrd;
-   int i;
- 
-   userFrameDataPH->nrEntries = 0;
-@@ -436,7 +436,7 @@
- 
- 	    for ( sfb = 0; sfb < 13; sfb++ )
- 	    {
--				unsigned tableindex = 100;
-+				unsigned int tableindex = 100;
- 				start = scalefac[ sfb ];
- 				end   = scalefac[ sfb+1 ];
- 
-@@ -464,7 +464,7 @@
- 		else if ( gi->mixed_block_flag && gi->block_type == 2 )
- 	  {  /* Mixed blocks long, short */
- 			int sfb, window, line, start, end;
--			unsigned tableindex;
-+			unsigned int tableindex;
- 			I192_3 *ix_s;
- 			int *scalefac = &sfBandIndex[fr_ps->header->sampling_frequency].s[0];
- 		
-@@ -507,7 +507,7 @@
-     else
-     { /* Long blocks */
- 			int *scalefac = &sfBandIndex[fr_ps->header->sampling_frequency].l[0];
--			unsigned scalefac_index = 100;
-+			unsigned int scalefac_index = 100;
- 		
- 			if ( gi->mixed_block_flag )
- 			{
-@@ -523,7 +523,7 @@
- 			}
- 			for ( i = 0; i < bigvalues; i += 2 )
- 			{
--		    unsigned tableindex = 100;
-+		    unsigned int tableindex = 100;
- 		    /* get table pointer */
- 		    if ( i < region1Start )
- 		    {
-@@ -647,7 +647,7 @@
-   */
- int HuffmanCode( int table_select, int x, int y, unsigned int *code, unsigned int *ext, int *cbits, int *xbits )
- {
--  unsigned signx, signy, linbitsx, linbitsy, linbits, xlen, ylen, idx;
-+  unsigned int signx, signy, linbitsx, linbitsy, linbits, xlen, ylen, idx;
-   struct huffcodetab *h;
- 
-   *cbits = 0;
diff --git a/audio/bladeenc/patches/patch-ak b/audio/bladeenc/patches/patch-ak
deleted file mode 100644
index d7a4e15a80f..00000000000
--- a/audio/bladeenc/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.1 1999/09/13 03:33:36 simonb Exp $
-
---- l3bitstream.h.orig	Sat Jul 24 07:50:33 1999
-+++ l3bitstream.h	Mon Sep 13 12:53:27 1999
-@@ -48,7 +48,7 @@
- 			   char             *ancillary,

- 			   int              anc_bits );

- 

--int HuffmanCode( int table_select, int x, int y, unsigned *code, unsigned int *extword, int *codebits, int *extbits );

-+int HuffmanCode( int table_select, int x, int y, unsigned int *code, unsigned int *extword, int *codebits, int *extbits );

- int	HuffmanCode_tj( int table_select, int x, int y );

- 

- 

diff --git a/audio/bladeenc/patches/patch-al b/audio/bladeenc/patches/patch-al
deleted file mode 100644
index 55129bd900d..00000000000
--- a/audio/bladeenc/patches/patch-al
+++ /dev/null
@@ -1,80 +0,0 @@
-$NetBSD: patch-al,v 1.1 1999/09/13 03:33:36 simonb Exp $
-
---- l3side.h.orig	Sat Jul 24 07:50:33 1999
-+++ l3side.h	Mon Sep 13 12:53:43 1999
-@@ -56,8 +56,8 @@
- typedef	char	C192_3[192][3];

- 

- typedef struct {

--	unsigned cbl_max;

--	unsigned cbs_start;

-+	unsigned int cbl_max;

-+	unsigned int cbs_start;

- } III_cb_info;

- 

- 

-@@ -81,39 +81,39 @@
- 	} III_input3; /* ch */

- 

- typedef struct {

--	unsigned part2_3_length;

--	unsigned big_values;

--	unsigned count1;

-- 	unsigned global_gain;

--	unsigned scalefac_compress;

--	unsigned window_switching_flag;

--	unsigned block_type;

--	unsigned mixed_block_flag;

--	unsigned table_select[3];

-+	unsigned int part2_3_length;

-+	unsigned int big_values;

-+	unsigned int count1;

-+ 	unsigned int global_gain;

-+	unsigned int scalefac_compress;

-+	unsigned int window_switching_flag;

-+	unsigned int block_type;

-+	unsigned int mixed_block_flag;

-+	unsigned int table_select[3];

- int /*	unsigned */ subblock_gain[3];

--	unsigned region0_count;

--	unsigned region1_count;

--	unsigned preflag;

--	unsigned scalefac_scale;

--	unsigned count1table_select;

--

--	unsigned part2_length;

--	unsigned sfb_lmax;

--	unsigned sfb_smax;

--	unsigned address1;

--	unsigned address2;

--	unsigned address3;

-+	unsigned int region0_count;

-+	unsigned int region1_count;

-+	unsigned int preflag;

-+	unsigned int scalefac_scale;

-+	unsigned int count1table_select;

-+

-+	unsigned int part2_length;

-+	unsigned int sfb_lmax;

-+	unsigned int sfb_smax;

-+	unsigned int address1;

-+	unsigned int address2;

-+	unsigned int address3;

- 	double quantizerStepSize;

- 	/* added for LSF */

--	unsigned *sfb_partition_table;

--	unsigned slen[4];

-+	unsigned int *sfb_partition_table;

-+	unsigned int slen[4];

- } gr_info;

- 

- typedef struct {

- 	int main_data_begin; /* unsigned -> int */

--	unsigned private_bits;

-+	unsigned int private_bits;

- 	int resvDrain;

--	unsigned scfsi[2][4];

-+	unsigned int scfsi[2][4];

- 	struct {

- 		struct gr_info_s {

- 			gr_info tt;

diff --git a/audio/bladeenc/patches/patch-am b/audio/bladeenc/patches/patch-am
deleted file mode 100644
index b7141120004..00000000000
--- a/audio/bladeenc/patches/patch-am
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD: patch-am,v 1.1 1999/09/13 03:33:36 simonb Exp $
-
---- loop.c.orig	Sat Jul 24 07:50:33 1999
-+++ loop.c	Mon Sep 13 12:54:58 1999
-@@ -71,7 +71,7 @@
- 

-   [table_number][row_in_table][column of nr_of_sfb]

- */

--static unsigned nr_of_sfb_block[6][3][4] =

-+static unsigned int nr_of_sfb_block[6][3][4] =

- {

-   {

-     {6, 5, 5, 5},

-@@ -445,7 +445,7 @@
-     int xm_scfsi_band_krit = 10;

- 

-     int scfsi_band;

--    unsigned scfsi_set;

-+    unsigned int scfsi_set;

- 

-     int sfb, start, end, i;

-     int condition = 0;

-@@ -1395,8 +1395,8 @@
- 

- struct

- {

--    unsigned region0_count;

--    unsigned region1_count;

-+    unsigned int region0_count;

-+    unsigned int region1_count;

- } subdv_table[ 23 ] =

- {

- {0, 0}, /* 0 bands */

-@@ -1789,8 +1789,8 @@
- 

-     for ( ; sfb < 13; sfb++ )

-     {

--      unsigned tableindex = 100;

--			unsigned idx;

-+      unsigned int tableindex = 100;

-+			unsigned int idx;

- 			struct huffcodetab *h;

- 

-       start = scalefac_band_short[ sfb ];

-@@ -1870,7 +1870,7 @@
- int count_bit_tj( int abs_ix[576], unsigned int start, unsigned int end, unsigned int table )

- {

-     int i, sum;

--		unsigned idx;

-+		unsigned int idx;

- 		struct huffcodetab *h;

- 		int		x, y;

- 

-@@ -1951,7 +1951,7 @@
- double

- 

- aint(double in) {

--	return((long) in);

-+	return((int) in);

- }

- #endif

- 

diff --git a/audio/bladeenc/patches/patch-an b/audio/bladeenc/patches/patch-an
deleted file mode 100644
index 8d9c2508384..00000000000
--- a/audio/bladeenc/patches/patch-an
+++ /dev/null
@@ -1,96 +0,0 @@
-$NetBSD: patch-an,v 1.2 1999/09/20 09:30:19 agc Exp $
-
---- samplein.c.orig	Fri Jul 23 22:50:33 1999
-+++ samplein.c	Mon Sep 20 10:19:51 1999
-@@ -52,11 +52,11 @@
- static int	initAIFF( SplIn * psInfo );
- static uint	readAIFFSamples( SplIn * psInfo, int nSamples, short * wpSamples );
- 
--static int myFseek( FILE * fp, long offset );
-+static int myFseek( FILE * fp, int offset );
- 
- 
--ulong INLINE intlLong( char iLong[4] );
--ulong INLINE mcLong( char mcLong[4] );
-+uint INLINE intlLong( char iLong[4] );
-+uint INLINE mcLong( char mcLong[4] );
- ushort INLINE intlShort( char iShort[2] );
- ushort INLINE mcShort( char mcShort[2] );
- 
-@@ -124,6 +124,10 @@
- 	return	FALSE;
- }
- 
-+#if defined(__sun__) && defined(__svr4__)
-+typedef unsigned char	u_int8_t;
-+#endif
-+
- 
- /*____ readSamples() __________________________________________________________*/
- 
-@@ -185,8 +189,8 @@
- 	if( psInfo->bits == 8 )
- 	{
-  		for( i = readSamples-1 ; i > 0 ; i-- )
--    	wpSamples[i] = ((short)((unsigned char *) wpSamples)[i]) << 8;
-- 		wpSamples[i] = ((short)((unsigned char *) wpSamples)[i]) << 8;
-+    	wpSamples[i] = ((short)((u_int8_t *) wpSamples)[i]) << 8;
-+ 		wpSamples[i] = ((short)((u_int8_t *) wpSamples)[i]) << 8;
- 	}
- 
- 	/* Convert unsigned to signed */
-@@ -256,8 +260,8 @@
- { 
- 	short		wFormatTag;						/* Format category */
-   short		wChannels;						/* Number of channels */
--  long		dwSamplesPerSec;			/* Sampling rate */
--  long		dwAvgBytesPerSec;			/* For buffer estimation */
-+  int		dwSamplesPerSec;			/* Sampling rate */
-+  int		dwAvgBytesPerSec;			/* For buffer estimation */
-   short		wBlockAlign;					/* Data block size */
- 	short		bitsPerSample;				/* Actually a PCM-specific additional byte... */
- } sFmtChunk;
-@@ -366,7 +370,7 @@
- 	struct 
- 	{ 
- 		short           numChannels;
--    unsigned long   numSampleFrames;
-+    unsigned int   numSampleFrames;
-     short           sampleSize;
- /*    char						sampleRate[10]; */
- 
-@@ -509,19 +513,19 @@
- 
- /*____ intlLong() _____________________________________________________________*/
- 
--ulong INLINE intlLong( char iLong[4] )
-+uint INLINE intlLong( char iLong[4] )
- {
--	return	((ulong)((uchar*)iLong)[0]) + (((ulong)((uchar*)iLong)[1]) << 8)
--		    + (((ulong)((uchar*)iLong)[2]) << 16) + (((ulong)((uchar*)iLong)[3]) << 24);
-+	return	((uint)((uchar*)iLong)[0]) + (((uint)((uchar*)iLong)[1]) << 8)
-+		    + (((uint)((uchar*)iLong)[2]) << 16) + (((uint)((uchar*)iLong)[3]) << 24);
- }
- 
- 
- /*____ mcLong() _______________________________________________________________*/
- 
--ulong INLINE mcLong( char mcLong[4] )
-+uint INLINE mcLong( char mcLong[4] )
- {
--	return	((ulong)((uchar*)mcLong)[3]) + (((ulong)((uchar*)mcLong)[2]) << 8 )
--		    + (((ulong)((uchar*)mcLong)[1]) << 16) + (((ulong)((uchar*)mcLong)[0]) << 24);
-+	return	((uint)((uchar*)mcLong)[3]) + (((uint)((uchar*)mcLong)[2]) << 8 )
-+		    + (((uint)((uchar*)mcLong)[1]) << 16) + (((uint)((uchar*)mcLong)[0]) << 24);
- }
- 
- 
-@@ -544,7 +548,7 @@
- 
- /* We can't use the real fseek() since you can't seek in a stream (stdin) */
- 
--int myFseek( FILE * fp, long offset )
-+int myFseek( FILE * fp, int offset )
- {
- 	char	dummy[256];
- 
diff --git a/audio/bladeenc/patches/patch-ao b/audio/bladeenc/patches/patch-ao
deleted file mode 100644
index 82d97076344..00000000000
--- a/audio/bladeenc/patches/patch-ao
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ao,v 1.1 1999/09/13 03:33:36 simonb Exp $
-
---- system.h.orig	Sat Jul 24 07:50:33 1999
-+++ system.h	Mon Sep 13 12:55:43 1999
-@@ -183,12 +183,9 @@
- 
- typedef		unsigned	char 	uchar;
- 
--#ifndef				_SYS_TYPES_H
-+#if !defined(_SYS_TYPES_H) && !defined(_SYS_TYPES_H_)
- typedef         unsigned        short   ushort;
--typedef         unsigned        long    ulong;
- typedef         unsigned        int     uint;
- #endif
--
--
- 
- 
diff --git a/audio/bladeenc/patches/patch-ba b/audio/bladeenc/patches/patch-ba
new file mode 100644
index 00000000000..18fba65ae97
--- /dev/null
+++ b/audio/bladeenc/patches/patch-ba
@@ -0,0 +1,13 @@
+$NetBSD: patch-ba,v 1.1 1999/12/12 00:08:52 mjl Exp $
+
+--- bladeenc/system.h.orig	Sat Dec 11 04:37:30 1999
++++ bladeenc/system.h	Sat Dec 11 04:38:33 1999
+@@ -39,7 +39,7 @@
+ #define			BEOS_PPC				18
+ 
+ #ifndef	SYSTEM
+-#	define		SYSTEM		LINUX_I386		/* Set current system here, select */
++#	define		SYSTEM		NETBSD		/* Set current system here, select */
+ #endif										/* from list above. */
+ 
+