Index: www/linux-c6-flashplugin11/Makefile
===================================================================
--- www/linux-c6-flashplugin11/Makefile
+++ www/linux-c6-flashplugin11/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	flashplugin
 PORTVERSION=	11.2r202.451
+PORTREVISION=	1
 CATEGORIES=	www multimedia linux
 MASTER_SITES=	http://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION:S/r/./}/:plugin \
 		LOCAL/nox:suplib
@@ -14,8 +15,8 @@
 COMMENT=	Adobe Flash Player NPAPI Plugin
 
 ONLY_FOR_ARCHS=	amd64 i386
-USE_LINUX=	c6
-USE_LINUX_APPS=	curl cyrus-sasl2 gdkpixbuf2 gtk2 nspr nss # libssh2 openldap
+USE_LINUX?=	c6
+USE_LINUX_APPS?=	curl cyrus-sasl2 gdkpixbuf2 gtk2 nspr nss # libssh2 openldap
 WANT_GNOME=	yes
 
 RESTRICTED=	Redistribution not allowed
@@ -31,9 +32,9 @@
 OPTIONS_SUB=	yes
 
 ALSA_DESC=	ALSA audio output (broken, needs lemul)
-ALSA_RUN_DEPENDS=linux-${USE_LINUX}-alsa-lib>=1.0.22_2:${PORTSDIR}/audio/linux-c6-alsa-lib
-ALSA_DISTFILES_OFF=linux-f10-flashsupport-9.0.1.i386.tar.gz:suplib
-ALSA_PLIST_SUB_OFF=LINUXBASE="${LINUXBASE}" COMPATDIR="${LINUXBASE:H}"
+ALSA_RUN_DEPENDS?=	linux-${USE_LINUX}-alsa-lib>=1.0.22_2:${PORTSDIR}/audio/linux-c6-alsa-lib
+ALSA_DISTFILES_OFF=	linux-f10-flashsupport-9.0.1.i386.tar.gz:suplib
+ALSA_PLIST_SUB_OFF=	LINUXBASE="${LINUXBASE}" COMPATDIR="${LINUXBASE:H}"
 
 GNOME_DESC=	include gnome support for .desktop file
 GNOME_USES=	desktop-file-utils
@@ -46,7 +47,11 @@
 .if ${PORT_OPTIONS:MALSA}
 USE_LINUX_APPS+=alsalib alsa-plugins-oss
 .else
-USE_LINUX_APPS+=openssl-compat
+.if ${USE_LINUX} == "f10"
+USE_LINUX_APPS+=	openssl
+.else
+USE_LINUX_APPS+=	openssl-compat
+.endif
 .endif
 
 .if ${PORT_OPTIONS:MGNOME}
Index: www/linux-f10-flashplugin11/Makefile
===================================================================
--- www/linux-f10-flashplugin11/Makefile
+++ www/linux-f10-flashplugin11/Makefile
@@ -1,68 +1,9 @@
 # Created by: Naoki Tsurutani
 # $FreeBSD$
 
-PORTNAME=	flashplugin
-PORTVERSION=	11.2r202.451
-CATEGORIES=	www multimedia linux
-MASTER_SITES=	http://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION:S/r/./}/:plugin \
-		LOCAL/nox:suplib
-PKGNAMEPREFIX=	linux-${USE_LINUX}-
-DISTFILES=	install_flash_player_11_linux.i386.tar.gz:plugin
-DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
+USE_LINUX=		f10
+ALSA_RUN_DEPENDS=	linux-${USE_LINUX}-alsa-lib>=1.0.21_5:${PORTSDIR}/audio/linux-f10-alsa-lib
+USE_LINUX_APPS=		curl cyrus-sasl2 gtk2 libssh2 nspr nss openldap
+MASTERDIR=		${.CURDIR}/../linux-c6-flashplugin11
 
