diff options
| author | abs <abs@pkgsrc.org> | 2011-10-27 11:46:20 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2011-10-27 11:46:20 +0000 |
| commit | 0dbe0de7ea4895497960b19e7ef31aa81b97b65a (patch) | |
| tree | b09def316a7ab1e8c77c188c5dc59e0ef13f8490 /multimedia | |
| parent | 8482683a97b9a7dcc9f2ec75b4491487e12b6c47 (diff) | |
| download | pkgsrc-0dbe0de7ea4895497960b19e7ef31aa81b97b65a.tar.gz | |
Add DEPENDS for libflashsupport for non Linux systems.
Thanks to Tomas Bodzar for catching this
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/adobe-flash-plugin/Makefile | 7 | ||||
| -rw-r--r-- | multimedia/adobe-flash-plugin10.1/Makefile | 8 | ||||
| -rw-r--r-- | multimedia/adobe-flash-plugin10.1/options.mk | 4 |
3 files changed, 14 insertions, 5 deletions
diff --git a/multimedia/adobe-flash-plugin/Makefile b/multimedia/adobe-flash-plugin/Makefile index bc82456c0b2..d96ee7b467e 100644 --- a/multimedia/adobe-flash-plugin/Makefile +++ b/multimedia/adobe-flash-plugin/Makefile @@ -1,5 +1,6 @@ -# $NetBSD: Makefile,v 1.6 2011/03/28 12:24:48 obache Exp $ +# $NetBSD: Makefile,v 1.7 2011/10/27 11:46:20 abs Exp $ +PKGREVISION= 1 CATEGORIES= multimedia www MASTER_SITES= http://download.macromedia.com/pub/labs/flashplayer10/ MASTER_SITES+= ftp://ftp.dvo.ru/pub/Gentoo/distfiles/ @@ -29,6 +30,10 @@ EMUL_REQD= suse>=10.0 .include "../../mk/bsd.prefs.mk" +.if ${OPSYS} != "Linux" +DEPENDS+= libflashsupport-[0-9]*:../../multimedia/libflashsupport +.endif + # Defaults so lintpkgsrc is happy FLASH_VERS= 10.0.0.525 .if ${EMUL_PLATFORM} == "linux-i386" diff --git a/multimedia/adobe-flash-plugin10.1/Makefile b/multimedia/adobe-flash-plugin10.1/Makefile index c9b12a12876..360c8b1f7a2 100644 --- a/multimedia/adobe-flash-plugin10.1/Makefile +++ b/multimedia/adobe-flash-plugin10.1/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2011/09/12 23:35:15 abs Exp $ +# $NetBSD: Makefile,v 1.11 2011/10/27 11:46:20 abs Exp $ PKGNAME= adobe-flash-plugin-${FLASH_VERSION:S/r/./} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= multimedia www MASTER_SITES= http://fpdownload.macromedia.com/get/flashplayer/current/ @@ -39,6 +39,10 @@ NS_PLUGINS_DIR= ${PREFIX}/lib/netscape/plugins .include "options.mk" +.if ${OPSYS} != "Linux" +DEPENDS+= libflashsupport-[0-9]*:../../multimedia/libflashsupport +.endif + do-install: ${INSTALL_DATA_DIR} ${DESTDIR}${NS_PLUGINS_DIR} ${INSTALL_DATA} ${WRKSRC}/usr/lib/flash-plugin/libflashplayer.so \ diff --git a/multimedia/adobe-flash-plugin10.1/options.mk b/multimedia/adobe-flash-plugin10.1/options.mk index 2788f554d75..f2df3cc6bc6 100644 --- a/multimedia/adobe-flash-plugin10.1/options.mk +++ b/multimedia/adobe-flash-plugin10.1/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2011/09/12 23:35:15 abs Exp $ +# $NetBSD: options.mk,v 1.4 2011/10/27 11:46:20 abs Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.adobe-flash-plugin @@ -13,7 +13,7 @@ PKG_SUPPORTED_OPTIONS= nspluginwrapper .include "../../mk/bsd.prefs.mk" .if ${MACHINE_ARCH} == "i386" && ${OPSYS} != "Linux" -PKG_SUGGESTED_OPTIONS= nspluginwrapper +PKG_SUGGESTED_OPTIONS= nspluginwrapper .endif .include "../../mk/bsd.options.mk" |