Obey CFLAGS

9 files changed, 107 insertions, 113 deletions

diff --git a/graphics/libflash/distinfo b/graphics/libflash/distinfo
index a39a0b2bc5e..08590f77ae7 100644
--- a/graphics/libflash/distinfo
+++ b/graphics/libflash/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.8 2001/12/03 04:44:57 mycroft Exp $
+$NetBSD: distinfo,v 1.9 2002/01/03 11:10:35 abs Exp $
 
 SHA1 (flash-0.4.10.tgz) = 41f2b8bba3e551e611913069e6e650bc4c8ab420
 Size (flash-0.4.10.tgz) = 358995 bytes
-SHA1 (patch-aa) = 084064cfd3d4e650f98b93dd07404a1c52828848
-SHA1 (patch-ab) = e67474d893793b58cdf544722046d91e6cb2044b
-SHA1 (patch-ac) = dc2d407b7863005359ec8b07836732fa386414d3
-SHA1 (patch-ad) = 177bb07d1377c1923f8548cdece23292c2b897b8
-SHA1 (patch-ae) = 301e3359b28320822373c54a2c97e6ef528e55c7
-SHA1 (patch-af) = 918bfd3f9f021dded65f8379bec3b42deb30cf65
-SHA1 (patch-ag) = 74b9b37cd22be89dbbfba30ec37bb3b0caf3ead7
-SHA1 (patch-ah) = db5231bad2e041a1ea9628fdddfe187e6fe22ac8
+SHA1 (patch-aa) = e23ae7d4d32fc87061657a2293eeb1e33292b777
+SHA1 (patch-ab) = 5f3d335da5f2f6ef59c597b30c6f363bc97a4e98
+SHA1 (patch-ac) = 958037fe0ba76975ceceb23d390e34563585ca14
+SHA1 (patch-ad) = 0be721c008bd4caca667ee5366d7678a2f9dab5f
+SHA1 (patch-ae) = b4bccafc46500529d1f04ad9cbbef462e1a7cde9
+SHA1 (patch-af) = 67e6c0cb053bbe8dcf36bf24efe80cc720896d76
+SHA1 (patch-ag) = f23cbd2eb2308d9afe625da23bb5f1f5a6177c2b
+SHA1 (patch-ah) = f9e0ec51cff1701510c740874bce45c5df0ae67c
diff --git a/graphics/libflash/patches/patch-aa b/graphics/libflash/patches/patch-aa
index 919db7c9dfb..1d7cbbac25c 100644
--- a/graphics/libflash/patches/patch-aa
+++ b/graphics/libflash/patches/patch-aa
@@ -1,10 +1,16 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/08/28 17:33:50 rh Exp $
+$NetBSD: patch-aa,v 1.2 2002/01/03 11:10:35 abs Exp $
 
---- Makefile.orig	Fri Aug 25 16:58:32 2000
-+++ Makefile
-@@ -1,4 +1,4 @@
--SUBDIRS= Jpeg Zlib Lib Player Plugin Kflash
-+SUBDIRS?= Lib Player Plugin # Kflash
+--- Kflash/kflash.cc.orig	Mon Jun 12 08:46:38 2000
++++ Kflash/kflash.cc
+@@ -443,7 +443,11 @@
+ 	FlashSettings(flashHandle, PLAYER_LOOP);
+ 
+ 	if (enableSound) {
++#ifdef __NetBSD__
++		FlashSoundInit(flashHandle, "/dev/sound");
++#else
+ 		FlashSoundInit(flashHandle, "/dev/dsp");
++#endif
+ 	}
+ }
  
- all:
- 	for subdir in $(SUBDIRS); do (cd $$subdir; $(MAKE)); done
diff --git a/graphics/libflash/patches/patch-ab b/graphics/libflash/patches/patch-ab
index 46467d71e6b..437b570debc 100644
--- a/graphics/libflash/patches/patch-ab
+++ b/graphics/libflash/patches/patch-ab
@@ -1,13 +1,16 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/08/28 17:33:50 rh Exp $
+$NetBSD: patch-ab,v 1.2 2002/01/03 11:10:36 abs Exp $
 
---- Lib/Makefile.orig	Sun Jun  4 11:49:23 2000
+--- Lib/Makefile.orig	Sun Jun  4 10:49:23 2000
 +++ Lib/Makefile
-@@ -1,4 +1,4 @@
+@@ -1,6 +1,6 @@
 -CPPFLAGS=-I../Jpeg -I../Zlib
 +CPPFLAGS=-I${LOCALBASE}/include
  # Comment out the following line if you use egcs :
