diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2002-10-23 04:43:15 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2002-10-23 04:43:15 +0000 |
| commit | 6e10330cc5694fb168941322e37245be4c28be26 (patch) | |
| tree | c291e7771b901736a76de9b74f0216081412b5d8 /www/mozilla | |
| parent | * Add a patch that fixes some localization issues [1] (diff) | |
* Fix a problem with plugins not actually loading
* Hopefully correct some issues with installs erroring out with Error 1
Notes
Notes:
svn path=/head/; revision=68632
Diffstat (limited to 'www/mozilla')
| -rw-r--r-- | www/mozilla/Makefile | 17 | ||||
| -rw-r--r-- | www/mozilla/files/patch-build_unix_run-mozilla.sh | 15 |
2 files changed, 23 insertions, 9 deletions
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile index 89272b0913b2..bb9ed664a9bb 100644 --- a/www/mozilla/Makefile +++ b/www/mozilla/Makefile @@ -7,6 +7,7 @@ PORTNAME= mozilla PORTVERSION= 1.1 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA} \ @@ -123,8 +124,9 @@ post-build: pre-install: ${ECHO_CMD} bin/mozilla > ${PLIST} - ${TEST} ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so && \ - ${ECHO_CMD} lib/browser_plugins/libjavaplugin_oji.so >> ${PLIST} + if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then + ${ECHO_CMD} lib/browser_plugins/libjavaplugin_oji.so >> ${PLIST} + fi cd ${WRKSRC}/dist/bin && ${FIND} -s * -type f -o -type l | \ ${SED} -e 's:^:lib/mozilla/:' >> ${PLIST} \ && ${FIND} -d * -type d | \ @@ -137,11 +139,14 @@ do-install: cd ${WRKSRC}/dist/bin && ${FIND} . | \ cpio -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/mozilla ${INSTALL_SCRIPT} ${WRKSRC}/mozilla ${PREFIX}/bin - ${TEST} ! -d ${PREFIX}/lib/browser_plugins && \ - ${MKDIR} ${PREFIX}/lib/browser_plugins - ${TEST} ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so && \ - ${LN} -sf ${LOCALBASE}/jdk1.3.1/jre/plugin/i386/ns600/libjavaplugin_oji.so \ + if [ ! -d ${PREFIX}/lib/browser_plugins ]; then + ${MKDIR} ${PREFIX}/lib/browser_plugins + fi + if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then + + ${LN} -sf ${LOCALBASE}/jdk1.3.1/jre/plugin/i386/ns600/libjavaplugin_oji.so \ ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so + fi post-install: @${CAT} ${PKGMESSAGE} diff --git a/www/mozilla/files/patch-build_unix_run-mozilla.sh b/www/mozilla/files/patch-build_unix_run-mozilla.sh index 6f5bef8901f5..96084fd68646 100644 --- a/www/mozilla/files/patch-build_unix_run-mozilla.sh +++ b/www/mozilla/files/patch-build_unix_run-mozilla.sh @@ -1,5 +1,14 @@ ---- build/unix/run-mozilla.sh.orig Thu Oct 17 00:00:21 2002 -+++ build/unix/run-mozilla.sh Thu Oct 17 00:01:24 2002 +--- build/unix/run-mozilla.sh.orig Wed Oct 23 00:08:03 2002 ++++ build/unix/run-mozilla.sh Wed Oct 23 00:08:59 2002 +@@ -355,7 +355,7 @@ + fi + ## + ## Set LD_LIBRARY_PATH +-LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} ++LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%PREFIX%%/lib/browser_plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} + if [ -n "$LD_LIBRARYN32_PATH" ] + then + LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"} @@ -392,7 +392,7 @@ export XSUNTRANSPORT XSUNSMESIZE fi @@ -14,7 +23,7 @@ export MOZILLA_FIVE_HOME LD_LIBRARY_PATH export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH + -+MOZ_PLUGIN_PATH %%PREFIX%%/lib/browser_plugins ++MOZ_PLUGIN_PATH=%%PREFIX%%/lib/browser_plugins +export MOZ_PLUGIN_PATH if [ $moz_debug -eq 1 ] |