Don't overwrite MOZ_PLUGIN_PATH in the startup script if it has been already

been set. This allows to load plugins on demand, especially interesting when
using multiple profiles with the -no-remote option.
OK martynas@
This commit is contained in:
claudio 2008-07-20 09:49:00 +00:00
parent 066fa4f282
commit 8c7cca2dc8
2 changed files with 4 additions and 4 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.96 2008/07/17 16:47:39 martynas Exp $
# $OpenBSD: Makefile,v 1.97 2008/07/20 09:49:00 claudio Exp $
SHARED_ONLY= Yes
ONLY_FOR_ARCHS= alpha amd64 arm i386 powerpc sparc sparc64
@ -7,7 +7,7 @@ COMMENT= redesign of Mozilla's browser component
VER= 2.0.0.16
DISTNAME= mozilla
PKGNAME= mozilla-firefox-${VER}
PKGNAME= mozilla-firefox-${VER}p0
SO_VERSION= 19.0
# NOTE: Must bump minor version if any shlib's are removed from the
# components dir to avoid pkg_add -r issues.

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-browser_app_mozilla_in,v 1.8 2007/11/28 20:22:25 martynas Exp $
$OpenBSD: patch-browser_app_mozilla_in,v 1.9 2008/07/20 09:49:00 claudio Exp $
--- browser/app/mozilla.in.orig Thu Nov 8 10:53:19 2007
+++ browser/app/mozilla.in Tue Nov 27 11:43:00 2007
@@ -92,7 +92,13 @@ moz_pis_startstop_scripts()
@ -11,7 +11,7 @@ $OpenBSD: patch-browser_app_mozilla_in,v 1.8 2007/11/28 20:22:25 martynas Exp $
+fi
+
moz_libdir=%MOZAPPDIR%
+MOZ_PLUGIN_PATH=_LOCALBASE_/lib/mozilla-plugins
+MOZ_PLUGIN_PATH=${MOZ_PLUGIN_PATH:=_LOCALBASE_/lib/mozilla-plugins}
MRE_HOME=%MREDIR%
# Use run-mozilla.sh in the current dir if it exists