View | Details | Raw Unified | Return to bug 195416 | Differences between
and this patch

Collapse All | Expand All

(-)www/linux-c6-flashplugin11/Makefile (-13 / +26 lines)
Lines 3-27 Link Here
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
ALSA_PLIST_SUB_OFF=LINUXBASE="${LINUXBASE}" COMPATDIR="${LINUXBASE:H}"
38
33
GNOME_DESC=	include gnome support for .desktop file
39
GNOME_DESC=	include gnome support for .desktop file
40
GNOME_USES=	desktop-file-utils
34
41
35
CPE_VENDOR=	adobe
42
CPE_VENDOR=	adobe
36
CPE_PRODUCT=	flash_player
43
CPE_PRODUCT=	flash_player
37
44
38
OPTIONS_SUB=	yes
39
PLIST_SUB=	LINUXBASE="${LINUXBASE}"
40
41
.include <bsd.port.options.mk>
45
.include <bsd.port.options.mk>
42
46
47
.if ${PORT_OPTIONS:MALSA}
48
USE_LINUX_APPS+=alsalib alsa-plugins-oss
49
.else
50
USE_LINUX_APPS+=openssl-compat
51
.endif
52
43
.if ${PORT_OPTIONS:MGNOME}
53
.if ${PORT_OPTIONS:MGNOME}
44
USES+=		desktop-file-utils
45
INSTALLS_ICONS=	yes
54
INSTALLS_ICONS=	yes
46
.endif
55
.endif
47
56
Lines 49-56 post-patch: Link Here
49
	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' -e '/^NotShowIn=KDE/d' ${WRKDIR}/usr/share/applications/flash-player-properties.desktop
58
	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' -e '/^NotShowIn=KDE/d' ${WRKDIR}/usr/share/applications/flash-player-properties.desktop
50
59
51
do-install:
60
do-install:
52
	${MKDIR} ${STAGEDIR}${WEBPLUGIN_DIR} ${STAGEDIR}${LINUXBASE}/usr/lib
61
	${MKDIR} ${STAGEDIR}${WEBPLUGIN_DIR}
53
	${INSTALL_LIB} ${WRKDIR}/libflashplayer.so ${STAGEDIR}${WEBPLUGIN_DIR}
62
	${INSTALL_LIB} ${WRKDIR}/libflashplayer.so ${STAGEDIR}${WEBPLUGIN_DIR}
63
.if ! ${PORT_OPTIONS:MALSA}
64
	${MKDIR} ${STAGEDIR}${LINUXBASE}/usr/lib
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)
(-)www/linux-c6-flashplugin11/distinfo (+2 lines)
Lines 1-2 Link Here
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
(-)www/linux-c6-flashplugin11/pkg-plist (+5 lines)
Lines 6-8 share/icons/hicolor/22x22/apps/flash-player-proper Link Here
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
10
%%NO_ALSA%%@dir %%LINUXBASE%%/usr/lib
11
%%NO_ALSA%%@dir %%LINUXBASE%%/usr
12
%%NO_ALSA%%@dir %%LINUXBASE%%
13
%%NO_ALSA%%@dir %%COMPATDIR%%
(-)www/linux-f10-flashplugin11/Makefile (-13 / +24 lines)
Lines 3-27 Link Here
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
ALSA_PLIST_SUB_OFF=LINUXBASE="${LINUXBASE}" COMPATDIR="${LINUXBASE:H}"
38
33
GNOME_DESC=	include gnome support for .desktop file
39
GNOME_DESC=	include gnome support for .desktop file
40
GNOME_USES=	desktop-file-utils
34
41
35
CPE_VENDOR=	adobe
42
CPE_VENDOR=	adobe
36
CPE_PRODUCT=	flash_player
43
CPE_PRODUCT=	flash_player
37
44
38
OPTIONS_SUB=	yes
39
PLIST_SUB=	LINUXBASE="${LINUXBASE}"
40
41
.include <bsd.port.options.mk>
45
.include <bsd.port.options.mk>
42
46
47
.if ${PORT_OPTIONS:MALSA}
48
USE_LINUX_APPS+=alsalib alsa-plugins-oss
49
.endif
50
43
.if ${PORT_OPTIONS:MGNOME}
51
.if ${PORT_OPTIONS:MGNOME}
44
USES+=		desktop-file-utils
45
INSTALLS_ICONS=	yes
52
INSTALLS_ICONS=	yes
46
.endif
53
.endif
47
54
Lines 49-56 post-patch: Link Here
49
	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' -e '/^NotShowIn=KDE/d' ${WRKDIR}/usr/share/applications/flash-player-properties.desktop
56
	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' -e '/^NotShowIn=KDE/d' ${WRKDIR}/usr/share/applications/flash-player-properties.desktop
50
57
51
do-install:
58
do-install:
52
	${MKDIR} ${STAGEDIR}${WEBPLUGIN_DIR} ${STAGEDIR}${LINUXBASE}/usr/lib
59
	${MKDIR} ${STAGEDIR}${WEBPLUGIN_DIR}
53
	${INSTALL_LIB} ${WRKDIR}/libflashplayer.so ${STAGEDIR}${WEBPLUGIN_DIR}
60
	${INSTALL_LIB} ${WRKDIR}/libflashplayer.so ${STAGEDIR}${WEBPLUGIN_DIR}
61
.if ! ${PORT_OPTIONS:MALSA}
62
	${MKDIR} ${STAGEDIR}${LINUXBASE}/usr/lib
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)
(-)www/linux-f10-flashplugin11/distinfo (+2 lines)
Lines 1-2 Link Here
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
(-)www/linux-f10-flashplugin11/pkg-plist (+5 lines)
Lines 6-8 share/icons/hicolor/22x22/apps/flash-player-proper Link Here
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
10
%%NO_ALSA%%@dir %%LINUXBASE%%/usr/lib
11
%%NO_ALSA%%@dir %%LINUXBASE%%/usr
12
%%NO_ALSA%%@dir %%LINUXBASE%%
13
%%NO_ALSA%%@dir %%COMPATDIR%%

Return to bug 195416