Make this package compile on Solaris.

4 files changed, 39 insertions, 18 deletions

diff --git a/audio/bladeenc/Makefile b/audio/bladeenc/Makefile
index 572642f4dfe..765cecda517 100644
--- a/audio/bladeenc/Makefile
+++ b/audio/bladeenc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1999/09/13 10:08:21 tron Exp $
+# $NetBSD: Makefile,v 1.8 1999/09/20 09:30:18 agc Exp $
 #
 
 DISTNAME=		bladeenc-082-src-stable-2
@@ -9,4 +9,6 @@ MASTER_SITES=		http://home.swipnet.se/~w-82625/encoder/source/
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://bladeenc.cjb.net/
 
+USE_GMAKE=		yes
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/bladeenc/patches/patch-aa b/audio/bladeenc/patches/patch-aa
index cd96baa8281..71ecf71951d 100644
--- a/audio/bladeenc/patches/patch-aa
+++ b/audio/bladeenc/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.2 1999/09/13 10:05:58 tron Exp $
+$NetBSD: patch-aa,v 1.3 1999/09/20 09:30:19 agc Exp $
 
---- Makefile.orig	Fri Jul 23 23:50:33 1999
-+++ Makefile	Mon Sep 13 11:58:06 1999
+--- 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>
  
@@ -24,7 +24,7 @@ $NetBSD: patch-aa,v 1.2 1999/09/13 10:05:58 tron Exp $
 +
  bladeenc: $(OBJS)
 -	gcc -o $@ $^ $(LIBS)
-+	gcc -g -o $@ $> $(LIBS)
++	gcc -g -o $@ ${OBJS} $(LIBS)
  
  %.o: %.c
 -	gcc $(CFLAGS) -c -o $@ $^
diff --git a/audio/bladeenc/patches/patch-ae b/audio/bladeenc/patches/patch-ae
index 89d305161b4..a9b8284b6f2 100644
--- a/audio/bladeenc/patches/patch-ae
+++ b/audio/bladeenc/patches/patch-ae
@@ -1,8 +1,16 @@
-$NetBSD: patch-ae,v 1.1 1999/09/13 03:33:35 simonb Exp $
+$NetBSD: patch-ae,v 1.2 1999/09/20 09:30:19 agc Exp $
 
---- common.h.orig	Sat Jul 24 07:50:33 1999
-+++ common.h	Mon Sep 13 12:54:56 1999
-@@ -175,9 +175,9 @@
+--- 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 */

@@ -14,7 +22,7 @@ $NetBSD: patch-ae,v 1.1 1999/09/13 03:33:35 simonb Exp $
  

      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 +212,7 @@
+@@ -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 */

diff --git a/audio/bladeenc/patches/patch-an b/audio/bladeenc/patches/patch-an
index 03d577ba786..8d9c2508384 100644
--- a/audio/bladeenc/patches/patch-an
+++ b/audio/bladeenc/patches/patch-an
@@ -1,7 +1,7 @@
-$NetBSD: patch-an,v 1.1 1999/09/13 03:33:36 simonb Exp $
+$NetBSD: patch-an,v 1.2 1999/09/20 09:30:19 agc Exp $
 
---- samplein.c.orig	Sat Jul 24 07:50:33 1999
-+++ samplein.c	Mon Sep 13 12:55:39 1999
+--- 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 );
@@ -17,7 +17,18 @@ $NetBSD: patch-an,v 1.1 1999/09/13 03:33:36 simonb Exp $
  ushort INLINE intlShort( char iShort[2] );
  ushort INLINE mcShort( char mcShort[2] );
  
-@@ -185,8 +185,8 @@
+@@ -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-- )
@@ -28,7 +39,7 @@ $NetBSD: patch-an,v 1.1 1999/09/13 03:33:36 simonb Exp $
  	}
  
  	/* Convert unsigned to signed */
-@@ -256,8 +256,8 @@
+@@ -256,8 +260,8 @@
  { 
  	short		wFormatTag;						/* Format category */
    short		wChannels;						/* Number of channels */
@@ -39,7 +50,7 @@ $NetBSD: patch-an,v 1.1 1999/09/13 03:33:36 simonb Exp $
    short		wBlockAlign;					/* Data block size */
  	short		bitsPerSample;				/* Actually a PCM-specific additional byte... */
  } sFmtChunk;
-@@ -366,7 +366,7 @@
+@@ -366,7 +370,7 @@
  	struct 
  	{ 
  		short           numChannels;
@@ -48,7 +59,7 @@ $NetBSD: patch-an,v 1.1 1999/09/13 03:33:36 simonb Exp $
      short           sampleSize;
  /*    char						sampleRate[10]; */
  
-@@ -509,19 +509,19 @@
+@@ -509,19 +513,19 @@
  
  /*____ intlLong() _____________________________________________________________*/
  
@@ -74,7 +85,7 @@ $NetBSD: patch-an,v 1.1 1999/09/13 03:33:36 simonb Exp $
  }
  
  
-@@ -544,7 +544,7 @@
+@@ -544,7 +548,7 @@
  
  /* We can't use the real fseek() since you can't seek in a stream (stdin) */