Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/www/linux-flashplugin7/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- Makefile	26 Apr 2006 21:48:36 -0000	1.16
+++ Makefile	28 Jul 2006 22:15:31 -0000
@@ -14,31 +14,26 @@
 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>
Index: pkg-plist
===================================================================
RCS file: pkg-plist
diff -N pkg-plist
--- pkg-plist	26 Apr 2006 21:48:36 -0000	1.8
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -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