Index: www/linux-c6-flashplugin11/Makefile
===================================================================
--- www/linux-c6-flashplugin11/Makefile	(revision 373451)
+++ www/linux-c6-flashplugin11/Makefile	(working copy)
@@ -3,25 +3,24 @@
 
 PORTNAME=	flashplugin
 PORTVERSION=	11.2r202.418
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www multimedia linux
-MASTER_SITES=	http://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION:S/r/./}/
+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
+DISTFILES=	install_flash_player_11_linux.i386.tar.gz:plugin
 DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Adobe Flash Player NPAPI Plugin
 
-RUN_DEPENDS+=	linux-${USE_LINUX}-alsa-lib>=1.0.22_2:${PORTSDIR}/audio/linux-c6-alsa-lib
-
 ONLY_FOR_ARCHS=	amd64 i386
 USE_LINUX=	c6
-USE_LINUX_APPS=	alsalib alsa-plugins-oss curl cyrus-sasl2 \
-		gtk2 nspr nss # libssh2 openldap
+USE_LINUX_APPS=	curl cyrus-sasl2 gtk2 nspr nss # libssh2 openldap
 WANT_GNOME=	yes
 
 RESTRICTED=	Redistribution not allowed
+RESTRICTED_FILES=	${DISTFILES:Nlinux-f10-flashsupport*:C/:[^:]+$//}
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
@@ -29,19 +28,30 @@ NO_WRKSUBDIR=	yes
 USES=		webplugin:linux desktop-file-utils cpe
 WEBPLUGIN_FILES=	libflashplayer.so
 
-OPTIONS_DEFINE=	GNOME
+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.22_2:${PORTSDIR}/audio/linux-c6-alsa-lib
+ALSA_DISTFILES_OFF=linux-f10-flashsupport-9.0.1.i386.tar.gz:suplib
+
 GNOME_DESC=	include gnome support for .desktop file
+GNOME_USES=	desktop-file-utils
 
 CPE_VENDOR=	adobe
 CPE_PRODUCT=	flash_player
 
-OPTIONS_SUB=	yes
 PLIST_SUB=	LINUXBASE="${LINUXBASE}"
 
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MALSA}
+USE_LINUX_APPS+=alsalib alsa-plugins-oss
+.else
+USE_LINUX_APPS+=openssl-compat
+.endif
+
 .if ${PORT_OPTIONS:MGNOME}
-USES+=		desktop-file-utils
 INSTALLS_ICONS=	yes
 .endif
 
@@ -51,6 +61,9 @@ post-patch:
 do-install:
 	${MKDIR} ${STAGEDIR}${WEBPLUGIN_DIR} ${STAGEDIR}${LINUXBASE}/usr/lib
 	${INSTALL_LIB} ${WRKDIR}/libflashplayer.so ${STAGEDIR}${WEBPLUGIN_DIR}
+.if ! ${PORT_OPTIONS:MALSA}
+	${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)
Index: www/linux-c6-flashplugin11/distinfo
===================================================================
--- www/linux-c6-flashplugin11/distinfo	(revision 373451)
+++ www/linux-c6-flashplugin11/distinfo	(working copy)
@@ -1,2 +1,4 @@
 SHA256 (flashplugin/11.2r202.418/install_flash_player_11_linux.i386.tar.gz) = e374f4fec5f2881407728c261754bd596e4af0e1237dbe7de5fcacbde796b79e
 SIZE (flashplugin/11.2r202.418/install_flash_player_11_linux.i386.tar.gz) = 6925123
+SHA256 (flashplugin/11.2r202.418/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf
+SIZE (flashplugin/11.2r202.418/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455
Index: www/linux-c6-flashplugin11/pkg-plist
===================================================================
--- www/linux-c6-flashplugin11/pkg-plist	(revision 373451)
+++ www/linux-c6-flashplugin11/pkg-plist	(working copy)
@@ -6,3 +6,4 @@ share/icons/hicolor/22x22/apps/flash-player-proper
 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
Index: www/linux-f10-flashplugin11/Makefile
===================================================================
--- www/linux-f10-flashplugin11/Makefile	(revision 373445)
+++ www/linux-f10-flashplugin11/Makefile	(working copy)
@@ -3,25 +3,24 @@
 
 PORTNAME=	flashplugin
 PORTVERSION=	11.2r202.418
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www multimedia linux
-MASTER_SITES=	http://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION:S/r/./}/
+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
+DISTFILES=	install_flash_player_11_linux.i386.tar.gz:plugin
 DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Adobe Flash Player NPAPI Plugin
 
-RUN_DEPENDS+=	linux-${USE_LINUX}-alsa-lib>=1.0.21_5:${PORTSDIR}/audio/linux-f10-alsa-lib
-
 ONLY_FOR_ARCHS=	amd64 i386
 USE_LINUX=	f10
-USE_LINUX_APPS=	alsalib alsa-plugins-oss curl cyrus-sasl2 \
-		gtk2 libssh2 nspr nss openldap openssl
+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
@@ -29,19 +28,28 @@ NO_WRKSUBDIR=	yes
 USES=		webplugin:linux desktop-file-utils cpe
 WEBPLUGIN_FILES=	libflashplayer.so
 
-OPTIONS_DEFINE=	GNOME
+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
+
 GNOME_DESC=	include gnome support for .desktop file
+GNOME_USES=	desktop-file-utils
 
 CPE_VENDOR=	adobe
 CPE_PRODUCT=	flash_player
 
-OPTIONS_SUB=	yes
 PLIST_SUB=	LINUXBASE="${LINUXBASE}"
 
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MALSA}
+USE_LINUX_APPS+=alsalib alsa-plugins-oss
+.endif
+
 .if ${PORT_OPTIONS:MGNOME}
-USES+=		desktop-file-utils
 INSTALLS_ICONS=	yes
 .endif
 
@@ -51,6 +59,9 @@ post-patch:
 do-install:
 	${MKDIR} ${STAGEDIR}${WEBPLUGIN_DIR} ${STAGEDIR}${LINUXBASE}/usr/lib
 	${INSTALL_LIB} ${WRKDIR}/libflashplayer.so ${STAGEDIR}${WEBPLUGIN_DIR}
+.if ! ${PORT_OPTIONS:MALSA}
+	${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)
Index: www/linux-f10-flashplugin11/distinfo
===================================================================
--- www/linux-f10-flashplugin11/distinfo	(revision 373445)
+++ www/linux-f10-flashplugin11/distinfo	(working copy)
@@ -1,2 +1,4 @@
 SHA256 (flashplugin/11.2r202.418/install_flash_player_11_linux.i386.tar.gz) = e374f4fec5f2881407728c261754bd596e4af0e1237dbe7de5fcacbde796b79e
 SIZE (flashplugin/11.2r202.418/install_flash_player_11_linux.i386.tar.gz) = 6925123
+SHA256 (flashplugin/11.2r202.418/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf
+SIZE (flashplugin/11.2r202.418/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455
Index: www/linux-f10-flashplugin11/pkg-plist
===================================================================
--- www/linux-f10-flashplugin11/pkg-plist	(revision 373445)
+++ www/linux-f10-flashplugin11/pkg-plist	(working copy)
@@ -6,3 +6,4 @@ share/icons/hicolor/22x22/apps/flash-player-proper
 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