Link libflash with libstdc++ - makes the mozilla flash plugin work when

compiled with gcc3.

4 files changed, 10 insertions, 9 deletions

diff --git a/graphics/libflash/Makefile b/graphics/libflash/Makefile
index 08a9596b1b0..56f2a4edaff 100644
--- a/graphics/libflash/Makefile
+++ b/graphics/libflash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/21 16:51:47 martti Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/01 21:29:09 agc Exp $
 #
 
 .include "Makefile.common"
@@ -11,6 +11,7 @@ USE_BUILDLINK2=	yes
 USE_LIBTOOL=	yes
 BUILD_DIRS=	${WRKSRC}/Lib
 MAKE_ENV+=	LIBOSSAUDIO="${LIBOSSAUDIO}"
+MAKE_ENV+=	LIBSTDCPP=-lstdc++
 
 .include "../../devel/zlib/buildlink2.mk"
 .include "../../graphics/jpeg/buildlink2.mk"
diff --git a/graphics/libflash/distinfo b/graphics/libflash/distinfo
index 2a4b6af6f6f..1dfc8a0205a 100644
--- a/graphics/libflash/distinfo
+++ b/graphics/libflash/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.14 2003/09/28 20:08:14 tron Exp $
+$NetBSD: distinfo,v 1.15 2004/01/01 21:29:09 agc Exp $
 
 SHA1 (flash-0.4.10.tgz) = 41f2b8bba3e551e611913069e6e650bc4c8ab420
 Size (flash-0.4.10.tgz) = 358995 bytes
-SHA1 (patch-ab) = f2d681555e672a9ea39206db468ab1499307a5f6
+SHA1 (patch-ab) = 29afb4393acc2c44e622d398dba05749fb5c581d
 SHA1 (patch-ac) = ce803268d7c85e0317c61dbd63c56028eaba82a8
 SHA1 (patch-ad) = a67db33d60bc5ce23241e5f445aabb9bdb1864c2
 SHA1 (patch-af) = b55169832b1475f41c7e7ecaf1abe1f7d4c93037
 SHA1 (patch-ag) = cc6277a63c4bfa54a35b74a1a66dea5923ae8637
-SHA1 (patch-ah) = 030219457c785e851abfeb7ed5166a00ae6eface
+SHA1 (patch-ah) = ff644dd1c53b54a029adc870f69e128213e50635
 SHA1 (patch-ai) = a4f927b4698e7de7b46f2496b57c83a30a57fecb
 SHA1 (patch-aj) = d37351360b7e703747b4742e0378f89c528bdef7
diff --git a/graphics/libflash/patches/patch-ab b/graphics/libflash/patches/patch-ab
index ae59091c17f..59ed65faefa 100644
--- a/graphics/libflash/patches/patch-ab
+++ b/graphics/libflash/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.4 2003/01/30 12:22:48 jlam Exp $
+$NetBSD: patch-ab,v 1.5 2004/01/01 21:29:09 agc Exp $
 
 --- Lib/Makefile.orig	Sun Jun  4 02:49:23 2000
 +++ Lib/Makefile
@@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.4 2003/01/30 12:22:48 jlam Exp $
  
  INCLUDES= adpcm.h        cxform.h       graphic.h      script.h       sqrt.h\
  	bitmap.h       displaylist.h  matrix.h       shape.h        swf.h\
-@@ -34,7 +33,20 @@ SWFOBJS=\
+@@ -34,7 +33,20 @@
  #	bitstream.o
  #	dump.o
  
@@ -28,7 +28,7 @@ $NetBSD: patch-ab,v 1.4 2003/01/30 12:22:48 jlam Exp $
 +	done
 +
 +libflash.la: $(SWFOBJS)
-+	${LIBTOOL} --mode=link ${CC} ${LDFLAGS} -o $@ ${SWFOBJS:.o=.lo} -rpath ${PREFIX}/lib -ljpeg -lz ${LIBOSSAUDIO} -version-info 0:4
++	${LIBTOOL} --mode=link ${CC} ${LDFLAGS} -o $@ ${SWFOBJS:.o=.lo} -rpath ${PREFIX}/lib -ljpeg -lz ${LIBSTDCPP} ${LIBOSSAUDIO} -version-info 0:4
  
  libflash.a: $(SWFOBJS) 
  	ar rcs $@ $(SWFOBJS)
diff --git a/graphics/libflash/patches/patch-ah b/graphics/libflash/patches/patch-ah
index ec33870bbe1..78805343673 100644
--- a/graphics/libflash/patches/patch-ah
+++ b/graphics/libflash/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.5 2003/01/30 12:22:48 jlam Exp $
+$NetBSD: patch-ah,v 1.6 2004/01/01 21:29:09 agc Exp $
 
 --- Plugin/Makefile.orig	Tue Sep 28 05:13:38 1999
 +++ Plugin/Makefile
@@ -23,7 +23,7 @@ $NetBSD: patch-ah,v 1.5 2003/01/30 12:22:48 jlam Exp $
 -CFLAGS=  $(OPTIMIZER) $(PLUGIN_DEFINES) -I$(FLASH) -I/usr/X11R6/include
 -LDFLAGS= $(FLASH)/libflash.a $(LIBCXX) ../Jpeg/libjpeg.a ../Zlib/libz.a
 +CFLAGS+=  $(OPTIMIZER) $(PLUGIN_DEFINES) $(CPPFLAGS)
-+LIBS= -lflash $(LIBCXX) -ljpeg -lz $(LIBOSSAUDIO) -lX11 -lXt
++LIBS= -lflash $(LIBSTDCPP) -ljpeg -lz $(LIBOSSAUDIO) -lX11 -lXt
  
  SRC= plugin.c npunix.c
  OBJ= plugin.o npunix.o