[Lunar-commits] <moonbase-other> Merge branch 'master' of github.com:lunar-linux/moonbase-other

[Florin Braescu]

commit 3241e5e8a3ca74233b574918e7642fd5d34a196c
Author: Florin Braescu <florin at lunar-linux.org>
Date: Sat, 18 Oct 2014 14:47:46 +0300
URL: https://github.com/lunar-linux/moonbase-other/commit/3241e5e8a3ca74233b574918e7642fd5d34a196c

Merge branch 'master' of github.com:lunar-linux/moonbase-other
---
  aliases               | +1/-0     
  web/firefox/CONFIGURE | +1/-1     
  web/firefox/DEPENDS   | +1/-1     
  web/opera/DEPENDS     | +2/-1     
  web/seamonkey/DEPENDS | +1/-1     
  5 files changed, 6 insertions(+), 4 deletions(-)

--- a/aliases
+++ b/aliases
@@ -15,4 +15,5 @@
 %CDR:cdrtools cdrkit dvdrtools
 %MYSQL:mariadb mysql
 %BLUEZ:bluez-5 bluez
+%FLASH:pepperflash flash-plugin-11
 %MOZJS:spidermonkey mozjs
--- a/web/firefox/CONFIGURE
+++ b/web/firefox/CONFIGURE
@@ -1,2 +1,2 @@
-mquery PGO "Build with Profile Guided Optimization? (Requires firefox to be compiled within a running instance of X)"  y  ""  "--disable-tests"
+mquery PGO "Build with Profile Guided Optimization? (Requires firefox to be compiled within a running instance of X)"  n  ""  "--disable-tests"
 mquery SAFE "Enable safe browsing (anti-phishing)?"  y  "--enable-safe-browsing"  "--disable-safe-browsing"
--- a/web/firefox/DEPENDS
+++ b/web/firefox/DEPENDS
@@ -10,7 +10,7 @@ depends libvpx
 optional_depends cairo "--enable-system-cairo" "--disable-system-cairo" "Build with system cairo ${PROBLEM_COLOR}(unstable)"
 
 optional_depends "Python"           ""  ""  "Needed to do a Profile Guided Optimization build"
-optional_depends "flash-plugin-11"  ""  ""  "To enable Flash plugin"
+optional_depends "%FLASH"           ""  ""  "To enable Flash plugin"
 optional_depends "freetype2"        "--enable-tree-freetype" "--disable-tree-freetype" "For freetype font support"
 optional_depends "hunspell"         "--enable-system-hunspell"  "--disable-system-hunspell"  "For spelling support"
 optional_depends "libevent"         "--with-system-libevent"  "--without-system-libevent"  "For system library event detection"
--- a/web/opera/DEPENDS
+++ b/web/opera/DEPENDS
@@ -25,4 +25,5 @@ depends libxcb
 depends xcb-util
 
 optional_depends opera-gtk "" "" "for GTK+ support"
-optional_depends kdelibs  "" "" "for KDE support"
+optional_depends kdelibs   "" "" "for KDE support"
+optional_depends %FLASH    "" "" "adobe flash support"
--- a/web/seamonkey/DEPENDS
+++ b/web/seamonkey/DEPENDS
@@ -10,7 +10,7 @@ depends alsa-lib
 depends libvpx
 
 
-optional_depends "flash-plugin-11"  ""  ""  "To enable Flash plugin"
+optional_depends "%FLASH"           ""  ""  "To enable Flash plugin"
 optional_depends "Python"           ""  ""  "Needed to do a Profile Guided Optimization build"
 
 optional_depends "sqlite"           "--enable-system-sqlite"   "--disable-system-sqlite"   "Use system sqlite. ${PROBLEM_COLOR}Not recommended${DEFAULT_COLOR}"