Bump PKGREVISIONs of libflash, flashplayer, and moz-flash. These

packages can now use audio/oss for OSS audio support.  Convert to use
buildlink2 and make libflash.so link against the proper libraries so
that all inter-library dependencies are recorded.  Also build moz-flash
using libtool instead of guessing at the link command for the shared
module.

13 files changed, 154 insertions, 123 deletions

diff --git a/graphics/libflash/DESCR b/graphics/libflash/DESCR
index b539d8da9c8..0ff7e0b140e 100644
--- a/graphics/libflash/DESCR
+++ b/graphics/libflash/DESCR
@@ -1,4 +1,2 @@
-  GPL Flash [tm] library is a set of source codes that allow to play
-Flash[tm] movies.  The core of the library is a graphic renderer that is
-portable is to be re-used in applications that need to play Flash[tm]
-movies.
+Libflash is a GPL Flash(tm) library built around a core graphic renderer
+that is capable of playing Flash(tm) movies.
diff --git a/graphics/libflash/Makefile b/graphics/libflash/Makefile
index 1ce85775bef..31978d05171 100644
--- a/graphics/libflash/Makefile
+++ b/graphics/libflash/Makefile
@@ -1,19 +1,17 @@
-# $NetBSD: Makefile,v 1.6 2002/07/11 14:24:00 abs Exp $
+# $NetBSD: Makefile,v 1.7 2003/01/30 12:22:47 jlam Exp $
 #
 
-PKGNAME=	lib${DISTNAME}
-PKGREVISION=	3
-
-COMMENT=	open source flash(tm) library
+.include "Makefile.common"
 
-DEPENDS+=	jpeg-6b:../../graphics/jpeg
+PKGNAME=	lib${DISTNAME}
+PKGREVISION=	4
+COMMENT=	open source Flash(tm) library
 
+USE_BUILDLINK2=	yes
 USE_LIBTOOL=	yes
+BUILD_DIRS=	${WRKSRC}/Lib
+MAKE_ENV+=	LIBOSSAUDIO="${LIBOSSAUDIO}"
 
-do-build:
-		cd ${WRKSRC}/Lib && ${SETENV} ${MAKE_ENV} ${MAKE}
-
-do-install:
-		cd ${WRKSRC}/Lib && ${SETENV} ${MAKE_ENV} ${MAKE} install
-
-.include	"Makefile.common"
+.include "../../devel/zlib/buildlink2.mk"
+.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/libflash/Makefile.common b/graphics/libflash/Makefile.common
index e60a60da301..617449d0f66 100644
--- a/graphics/libflash/Makefile.common
+++ b/graphics/libflash/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2000/08/28 17:33:50 rh Exp $
+# $NetBSD: Makefile.common,v 1.2 2003/01/30 12:22:47 jlam Exp $
 #
 
 DISTNAME=	flash-0.4.10
@@ -11,4 +11,12 @@ HOMEPAGE=	http://www.swift-tools.com/Flash/
 
 USE_X11=	yes
 