-MAINTAINER=	emulation@FreeBSD.org
-COMMENT=	Adobe Flash Player NPAPI Plugin
-
-ONLY_FOR_ARCHS=	amd64 i386
-USE_LINUX=	f10
-USE_LINUX_APPS=	curl cyrus-sasl2 gtk2 libssh2 nspr nss openldap openssl
-WANT_GNOME=	yes
-
-RESTRICTED=	Redistribution not allowed
-RESTRICTED_FILES=	${DISTFILES:Nlinux-f10-flashsupport*:C/:[^:]+$//}
-
-NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
-
-USES=		webplugin:linux desktop-file-utils cpe
-WEBPLUGIN_FILES=	libflashplayer.so
-
-OPTIONS_DEFINE=	ALSA GNOME
-OPTIONS_SUB=	yes
-
-ALSA_DESC=	ALSA audio output (broken, needs lemul)
-ALSA_RUN_DEPENDS=linux-${USE_LINUX}-alsa-lib>=1.0.21_5:${PORTSDIR}/audio/linux-f10-alsa-lib
-ALSA_DISTFILES_OFF=linux-f10-flashsupport-9.0.1.i386.tar.gz:suplib
-ALSA_PLIST_SUB_OFF=LINUXBASE="${LINUXBASE}" COMPATDIR="${LINUXBASE:H}"
-
-GNOME_DESC=	include gnome support for .desktop file
-GNOME_USES=	desktop-file-utils
-
-CPE_VENDOR=	adobe
-CPE_PRODUCT=	flash_player
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MALSA}
-USE_LINUX_APPS+=alsalib alsa-plugins-oss
-.endif
-
-.if ${PORT_OPTIONS:MGNOME}
-INSTALLS_ICONS=	yes
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' -e '/^NotShowIn=KDE/d' ${WRKDIR}/usr/share/applications/flash-player-properties.desktop
-
-do-install:
-	${MKDIR} ${STAGEDIR}${WEBPLUGIN_DIR}
-	${INSTALL_LIB} ${WRKDIR}/libflashplayer.so ${STAGEDIR}${WEBPLUGIN_DIR}
-.if ! ${PORT_OPTIONS:MALSA}
-	${MKDIR} ${STAGEDIR}${LINUXBASE}/usr/lib
-	${INSTALL_LIB} ${WRKDIR}/libflashsupport.so ${STAGEDIR}${LINUXBASE}/usr/lib
-.endif
-	${INSTALL_PROGRAM} ${WRKDIR}/usr/bin/flash-player-properties ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_DATA} ${WRKDIR}/usr/share/applications/flash-player-properties.desktop ${STAGEDIR}${DESKTOPDIR}
-	(cd ${WRKDIR}/usr/share/icons && ${COPYTREE_SHARE} hicolor ${STAGEDIR}${PREFIX}/share/icons)
-
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
Index: www/linux-f10-flashplugin11/distinfo
===================================================================
--- www/linux-f10-flashplugin11/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-SHA256 (flashplugin/11.2r202.451/install_flash_player_11_linux.i386.tar.gz) = ba4dfc6450a48941c440994580751da604e86502aef5a1a11caec1f19be9fbd2
-SIZE (flashplugin/11.2r202.451/install_flash_player_11_linux.i386.tar.gz) = 6931380
-SHA256 (flashplugin/11.2r202.451/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf
-SIZE (flashplugin/11.2r202.451/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455
Index: www/linux-f10-flashplugin11/pkg-descr
===================================================================
--- www/linux-f10-flashplugin11/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-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
-Firefox sessions.
-
-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.adobe.com/
Index: www/linux-f10-flashplugin11/pkg-message
===================================================================
--- www/linux-f10-flashplugin11/pkg-message
+++ /dev/null
@@ -1,7 +0,0 @@
-If this is your first time installing flash each user must run:
-
-	nspluginwrapper -v -a -i
-
-If you are updating flash each user must run:
-
-	nspluginwrapper -v -a -u
Index: www/linux-f10-flashplugin11/pkg-plist
===================================================================
--- www/linux-f10-flashplugin11/pkg-plist
+++ /dev/null
@@ -1,13 +0,0 @@
-bin/flash-player-properties
-%%WEBPLUGIN_DIR%%/libflashplayer.so
-share/applications/flash-player-properties.desktop
-share/icons/hicolor/16x16/apps/flash-player-properties.png
-share/icons/hicolor/22x22/apps/flash-player-properties.png
-share/icons/hicolor/24x24/apps/flash-player-properties.png
-share/icons/hicolor/32x32/apps/flash-player-properties.png
-share/icons/hicolor/48x48/apps/flash-player-properties.png
-%%NO_ALSA%%%%LINUXBASE%%/usr/lib/libflashsupport.so
-%%NO_ALSA%%@dir %%LINUXBASE%%/usr/lib
-%%NO_ALSA%%@dir %%LINUXBASE%%/usr
-%%NO_ALSA%%@dir %%LINUXBASE%%
-%%NO_ALSA%%@dir %%COMPATDIR%%