libflash and flashplayer moved to the multimedia category.

18 files changed, 1 insertions, 372 deletions

diff --git a/graphics/Makefile b/graphics/Makefile
index c003f4ab2b6..f6126ba4eb5 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.281 2004/01/26 13:30:46 jmmv Exp $
+# $NetBSD: Makefile,v 1.282 2004/01/26 13:38:43 jmmv Exp $
 #
 
 COMMENT=	Graphics tools and libraries
@@ -60,7 +60,6 @@ SUBDIR+=	fbm
 SUBDIR+=	feh
 SUBDIR+=	ffmpeg
 SUBDIR+=	filmgimp
-SUBDIR+=	flashplayer
 SUBDIR+=	fly
 SUBDIR+=	fnlib
 SUBDIR+=	freetype
@@ -130,7 +129,6 @@ SUBDIR+=	libcaca
 SUBDIR+=	libdvbpsi
 SUBDIR+=	libexif
 SUBDIR+=	libexif-gtk
-SUBDIR+=	libflash
 SUBDIR+=	libgdgeda
 SUBDIR+=	libggi
 SUBDIR+=	libggigcp
diff --git a/graphics/flashplayer/DESCR b/graphics/flashplayer/DESCR
deleted file mode 100644
index e8f0eb3df30..00000000000
--- a/graphics/flashplayer/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Swfplayer is a standalone open source Flash(tm) player using libflash.
-You can use it to quickly play movies without starting Netscape.  It can
-also play movies in the root window (suitable for xscreensaver).
diff --git a/graphics/flashplayer/Makefile b/graphics/flashplayer/Makefile
deleted file mode 100644
index 77dd0b25dfc..00000000000
--- a/graphics/flashplayer/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2003/09/28 20:05:20 tron Exp $
-#
-
-.include "../libflash/Makefile.common"
-
-PKGNAME=	${DISTNAME:C/-/player-/}
-PKGREVISION=	2
-COMMENT=	Standalone open source Flash(tm) player
-
-USE_BUILDLINK2=	yes
-BUILD_DIRS=	${WRKSRC}/Player
-CPPFLAGS+=	-DDEV_DSP=\\\"${DEVOSSSOUND}\\\"
-
-.if defined(CC_VERSION) && !empty(CC_VERSION:Mgcc-3.*)
-MAKE_ENV+=	LIBSTDCPP=-lstdc++
-.else
-MAKE_ENV+=	LIBSTDCPP=
-.endif
-
-.include "../libflash/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/flashplayer/PLIST b/graphics/flashplayer/PLIST
deleted file mode 100644
index f36212b2301..00000000000
--- a/graphics/flashplayer/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:50:36 zuntum Exp $
-bin/swfplayer
diff --git a/graphics/libflash/DESCR b/graphics/libflash/DESCR
deleted file mode 100644
index 0ff7e0b140e..00000000000
--- a/graphics/libflash/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 56f2a4edaff..00000000000
--- a/graphics/libflash/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2004/01/01 21:29:09 agc Exp $
-#
-
-.include "Makefile.common"
-
-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}"
-MAKE_ENV+=	LIBSTDCPP=-lstdc++
-
-.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
deleted file mode 100644
index 57071aa9a52..00000000000
--- a/graphics/libflash/Makefile.common
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile.common,v 1.3 2003/07/17 21:41:30 grant Exp $
-#
-
-DISTNAME=	flash-0.4.10
-CATEGORIES=	graphics
-MASTER_SITES=	http://www.swift-tools.com/Flash/
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	hubertf@NetBSD.org
-HOMEPAGE=	http://www.swift-tools.com/Flash/
-
-USE_X11=	yes
-
-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/PLIST b/graphics/libflash/PLIST
deleted file mode 100644
index de1f171843b..00000000000
--- a/graphics/libflash/PLIST
+++ /dev/null
@@ -1,27 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2003/01/30 10:24:41 jlam Exp $
-include/flash/adpcm.h
-include/flash/bitmap.h
-include/flash/button.h
-include/flash/character.h
-include/flash/cxform.h
-include/flash/displaylist.h
-include/flash/flash.h
-include/flash/font.h
-include/flash/graphic.h
-include/flash/matrix.h
-include/flash/movie.h
-include/flash/program.h
-include/flash/rect.h
-include/flash/script.h
-include/flash/shape.h
-include/flash/sound.h
-include/flash/sprite.h
-include/flash/sqrt.h
-include/flash/swf.h
-include/flash/text.h
-lib/libflash.a
-lib/libflash.la
-lib/libflash.so
-lib/libflash.so.0
-lib/libflash.so.0.4
-@dirrm include/flash
diff --git a/graphics/libflash/buildlink2.mk b/graphics/libflash/buildlink2.mk
deleted file mode 100644
index deff9f747f8..00000000000
--- a/graphics/libflash/buildlink2.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# $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
deleted file mode 100644
index 1dfc8a0205a..00000000000
--- a/graphics/libflash/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$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) = 29afb4393acc2c44e622d398dba05749fb5c581d
-SHA1 (patch-ac) = ce803268d7c85e0317c61dbd63c56028eaba82a8
-SHA1 (patch-ad) = a67db33d60bc5ce23241e5f445aabb9bdb1864c2
-SHA1 (patch-af) = b55169832b1475f41c7e7ecaf1abe1f7d4c93037
-SHA1 (patch-ag) = cc6277a63c4bfa54a35b74a1a66dea5923ae8637
-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
deleted file mode 100644
index 59ed65faefa..00000000000
--- a/graphics/libflash/patches/patch-ab
+++ /dev/null
@@ -1,34 +0,0 @@
-$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
-@@ -1,6 +1,5 @@
--CPPFLAGS=-I../Jpeg -I../Zlib
- # Comment out the following line if you use egcs :
--CXXFLAGS=-O3 -Wall -fno-rtti -fno-exceptions
-+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,7 +33,20 @@
- #	bitstream.o
- #	dump.o
- 
--all: libflash.a
-+.cc.o:
-+	${LIBTOOL} --mode=compile ${CXX} -c ${CPPFLAGS} ${CXXFLAGS} $<
-+
-+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}; do \
-+		${BSD_INSTALL_DATA} $$file ${PREFIX}/include/flash; \
-+	done
-+
-+libflash.la: $(SWFOBJS)
-+	${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-ac b/graphics/libflash/patches/patch-ac
deleted file mode 100644
index 29f04719526..00000000000
--- a/graphics/libflash/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2002/07/11 14:24:00 abs Exp $
-
---- Lib/flash.cc.orig	Thu Jul 11 15:07:01 2002
-+++ Lib/flash.cc
-@@ -100,6 +100,7 @@ long FlashGraphicInit(FlashHandle flashH
- 			break;
- 		default:
- 			fprintf(stderr, "Unsupported depth\n");
-+			return 0;
- 	}
- 
- 	fh->gd->setMovieDimension(fh->main->frameRect.xmax - fh->main->frameRect.xmin,
diff --git a/graphics/libflash/patches/patch-ad b/graphics/libflash/patches/patch-ad
deleted file mode 100644
index 19ad0c883c0..00000000000
--- a/graphics/libflash/patches/patch-ad
+++ /dev/null
@@ -1,65 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2003/01/30 12:22:48 jlam Exp $
-
---- Lib/sound.cc.orig	Wed Sep  1 08:10:03 1999
-+++ Lib/sound.cc
-@@ -26,7 +26,11 @@
- #include <fcntl.h>
- #include <sys/ioctl.h>
- #ifndef NOSOUND
--#include <linux/soundcard.h>
-+#ifdef HAVE_SOUNDCARD_H
-+#include <soundcard.h>
-+#else
-+#include <sys/soundcard.h>
-+#endif
- #endif
- 
- #ifdef RCSID
-@@ -56,16 +60,16 @@ void
- Sound::setSoundFlags(long f) {
- 	switch (GET_SOUND_RATE_CODE(f)) {
- 		case 0:
--			soundRate = 5500;
-+			soundRate = 5512;
- 			break;
- 		case 1:
--			soundRate = 11000;
-+			soundRate = 11025;
- 			break;
- 		case 2:
--			soundRate = 22000;
-+			soundRate = 22050;
- 			break;
- 		case 3:
--			soundRate = 44000;
-+			soundRate = 44100;
- 			break;
- 	}
- 	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");
- 
- 	// 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");
- 
-@@ -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-af b/graphics/libflash/patches/patch-af
deleted file mode 100644
index 36e02d51dea..00000000000
--- a/graphics/libflash/patches/patch-af
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-af,v 1.5 2003/09/28 20:08:14 tron Exp $
-
---- Player/Makefile.orig	Wed Jun  7 11:19:50 2000
-+++ Player/Makefile
-@@ -1,14 +1,12 @@
--FLASH=../Lib
--CPPFLAGS=-I$(FLASH)
--CFLAGS=-O3
--LIBS = $(FLASH)/libflash.a ../Zlib/libz.a ../Jpeg/libjpeg.a -L/usr/X11R6/lib -lX11 -lXext -lm
--CC=gcc
--LDFLAGS=
-+LIBS = -lflash -ljpeg -lz ${LIBOSSAUDIO} -lX11 -lXext -lm $(LIBSTDCPP)
- 
--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
deleted file mode 100644
index 8b56909a15c..00000000000
--- a/graphics/libflash/patches/patch-ag
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ag,v 1.4 2003/01/30 12:22:48 jlam Exp $
-
---- 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);
- 
--	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
deleted file mode 100644
index 78805343673..00000000000
--- a/graphics/libflash/patches/patch-ah
+++ /dev/null
@@ -1,49 +0,0 @@
-$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
-@@ -21,34 +21,30 @@
- 
- PLUGIN_DEFINES= -DXP_UNIX
- OPTIMIZER=
--FLASH=../Lib
- 
- # Solaris
- #LIBCXX=/usr/lib/libC.so
- # gcc
- LIBCXX=
- 
--# Solaris (Sun compiler/linker)
--#SHARED=-G
--# FreeBSD
--#SHARED=-Bshareable
--# Linux
--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) $(PLUGIN_DEFINES) $(CPPFLAGS)
-+LIBS= -lflash $(LIBSTDCPP) -ljpeg -lz $(LIBOSSAUDIO) -lX11 -lXt
- 
- SRC= plugin.c npunix.c
- OBJ= plugin.o npunix.o
- 
- 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
-+$(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
deleted file mode 100644
index d6d31db04c7..00000000000
--- a/graphics/libflash/patches/patch-ai
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2003/01/30 12:22:48 jlam Exp $
-
---- 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);
- 
--		FlashSoundInit(This->fh, "/dev/dsp");
-+#ifndef DEV_DSP
-+#define DEV_DSP	"/dev/dsp"
-+#endif
-+
-+		FlashSoundInit(This->fh, DEV_DSP);
- 
- 		return NPERR_NO_ERROR;
- 	}
-@@ -193,6 +197,7 @@ NPP_Destroy(NPP instance, NPSavedData** 
- 			XSync(This->dpy,False);
- 			XFreePixmap(This->dpy, This->canvas);
- 			shmdt(This->segInfo.shmaddr);
-+			shmctl(This->segInfo.shmid, IPC_RMID, 0);
- 
- 			FlashClose(This->fh);
- 			This->fh = 0;
diff --git a/graphics/libflash/patches/patch-aj b/graphics/libflash/patches/patch-aj
deleted file mode 100644
index c03ea161635..00000000000
--- a/graphics/libflash/patches/patch-aj
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD$
-
---- Lib/shape.cc.orig	Wed Jun  7 19:11:08 2000
-+++ Lib/shape.cc
-@@ -24,2 +24,4 @@
- 
-+#include <math.h>
-+
- #ifdef RCSID