-.include "../../mk/bsd.pkg.mk"
+DISTINFO_FILE=	${.CURDIR}/../libflash/distinfo
+PATCHDIR=	${.CURDIR}/../libflash/patches
+
+post-extract: remove-subpackages
+
+remove-subpackages:
+	${RM} -rf ${WRKSRC}/Jpeg ${WRKSRC}/Zlib
+
+.include "../../mk/ossaudio.buildlink2.mk"
diff --git a/graphics/libflash/buildlink2.mk b/graphics/libflash/buildlink2.mk
new file mode 100644
index 00000000000..deff9f747f8
--- /dev/null
+++ b/graphics/libflash/buildlink2.mk
@@ -0,0 +1,25 @@
+# $NetBSD: buildlink2.mk,v 1.1 2003/01/30 12:22:47 jlam Exp $
+
+.if !defined(LIBFLASH_BUILDLINK2_MK)
+LIBFLASH_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		libflash
+BUILDLINK_DEPENDS.libflash?=	libflash>=0.4.10nb4
+BUILDLINK_PKGSRCDIR.libflash?=	../../graphics/libflash
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.libflash=libflash
+BUILDLINK_PREFIX.libflash_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.libflash+=	include/flash/*.h
+BUILDLINK_FILES.libflash+=	lib/libflash.*
+
+BUILDLINK_CPPFLAGS.libflash=	-I${BUILDLINK_PREFIX.libflash}/include/flash
+CPPFLAGS+=	${BUILDLINK_CPPFLAGS.libflash}
+
+.include "../../devel/zlib/buildlink2.mk"
+.include "../../graphics/jpeg/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	libflash-buildlink
+
+libflash-buildlink: _BUILDLINK_USE
+
+.endif	# LIBFLASH_BUILDLINK2_MK
diff --git a/graphics/libflash/distinfo b/graphics/libflash/distinfo
index 6224131d7ae..932f002400b 100644
--- a/graphics/libflash/distinfo
+++ b/graphics/libflash/distinfo
@@ -1,13 +1,11 @@
-$NetBSD: distinfo,v 1.10 2002/07/11 14:24:00 abs Exp $
+$NetBSD: distinfo,v 1.11 2003/01/30 12:22:47 jlam Exp $
 
 SHA1 (flash-0.4.10.tgz) = 41f2b8bba3e551e611913069e6e650bc4c8ab420
 Size (flash-0.4.10.tgz) = 358995 bytes
-SHA1 (patch-aa) = a6b56653644506e1695811ff677ca3bc832e88b3
-SHA1 (patch-ab) = 571690220bbfcbbe81b7aa6aa812a1cff023cd91
+SHA1 (patch-ab) = f2d681555e672a9ea39206db468ab1499307a5f6
 SHA1 (patch-ac) = ce803268d7c85e0317c61dbd63c56028eaba82a8
-SHA1 (patch-ad) = cc0fa0cc19565ee3ed3c0c9f22e144705d2ab167
-SHA1 (patch-ae) = 0be721c008bd4caca667ee5366d7678a2f9dab5f
-SHA1 (patch-af) = b4bccafc46500529d1f04ad9cbbef462e1a7cde9
-SHA1 (patch-ag) = 2755ab4b79f1c01e2190816609aa7246c43c764f
-SHA1 (patch-ah) = 60cd6c9fd3d67374ee4e201935fa24695177c2eb
-SHA1 (patch-ai) = aa2c26edb5ae2fde5c21c9bd784445ab8fb89ae4
+SHA1 (patch-ad) = a67db33d60bc5ce23241e5f445aabb9bdb1864c2
+SHA1 (patch-af) = 4e7d298ca6443f55bbed55d6dd17939c13fababb
+SHA1 (patch-ag) = cc6277a63c4bfa54a35b74a1a66dea5923ae8637
+SHA1 (patch-ah) = 030219457c785e851abfeb7ed5166a00ae6eface
+SHA1 (patch-ai) = a4f927b4698e7de7b46f2496b57c83a30a57fecb
diff --git a/graphics/libflash/patches/patch-aa b/graphics/libflash/patches/patch-aa
deleted file mode 100644
index b25854e7a1e..00000000000
--- a/graphics/libflash/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2002/07/11 14:24:00 abs Exp $
-
---- Kflash/kflash.cc.orig	Mon Jun 12 08:46:38 2000
-+++ Kflash/kflash.cc
-@@ -443,7 +443,11 @@ void KFlashSaver::initialise()
- 	FlashSettings(flashHandle, PLAYER_LOOP);
- 
- 	if (enableSound) {
-+#ifdef __NetBSD__
-+		FlashSoundInit(flashHandle, "/dev/sound");
-+#else
- 		FlashSoundInit(flashHandle, "/dev/dsp");
-+#endif
- 	}
- }
- 
diff --git a/graphics/libflash/patches/patch-ab b/graphics/libflash/patches/patch-ab
index 56850510f28..ae59091c17f 100644
--- a/graphics/libflash/patches/patch-ab
+++ b/graphics/libflash/patches/patch-ab
@@ -1,35 +1,34 @@
-$NetBSD: patch-ab,v 1.3 2002/07/11 14:24:00 abs Exp $
+$NetBSD: patch-ab,v 1.4 2003/01/30 12:22:48 jlam Exp $
 
---- Lib/Makefile.orig	Sun Jun  4 10:49:23 2000
+--- Lib/Makefile.orig	Sun Jun  4 02:49:23 2000
 +++ Lib/Makefile
-@@ -1,6 +1,6 @@
+@@ -1,6 +1,5 @@
 -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 ${CFLAGS}
++CXXFLAGS+=-Wall -fno-rtti -fno-exceptions
  
  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 @@ SWFOBJS=\
+@@ -34,7 +33,20 @@ SWFOBJS=\
  #	bitstream.o
  #	dump.o
  
+-all: libflash.a
 +.cc.o:
-+	${LIBTOOL} --mode=compile ${CXX} -c ${CPPFLAGS} ${CXXFLAGS} ${.IMPSRC}
++	${LIBTOOL} --mode=compile ${CXX} -c ${CPPFLAGS} ${CXXFLAGS} $<
 +
- all: libflash.a
- 
-+install:
++all: libflash.la
++
++install: libflash.la
 +	${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} libflash.la ${PREFIX}/lib
 +	${BSD_INSTALL_DATA_DIR} ${PREFIX}/include/flash
-+.for file in ${INCLUDES}
-+	${BSD_INSTALL_DATA} ${file} ${PREFIX}/include/flash
-+.endfor
++	for file in ${INCLUDES}; do \
++		${BSD_INSTALL_DATA} $$file ${PREFIX}/include/flash; \
++	done
 +
- libflash.a: $(SWFOBJS) 
--	ar rcs $@ $(SWFOBJS)
-+	${LIBTOOL} --mode=link ${CC} -o ${.TARGET:.a=.la} ${SWFOBJS:.o=.lo} -rpath ${PREFIX}/lib -L${PREFIX}/lib -Wl,-R${PREFIX}/lib -ljpeg -version-info 0:4
- 
- $(SWFOBJS): $(INCLUDES)
++libflash.la: $(SWFOBJS)
++	${LIBTOOL} --mode=link ${CC} ${LDFLAGS} -o $@ ${SWFOBJS:.o=.lo} -rpath ${PREFIX}/lib -ljpeg -lz ${LIBOSSAUDIO} -version-info 0:4
  
+ libflash.a: $(SWFOBJS) 
+ 	ar rcs $@ $(SWFOBJS)
diff --git a/graphics/libflash/patches/patch-ad b/graphics/libflash/patches/patch-ad
index 562fe479df7..19ad0c883c0 100644
--- a/graphics/libflash/patches/patch-ad
+++ b/graphics/libflash/patches/patch-ad
@@ -1,19 +1,22 @@
-$NetBSD: patch-ad,v 1.3 2002/07/11 14:24:00 abs Exp $
+$NetBSD: patch-ad,v 1.4 2003/01/30 12:22:48 jlam Exp $
 
---- Lib/sound.cc.orig	Wed Sep  1 16:10:03 1999
+--- Lib/sound.cc.orig	Wed Sep  1 08:10:03 1999
 +++ Lib/sound.cc
-@@ -27,6 +27,10 @@
+@@ -26,7 +26,11 @@
+ #include <fcntl.h>
  #include <sys/ioctl.h>
  #ifndef NOSOUND
-+#ifdef __NetBSD__
+-#include <linux/soundcard.h>
++#ifdef HAVE_SOUNDCARD_H
 +#include <soundcard.h>
 +#else
- #include <linux/soundcard.h>
- #endif
++#include <sys/soundcard.h>
 +#endif
+ #endif
  
  #ifdef RCSID
-@@ -57,14 +61,14 @@ Sound::setSoundFlags(long f) {
+@@ -56,16 +60,16 @@ void
+ Sound::setSoundFlags(long f) {
  	switch (GET_SOUND_RATE_CODE(f)) {
  		case 0:
 -			soundRate = 5500;
@@ -32,24 +35,31 @@ $NetBSD: patch-ad,v 1.3 2002/07/11 14:24:00 abs Exp $
 +			soundRate = 44100;
  			break;
  	}
-@@ -163,5 +167,5 @@ SoundMixer::SoundMixer(char *device)
+ 	if (f & soundIs16bit) {
+@@ -162,7 +166,7 @@ SoundMixer::SoundMixer(char *device)
+ 	}
  
  	// Reset device
 -	status = ioctl(dsp, SNDCTL_DSP_RESET);
 +	status = ioctl(dsp, SNDCTL_DSP_RESET, NULL);
  	if (status < 0) perror("ioctl SNDCTL_DSP_RESET");
  
-@@ -188,5 +192,5 @@ SoundMixer::SoundMixer(char *device)
+ 	// Set sample size
+@@ -187,7 +191,7 @@ SoundMixer::SoundMixer(char *device)
+ 	}
  
  	// Set sound rate in Hertz
 -	soundRate = 11000;
 +	soundRate = 11025;
  	status = ioctl(dsp, SNDCTL_DSP_SPEED, &soundRate);
  	if (status < 0) perror("ioctl SNDCTL_DSP_SPEED");
-@@ -325,5 +329,5 @@ SoundMixer::playSounds()
+ 
+@@ -324,7 +328,7 @@ SoundMixer::playSounds()
+ 	if (nbBytes) {
  		// 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-ae b/graphics/libflash/patches/patch-ae
deleted file mode 100644
index 253f4780fac..00000000000
--- a/graphics/libflash/patches/patch-ae
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2002/07/11 14:24:00 abs Exp $
-
---- 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-af b/graphics/libflash/patches/patch-af
index a913d72e1c8..bdee906d29a 100644
--- a/graphics/libflash/patches/patch-af
+++ b/graphics/libflash/patches/patch-af
@@ -1,17 +1,26 @@
-$NetBSD: patch-af,v 1.3 2002/07/11 14:24:00 abs Exp $
+$NetBSD: patch-af,v 1.4 2003/01/30 12:22:48 jlam Exp $
 
---- Player/Makefile.orig	Wed Jun  7 19:19:50 2000
+--- Player/Makefile.orig	Wed Jun  7 11:19:50 2000
 +++ Player/Makefile
-@@ -1,7 +1,9 @@
+@@ -1,14 +1,12 @@
 -FLASH=../Lib
 -CPPFLAGS=-I$(FLASH)
-+FLASH=${LOCALBASE}/lib
-+CPPFLAGS=-I${LOCALBASE}/include/flash -I${LOCALBASE}include -I${X11BASE}/include
- CFLAGS=-O3
+-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=
+-CC=gcc
+-LDFLAGS=
++LIBS = -lflash -ljpeg -lz ${LIBOSSAUDIO} -lX11 -lXext -lm
  
+-swfplayer: main.o $(FLASH)/libflash.a ../Zlib/libz.a ../Jpeg/libjpeg.a
++all: swfplayer
++
++install: swfplayer
++	${BSD_INSTALL_PROGRAM} swfplayer ${PREFIX}/bin
++
++swfplayer: main.o
+ 	$(CC) $(LDFLAGS) -o $@ main.o $(LIBS)
+ 
+ clean:
+ 	rm -f *~ *.o swfplayer core gmon.out
+-
+-
diff --git a/graphics/libflash/patches/patch-ag b/graphics/libflash/patches/patch-ag
index 6bd1a548ed0..8b56909a15c 100644
--- a/graphics/libflash/patches/patch-ag
+++ b/graphics/libflash/patches/patch-ag
@@ -1,16 +1,17 @@
-$NetBSD: patch-ag,v 1.3 2002/07/11 14:24:00 abs Exp $
+$NetBSD: patch-ag,v 1.4 2003/01/30 12:22:48 jlam Exp $
 
---- Player/main.c.orig	Thu Jun  8 07:56:11 2000
+--- Player/main.c.orig	Wed Jun  7 23:56:11 2000
 +++ Player/main.c
 @@ -559,7 +559,11 @@ main(int argc, char **argv)
  
          FlashGraphicInitX11(flashHandle, dpy, movie, onRoot);
  
-+#ifdef __NetBSD__
-+	FlashSoundInit(flashHandle, "/dev/sound");
-+#else
- 	FlashSoundInit(flashHandle, "/dev/dsp");
+-	FlashSoundInit(flashHandle, "/dev/dsp");
++#ifndef DEV_DSP
++#define DEV_DSP "/dev/dsp"
 +#endif
++
++	FlashSoundInit(flashHandle, DEV_DSP);
  
  	FlashSetGetUrlMethod(flashHandle, showUrl, 0);
  
diff --git a/graphics/libflash/patches/patch-ah b/graphics/libflash/patches/patch-ah
index 357acad2228..ec33870bbe1 100644
--- a/graphics/libflash/patches/patch-ah
+++ b/graphics/libflash/patches/patch-ah
@@ -1,39 +1,49 @@
-$NetBSD: patch-ah,v 1.4 2002/07/11 14:24:00 abs Exp $
+$NetBSD: patch-ah,v 1.5 2003/01/30 12:22:48 jlam Exp $
 
---- Plugin/Makefile.orig	Tue Sep 28 13:13:38 1999
+--- Plugin/Makefile.orig	Tue Sep 28 05:13:38 1999
 +++ Plugin/Makefile
-@@ -21,7 +21,7 @@
+@@ -21,34 +21,30 @@
  
  PLUGIN_DEFINES= -DXP_UNIX
  OPTIMIZER=
 -FLASH=../Lib
-+FLASH=${LOCALBASE}/include/flash
  
  # Solaris
  #LIBCXX=/usr/lib/libC.so
-@@ -31,12 +31,12 @@ LIBCXX=
- # Solaris (Sun compiler/linker)
- #SHARED=-G
- # FreeBSD
+ # gcc
+ LIBCXX=
+ 
+-# Solaris (Sun compiler/linker)
+-#SHARED=-G
+-# FreeBSD
 -#SHARED=-Bshareable
-+SHARED=-Bshareable
- # Linux
+-# 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
++CFLAGS+=  $(OPTIMIZER) $(PLUGIN_DEFINES) $(CPPFLAGS)
++LIBS= -lflash $(LIBCXX) -ljpeg -lz $(LIBOSSAUDIO) -lX11 -lXt
  
  SRC= plugin.c npunix.c
  OBJ= plugin.o npunix.o
-@@ -48,7 +48,7 @@ default all: $(SHAREDTARGET)
- $(SHAREDTARGET): $(OBJ) $(FLASH)/libflash.a
- 	$(LD) $(SHARED) -o $(SHAREDTARGET) $(OBJ) $(LDFLAGS)
+ 
+ SHAREDTARGET=npflash.so
+ 
+-default all: $(SHAREDTARGET)
++.c.o:
++	$(SHLIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $<
++
++default all: npflash.la
+ 
+-$(SHAREDTARGET): $(OBJ) $(FLASH)/libflash.a
+-	$(LD) $(SHARED) -o $(SHAREDTARGET) $(OBJ) $(LDFLAGS)
++npflash.la: $(OBJ)
++	$(SHLIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJ:.o=.lo) $(LIBS) -avoid-version -module -rpath $(MOZ_PLUGDIR)
  
 -plugin.o: $(FLASH)/flash.h
-+plugin.o: ${LOCALBASE}/include/flash/flash.h
++$(SHAREDTARGET): $(OBJ)
++	$(LD) $(SHARED) -o $(SHAREDTARGET) $(OBJ) $(LDFLAGS) $(LIBS)
  
  clean:
  	$(RM) $(OBJ) $(SHAREDTARGET)
diff --git a/graphics/libflash/patches/patch-ai b/graphics/libflash/patches/patch-ai
index 79a9414ba70..d6d31db04c7 100644
--- a/graphics/libflash/patches/patch-ai
+++ b/graphics/libflash/patches/patch-ai
@@ -1,16 +1,17 @@
-$NetBSD: patch-ai,v 1.1 2002/07/11 14:24:00 abs Exp $
+$NetBSD: patch-ai,v 1.2 2003/01/30 12:22:48 jlam Exp $
 
---- Plugin/plugin.c.orig	Mon Jun 12 09:24:09 2000
+--- Plugin/plugin.c.orig	Mon Jun 12 01:24:09 2000
 +++ Plugin/plugin.c
 @@ -162,7 +162,11 @@ NPP_New(NPMIMEType pluginType,
  
  		FlashSetCursorOnOffMethod(This->fh, cursorOnOff, (void*)instance);
  
-+#ifdef __NetBSD__
-+		FlashSoundInit(This->fh, "/dev/sound");
-+#else
- 		FlashSoundInit(This->fh, "/dev/dsp");
+-		FlashSoundInit(This->fh, "/dev/dsp");
++#ifndef DEV_DSP
++#define DEV_DSP	"/dev/dsp"
 +#endif
++
++		FlashSoundInit(This->fh, DEV_DSP);
  
  		return NPERR_NO_ERROR;
  	}