8 files changed, 78 insertions, 52 deletions

diff --git a/graphics/libflash/Makefile b/graphics/libflash/Makefile
index 22ec7b9a58ad..03386e8b0b27 100644
--- a/graphics/libflash/Makefile
+++ b/graphics/libflash/Makefile
@@ -1,27 +1,25 @@
-# New ports collection makefile for:   flashplayer
-# Date created:        2 October 1999
-# Whom:                Akinori MUSHA aka knu <knu@idaemons.org>
+# New ports collection makefile for:	FlashLib
+# Date created:		10 October 2000
+# Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	flashplayer
-PORTVERSION=	0.4.3
+PORTNAME=	libflash
+PORTVERSION=	0.4.10
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.geocities.com/TimesSquare/Labyrinth/5084/flash/Linux/ \
-		http://perso.club-internet.fr/odebon/flash/Linux/
+MASTER_SITES=	http://www.swift-tools.com/Flash/
 DISTNAME=	flash-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
-PATCH_SITES=	http://leed.t.u-tokyo.ac.jp/~yamagata/flash/
-PATCHFILES=	flash-0.4.3-fbsd-19990512.patch
-
 MAINTAINER=	knu@FreeBSD.org
 
-USE_X_PREFIX=	yes
-ALL_TARGET=	swfplayer
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
+
+WRKSRC=		${WRKDIR}/${DISTNAME}/Lib
+#MAKE_ARGS=	LOCALBASE="${LOCALBASE}"
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/swfplayer ${PREFIX}/bin
+pre-build:
+	${CP} ${FILESDIR}/Makefile ${WRKSRC}/
 
 .include <bsd.port.mk>
diff --git a/graphics/libflash/distinfo b/graphics/libflash/distinfo
index 44bd9fb02bc6..1736b2f2eba0 100644
--- a/graphics/libflash/distinfo
+++ b/graphics/libflash/distinfo
@@ -1,2 +1 @@
-MD5 (flash-0.4.3.tgz) = 87b855c1ac5ea38bfa668b98a099d3b5
-MD5 (flash-0.4.3-fbsd-19990512.patch) = 57784f1045062aa23c584b2f5bbc6483
+MD5 (flash-0.4.10.tgz) = 1473f085c599d8076fa866cd91e11598
diff --git a/graphics/libflash/files/Makefile b/graphics/libflash/files/Makefile
new file mode 100644
index 000000000000..7d6b4df5eb29
--- /dev/null
+++ b/graphics/libflash/files/Makefile
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+LIB=		flash
+SHLIB_MAJOR?=	0
+SHLIB_MINOR?=	4
+CXXFLAGS+=	-fno-rtti -DXP_UNIX	\
+		-I${LOCALBASE}/include	\
+		-DCHECK_TEXT_PLAIN
+LDADD=		-lz \
+		-L${LOCALBASE}/lib -ljpeg
+SRCS=		adpcm.cc bitmap.cc button.cc character.cc cxform.cc \
+		displaylist.cc flash.cc font.cc graphic.cc graphic16.cc \
+		graphic24.cc graphic32.cc matrix.cc movie.cc \
+		program.cc script.cc shape.cc sound.cc \
+		sprite.cc sqrt.cc text.cc
+INCS=		flash.h
+NOMAN=		YES
+LIBDIR=		${LOCALBASE}/lib
+INCDIR=		${LOCALBASE}/include
+
+.include <bsd.lib.mk>
diff --git a/graphics/libflash/files/patch-ah b/graphics/libflash/files/patch-ah
index da5fa199155b..80628391a448 100644
--- a/graphics/libflash/files/patch-ah
+++ b/graphics/libflash/files/patch-ah
@@ -1,21 +1,24 @@
---- Lib/cxform.cc.orig	Sun Aug  6 18:07:51 2000
-+++ Lib/cxform.cc	Sun Aug  6 18:08:18 2000
-@@ -23,7 +23,7 @@
+--- cxform.cc.orig	Tue May  2 04:18:33 2000
++++ cxform.cc	Thu Oct 12 14:44:03 2000
+@@ -26,6 +26,10 @@
  static char *rcsid = "$Id";
