diff -ruN --exclude=CVS mozilla-devel/Makefile seamonkey/Makefile --- mozilla-devel/Makefile Fri Sep 16 14:35:28 2005 +++ seamonkey/Makefile Fri Sep 16 14:30:04 2005 @@ -5,14 +5,12 @@ # $FreeBSD: ports/www/mozilla-devel/Makefile,v 1.230 2005/09/10 17:24:31 pav Exp $ # -PORTNAME?= mozilla -PORTVERSION= 1.8.b1 -PORTREVISION?= 5 -PORTEPOCH?= 2 +PORTNAME?= seamonkey +DISTVERSION= 1.0a CATEGORIES?= www MASTER_SITES= ${MASTER_SITE_MOZILLA} -MASTER_SITE_SUBDIR= mozilla/releases/${PORTNAME}${PORTVERSION:S/.b1/b1/}/source -DISTNAME= ${PORTNAME}-source-${PORTVERSION:S/.b1/b1/} +MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION} +DISTNAME= ${PORTNAME}-${DISTVERSION}.source MAINTAINER= gnome@FreeBSD.org COMMENT= The open source, standards compliant web browser @@ -22,9 +20,9 @@ png.5:${PORTSDIR}/graphics/png \ Xft.2:${PORTSDIR}/x11-fonts/libXft -WRKSRC= ${WRKDIR}/${PORTNAME} -MOZILLA?= mozilla-devel -MOZ_SUFX?= -devel +WRKSRC= ${WRKDIR}/mozilla +MOZILLA?= seamonkey +MOZ_SUFX?= # empty (for now) MOZ_VER?= ${PORTVERSION:S/.b1/b/} LATEST_LINK= ${MOZILLA} EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude */CVS/* \ @@ -212,6 +210,13 @@ .endif post-patch: +.for f in configure allmakefiles.sh build/autoconf/mozconfig2configure \ + build/autoconf/config.sub build/autoconf/config.guess \ + nsprpub/configure + ${MV} ${WRKSRC}/${f} ${WRKSRC}/${f}.bak2 + ${TR} -d \\r <${WRKSRC}/${f}.bak2 > ${WRKSRC}/${f} + ${CHMOD} +x ${WRKSRC}/${f} +.endfor @${REINPLACE_CMD} -e 's/%{idldir}/%idldir%/g' \ ${WRKSRC}/build/unix/mozilla-config.in @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ @@ -219,8 +224,6 @@ @${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \ -e 's|%%HEADERS_SUFX%%|${MOZ_SUFX}|g' \ ${WRKSRC}/config/autoconf.mk.in - @${FIND} ${WRKSRC}/other-licenses/libical -name "*.c" | ${XARGS} \ - ${REINPLACE_CMD} 's|||g' @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ s|-lpthread|${PTHREAD_LIBS}|g' \ ${WRKSRC}/configure \ @@ -246,8 +249,8 @@ ${WRKSRC}/build/unix/$${pcfile}.pc.in; \ done @${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \ - < ${FILESDIR}/mozilla-devel.desktop.in > \ - ${WRKDIR}/mozilla-devel.desktop + < ${FILESDIR}/seamonkey.desktop.in > \ + ${WRKDIR}/seamonkey.desktop pre-configure: @if [ -n "`${PKG_INFO} -xI '^bind[0-9]*-base-[0-9]'`" ]; then \ @@ -282,15 +285,15 @@ fi ${ECHO_CMD} lib/browser_plugins/.${PORTNAME}.keep >> ${PLIST} ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/browser_plugins 2>/dev/null || ${TRUE}" >> ${PLIST} - ${ECHO_CMD} lib/${MOZILLA}/mozilla >> ${PLIST} - ${ECHO_CMD} lib/${MOZILLA}/mozilla-config >> ${PLIST} + ${ECHO_CMD} lib/${MOZILLA}/seamonkey >> ${PLIST} + ${ECHO_CMD} lib/${MOZILLA}/seamonkey-config >> ${PLIST} .for ii in ${MOZ_PIS_SCRIPTS} ${INSTALL_SCRIPT} ${FILESDIR}/moz_pis_${ii} ${MOZ_PIS_DIR}/${ii} .endfor .if !defined(WITHOUT_MAILNEWS) @${CP} -RL ${WRKSRC}/dist/bin/defaults/isp ${FAKEDIR}/lib/${MOZILLA}/defaults .endif - ${ECHO_CMD} share/applications/mozilla-devel.desktop >> ${PLIST} + ${ECHO_CMD} share/applications/seamonkey.desktop >> ${PLIST} ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} cd ${FAKEDIR}/lib/${MOZILLA} && ${FIND} -s * -type f -o -type l | \ ${SED} -e 's:^:lib/${MOZILLA}/:' >> ${PLIST} \ @@ -351,8 +354,7 @@ cd ${FAKEDIR}/include/${MOZILLA} && ${FIND} . | \ ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/${MOZILLA} ${MKDIR} ${PREFIX}/share/applications - ${INSTALL_DATA} ${WRKDIR}/mozilla-devel.desktop \ - ${PREFIX}/share/applications + ${INSTALL_DATA} ${WRKDIR}/seamonkey.desktop ${PREFIX}/share/applications ${MKDIR} ${PREFIX}/share/idl/${MOZILLA} cd ${FAKEDIR}/share/idl/${MOZILLA:S/-devel//}-${MOZ_VER} && ${FIND} . | \ ${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/idl/${MOZILLA} diff -ruN --exclude=CVS mozilla-devel/distinfo seamonkey/distinfo --- mozilla-devel/distinfo Fri Sep 16 14:35:28 2005 +++ seamonkey/distinfo Fri Sep 16 14:04:27 2005 @@ -1,2 +1,2 @@ -MD5 (mozilla-source-1.8b1.tar.bz2) = 42a0b25d405ee60128adb0eef4bc0fa0 -SIZE (mozilla-source-1.8b1.tar.bz2) = 32116336 +MD5 (seamonkey-1.0a.source.tar.bz2) = b1d49bcfc2ebe2d9f246bb2545b40b69 +SIZE (seamonkey-1.0a.source.tar.bz2) = 32592929 diff -ruN --exclude=CVS mozilla-devel/files/mozilla-devel.desktop.in seamonkey/files/mozilla-devel.desktop.in --- mozilla-devel/files/mozilla-devel.desktop.in Fri Sep 16 14:35:28 2005 +++ seamonkey/files/mozilla-devel.desktop.in Wed Dec 31 19:00:00 1969 @@ -1,169 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Mozilla Web Browser -Name[az]=Mozilla Veb Səyyahı -Name[bg]=Интернет браузър (Mozilla) -Name[bs]=Mozilla web preglednik -Name[ca]=Navegador web Mozilla -Name[cs]=Prohlížeč WWW Mozilla -Name[cy]=Y Porwr Gwe Mozilla -Name[da]=Mozilla - internetbrowser -Name[de]=Mozilla Webbrowser -Name[el]=Περιηγητής Διαδικτύου Mozilla -Name[en_CA]=Mozilla Web Browser -Name[en_GB]=Mozilla Web Browser -Name[es]=Navegador Web Mozilla -Name[et]=Mozilla veebibrauser -Name[eu]=Mozilla web arakatzailea -Name[fa]=مرورگر وب Mozilla -Name[fi]=Mozilla, WWW-selain -Name[fr]=Navigateur Web Mozilla -Name[ga]=Brabhsálaí Lín Mozilla -Name[he]=דפדפן Mozilla -Name[hr]=Mozilla Web preglednik -Name[hu]=Mozilla webböngésző -Name[id]=Web Browser Mozilla -Name[it]=Browser web Mozilla -Name[ja]=Mozilla ウェブ・ブラウザ -Name[ko]=Mozilla 웹 브라우저 -Name[li]=Mozilla Web Browser -Name[lt]=Mozilla web naršyklė -Name[mk]=Mozilla Веб Прелистувач -Name[mn]=Mozilla веб хөтөч -Name[ms]=Pelungsur Web Mozilla -Name[nb]=Mozilla nettleser -Name[nl]=Mozilla webbrowser -Name[nn]=Mozilla nettlesar -Name[no]=Mozilla nettleser -Name[pl]=Przeglądarka WWW Mozilla -Name[pt]=Navegador Web Mozilla -Name[pt_BR]=Navegador Web Mozilla -Name[ro]=Navigatorul Mozilla -Name[sl]=Spletni brskalnik Mozilla -Name[sq]=Mozilla - Shfletuesi Web -Name[sv]=Webbläsaren Mozilla -Name[tk]=Mozilla Web Ahtarçisi -Name[tr]=Mozilla Web Tarayıcı -Name[uk]=Переглядач web Mozilla -Name[vi]=Trình Duyệt Web Mozilla -Name[wa]=Betchteu waibe mozilla -Name[zh_CN]=Mozilla Web 浏览器 -Name[zh_TW]=Mozilla 網頁瀏覽器 -GenericName=Mozilla Web Browser -GenericName[az]=Mozilla Veb Səyyahı -GenericName[bg]=Интернет браузър (Mozilla) -GenericName[bs]=Mozilla web preglednik -GenericName[ca]=Navegador web Mozilla -GenericName[cs]=Prohlížeč WWW Mozilla -GenericName[cy]=Y Porwr Gwe Mozilla -GenericName[da]=Mozilla - internetbrowser -GenericName[de]=Mozilla Webbrowser -GenericName[el]=Περιηγητής Διαδικτύου Mozilla -GenericName[en_CA]=Mozilla Web Browser -GenericName[en_GB]=Mozilla Web Browser -GenericName[es]=Navegador Web Mozilla -GenericName[et]=Mozilla veebibrauser -GenericName[eu]=Mozilla web arakatzailea -GenericName[fa]=مرورگر وب Mozilla -GenericName[fi]=Mozilla, WWW-selain -GenericName[fr]=Navigateur Web Mozilla -GenericName[ga]=Brabhsálaí Lín Mozilla -GenericName[he]=דפדפן Mozilla -GenericName[hr]=Mozilla Web preglednik -GenericName[hu]=Mozilla webböngésző -GenericName[id]=Web Browser Mozilla -GenericName[it]=Browser web Mozilla -GenericName[ja]=Mozilla ウェブ・ブラウザ -GenericName[ko]=Mozilla 웹 브라우저 -GenericName[li]=Mozilla Web Browser -GenericName[lt]=Mozilla web naršyklė -GenericName[mk]=Mozilla Веб Прелистувач -GenericName[mn]=Mozilla веб хөтөч -GenericName[ms]=Pelungsur Web Mozilla -GenericName[nb]=Mozilla nettleser -GenericName[nl]=Mozilla webbrowser -GenericName[nn]=Mozilla nettlesar -GenericName[no]=Mozilla nettleser -GenericName[pl]=Przeglądarka WWW Mozilla -GenericName[pt]=Navegador Web Mozilla -GenericName[pt_BR]=Navegador Web Mozilla -GenericName[ro]=Navigatorul Mozilla -GenericName[sl]=Spletni brskalnik Mozilla -GenericName[sq]=Mozilla - Shfletuesi Web -GenericName[sv]=Webbläsaren Mozilla -GenericName[tk]=Mozilla Web Ahtarçisi -GenericName[tr]=Mozilla Web Tarayıcı -GenericName[uk]=Переглядач web Mozilla -GenericName[vi]=Trình Duyệt Web Mozilla -GenericName[wa]=Betchteu waibe mozilla -GenericName[zh_CN]=Mozilla Web 浏览器 -GenericName[zh_TW]=Mozilla 網頁瀏覽器 -Comment=Browse the web -Comment[ar]=تصفح الانترنت -Comment[az]=Vebi gəzin -Comment[be]=Вандраваць па павуціньню -Comment[bg]=Сърфиране в интернет -Comment[bn]=ওয়েব ব্রাউজ করুন -Comment[bs]=Pregledaj na internetu -Comment[ca]=Navegueu per la web -Comment[cs]=Prohlížet WWW -Comment[cy]=Pori'r we -Comment[da]=Benyt internettet -Comment[de]=Im Web surfen -Comment[el]=Περιήγηση στον παγκόσμιο ιστό -Comment[en_CA]=Browse the web -Comment[en_GB]=Browse the web -Comment[es]=Navegar por la web -Comment[et]=Sirvi veebi -Comment[eu]=Arakatu web-a -Comment[fa]=مرور وب -Comment[fi]=Selaa WWW:tä -Comment[fr]=Naviguer sur Internet -Comment[ga]=Brabhsáil an Líon -Comment[gu]=વેબમાં શોધો -Comment[he]=גלוש ברשת -Comment[hi]=वेब ब्राउज़ करें -Comment[hr]=Pregledaj Web -Comment[hu]=A világháló böngészése -Comment[id]=Jelajah web -Comment[it]=Esplora il web -Comment[ja]=ウェブを閲覧します -Comment[ko]=웹을 돌아 다닙니다 -Comment[li]=Blajere op internet -Comment[lt]=Naršyti internete -Comment[mk]=Прелистувајте го вебот -Comment[ml]=വലക്കെട്ട് തിരയുക -Comment[mn]=Веб броузе хийх -Comment[ms]=Layari web -Comment[nb]=Surf på nettet -Comment[nl]=Websurfen -Comment[nn]=Surf på nettet -Comment[no]=Surf på nettet -Comment[pa]=ਵੈਬ ਬਰਾਊਜ਼ -Comment[pl]=Przeglądanie stron WWW -Comment[pt]=Navegar na web -Comment[pt_BR]=Navegar na web -Comment[ro]=Navigare Internet -Comment[ru]=Программа для просмотра веб-страниц -Comment[sk]=Prehliadať internet -Comment[sl]=Brskaj po spletu -Comment[sq]=Eksploro web-in -Comment[sr]=Прегледај веб -Comment[sr@Latn]=Pregledaj veb -Comment[sv]=Surfa på nätet -Comment[ta]=வலையில் உலாவு -Comment[th]=ใช้งานเว็บบราวเซอร์ Mozilla -Comment[tk]=Webi Ahtar -Comment[tr]=Web'e Gözat -Comment[uk]=Програма перегляду web-сторінок -Comment[vi]=Duyệt web -Comment[wa]=Naivyî avå les waibes -Comment[zh_CN]=浏览 Web -Comment[zh_TW]=瀏覽網頁 -Exec=mozilla-devel %U -StartupNotify=true -Terminal=false -Type=Application -Icon=%%PREFIX%%/lib/mozilla-devel/chrome/icons/default/default.xpm -Categories=Application;Network; -MimeType=text/html;text/xml;application/xhtml+xml; diff -ruN --exclude=CVS mozilla-devel/files/mozilla.sh seamonkey/files/mozilla.sh --- mozilla-devel/files/mozilla.sh Fri Sep 16 14:35:28 2005 +++ seamonkey/files/mozilla.sh Wed Dec 31 19:00:00 1969 @@ -1,85 +0,0 @@ -#!/bin/sh - -MOZILLA_DIR="%%PREFIX%%/lib/%%MOZILLA%%" -MOZILLA_EXEC="./mozilla" -MOZILLA_REMOTE_EXEC="${MOZILLA_EXEC} -remote" -APPLICATION_ID="mozilla" - -LOCATION='new-tab' -#MOZILLA_UILOCALE="en-US" -#MOZILLA_UIREGION="US" -#MOZILLA_DSP="auto" - -cd $MOZILLA_DIR || exit 1 - -# LANG, MOZILLA_UILOCALE, MOZILLA_UIREGION -if [ -n "$LANG" -a ! -n "${MOZILLA_UILOCALE}" ]; then - _locale="${LANG%%.*}" - if [ "${_locale}" != "en_US" -a "${_locale}" != "C" ]; then - _region="${_locale##*_}" - _locale="${_locale%_*}" - [ -r chrome/${_locale}-${_region}.jar ] && \ - MOZILLA_EXEC="${MOZILLA_EXEC} -UILocale ${_locale}-${_region}" - fi -elif [ -n "${MOZILLA_UILOCALE}" ]; then - MOZILLA_EXEC="${MOZILLA_EXEC} -UILocale ${MOZILLA_UILOCALE}" - if [ -n "${MOZILLA_UIREGION}" ]; then - MOZILLA_EXEC="${MOZILLA_EXEC} -UIRegion ${MOZILLA_UIREGION}" - fi -fi - -# find a /dev/dsp handler -case "${MOZILLA_DSP}" in -# [Ee][Ss][Dd]|esddsp) # Use the esd dsp wrapper -# MOZILLA_DSP="esddsp" -# ;; - [Aa][Rr][Tt][Ss]|artsdsp) # Use the arts dsp wrapper - MOZILLA_DSP="artsdsp" - ;; - [Nn][Oo][Nn][Ee]) # Direct dsp output - MOZILLA_DSP="" - ;; - *) # Guest one (auto) - if [ -n "${KDE_FULL_SESSION}" ]; then - MOZILLA_DSP="artsdsp" -# elif [ -r ${HOME}/.esd_auth ]; then -# MOZILLA_DSP="esddsp" - else - MOZILLA_DSP="" - fi - ;; -esac - -if [ -n "${MOZILLA_DSP}" ] && type "${MOZILLA_DSP}" > /dev/null 2>&1; then - MOZILLA_EXEC="${MOZILLA_DSP} ${MOZILLA_EXEC}" -fi - -case $1 in - -browser) - REMOTE_COMMAND="xfeDoCommand (openBrowser)" - ;; - -mail) - REMOTE_COMMAND="xfeDoCommand (openInbox)" - ;; - -compose) - REMOTE_COMMAND="xfeDoCommand (composeMessage)" - ;; - -*) - exec ${MOZILLA_EXEC} "$@" - ;; - *) - if [ -n "${LOCATION}" ]; then - REMOTE_COMMAND="openURL($@,$LOCATION)" - else - REMOTE_COMMAND="openURL($@)" - fi - ;; -esac - -# process found -${MOZILLA_REMOTE_EXEC} "ping()" >/dev/null 2>&1 && -${MOZILLA_REMOTE_EXEC} "${REMOTE_COMMAND}" && exit 0 - -# no existing process -exec ${MOZILLA_EXEC} "$@" - diff -ruN --exclude=CVS mozilla-devel/files/patch-CAN-2005-2871 seamonkey/files/patch-CAN-2005-2871 --- mozilla-devel/files/patch-CAN-2005-2871 Fri Sep 16 14:35:28 2005 +++ seamonkey/files/patch-CAN-2005-2871 Wed Dec 31 19:00:00 1969 @@ -1,92 +0,0 @@ -Index: netwerk/base/src/nsStandardURL.cpp -=================================================================== -RCS file: /cvs/mozilla/netwerk/base/src/nsStandardURL.cpp,v -retrieving revision 1.82 -diff -p -u -1 -2 -r1.82 nsStandardURL.cpp ---- netwerk/base/src/nsStandardURL.cpp 20 Jun 2005 05:23:20 -0000 1.82 -+++ netwerk/base/src/nsStandardURL.cpp 9 Sep 2005 16:34:42 -0000 -@@ -458,24 +458,25 @@ nsStandardURL::AppendToBuf(char *buf, PR - // 4- update url segment positions and lengths - nsresult - nsStandardURL::BuildNormalizedSpec(const char *spec) - { - // Assumptions: all member URLSegments must be relative the |spec| argument - // passed to this function. - - // buffers for holding escaped url segments (these will remain empty unless - // escaping is required). - nsCAutoString encUsername; - nsCAutoString encPassword; - nsCAutoString encHost; -+ PRBool useEncHost; - nsCAutoString encDirectory; - nsCAutoString encBasename; - nsCAutoString encExtension; - nsCAutoString encParam; - nsCAutoString encQuery; - nsCAutoString encRef; - - // - // escape each URL segment, if necessary, and calculate approximate normalized - // spec length. - // - PRInt32 approxLen = 3; // includes room for "://" -@@ -497,25 +498,25 @@ nsStandardURL::BuildNormalizedSpec(const - approxLen += encoder.EncodeSegmentCount(spec, mParam, esc_Param, encParam); - approxLen += encoder.EncodeSegmentCount(spec, mQuery, esc_Query, encQuery); - approxLen += encoder.EncodeSegmentCount(spec, mRef, esc_Ref, encRef); - } - - // do not escape the hostname, if IPv6 address literal, mHost will - // already point to a [ ] delimited IPv6 address literal. - // However, perform Unicode normalization on it, as IDN does. - mHostEncoding = eEncoding_ASCII; - if (mHost.mLen > 0) { - const nsCSubstring& tempHost = - Substring(spec + mHost.mPos, spec + mHost.mPos + mHost.mLen); -- if (NormalizeIDN(tempHost, encHost)) -+ if ((useEncHost = NormalizeIDN(tempHost, encHost))) - approxLen += encHost.Length(); - else - approxLen += mHost.mLen; - } - - // - // generate the normalized URL string - // - mSpec.SetLength(approxLen + 32); - char *buf; - mSpec.BeginWriting(buf); - PRUint32 i = 0; -@@ -530,25 +531,30 @@ nsStandardURL::BuildNormalizedSpec(const - mAuthority.mPos = i; - - // append authority - if (mUsername.mLen > 0) { - i = AppendSegmentToBuf(buf, i, spec, mUsername, &encUsername); - if (mPassword.mLen >= 0) { - buf[i++] = ':'; - i = AppendSegmentToBuf(buf, i, spec, mPassword, &encPassword); - } - buf[i++] = '@'; - } - if (mHost.mLen > 0) { -- i = AppendSegmentToBuf(buf, i, spec, mHost, &encHost); -+ if (useEncHost) { -+ mHost.mPos = i; -+ mHost.mLen = encHost.Length(); -+ i = AppendToBuf(buf, i, encHost.get(), mHost.mLen); -+ } else -+ i = AppendSegmentToBuf(buf, i, spec, mHost); - net_ToLowerCase(buf + mHost.mPos, mHost.mLen); - if (mPort != -1 && mPort != mDefaultPort) { - nsCAutoString portbuf; - portbuf.AppendInt(mPort); - buf[i++] = ':'; - i = AppendToBuf(buf, i, portbuf.get(), portbuf.Length()); - } - } - - // record authority length - mAuthority.mLen = i - mAuthority.mPos; - diff -ruN --exclude=CVS mozilla-devel/files/patch-Double.cpp seamonkey/files/patch-Double.cpp --- mozilla-devel/files/patch-Double.cpp Fri Sep 16 14:35:28 2005 +++ seamonkey/files/patch-Double.cpp Wed Dec 31 19:00:00 1969 @@ -1,59 +0,0 @@ ---- extensions/transformiix/source/base/Double.cpp.orig Thu Jan 30 09:26:46 2003 -+++ extensions/transformiix/source/base/Double.cpp Sun Nov 16 01:46:42 2003 -@@ -51,10 +51,10 @@ - //A trick to handle IEEE floating point exceptions on FreeBSD - E.D. - #ifdef __FreeBSD__ - #include --#ifdef __alpha__ --fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; --#else -+#if defined(__i386__) - fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML; -+#else -+fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; - #endif - fp_except_t oldmask = fpsetmask(~allmask); - #endif -@@ -75,22 +75,31 @@ - #define TX_DOUBLE_HI32_EXPMASK 0x7ff00000 - #define TX_DOUBLE_HI32_MANTMASK 0x000fffff - -+union ui32dun { -+ PRUint32 i[2]; -+ double d; -+}; -+ - //-- Initialize Double related constants - #ifdef IS_BIG_ENDIAN --const PRUint32 nanMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK, -- 0xffffffff}; --const PRUint32 infMask[2] = {TX_DOUBLE_HI32_EXPMASK, 0}; --const PRUint32 negInfMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}; -+const union ui32dun nanMask = -+ {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK, 0xffffffff}}; -+const union ui32dun infMask = -+ {{TX_DOUBLE_HI32_EXPMASK, 0}}; -+const union ui32dun negInfMask = -+ {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}}; - #else --const PRUint32 nanMask[2] = {0xffffffff, -- TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK}; --const PRUint32 infMask[2] = {0, TX_DOUBLE_HI32_EXPMASK}; --const PRUint32 negInfMask[2] = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}; -+const union ui32dun nanMask = -+ {{0xffffffff, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK}}; -+const union ui32dun infMask = -+ {{0, TX_DOUBLE_HI32_EXPMASK}}; -+const union ui32dun negInfMask = -+ {{0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}}; - #endif - --const double Double::NaN = *((double*)nanMask); --const double Double::POSITIVE_INFINITY = *((double*)infMask); --const double Double::NEGATIVE_INFINITY = *((double*)negInfMask); -+const double Double::NaN = nanMask.d; -+const double Double::POSITIVE_INFINITY = infMask.d; -+const double Double::NEGATIVE_INFINITY = negInfMask.d; - - /* - * Determines whether the given double represents positive or negative diff -ruN --exclude=CVS mozilla-devel/files/patch-Makefile.in seamonkey/files/patch-Makefile.in --- mozilla-devel/files/patch-Makefile.in Fri Sep 16 14:35:28 2005 +++ seamonkey/files/patch-Makefile.in Wed Dec 31 19:00:00 1969 @@ -1,22 +0,0 @@ ---- Makefile.in.orig Thu Oct 21 19:25:55 2004 -+++ Makefile.in Thu Oct 21 19:26:46 2004 -@@ -80,8 +80,7 @@ - $(tier_1_dirs) \ - $(tier_2_dirs) \ - $(tier_9_dirs) \ -- $(tier_50_dirs) \ -- $(NULL) -+ $(tier_50_dirs) - - ifdef GC_LEAK_DETECTOR - DIRS += gc/boehm -@@ -100,7 +99,8 @@ - DIRS += $(tier_98_dirs) - endif - --DIRS += $(tier_99_dirs) -+DIRS += $(tier_99_dirs) \ -+ $(NULL) - - # - # tier 0 - base build config dirs diff -ruN --exclude=CVS mozilla-devel/files/patch-build_unix_run-mozilla.sh seamonkey/files/patch-build_unix_run-mozilla.sh --- mozilla-devel/files/patch-build_unix_run-mozilla.sh Fri Sep 16 14:35:28 2005 +++ seamonkey/files/patch-build_unix_run-mozilla.sh Fri Sep 16 02:20:11 2005 @@ -1,23 +1,21 @@ -$FreeBSD: ports/www/mozilla-devel/files/patch-build_unix_run-mozilla.sh,v 1.3 2005/04/02 16:54:46 ahze Exp $ - ---- build/unix/run-mozilla.sh.orig Mon Dec 15 12:27:28 2003 -+++ build/unix/run-mozilla.sh Wed Feb 11 14:24:17 2004 -@@ -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"} -@@ -442,6 +442,9 @@ - # - export MOZILLA_FIVE_HOME LD_LIBRARY_PATH - export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH +--- build/unix/run-mozilla.sh.orig Sun Apr 18 10:17:09 2004 ++++ build/unix/run-mozilla.sh Fri Sep 16 02:19:53 2005 +@@ -327,7 +327,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"}LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/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"} +@@ -414,6 +414,9 @@ + # + 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 +export MOZ_PLUGIN_PATH - - if [ $moz_debug -eq 1 ] - then + + if [ $moz_debug -eq 1 ] + then diff -ruN --exclude=CVS mozilla-devel/files/patch-config::mkdepend::Makefile.in seamonkey/files/patch-config::mkdepend::Makefile.in --- mozilla-devel/files/patch-config::mkdepend::Makefile.in Fri Sep 16 14:35:28 2005 +++ seamonkey/files/patch-config::mkdepend::Makefile.in Fri Sep 16 02:22:38 2005 @@ -1,10 +1,11 @@ ---- config/mkdepend/Makefile.in.orig Sun Apr 18 14:17:26 2004 -+++ config/mkdepend/Makefile.in Sun Dec 12 09:42:11 2004 -@@ -73,6 +73,7 @@ - include $(topsrcdir)/config/rules.mk - - HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" +--- config/mkdepend/Makefile.in.orig Sun Apr 18 10:17:26 2004 ++++ config/mkdepend/Makefile.in Fri Sep 16 02:22:09 2005 +@@ -72,7 +72,7 @@ + + include $(topsrcdir)/config/rules.mk + +-HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" +HOST_CFLAGS += $(XCFLAGS) - - ifdef GNU_CC - _GCCDIR = $(shell $(CC) -print-file-name=include) + + ifdef GNU_CC + _GCCDIR = $(shell $(CC) -print-file-name=include) diff -ruN --exclude=CVS mozilla-devel/files/patch-config::rules.mk seamonkey/files/patch-config::rules.mk --- mozilla-devel/files/patch-config::rules.mk Fri Sep 16 14:35:28 2005 +++ seamonkey/files/patch-config::rules.mk Fri Sep 16 02:25:02 2005 @@ -1,14 +1,15 @@ ---- config/rules.mk.orig Sun May 18 16:10:18 2003 -+++ config/rules.mk Sun Jul 20 18:07:26 2003 -@@ -448,7 +448,11 @@ - - ifeq ($(OS_ARCH),FreeBSD) - ifdef IS_COMPONENT +--- config/rules.mk.orig Thu Aug 11 12:41:53 2005 ++++ config/rules.mk Fri Sep 16 02:24:34 2005 +@@ -443,7 +443,11 @@ + + ifeq ($(OS_ARCH),FreeBSD) + ifdef IS_COMPONENT +-EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic +ifneq (,$(filter alpha ia64,$(OS_TEST))) +EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc +else - EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -+endif - endif - endif - ++EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic +++endif + endif + endif + diff -ruN --exclude=CVS mozilla-devel/files/patch-config_autoconf.mk.in seamonkey/files/patch-config_autoconf.mk.in --- mozilla-devel/files/patch-config_autoconf.mk.in Fri Sep 16 14:35:28 2005 +++ seamonkey/files/patch-config_autoconf.mk.in Fri Sep 16 02:27:33 2005 @@ -1,18 +1,18 @@ ---- config/autoconf.mk.in.orig Mon Mar 15 22:56:25 2004 -+++ config/autoconf.mk.in Fri Mar 19 15:17:50 2004 -@@ -31,13 +31,13 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ --includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+includedir = @includedir@/mozilla%%HEADERS_SUFX%% - libdir = @libdir@ - datadir = @datadir@ - mandir = @mandir@ - idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) - --mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+mozappdir = $(libdir)/%%MOZILLA%% - mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION) - mrelibdir = $(mredir)/lib - +--- config/autoconf.mk.in.orig Wed Aug 17 13:17:17 2005 ++++ config/autoconf.mk.in Fri Sep 16 02:27:18 2005 +@@ -54,13 +54,13 @@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ + bindir = @bindir@ +-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++includedir = @includedir@/seamonkey%%HEADERS_SUFX%% + libdir = @libdir@ + datadir = @datadir@ + mandir = @mandir@ + idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) + +-mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++mozappdir = $(libdir)/%%MOZILLA%% + mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION) + mrelibdir = $(mredir)/lib + diff -ruN --exclude=CVS mozilla-devel/files/patch-configure seamonkey/files/patch-configure --- mozilla-devel/files/patch-configure Wed Dec 31 19:00:00 1969 +++ seamonkey/files/patch-configure Fri Sep 16 02:51:12 2005 @@ -0,0 +1,47 @@ +--- configure.orig Tue Sep 6 23:13:49 2005 ++++ configure Fri Sep 16 02:51:03 2005 +@@ -10016,7 +10016,7 @@ + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-liconv $LIBS" ++LIBS="-L$LOCALBASE/lib -liconv $LIBS" + cat > conftest.$ac_ext <&6 +- _ICONV_LIBS="$_ICONV_LIBS -liconv" ++ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv" + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 +@@ -10057,7 +10057,7 @@ + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-liconv $LIBS" ++LIBS="-L$LOCALBASE/lib -liconv $LIBS" + cat > conftest.$ac_ext <&6 +- _ICONV_LIBS="$_ICONV_LIBS -liconv" ++ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv" + else + echo "$ac_t""no" 1>&6 + fi +@@ -12509,7 +12509,7 @@ + MOZ_SUITE=1 + MOZ_PROFILESHARING= + MOZ_APP_VERSION=$SEAMONKEY_VERSION +- MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector irc universalchardet typeaheadfind webservices spellcheck gnomevfs auth sroaming permissions reporter" ++ MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector universalchardet typeaheadfind webservices spellcheck gnomevfs auth sroaming permissions reporter" + cat >> confdefs.h <<\EOF + #define MOZ_SUITE 1 + EOF diff -ruN --exclude=CVS mozilla-devel/files/patch-extensions_negotiateauth_Makefile.in seamonkey/files/patch-extensions_negotiateauth_Makefile.in --- mozilla-devel/files/patch-extensions_negotiateauth_Makefile.in Fri Sep 16 14:35:28 2005 +++ seamonkey/files/patch-extensions_negotiateauth_Makefile.in Fri Sep 16 02:33:25 2005 @@ -1,19 +1,16 @@ ---- extensions/negotiateauth/Makefile.in.orig Wed Apr 28 03:26:19 2004 -+++ extensions/negotiateauth/Makefile.in Tue Jul 6 16:27:07 2004 -@@ -66,7 +66,6 @@ - $(NULL) - - EXTRA_DSO_LDOPTS = \ -- $(MOZ_COMPONENT_LIBS) \ - $(NULL) - - ifneq (,$(GSSAPI_LIBS)) -@@ -74,6 +73,8 @@ - EXTRA_DSO_LDOPTS += $(GSSAPI_LIBS) - CPPSRCS += nsNegotiateAuthGSSAPI.cpp - endif -+ +--- extensions/negotiateauth/Makefile.in.orig Fri Jul 1 01:01:28 2005 ++++ extensions/negotiateauth/Makefile.in Fri Sep 16 02:33:12 2005 +@@ -68,7 +68,6 @@ + $(NULL) + + EXTRA_DSO_LDOPTS = \ +- $(MOZ_COMPONENT_LIBS) \ + $(NULL) + + ifeq (1,$(USE_GSSAPI)) +@@ -81,4 +80,5 @@ + CPPSRCS += nsNegotiateAuthSSPI.cpp + endif + +EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) - - # make sure this component is never statically linked into the main - # application. this is necessary since we don't want to force users + include $(topsrcdir)/config/rules.mk diff -ruN --exclude=CVS mozilla-devel/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp seamonkey/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp --- mozilla-devel/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp Fri Sep 16 14:35:28 2005 +++ seamonkey/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp Fri Sep 16 02:35:29 2005 @@ -1,12 +1,12 @@ ---- gfx/src/gtk/nsFontMetricsXft.cpp.orig Wed Mar 17 02:08:01 2004 -+++ gfx/src/gtk/nsFontMetricsXft.cpp Wed Mar 17 02:08:15 2004 -@@ -65,7 +65,8 @@ - - #include - #include --#include +--- gfx/src/gtk/nsFontMetricsXft.cpp.orig Tue Jun 21 02:08:27 2005 ++++ gfx/src/gtk/nsFontMetricsXft.cpp Fri Sep 16 02:35:09 2005 +@@ -68,7 +68,8 @@ + + #include + #include +-#include +#include +#include FT_FREETYPE_H - - #define FORCE_PR_LOG - #include "prlog.h" + + #define FORCE_PR_LOG + #include "prlog.h" diff -ruN --exclude=CVS mozilla-devel/files/patch-modules::plugin::base::public::nptypes.h seamonkey/files/patch-modules::plugin::base::public::nptypes.h --- mozilla-devel/files/patch-modules::plugin::base::public::nptypes.h Fri Sep 16 14:35:28 2005 +++ seamonkey/files/patch-modules::plugin::base::public::nptypes.h Wed Dec 31 19:00:00 1969 @@ -1,11 +0,0 @@ ---- modules/plugin/base/public/nptypes.h.orig Sun Sep 5 18:56:55 2004 -+++ modules/plugin/base/public/nptypes.h Thu Oct 21 19:29:29 2004 -@@ -73,7 +73,7 @@ - #if defined(bsdi) || defined(OPENBSD) - typedef u_int32_t uint32_t; - -- #if defined(bsdi) -+ #if defined(bsdi) || defined(__FreeBSD__) - #if !defined(__cplusplus) - typedef int bool; - #endif diff -ruN --exclude=CVS mozilla-devel/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c seamonkey/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c --- mozilla-devel/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c Fri Sep 16 14:35:28 2005 +++ seamonkey/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c Wed Dec 31 19:00:00 1969 @@ -1,12 +0,0 @@ ---- widget/src/gtk2/mozdrawingarea.c.orig Tue Apr 30 12:29:00 2002 -+++ widget/src/gtk2/mozdrawingarea.c Thu Aug 18 22:27:27 2005 -@@ -168,7 +168,9 @@ - - drawingarea = MOZ_DRAWINGAREA(object); - -+ gdk_window_set_user_data(drawingarea->inner_window, NULL); - gdk_window_destroy(drawingarea->inner_window); -+ gdk_window_set_user_data(drawingarea->clip_window, NULL); - gdk_window_destroy(drawingarea->clip_window); - - (* parent_class->finalize) (object); diff -ruN --exclude=CVS mozilla-devel/files/patch-nsprpub-pr-include-md-_pth.h seamonkey/files/patch-nsprpub-pr-include-md-_pth.h --- mozilla-devel/files/patch-nsprpub-pr-include-md-_pth.h Fri Sep 16 14:35:28 2005 +++ seamonkey/files/patch-nsprpub-pr-include-md-_pth.h Wed Dec 31 19:00:00 1969 @@ -1,11 +0,0 @@ ---- nsprpub/pr/include/md/_pth.h.orig Sun Jan 16 16:09:10 2005 -+++ nsprpub/pr/include/md/_pth.h Sun Jan 16 16:10:06 2005 -@@ -84,7 +84,7 @@ - #define _PT_PTHREAD_MUTEXATTR_DESTROY(x) /* */ - #define _PT_PTHREAD_MUTEX_INIT(m, a) (memset(&(m), 0, sizeof(m)), \ - pthread_mutex_init(&(m), NULL)) --#define _PT_PTHREAD_MUTEX_IS_LOCKED(m) (EBUSY == pthread_mutex_trylock(&(m))) -+#define _PT_PTHREAD_MUTEX_IS_LOCKED(m) (0 != pthread_mutex_trylock(&(m))) - #define _PT_PTHREAD_CONDATTR_INIT(x) 0 - #define _PT_PTHREAD_CONDATTR_DESTROY(x) /* */ - #define _PT_PTHREAD_COND_INIT(m, a) (memset(&(m), 0, sizeof(m)), \ diff -ruN --exclude=CVS mozilla-devel/files/patch-nsprpub::pr::include::md::_freebsd.cfg seamonkey/files/patch-nsprpub::pr::include::md::_freebsd.cfg --- mozilla-devel/files/patch-nsprpub::pr::include::md::_freebsd.cfg Fri Sep 16 14:35:28 2005 +++ seamonkey/files/patch-nsprpub::pr::include::md::_freebsd.cfg Fri Sep 16 02:47:08 2005 @@ -1,11 +1,11 @@ ---- nsprpub/pr/include/md/_freebsd.cfg.orig Sun Jan 16 16:13:08 2005 -+++ nsprpub/pr/include/md/_freebsd.cfg Sun Jan 16 16:16:34 2005 +--- nsprpub/pr/include/md/_freebsd.cfg.orig Fri Sep 16 02:46:58 2005 ++++ nsprpub/pr/include/md/_freebsd.cfg Fri Sep 16 02:45:54 2005 @@ -141,7 +141,7 @@ - #define PR_ALIGN_OF_DOUBLE 8 - #define PR_ALIGN_OF_POINTER 8 - --#elif defined(__sparc__) -+#elif defined(__sparc64__) - - #undef IS_LITTLE_ENDIAN - #define IS_BIG_ENDIAN 1 + #define PR_ALIGN_OF_DOUBLE 8 + #define PR_ALIGN_OF_POINTER 8 + +-#elif defined(__sparc__) ++#elif defined(__sparc64__) + + #undef IS_LITTLE_ENDIAN + #define IS_BIG_ENDIAN 1 diff -ruN --exclude=CVS mozilla-devel/files/patch-qt seamonkey/files/patch-qt --- mozilla-devel/files/patch-qt Fri Sep 16 14:35:28 2005 +++ seamonkey/files/patch-qt Wed Dec 31 19:00:00 1969 @@ -1,47 +0,0 @@ ---- configure.orig Wed Dec 22 19:34:26 2004 -+++ configure Sun Jan 16 16:30:16 2005 -@@ -9446,7 +9446,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-liconv $LIBS" -+LIBS="-L$LOCALBASE/lib -liconv $LIBS" - cat > conftest.$ac_ext <&6 -- _ICONV_LIBS="$_ICONV_LIBS -liconv" -+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv" - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 -@@ -9487,7 +9487,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-liconv $LIBS" -+LIBS="-L$LOCALBASE/lib -liconv $LIBS" - cat > conftest.$ac_ext <&6 -- _ICONV_LIBS="$_ICONV_LIBS -liconv" -+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv" - else - echo "$ac_t""no" 1>&6 - fi -@@ -11847,7 +11847,7 @@ - MOZ_COMPOSER=1 - MOZ_PROFILESHARING=1 - MOZ_APP_VERSION=$MOZILLA_VERSION -- MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector irc universalchardet typeaheadfind webservices spellcheck gnomevfs negotiateauth sroaming permissions" -+ MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector universalchardet typeaheadfind webservices spellcheck gnomevfs negotiateauth sroaming permissions" - ;; - - browser) diff -ruN --exclude=CVS mozilla-devel/files/patch-security::coreconf::FreeBSD.mk seamonkey/files/patch-security::coreconf::FreeBSD.mk --- mozilla-devel/files/patch-security::coreconf::FreeBSD.mk Fri Sep 16 14:35:28 2005 +++ seamonkey/files/patch-security::coreconf::FreeBSD.mk Fri Sep 16 02:54:48 2005 @@ -1,37 +1,37 @@ ---- security/coreconf/FreeBSD.mk.orig Wed Mar 26 20:17:25 2003 -+++ security/coreconf/FreeBSD.mk Thu Jul 8 12:56:24 2004 -@@ -35,16 +35,18 @@ - - include $(CORE_DEPTH)/coreconf/UNIX.mk - --DEFAULT_COMPILER = gcc --CC = gcc --CCC = g++ +--- security/coreconf/FreeBSD.mk.orig Sun Apr 25 11:02:17 2004 ++++ security/coreconf/FreeBSD.mk Fri Sep 16 02:54:26 2005 +@@ -37,16 +37,18 @@ + + include $(CORE_DEPTH)/coreconf/UNIX.mk + +-DEFAULT_COMPILER = gcc +-CC = gcc +-CCC = g++ +CCC = ${CXX} - RANLIB = ranlib - - ifeq ($(OS_TEST),alpha) - CPU_ARCH = alpha - else + RANLIB = ranlib + + ifeq ($(OS_TEST),alpha) + CPU_ARCH = alpha + else +ifeq ($(OS_TEST),amd64) -+CPU_ARCH = amd64 ++CPU_ARCH = amd64 +else - CPU_ARCH = x86 - endif + CPU_ARCH = x86 + endif +endif - - OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK - -@@ -71,7 +73,11 @@ - DLL_SUFFIX = so.1.0 - endif - --MKSHLIB = $(CC) $(DSO_LDOPTS) + + OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK + +@@ -73,7 +75,11 @@ + DLL_SUFFIX = so.1.0 + endif + +-MKSHLIB = $(CC) $(DSO_LDOPTS) +ifneq (,$(filter alpha ia64,$(OS_TEST))) -+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@ ++MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@ +else -+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ ++MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ +endif - ifdef MAPFILE - # Add LD options to restrict exported symbols to those in the map file - endif + ifdef MAPFILE + # Add LD options to restrict exported symbols to those in the map file + endif diff -ruN --exclude=CVS mozilla-devel/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp seamonkey/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp --- mozilla-devel/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp Fri Sep 16 14:35:28 2005 +++ seamonkey/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp Fri Sep 16 02:58:24 2005 @@ -1,29 +1,31 @@ ---- uriloader/exthandler/unix/nsGNOMERegistry.cpp.orig Fri Dec 24 04:30:00 2004 -+++ uriloader/exthandler/unix/nsGNOMERegistry.cpp Fri Dec 24 04:34:05 2004 +--- uriloader/exthandler/unix/nsGNOMERegistry.cpp.orig Sat Oct 16 09:46:17 2004 ++++ uriloader/exthandler/unix/nsGNOMERegistry.cpp Fri Sep 16 02:58:00 2005 @@ -143,7 +143,7 @@ - PR_END_MACRO - - // Attempt to open libgconf -- gconfLib = LoadVersionedLibrary("gconf-2", ".4"); + PR_END_MACRO + + // Attempt to open libgconf +- gconfLib = LoadVersionedLibrary("gconf-2", ".4"); + gconfLib = PR_LoadLibrary("libgconf-2.so"); - ENSURE_LIB(gconfLib); - - GET_LIB_FUNCTION(gconf, gconf_client_get_default); -@@ -151,7 +151,7 @@ - GET_LIB_FUNCTION(gconf, gconf_client_get_bool); - - // Attempt to open libgnome -- gnomeLib = LoadVersionedLibrary("gnome-2", ".0"); -+ gnomeLib = PR_LoadLibrary("libgnome-2.so"); - ENSURE_LIB(gnomeLib); - - GET_LIB_FUNCTION(gnome, gnome_url_show); + ENSURE_LIB(gconfLib); + + GET_LIB_FUNCTION(gconf, gconf_client_get_default); +@@ -151,8 +151,8 @@ + GET_LIB_FUNCTION(gconf, gconf_client_get_bool); + + // Attempt to open libgnome +- gnomeLib = LoadVersionedLibrary("gnome-2", ".0"); +- ENSURE_LIB(gnomeLib); ++ gnomeLib = PR_LoadLibrary("libgnome-2.so"); ++ ENSURE_LIB(gnomeLib); + + GET_LIB_FUNCTION(gnome, gnome_url_show); + GET_LIB_FUNCTION(gnome, gnome_program_init); @@ -160,7 +160,7 @@ - GET_LIB_FUNCTION(gnome, gnome_program_get); - - // Attempt to open libgnomevfs -- vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0"); + GET_LIB_FUNCTION(gnome, gnome_program_get); + + // Attempt to open libgnomevfs +- vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0"); + vfsLib = PR_LoadLibrary("libgnomevfs-2.so"); - ENSURE_LIB(vfsLib); - - GET_LIB_FUNCTION(vfs, gnome_vfs_mime_type_from_name); + ENSURE_LIB(vfsLib); + + GET_LIB_FUNCTION(vfs, gnome_vfs_mime_type_from_name); diff -ruN --exclude=CVS mozilla-devel/files/patch-xpcom::reflect::xptcall::public::xptcstubsdecl.inc seamonkey/files/patch-xpcom::reflect::xptcall::public::xptcstubsdecl.inc --- mozilla-devel/files/patch-xpcom::reflect::xptcall::public::xptcstubsdecl.inc Fri Sep 16 14:35:28 2005 +++ seamonkey/files/patch-xpcom::reflect::xptcall::public::xptcstubsdecl.inc Fri Sep 16 03:01:04 2005 @@ -1,11 +1,11 @@ ---- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004 -+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Fri Mar 19 15:58:14 2004 +--- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Thu Jun 16 12:31:53 2005 ++++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Fri Sep 16 03:00:11 2005 @@ -8,7 +8,7 @@ - * 1 is AddRef - * 2 is Release - */ --#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) + * 1 is AddRef + * 2 is Release + */ +-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) +#if !defined(__ia64) - NS_IMETHOD Stub3(); - NS_IMETHOD Stub4(); - NS_IMETHOD Stub5(); + NS_IMETHOD Stub3(); + NS_IMETHOD Stub4(); + NS_IMETHOD Stub5(); diff -ruN --exclude=CVS mozilla-devel/files/patch-xpcom::reflect::xptcall::src::md::unix::Makefile.in seamonkey/files/patch-xpcom::reflect::xptcall::src::md::unix::Makefile.in --- mozilla-devel/files/patch-xpcom::reflect::xptcall::src::md::unix::Makefile.in Fri Sep 16 14:35:28 2005 +++ seamonkey/files/patch-xpcom::reflect::xptcall::src::md::unix::Makefile.in Fri Sep 16 03:06:13 2005 @@ -1,56 +1,56 @@ ---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Thu Aug 14 21:00:23 2003 -+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Sun Feb 1 14:31:25 2004 -@@ -49,6 +49,9 @@ - ifeq (86,$(findstring 86,$(OS_TEST))) - CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp - endif +--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Wed Jun 15 04:32:21 2005 ++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Fri Sep 16 03:05:48 2005 +@@ -65,6 +65,9 @@ + ifeq (86,$(findstring 86,$(OS_TEST))) + CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp + endif +ifeq (amd64,$(OS_TEST)) -+CPPSRCS := xptcinvoke_amd64_freebsd.cpp xptcstubs_amd64_freebsd.cpp +++CPPSRCS := xptcinvoke_amd64_freebsd.cpp xptcstubs_amd64_freebsd.cpp +endif - endif - # - # New code for Linux, et. al., with gcc -@@ -59,8 +62,8 @@ - CPPSRCS := xptcinvoke_gcc_x86_unix.cpp xptcstubs_gcc_x86_unix.cpp - endif - endif --# IA64 Linux --ifneq (,$(filter Linux,$(OS_ARCH))) + endif + # + # New code for Linux, et. al., with gcc +@@ -80,12 +83,16 @@ + endif + endif + endif +-# IA64 Linux +-ifneq (,$(filter Linux,$(OS_ARCH))) +# IA64 Linux & FreeBSD -+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH))) - ifneq (,$(findstring ia64,$(OS_TEST))) - CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp - ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -106,9 +109,15 @@ - ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s - endif - # ++ifneq (,$(filter Linux FreeBSD,$(OS_ARCH + ifneq (,$(findstring ia64,$(OS_TEST))) + CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp + ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s + endif +# FreeBSD/Alpha +# +ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha) -+CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp -+endif -+# - # Linux/Alpha - # --ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) -+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp - endif - # -@@ -294,6 +303,15 @@ - ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc) - CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp - ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s ++CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp + endif + # + # BeOS/Intel (uses the same unixish_x86 code) +@@ -130,7 +137,7 @@ + # + # Linux/Alpha + # +-ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) ++ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) + CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp + endif + # +@@ -321,6 +328,15 @@ + ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc) + CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp + ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s +endif +# +# FreeBSD/SPARC64 +# +ifeq ($(OS_ARCH),FreeBSD) +ifneq (,$(findstring sparc,$(OS_TEST))) -+CPPSRCS := xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp -+ASFILES := xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s ++CPPSRCS := xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp ++ASFILES := xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s +endif - endif - # - # Solaris/SPARC + endif + # + # Solaris/SPARC diff -ruN --exclude=CVS mozilla-devel/files/patch-xpfe_bootstrap_mozilla.in seamonkey/files/patch-xpfe_bootstrap_mozilla.in --- mozilla-devel/files/patch-xpfe_bootstrap_mozilla.in Fri Sep 16 14:35:28 2005 +++ seamonkey/files/patch-xpfe_bootstrap_mozilla.in Fri Sep 16 03:28:16 2005 @@ -1,52 +1,52 @@ ---- xpfe/bootstrap/mozilla.in.orig Sat Apr 17 18:51:11 2004 -+++ xpfe/bootstrap/mozilla.in Tue Mar 1 00:12:20 2005 -@@ -49,139 +49,319 @@ - ## the mozilla-bin binary to work. - ## - +--- xpfe/bootstrap/mozilla.in.orig Tue Mar 29 16:02:22 2005 ++++ xpfe/bootstrap/mozilla.in Fri Sep 16 03:27:40 2005 +@@ -49,139 +49,312 @@ + ## the application binary to work. + ## + +# +# MOZ_PIS, "Mozilla Plugable Init Scripts" +# MOZ_PIS_ is the name space used +# These variables and there meaning are specified in +# mozilla/xpfe/bootstrap/init.d/README - moz_pis_startstop_scripts() - { -- MOZ_USER_DIR="%MOZ_USER_DIR%" -- # MOZ_PIS_ is the name space for "Mozilla Plugable Init Scripts" -- # These variables and there meaning are specified in -- # mozilla/xpfe/bootstrap/init.d/README -- MOZ_PIS_API=2 -- MOZ_PIS_MOZBINDIR="${dist_bin}" -- MOZ_PIS_SESSION_PID="$$" -- MOZ_PIS_USER_DIR="${MOZ_USER_DIR}" -- export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR -- -- case "${1}" in -- "start") -- for curr_pis in "${dist_bin}/init.d"/S* "${HOME}/${MOZ_USER_DIR}/init.d"/S* ; do -- if [ -x "${curr_pis}" ] ; then -- case "${curr_pis}" in -- *.sh) . "${curr_pis}" ;; -- *) "${curr_pis}" "start" ;; -- esac -- fi -- done -- ;; -- "stop") -- for curr_pis in "${HOME}/${MOZ_USER_DIR}/init.d"/K* "${dist_bin}/init.d"/K* ; do -- if [ -x "${curr_pis}" ] ; then -- case "${curr_pis}" in -- *.sh) . "${curr_pis}" ;; -- *) "${curr_pis}" "stop" ;; -- esac -- fi -- done -- ;; -- *) -- echo 1>&2 "$0: Internal error in moz_pis_startstop_scripts." -- exit 1 -- ;; -- esac + moz_pis_startstop_scripts() + { +- MOZ_USER_DIR="%MOZ_USER_DIR%" +- # MOZ_PIS_ is the name space for "Mozilla Plugable Init Scripts" +- # These variables and there meaning are specified in +- # mozilla/xpfe/bootstrap/init.d/README +- MOZ_PIS_API=2 +- MOZ_PIS_MOZBINDIR="${dist_bin}" +- MOZ_PIS_SESSION_PID="$$" +- MOZ_PIS_USER_DIR="${MOZ_USER_DIR}" +- export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR +- +- case "${1}" in +- "start") +- for curr_pis in "${dist_bin}/init.d"/S* "${HOME}/${MOZ_USER_DIR}/init.d"/S* ; do +- if [ -x "${curr_pis}" ] ; then +- case "${curr_pis}" in +- *.sh) . "${curr_pis}" ;; +- *) "${curr_pis}" "start" ;; +- esac +- fi +- done +- ;; +- "stop") +- for curr_pis in "${HOME}/${MOZ_USER_DIR}/init.d"/K* "${dist_bin}/init.d"/K* ; do +- if [ -x "${curr_pis}" ] ; then +- case "${curr_pis}" in +- *.sh) . "${curr_pis}" ;; +- *) "${curr_pis}" "stop" ;; +- esac +- fi +- done +- ;; +- *) +- echo 1>&2 "$0: Internal error in moz_pis_startstop_scripts." +- exit 1 +- ;; +- esac + MOZ_PIS_API=2 + MOZ_PIS_MOZBINDIR="${dist_bin}" + MOZ_PIS_SESSION_PID="$$" @@ -54,67 +54,87 @@ + export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR + + case "${1}" in -+ "start") -+ for curr_pis in "${MOZ_PIS_MOZBINDIR}/init.d"/S* \ -+ "${HOME}/${MOZ_PIS_USER_DIR}/init.d"/S*; do -+ if [ -x "${curr_pis}" ]; then -+ case "${curr_pis}" in -+ *.sh) -+ . "${curr_pis}" -+ ;; -+ *) -+ ${curr_pis} "start" -+ ;; -+ esac -+ fi -+ done -+ ;; -+ "stop") -+ for curr_pis in "${MOZ_PIS_MOZBINDIR}/init.d"/K* \ -+ "${HOME}/${MOZ_PIS_USER_DIR}/init.d"/K*; do -+ if [ -x "${curr_pis}" ]; then -+ case "${curr_pis}" in -+ *.sh) -+ . "${curr_pis}" -+ ;; -+ *) -+ ${curr_pis} "stop" -+ ;; -+ esac -+ fi -+ done -+ ;; -+ *) -+ echo "$0: Internal error in moz_pis_startstop_scripts." 1>&2 -+ exit 1 -+ ;; ++ "start") ++ for curr_pis in "${MOZ_PIS_MOZBINDIR}/init.d"/S* \ ++ "${HOME}/${MOZ_PIS_USER_DIR}/init.d"/S*; do ++ if [ -x "${curr_pis}" ]; then ++ case "${curr_pis}" in ++ *.sh) ++ ++ . "${curr_pis}" ++ ;; ++ *) ++ ${curr_pis} "start" ++ ;; ++ esac ++ fi ++ done ++ ;; ++ "stop") ++ for curr_pis in "${MOZ_PIS_MOZBINDIR}/init.d"/K* \ ++ "${HOME}/${MOZ_PIS_USER_DIR}/init.d"/K*; do ++ if [ -x "${curr_pis}" ]; then ++ case "${curr_pis}" in ++ *.sh) ++ . "${curr_pis}" ++ ;; ++ *) ++ ${curr_pis} "stop" ++ ;; ++ esac ++ fi ++ done ++ ;; ++ *) ++ echo "$0: Internal error in moz_pis_startstop_scripts." 1>&2 ++ exit 1 ++ ;; + esac - } - - #uncomment for debugging - #set -x - --moz_libdir=%MOZAPPDIR% --MRE_HOME=%MREDIR% ++ + } + + #uncomment for debugging + #set -x + +-moz_libdir=%MOZAPPDIR% +-MRE_HOME=%MREDIR% +# +# variables +# +location="new-tab" +#MOZILLA_UILOCALE="en-US" +#MOZILLA_UIREGION="US" - --# honor MOZILLA_FIVE_HOME if it's there --if [ -n "$MOZILLA_FIVE_HOME" ] ; then -- dist_bin="$MOZILLA_FIVE_HOME" --else -- # Use run-mozilla.sh in the current dir if it exists -- # If not, then start resolving symlinks until we find run-mozilla.sh -- found=0 -- progname=$0 -- curdir=`dirname "$progname"` -- run_moz="$curdir/run-mozilla.sh" -- if test -x "$run_moz"; then -- dist_bin=$curdir + + # honor MOZILLA_FIVE_HOME if it's there +-if [ -n "$MOZILLA_FIVE_HOME" ] ; then +- dist_bin="$MOZILLA_FIVE_HOME" +-else +- # Use run-mozilla.sh in the current dir if it exists +- # If not, then start resolving symlinks until we find run-mozilla.sh +- found=0 +- progname=$0 +- curdir=`dirname "$progname"` +- run_moz="$curdir/run-mozilla.sh" +- if test -x "$run_moz"; then +- dist_bin=$curdir +- found=1 +- else +- here=`/bin/pwd` +- while [ -h "$progname" ]; do +- bn=`basename "$progname"` +- cd `dirname "$progname"` +- progname=`/bin/ls -l "$bn" |sed -e 's/^.* -> //' ` +- if [ ! -x "$progname" ]; then +- break +- fi +- curdir=`dirname "$progname"` +- run_moz="$curdir/run-mozilla.sh" +- if [ -x "$run_moz" ]; then +- cd "$curdir" +- dist_bin=`pwd` +- found=1 +- break +- fi +# +# working definitions +# @@ -122,8 +142,8 @@ +moz_libdir="%MOZAPPDIR%" +MRE_HOME="%MREDIR%" + -+debugging= # set the debugging level -+use_openFile="yes" # use openFile() for file/dir ++debugging= # set the debugging level ++use_openFile="yes" # use openFile() for file/dir +here=`pwd` + +if [ ! -d "${MRE_HOME}" ]; then @@ -141,83 +161,63 @@ +run_moz="$curdir/run-mozilla.sh" +# mozilla must obey MOZILLA_FIVE_HOME +if [ -n "$MOZILLA_FIVE_HOME" -a -d "$MOZILLA_FIVE_HOME" -a \ -+ -x "$MOZILLA_FIVE_HOME/run-mozilla.sh" ]; then ++ -x "$MOZILLA_FIVE_HOME/run-mozilla.sh" ]; then + curdir="$MOZILLA_FIVE_HOME" + run_moz="$curdir/run-mozilla.sh" + dist_bin="$curdir" - found=1 -- else -- here=`/bin/pwd` -- while [ -h "$progname" ]; do -- bn=`basename "$progname"` -- cd `dirname "$progname"` -- progname=`/bin/ls -l "$bn" |sed -e 's/^.* -> //' ` -- if [ ! -x "$progname" ]; then -- break -- fi -- curdir=`dirname "$progname"` -- run_moz="$curdir/run-mozilla.sh" -- if [ -x "$run_moz" ]; then -- cd "$curdir" -- dist_bin=`pwd` -- found=1 -- break -- fi ++ found=1 +elif [ -x "$run_moz" ]; then + dist_bin="$curdir" + found=1 +else + while [ -h "${progname}" ]; do -+ bn=`basename "${progname}"` -+ cd `dirname "${progname}"` -+ progname=`ls -l "${bn}" | sed -e 's/^.* -> //'` -+ if [ ! -x "$progname" ]; then -+ break -+ fi -+ curdir=`dirname "${progname}"` -+ run_moz="${curdir}/run-mozilla.sh" -+ if [ -x "${run_moz}" ]; then -+ cd "$curdir" -+ dist_bin=`pwd` -+ run_moz="${dist_bin}/run-mozilla.sh" -+ found=1 -+ break -+ fi - done -- cd "$here" -- fi -- if [ $found = 0 ]; then ++ bn=`basename "${progname}"` ++ cd `dirname "${progname}"` ++ progname=`ls -l "${bn}" | sed -e 's/^.* -> //'` ++ if [ ! -x "$progname" ]; then break ++ fi ++ curdir=`dirname "${progname}"` ++ run_moz="${curdir}/run-mozilla.sh" ++ if [ -x "${run_moz}" ]; then ++ cd "$curdir" ++ dist_bin=`pwd` ++ run_moz="${dist_bin}/run-mozilla.sh" ++ found=1 ++ break ++ fi + done +- cd "$here" +- fi +- if [ $found = 0 ]; then + cd "${here}" +fi +if [ $found = 0 ]; then - # Check default compile-time libdir -- if [ -x "$moz_libdir/run-mozilla.sh" ]; then -- dist_bin=$moz_libdir -- else -- echo "Cannot find mozilla runtime directory. Exiting." -- exit 1 -- fi -- fi + # Check default compile-time libdir +- if [ -x "$moz_libdir/run-mozilla.sh" ]; then +- dist_bin=$moz_libdir +- else +- echo "Cannot find %MOZ_APP_DISPLAYNAME% runtime directory. Exiting." +- exit 1 +- fi + if [ -x "${moz_libdir}/run-mozilla.sh" ]; then -+ dist_bin="$moz_libdir" -+ run_moz="${dist_bin}/run-mozilla.sh" ++ dist_bin="$moz_libdir" ++ run_moz="${dist_bin}/run-mozilla.sh" + else -+ echo "$0: Cannot find mozilla runtime directory. Exiting." 1>&2 -+ exit 1 ++ echo "$0: Cannot find mozilla runtime directory. Exiting." 1>&2 ++ exit 1 + fi - fi - --script_args="" --moreargs="" --debugging=0 --MOZILLA_BIN="%MOZILLA-BIN%" -- + fi + fi + +-script_args="" +-moreargs="" +-debugging=0 +-MOZILLA_BIN="%MOZILLA-BIN%" +MOZILLA_BIN="${progbase}-bin" - if [ "$OSTYPE" = "beos" ]; then -- mimeset -F $MOZILLA_BIN -+ mimeset -F "$MOZILLA_BIN" - fi - + + if [ "$OSTYPE" = "beos" ]; then + mimeset -F $MOZILLA_BIN + fi +# test for binary apps in ${dist_bin} +if [ -x "${dist_bin}/${MOZILLA_BIN}" ]; then + MOZILLA_BIN="${dist_bin}/${progbase}-bin" @@ -230,170 +230,153 @@ +else + MOZ_CLIENT_PROGRAM="${MOZILLA_BIN} -remote -a ${progbase}" +fi -+ +# guest a default remote command +_remote_cmd="xfeDoCommand(openBrowser)" + +# parse options -+script_args= # null -+moreargs= # null -+target= # null ++# parse options ++script_args= # null ++moreargs= # null ++target= # null +ALREADY_RUNNING="test" - while [ $# -gt 0 ] - do -- case "$1" in -- -p | -pure) -- MOZILLA_BIN="%MOZILLA-BIN%.pure" -- shift -- ;; -- -g | --debug) -- script_args="$script_args -g" -- debugging=1 -- shift -- ;; -- -d | --debugger) -- script_args="$script_args -d $2" -- shift 2 -- ;; -- *) -- moreargs="$moreargs \"$1\"" -- shift 1 -- ;; -- esac + + while [ $# -gt 0 ] + do +- case "$1" in +- -p | -pure) +- MOZILLA_BIN="%MOZILLA-BIN%.pure" +- shift +- ;; +- -g | --debug) +- script_args="$script_args -g" +- debugging=1 +- shift +- ;; +- -d | --debugger) +- script_args="$script_args -d $2" +- shift 2 +- ;; +- *) +- moreargs="$moreargs \"$1\"" +- shift 1 +- ;; +- esac + if [ -n "${target}" ]; then -+ # well, this can't be the target if not last -+ moreargs="${moreargs} \"${target}\"" -+ target= # null ++ # well, this can't be the target if not last ++ moreargs="${moreargs} \"${target}\"" ++ target= # null + fi + case "$1" in -+ # preserve [pP] for profile -+ --pure | -pure) -+ MOZILLA_BIN="${MOZILLA_BIN}.pure" -+ shift -+ ;; -+ -g | --debug) -+ script_args="${script_args} -g" -+ debugging=1 -+ shift -+ ;; -+ -d | --debugger) -+ if [ -n "$2" ]; then -+ script_args="${script_args} -d $2" -+ shift 2 -+ else -+ "$0: ERROR, $1 needs an argument. Exiting" 1>&2 -+ exit 1 -+ fi -+ ;; -+ -[Uu][Ii][Ll]ocale) -+ if [ -n "$2" ]; then -+ uilocale="$2" -+ shift 2 -+ else -+ echo "$0: ERROR, $1 needs an argument. Exiting" 1>&2 -+ exit 1 -+ fi -+ ;; -+ -[Uu][Ii][Rr]egion) -+ if [ -n "$2" ]; then -+ uiregion="$2" -+ shift 2 -+ else -+ echo "$0: ERROR, $1 needs an argument. Exiting" 1>&2 -+ exit 1 -+ fi -+ ;; -+ -browser) -+ # browser is default for mozilla -+ shift -+ ;; -+ -mail) -+ _remote_cmd="xfeDoCommand(openInbox)" -+ moreargs="${moreargs} $1" -+ shift -+ ;; -+ -compose) -+ _remote_cmd="xfeDoCommand(composeMessage)" -+ moreargs="${moreargs} $1" -+ shift -+ ;; -+ -turbo | -nosplash | -quiet) -+ # use remote even with this -+ moreargs="${moreargs} $1" -+ shift -+ ;; -+ -*) -+ # don't use remote with options -+ ALREADY_RUNNING= # null -+ moreargs="${moreargs} $1" -+ shift -+ ;; -+ *) -+ target="$1" -+ shift -+ ;; ++ # preserve [pP] for profile ++ --pure | -pure) ++ MOZILLA_BIN="${MOZILLA_BIN}.pure" ++ shift ++ ;; ++ -g | --debug) ++ script_args="${script_args} -g" ++ debugging=1 ++ shift ++ ;; ++ -d | --debugger) ++ if [ -n "$2" ]; then ++ script_args="${script_args} -d $2" ++ shift 2 ++ else ++ "$0: ERROR, $1 needs an argument. Exiting" 1>&2 ++ exit 1 ++ fi ++ ;; ++ -[Uu][Ii][Ll]ocale) ++ if [ -n "$2" ]; then ++ uilocale="$2" ++ shift 2 ++ else ++ echo "$0: ERROR, $1 needs an argument. Exiting" 1>&2 ++ exit 1 ++ fi ++ ;; ++ -[Uu][Ii][Rr]egion) ++ if [ -n "$2" ]; then ++ uiregion="$2" ++ shift 2 ++ else ++ echo "$0: ERROR, $1 needs an argument. Exiting" 1>&2 ++ exit 1 ++ fi ++ ;; ++ -browser) ++ # browser is default for mozilla ++ shift ++ ;; ++ -mail) ++ _remote_cmd="xfeDoCommand(openInbox)" ++ moreargs="${moreargs} $1" ++ shift ++ ;; ++ -compose) ++ _remote_cmd="xfeDoCommand(composeMessage)" ++ moreargs="${moreargs} $1" ++ shift ++ ;; ++ -turbo | -nosplash | -quiet) ++ # use remote even with this ++ moreargs="${moreargs} $1" ++ shift ++ ;; ++ -*) ++ # don't use remote with options ++ ALREADY_RUNNING= # null ++ moreargs="${moreargs} $1" ++ shift ++ ;; ++ *) ++ target="$1" ++ shift ++ ;; + esac - done - --export MRE_HOME --eval "set -- $moreargs" -+# test for a running copy of firefox -+# seems this is not needed -+#if [-n "${ALREADY_RUNNING}" ]; then -+# if [ -n "${DISPLAY}" ]; then -+# if [ -n "${debugging}" ]; then -+# echo "${run_moz} ${MOZ_CLIENT_PROGRAM} ping()" -+# ${run_moz} ${MOZ_CLIENT_PROGRAM} 'ping()' && ALREADY_RUNNING="yes" -+# else -+# ${run_moz} ${MOZ_CLIENT_PROGRAM} 'ping()' >/dev/null 2>&1 && -+# ALREADY_RUNNING="yes" -+# fi -+# elif [ -n "${debugging}" ]; then -+# echo "$0: WARN, no DISPLAY environment" 1>&2 -+# fi -+#fi -+ + done + +-export MRE_HOME +-eval "set -- $moreargs" +# process target +if [ -n "${target}" ]; then + moreargs="${moreargs} \"${target}\"" + if [ -n "${ALREADY_RUNNING}" ]; then -+ if [ `expr "${target}" : '.*:.*'` -eq 0 ]; then -+ if [ `expr "${target}" : '/.*'` -eq 0 ]; then -+ target="${here}/${target}" -+ fi -+ if [ -r "${target}" -o -d "${target}" ]; then -+ [ -n "${use_openFile}" ] || target="file://${target}" -+ else -+ echo "$0: WARN, target: ${target} not an URI/file/dir" 1>&2 -+ ALREADY_RUNNING= # null -+ fi -+ else -+ # an former URI, don't use openFile -+ use_openFile= # null -+ fi ++ if [ `expr "${target}" : '.*:.*'` -eq 0 ]; then ++ if [ `expr "${target}" : '/.*'` -eq 0 ]; then ++ target="${here}/${target}" ++ fi ++ if [ -r "${target}" -o -d "${target}" ]; then ++ [ -n "${use_openFile}" ] || target="file://${target}" ++ else ++ echo "$0: WARN, target: ${target} not an URI/file/dir" 1>&2 ++ ALREADY_RUNNING= # null ++ fi ++ else ++ # an former URI, don't use openFile ++ use_openFile= # null ++ fi + fi +fi -+ +# try remote protocol if running +if [ -n "${ALREADY_RUNNING}" ]; then + if [ -n "${target}" ]; then -+ if [ -n "${use_openFile}" ]; then -+ _remote_cmd="openFile(${target})" -+ elif [ -n "${location}" ]; then -+ _remote_cmd="openURL(${target},${location})" -+ else -+ _remote_cmd="openURL(${target})" -+ fi ++ if [ -n "${use_openFile}" ]; then ++ _remote_cmd="openFile(${target})" ++ elif [ -n "${location}" ]; then ++ _remote_cmd="openURL(${target},${location})" ++ else ++ _remote_cmd="openURL(${target})" ++ fi + fi + # FIXME problems with freedesktop StartupNotify + if [ -n "${debugging}" ]; then -+ echo "${run_moz} ${script_args} ${MOZ_CLIENT_PROGRAM} ${_remote_cmd}" ++ echo "${run_moz} ${script_args} ${MOZ_CLIENT_PROGRAM} ${_remote_cmd}" + fi + ${run_moz} ${script_args} ${MOZ_CLIENT_PROGRAM} ${_remote_cmd} && exit 0 +fi + +# fallback to direct invocation -+ +# UILocale, UIRegion +if [ -z "${uilocale}" -a -n "${MOZILLA_UILOCALE}" ]; then + uilocale="${MOZILLA_UILOCALE}" @@ -406,25 +389,32 @@ +fi +if [ -n "${uilocale}" ]; then + if [ -n "${uiregion}" ]; then -+ moreargs="-UIRegion ${uiregion} ${moreargs}" ++ moreargs="-UIRegion ${uiregion} ${moreargs}" + fi + moreargs="-UILocale ${uilocale} ${moreargs}" +fi + +# real invocation +eval "set -- ${moreargs}" - - ## Start addon scripts - moz_pis_startstop_scripts "start" - --if [ $debugging = 1 ] --then -- echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN "$@" ++ ++ ++if [ -n "${target}" ]; then ++ moreargs="${moreargs} \"${target}\"" ++ if [ -n "${ALREADY_RUNNING}" ]; then ++ if [ `expr "${target}" : '.*:.*'` -eq 0 ]; then ++ if [ `expr "${target}" : '/.*'` -eq 0 ]; then + + ## Start addon scripts + moz_pis_startstop_scripts "start" + +-if [ $debugging = 1 ] +-then +- echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN "$@" +if [ -n "${debugging}" ]; then + echo "${run_moz} ${script_args} ${MOZILLA_BIN} $@" - fi --"$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@" + fi +-"$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@" +${run_moz} ${script_args} ${MOZILLA_BIN} "$@" - exitcode=$? - - ## Stop addon scripts + exitcode=$? + + ## Stop addon scripts diff -ruN --exclude=CVS mozilla-devel/files/patch-xptcall-ia64 seamonkey/files/patch-xptcall-ia64 --- mozilla-devel/files/patch-xptcall-ia64 Fri Sep 16 14:35:28 2005 +++ seamonkey/files/patch-xptcall-ia64 Fri Sep 16 03:33:59 2005 @@ -1,38 +1,38 @@ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s.orig Sun Jul 20 00:05:32 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s Sun Jul 20 00:06:37 2003 +--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s.orig Wed Apr 6 15:04:07 2005 ++++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s Fri Sep 16 03:32:06 2005 @@ -8,6 +8,7 @@ - // Section has executable code - .section .text, "ax","progbits" - // procedure named 'XPTC_InvokeByIndex' -+ .global XPTC_InvokeByIndex - .proc XPTC_InvokeByIndex - // manual bundling - .explicit + // Section has executable code + .section .text, "ax","progbits" + // procedure named 'XPTC_InvokeByIndex' ++ .global XPTC_InvokeByIndex + .proc XPTC_InvokeByIndex + // manual bundling + .explicit @@ -24,7 +25,7 @@ - - // XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, - // PRUint32 paramCount, nsXPTCVariant* params); --XPTC_InvokeByIndex:: + + // XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, + // PRUint32 paramCount, nsXPTCVariant* params); +-XPTC_InvokeByIndex:: +XPTC_InvokeByIndex: - .prologue - .save ar.pfs, r37 - // allocate 4 input args, 6 local args, and 8 output args ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s.orig Sun Jul 20 00:02:02 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s Sun Jul 20 00:02:40 2003 + .prologue + .save ar.pfs, r37 + // allocate 4 input args, 6 local args, and 8 output args +--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s.orig Tue May 24 11:30:54 2005 ++++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s Fri Sep 16 03:33:12 2005 @@ -6,6 +6,7 @@ - // Section has executable code - .section .text, "ax","progbits" - // procedure named 'SharedStub' -+ .global SharedStub - .proc SharedStub - // manual bundling - .explicit + // Section has executable code + .section .text, "ax","progbits" + // procedure named 'SharedStub' ++ .global SharedStub + .proc SharedStub + // manual bundling + .explicit @@ -14,7 +15,7 @@ - // .exclass PrepareAndDispatch, @fullyvisible - .type PrepareAndDispatch,@function - --SharedStub:: + // .exclass PrepareAndDispatch, @fullyvisible + .type PrepareAndDispatch,@function + +-SharedStub:: +SharedStub: - // 9 arguments, first 8 are the input arguments of previous - // function call. The last one is methodIndex, and is passed in memory - .prologue + // 10 arguments, first 8 are the input arguments of previous + // function call. The 9th one is methodIndex and the 10th is the + // pointer to the remaining input arguments. The last two arguments diff -ruN --exclude=CVS mozilla-devel/files/seamonkey.desktop.in seamonkey/files/seamonkey.desktop.in --- mozilla-devel/files/seamonkey.desktop.in Wed Dec 31 19:00:00 1969 +++ seamonkey/files/seamonkey.desktop.in Fri Sep 16 02:31:26 2005 @@ -0,0 +1,169 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Seamonkey Web Browser +Name[az]=Seamonkey Veb Səyyahı +Name[bg]=Интернет браузър (Mozilla) +Name[bs]=Mozilla web preglednik +Name[ca]=Navegador web Mozilla +Name[cs]=Prohlížeč WWW Mozilla +Name[cy]=Y Porwr Gwe Mozilla +Name[da]=Mozilla - internetbrowser +Name[de]=Mozilla Webbrowser +Name[el]=Περιηγητής Διαδικτύου Mozilla +Name[en_CA]=Mozilla Web Browser +Name[en_GB]=Mozilla Web Browser +Name[es]=Navegador Web Mozilla +Name[et]=Mozilla veebibrauser +Name[eu]=Mozilla web arakatzailea +Name[fa]=مرورگر وب Mozilla +Name[fi]=Mozilla, WWW-selain +Name[fr]=Navigateur Web Mozilla +Name[ga]=Brabhsálaí Lín Mozilla +Name[he]=דפדפן Mozilla +Name[hr]=Mozilla Web preglednik +Name[hu]=Mozilla webböngésző +Name[id]=Web Browser Mozilla +Name[it]=Browser web Mozilla +Name[ja]=Mozilla ウェブ・ブラウザ +Name[ko]=Mozilla 웹 브라우저 +Name[li]=Mozilla Web Browser +Name[lt]=Mozilla web naršyklė +Name[mk]=Mozilla Веб Прелистувач +Name[mn]=Mozilla веб хөтөч +Name[ms]=Pelungsur Web Mozilla +Name[nb]=Mozilla nettleser +Name[nl]=Mozilla webbrowser +Name[nn]=Mozilla nettlesar +Name[no]=Mozilla nettleser +Name[pl]=Przeglądarka WWW Mozilla +Name[pt]=Navegador Web Mozilla +Name[pt_BR]=Navegador Web Mozilla +Name[ro]=Navigatorul Mozilla +Name[sl]=Spletni brskalnik Mozilla +Name[sq]=Mozilla - Shfletuesi Web +Name[sv]=Webbläsaren Mozilla +Name[tk]=Mozilla Web Ahtarçisi +Name[tr]=Mozilla Web Tarayıcı +Name[uk]=Переглядач web Mozilla +Name[vi]=Trình Duyệt Web Mozilla +Name[wa]=Betchteu waibe mozilla +Name[zh_CN]=Mozilla Web 浏览器 +Name[zh_TW]=Mozilla 網頁瀏覽器 +GenericName=Mozilla Web Browser +GenericName[az]=Mozilla Veb Səyyahı +GenericName[bg]=Интернет браузър (Mozilla) +GenericName[bs]=Mozilla web preglednik +GenericName[ca]=Navegador web Mozilla +GenericName[cs]=Prohlížeč WWW Mozilla +GenericName[cy]=Y Porwr Gwe Mozilla +GenericName[da]=Mozilla - internetbrowser +GenericName[de]=Mozilla Webbrowser +GenericName[el]=Περιηγητής Διαδικτύου Mozilla +GenericName[en_CA]=Mozilla Web Browser +GenericName[en_GB]=Mozilla Web Browser +GenericName[es]=Navegador Web Mozilla +GenericName[et]=Mozilla veebibrauser +GenericName[eu]=Mozilla web arakatzailea +GenericName[fa]=مرورگر وب Mozilla +GenericName[fi]=Mozilla, WWW-selain +GenericName[fr]=Navigateur Web Mozilla +GenericName[ga]=Brabhsálaí Lín Mozilla +GenericName[he]=דפדפן Mozilla +GenericName[hr]=Mozilla Web preglednik +GenericName[hu]=Mozilla webböngésző +GenericName[id]=Web Browser Mozilla +GenericName[it]=Browser web Mozilla +GenericName[ja]=Mozilla ウェブ・ブラウザ +GenericName[ko]=Mozilla 웹 브라우저 +GenericName[li]=Mozilla Web Browser +GenericName[lt]=Mozilla web naršyklė +GenericName[mk]=Mozilla Веб Прелистувач +GenericName[mn]=Mozilla веб хөтөч +GenericName[ms]=Pelungsur Web Mozilla +GenericName[nb]=Mozilla nettleser +GenericName[nl]=Mozilla webbrowser +GenericName[nn]=Mozilla nettlesar +GenericName[no]=Mozilla nettleser +GenericName[pl]=Przeglądarka WWW Mozilla +GenericName[pt]=Navegador Web Mozilla +GenericName[pt_BR]=Navegador Web Mozilla +GenericName[ro]=Navigatorul Mozilla +GenericName[sl]=Spletni brskalnik Mozilla +GenericName[sq]=Mozilla - Shfletuesi Web +GenericName[sv]=Webbläsaren Mozilla +GenericName[tk]=Mozilla Web Ahtarçisi +GenericName[tr]=Mozilla Web Tarayıcı +GenericName[uk]=Переглядач web Mozilla +GenericName[vi]=Trình Duyệt Web Mozilla +GenericName[wa]=Betchteu waibe mozilla +GenericName[zh_CN]=Mozilla Web 浏览器 +GenericName[zh_TW]=Mozilla 網頁瀏覽器 +Comment=Browse the web +Comment[ar]=تصفح الانترنت +Comment[az]=Vebi gəzin +Comment[be]=Вандраваць па павуціньню +Comment[bg]=Сърфиране в интернет +Comment[bn]=ওয়েব ব্রাউজ করুন +Comment[bs]=Pregledaj na internetu +Comment[ca]=Navegueu per la web +Comment[cs]=Prohlížet WWW +Comment[cy]=Pori'r we +Comment[da]=Benyt internettet +Comment[de]=Im Web surfen +Comment[el]=Περιήγηση στον παγκόσμιο ιστό +Comment[en_CA]=Browse the web +Comment[en_GB]=Browse the web +Comment[es]=Navegar por la web +Comment[et]=Sirvi veebi +Comment[eu]=Arakatu web-a +Comment[fa]=مرور وب +Comment[fi]=Selaa WWW:tä +Comment[fr]=Naviguer sur Internet +Comment[ga]=Brabhsáil an Líon +Comment[gu]=વેબમાં શોધો +Comment[he]=גלוש ברשת +Comment[hi]=वेब ब्राउज़ करें +Comment[hr]=Pregledaj Web +Comment[hu]=A világháló böngészése +Comment[id]=Jelajah web +Comment[it]=Esplora il web +Comment[ja]=ウェブを閲覧します +Comment[ko]=웹을 돌아 다닙니다 +Comment[li]=Blajere op internet +Comment[lt]=Naršyti internete +Comment[mk]=Прелистувајте го вебот +Comment[ml]=വലക്കെട്ട് തിരയുക +Comment[mn]=Веб броузе хийх +Comment[ms]=Layari web +Comment[nb]=Surf på nettet +Comment[nl]=Websurfen +Comment[nn]=Surf på nettet +Comment[no]=Surf på nettet +Comment[pa]=ਵੈਬ ਬਰਾਊਜ਼ +Comment[pl]=Przeglądanie stron WWW +Comment[pt]=Navegar na web +Comment[pt_BR]=Navegar na web +Comment[ro]=Navigare Internet +Comment[ru]=Программа для просмотра веб-страниц +Comment[sk]=Prehliadať internet +Comment[sl]=Brskaj po spletu +Comment[sq]=Eksploro web-in +Comment[sr]=Прегледај веб +Comment[sr@Latn]=Pregledaj veb +Comment[sv]=Surfa på nätet +Comment[ta]=வலையில் உலாவு +Comment[th]=ใช้งานเว็บบราวเซอร์ Mozilla +Comment[tk]=Webi Ahtar +Comment[tr]=Web'e Gözat +Comment[uk]=Програма перегляду web-сторінок +Comment[vi]=Duyệt web +Comment[wa]=Naivyî avå les waibes +Comment[zh_CN]=浏览 Web +Comment[zh_TW]=瀏覽網頁 +Exec=seamonkey %U +StartupNotify=true +Terminal=false +Type=Application +Icon=%%PREFIX%%/lib/seamonkey/chrome/icons/default/default.xpm +Categories=Application;Network; +MimeType=text/html;text/xml;application/xhtml+xml; diff -ruN --exclude=CVS mozilla-devel/files/seamonkey.sh seamonkey/files/seamonkey.sh --- mozilla-devel/files/seamonkey.sh Wed Dec 31 19:00:00 1969 +++ seamonkey/files/seamonkey.sh Fri Sep 16 02:03:13 2005 @@ -0,0 +1,85 @@ +#!/bin/sh + +MOZILLA_DIR="%%PREFIX%%/lib/%%MOZILLA%%" +MOZILLA_EXEC="./mozilla" +MOZILLA_REMOTE_EXEC="${MOZILLA_EXEC} -remote" +APPLICATION_ID="mozilla" + +LOCATION='new-tab' +#MOZILLA_UILOCALE="en-US" +#MOZILLA_UIREGION="US" +#MOZILLA_DSP="auto" + +cd $MOZILLA_DIR || exit 1 + +# LANG, MOZILLA_UILOCALE, MOZILLA_UIREGION +if [ -n "$LANG" -a ! -n "${MOZILLA_UILOCALE}" ]; then + _locale="${LANG%%.*}" + if [ "${_locale}" != "en_US" -a "${_locale}" != "C" ]; then + _region="${_locale##*_}" + _locale="${_locale%_*}" + [ -r chrome/${_locale}-${_region}.jar ] && \ + MOZILLA_EXEC="${MOZILLA_EXEC} -UILocale ${_locale}-${_region}" + fi +elif [ -n "${MOZILLA_UILOCALE}" ]; then + MOZILLA_EXEC="${MOZILLA_EXEC} -UILocale ${MOZILLA_UILOCALE}" + if [ -n "${MOZILLA_UIREGION}" ]; then + MOZILLA_EXEC="${MOZILLA_EXEC} -UIRegion ${MOZILLA_UIREGION}" + fi +fi + +# find a /dev/dsp handler +case "${MOZILLA_DSP}" in +# [Ee][Ss][Dd]|esddsp) # Use the esd dsp wrapper +# MOZILLA_DSP="esddsp" +# ;; + [Aa][Rr][Tt][Ss]|artsdsp) # Use the arts dsp wrapper + MOZILLA_DSP="artsdsp" + ;; + [Nn][Oo][Nn][Ee]) # Direct dsp output + MOZILLA_DSP="" + ;; + *) # Guest one (auto) + if [ -n "${KDE_FULL_SESSION}" ]; then + MOZILLA_DSP="artsdsp" +# elif [ -r ${HOME}/.esd_auth ]; then +# MOZILLA_DSP="esddsp" + else + MOZILLA_DSP="" + fi + ;; +esac + +if [ -n "${MOZILLA_DSP}" ] && type "${MOZILLA_DSP}" > /dev/null 2>&1; then + MOZILLA_EXEC="${MOZILLA_DSP} ${MOZILLA_EXEC}" +fi + +case $1 in + -browser) + REMOTE_COMMAND="xfeDoCommand (openBrowser)" + ;; + -mail) + REMOTE_COMMAND="xfeDoCommand (openInbox)" + ;; + -compose) + REMOTE_COMMAND="xfeDoCommand (composeMessage)" + ;; + -*) + exec ${MOZILLA_EXEC} "$@" + ;; + *) + if [ -n "${LOCATION}" ]; then + REMOTE_COMMAND="openURL($@,$LOCATION)" + else + REMOTE_COMMAND="openURL($@)" + fi + ;; +esac + +# process found +${MOZILLA_REMOTE_EXEC} "ping()" >/dev/null 2>&1 && +${MOZILLA_REMOTE_EXEC} "${REMOTE_COMMAND}" && exit 0 + +# no existing process +exec ${MOZILLA_EXEC} "$@" +