3 files changed, 14 insertions, 28 deletions

diff --git a/www/linux-flashplugin9/Makefile b/www/linux-flashplugin9/Makefile
index bd4e6a33140e..1a1707e515bd 100644
--- a/www/linux-flashplugin9/Makefile
+++ b/www/linux-flashplugin9/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	flashplugin
 PORTVERSION=	7.0r63
+PORTREVISION=	1
 CATEGORIES=	www multimedia linux
 MASTER_SITES=	http://fpdownload.macromedia.com/get/flashplayer/current/
 PKGNAMEPREFIX=	linux-
@@ -14,31 +15,26 @@ DISTNAME=	install_flash_player_7_linux
 DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	jamie@bishopston.net
-COMMENT=	The official Macromedia Flash Player for Linux Mozilla and Netscape 6+
+COMMENT=	Adobe Flash Player NPAPI Plugin
 
 ONLY_FOR_ARCHS=	amd64 i386
 USE_LINUX=	yes
-USE_X_PREFIX=	yes
 
 RESTRICTED=	Redistribution not allowed
 
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/install_flash_player_7_linux
 LATEST_LINK=	flash7
+PORTDOCS=	Readme.txt Readme.htm
 
-LIBFILES=	libflashplayer.so flashplayer.xpt
+USE_NPAPI=	linux-*
+NPAPI_FILES=	libflashplayer.so flashplayer.xpt
 
-DOCSDIR?=	${PREFIX}/share/doc/${UNIQUENAME}
-
-do-install:
-	@${MKDIR} ${PREFIX}/lib/linux-flashplugin7
-.for f in ${LIBFILES}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/lib/linux-flashplugin7
-.endfor
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/Readme.txt ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/Readme.htm ${DOCSDIR}
+post-install:
+.ifndef NOPORTDOCS
+	@${INSTALL} -d ${DOCSDIR}
+	@${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
 .endif
 
+.include "${.CURDIR}/../linux-mplayer-plugin/Makefile.npapi"
 .include <bsd.port.mk>
diff --git a/www/linux-flashplugin9/pkg-descr b/www/linux-flashplugin9/pkg-descr
index 5e43beaa41bf..9c9dcd2de5d8 100644
--- a/www/linux-flashplugin9/pkg-descr
+++ b/www/linux-flashplugin9/pkg-descr
@@ -1,14 +1,10 @@
-This is the official Flash Player from Macromedia. This plugin enables
+This is the official Flash Player from Adobe. This plugin enables
 you to see .swf and .spl files on the 'net from your Opera, Mozilla or
-Netscape 6+ sessions.
+Firefox sessions.
 
-Version 7 of the Macromedia Flash Player no longer works with Netscape
-4.x or earlier.  For Flash support in those browsers install the
-linux-flashplugin port.
-
-Please see the Macromedia home page for more information.
+Please see the Adobe home page for more information.
 
 FreeBSD Flash License Agreement:
 	http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/96374
 
-WWW: http://www.macromedia.com/
+WWW: http://www.adobe.com/
diff --git a/www/linux-flashplugin9/pkg-plist b/www/linux-flashplugin9/pkg-plist
deleted file mode 100644
index e424084d238d..000000000000
--- a/www/linux-flashplugin9/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-lib/linux-flashplugin7/flashplayer.xpt
-lib/linux-flashplugin7/libflashplayer.so
-%%PORTDOCS%%%%DOCSDIR%%/Readme.txt
-%%PORTDOCS%%%%DOCSDIR%%/Readme.htm
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm lib/linux-flashplugin7