Date: Thu, 14 Nov 2013 10:24:18 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1382 - in trunk: mail/linux-thunderbird mail/thunderbird/files www/firefox-esr/files www/firefox-nightly/files www/firefox/files www/libxul/files www/linux-firefox www/linux-seamonkey www/linux-tor-browser www/seamonkey/files Message-ID: <201311141024.rAEAOINf079820@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Thu Nov 14 10:24:18 2013 New Revision: 1382 Log: fixup bitrot Modified: trunk/mail/linux-thunderbird/pkg-plist trunk/mail/thunderbird/files/patch-mail-app-nsMailApp.cpp trunk/www/firefox-esr/files/patch-browser-app-nsBrowserApp.cpp trunk/www/firefox-nightly/files/patch-browser-app-nsBrowserApp.cpp trunk/www/firefox/files/patch-browser-app-nsBrowserApp.cpp trunk/www/libxul/files/patch-build_unix_run-mozilla.sh trunk/www/libxul/files/patch-xulrunner-stub-nsXULStub.cpp trunk/www/linux-firefox/pkg-plist trunk/www/linux-seamonkey/Makefile.common trunk/www/linux-seamonkey/pkg-plist trunk/www/linux-tor-browser/Makefile trunk/www/seamonkey/files/patch-suite-app-nsSuiteApp.cpp Modified: trunk/mail/linux-thunderbird/pkg-plist ============================================================================== --- trunk/mail/linux-thunderbird/pkg-plist Thu Nov 14 10:24:08 2013 (r1381) +++ trunk/mail/linux-thunderbird/pkg-plist Thu Nov 14 10:24:18 2013 (r1382) @@ -71,7 +71,7 @@ lib/%%APP_NAME%%/update-settings.ini lib/%%APP_NAME%%/updater lib/%%APP_NAME%%/updater.ini -@exec /bin/cp -R %%LOCALBASE%%/lib/npapi/symlinks/%%APP_NAME%%/ %D/lib/%%APP_NAME%%/plugins/ 2>/dev/null || true +@exec /bin/cp -R %%LOCALBASE%%/lib/browser_plugins/symlinks/%%APP_NAME%%/ %D/lib/%%APP_NAME%%/plugins/ 2>/dev/null || true @exec /bin/cp -R %%LOCALBASE%%/lib/xpi/symlinks/%%APP_NAME%%/ %D/lib/%%APP_NAME%%/extensions/ 2>/dev/null || true @unexec /usr/bin/find %D/lib/%%APP_NAME%%/plugins/ -depth 1 -type l -delete 2>/dev/null || true @unexec /usr/bin/find %D/lib/%%APP_NAME%%/extensions/ -depth 1 -type l -delete 2>/dev/null || true Modified: trunk/mail/thunderbird/files/patch-mail-app-nsMailApp.cpp ============================================================================== --- trunk/mail/thunderbird/files/patch-mail-app-nsMailApp.cpp Thu Nov 14 10:24:08 2013 (r1381) +++ trunk/mail/thunderbird/files/patch-mail-app-nsMailApp.cpp Thu Nov 14 10:24:18 2013 (r1382) @@ -4,7 +4,7 @@ TriggerQuirks(); #endif -+ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko19:%%LOCALBASE%%/lib/npapi/symlinks/thunderbird", 0); ++ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko:%%LOCALBASE%%/lib/browser_plugins/symlinks/thunderbird", 0); nsresult rv = mozilla::BinaryPath::Get(argv[0], exePath); if (NS_FAILED(rv)) { Output("Couldn't calculate the application directory.\n"); Modified: trunk/www/firefox-esr/files/patch-browser-app-nsBrowserApp.cpp ============================================================================== --- trunk/www/firefox-esr/files/patch-browser-app-nsBrowserApp.cpp Thu Nov 14 10:24:08 2013 (r1381) +++ trunk/www/firefox-esr/files/patch-browser-app-nsBrowserApp.cpp Thu Nov 14 10:24:18 2013 (r1382) @@ -4,7 +4,7 @@ TriggerQuirks(); #endif -+ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko19:%%LOCALBASE%%/lib/npapi/symlinks/firefox", 0); ++ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko:%%LOCALBASE%%/lib/browser_plugins/symlinks/firefox", 0); int gotCounters; #if defined(XP_UNIX) struct rusage initialRUsage; Modified: trunk/www/firefox-nightly/files/patch-browser-app-nsBrowserApp.cpp ============================================================================== --- trunk/www/firefox-nightly/files/patch-browser-app-nsBrowserApp.cpp Thu Nov 14 10:24:08 2013 (r1381) +++ trunk/www/firefox-nightly/files/patch-browser-app-nsBrowserApp.cpp Thu Nov 14 10:24:18 2013 (r1382) @@ -4,7 +4,7 @@ TriggerQuirks(); #endif -+ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko19:%%LOCALBASE%%/lib/npapi/symlinks/firefox", 0); ++ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko:%%LOCALBASE%%/lib/browser_plugins/symlinks/firefox", 0); int gotCounters; #if defined(XP_UNIX) struct rusage initialRUsage; Modified: trunk/www/firefox/files/patch-browser-app-nsBrowserApp.cpp ============================================================================== --- trunk/www/firefox/files/patch-browser-app-nsBrowserApp.cpp Thu Nov 14 10:24:08 2013 (r1381) +++ trunk/www/firefox/files/patch-browser-app-nsBrowserApp.cpp Thu Nov 14 10:24:18 2013 (r1382) @@ -4,7 +4,7 @@ TriggerQuirks(); #endif -+ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko19:%%LOCALBASE%%/lib/npapi/symlinks/firefox", 0); ++ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko:%%LOCALBASE%%/lib/browser_plugins/symlinks/firefox", 0); int gotCounters; #if defined(XP_UNIX) struct rusage initialRUsage; Modified: trunk/www/libxul/files/patch-build_unix_run-mozilla.sh ============================================================================== --- trunk/www/libxul/files/patch-build_unix_run-mozilla.sh Thu Nov 14 10:24:08 2013 (r1381) +++ trunk/www/libxul/files/patch-build_unix_run-mozilla.sh Thu Nov 14 10:24:18 2013 (r1382) @@ -4,7 +4,7 @@ export MOZILLA_FIVE_HOME LD_LIBRARY_PATH export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH -+MOZ_PLUGIN_PATH=%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko19:%%LOCALBASE%%/lib/npapi/symlinks/firefox ++MOZ_PLUGIN_PATH=%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko:%%LOCALBASE%%/lib/browser_plugins/symlinks/firefox +export MOZ_PLUGIN_PATH + if [ $moz_debug -eq 1 ] Modified: trunk/www/libxul/files/patch-xulrunner-stub-nsXULStub.cpp ============================================================================== --- trunk/www/libxul/files/patch-xulrunner-stub-nsXULStub.cpp Thu Nov 14 10:24:08 2013 (r1381) +++ trunk/www/libxul/files/patch-xulrunner-stub-nsXULStub.cpp Thu Nov 14 10:24:18 2013 (r1382) @@ -4,7 +4,7 @@ char greDir[MAXPATHLEN]; bool greFound = false; -+ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko19:%%LOCALBASE%%/lib/npapi/symlinks/xulrunner", 0); ++ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko:%%LOCALBASE%%/lib/browser_plugins/symlinks/xulrunner", 0); + #if defined(XP_MACOSX) CFBundleRef appBundle = CFBundleGetMainBundle(); Modified: trunk/www/linux-firefox/pkg-plist ============================================================================== --- trunk/www/linux-firefox/pkg-plist Thu Nov 14 10:24:08 2013 (r1381) +++ trunk/www/linux-firefox/pkg-plist Thu Nov 14 10:24:18 2013 (r1382) @@ -68,7 +68,7 @@ lib/%%APP_NAME%%/webapprt-stub lib/%%APP_NAME%%/webapprt/omni.ja lib/%%APP_NAME%%/webapprt/webapprt.ini -@exec /bin/cp -R %%LOCALBASE%%/lib/npapi/symlinks/%%APP_NAME%%/ %D/lib/%%APP_NAME%%/browser/plugins/ 2>/dev/null || true +@exec /bin/cp -R %%LOCALBASE%%/lib/browser_plugins/symlinks/%%APP_NAME%%/ %D/lib/%%APP_NAME%%/browser/plugins/ 2>/dev/null || true @exec /bin/cp -R %%LOCALBASE%%/lib/xpi/symlinks/%%APP_NAME%%/ %D/lib/%%APP_NAME%%/browser/extensions/ 2>/dev/null || true @unexec /usr/bin/find %D/lib/%%APP_NAME%%/browser/plugins/ -depth 1 -type l -delete 2>/dev/null || true @unexec /usr/bin/find %D/lib/%%APP_NAME%%/browser/extensions/ -depth 1 -type l -delete 2>/dev/null || true Modified: trunk/www/linux-seamonkey/Makefile.common ============================================================================== --- trunk/www/linux-seamonkey/Makefile.common Thu Nov 14 10:24:08 2013 (r1381) +++ trunk/www/linux-seamonkey/Makefile.common Thu Nov 14 10:24:18 2013 (r1382) @@ -73,7 +73,7 @@ @${CP} -pR ${WRKSRC}/ ${FDIR}/ @${CHOWN} -R ${BINOWN}:${BINGRP} ${FDIR}/ @${LN} -sf ${FDIR}/${BIN_NAME} ${PREFIX}/bin/${APP_NAME} - @${CP} -R ${LOCALBASE}/lib/npapi/symlinks/${APP_NAME}/ \ + @${CP} -R ${LOCALBASE}/lib/browser_plugins/symlinks/${APP_NAME}/ \ ${FDIR}/${APP_SUBDIR}plugins/ ${_Q} @${CP} -R ${LOCALBASE}/lib/xpi/symlinks/${APP_NAME}/ \ ${FDIR}/${APP_SUBDIR}extensions/ ${_Q} @@ -105,7 +105,7 @@ ${ECHO_CMD} share/applications/%%APP_NAME%%.desktop >> ${PLIST} cd ${WRKSRC} && ${FIND} -s . -type f -or -type l | \ ${SED} -e "s#^\.#lib/%%APP_NAME%%#" | ${SORT} >> ${PLIST} - ${ECHO_CMD} '@exec ${CP} -R %%LOCALBASE%%/lib/npapi/symlinks/%%APP_NAME%%/ \ + ${ECHO_CMD} '@exec ${CP} -R %%LOCALBASE%%/lib/browser_plugins/symlinks/%%APP_NAME%%/ \ %D/lib/%%APP_NAME%%/${APP_SUBDIR}plugins/ ${_Q}' >> ${PLIST} ${ECHO_CMD} '@exec ${CP} -R %%LOCALBASE%%/lib/xpi/symlinks/%%APP_NAME%%/ \ %D/lib/%%APP_NAME%%/${APP_SUBDIR}extensions/ ${_Q}' >> ${PLIST} Modified: trunk/www/linux-seamonkey/pkg-plist ============================================================================== --- trunk/www/linux-seamonkey/pkg-plist Thu Nov 14 10:24:08 2013 (r1381) +++ trunk/www/linux-seamonkey/pkg-plist Thu Nov 14 10:24:18 2013 (r1382) @@ -119,7 +119,7 @@ lib/%%APP_NAME%%/update-settings.ini lib/%%APP_NAME%%/updater lib/%%APP_NAME%%/updater.ini -@exec /bin/cp -R %%LOCALBASE%%/lib/npapi/symlinks/%%APP_NAME%%/ %D/lib/%%APP_NAME%%/plugins/ 2>/dev/null || true +@exec /bin/cp -R %%LOCALBASE%%/lib/browser_plugins/symlinks/%%APP_NAME%%/ %D/lib/%%APP_NAME%%/plugins/ 2>/dev/null || true @exec /bin/cp -R %%LOCALBASE%%/lib/xpi/symlinks/%%APP_NAME%%/ %D/lib/%%APP_NAME%%/extensions/ 2>/dev/null || true @unexec /usr/bin/find %D/lib/%%APP_NAME%%/plugins/ -depth 1 -type l -delete 2>/dev/null || true @unexec /usr/bin/find %D/lib/%%APP_NAME%%/extensions/ -depth 1 -type l -delete 2>/dev/null || true Modified: trunk/www/linux-tor-browser/Makefile ============================================================================== --- trunk/www/linux-tor-browser/Makefile Thu Nov 14 10:24:08 2013 (r1381) +++ trunk/www/linux-tor-browser/Makefile Thu Nov 14 10:24:18 2013 (r1382) @@ -85,7 +85,7 @@ @${MV} ${WRKSRC}/Data ${WRKSRC}/Skel @${LN} -sf ${DATADIR} ${WRKSRC}/Data - @${LN} -sf ${LOCALBASE}/lib/npapi/symlinks/linux-firefox \ + @${LN} -sf ${LOCALBASE}/lib/browser_plugins/symlinks/linux-firefox \ ${WRKSRC}/App/Firefox/plugins @${MKDIR} ${WRKSRC}/App/Firefox/defaults/preferences Modified: trunk/www/seamonkey/files/patch-suite-app-nsSuiteApp.cpp ============================================================================== --- trunk/www/seamonkey/files/patch-suite-app-nsSuiteApp.cpp Thu Nov 14 10:24:08 2013 (r1381) +++ trunk/www/seamonkey/files/patch-suite-app-nsSuiteApp.cpp Thu Nov 14 10:24:18 2013 (r1382) @@ -5,7 +5,7 @@ TriggerQuirks(); #endif + -+ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko19:%%LOCALBASE%%/lib/npapi/symlinks/seamonkey", 0); ++ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko:%%LOCALBASE%%/lib/browser_plugins/symlinks/seamonkey", 0); nsresult rv = mozilla::BinaryPath::Get(argv[0], exePath); if (NS_FAILED(rv)) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311141024.rAEAOINf079820>