- CXXFLAGS=-O3 -Wall -fno-rtti -fno-exceptions
+-CXXFLAGS=-O3 -Wall -fno-rtti -fno-exceptions
++CXXFLAGS=-O3 -Wall -fno-rtti -fno-exceptions ${CFLAGS}
  
+ INCLUDES= adpcm.h        cxform.h       graphic.h      script.h       sqrt.h\
+ 	bitmap.h       displaylist.h  matrix.h       shape.h        swf.h\
 @@ -34,10 +34,20 @@
  #	bitstream.o
  #	dump.o
diff --git a/graphics/libflash/patches/patch-ac b/graphics/libflash/patches/patch-ac
index df6c6ed117f..0a9dca609b4 100644
--- a/graphics/libflash/patches/patch-ac
+++ b/graphics/libflash/patches/patch-ac
@@ -1,9 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2001/12/03 04:26:45 mycroft Exp $
+$NetBSD: patch-ac,v 1.4 2002/01/03 11:10:36 abs Exp $
 
---- Lib/sound.cc.orig	Wed Sep  1 15:10:03 1999
-+++ Lib/sound.cc	Mon Dec  3 04:12:21 2001
-@@ -26,7 +26,11 @@
- #include <fcntl.h>
+--- Lib/sound.cc.orig	Wed Sep  1 16:10:03 1999
++++ Lib/sound.cc
+@@ -27,6 +27,10 @@
  #include <sys/ioctl.h>
  #ifndef NOSOUND
 +#ifdef __NetBSD__
@@ -14,8 +13,7 @@ $NetBSD: patch-ac,v 1.3 2001/12/03 04:26:45 mycroft Exp $
 +#endif
  
  #ifdef RCSID
-@@ -56,16 +60,16 @@
- Sound::setSoundFlags(long f) {
+@@ -57,14 +61,14 @@
  	switch (GET_SOUND_RATE_CODE(f)) {
  		case 0:
 -			soundRate = 5500;
@@ -34,31 +32,24 @@ $NetBSD: patch-ac,v 1.3 2001/12/03 04:26:45 mycroft Exp $
 +			soundRate = 44100;
  			break;
  	}
- 	if (f & soundIs16bit) {
-@@ -162,7 +166,7 @@
- 	}
+@@ -163,5 +167,5 @@
  
  	// Reset device
 -	status = ioctl(dsp, SNDCTL_DSP_RESET);
 +	status = ioctl(dsp, SNDCTL_DSP_RESET, NULL);
  	if (status < 0) perror("ioctl SNDCTL_DSP_RESET");
  
- 	// Set sample size
-@@ -187,7 +191,7 @@
- 	}
+@@ -188,5 +192,5 @@
  
  	// Set sound rate in Hertz
 -	soundRate = 11000;
 +	soundRate = 11025;
  	status = ioctl(dsp, SNDCTL_DSP_SPEED, &soundRate);
  	if (status < 0) perror("ioctl SNDCTL_DSP_SPEED");
- 
-@@ -324,7 +328,7 @@
- 	if (nbBytes) {
+@@ -325,5 +329,5 @@
  		// At last ! Play It !
  		write(dsp,buffer,nbBytes);
 -		status = ioctl(dsp, SNDCTL_DSP_POST);
 +		status = ioctl(dsp, SNDCTL_DSP_POST, NULL);
  	}
  
- 	return nbBytes;
diff --git a/graphics/libflash/patches/patch-ad b/graphics/libflash/patches/patch-ad
index 1a1c96218d4..168cef807b4 100644
--- a/graphics/libflash/patches/patch-ad
+++ b/graphics/libflash/patches/patch-ad
@@ -1,17 +1,10 @@
-$NetBSD: patch-ad,v 1.1.1.1 2000/08/28 17:33:50 rh Exp $
+$NetBSD: patch-ad,v 1.2 2002/01/03 11:10:36 abs Exp $
 
---- Player/Makefile.orig	Wed Jun  7 20:19:50 2000
-+++ Player/Makefile
-@@ -1,7 +1,9 @@
--FLASH=../Lib
--CPPFLAGS=-I$(FLASH)
-+FLASH=${LOCALBASE}/lib
-+CPPFLAGS=-I${LOCALBASE}/include/flash -I${LOCALBASE}include -I${X11BASE}/include
- CFLAGS=-O3
--LIBS = $(FLASH)/libflash.a ../Zlib/libz.a ../Jpeg/libjpeg.a -L/usr/X11R6/lib -lX11 -lXext -lm
-+LIBS = -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lflash\
-+	-ljpeg -lz -lossaudio -Wl,-R${X11BASE}/lib -L${X11BASE}/lib \
-+	-lX11 -lXext -lm
- CC=gcc
- LDFLAGS=
+--- Makefile.orig	Mon Jun 12 09:19:14 2000
++++ Makefile
+@@ -1,4 +1,4 @@
+-SUBDIRS= Jpeg Zlib Lib Player Plugin Kflash
++SUBDIRS?= Lib Player Plugin # Kflash
  
