diff options
| author | abs <abs> | 2011-10-27 11:48:36 +0000 |
|---|---|---|
| committer | abs <abs> | 2011-10-27 11:48:36 +0000 |
| commit | 5c63b60f8d4ab07aa1ee5fd7ff30f3f72b986ab9 (patch) | |
| tree | 4622c14e795980198f121df2c8fc2b8ebd67ba70 /multimedia | |
| parent | 8a8a0a60091a1351347c579df054591eda81d939 (diff) | |
| download | pkgsrc-5c63b60f8d4ab07aa1ee5fd7ff30f3f72b986ab9.tar.gz | |
Handle last change (libflashsupport) correctly - to match adobe-flash-plugin
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/adobe-flash-plugin10.1/Makefile | 8 | ||||
| -rw-r--r-- | multimedia/adobe-flash-plugin10.1/options.mk | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/multimedia/adobe-flash-plugin10.1/Makefile b/multimedia/adobe-flash-plugin10.1/Makefile index 360c8b1f7a2..4e1bc045f70 100644 --- a/multimedia/adobe-flash-plugin10.1/Makefile +++ b/multimedia/adobe-flash-plugin10.1/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.11 2011/10/27 11:46:20 abs Exp $ +# $NetBSD: Makefile,v 1.12 2011/10/27 11:48:36 abs Exp $ PKGNAME= adobe-flash-plugin-${FLASH_VERSION:S/r/./} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= multimedia www MASTER_SITES= http://fpdownload.macromedia.com/get/flashplayer/current/ @@ -39,10 +39,6 @@ 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 f2df3cc6bc6..fc04b567a75 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.4 2011/10/27 11:46:20 abs Exp $ +# $NetBSD: options.mk,v 1.5 2011/10/27 11:48:36 abs Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.adobe-flash-plugin @@ -20,6 +20,7 @@ PKG_SUGGESTED_OPTIONS= nspluginwrapper .if !empty(PKG_OPTIONS:Mnspluginwrapper) DEPENDS+= nspluginwrapper>0:../../www/nspluginwrapper +DEPENDS+= libflashsupport{,-pulse}>0:../../multimedia/libflashsupport INSTALL_TEMPLATES+= ${PKGDIR}/INSTALL.nspluginwrapper DEINSTALL_TEMPLATES+= ${PKGDIR}/INSTALL.nspluginwrapper .endif |