Attachment #149893 for bug #195416





PORTNAME=	flashplugin
PORTVERSION=	11.2r202.418
PORTREVISION=	3
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}

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=	curl cyrus-sasl2 gtk2 nspr nss # libssh2 openldap
		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

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.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


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)

Lines 1-2 Link Here

(-)www/linux-c6-flashplugin11/distinfo (+2 lines)
1	SHA256 (flashplugin/11.2r202.418/install_flash_player_11_linux.i386.tar.gz) = e374f4fec5f2881407728c261754bd596e4af0e1237dbe7de5fcacbde796b79e	1	SHA256 (flashplugin/11.2r202.418/install_flash_player_11_linux.i386.tar.gz) = e374f4fec5f2881407728c261754bd596e4af0e1237dbe7de5fcacbde796b79e
2	SIZE (flashplugin/11.2r202.418/install_flash_player_11_linux.i386.tar.gz) = 6925123	2	SIZE (flashplugin/11.2r202.418/install_flash_player_11_linux.i386.tar.gz) = 6925123
		3	SHA256 (flashplugin/11.2r202.418/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf
		4	SIZE (flashplugin/11.2r202.418/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455

Lines 6-8 share/icons/hicolor/22x22/apps/flash-player-proper Link Here

(-)www/linux-c6-flashplugin11/pkg-plist (+1 lines)
6	share/icons/hicolor/24x24/apps/flash-player-properties.png	6	share/icons/hicolor/24x24/apps/flash-player-properties.png
7	share/icons/hicolor/32x32/apps/flash-player-properties.png	7	share/icons/hicolor/32x32/apps/flash-player-properties.png
8	share/icons/hicolor/48x48/apps/flash-player-properties.png	8	share/icons/hicolor/48x48/apps/flash-player-properties.png
		9	%%NO_ALSA%%%%LINUXBASE%%/usr/lib/libflashsupport.so





PORTNAME=	flashplugin
PORTVERSION=	11.2r202.418
PORTREVISION=	4
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}

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=	curl cyrus-sasl2 gtk2 libssh2 nspr nss openldap openssl
		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

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


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)

Lines 1-2 Link Here