+ all:
+ 	for subdir in $(SUBDIRS); do (cd $$subdir; $(MAKE)); done
diff --git a/graphics/libflash/patches/patch-ae b/graphics/libflash/patches/patch-ae
index a9e7ca9d3cb..04ccf5daff4 100644
--- a/graphics/libflash/patches/patch-ae
+++ b/graphics/libflash/patches/patch-ae
@@ -1,39 +1,17 @@
-$NetBSD: patch-ae,v 1.3 2001/12/02 21:25:31 mycroft Exp $
+$NetBSD: patch-ae,v 1.4 2002/01/03 11:10:36 abs Exp $
 
---- Plugin/Makefile.orig	Tue Sep 28 12:13:38 1999
-+++ Plugin/Makefile	Sun Dec  2 20:33:25 2001
-@@ -21,7 +21,7 @@
- 
- PLUGIN_DEFINES= -DXP_UNIX
- OPTIMIZER=
+--- Player/Makefile.orig	Wed Jun  7 19:19:50 2000
++++ Player/Makefile
+@@ -1,7 +1,9 @@
 -FLASH=../Lib
-+FLASH=${LOCALBASE}/include/flash
- 
- # Solaris
- #LIBCXX=/usr/lib/libC.so
-@@ -31,12 +31,12 @@
- # Solaris (Sun compiler/linker)
- #SHARED=-G
- # FreeBSD
--#SHARED=-Bshareable
-+SHARED=-Bshareable
- # Linux
--SHARED=-shared
-+#SHARED=-shared
- 
--CFLAGS=  $(OPTIMIZER) $(PLUGIN_DEFINES) -I$(FLASH) -I/usr/X11R6/include
--LDFLAGS= $(FLASH)/libflash.a $(LIBCXX) ../Jpeg/libjpeg.a ../Zlib/libz.a
-+CFLAGS=  $(OPTIMIZER) -fPIC $(PLUGIN_DEFINES) -I$(FLASH) -I${X11BASE}/include
-+LDFLAGS= -lflash $(LIBCXX) -L${LOCALBASE}/lib -R${LOCALBASE}/lib -L${X11BASE}/lib -R${X11BASE}/lib -lXt -lX11 -ljpeg -lz -lossaudio
- 
- SRC= plugin.c npunix.c
- OBJ= plugin.o npunix.o
-@@ -48,7 +48,7 @@
- $(SHAREDTARGET): $(OBJ) $(FLASH)/libflash.a
- 	$(LD) $(SHARED) -o $(SHAREDTARGET) $(OBJ) $(LDFLAGS)
- 
--plugin.o: $(FLASH)/flash.h
-+plugin.o: ${LOCALBASE}/include/flash/flash.h
+-CPPFLAGS=-I$(FLASH)
++FLASH=${LOCALBASE}/lib
++CPPFLAGS=-I${LOCALBASE}/include/flash -I${LOCALBASE}include -I${X11BASE}/include
+ CFLAGS=-O3
+-LIBS = $(FLASH)/libflash.a ../Zlib/libz.a ../Jpeg/libjpeg.a -L/usr/X11R6/lib -lX11 -lXext -lm
++LIBS = -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lflash\
++	-ljpeg -lz -lossaudio -Wl,-R${X11BASE}/lib -L${X11BASE}/lib \
++	-lX11 -lXext -lm
+ CC=gcc
+ LDFLAGS=
  
- clean:
- 	$(RM) $(OBJ) $(SHAREDTARGET)
diff --git a/graphics/libflash/patches/patch-af b/graphics/libflash/patches/patch-af
index 5696ac85e57..7fbea66a6e7 100644
--- a/graphics/libflash/patches/patch-af
+++ b/graphics/libflash/patches/patch-af
@@ -1,16 +1,16 @@
-$NetBSD: patch-af,v 1.1.1.1 2000/08/28 17:33:50 rh Exp $
+$NetBSD: patch-af,v 1.2 2002/01/03 11:10:36 abs Exp $
 
---- Kflash/kflash.cc.orig	Sat Aug 26 05:46:33 2000
-+++ Kflash/kflash.cc	Sat Aug 26 05:47:50 2000
-@@ -443,7 +443,11 @@
- 	FlashSettings(flashHandle, PLAYER_LOOP);
+--- Player/main.c.orig	Thu Jun  8 07:56:11 2000
++++ Player/main.c
+@@ -559,7 +559,11 @@
+ 
+         FlashGraphicInitX11(flashHandle, dpy, movie, onRoot);
  