- 
- #ifdef __FreeBSD__
--#include <floatingpoint.h>
-+#include <ieeefp.h>
  #endif
  
- #include "cxform.h"
-@@ -63,7 +63,9 @@
- 	if (newColor.blue > 255) newColor.blue = 255;
- 	newColor.alpha = getAlpha(color.alpha);
- #ifdef __FreeBSD__
-+#ifndef __alpha__
- 	fpresetsticky(FP_X_DZ|FP_X_INV);
++#ifdef __FreeBSD__
++#include <ieeefp.h>
++#endif
++
+ long
+ Cxform::getRed(long v) {
+ 	long val;
+@@ -69,6 +73,10 @@
+ Color
+ Cxform::getColor(Color color) {
+ 	Color newColor;
++
++#ifdef __FreeBSD__
++	fpsetmask(0);
 +#endif
- 	fpsetmask(FP_X_DZ|FP_X_INV);
- #endif
  
+ 	newColor.red = getRed(color.red);
+ 	newColor.green = getGreen(color.green);
diff --git a/graphics/libflash/files/patch-ai b/graphics/libflash/files/patch-ai
new file mode 100644
index 000000000000..d9dd605804b7
--- /dev/null
+++ b/graphics/libflash/files/patch-ai
@@ -0,0 +1,14 @@
+--- sound.cc.orig	Thu Sep  2 00:10:03 1999
++++ sound.cc	Thu Oct 12 14:49:31 2000
+@@ -26,7 +26,11 @@
+ #include <fcntl.h>
+ #include <sys/ioctl.h>
+ #ifndef NOSOUND
++#ifdef __FreeBSD__
++#include <machine/soundcard.h>
++#else
+ #include <linux/soundcard.h>
++#endif
+ #endif
+ 
+ #ifdef RCSID
diff --git a/graphics/libflash/pkg-comment b/graphics/libflash/pkg-comment
index a8a296b229ee..05954f0d13cb 100644
--- a/graphics/libflash/pkg-comment
+++ b/graphics/libflash/pkg-comment
@@ -1 +1 @@
-An implementation of Macromedia Flash standalone player
+GPL Flash (TM) Library
diff --git a/graphics/libflash/pkg-descr b/graphics/libflash/pkg-descr
index f138cdb3f9ff..c48db59029c0 100644
--- a/graphics/libflash/pkg-descr
+++ b/graphics/libflash/pkg-descr
@@ -1,20 +1,8 @@
-This is an implementation of Macromedia Flash standalone player.
-Note that this is an unofficial implementation, not done by Macromedia itself.
+GPL Flash (TM) Library is a set of source codes that allow to play
+Flash (TM) movies.
 
-Usage:	swfplayer <file.swf>
+The core of the library is a graphic renderer that is portable is to
+be reused in applications that need to play Flash (TM) movies.
 
-WWW:	http://www.geocities.com/TimesSquare/Labyrinth/5084/flash.html
-	http://perso.club-internet.fr/odebon/flash.html (mirror)
-
-Author: Olivier Debon <odebon@club-internet.fr>
-
-Porting to FreeBSD was done by <yamagata@nwgpc.kek.jp>, whose works are
-available at:
-
-	http://leed.t.u-tokyo.ac.jp/~yamagata/flash/
-
-
-The Netscape plugin is also available as a separate port.
-
--- 
-Akinori MUSHA aka knu <knu@idaemons.org>
+Author:	Olivier Debon <odebon@club-internet.fr>
+WWW:	http://www.swift-tools.com/Flash/
diff --git a/graphics/libflash/pkg-plist b/graphics/libflash/pkg-plist
index 79396b1733e1..2b2f01e56475 100644
--- a/graphics/libflash/pkg-plist
+++ b/graphics/libflash/pkg-plist
@@ -1 +1,4 @@
-bin/swfplayer
+include/flash.h
+lib/libflash.a
+lib/libflash.so
+lib/libflash.so.0