(-)www/linux-f10-flashplugin11/distinfo (+2 lines)
1	SHA256 (flashplugin/11.2r202.418/install_flash_player_11_linux.i386.tar.gz) = e374f4fec5f2881407728c261754bd596e4af0e1237dbe7de5fcacbde796b79e	1	SHA256 (flashplugin/11.2r202.418/install_flash_player_11_linux.i386.tar.gz) = e374f4fec5f2881407728c261754bd596e4af0e1237dbe7de5fcacbde796b79e
2	SIZE (flashplugin/11.2r202.418/install_flash_player_11_linux.i386.tar.gz) = 6925123	2	SIZE (flashplugin/11.2r202.418/install_flash_player_11_linux.i386.tar.gz) = 6925123
		3	SHA256 (flashplugin/11.2r202.418/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf
		4	SIZE (flashplugin/11.2r202.418/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455

Lines 6-8 share/icons/hicolor/22x22/apps/flash-player-proper Link Here

(-)www/linux-f10-flashplugin11/pkg-plist (+1 lines)
6	share/icons/hicolor/24x24/apps/flash-player-properties.png	6	share/icons/hicolor/24x24/apps/flash-player-properties.png
7	share/icons/hicolor/32x32/apps/flash-player-properties.png	7	share/icons/hicolor/32x32/apps/flash-player-properties.png
8	share/icons/hicolor/48x48/apps/flash-player-properties.png	8	share/icons/hicolor/48x48/apps/flash-player-properties.png
		9	%%NO_ALSA%%%%LINUXBASE%%/usr/lib/libflashsupport.so

Return to bug 195416

Lines 3-27 Link Here

(-)www/linux-c6-flashplugin11/Makefile (-10 / +23 lines)
3		3
4	PORTNAME= flashplugin	4	PORTNAME= flashplugin
5	PORTVERSION= 11.2r202.418	5	PORTVERSION= 11.2r202.418
6	PORTREVISION= 2	6	PORTREVISION= 3
7	CATEGORIES= www multimedia linux	7	CATEGORIES= www multimedia linux
8	MASTER_SITES= http://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION:S/r/./}/	8	MASTER_SITES= http://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION:S/r/./}/:plugin \
		9	LOCAL/nox:suplib
9	PKGNAMEPREFIX= linux-${USE_LINUX}-	10	PKGNAMEPREFIX= linux-${USE_LINUX}-
10	DISTFILES= install_flash_player_11_linux.i386.tar.gz	11	DISTFILES= install_flash_player_11_linux.i386.tar.gz:plugin
11	DIST_SUBDIR= ${PORTNAME}/${PORTVERSION}	12	DIST_SUBDIR= ${PORTNAME}/${PORTVERSION}
12		13
13	MAINTAINER= emulation@FreeBSD.org	14	MAINTAINER= emulation@FreeBSD.org
14	COMMENT= Adobe Flash Player NPAPI Plugin	15	COMMENT= Adobe Flash Player NPAPI Plugin
15		16
16	RUN_DEPENDS+= linux-${USE_LINUX}-alsa-lib>=1.0.22_2:${PORTSDIR}/audio/linux-c6-alsa-lib
17
18	ONLY_FOR_ARCHS= amd64 i386	17	ONLY_FOR_ARCHS= amd64 i386
19	USE_LINUX= c6	18	USE_LINUX= c6
20	USE_LINUX_APPS= alsalib alsa-plugins-oss curl cyrus-sasl2 \	19	USE_LINUX_APPS= curl cyrus-sasl2 gtk2 nspr nss # libssh2 openldap
21	gtk2 nspr nss # libssh2 openldap
22	WANT_GNOME= yes	20	WANT_GNOME= yes
23		21
24	RESTRICTED= Redistribution not allowed	22	RESTRICTED= Redistribution not allowed
		23	RESTRICTED_FILES= ${DISTFILES:Nlinux-f10-flashsupport*:C/:[^:]+$//}
25		24
26	NO_BUILD= yes	25	NO_BUILD= yes
27	NO_WRKSUBDIR= yes	26	NO_WRKSUBDIR= yes
Lines 29-47 NO_WRKSUBDIR= yes Link Here
29	USES= webplugin:linux desktop-file-utils cpe	28	USES= webplugin:linux desktop-file-utils cpe
30	WEBPLUGIN_FILES= libflashplayer.so	29	WEBPLUGIN_FILES= libflashplayer.so
31		30
32	OPTIONS_DEFINE= GNOME	31	OPTIONS_DEFINE= ALSA GNOME
		32	OPTIONS_SUB= yes
		33
		34	ALSA_DESC= ALSA audio output (broken, needs /lemul)
		35	ALSA_RUN_DEPENDS=linux-${USE_LINUX}-alsa-lib>=1.0.22_2:${PORTSDIR}/audio/linux-c6-alsa-lib
		36	ALSA_DISTFILES_OFF=linux-f10-flashsupport-9.0.1.i386.tar.gz:suplib
		37
33	GNOME_DESC= include gnome support for .desktop file	38	GNOME_DESC= include gnome support for .desktop file
		39	GNOME_USES= desktop-file-utils
34		40
35	CPE_VENDOR= adobe	41	CPE_VENDOR= adobe
36	CPE_PRODUCT= flash_player	42	CPE_PRODUCT= flash_player
37		43
38	OPTIONS_SUB= yes
39	PLIST_SUB= LINUXBASE="${LINUXBASE}"	44	PLIST_SUB= LINUXBASE="${LINUXBASE}"
40		45
41	.include <bsd.port.options.mk>	46	.include <bsd.port.options.mk>
42		47
		48	.if ${PORT_OPTIONS:MALSA}
		49	USE_LINUX_APPS+=alsalib alsa-plugins-oss
		50	.else
		51	USE_LINUX_APPS+=openssl-compat
		52	.endif
		53
43	.if ${PORT_OPTIONS:MGNOME}	54	.if ${PORT_OPTIONS:MGNOME}
44	USES+= desktop-file-utils
45	INSTALLS_ICONS= yes	55	INSTALLS_ICONS= yes
46	.endif	56	.endif
47		57
Lines 51-56 post-patch: Link Here
51	do-install:	61	do-install:
52	${MKDIR} ${STAGEDIR}${WEBPLUGIN_DIR} ${STAGEDIR}${LINUXBASE}/usr/lib	62	${MKDIR} ${STAGEDIR}${WEBPLUGIN_DIR} ${STAGEDIR}${LINUXBASE}/usr/lib
53	${INSTALL_LIB} ${WRKDIR}/libflashplayer.so ${STAGEDIR}${WEBPLUGIN_DIR}	63	${INSTALL_LIB} ${WRKDIR}/libflashplayer.so ${STAGEDIR}${WEBPLUGIN_DIR}
		64	.if ! ${PORT_OPTIONS:MALSA}
		65	${INSTALL_LIB} ${WRKDIR}/libflashsupport.so ${STAGEDIR}${LINUXBASE}/usr/lib
		66	.endif
54	${INSTALL_PROGRAM} ${WRKDIR}/usr/bin/flash-player-properties ${STAGEDIR}${PREFIX}/bin	67	${INSTALL_PROGRAM} ${WRKDIR}/usr/bin/flash-player-properties ${STAGEDIR}${PREFIX}/bin
55	${INSTALL_DATA} ${WRKDIR}/usr/share/applications/flash-player-properties.desktop ${STAGEDIR}${DESKTOPDIR}	68	${INSTALL_DATA} ${WRKDIR}/usr/share/applications/flash-player-properties.desktop ${STAGEDIR}${DESKTOPDIR}
56	(cd ${WRKDIR}/usr/share/icons && ${COPYTREE_SHARE} hicolor ${STAGEDIR}${PREFIX}/share/icons)	69	(cd ${WRKDIR}/usr/share/icons && ${COPYTREE_SHARE} hicolor ${STAGEDIR}${PREFIX}/share/icons)

Lines 3-27 Link Here

(-)www/linux-f10-flashplugin11/Makefile (-10 / +21 lines)
3		3
4	PORTNAME= flashplugin	4	PORTNAME= flashplugin
5	PORTVERSION= 11.2r202.418	5	PORTVERSION= 11.2r202.418
6	PORTREVISION= 3	6	PORTREVISION= 4
7	CATEGORIES= www multimedia linux	7	CATEGORIES= www multimedia linux
8	MASTER_SITES= http://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION:S/r/./}/	8	MASTER_SITES= http://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION:S/r/./}/:plugin \
		9	LOCAL/nox:suplib
9	PKGNAMEPREFIX= linux-${USE_LINUX}-	10	PKGNAMEPREFIX= linux-${USE_LINUX}-
10	DISTFILES= install_flash_player_11_linux.i386.tar.gz	11	DISTFILES= install_flash_player_11_linux.i386.tar.gz:plugin
11	DIST_SUBDIR= ${PORTNAME}/${PORTVERSION}	12	DIST_SUBDIR= ${PORTNAME}/${PORTVERSION}
12		13
13	MAINTAINER= emulation@FreeBSD.org	14	MAINTAINER= emulation@FreeBSD.org
14	COMMENT= Adobe Flash Player NPAPI Plugin	15	COMMENT= Adobe Flash Player NPAPI Plugin
15		16
16	RUN_DEPENDS+= linux-${USE_LINUX}-alsa-lib>=1.0.21_5:${PORTSDIR}/audio/linux-f10-alsa-lib
17
18	ONLY_FOR_ARCHS= amd64 i386	17	ONLY_FOR_ARCHS= amd64 i386
19	USE_LINUX= f10	18	USE_LINUX= f10
20	USE_LINUX_APPS= alsalib alsa-plugins-oss curl cyrus-sasl2 \	19	USE_LINUX_APPS= curl cyrus-sasl2 gtk2 libssh2 nspr nss openldap openssl
21	gtk2 libssh2 nspr nss openldap openssl
22	WANT_GNOME= yes	20	WANT_GNOME= yes
23		21
24	RESTRICTED= Redistribution not allowed	22	RESTRICTED= Redistribution not allowed
		23	RESTRICTED_FILES= ${DISTFILES:Nlinux-f10-flashsupport*:C/:[^:]+$//}
25		24
26	NO_BUILD= yes	25	NO_BUILD= yes
27	NO_WRKSUBDIR= yes	26	NO_WRKSUBDIR= yes
Lines 29-47 NO_WRKSUBDIR= yes Link Here
29	USES= webplugin:linux desktop-file-utils cpe	28	USES= webplugin:linux desktop-file-utils cpe
30	WEBPLUGIN_FILES= libflashplayer.so	29	WEBPLUGIN_FILES= libflashplayer.so
31		30
32	OPTIONS_DEFINE= GNOME	31	OPTIONS_DEFINE= ALSA GNOME
		32	OPTIONS_SUB= yes
		33
		34	ALSA_DESC= ALSA audio output (broken, needs /lemul)
		35	ALSA_RUN_DEPENDS=linux-${USE_LINUX}-alsa-lib>=1.0.21_5:${PORTSDIR}/audio/linux-f10-alsa-lib
		36	ALSA_DISTFILES_OFF=linux-f10-flashsupport-9.0.1.i386.tar.gz:suplib
		37
33	GNOME_DESC= include gnome support for .desktop file	38	GNOME_DESC= include gnome support for .desktop file
		39	GNOME_USES= desktop-file-utils
34		40
35	CPE_VENDOR= adobe	41	CPE_VENDOR= adobe
36	CPE_PRODUCT= flash_player	42	CPE_PRODUCT= flash_player
37		43
38	OPTIONS_SUB= yes
39	PLIST_SUB= LINUXBASE="${LINUXBASE}"	44	PLIST_SUB= LINUXBASE="${LINUXBASE}"
40		45
41	.include <bsd.port.options.mk>	46	.include <bsd.port.options.mk>
42		47
		48	.if ${PORT_OPTIONS:MALSA}
		49	USE_LINUX_APPS+=alsalib alsa-plugins-oss
		50	.endif
		51
43	.if ${PORT_OPTIONS:MGNOME}	52	.if ${PORT_OPTIONS:MGNOME}
44	USES+= desktop-file-utils
45	INSTALLS_ICONS= yes	53	INSTALLS_ICONS= yes
46	.endif	54	.endif
47		55
Lines 51-56 post-patch: Link Here
51	do-install:	59	do-install:
52	${MKDIR} ${STAGEDIR}${WEBPLUGIN_DIR} ${STAGEDIR}${LINUXBASE}/usr/lib	60	${MKDIR} ${STAGEDIR}${WEBPLUGIN_DIR} ${STAGEDIR}${LINUXBASE}/usr/lib
53	${INSTALL_LIB} ${WRKDIR}/libflashplayer.so ${STAGEDIR}${WEBPLUGIN_DIR}	61	${INSTALL_LIB} ${WRKDIR}/libflashplayer.so ${STAGEDIR}${WEBPLUGIN_DIR}
		62	.if ! ${PORT_OPTIONS:MALSA}
		63	${INSTALL_LIB} ${WRKDIR}/libflashsupport.so ${STAGEDIR}${LINUXBASE}/usr/lib
		64	.endif
54	${INSTALL_PROGRAM} ${WRKDIR}/usr/bin/flash-player-properties ${STAGEDIR}${PREFIX}/bin	65	${INSTALL_PROGRAM} ${WRKDIR}/usr/bin/flash-player-properties ${STAGEDIR}${PREFIX}/bin
55	${INSTALL_DATA} ${WRKDIR}/usr/share/applications/flash-player-properties.desktop ${STAGEDIR}${DESKTOPDIR}	66	${INSTALL_DATA} ${WRKDIR}/usr/share/applications/flash-player-properties.desktop ${STAGEDIR}${DESKTOPDIR}
56	(cd ${WRKDIR}/usr/share/icons && ${COPYTREE_SHARE} hicolor ${STAGEDIR}${PREFIX}/share/icons)	67	(cd ${WRKDIR}/usr/share/icons && ${COPYTREE_SHARE} hicolor ${STAGEDIR}${PREFIX}/share/icons)