- 	if (enableSound) {
 +#ifdef __NetBSD__
-+		FlashSoundInit(flashHandle, "/dev/sound");
++	FlashSoundInit(flashHandle, "/dev/sound");
 +#else
- 		FlashSoundInit(flashHandle, "/dev/dsp");
+ 	FlashSoundInit(flashHandle, "/dev/dsp");
 +#endif
- 	}
- }
+ 
+ 	FlashSetGetUrlMethod(flashHandle, showUrl, 0);
  
diff --git a/graphics/libflash/patches/patch-ag b/graphics/libflash/patches/patch-ag
index b6f5ab6c769..4cd8f56bf0f 100644
--- a/graphics/libflash/patches/patch-ag
+++ b/graphics/libflash/patches/patch-ag
@@ -1,16 +1,39 @@
-$NetBSD: patch-ag,v 1.1.1.1 2000/08/28 17:33:50 rh Exp $
+$NetBSD: patch-ag,v 1.2 2002/01/03 11:10:36 abs Exp $
 
---- Player/main.c.orig	Thu Jun  8 08:56:11 2000
-+++ Player/main.c
-@@ -559,7 +559,11 @@
+--- Plugin/Makefile.orig	Tue Sep 28 13:13:38 1999
++++ Plugin/Makefile
+@@ -21,7 +21,7 @@
  
-         FlashGraphicInitX11(flashHandle, dpy, movie, onRoot);
+ PLUGIN_DEFINES= -DXP_UNIX
+ OPTIMIZER=
+-FLASH=../Lib
++FLASH=${LOCALBASE}/include/flash
  
-+#ifdef __NetBSD__
-+	FlashSoundInit(flashHandle, "/dev/sound");
-+#else
- 	FlashSoundInit(flashHandle, "/dev/dsp");
-+#endif
+ # Solaris
+ #LIBCXX=/usr/lib/libC.so
+@@ -31,12 +31,12 @@
+ # Solaris (Sun compiler/linker)
+ #SHARED=-G
+ # FreeBSD
+-#SHARED=-Bshareable
++SHARED=-Bshareable
+ # Linux
+-SHARED=-shared
++#SHARED=-shared
  
- 	FlashSetGetUrlMethod(flashHandle, showUrl, 0);
+-CFLAGS=  $(OPTIMIZER) $(PLUGIN_DEFINES) -I$(FLASH) -I/usr/X11R6/include
+-LDFLAGS= $(FLASH)/libflash.a $(LIBCXX) ../Jpeg/libjpeg.a ../Zlib/libz.a
++CFLAGS=  $(OPTIMIZER) -fPIC $(PLUGIN_DEFINES) -I$(FLASH) -I${X11BASE}/include
++LDFLAGS= -lflash $(LIBCXX) -L${LOCALBASE}/lib -R${LOCALBASE}/lib -L${X11BASE}/lib -R${X11BASE}/lib -lXt -lX11 -ljpeg -lz -lossaudio
  
+ SRC= plugin.c npunix.c
+ OBJ= plugin.o npunix.o
+@@ -48,7 +48,7 @@
+ $(SHAREDTARGET): $(OBJ) $(FLASH)/libflash.a
+ 	$(LD) $(SHARED) -o $(SHAREDTARGET) $(OBJ) $(LDFLAGS)
+ 
+-plugin.o: $(FLASH)/flash.h
++plugin.o: ${LOCALBASE}/include/flash/flash.h
+ 
+ clean:
+ 	$(RM) $(OBJ) $(SHAREDTARGET)
diff --git a/graphics/libflash/patches/patch-ah b/graphics/libflash/patches/patch-ah
index c387ce9d4e2..c5bd1cb53b1 100644
--- a/graphics/libflash/patches/patch-ah
+++ b/graphics/libflash/patches/patch-ah
@@ -1,7 +1,7 @@
-$NetBSD: patch-ah,v 1.2 2001/12/03 04:44:58 mycroft Exp $
+$NetBSD: patch-ah,v 1.3 2002/01/03 11:10:36 abs Exp $
 
---- Plugin/plugin.c.orig	Mon Jun 12 08:24:09 2000
-+++ Plugin/plugin.c	Mon Dec  3 04:43:37 2001
+--- Plugin/plugin.c.orig	Mon Jun 12 09:24:09 2000
++++ Plugin/plugin.c
 @@ -162,7 +162,11 @@
  
  		FlashSetCursorOnOffMethod(This->fh, cursorOnOff, (void*)instance);