Merge branch 'master' of github.com:pcbsd/pbi

pcbsd · Oct 18, 2013 · 430f507 · 430f507
2 parents d9e1d78 + ae74c62
commit 430f507
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 58 deletions.
diff --git a/modules10/www/chromium/pbi.conf b/modules10/www/chromium/pbi.conf
@@ -26,7 +26,7 @@ PBI_MAKEOPTS="chromium_SET=CUPS CODECS CLANG"
 
 # Ports to build before / after
 PBI_MKPORTBEFORE=""
-PBI_MKPORTAFTER="security/nss security/openssl"
+PBI_MKPORTAFTER="security/nss security/openssl www/linux-f10-flashplugin11 www/nspluginwrapper"
 
 # Set build key
 PBI_BUILDKEY="13"

diff --git a/modules10/www/firefox-esr/pbi.conf b/modules10/www/firefox-esr/pbi.conf
@@ -6,7 +6,7 @@ PBI_PROGICON="firefox.png"
 PBI_MAKEPORT="www/firefox-esr"
 PBI_MKPORTBEFORE=""
 
-PBI_MKPORTAFTER="www/firefox-esr-i18n"
+PBI_MKPORTAFTER="www/firefox-esr-i18n www/linux-f10-flashplugin11 www/nspluginwrapper"
 
 PBI_MAKEOPTS=""
 PBI_BUILDKEY="01"; export PBI_BUILDKEY

diff --git a/modules10/www/firefox/pbi.conf b/modules10/www/firefox/pbi.conf
@@ -27,7 +27,7 @@ WITH_CUPS=yes"
 
 # Ports to build before / after
 PBI_MKPORTBEFORE=""
-PBI_MKPORTAFTER="devel/gnome-vfs audio/esound x11-fonts/dejavu x11-themes/qtcurve-gtk2 devel/gconf2 x11/libXScrnSaver www/gecko-mediaplayer www/firefox-i18n"
+PBI_MKPORTAFTER="devel/gnome-vfs audio/esound x11-fonts/dejavu x11-themes/qtcurve-gtk2 devel/gconf2 x11/libXScrnSaver www/gecko-mediaplayer www/firefox-i18n www/linux-f10-flashplugin11 www/nspluginwrapper"
 
 PBI_BUILDKEY="11"
 

diff --git a/modules10/www/firefox/scripts/post-portmake.sh b/modules10/www/firefox/scripts/post-portmake.sh
@@ -1,8 +1 @@
 #!/bin/sh
-
-cp ${PBI_PROGDIRPATH}/lib/libevent* ${PBI_PROGDIRPATH}/lib/firefox/
-
-rm -rf ${PBI_PROGDIRPATH}/include
-rm -rf ${PBI_PROGDIRPATH}/man
-rm -rf ${PBI_PROGDIRPATH}/share/doc
-rm -rf ${PBI_PROGDIRPATH}/lib/libxul
diff --git a/modules10/www/opera/pbi.conf b/modules10/www/opera/pbi.conf
@@ -23,7 +23,7 @@ PBI_MAKEPORT="www/opera"
 
 # Ports to build before / after
 PBI_MKPORTBEFORE=""
-PBI_MKPORTAFTER="www/opera-linuxplugins"
+PBI_MKPORTAFTER="www/opera-linuxplugins www/linux-f10-flashplugin11 www/nspluginwrapper"
 
 PBI_AB_PRIORITY="50"