Update to 0.4.10 and make it link with libflash which was separated

from this standalone program.

5 files changed, 26 insertions, 33 deletions

diff --git a/graphics/flashplayer/Makefile b/graphics/flashplayer/Makefile
index 22ec7b9a58ad..79337974c8f7 100644
--- a/graphics/flashplayer/Makefile
+++ b/graphics/flashplayer/Makefile
@@ -1,27 +1,24 @@
-# New ports collection makefile for:   flashplayer
-# Date created:        2 October 1999
-# Whom:                Akinori MUSHA aka knu <knu@idaemons.org>
+# New ports collection makefile for:	flashplayer
+# Date created:		2 October 1999
+# Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	flashplayer
-PORTVERSION=	0.4.3
+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=	flash.0:${.CURDIR}/../libflash
+
+WRKSRC=		${WRKDIR}/${DISTNAME}/Player
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/swfplayer ${PREFIX}/bin
+pre-build:
+	${CP} ${FILESDIR}/Makefile ${WRKSRC}/
 
 .include <bsd.port.mk>
diff --git a/graphics/flashplayer/distinfo b/graphics/flashplayer/distinfo
index 44bd9fb02bc6..1736b2f2eba0 100644
--- a/graphics/flashplayer/distinfo
+++ b/graphics/flashplayer/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/flashplayer/files/Makefile b/graphics/flashplayer/files/Makefile
new file mode 100644
index 000000000000..0e67bc8fb449
--- /dev/null
+++ b/graphics/flashplayer/files/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+PROG=		swfplayer
+SRCS=		main.c
+CFLAGS+=	-I${LOCALBASE}/include -I${X11BASE}/include
+LDADD=		-L${LOCALBASE}/lib -lflash -L${X11BASE}/lib -lX11 -lXext -lm
+NOMAN=		YES
+BINDIR=		${LOCALBASE}/bin
+
+.include <bsd.prog.mk>
diff --git a/graphics/flashplayer/pkg-comment b/graphics/flashplayer/pkg-comment
index a8a296b229ee..2d371a7713bc 100644
--- a/graphics/flashplayer/pkg-comment
+++ b/graphics/flashplayer/pkg-comment
@@ -1 +1 @@
-An implementation of Macromedia Flash standalone player
+GPL standalone Flash (TM) player
diff --git a/graphics/flashplayer/pkg-descr b/graphics/flashplayer/pkg-descr
index f138cdb3f9ff..56ae862f4a92 100644
--- a/graphics/flashplayer/pkg-descr
+++ b/graphics/flashplayer/pkg-descr
@@ -1,20 +1,7 @@
-This is an implementation of Macromedia Flash standalone player.
-Note that this is an unofficial implementation, not done by Macromedia itself.
-
-Usage:	swfplayer <file.swf>
-
-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/
+This is GPL standalone Flash (TM) Player, that comes with FlashLib
+(libflash) distribution.
 
+Author:	Olivier Debon <odebon@club-internet.fr>
+WWW:	http://www.swift-tools.com/Flash/
 
 The Netscape plugin is also available as a separate port.
-
--- 
-Akinori MUSHA aka knu <knu@idaemons.org>