cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Same change as done in productivity/sunbird and mail/mozilla-thunderbird,

Browse Source 
harmonize default search paths for systemwide mozilla extensions and
plugins to ${LOCALBASE}/lib/mozilla/{plugins,extensions}. The
install.rdf files take care anyway of telling with which mozapp an xpi
extension is compatible.
This commit is contained in:
landry 2010-04-27 21:03:25 +00:00
parent e138e5f94a
commit 18d99d0513
3 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
www/seamonkey/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.44 2010/04/03 09:30:14 landry Exp $
# $OpenBSD: Makefile,v 1.45 2010/04/27 21:03:25 landry Exp $
SHARED_ONLY= Yes
ONLY_FOR_ARCHS= alpha amd64 i386 powerpc sparc sparc64
@ -7,7 +7,7 @@ COMMENT= integrated mozilla application suite
VER= 2.0.4
DISTNAME= seamonkey-${VER}.source
PKGNAME= seamonkey-${VER}
PKGNAME= seamonkey-${VER}p0
EXTRACT_SUFX= .tar.bz2
# must be in sync with SO_VERSION in mail/mozilla-thunderbird
@ -157,6 +157,7 @@ pre-configure:
cd ${WRKSRC}/mozilla/js/src && ${SETENV} ${AUTOCONF_ENV} ${AUTOCONF}
cd ${WRKSRC}/mozilla/nsprpub && ${SETENV} ${AUTOCONF_ENV} ${AUTOCONF}
${SUBST_CMD} ${WRKSRC}/mozilla/js/src/xpconnect/shell/Makefile.in \
${WRKSRC}/mozilla/xpcom/io/nsAppFileLocationProvider.cpp \
${WRKSRC}/mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp \
${WRKSRC}/mozilla/build/unix/mozilla.in \
${WRKSRC}/mozilla/toolkit/xre/nsXREDirProvider.cpp

4
www/seamonkey/patches/patch-mozilla_toolkit_xre_nsXREDirProvider_cpp
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-mozilla_toolkit_xre_nsXREDirProvider_cpp,v 1.1 2010/04/03 09:30:15 landry Exp $
$OpenBSD: patch-mozilla_toolkit_xre_nsXREDirProvider_cpp,v 1.2 2010/04/27 21:03:25 landry Exp $
--- mozilla/toolkit/xre/nsXREDirProvider.cpp.orig Sat Dec 5 02:56:51 2009
+++ mozilla/toolkit/xre/nsXREDirProvider.cpp Sat Jan 16 16:31:41 2010
@@ -1144,11 +1144,7 @@ nsXREDirProvider::GetSystemExtensionsDirectory(nsILoca
@ -10,7 +10,7 @@ $OpenBSD: patch-mozilla_toolkit_xre_nsXREDirProvider_cpp,v 1.1 2010/04/03 09:30:
-#else
- "/usr/lib/mozilla/extensions";
-#endif
+ "${LOCALBASE}/lib/mozilla-extensions";
+ "${LOCALBASE}/lib/mozilla/extensions";
rv = NS_NewNativeLocalFile(nsDependentCString(sysSExtDir), PR_FALSE,
getter_AddRefs(localDir));

17
www/seamonkey/patches/patch-mozilla_xpcom_io_nsAppFileLocationProvider_cpp Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-mozilla_xpcom_io_nsAppFileLocationProvider_cpp,v 1.1 2010/04/27 21:03:25 landry Exp $
--- mozilla/xpcom/io/nsAppFileLocationProvider.cpp.orig Sat Apr 24 16:14:01 2010
+++ mozilla/xpcom/io/nsAppFileLocationProvider.cpp Sat Apr 24 16:14:26 2010
@@ -254,12 +254,7 @@ nsAppFileLocationProvider::GetFile(const char *prop, P
}
#ifdef XP_UNIX
else if (nsCRT::strcmp(prop, NS_SYSTEM_PLUGINS_DIR) == 0) {
- static const char *const sysLPlgDir =
-#if defined(HAVE_USR_LIB64_DIR) && defined(__LP64__)
- "/usr/lib64/mozilla/plugins";
-#else
- "/usr/lib/mozilla/plugins";
-#endif
+ static const char *const sysLPlgDir = "${LOCALBASE}/lib/mozilla/plugins";
rv = NS_NewNativeLocalFile(nsDependentCString(sysLPlgDir),
PR_FALSE, getter_AddRefs(localFile));
}