5 files changed, 16 insertions, 17 deletions

diff --git a/www/linux-flashplugin/Makefile b/www/linux-flashplugin/Makefile
index 1e53fe548d63..ee53a95fa13b 100644
--- a/www/linux-flashplugin/Makefile
+++ b/www/linux-flashplugin/Makefile
@@ -5,20 +5,21 @@
 # $FreeBSD$
 #
 
-PORTNAME=	linux-flashplugin
-PORTVERSION=	4.0.r12
+PORTNAME=	flashplugin
+PORTVERSION=	5.0r47
 CATEGORIES=	www graphics linux
-MASTER_SITES=	http://download.macromedia.com/pub/shockwave/flash/english/linux/4.0r12/
-DISTNAME=	flash_linux
+MASTER_SITES=	http://download.macromedia.com/pub/shockwave/flash/english/linux/
+PKGNAMEPREFIX=	linux-
+DISTNAME=	5.0r47/flash_linux
 
-MAINTAINER=	matt@LUCIDA.QC.CA
+MAINTAINER=	pat@databits.net
 
 RUN_DEPENDS=	/compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
 
 ONLY_FOR_ARCHS=	i386
 NO_CDROM=	"Redistribution not allowed"
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/Linux
+WRKSRC=		${WRKDIR}/flash_linux
 
 PLUGINSDIR=	lib/netscape-linux/plugins
 LIBFILES=	libflashplayer.so \
@@ -34,6 +35,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/lib/flash/
 	${LN} -sf ${PREFIX}/lib/flash/${f} ${PREFIX}/${PLUGINSDIR}/
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/README.Linux ${PREFIX}/share/doc/flash/
-
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/flash/
+	${INSTALL_DATA} ${WRKSRC}/ReadMe.htm ${PREFIX}/share/doc/flash/
 .include <bsd.port.mk>
diff --git a/www/linux-flashplugin/distinfo b/www/linux-flashplugin/distinfo
index 2d82f3920b50..3aa2bb5ce5bb 100644
--- a/www/linux-flashplugin/distinfo
+++ b/www/linux-flashplugin/distinfo
@@ -1 +1 @@
-MD5 (flash_linux.tar.gz) = 2962638158fb1f83fec4aa617405dd6a
+MD5 (5.0r47/flash_linux.tar.gz) = 28e526dc63ad1eb7395cca8fe1678f2e
diff --git a/www/linux-flashplugin/pkg-comment b/www/linux-flashplugin/pkg-comment
index e4a65b7ec17f..017a5439e013 100644
--- a/www/linux-flashplugin/pkg-comment
+++ b/www/linux-flashplugin/pkg-comment
@@ -1 +1 @@
-The official Macromedia Flash 4 Player for Linux Netscape
+The official Macromedia Flash Player for Linux Netscape
diff --git a/www/linux-flashplugin/pkg-descr b/www/linux-flashplugin/pkg-descr
index b3473dbca581..53a71874c6d2 100644
--- a/www/linux-flashplugin/pkg-descr
+++ b/www/linux-flashplugin/pkg-descr
@@ -1,11 +1,8 @@
-Macromedia Flash Player 4
+Macromedia Flash Player
 Netscape Plug-in for Linux
 
-This is the official Flash Player 4 from Macromedia. Through this plugin,
+This is the official Flash Player from Macromedia. Through this plugin,
 it enables you to see .swf and .spl files on the 'net from your Netscape
 session. Please see the Macromedia home page for more information.
 
 WWW: http://www.macromedia.com
-
-- Matt Heckaman
-matt@LUCIDA.QC.CA
diff --git a/www/linux-flashplugin/pkg-plist b/www/linux-flashplugin/pkg-plist
index b2e9a235635f..ffa8b6595033 100644
--- a/www/linux-flashplugin/pkg-plist
+++ b/www/linux-flashplugin/pkg-plist
@@ -2,7 +2,8 @@ lib/flash/ShockwaveFlash.class
 lib/flash/libflashplayer.so
 %%PLUGINSDIR%%/ShockwaveFlash.class
 %%PLUGINSDIR%%/libflashplayer.so
-@unexec rmdir -p %%PLUGINSDIR%% 2>/dev/null || true
-share/doc/flash/README.Linux
+@unexec rmdir -p %D/%%PLUGINSDIR%% 2>/dev/null || true
+share/doc/flash/README
+share/doc/flash/ReadMe.htm
 @dirrm lib/flash
 @dirrm share/doc/flash