Be sure to create the browser_plugins during package install as well. Some

ports (e.g. www/ump) depend on this directory being there.

Reported by:	pointyhat via kris

26 files changed, 69 insertions, 4 deletions

diff --git a/www/firefox-devel/Makefile b/www/firefox-devel/Makefile
index 4eb85744734b..83de1a8e522c 100644
--- a/www/firefox-devel/Makefile
+++ b/www/firefox-devel/Makefile
@@ -126,6 +126,7 @@ post-extract::
 
 post-patch:
 	@${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${FIREFOX}|g ; \
+		s|%%PREFIX%%|${PREFIX}|g ; \
 		s|%%X11BASE%%|${X11BASE}|g' \
 		< ${MASTERDIR}/pkg-install.in > ${PKGINSTALL}
 	@${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${FIREFOX}|g' \
diff --git a/www/firefox-devel/pkg-install.in b/www/firefox-devel/pkg-install.in
index 8f8dbd0c6cc3..f25aa135197d 100644
--- a/www/firefox-devel/pkg-install.in
+++ b/www/firefox-devel/pkg-install.in
@@ -29,4 +29,8 @@ cd ${MOZDIR} || exit 1
 ./run-mozilla.sh ${REGCHROME} || true
 ./run-mozilla.sh ${FIREFOX} -register > /dev/null 2>&1
 
+if [ ! -d %%PREFIX%%/lib/browser_plugins ]; then
+    mkdir -p %%PREFIX%%/lib/browser_plugins
+fi
+
 exit 0
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index 4eb85744734b..83de1a8e522c 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -126,6 +126,7 @@ post-extract::
 
 post-patch:
 	@${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${FIREFOX}|g ; \
+		s|%%PREFIX%%|${PREFIX}|g ; \
 		s|%%X11BASE%%|${X11BASE}|g' \
 		< ${MASTERDIR}/pkg-install.in > ${PKGINSTALL}
 	@${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${FIREFOX}|g' \
diff --git a/www/firefox-esr/pkg-install.in b/www/firefox-esr/pkg-install.in
index 8f8dbd0c6cc3..f25aa135197d 100644
--- a/www/firefox-esr/pkg-install.in
+++ b/www/firefox-esr/pkg-install.in
@@ -29,4 +29,8 @@ cd ${MOZDIR} || exit 1
 ./run-mozilla.sh ${REGCHROME} || true
 ./run-mozilla.sh ${FIREFOX} -register > /dev/null 2>&1
 
+if [ ! -d %%PREFIX%%/lib/browser_plugins ]; then
+    mkdir -p %%PREFIX%%/lib/browser_plugins
+fi
+
 exit 0
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 4eb85744734b..83de1a8e522c 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -126,6 +126,7 @@ post-extract::
 
 post-patch:
 	@${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${FIREFOX}|g ; \
+		s|%%PREFIX%%|${PREFIX}|g ; \
 		s|%%X11BASE%%|${X11BASE}|g' \
 		< ${MASTERDIR}/pkg-install.in > ${PKGINSTALL}
 	@${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${FIREFOX}|g' \
diff --git a/www/firefox/pkg-install.in b/www/firefox/pkg-install.in
index 8f8dbd0c6cc3..f25aa135197d 100644
--- a/www/firefox/pkg-install.in
+++ b/www/firefox/pkg-install.in
@@ -29,4 +29,8 @@ cd ${MOZDIR} || exit 1
 ./run-mozilla.sh ${REGCHROME} || true
 ./run-mozilla.sh ${FIREFOX} -register > /dev/null 2>&1
 
+if [ ! -d %%PREFIX%%/lib/browser_plugins ]; then
+    mkdir -p %%PREFIX%%/lib/browser_plugins
+fi
+
 exit 0
diff --git a/www/firefox10/Makefile b/www/firefox10/Makefile
index 4eb85744734b..83de1a8e522c 100644
--- a/www/firefox10/Makefile
+++ b/www/firefox10/Makefile
@@ -126,6 +126,7 @@ post-extract::
 
 post-patch:
 	@${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${FIREFOX}|g ; \
+		s|%%PREFIX%%|${PREFIX}|g ; \
 		s|%%X11BASE%%|${X11BASE}|g' \
 		< ${MASTERDIR}/pkg-install.in > ${PKGINSTALL}
 	@${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${FIREFOX}|g' \
diff --git a/www/firefox10/pkg-install.in b/www/firefox10/pkg-install.in
index 8f8dbd0c6cc3..f25aa135197d 100644
--- a/www/firefox10/pkg-install.in
+++ b/www/firefox10/pkg-install.in
@@ -29,4 +29,8 @@ cd ${MOZDIR} || exit 1
 ./run-mozilla.sh ${REGCHROME} || true
 ./run-mozilla.sh ${FIREFOX} -register > /dev/null 2>&1
 
+if [ ! -d %%PREFIX%%/lib/browser_plugins ]; then
+    mkdir -p %%PREFIX%%/lib/browser_plugins
+fi
+
 exit 0
diff --git a/www/firefox15/Makefile b/www/firefox15/Makefile
index 4eb85744734b..83de1a8e522c 100644
--- a/www/firefox15/Makefile
+++ b/www/firefox15/Makefile
@@ -126,6 +126,7 @@ post-extract::
 
 post-patch:
 	@${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${FIREFOX}|g ; \
+		s|%%PREFIX%%|${PREFIX}|g ; \
 		s|%%X11BASE%%|${X11BASE}|g' \
 		< ${MASTERDIR}/pkg-install.in > ${PKGINSTALL}
 	@${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${FIREFOX}|g' \
diff --git a/www/firefox15/pkg-install.in b/www/firefox15/pkg-install.in
index 8f8dbd0c6cc3..f25aa135197d 100644
--- a/www/firefox15/pkg-install.in
+++ b/www/firefox15/pkg-install.in
@@ -29,4 +29,8 @@ cd ${MOZDIR} || exit 1
 ./run-mozilla.sh ${REGCHROME} || true
 ./run-mozilla.sh ${FIREFOX} -register > /dev/null 2>&1
 
+if [ ! -d %%PREFIX%%/lib/browser_plugins ]; then
+    mkdir -p %%PREFIX%%/lib/browser_plugins
+fi
+
 exit 0
diff --git a/www/firefox3-devel/Makefile b/www/firefox3-devel/Makefile
index 4eb85744734b..83de1a8e522c 100644
--- a/www/firefox3-devel/Makefile
+++ b/www/firefox3-devel/Makefile
@@ -126,6 +126,7 @@ post-extract::
 
 post-patch:
 	@${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${FIREFOX}|g ; \
+		s|%%PREFIX%%|${PREFIX}|g ; \
 		s|%%X11BASE%%|${X11BASE}|g' \
 		< ${MASTERDIR}/pkg-install.in > ${PKGINSTALL}
 	@${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${FIREFOX}|g' \
diff --git a/www/firefox3-devel/pkg-install.in b/www/firefox3-devel/pkg-install.in
index 8f8dbd0c6cc3..f25aa135197d 100644
--- a/www/firefox3-devel/pkg-install.in
+++ b/www/firefox3-devel/pkg-install.in
@@ -29,4 +29,8 @@ cd ${MOZDIR} || exit 1
 ./run-mozilla.sh ${REGCHROME} || true
 ./run-mozilla.sh ${FIREFOX} -register > /dev/null 2>&1
 
+if [ ! -d %%PREFIX%%/lib/browser_plugins ]; then
+    mkdir -p %%PREFIX%%/lib/browser_plugins
+fi
+
 exit 0
diff --git a/www/firefox35/Makefile b/www/firefox35/Makefile
index 4eb85744734b..83de1a8e522c 100644
--- a/www/firefox35/Makefile
+++ b/www/firefox35/Makefile
@@ -126,6 +126,7 @@ post-extract::
 
 post-patch:
 	@${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${FIREFOX}|g ; \
+		s|%%PREFIX%%|${PREFIX}|g ; \
 		s|%%X11BASE%%|${X11BASE}|g' \
 		< ${MASTERDIR}/pkg-install.in > ${PKGINSTALL}
 	@${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${FIREFOX}|g' \
diff --git a/www/firefox35/pkg-install.in b/www/firefox35/pkg-install.in
index 8f8dbd0c6cc3..f25aa135197d 100644
--- a/www/firefox35/pkg-install.in
+++ b/www/firefox35/pkg-install.in
@@ -29,4 +29,8 @@ cd ${MOZDIR} || exit 1
 ./run-mozilla.sh ${REGCHROME} || true
 ./run-mozilla.sh ${FIREFOX} -register > /dev/null 2>&1
 
+if [ ! -d %%PREFIX%%/lib/browser_plugins ]; then
+    mkdir -p %%PREFIX%%/lib/browser_plugins
+fi
+
 exit 0
diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile
index 4eb85744734b..83de1a8e522c 100644
--- a/www/firefox36/Makefile
+++ b/www/firefox36/Makefile
@@ -126,6 +126,7 @@ post-extract::
 
 post-patch:
 	@${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${FIREFOX}|g ; \
+		s|%%PREFIX%%|${PREFIX}|g ; \
 		s|%%X11BASE%%|${X11BASE}|g' \
 		< ${MASTERDIR}/pkg-install.in > ${PKGINSTALL}
 	@${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${FIREFOX}|g' \
diff --git a/www/firefox36/pkg-install.in b/www/firefox36/pkg-install.in
index 8f8dbd0c6cc3..f25aa135197d 100644
--- a/www/firefox36/pkg-install.in
+++ b/www/firefox36/pkg-install.in
@@ -29,4 +29,8 @@ cd ${MOZDIR} || exit 1
 ./run-mozilla.sh ${REGCHROME} || true
 ./run-mozilla.sh ${FIREFOX} -register > /dev/null 2>&1
 
+if [ ! -d %%PREFIX%%/lib/browser_plugins ]; then
+    mkdir -p %%PREFIX%%/lib/browser_plugins
+fi
+
 exit 0
diff --git a/www/flock/Makefile b/www/flock/Makefile
index 4eb85744734b..83de1a8e522c 100644
--- a/www/flock/Makefile
+++ b/www/flock/Makefile
@@ -126,6 +126,7 @@ post-extract::
 
 post-patch:
 	@${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${FIREFOX}|g ; \
+		s|%%PREFIX%%|${PREFIX}|g ; \
 		s|%%X11BASE%%|${X11BASE}|g' \
 		< ${MASTERDIR}/pkg-install.in > ${PKGINSTALL}
 	@${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${FIREFOX}|g' \
diff --git a/www/flock/pkg-install.in b/www/flock/pkg-install.in
index 8f8dbd0c6cc3..f25aa135197d 100644
--- a/www/flock/pkg-install.in
+++ b/www/flock/pkg-install.in
@@ -29,4 +29,8 @@ cd ${MOZDIR} || exit 1
 ./run-mozilla.sh ${REGCHROME} || true
 ./run-mozilla.sh ${FIREFOX} -register > /dev/null 2>&1
 
+if [ ! -d %%PREFIX%%/lib/browser_plugins ]; then
+    mkdir -p %%PREFIX%%/lib/browser_plugins
+fi
+
 exit 0
diff --git a/www/mozilla-devel/Makefile b/www/mozilla-devel/Makefile
index 98607b8830f0..97ad72c77fd3 100644
--- a/www/mozilla-devel/Makefile
+++ b/www/mozilla-devel/Makefile
@@ -258,7 +258,8 @@ post-patch:
 			s|mozilla-nspr|mozilla-nspr${MOZ_SUFX}|g' \
 			${WRKSRC}/build/unix/$${pcfile}.pc.in; \
 	done
-	@${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${MOZILLA}|g' \
+	@${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${MOZILLA}|g ; \
+		s|%%PREFIX%%|${PREFIX}|g' \
 		< ${MASTERDIR}/pkg-install.in > ${PKGINSTALL}
 	@${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${MOZILLA}|g' \
 		< ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL}
diff --git a/www/mozilla-devel/pkg-install.in b/www/mozilla-devel/pkg-install.in
index 3687532f1882..79a65c81189a 100644
--- a/www/mozilla-devel/pkg-install.in
+++ b/www/mozilla-devel/pkg-install.in
@@ -26,4 +26,8 @@ cd ${MOZDIR} || exit 1
 ./run-mozilla.sh ${REGXPCOM} || true
 ./run-mozilla.sh ${REGCHROME} || true
 
+if [ ! -d %%PREFIX%%/lib/browser_plugins ]; then
+    mkdir -p %%PREFIX%%/lib/browser_plugins
+fi
+
 exit 0
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index d9fe00c9191f..16c8efd009cf 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -267,7 +267,8 @@ post-patch:
 			s|mozilla-nspr|mozilla-nspr${MOZ_SUFX}${PKGNAMESUFFIX}|g' \
 			${WRKSRC}/build/unix/$${pcfile}.pc.in; \
 	done
-	@${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${MOZILLA}|g' \
+	@${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${MOZILLA}|g ; \
+		s|%%PREFIX%%|${PREFIX}|g' \
 		< ${MASTERDIR}/pkg-install.in > ${PKGINSTALL}
 	@${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${MOZILLA}|g' \
 		< ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL}
diff --git a/www/mozilla/pkg-install.in b/www/mozilla/pkg-install.in
index 3687532f1882..79a65c81189a 100644
--- a/www/mozilla/pkg-install.in
+++ b/www/mozilla/pkg-install.in
@@ -26,4 +26,8 @@ cd ${MOZDIR} || exit 1
 ./run-mozilla.sh ${REGXPCOM} || true
 ./run-mozilla.sh ${REGCHROME} || true
 
+if [ ! -d %%PREFIX%%/lib/browser_plugins ]; then
+    mkdir -p %%PREFIX%%/lib/browser_plugins
+fi
+
 exit 0
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 98607b8830f0..97ad72c77fd3 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -258,7 +258,8 @@ post-patch:
 			s|mozilla-nspr|mozilla-nspr${MOZ_SUFX}|g' \
 			${WRKSRC}/build/unix/$${pcfile}.pc.in; \
 	done
-	@${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${MOZILLA}|g' \
+	@${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${MOZILLA}|g ; \
+		s|%%PREFIX%%|${PREFIX}|g' \
 		< ${MASTERDIR}/pkg-install.in > ${PKGINSTALL}
 	@${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${MOZILLA}|g' \
 		< ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL}
diff --git a/www/seamonkey/pkg-install.in b/www/seamonkey/pkg-install.in
index 3687532f1882..79a65c81189a 100644
--- a/www/seamonkey/pkg-install.in
+++ b/www/seamonkey/pkg-install.in
@@ -26,4 +26,8 @@ cd ${MOZDIR} || exit 1
 ./run-mozilla.sh ${REGXPCOM} || true
 ./run-mozilla.sh ${REGCHROME} || true
 
+if [ ! -d %%PREFIX%%/lib/browser_plugins ]; then
+    mkdir -p %%PREFIX%%/lib/browser_plugins
+fi
+
 exit 0
diff --git a/www/seamonkey2/Makefile b/www/seamonkey2/Makefile
index 98607b8830f0..97ad72c77fd3 100644
--- a/www/seamonkey2/Makefile
+++ b/www/seamonkey2/Makefile
@@ -258,7 +258,8 @@ post-patch:
 			s|mozilla-nspr|mozilla-nspr${MOZ_SUFX}|g' \
 			${WRKSRC}/build/unix/$${pcfile}.pc.in; \
 	done
-	@${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${MOZILLA}|g' \
+	@${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${MOZILLA}|g ; \
+		s|%%PREFIX%%|${PREFIX}|g' \
 		< ${MASTERDIR}/pkg-install.in > ${PKGINSTALL}
 	@${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${MOZILLA}|g' \
 		< ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL}
diff --git a/www/seamonkey2/pkg-install.in b/www/seamonkey2/pkg-install.in
index 3687532f1882..79a65c81189a 100644
--- a/www/seamonkey2/pkg-install.in
+++ b/www/seamonkey2/pkg-install.in
@@ -26,4 +26,8 @@ cd ${MOZDIR} || exit 1
 ./run-mozilla.sh ${REGXPCOM} || true
 ./run-mozilla.sh ${REGCHROME} || true
 
+if [ ! -d %%PREFIX%%/lib/browser_plugins ]; then
+    mkdir -p %%PREFIX%%/lib/browser_plugins
+fi
+
 exit 0