summaryrefslogtreecommitdiffstats
path: root/www/firefox3-devel
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2005-03-10 08:44:08 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2005-03-10 08:44:08 +0800
commite94d50b816875628428577d6a01717dc794dba18 (patch)
treeb49e0cb118c4aab51229a0b0f036067fb459648a /www/firefox3-devel
parent7c7642157586a0f2ee4eabff72d7ef7372e8f8b7 (diff)
downloadmarcuscom-ports-e94d50b816875628428577d6a01717dc794dba18.tar
marcuscom-ports-e94d50b816875628428577d6a01717dc794dba18.tar.gz
marcuscom-ports-e94d50b816875628428577d6a01717dc794dba18.tar.bz2
marcuscom-ports-e94d50b816875628428577d6a01717dc794dba18.tar.lz
marcuscom-ports-e94d50b816875628428577d6a01717dc794dba18.tar.xz
marcuscom-ports-e94d50b816875628428577d6a01717dc794dba18.tar.zst
marcuscom-ports-e94d50b816875628428577d6a01717dc794dba18.zip
Remove these ports now that the updates have been merged into the ports
tree. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3913 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'www/firefox3-devel')
-rw-r--r--www/firefox3-devel/Makefile276
-rw-r--r--www/firefox3-devel/distinfo2
-rw-r--r--www/firefox3-devel/files/extra-patch-config_make-jars.pl10
-rw-r--r--www/firefox3-devel/files/firefox.desktop.in191
-rw-r--r--www/firefox3-devel/files/firefox.rb95
-rwxr-xr-xwww/firefox3-devel/files/mkdistfile171
-rw-r--r--www/firefox3-devel/files/moz_pis_S50cleanhome31
-rw-r--r--www/firefox3-devel/files/mozconfig.in83
-rw-r--r--www/firefox3-devel/files/patch-Double.cpp61
-rw-r--r--www/firefox3-devel/files/patch-browser_app_mozilla.in465
-rw-r--r--www/firefox3-devel/files/patch-bugzilla149334342
-rw-r--r--www/firefox3-devel/files/patch-build_unix_mozilla-xpcom.pc.in8
-rw-r--r--www/firefox3-devel/files/patch-build_unix_run-mozilla.sh23
-rw-r--r--www/firefox3-devel/files/patch-config-mkdepend-imakemdep.h12
-rw-r--r--www/firefox3-devel/files/patch-config-rules.mk16
-rw-r--r--www/firefox3-devel/files/patch-config::mkdepend::Makefile.in10
-rw-r--r--www/firefox3-devel/files/patch-configure38
-rw-r--r--www/firefox3-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp48
-rw-r--r--www/firefox3-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h14
-rw-r--r--www/firefox3-devel/files/patch-nspr-unix.c23
-rw-r--r--www/firefox3-devel/files/patch-nsprpub-pr-include-md-_freebsd.cfg163
-rw-r--r--www/firefox3-devel/files/patch-nsprpub-pr-include-md-_freebsd.h15
-rw-r--r--www/firefox3-devel/files/patch-nsprpub-pr-include-md-_pth.h11
-rw-r--r--www/firefox3-devel/files/patch-nsprpub-pr-src-io-prprf.c14
-rw-r--r--www/firefox3-devel/files/patch-nsprpub-pr-src-pthreads-ptio.c31
-rw-r--r--www/firefox3-devel/files/patch-security-coreconf-FreeBSD.mk28
-rw-r--r--www/firefox3-devel/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp29
-rw-r--r--www/firefox3-devel/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc11
-rw-r--r--www/firefox3-devel/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in56
-rw-r--r--www/firefox3-devel/files/patch-xptcall-alpha461
-rw-r--r--www/firefox3-devel/files/patch-xptcall-ia6440
-rw-r--r--www/firefox3-devel/files/patch-xptcall-sparc64329
-rw-r--r--www/firefox3-devel/pkg-deinstall.in25
-rw-r--r--www/firefox3-devel/pkg-descr12
-rw-r--r--www/firefox3-devel/pkg-install.in36
-rw-r--r--www/firefox3-devel/pkg-message41
36 files changed, 0 insertions, 3221 deletions
diff --git a/www/firefox3-devel/Makefile b/www/firefox3-devel/Makefile
deleted file mode 100644
index 7cab45b68..000000000
--- a/www/firefox3-devel/Makefile
+++ /dev/null
@@ -1,276 +0,0 @@
-# New ports collection makefile for: phoenix
-# Date created: 2002/10/21
-# Whom: Alan Eldridge <alane@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME= firefox
-PORTVERSION= 1.0.1
-PORTREVISION= 2
-PORTEPOCH= 1
-CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR= ${PORTNAME}/releases/1.0.1/source
-DISTNAME= ${PORTNAME}-1.0.1-source
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= Web browser based on the browser portion of Mozilla
-
-LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
- png.5:${PORTSDIR}/graphics/png \
- mng.1:${PORTSDIR}/graphics/libmng
-BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip
-
-ALL_TARGET= default
-CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
-FAKEDIR= ${WRKDIR}/fake
-USE_REINPLACE= yes
-HAS_CONFIGURE= yes
-ESD_LIB= libesd.so.2
-PLIST= ${WRKDIR}/plist
-PLUGINSDIR= ${PREFIX}/lib/browser_plugins
-USE_BZIP2= yes
-USE_GMAKE= yes
-USE_GNOME= gtk20 libidl gnomehier desktopfileutils
-USE_ICONV= yes
-USE_PERL5_BUILD=yes
-USE_X_PREFIX= yes
-WRKSRC= ${WRKDIR}/mozilla
-PKGINSTALL= ${WRKDIR}/pkg-install
-PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
-
-EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude */CVS/* \
- --exclude */macbuild/*\
- --exclude */package/* \
- --exclude .cvsignore \
- --exclude makefile.win \
- --exclude MANIFEST
-
-FIREFOX= ${PORTNAME}
-FF_VER= ${PORTVERSION}
-
-FIREFOX_ICON= firefox.png
-FIREFOX_ICON_SRC=${WRKSRC}/other-licenses/branding/firefox/content/alert-exclam.png
-
-PKGCONFIG_FILES=firefox-gtkmozembed firefox-js firefox-xpcom \
- firefox-nspr firefox-nss firefox-plugin
-
-JPI_LIST?=\
- ${LOCALBASE}/jdk1.4.2/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so \
- ${LOCALBASE}/jdk1.4.1/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so \
- ${LOCALBASE}/diablo-jdk1.3.1/jre/plugin/${ARCH}/ns600/libjavaplugin_oji.so \
- ${LOCALBASE}/jdk1.3.1/jre/plugin/${ARCH}/ns600/libjavaplugin_oji.so
-
-SYSTEM_PREFS= ${FAKEDIR}/lib/${FIREFOX}-${FF_VER}/defaults/pref/firefox.js
-SCRIPTS_DIR= ${FAKEDIR}/lib/${FIREFOX}-${FF_VER}
-MOZ_PIS_SCRIPTS= S50cleanhome
-MOZ_PIS_DIR= ${SCRIPTS_DIR}/init.d
-
-OPTIONS= DEBUG "Build a debugging image" off \
- LOGGING "Enable additional log messages" off \
- OPTIMIZED_CFLAGS "Enable some additional optimizations" off \
- XFT "Enable support for anti-aliased fonts" on \
- SMB "Enable smb:// URI support using gnomevfs" off \
- NEWTAB "Open external links in a new tab" on
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_DEBUG)
-WITH_LOGGING= yes
-CONFIGURE_ENV+= WITH_DEBUG=yes
-.endif # defined(WITH_DEBUG)
-
-.if defined(WITH_OPTIMIZED_CFLAGS)
-CFLAGS:= -O2 -fno-strict-aliasing ${CFLAGS:N-O*}
-.else
-CFLAGS:= -O ${CFLAGS:N-O*:N-m*}
-CONFIGURE_ENV+= WITH_OPTIMIZE=-O
-.endif # defined(WITH_OPTIMIZED_CFLAGS)
-
-.if defined(WITH_LOGGING)
-CONFIGURE_ENV+= WITH_LOGGING=yes
-.endif # defined(WITH_LOGGING)
-
-.if defined(WITHOUT_XFT)
-CONFIGURE_ENV+= WITHOUT_XFT=yes
-.else
-LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft
-.endif # !defined(WITHOUT_XFT)
-
-.if defined(WITH_SMB)
-USE_GNOME+= gnomevfs2
-CONFIGURE_ENV+= WITH_SMB=yes
-.endif # defined(WITH_SMB)
-
-CPPFLAGS+= -I${X11BASE}/include -I${LOCALBASE}/include
-CFLAGS+= ${PTHREAD_CFLAGS}
-LDFLAGS+= -L${X11BASE}/lib
-LIBS+= ${PTHREAD_LIBS}
-
-EXTRA_SCRIPTS= ${PORTNAME}.rb
-
-.if ${ARCH} == "alpha" && ${OSVERSION} < 500035
-IGNORE= "core dumps on alpha during post-build"
-.endif
-
-.if ${PERL_LEVEL} < 500600
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config_make-jars.pl
-.endif
-
-pre-extract::
- @${ECHO_MSG}
- @${ECHO_MSG} "Extracting source (this takes a while) ..."
- @${ECHO_MSG}
-
-post-extract::
- @${SED} -e 's|@CPPFLAGS@|${CPPFLAGS}|' \
- -e 's|@CFLAGS@|${CFLAGS}|' \
- -e 's|@LDFLAGS@|${LDFLAGS}|' \
- -e 's|@LIBS@|${LIBS}|' \
- -e 's|@X11BASE@|${X11BASE}|' \
- -e 's|@LOCALBASE@|${LOCALBASE}|' \
- -e 's|@FAKEDIR@|${FAKEDIR}|' \
- -e 's|@PERL@|${PERL5}|' \
- <${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
- @${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' \
- <${FILESDIR}/firefox.desktop.in >${WRKDIR}/firefox.desktop
-
-post-patch:
- @${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${FIREFOX}|g ; \
- s|%%PREFIX%%|${PREFIX}|g ; \
- s|%%X11BASE%%|${X11BASE}|g' \
- < ${MASTERDIR}/pkg-install.in > ${PKGINSTALL}
- @${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${FIREFOX}|g' \
- < ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL}
-.for ii in ${EXTRA_SCRIPTS}
- @${SED} -e 's|%%MOZILLA%%|${FIREFOX}|g ; \
- s|%%PREFIX%%|${PREFIX}|g ; \
- s|%%X11BASE%%|${X11BASE}|g' \
- < ${FILESDIR}/${ii} > ${WRKDIR}/${ii}
-.endfor
-.for ii in ${MOZ_PIS_SCRIPTS}
- @${SED} -e 's|%%MOZILLA%%|${FIREFOX}|g ; \
- s|%%PREFIX%%|${PREFIX}|g ; \
- s|%%X11BASE%%|${X11BASE}|g' \
- < ${FILESDIR}/moz_pis_${ii} > ${WRKDIR}/moz_pis_${ii}
-.endfor
- @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
- ${WRKSRC}/build/unix/run-mozilla.sh
- @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
- s|-lpthread|${PTHREAD_LIBS}|g' \
- ${WRKSRC}/configure \
- ${WRKSRC}/nsprpub/configure
- @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
- ${WRKSRC}/nsprpub/config/config.mk \
- ${WRKSRC}/security/coreconf/FreeBSD.mk \
- ${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \
- ${WRKSRC}/js/src/Makefile.in
- @${REINPLACE_CMD} -e 's|libesd\.so\.\d+|${ESD_LIB}|g' \
- ${WRKSRC}/widget/src/gtk2/nsSound.cpp
- @${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.no|g' \
- ${WRKSRC}/gfx/src/gtk/nsDeviceContextSpecG.cpp
-.for ii in modules/libpref/src/init extensions/sroaming/resources/content/prefs \
- embedding/minimo
- @${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \
- /dom.disable_window_open_feature.toolbar/s/false/true/' \
- ${WRKSRC}/${ii}/all.js
-.endfor
-
-pre-configure:
- @if [ -n "`${PKG_INFO} -xI '^bind[0-9]*-base-[0-9]'`" ]; then \
- ${ECHO_CMD} "${PKGNAME}: bind installed with PORT_REPLACES_BASE_BIND causes build problems."; \
- ${FALSE}; \
- fi
-
-pre-install:
- @${RM} -rf ${FAKEDIR} ${PLIST}
- @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
- Makefile ${MAKE_ARGS} install
- @${MKDIR} ${SCRIPTS_DIR}
- @${MKDIR} ${MOZ_PIS_DIR}
- ${ECHO_CMD} 'share/gnome/pixmaps/${FIREFOX_ICON}' >> ${PLIST}
- ${ECHO_CMD} 'share/gnome/applications/firefox.desktop' >> ${PLIST}
- ${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g; \
- s|${FIREFOX}-${FF_VER}|${FIREFOX}|' \
- ${FAKEDIR}/bin/firefox \
- ${FAKEDIR}/bin/firefox-config
- for i in ${EXTRA_SCRIPTS}; do \
- ${ECHO_CMD} bin/$${i} >> ${PLIST}; \
- done
- ${ECHO_CMD} bin/firefox >> ${PLIST}
- ${ECHO_CMD} bin/firefox-config >> ${PLIST}
-.for ii in ${MOZ_PIS_SCRIPTS}
- ${INSTALL_SCRIPT} ${WRKDIR}/moz_pis_${ii} ${MOZ_PIS_DIR}/${ii}
-.endfor
-.if !defined(WITHOUT_NEWTAB)
- ${ECHO_CMD} >> ${SYSTEM_PREFS}
- ${ECHO_CMD} "// Open external links in new tab" >> ${SYSTEM_PREFS}
- ${ECHO_CMD} "pref(\"browser.link.open_external\", 3);" \
- >> ${SYSTEM_PREFS}
-.endif # !defined(WITHOUT_NEWTAB)
- cd ${FAKEDIR}/lib/${FIREFOX}-${FF_VER} && ${FIND} -s * -type f -o -type l | \
- ${SED} -e 's|^|lib/${FIREFOX}/|' >> ${PLIST} \
- && ${FIND} -d * -type d | \
- ${SED} -e 's|^|@dirrm lib/${FIREFOX}/|' >> ${PLIST}
- ${ECHO_CMD} @dirrm lib/firefox >> ${PLIST}
- for pcfile in ${PKGCONFIG_FILES}; do \
- ${REINPLACE_CMD} -e 's|${FIREFOX}-${FF_VER}|${FIREFOX}|g; \
- s|${FAKEDIR}|${PREFIX}|' \
- ${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc ; \
- ${ECHO_CMD} libdata/pkgconfig/$${pcfile}.pc >> ${PLIST} ; \
- done
- cd ${FAKEDIR}/include/${FIREFOX}-${FF_VER} && ${FIND} -s * -type f -o -type l | \
- ${SED} -e 's|^|include/${FIREFOX}/|' >> ${PLIST} \
- && ${FIND} -d * -type d | \
- ${SED} -e 's|^|@dirrm include/${FIREFOX}/|' >> ${PLIST}
- ${ECHO_CMD} @dirrm include/${FIREFOX} >> ${PLIST}
- ${ECHO_CMD} lib/browser_plugins/.${PORTNAME}.keep >> ${PLIST}
- ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/browser_plugins 2>/dev/null || ${TRUE}" >> ${PLIST}
- ${ECHO_CMD} "@exec update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST}
- ${ECHO_CMD} "@unexec update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST}
-
-do-install:
- ${MKDIR} ${PREFIX}/lib/${FIREFOX}
- ${CHMOD} 755 ${PREFIX}/lib/${FIREFOX}
- ${INSTALL_SCRIPT} ${FAKEDIR}/bin/firefox ${PREFIX}/bin
- ${INSTALL_SCRIPT} ${FAKEDIR}/bin/firefox-config ${PREFIX}/bin
- if [ ! -d ${PREFIX}/lib/browser_plugins ]; then \
- ${MKDIR} ${PREFIX}/lib/browser_plugins ; \
- fi
- ${TOUCH} -f ${PREFIX}/lib/browser_plugins/.${PORTNAME}.keep
- if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \
- for jpi in ${JPI_LIST}; do \
- if [ -f $${jpi} ]; then \
- ${LN} -sf $${jpi} \
- ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ; \
- break; \
- fi; \
- done; \
- fi
- for pcfile in ${PKGCONFIG_FILES}; do \
- ${INSTALL_DATA} ${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc \
- ${PREFIX}/libdata/pkgconfig/$${pcfile}.pc ; \
- done
- -${RM} -fr ${PREFIX}/include/${FIREFOX}
- ${MKDIR} ${PREFIX}/include/${FIREFOX}
- ${CHMOD} 755 ${PREFIX}/include/${FIREFOX}
- cd ${FAKEDIR}/include/${FIREFOX}-${FF_VER} && ${FIND} . | \
- ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/${FIREFOX}
- cd ${FAKEDIR}/lib/${FIREFOX}-${FF_VER} && ${FIND} . | \
- ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${FIREFOX}
-
-post-install:
-.if !defined(PACKAGE_BUILDING)
- @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.endif
-.for i in ${EXTRA_SCRIPTS}
- ${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin
-.endfor
- ${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON}
- ${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications
- ${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \
- ${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm
- @-update-desktop-database
-
-.include <bsd.port.post.mk>
diff --git a/www/firefox3-devel/distinfo b/www/firefox3-devel/distinfo
deleted file mode 100644
index 2ce601d09..000000000
--- a/www/firefox3-devel/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (firefox-1.0.1-source.tar.bz2) = ebaea974fea9460ab7050fff76b41cb1
-SIZE (firefox-1.0.1-source.tar.bz2) = 32671529
diff --git a/www/firefox3-devel/files/extra-patch-config_make-jars.pl b/www/firefox3-devel/files/extra-patch-config_make-jars.pl
deleted file mode 100644
index a558607ca..000000000
--- a/www/firefox3-devel/files/extra-patch-config_make-jars.pl
+++ /dev/null
@@ -1,10 +0,0 @@
---- config/make-jars.pl.orig Wed Oct 13 16:17:11 2004
-+++ config/make-jars.pl Wed Oct 13 16:17:07 2004
-@@ -40,6 +40,7 @@
- last if ($arg eq "--");
- }
- my $defines = join(' ', @ARGV[ $ddindex .. $#ARGV ]);
-+splice @ARGV, $ddindex, $#ARGV;
-
- getopts("d:s:t:f:avlD:o:p:xz:");
-
diff --git a/www/firefox3-devel/files/firefox.desktop.in b/www/firefox3-devel/files/firefox.desktop.in
deleted file mode 100644
index c1b7a2e59..000000000
--- a/www/firefox3-devel/files/firefox.desktop.in
+++ /dev/null
@@ -1,191 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Firefox Web Browser
-Name[am]=
-Name[ar]=
-Name[az]=Firefox Veb Səyyahı
-Name[be]=
-Name[bg]=Интернет браузър Firefox
-Name[bn]=
-Name[bs]=Firefox web preglednik
-Name[ca]=Navegador web Firefox
-Name[cs]=Prohlížeč WWW Firefox
-Name[cy]=Y Porwr Gwe Firefox
-Name[da]=Firefox - internetsurfning
-Name[de]=Firefox Webbrowser
-Name[el]=Περιηγητής Διαδικτύου Firefox
-Name[en_CA]=Firefox Web Browser
-Name[en_GB]=Firefox Web Browser
-Name[es]=Navegador Web Firefox
-Name[et]=Firefox veebibrauser
-Name[eu]=Firefox web arakatzailea
-Name[fi]=Firefox, WWW-selain
-Name[fr]=Navigateur Web Firefox
-Name[ga]=Brabhsálaí Lín Firefox
-Name[gu]=એપીફની વૅબ બ્રાઉઝર
-Name[he]=דפדפן Firefox
-Name[hi]=
-Name[hr]=Firefox Web preglednik
-Name[hu]=Firefox webböngésző
-Name[id]=Web Browser Firefox
-Name[it]=Browser web Firefox
-Name[ja]=Firefox ウェブ・ブラウザ
-Name[ko]=Firefox 웹 브라우저
-Name[li]=Firefox Web Browser
-Name[lt]=Firefox web naršyklė
-Name[mk]=Firefox веб прелистувач
-Name[ml]=എപ്പിഫാനി വെബ്ബ് ബ്രൌസ‌ര്
-Name[mn]=Firefox веб хөтөч
-Name[ms]=Pelungsur Web Firefox
-Name[nb]=Firefox nettleser
-Name[nl]=Firefox Webbrowser
-Name[nn]=Firefox nettlesar
-Name[no]=Firefox nettleser
-Name[pa]=ਏਪੀਫਾਨੀ ਵੈੱਬ ਬਰਾਊਜ਼ਰ
-Name[pl]=Przeglądarka WWW Firefox
-Name[pt]=Navegador Web Firefox
-Name[pt_BR]=Navegador Web Firefox
-Name[ro]=Navigatorul Firefox
-Name[ru]=Веб-браузер Firefox
-Name[sk]=
-Name[sl]=Spletni brskalnik Firefox
-Name[sq]=Firefox - Shfletuesi Web
-Name[sr]=
-Name[sr@Latn]=Veb čitač Spoznaja
-Name[sv]=Webbläsaren Firefox
-Name[ta]=எபிபனி வலை உலாவி
-Name[tk]=Firefox Web Ahtarçisi
-Name[tr]=Firefox Web Tarayıcı
-Name[uk]=Переглядач web Firefox
-Name[vi]=Trình Duyệt Web Firefox
-Name[wa]=Betchteu waibe epiphany
-Name[zh_CN]=Firefox Web 浏览器
-Name[zh_TW]=Firefox 網頁瀏覽器
-GenericName=Web Browser
-GenericName[ar]=متصفّح الانترنت
-GenericName[az]=Veb Səyyahı
-GenericName[be]=Вандроўнік па павуціньню
-GenericName[bg]=Браузър
-GenericName[bn]=ওয়েব ব্রাউজার
-GenericName[bs]=Web preglednik
-GenericName[ca]=Navegador web
-GenericName[cs]=Prohlížeč WWW
-GenericName[cy]=Porwr Gwe
-GenericName[da]=Internetsurfning
-GenericName[de]=Webbrowser
-GenericName[el]=Περιηγητής Ιστοσελίδων
-GenericName[en_CA]=Web Browser
-GenericName[en_GB]=Web Browser
-GenericName[es]=Navegador web
-GenericName[et]=Veebilehitseja
-GenericName[eu]=Web arakatzailea
-GenericName[fi]=WWW-selain
-GenericName[fr]=Navigateur Web Firefox
-GenericName[ga]=Brabhsálaí Lín
-GenericName[gu]=વેબ બ્રાઉઝર
-GenericName[he]=דפדפן אינטרנט
-GenericName[hi]=वेब ब्राउज़र
-GenericName[hr]=Web preglednik
-GenericName[hu]=Webböngésző
-GenericName[id]=Browser Web
-GenericName[it]=Browser web
-GenericName[ja]=GNOME ウェブ・ブラウザ
-GenericName[ko]=웹 브라우저
-GenericName[li]=Wèb Browser
-GenericName[lt]=Web naršyklė
-GenericName[mk]=Веб прелистувач
-GenericName[mn]=Веб хөтөч
-GenericName[ms]=Pelungsur Web
-GenericName[nb]=Nettleser
-GenericName[nl]=Web-browser
-GenericName[nn]=Nettlesar
-GenericName[no]=Nettleser
-GenericName[pa]=ਵੈਬ ਬਰਾਊਜ਼
-GenericName[pl]=Przeglądarka WWW
-GenericName[pt]=Navegador Web
-GenericName[pt_BR]=Navegador Web
-GenericName[ro]=Navigator Internet
-GenericName[ru]=Веб-браузер
-GenericName[sk]=WWW prehliadač
-GenericName[sl]=Spletni brskalnik
-GenericName[sq]=Shfletuesi Web
-GenericName[sr]=Веб читач
-GenericName[sr@Latn]=Veb čitač
-GenericName[sv]=Webbläsare
-GenericName[ta]=வலை உலாவி
-GenericName[th]=เว็บบราวเซอร์
-GenericName[tk]=Web Ahtarçysy
-GenericName[tr]=Web Tarayıcı
-GenericName[uk]=Переглядач web-сторінок
-GenericName[vi]=Trình duyệt Web
-GenericName[wa]=Betchteu waibe
-GenericName[zh_CN]=Web 浏览器
-GenericName[zh_TW]=網頁瀏覽器
-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]=Surf på 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[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]=ใช้งานเว็บบราวเซอร์ Firefox
-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=firefox %U
-Icon=@FIREFOX_ICON@
-StartupNotify=false
-Terminal=false
-Type=Application
-Categories=Application;Network;
-MimeType=text/html;text/xml;application/xhtml+xml;
diff --git a/www/firefox3-devel/files/firefox.rb b/www/firefox3-devel/files/firefox.rb
deleted file mode 100644
index 7aa32cbe5..000000000
--- a/www/firefox3-devel/files/firefox.rb
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/usr/bin/env ruby
-=begin -*-mode: ruby-*-
-
- MoZiLLa.in
-
- Copyright (c) 2002, Alan Eldridge
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- * Neither the name of the copyright owner nor the names of its
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
-
- $Id: firefox.rb,v 1.1 2005-03-05 01:49:02 marcus Exp $
-
- 2002-12-16 Alan Eldridge <alane@geeksrus.net>
-
-=end
-
-X11BIN = "/usr/X11R6/bin"
-NAME = File::basename($0, ".rb")
-APP_PATH = File::join(X11BIN, NAME)
-
-if !File::executable?(APP_PATH)
- raise "File '#{APP_PATH}' not found. Giving up."
-elsif ($display = ENV["DISPLAY"]) == nil
- raise "Environment variable DISPLAY not found. Giving up."
-end
-
-if ARGV.size > 0
- if ARGV[0] == "--debug"
- ARGV.shift
- else
- $stdin.reopen(File::open("/dev/null", "r"))
- $stdout.reopen(File::open("/dev/null", "w"))
- $stderr.reopen(File::open("/dev/null", "w"))
- end
-end
-
-if ARGV.size < 1
- $url = nil
-else
- $url = ARGV.pop
- $url.sub!(/^ghelp:/, "file:")
-end
-
-IO::popen("xwininfo -display #{$display} -root -tree") {
- |io|
- if NAME != "firefox"
- $windows = io.grep(%r<"Mozilla"\s+"navigator:\s*browser">)
- else
- $windows = io.grep(%r<Firefox-bin.*>)
- end
-}
-
-if $windows.size > 0
- $id = $windows.map {
- |s| s.strip.split.first
- }.sort.first
- $args = [ "-id", $id, "-raise", "-remote" ]
- $args.push($url ? "\"openURL(#{$url},new-window)\"" :
- "\"xfeDoCommand(openBrowser)\"")
-else
- $args = ARGV
- $args.push("\"#{$url}\"") if $url
-end
-
-fork {
- exec(([APP_PATH] + $args).join(" "))
-}
-exit!
-
-#EOF
diff --git a/www/firefox3-devel/files/mkdistfile b/www/firefox3-devel/files/mkdistfile
deleted file mode 100755
index 6737be921..000000000
--- a/www/firefox3-devel/files/mkdistfile
+++ /dev/null
@@ -1,171 +0,0 @@
-#!/bin/sh
-# -*-shell-script-*-
-#
-# mkdistfile -- maintainer's utility to make a firefox distfile
-#
-# Copyright (c) 2002, Alan Eldridge
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# * Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# * Neither the name of the copyright owner nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-# $FreeBSD$
-#
-# 2002/10/21 alane@geeksrus.net
-#
-
-ORIGDIR=$(/bin/pwd); export ORIGDIR
-APPNAME=${0##*/};APPNAME=${APPNAME#-}; export APPNAME
-test -z "$TMPDIR" && TMPDIR=/tmp; export TMPDIR
-test -z "$HOSTNAME" && HOSTNAME=$(hostname); export HOSTNAME
-warn() { echo "[$APPNAME:$$]" "****" "$@";}
-status() { echo "[$APPNAME:$$]" "===>" "$@";}
-error() { echo "[$APPNAME:$$]" "ERROR:" "$@";}
-die() { echo "[$APPNAME:$$]" "FATAL:" "$@"; exit 1;}
-unset echo_n; test "X`echo -n`" = "X-n" \
- && echo_n() { echo "$@\c"; } || echo_n() { echo -n "$@"; }
-status_n() { echo_n "[$APPNAME:$$]" "===>" "$@";}
-log() { local cmd=$1;shift;echo_n $(date "+%Y%m%d.%T") "";$cmd "$@";}
-qexpr() { expr "$@" >/dev/null 2>&1;}
-qw() { echo \""$@"\"; }
-listfiles() { ls -1 ${1:+"$@"} 2>/dev/null; }
-whichre() { local n=$#; local s="$1"; shift; while test $# -ge 1; do
- qexpr "$s" : "$1"&& echo $(($n - $#)) && return 0; shift; done;
- echo 0; return 1;}
-matchre() { test $(whichre "$@") -gt 0; }
-streq() { local s="$1"; shift; while test $# -ge 1; do
- test "X$s" = "X$1" && return 0; shift; done; return 1;}
-strupper() {
- echo "$@"|tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ
-}
-strlower() {
- echo "$@"|tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz
-}
-chdir() { cd "$1" || die cd $(qw $1) failed; }
-absdir() { chdir "$1" && pwd; }
-abspath() { local p=''; case "$1" in /*);; *)p="$(pwd)/";; esac; echo "$p$1"; }
-tmpfile() { mktemp -t .$APPNAME ${1:+"$@"}; }
-############################################################
-# show usage and exit
-############################################################
-usage() {
- cat <<EOF
-Usage: $APPNAME [options] [--] rev[.yyyymmdd]
-Options:
- -h,--help Show this help.
- -V,--version Show version number.
- -v,--verbose Produce more verbose output.
- -x,--debug Turn on shell command tracing.
- -- Stop option processing.
-EOF
- exit $1
-}
-############################################################
-# show version and exit
-############################################################
-VERSION='$Revision: 1.2 $'
-VERSION=${VERSION#* }; VERSION=${VERSION% *}
-version() { echo "$APPNAME $VERSION" \
- "Copyright (c) 2002 Alan Eldridge"; exit $1;}
-############################################################
-# set default vars here
-############################################################
-DEBUG=0
-VERBOSE=0; VFLG=''
-DATETIME=$(date +%Y%m%d.%H%M)
-DATE=${DATETIME%.*}
-TIME=${DATETIME#*.}
-############################################################
-# do command line options
-############################################################
-while test $# -gt 0; do
- n=1; case "$1" in
- -h|--help) usage 0;;
- -V|--version) version 0;;
- -v|--verbose) VERBOSE=1;VFLG='-v';;
- -x|--debug) set -x;DEBUG=1;;
- --) shift; break;; -*) usage 1;; *) break;;
- esac; shift $n
-done
-
-############################################################
-# main(): script execution begins here
-############################################################
-
-test $# -eq 1 || usage 1
-
-REV=$1
-test ${REV##*.} = today && REV=${REV%.*}.$DATE
-
-status "pruning tree..."
-exfile=$(tmpfile)
-cat >>$exfile <<'EOF'
-^.*/CVS($|/)
-^.*/macbuild($|/)
-^.*/package($|/)
-^.*/.cvsignore($|/)
-^.*/windows($|/)
-^.*/activex($|/)
-^.*/os2($|/)
-^.*/solaris($|/)
-^.*/gc($|/)
-^mozilla/apache($|/)
-^mozilla/calendar($|/)
-^mozilla/cck($|/)
-^mozilla/chimera($|/)
-^mozilla/ef($|/)
-^mozilla/embed.mak($|/)
-^mozilla/embed.mk($|/)
-^mozilla/gconfig($|/)
-^mozilla/gfx2($|/)
-^mozilla/grendel($|/)
-^mozilla/java($|/)
-^mozilla/js2($|/)
-^mozilla/mail($|/)
-^mozilla/mailnews($|/)
-^mozilla/mozilla($|/)
-^mozilla/mozilla.kdevprj($|/)
-^mozilla/mozilla.lsm($|/)
-^mozilla/msgsdk($|/)
-^mozilla/mstone($|/)
-^mozilla/nglayout.mac($|/)
-^mozilla/nunet($|/)
-^mozilla/other-licenses($|/)
-^mozilla/privacy($|/)
-^mozilla/silentdl($|/)
-^mozilla/timer($|/)
-^mozilla/trex.mak($|/)
-^mozilla/trex.mk($|/)
-^mozilla/webtools($|/)
-EOF
-test -d mozilla || die "No mozilla dir here."
-find mozilla 2>/dev/null | egrep -f $exfile | xargs rm -fr
-rm -f $exfile
-status "making firefox-$REV.tar.bz2 ..."
-tar -cjpf firefox-$REV.tar.bz2 mozilla
-status "done."
-#EOF
diff --git a/www/firefox3-devel/files/moz_pis_S50cleanhome b/www/firefox3-devel/files/moz_pis_S50cleanhome
deleted file mode 100644
index 3de5565e3..000000000
--- a/www/firefox3-devel/files/moz_pis_S50cleanhome
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-#
-
-# S50cleanhome
-# a script to clean up users' Mozilla home directories to make upgrading
-# less painful.
-
-# We run in our own subshell
-
-# First, verify protocol
-[ "$1" != "start" ] && exit 1
-[ -z "${MOZ_PIS_API}" -o ${MOZ_PIS_API} -ne 2 ] && exit 1
-[ -z "${MOZ_PIS_MOZBINDIR}" -o ! -d "${MOZ_PIS_MOZBINDIR}" ] && exit 1
-[ -z "${HOME}" -o ! -d "${HOME}" ] && exit 1
-[ -z "${MOZ_PIS_USER_DIR}" -o ! -d "${HOME}/${MOZ_PIS_USER_DIR}" ] && exit 1
-
-# Try to cleanup ${HOME}/${MOZ_PIS_USER_DIR}
-
-if [ -f "${HOME}/${MOZ_PIS_USER_DIR}/profiles.ini" ]; then
- sed -e '/Path=/! d' -e "s,Path=,${HOME}/${MOZ_PIS_USER_DIR}/," \
- "${HOME}/${MOZ_PIS_USER_DIR}/profiles.ini" \
- | while read dir
- do
- [ ! -d "${dir}" ] && continue
- # Debian does this for new builds
- # rm -f "${dir}/XUL.mfasl"
- # force a rebuild of compreg.dat and xpti.dat for new installations
- [ "${dir}/compreg.dat" -ot "${MOZ_PIS_MOZBINDIR}/components.ini" ] &&
- rm -f "${dir}/compatibility.ini" "${dir}/XUL.mfasl"
- done
-fi
diff --git a/www/firefox3-devel/files/mozconfig.in b/www/firefox3-devel/files/mozconfig.in
deleted file mode 100644
index a354709bf..000000000
--- a/www/firefox3-devel/files/mozconfig.in
+++ /dev/null
@@ -1,83 +0,0 @@
-# .mozconfig.in -*-shell-script-*-
-# $FreeBSD$
-######################################################################
-# standard opts from README
-export MOZ_PHOENIX=1
-mk_add_options MOZ_PHOENIX=1
-ac_add_options --enable-crypto
-ac_add_options --disable-tests
-ac_add_options --disable-mailnews
-ac_add_options --disable-composer
-ac_add_options --enable-default-toolkit=gtk2
-# See the following URL for approval email for using official branding
-# http://people.freebsd.org/~ahze/firefox_thunderbird-approved.txt
-ac_add_options --enable-official-branding
-######################################################################
-# FBSD specific
-export CPPFLAGS="@CPPFLAGS@"
-export CFLAGS="@CFLAGS@"
-export LIBS="@LIBS@"
-export LDFLAGS="@LDFLAGS@"
-export CONFIG_SH=/bin/sh
-export XP_UNIX=1
-mk_add_options XP_UNIX=1
-export PERL="@PERL@"
-mk_add_options PERL=$PERL
-# Configure options for installation
-ac_add_options --prefix=@FAKEDIR@
-ac_add_options --x-includes=@X11BASE@/include
-ac_add_options --x-libraries=@X11BASE@/lib
-######################################################################
-# Use ports for these libraries
-ac_add_options --with-system-jpeg=@LOCALBASE@
-ac_add_options --with-system-zlib
-ac_add_options --with-system-png=@LOCALBASE@
-ac_add_options --with-system-mng=@LOCALBASE@
-ac_add_options --without-system-nspr
-ac_add_options --with-gssapi=/usr
-######################################################################
-# set compile/link features
-ac_add_options --with-pthreads
-######################################################################
-# disable unneeded/unavailable
-ac_add_options --disable-auto-deps
-ac_add_options --disable-bidi
-ac_add_options --disable-dtd-debug
-ac_add_options --disable-jsd
-ac_add_options --disable-ldap
-ac_add_options --disable-pedantic
-ac_add_options --disable-profilesharing
-ac_add_options --disable-installer
-ac_add_options --enable-single-profile
-ac_add_options --disable-profilesharing
-ac_add_options --enable-image-decoders=png,gif,jpeg,bmp
-ac_add_options --enable-extensions="cookie,xml-rpc,xmlextras,pref,transformiix,universalchardet,webservices,inspector,p3p,gnomevfs"
-######################################################################
-# conditional from port Makefile
-#if test -n "$WITH_REORDER"; then
-# ac_add_options --enable-reorder
-#else
-# ac_add_options --disable-reorder
-#fi # test -n "$WITH_REORDER"
-if test -n "$WITH_DEBUG"; then
- ac_add_options --enable-debug
- ac_add_options --disable-strip
-else
- ac_add_options --disable-debug
- ac_add_options --enable-optimize=${WITH_OPTIMIZE}
- ac_add_options --enable-strip
-fi # test -n "$WITH_DEBUG"
-if test -n "$WITH_LOGGING"; then
- ac_add_options --enable-logging
-else
- ac_add_options --disable-logging
-fi # test -n "$WITH_LOGGING"
-if test -z "$WITHOUT_XFT"; then
- ac_add_options --enable-xft
-else
- ac_add_options --disable-xft
-fi # test -z "$WITHOUT_XFT"
-if test -z "$WITH_SMB"; then
- ac_add_options --disable-gnomevfs
-fi # test -z "$WITH_SMB"
-######################################################################
diff --git a/www/firefox3-devel/files/patch-Double.cpp b/www/firefox3-devel/files/patch-Double.cpp
deleted file mode 100644
index 26a1fa563..000000000
--- a/www/firefox3-devel/files/patch-Double.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-$FreeBSD$
-
---- 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 <ieeefp.h>
--#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 --git a/www/firefox3-devel/files/patch-browser_app_mozilla.in b/www/firefox3-devel/files/patch-browser_app_mozilla.in
deleted file mode 100644
index 492dacc52..000000000
--- a/www/firefox3-devel/files/patch-browser_app_mozilla.in
+++ /dev/null
@@ -1,465 +0,0 @@
---- browser/app/mozilla.in.orig Tue Oct 26 11:26:11 2004
-+++ browser/app/mozilla.in Mon Feb 28 23:32:14 2005
-@@ -29,51 +29,83 @@
- ## the mozilla-bin 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_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 "${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
-+# uncomment for debugging
- #set -x
-
--moz_libdir=%MOZAPPDIR%
--MRE_HOME=%MREDIR%
-+#
-+# variables
-+#
-+#location="new-tab"
-+#MOZILLA_UILOCALE="en-US"
-+#MOZILLA_UIREGION="US"
-+
-+#
-+# working definitions
-+#
-+MOZ_USER_DIR="%MOZ_USER_DIR%"
-+moz_libdir="%MOZAPPDIR%"
-+MRE_HOME="%MREDIR%"
-+
-+debugging= # set the debugging level
-+use_openFile="yes" # use openFile() for file/dir
-+here=`pwd`
-+
-+if [ ! -d "${MRE_HOME}" ]; then
-+ # use moz_libdir as MRE_HOME
-+ MRE_HOME="${moz_libdir}"
-+fi
-+export MRE_HOME
-
- # Use run-mozilla.sh in the current dir if it exists
- # If not, then start resolving symlinks until we find run-mozilla.sh
-@@ -82,149 +114,217 @@
- curdir=`dirname "$progname"`
- progbase=`basename "$progname"`
- run_moz="$curdir/run-mozilla.sh"
--if test -x "$run_moz"; then
-- dist_bin="$curdir"
-- found=1
-+if [ -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`
-- run_moz="$dist_bin/run-mozilla.sh"
-- found=1
-- break
-- fi
-- done
-- cd "$here"
-+ 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
-- # 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
--
--script_args=""
--moreargs=""
--debugging=0
--MOZILLA_BIN="${progbase}-bin"
--
--# The following is to check for a currently running instance.
--# This is taken almost verbatim from the Mozilla RPM package's launch script.
--MOZ_CLIENT_PROGRAM="$dist_bin/mozilla-xremote-client"
--check_running() {
-- "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" 'ping()' 2>/dev/null >/dev/null
-- RETURN_VAL=$?
-- if [ $RETURN_VAL -eq 0 ]; then
-- echo 1
-- return 1
-+ # Check default compile-time libdir
-+ if [ -x "${moz_libdir}/run-mozilla.sh" ]; then
-+ dist_bin="$moz_libdir"
-+ run_moz="${dist_bin}/run-mozilla.sh"
- else
-- echo 0
-- return 0
-+ echo "$0: Cannot find mozilla runtime directory. Exiting." 1>&2
-+ exit 1
- fi
--}
-+fi
-
-+MOZILLA_BIN="${progbase}-bin"
- if [ "$OSTYPE" = "beos" ]; then
-- mimeset -F "$MOZILLA_BIN"
-+ mimeset -F "$MOZILLA_BIN"
- fi
-
--ALREADY_RUNNING=`check_running`
-+# test for binary apps in ${dist_bin}
-+if [ -x "${dist_bin}/${MOZILLA_BIN}" ]; then
-+ MOZILLA_BIN="${dist_bin}/${progbase}-bin"
-+else
-+ echo "$0: Cannot find mozilla binary executable. Exiting." 1>&2
-+ exit 1
-+fi
-+if [ -x "${dist_bin}/mozilla-xremote-client" ]; then
-+ MOZ_CLIENT_PROGRAM="${dist_bin}/mozilla-xremote-client -a ${progbase}"
-+else
-+ MOZ_CLIENT_PROGRAM="${MOZILLA_BIN} -remote -a ${progbase}"
-+fi
-
--################################################################ Parse Arguments
--# If there's a command line argument but it doesn't begin with a -
--# it's probably a url. Try to send it to a running instance.
--_USE_EXIST=0
--_optOne="$1"
--case "${_optOne}" in
-- -*)
-- ;;
-+# guest a default remote command
-+_remote_cmd="xfeDoCommand(openBrowser)"
-+
-+# parse options
-+script_args= # null
-+moreargs= # null
-+target= # null
-+ALREADY_RUNNING="test"
-+while [ $# -gt 0 ]
-+do
-+ if [ -n "${target}" ]; then
-+ # 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 firefox
-+ 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
-+ ;;
- *)
-- _USE_EXIST=1
-- ;;
--esac
--
--_optLast=
--for i in "$@"; do
-- _optLast="${i}"
--done #last arg
--
--if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
-- # Last argument seems to be a local file/directory
-- # Check, if it is absolutely specified (ie. /home/foo/file vs. ./file)
-- # If it is just "relatively" (./file) specified, make it absolutely
-- [ `expr "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
--fi
--################################################################ Parse Arguments
--
--########################################################################### Main
--if [ $ALREADY_RUNNING -eq 1 ]; then
-- # There's an instance already running. Use it.
-- # Any command line args passed in?
-- if [ $# -gt 0 ]; then
-- # There were "some" command line args.
-- if [ ${_USE_EXIST} -eq 1 ]; then
-- # We should use an existing instance, as _USE_EXIST=$_USE_EXIST=-1
-- _remote_cmd="openURL(${_optLast})"
-- "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "${_remote_cmd}"
-- unset _remote_cmd
-- exit $?
-- fi
-+ target="$1"
-+ shift
-+ ;;
-+ esac
-+done
-+
-+# 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
-+
-+# 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
-- # No command line args. Open new window/tab
-- #exec "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "xfeDoCommand(openBrowser)"
-- "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "xfeDoCommand(openBrowser)"
-- exit $?
-+ # an former URI, don't use openFile
-+ use_openFile= # null
- fi
-+ fi
- fi
--# Default action - no running instance or _USE_EXIST (${_USE_EXIST}) ! -eq 1
--########################################################################### Main
-
--while [ $# -gt 0 ]
--do
-- case "$1" in
-- -p | --pure | -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
--done
-+# 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
-+ fi
-+ # FIXME problems with freedesktop StartupNotify
-+ if [ -n "${debugging}" ]; then
-+ 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}"
-+fi
-+if [ -z "${uiregion}" -a -n "${MOZILLA_UIREGION}" ]; then
-+ uiregion="${MOZILLA_UIREGION}"
-+fi
-+if [ -n "${uiregion}" -a -z "${uilocale}" ]; then
-+ uilocale="en-US"
-+fi
-+if [ -n "${uilocale}" ]; then
-+ if [ -n "${uiregion}" ]; then
-+ moreargs="-UIRegion ${uiregion} ${moreargs}"
-+ fi
-+ moreargs="-UILocale ${uilocale} ${moreargs}"
-+fi
-
--export MRE_HOME
--eval "set -- $moreargs"
-+# 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 "${debugging}" ]; then
-+ echo "${run_moz} ${script_args} ${MOZILLA_BIN} $@"
- fi
--"$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@"
-+${run_moz} ${script_args} ${MOZILLA_BIN} "$@"
- exitcode=$?
-
- ## Stop addon scripts
diff --git a/www/firefox3-devel/files/patch-bugzilla149334 b/www/firefox3-devel/files/patch-bugzilla149334
deleted file mode 100644
index fe1be5bc8..000000000
--- a/www/firefox3-devel/files/patch-bugzilla149334
+++ /dev/null
@@ -1,342 +0,0 @@
-Index: gfx/idl/nsIFreeType2.idl
-===================================================================
-RCS file: /cvsroot/mozilla/gfx/idl/nsIFreeType2.idl,v
-retrieving revision 1.10
-diff -u -3 -p -r1.10 nsIFreeType2.idl
---- gfx/idl/nsIFreeType2.idl 15 Apr 2004 23:30:02 -0000 1.10
-+++ gfx/idl/nsIFreeType2.idl 26 May 2004 10:00:54 -0000
-@@ -76,10 +76,11 @@ native FT_Pointer(FT_Pointer);
- native FT_Sfnt_Tag(FT_Sfnt_Tag);
- native FT_Size(FT_Size);
-
--[ptr] native FTC_Image_Desc_p(FTC_Image_Desc);
-+[ptr] native FTC_ImageType_p(FTC_ImageType);
- native FTC_Face_Requester(FTC_Face_Requester);
- native FTC_Font(FTC_Font);
--native FTC_Image_Cache(FTC_Image_Cache);
-+native FTC_FaceID(FTC_FaceID);
-+native FTC_ImageCache(FTC_ImageCache);
- native FTC_Manager(FTC_Manager);
-
- // #ifdef MOZ_SVG
-@@ -99,7 +100,7 @@ interface nsIFreeType2 : nsISupports
-
- readonly attribute FT_Library library;
- readonly attribute FTC_Manager FTCacheManager;
-- readonly attribute FTC_Image_Cache ImageCache;
-+ readonly attribute FTC_ImageCache ImageCache;
-
- void doneFace(in FT_Face face);
- void doneFreeType(in FT_Library lib);
-@@ -115,16 +116,16 @@ interface nsIFreeType2 : nsISupports
- void outlineDecompose(in FT_Outline_p outline,
- in const_FT_Outline_Funcs_p funcs, in voidPtr p);
- void setCharmap(in FT_Face face, in FT_CharMap charmap);
-- void imageCacheLookup(in FTC_Image_Cache cache, in FTC_Image_Desc_p desc,
-+ void imageCacheLookup(in FTC_ImageCache cache, in FTC_ImageType_p desc,
- in FT_UInt gindex, out FT_Glyph glyph);
-- void managerLookupSize(in FTC_Manager manager, in FTC_Font font,
-- out FT_Face face, out FT_Size size);
-+ void managerLookupFace(in FTC_Manager manager, in FTC_FaceID face_id,
-+ out FT_Face face);
- void managerDone(in FTC_Manager manager);
- void managerNew(in FT_Library lib, in FT_UInt max_faces,
- in FT_UInt max_sizes, in FT_ULong max_bytes,
- in FTC_Face_Requester requester, in FT_Pointer req_data,
- out FTC_Manager manager);
-- void imageCacheNew(in FTC_Manager manager, out FTC_Image_Cache cache);
-+ void imageCacheNew(in FTC_Manager manager, out FTC_ImageCache cache);
- /* #ifdef MOZ_SVG */
- void glyphTransform(in FT_Glyph glyph, in FT_Matrix_p matrix,
- in FT_Vector_p delta);
-Index: gfx/src/freetype/nsFreeType.cpp
-===================================================================
-RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.cpp,v
-retrieving revision 1.25
-diff -u -3 -p -r1.25 nsFreeType.cpp
---- gfx/src/freetype/nsFreeType.cpp 17 Apr 2004 21:52:29 -0000 1.25
-+++ gfx/src/freetype/nsFreeType.cpp 26 May 2004 10:00:54 -0000
-@@ -110,11 +110,11 @@ FtFuncList nsFreeType2::FtFuncs [] = {
- {"FT_New_Face", NS_FT2_OFFSET(nsFT_New_Face), PR_TRUE},
- {"FT_Outline_Decompose", NS_FT2_OFFSET(nsFT_Outline_Decompose), PR_TRUE},
- {"FT_Set_Charmap", NS_FT2_OFFSET(nsFT_Set_Charmap), PR_TRUE},
-- {"FTC_Image_Cache_Lookup", NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup), PR_TRUE},
-- {"FTC_Manager_Lookup_Size", NS_FT2_OFFSET(nsFTC_Manager_Lookup_Size), PR_TRUE},
-+ {"FTC_ImageCache_Lookup", NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup), PR_TRUE},
-+ {"FTC_Manager_LookupFace", NS_FT2_OFFSET(nsFTC_Manager_LookupFace), PR_TRUE},
- {"FTC_Manager_Done", NS_FT2_OFFSET(nsFTC_Manager_Done), PR_TRUE},
- {"FTC_Manager_New", NS_FT2_OFFSET(nsFTC_Manager_New), PR_TRUE},
-- {"FTC_Image_Cache_New", NS_FT2_OFFSET(nsFTC_Image_Cache_New), PR_TRUE},
-+ {"FTC_ImageCache_New", NS_FT2_OFFSET(nsFTC_Image_Cache_New), PR_TRUE},
- // #ifdef MOZ_SVG
- {"FT_Glyph_Transform", NS_FT2_OFFSET(nsFT_Glyph_Transform), PR_TRUE},
- {"FT_Get_Kerning", NS_FT2_OFFSET(nsFT_Get_Kerning), PR_TRUE},
-@@ -282,7 +282,7 @@ nsFreeType2::SetCharmap(FT_Face face, FT
- }
-
- NS_IMETHODIMP
--nsFreeType2::ImageCacheLookup(FTC_Image_Cache cache, FTC_Image_Desc *desc,
-+nsFreeType2::ImageCacheLookup(FTC_ImageCache cache, FTC_ImageType *desc,
- FT_UInt glyphID, FT_Glyph *glyph)
- {
- // call the FreeType2 function via the function pointer
-@@ -291,11 +291,11 @@ nsFreeType2::ImageCacheLookup(FTC_Image_
- }
-
- NS_IMETHODIMP
--nsFreeType2::ManagerLookupSize(FTC_Manager manager, FTC_Font font,
-- FT_Face *face, FT_Size *size)
-+nsFreeType2::ManagerLookupFace(FTC_Manager manager, FTC_FaceID face_id,
-+ FT_Face *face)
- {
- // call the FreeType2 function via the function pointer
-- FT_Error error = nsFTC_Manager_Lookup_Size(manager, font, face, size);
-+ FT_Error error = nsFTC_Manager_LookupFace(manager, face_id, face);
- return error ? NS_ERROR_FAILURE : NS_OK;
- }
-
-@@ -320,7 +320,7 @@ nsFreeType2::ManagerNew(FT_Library libra
- }
-
- NS_IMETHODIMP
--nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_Image_Cache *cache)
-+nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_ImageCache *cache)
- {
- // call the FreeType2 function via the function pointer
- FT_Error error = nsFTC_Image_Cache_New(manager, cache);
-@@ -389,7 +389,7 @@ nsFreeType2::SupportsExtFunc(PRBool *res
- }
-
- NS_IMETHODIMP
--nsFreeType2::GetImageCache(FTC_Image_Cache *aCache)
-+nsFreeType2::GetImageCache(FTC_ImageCache *aCache)
- {
- *aCache = mImageCache;
- return NS_OK;
-Index: gfx/src/freetype/nsFreeType.h
-===================================================================
-RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.h,v
-retrieving revision 1.17
-diff -u -3 -p -r1.17 nsFreeType.h
---- gfx/src/freetype/nsFreeType.h 17 Apr 2004 21:52:29 -0000 1.17
-+++ gfx/src/freetype/nsFreeType.h 26 May 2004 10:00:54 -0000
-@@ -120,13 +120,13 @@ typedef FT_Error (*FT_Outline_Decompose_
- typedef FT_Error (*FT_New_Face_t)(FT_Library, const char*, FT_Long, FT_Face*);
- typedef FT_Error (*FT_Set_Charmap_t)(FT_Face face, FT_CharMap charmap);
- typedef FT_Error (*FTC_Image_Cache_Lookup_t)
-- (FTC_Image_Cache, FTC_Image_Desc*, FT_UInt, FT_Glyph*);
--typedef FT_Error (*FTC_Manager_Lookup_Size_t)
-- (FTC_Manager, FTC_Font, FT_Face*, FT_Size*);
-+ (FTC_ImageCache, FTC_ImageType*, FT_UInt, FT_Glyph*);
-+typedef FT_Error (*FTC_Manager_LookupFace_t)
-+ (FTC_Manager, FTC_FaceID, FT_Face*);
- typedef FT_Error (*FTC_Manager_Done_t)(FTC_Manager);
- typedef FT_Error (*FTC_Manager_New_t)(FT_Library, FT_UInt, FT_UInt, FT_ULong,
- FTC_Face_Requester, FT_Pointer, FTC_Manager*);
--typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_Image_Cache*);
-+typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_ImageCache*);
- // #ifdef MOZ_SVG
- typedef FT_Error (*FT_Glyph_Transform_t)(FT_Glyph, FT_Matrix*, FT_Vector*);
- typedef FT_Error (*FT_Get_Kerning_t)
-@@ -181,7 +181,7 @@ protected:
- FT_Outline_Decompose_t nsFT_Outline_Decompose;
- FT_Set_Charmap_t nsFT_Set_Charmap;
- FTC_Image_Cache_Lookup_t nsFTC_Image_Cache_Lookup;
-- FTC_Manager_Lookup_Size_t nsFTC_Manager_Lookup_Size;
-+ FTC_Manager_LookupFace_t nsFTC_Manager_LookupFace;
- FTC_Manager_Done_t nsFTC_Manager_Done;
- FTC_Manager_New_t nsFTC_Manager_New;
- FTC_Image_Cache_New_t nsFTC_Image_Cache_New;
-@@ -229,7 +229,7 @@ protected:
- PRLibrary *mSharedLib;
- FT_Library mFreeTypeLibrary;
- FTC_Manager mFTCacheManager;
-- FTC_Image_Cache mImageCache;
-+ FTC_ImageCache mImageCache;
-
- static nsHashtable *sFontFamilies;
- static nsHashtable *sRange1CharSetNames;
-Index: gfx/src/ps/nsFontMetricsPS.cpp
-===================================================================
-RCS file: /cvsroot/mozilla/gfx/src/ps/nsFontMetricsPS.cpp,v
-retrieving revision 1.43
-diff -u -3 -p -r1.43 nsFontMetricsPS.cpp
---- gfx/src/ps/nsFontMetricsPS.cpp 17 Apr 2004 21:52:31 -0000 1.43
-+++ gfx/src/ps/nsFontMetricsPS.cpp 26 May 2004 10:01:03 -0000
-@@ -1140,10 +1140,10 @@ nsFontPSFreeType::Init(nsITrueTypeFontCa
-
- mPixelSize = NSToIntRound(app2dev * mFont->size);
-
-- mImageDesc.font.face_id = (void*)mEntry;
-- mImageDesc.font.pix_width = mPixelSize;
-- mImageDesc.font.pix_height = mPixelSize;
-- mImageDesc.image_type = 0;
-+ mImageDesc->face_id = (FTC_FaceID)&mEntry;
-+ mImageDesc->width = mPixelSize;
-+ mImageDesc->height = mPixelSize;
-+ mImageDesc->flags = 0;
-
- nsresult rv;
- mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv);
-@@ -1189,7 +1189,7 @@ nsFontPSFreeType::GetWidth(const PRUnich
- if (!face)
- return 0;
-
-- FTC_Image_Cache iCache;
-+ FTC_ImageCache iCache;
- nsresult rv = mFt2->GetImageCache(&iCache);
- if (NS_FAILED(rv)) {
- NS_ERROR("Failed to get Image Cache");
-@@ -1227,8 +1227,8 @@ nsFontPSFreeType::getFTFace()
-
- FTC_Manager cManager;
- mFt2->GetFTCacheManager(&cManager);
-- nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
-- &face, nsnull);
-+ nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
-+ &face);
- NS_ASSERTION(rv==0, "failed to get face/size");
- if (rv)
- return nsnull;
-@@ -1621,16 +1621,16 @@ void nsFT2Type8Generator::GeneratePSFont
- mEntry->GetFamilyName(fontName);
- mEntry->GetStyleName(styleName);
-
-- mImageDesc.font.face_id = (void*)mEntry;
-+ mImageDesc->face_id = (FTC_FaceID)&mEntry;
- // TT glyph has no relation to size
-- mImageDesc.font.pix_width = 16;
-- mImageDesc.font.pix_height = 16;
-- mImageDesc.image_type = 0;
-+ mImageDesc->width = 16;
-+ mImageDesc->height = 16;
-+ mImageDesc->flags = 0;
- FT_Face face = nsnull;
- FTC_Manager cManager;
- mFt2->GetFTCacheManager(&cManager);
-- nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
-- &face, nsnull);
-+ nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
-+ &face);
- if (NS_FAILED(rv))
- return;
-
-Index: gfx/src/ps/nsFontMetricsPS.h
-===================================================================
-RCS file: /cvsroot/mozilla/gfx/src/ps/nsFontMetricsPS.h,v
-retrieving revision 1.25
-diff -u -3 -p -r1.25 nsFontMetricsPS.h
---- gfx/src/ps/nsFontMetricsPS.h 17 Apr 2004 21:52:31 -0000 1.25
-+++ gfx/src/ps/nsFontMetricsPS.h 26 May 2004 10:01:03 -0000
-@@ -319,7 +319,7 @@ protected:
- nsCOMPtr<nsITrueTypeFontCatalogEntry> mFaceID;
- nsCOMPtr<nsIFreeType2> mFt2;
- PRUint16 mPixelSize;
-- FTC_Image_Desc mImageDesc;
-+ FTC_ImageType mImageDesc;
-
-
- static PRBool AddUserPref(nsIAtom *aLang, const nsFont& aFont,
-@@ -362,7 +362,7 @@ public:
- protected:
- nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry;
- nsCOMPtr<nsIFreeType2> mFt2;
-- FTC_Image_Desc mImageDesc;
-+ FTC_ImageType mImageDesc;
- };
- #endif
-
-Index: gfx/src/x11shared/nsFontFreeType.cpp
-===================================================================
-RCS file: /cvsroot/mozilla/gfx/src/x11shared/nsFontFreeType.cpp,v
-retrieving revision 1.14
-diff -u -3 -p -r1.14 nsFontFreeType.cpp
---- gfx/src/x11shared/nsFontFreeType.cpp 17 Apr 2004 21:52:34 -0000 1.14
-+++ gfx/src/x11shared/nsFontFreeType.cpp 26 May 2004 10:01:03 -0000
-@@ -177,7 +177,7 @@ nsFreeTypeFont::getFTFace()
- FTC_Manager mgr;
- nsresult rv;
- mFt2->GetFTCacheManager(&mgr);
-- rv = mFt2->ManagerLookupSize(mgr, &mImageDesc.font, &face, nsnull);
-+ rv = mFt2->ManagerLookupFace(mgr, mImageDesc->face_id, &face);
- NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get face/size");
- if (NS_FAILED(rv))
- return nsnull;
-@@ -191,22 +191,15 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy
- PRBool embedded_bimap = PR_FALSE;
- mFaceID = aFaceID;
- mPixelSize = aPixelSize;
-- mImageDesc.font.face_id = (void*)mFaceID;
-- mImageDesc.font.pix_width = aPixelSize;
-- mImageDesc.font.pix_height = aPixelSize;
-- mImageDesc.image_type = 0;
-+ mImageDesc->face_id = (FTC_FaceID)&mFaceID;
-+ mImageDesc->width = aPixelSize;
-+ mImageDesc->height = aPixelSize;
-+ mImageDesc->flags = 0;
-
- if (aPixelSize < nsFreeType2::gAntiAliasMinimum) {
-- mImageDesc.image_type |= ftc_image_mono;
- anti_alias = PR_FALSE;
- }
-
-- if (nsFreeType2::gFreeType2Autohinted)
-- mImageDesc.image_type |= ftc_image_flag_autohinted;
--
-- if (nsFreeType2::gFreeType2Unhinted)
-- mImageDesc.image_type |= ftc_image_flag_unhinted;
--
- PRUint32 num_embedded_bitmaps, i;
- PRInt32* embedded_bitmapheights;
- mFaceID->GetEmbeddedBitmapHeights(&num_embedded_bitmaps,
-@@ -218,7 +211,6 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy
- if (embedded_bitmapheights[i] == aPixelSize) {
- embedded_bimap = PR_TRUE;
- // unhinted must be set for embedded bitmaps to be used
-- mImageDesc.image_type |= ftc_image_flag_unhinted;
- break;
- }
- }
-@@ -312,7 +304,7 @@ nsFreeTypeFont::doGetBoundingMetrics(con
- if (!face)
- return NS_ERROR_FAILURE;
-
-- FTC_Image_Cache icache;
-+ FTC_ImageCache icache;
- mFt2->GetImageCache(&icache);
- if (!icache)
- return NS_ERROR_FAILURE;
-@@ -401,7 +393,7 @@ nsFreeTypeFont::GetWidth(const PRUnichar
- if (!face)
- return 0;
-
-- FTC_Image_Cache icache;
-+ FTC_ImageCache icache;
- mFt2->GetImageCache(&icache);
- if (!icache)
- return 0;
-@@ -723,7 +715,7 @@ nsFreeTypeXImage::DrawString(nsRendering
- if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2);
- #endif
-
-- FTC_Image_Cache icache;
-+ FTC_ImageCache icache;
- mFt2->GetImageCache(&icache);
- if (!icache)
- return 0;
-Index: gfx/src/x11shared/nsFontFreeType.h
-===================================================================
-RCS file: /cvsroot/mozilla/gfx/src/x11shared/nsFontFreeType.h,v
-retrieving revision 1.10
-diff -u -3 -p -r1.10 nsFontFreeType.h
---- gfx/src/x11shared/nsFontFreeType.h 17 Apr 2004 21:52:34 -0000 1.10
-+++ gfx/src/x11shared/nsFontFreeType.h 26 May 2004 10:01:03 -0000
-@@ -110,7 +110,7 @@ protected:
- XImage *GetXImage(PRUint32 width, PRUint32 height);
- nsITrueTypeFontCatalogEntry *mFaceID;
- PRUint16 mPixelSize;
-- FTC_Image_Desc mImageDesc;
-+ FTC_ImageType mImageDesc;
- nsCOMPtr<nsIFreeType2> mFt2;
- };
-
diff --git a/www/firefox3-devel/files/patch-build_unix_mozilla-xpcom.pc.in b/www/firefox3-devel/files/patch-build_unix_mozilla-xpcom.pc.in
deleted file mode 100644
index 4e982a544..000000000
--- a/www/firefox3-devel/files/patch-build_unix_mozilla-xpcom.pc.in
+++ /dev/null
@@ -1,8 +0,0 @@
---- build/unix/mozilla-xpcom.pc.in.orig Thu Jun 24 12:23:09 2004
-+++ build/unix/mozilla-xpcom.pc.in Thu Jun 24 12:23:18 2004
-@@ -8,4 +8,4 @@
- Version: %MOZILLA_VERSION%
- Requires: mozilla-nspr = %MOZILLA_VERSION%
- Libs: -L${libdir} -lxpcom
--Cflags: -I${includedir}/xpcom -I${includedir}/string
-+Cflags: -I${includedir}/xpcom -I${includedir}/string -I${includedir}
diff --git a/www/firefox3-devel/files/patch-build_unix_run-mozilla.sh b/www/firefox3-devel/files/patch-build_unix_run-mozilla.sh
deleted file mode 100644
index f93248fd1..000000000
--- a/www/firefox3-devel/files/patch-build_unix_run-mozilla.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-$FreeBSD$
-
---- 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
-+
-+MOZ_PLUGIN_PATH=%%PREFIX%%/lib/browser_plugins
-+export MOZ_PLUGIN_PATH
-
- if [ $moz_debug -eq 1 ]
- then
diff --git a/www/firefox3-devel/files/patch-config-mkdepend-imakemdep.h b/www/firefox3-devel/files/patch-config-mkdepend-imakemdep.h
deleted file mode 100644
index d8b6e0b04..000000000
--- a/www/firefox3-devel/files/patch-config-mkdepend-imakemdep.h
+++ /dev/null
@@ -1,12 +0,0 @@
-$FreeBSD$
-
---- config/mkdepend/imakemdep.h Fri Sep 4 21:22:25 1998
-+++ config/mkdepend/imakemdep.h Thu Oct 16 22:43:25 2003
-@@ -278,4 +278,7 @@
- "-D__i386__",
- # endif
-+# if defined(__amd64__) || defined(__x86_64__)
-+ "-D__amd64__ -D__x86_64__",
-+# endif
- # ifdef __GNUC__
- "-traditional",
diff --git a/www/firefox3-devel/files/patch-config-rules.mk b/www/firefox3-devel/files/patch-config-rules.mk
deleted file mode 100644
index db3009d37..000000000
--- a/www/firefox3-devel/files/patch-config-rules.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-$FreeBSD$
-
---- config/rules.mk.orig Tue Aug 26 13:28:47 2003
-+++ config/rules.mk Sun Feb 1 15:11:41 2004
-@@ -444,7 +444,11 @@
-
- ifeq ($(OS_ARCH),FreeBSD)
- ifdef IS_COMPONENT
-+ifneq (,$(filter alpha ia64,$(OS_TEST)))
-+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc
-+else
- EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
-+endif
- endif
- endif
-
diff --git a/www/firefox3-devel/files/patch-config::mkdepend::Makefile.in b/www/firefox3-devel/files/patch-config::mkdepend::Makefile.in
deleted file mode 100644
index bace012a2..000000000
--- a/www/firefox3-devel/files/patch-config::mkdepend::Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- config/mkdepend/Makefile.in.orig Sun Dec 12 07:36:57 2004
-+++ config/mkdepend/Makefile.in Sun Dec 12 07:37:55 2004
-@@ -57,6 +57,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)
diff --git a/www/firefox3-devel/files/patch-configure b/www/firefox3-devel/files/patch-configure
deleted file mode 100644
index 9e60372ad..000000000
--- a/www/firefox3-devel/files/patch-configure
+++ /dev/null
@@ -1,38 +0,0 @@
---- configure.orig Fri Feb 13 01:06:29 2004
-+++ configure Fri Feb 13 01:07:17 2004
-@@ -9181,7 +9181,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 <<EOF
- #line 9187 "configure"
- #include "confdefs.h"
-@@ -9212,7 +9212,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&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
-@@ -9222,7 +9222,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 <<EOF
- #line 9228 "configure"
- #include "confdefs.h"
-@@ -9253,7 +9253,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
-- _ICONV_LIBS="$_ICONV_LIBS -liconv"
-+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv"
- else
- echo "$ac_t""no" 1>&6
- fi
diff --git a/www/firefox3-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp b/www/firefox3-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp
deleted file mode 100644
index 0a2fa7daa..000000000
--- a/www/firefox3-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-$FreeBSD$
-
---- extensions/typeaheadfind/src/nsTypeAheadFind.cpp.orig Wed Nov 19 01:20:47 2003
-+++ extensions/typeaheadfind/src/nsTypeAheadFind.cpp Tue Feb 10 02:52:26 2004
-@@ -323,11 +323,11 @@
- prefBranch->GetBoolPref("accessibility.typeaheadfind.startlinksonly",
- &mStartLinksOnlyPref);
-
-- PRBool isSoundEnabled = PR_TRUE;
-+ mIsSoundEnabled = PR_TRUE;
- prefBranch->GetBoolPref("accessibility.typeaheadfind.enablesound",
-- &isSoundEnabled);
-+ &mIsSoundEnabled);
- nsXPIDLCString soundStr;
-- if (isSoundEnabled) {
-+ if (mIsSoundEnabled && mIsSoundEnabled) {
- prefBranch->GetCharPref("accessibility.typeaheadfind.soundURL",
- getter_Copies(soundStr));
- }
-@@ -758,7 +758,7 @@
- }
- else {
- // No find string to backspace in!
-- if (mIsBackspaceProtectOn) {
-+ if (mIsBackspaceProtectOn && mIsSoundEnabled) {
- // This flag should be on only if the last key was a backspace.
- // It keeps us from accidentally hitting backspace too many times and
- // going back in history when we really just wanted to clear
-@@ -1012,7 +1012,9 @@
-
- // Error sound (don't fire when backspace is pressed, they're
- // trying to correct the mistake!)
-- PlayNotFoundSound();
-+ if (mIsSoundEnabled) {
-+ PlayNotFoundSound();
-+ }
-
- // Remove bad character from buffer, so we can continue typing from
- // last matched character
-@@ -1059,7 +1061,7 @@
- void
- nsTypeAheadFind::PlayNotFoundSound()
- {
-- if (mNotFoundSoundURL.IsEmpty()) // no sound
-+ if (mNotFoundSoundURL.IsEmpty() || !mIsSoundEnabled) // no sound
- return;
- if (!mSoundInterface) {
- mSoundInterface = do_CreateInstance("@mozilla.org/sound;1");
diff --git a/www/firefox3-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h b/www/firefox3-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h
deleted file mode 100644
index 809531f72..000000000
--- a/www/firefox3-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$FreeBSD$
-
---- extensions/typeaheadfind/src/nsTypeAheadFind.h.orig Fri May 23 22:00:33 2003
-+++ extensions/typeaheadfind/src/nsTypeAheadFind.h Mon Feb 9 22:21:43 2004
-@@ -194,6 +194,9 @@
-
- nsCString mNotFoundSoundURL;
-
-+ // Move the sound enabled boolean out for all methods to access.
-+ PRBool mIsSoundEnabled;
-+
- // PRBool's are used instead of PRPackedBool's where the address of the
- // boolean variable is getting passed into a method. For example:
- // GetBoolPref("accessibility.typeaheadfind.linksonly", &mLinksOnlyPref);
diff --git a/www/firefox3-devel/files/patch-nspr-unix.c b/www/firefox3-devel/files/patch-nspr-unix.c
deleted file mode 100644
index 4a221aa9d..000000000
--- a/www/firefox3-devel/files/patch-nspr-unix.c
+++ /dev/null
@@ -1,23 +0,0 @@
-$FreeBSD$
-
---- nsprpub/pr/src/md/unix/unix.c.orig Sat May 31 18:06:04 2003
-+++ nsprpub/pr/src/md/unix/unix.c Sat May 31 18:04:43 2003
-@@ -65,7 +65,8 @@
- * PRInt32* pointer to a _PRSockLen_t* pointer.
- */
- #if defined(HAVE_SOCKLEN_T) \
-- || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
-+ || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) \
-+ || defined(FREEBSD)
- #define _PRSockLen_t socklen_t
- #elif defined(IRIX) || defined(HPUX) || defined(OSF1) || defined(SOLARIS) \
- || defined(AIX4_1) || defined(LINUX) || defined(SONY) \
-@@ -73,7 +74,7 @@
- || defined(SUNOS4) || defined(NCR) || defined(DARWIN) \
- || defined(NEXTSTEP) || defined(QNX)
- #define _PRSockLen_t int
--#elif (defined(AIX) && !defined(AIX4_1)) || defined(FREEBSD) \
-+#elif (defined(AIX) && !defined(AIX4_1)) \
- || defined(NETBSD) || defined(OPENBSD) || defined(UNIXWARE) \
- || defined(DGUX) || defined(VMS) || defined(NTO)
- #define _PRSockLen_t size_t
diff --git a/www/firefox3-devel/files/patch-nsprpub-pr-include-md-_freebsd.cfg b/www/firefox3-devel/files/patch-nsprpub-pr-include-md-_freebsd.cfg
deleted file mode 100644
index 30a28b014..000000000
--- a/www/firefox3-devel/files/patch-nsprpub-pr-include-md-_freebsd.cfg
+++ /dev/null
@@ -1,163 +0,0 @@
-$FreeBSD$
-
---- nsprpub/pr/include/md/_freebsd.cfg.orig Wed Jan 2 18:38:25 2002
-+++ nsprpub/pr/include/md/_freebsd.cfg Sun Feb 1 15:09:53 2004
-@@ -91,7 +91,7 @@
- #define PR_ALIGN_OF_DOUBLE 4
- #define PR_ALIGN_OF_POINTER 4
-
--#elif defined(__alpha)
-+#elif defined(__alpha__)
-
- #define IS_LITTLE_ENDIAN 1
- #undef IS_BIG_ENDIAN
-@@ -138,6 +138,149 @@
- #define PR_ALIGN_OF_DOUBLE 8
- #define PR_ALIGN_OF_POINTER 8
-
-+#elif defined(__sparc64__)
-+#undef IS_LITTLE_ENDIAN
-+#define IS_BIG_ENDIAN 1
-+#define PR_ALIGN_OF_INT64 8
-+#define PR_ALIGN_OF_DOUBLE 8
-+#define IS_64
-+
-+#define PR_BYTES_PER_BYTE 1
-+#define PR_BYTES_PER_SHORT 2
-+#define PR_BYTES_PER_INT 4
-+#define PR_BYTES_PER_INT64 8
-+#define PR_BYTES_PER_LONG 8
-+#define PR_BYTES_PER_FLOAT 4
-+#define PR_BYTES_PER_DOUBLE 8
-+#define PR_BYTES_PER_WORD 8
-+#define PR_BYTES_PER_DWORD 8
-+#define PR_BYTES_PER_WORD_LOG2 3
-+#define PR_BYTES_PER_DWORD_LOG2 3
-+
-+#define PR_BITS_PER_BYTE 8
-+#define PR_BITS_PER_SHORT 16
-+#define PR_BITS_PER_INT 32
-+#define PR_BITS_PER_INT64 64
-+#define PR_BITS_PER_LONG 64
-+#define PR_BITS_PER_FLOAT 32
-+#define PR_BITS_PER_DOUBLE 64
-+#define PR_BITS_PER_WORD 64
-+
-+#define PR_BITS_PER_BYTE_LOG2 3
-+#define PR_BITS_PER_SHORT_LOG2 4
-+#define PR_BITS_PER_INT_LOG2 5
-+#define PR_BITS_PER_INT64_LOG2 6
-+#define PR_BITS_PER_LONG_LOG2 6
-+#define PR_BITS_PER_FLOAT_LOG2 5
-+#define PR_BITS_PER_DOUBLE_LOG2 6
-+#define PR_BITS_PER_WORD_LOG2 6
-+
-+#define PR_ALIGN_OF_SHORT 2
-+#define PR_ALIGN_OF_INT 4
-+#define PR_ALIGN_OF_LONG 8
-+#define PR_ALIGN_OF_FLOAT 4
-+#define PR_ALIGN_OF_POINTER 8
-+
-+#define HAVE_LONG_LONG
-+#define HAVE_ALIGNED_DOUBLES
-+#define HAVE_ALIGNED_LONGLONGS
-+
-+#elif defined(__ia64__)
-+#define IS_LITTLE_ENDIAN 1
-+#undef IS_BIG_ENDIAN
-+#define HAVE_LONG_LONG
-+#define HAVE_ALIGNED_DOUBLES
-+#define HAVE_ALIGNED_LONGLONGS
-+#define IS_64
-+
-+#define PR_BYTES_PER_BYTE 1
-+#define PR_BYTES_PER_SHORT 2
-+#define PR_BYTES_PER_INT 4
-+#define PR_BYTES_PER_INT64 8
-+#define PR_BYTES_PER_LONG 8
-+#define PR_BYTES_PER_FLOAT 4
-+#define PR_BYTES_PER_DOUBLE 8
-+#define PR_BYTES_PER_WORD 8
-+#define PR_BYTES_PER_DWORD 8
-+
-+#define PR_BITS_PER_BYTE 8
-+#define PR_BITS_PER_SHORT 16
-+#define PR_BITS_PER_INT 32
-+#define PR_BITS_PER_INT64 64
-+#define PR_BITS_PER_LONG 64
-+#define PR_BITS_PER_FLOAT 32
-+#define PR_BITS_PER_DOUBLE 64
-+#define PR_BITS_PER_WORD 64
-+
-+#define PR_BITS_PER_BYTE_LOG2 3
-+#define PR_BITS_PER_SHORT_LOG2 4
-+#define PR_BITS_PER_INT_LOG2 5
-+#define PR_BITS_PER_INT64_LOG2 6
-+#define PR_BITS_PER_LONG_LOG2 6
-+#define PR_BITS_PER_FLOAT_LOG2 5
-+#define PR_BITS_PER_DOUBLE_LOG2 6
-+#define PR_BITS_PER_WORD_LOG2 6
-+
-+#define PR_ALIGN_OF_SHORT 2
-+#define PR_ALIGN_OF_INT 4
-+#define PR_ALIGN_OF_LONG 8
-+#define PR_ALIGN_OF_INT64 8
-+#define PR_ALIGN_OF_FLOAT 4
-+#define PR_ALIGN_OF_DOUBLE 8
-+#define PR_ALIGN_OF_POINTER 8
-+#define PR_ALIGN_OF_WORD 8
-+
-+#define PR_BYTES_PER_WORD_LOG2 3
-+#define PR_BYTES_PER_DWORD_LOG2 3
-+
-+#elif defined(__amd64__)
-+#define IS_LITTLE_ENDIAN 1
-+#undef IS_BIG_ENDIAN
-+#define IS_64
-+
-+#define PR_BYTES_PER_BYTE 1
-+#define PR_BYTES_PER_SHORT 2
-+#define PR_BYTES_PER_INT 4
-+#define PR_BYTES_PER_INT64 8
-+#define PR_BYTES_PER_LONG 8
-+#define PR_BYTES_PER_FLOAT 4
-+#define PR_BYTES_PER_DOUBLE 8
-+#define PR_BYTES_PER_WORD 8
-+#define PR_BYTES_PER_DWORD 8
-+
-+#define PR_BITS_PER_BYTE 8
-+#define PR_BITS_PER_SHORT 16
-+#define PR_BITS_PER_INT 32
-+#define PR_BITS_PER_INT64 64
-+#define PR_BITS_PER_LONG 64
-+#define PR_BITS_PER_FLOAT 32
-+#define PR_BITS_PER_DOUBLE 64
-+#define PR_BITS_PER_WORD 64
-+
-+#define PR_BITS_PER_BYTE_LOG2 3
-+#define PR_BITS_PER_SHORT_LOG2 4
-+#define PR_BITS_PER_INT_LOG2 5
-+#define PR_BITS_PER_INT64_LOG2 6
-+#define PR_BITS_PER_LONG_LOG2 6
-+#define PR_BITS_PER_FLOAT_LOG2 5
-+#define PR_BITS_PER_DOUBLE_LOG2 6
-+#define PR_BITS_PER_WORD_LOG2 6
-+
-+#define PR_ALIGN_OF_SHORT 2
-+#define PR_ALIGN_OF_INT 4
-+#define PR_ALIGN_OF_LONG 8
-+#define PR_ALIGN_OF_INT64 8
-+#define PR_ALIGN_OF_FLOAT 4
-+#define PR_ALIGN_OF_DOUBLE 8
-+#define PR_ALIGN_OF_POINTER 8
-+#define PR_ALIGN_OF_WORD 8
-+
-+#define PR_BYTES_PER_WORD_LOG2 3
-+#define PR_BYTES_PER_DWORD_LOG2 3
-+
-+#define HAVE_LONG_LONG
-+#define HAVE_ALIGNED_DOUBLES
-+#define HAVE_ALIGNED_LONGLONGS
- #else
-
- #error "Unknown CPU architecture"
diff --git a/www/firefox3-devel/files/patch-nsprpub-pr-include-md-_freebsd.h b/www/firefox3-devel/files/patch-nsprpub-pr-include-md-_freebsd.h
deleted file mode 100644
index 02923f6d3..000000000
--- a/www/firefox3-devel/files/patch-nsprpub-pr-include-md-_freebsd.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$FreeBSD$
-
---- nsprpub/pr/include/md/_freebsd.h.orig Sat Nov 15 23:36:13 2003
-+++ nsprpub/pr/include/md/_freebsd.h Mon Feb 9 22:24:39 2004
-@@ -50,6 +50,10 @@
- #define _PR_SI_ARCHITECTURE "alpha"
- #elif defined(__sparc__)
- #define _PR_SI_ARCHITECTURE "sparc"
-+#elif defined(__ia64__)
-+#define _PR_SI_ARCHITECTURE "ia64"
-+#elif defined(__amd64__)
-+#define _PR_SI_ARCHITECTURE "amd64"
- #else
- #error "Unknown CPU architecture"
- #endif
diff --git a/www/firefox3-devel/files/patch-nsprpub-pr-include-md-_pth.h b/www/firefox3-devel/files/patch-nsprpub-pr-include-md-_pth.h
deleted file mode 100644
index 1f8159c70..000000000
--- a/www/firefox3-devel/files/patch-nsprpub-pr-include-md-_pth.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- nsprpub/pr/include/md/_pth.h.orig Mon Jul 26 07:23:42 2004
-+++ nsprpub/pr/include/md/_pth.h Mon Jul 26 07:18:37 2004
-@@ -90,7 +90,7 @@
- #define _PT_PTHREAD_MUTEXATTR_INIT pthread_mutexattr_init
- #define _PT_PTHREAD_MUTEXATTR_DESTROY pthread_mutexattr_destroy
- #define _PT_PTHREAD_MUTEX_INIT(m, a) pthread_mutex_init(&(m), &(a))
--#define _PT_PTHREAD_MUTEX_IS_LOCKED(m) (EBUSY == pthread_mutex_trylock(&(m)))
-+#define _PT_PTHREAD_MUTEX_IS_LOCKED(m) (0 != pthread_mutex_trylock(&(m)))
- #if defined(DARWIN)
- #define _PT_PTHREAD_CONDATTR_INIT(x) 0
- #else
diff --git a/www/firefox3-devel/files/patch-nsprpub-pr-src-io-prprf.c b/www/firefox3-devel/files/patch-nsprpub-pr-src-io-prprf.c
deleted file mode 100644
index 38bd959ae..000000000
--- a/www/firefox3-devel/files/patch-nsprpub-pr-src-io-prprf.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- nsprpub/pr/src/io/prprf.c.orig Mon Mar 8 22:18:19 2004
-+++ nsprpub/pr/src/io/prprf.c Tue Jun 15 13:17:30 2004
-@@ -51,7 +51,10 @@
- ** Note: on some platforms va_list is defined as an array,
- ** and requires array notation.
- */
--#if (defined(LINUX) && defined(__x86_64__))
-+#if defined(__amd64__)
-+#include <stdarg.h>
-+#define VARARGS_ASSIGN(foo, bar) va_copy((foo), (bar))
-+#elif (defined(LINUX) && defined(__x86_64__))
- #define VARARGS_ASSIGN(foo, bar) __va_copy((foo), (bar))
- #elif (defined(LINUX) && defined(__powerpc__)) || \
- (defined(LINUX) && defined(__s390__)) || \
diff --git a/www/firefox3-devel/files/patch-nsprpub-pr-src-pthreads-ptio.c b/www/firefox3-devel/files/patch-nsprpub-pr-src-pthreads-ptio.c
deleted file mode 100644
index c015c3d19..000000000
--- a/www/firefox3-devel/files/patch-nsprpub-pr-src-pthreads-ptio.c
+++ /dev/null
@@ -1,31 +0,0 @@
-$FreeBSD$
-
---- nsprpub/pr/src/pthreads/ptio.c.orig Mon Jul 14 21:59:47 2003
-+++ nsprpub/pr/src/pthreads/ptio.c Fri Oct 17 05:25:43 2003
-@@ -189,7 +189,7 @@
- #endif
- #endif
-
--#ifdef DARWIN
-+#if defined(DARWIN) || defined(FREEBSD)
- static PRBool _pr_ipv6_v6only_on_by_default;
- /* The IPV6_V6ONLY socket option is not defined on Mac OS X 10.1. */
- #ifndef IPV6_V6ONLY
-@@ -1154,7 +1154,7 @@
- _pr_stderr = pt_SetMethods(2, PR_DESC_FILE, PR_FALSE, PR_TRUE);
- PR_ASSERT(_pr_stdin && _pr_stdout && _pr_stderr);
-
--#ifdef DARWIN
-+#if defined(DARWIN) || defined(FREEBSD)
- /* In Mac OS X v10.3 Panther Beta the IPV6_V6ONLY socket option
- * is turned on by default, contrary to what RFC 3493, Section
- * 5.3 says. So we have to turn it off. Find out whether we
-@@ -3462,7 +3462,7 @@
- if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
- else
- {
--#ifdef DARWIN
-+#if defined(DARWIN) || defined(FREEBSD)
- if ((domain == AF_INET6) && _pr_ipv6_v6only_on_by_default)
- {
- int on = 0;
diff --git a/www/firefox3-devel/files/patch-security-coreconf-FreeBSD.mk b/www/firefox3-devel/files/patch-security-coreconf-FreeBSD.mk
deleted file mode 100644
index 3e0e14aca..000000000
--- a/www/firefox3-devel/files/patch-security-coreconf-FreeBSD.mk
+++ /dev/null
@@ -1,28 +0,0 @@
---- security/coreconf/FreeBSD.mk.orig Wed Mar 26 20:17:25 2003
-+++ security/coreconf/FreeBSD.mk Sun Nov 21 22:59:49 2004
-@@ -43,8 +43,12 @@
- ifeq ($(OS_TEST),alpha)
- CPU_ARCH = alpha
- else
-+ifeq ($(OS_TEST),amd64)
-+CPU_ARCH = amd64
-+else
- CPU_ARCH = x86
- endif
-+endif
-
- OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-
-@@ -71,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 $@
-+else
-+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@
-+endif
- ifdef MAPFILE
- # Add LD options to restrict exported symbols to those in the map file
- endif
diff --git a/www/firefox3-devel/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp b/www/firefox3-devel/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp
deleted file mode 100644
index 7f8e55f53..000000000
--- a/www/firefox3-devel/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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
-@@ -143,7 +143,7 @@
- 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);
-@@ -160,7 +160,7 @@
- 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);
diff --git a/www/firefox3-devel/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc b/www/firefox3-devel/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
deleted file mode 100644
index 9a41bbfc4..000000000
--- a/www/firefox3-devel/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
+++ /dev/null
@@ -1,11 +0,0 @@
---- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004
-+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Tue Jun 15 12:52:36 2004
-@@ -8,7 +8,7 @@
- * 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();
diff --git a/www/firefox3-devel/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in b/www/firefox3-devel/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in
deleted file mode 100644
index 5276b54f0..000000000
--- a/www/firefox3-devel/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in
+++ /dev/null
@@ -1,56 +0,0 @@
-$FreeBSD$
-
---- 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 15:06:40 2004
-@@ -49,6 +49,9 @@
- ifeq (86,$(findstring 86,$(OS_TEST)))
- CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
- endif
-+ifeq (amd64,$(OS_TEST))
-+CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp
-+endif
- endif
- #
- # New code for Linux, et. al., with gcc
-@@ -60,7 +63,7 @@
- endif
- endif
- # IA64 Linux
--ifneq (,$(filter Linux,$(OS_ARCH)))
-+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
- #
-+# 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
-+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
-+endif
- endif
- #
- # Solaris/SPARC
diff --git a/www/firefox3-devel/files/patch-xptcall-alpha b/www/firefox3-devel/files/patch-xptcall-alpha
deleted file mode 100644
index 6052f3ecf..000000000
--- a/www/firefox3-devel/files/patch-xptcall-alpha
+++ /dev/null
@@ -1,461 +0,0 @@
-$FreeBSD$
-
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig Tue May 27 01:37:25 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp Tue May 27 01:37:00 2003
-@@ -0,0 +1,184 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Netscape Public License
-+ * Version 1.1 (the "License"); you may not use this file except in
-+ * compliance with the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/NPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is
-+ * Netscape Communications Corporation.
-+ * Portions created by the Initial Developer are Copyright (C) 1998
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either the GNU General Public License Version 2 or later (the "GPL"), or
-+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the NPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the NPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+/* Platform specific code to invoke XPCOM methods on native objects */
-+
-+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */
-+
-+#include "xptcprivate.h"
-+
-+/* Prototype specifies unmangled function name and disables unused warning */
-+static void
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
-+__asm__("invoke_copy_to_stack") __attribute__((unused));
-+
-+static void
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
-+{
-+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer
-+
-+ for(PRUint32 i = 0; i < paramCount; i++, d++, s++)
-+ {
-+ if(s->IsPtrData())
-+ {
-+ *d = (PRUint64)s->ptr;
-+ continue;
-+ }
-+ switch(s->type)
-+ {
-+ case nsXPTType::T_I8 : *d = (PRUint64)s->val.i8; break;
-+ case nsXPTType::T_I16 : *d = (PRUint64)s->val.i16; break;
-+ case nsXPTType::T_I32 : *d = (PRUint64)s->val.i32; break;
-+ case nsXPTType::T_I64 : *d = (PRUint64)s->val.i64; break;
-+ case nsXPTType::T_U8 : *d = (PRUint64)s->val.u8; break;
-+ case nsXPTType::T_U16 : *d = (PRUint64)s->val.u16; break;
-+ case nsXPTType::T_U32 : *d = (PRUint64)s->val.u32; break;
-+ case nsXPTType::T_U64 : *d = (PRUint64)s->val.u64; break;
-+ case nsXPTType::T_FLOAT :
-+ if(i < NUM_ARG_REGS)
-+ {
-+ // convert floats to doubles if they are to be passed
-+ // via registers so we can just deal with doubles later
-+ union { PRUint64 u64; double d; } t;
-+ t.d = (double)s->val.f;
-+ *d = t.u64;
-+ }
-+ else
-+ // otherwise copy to stack normally
-+ *d = (PRUint64)s->val.u32;
-+ break;
-+ case nsXPTType::T_DOUBLE : *d = (PRUint64)s->val.u64; break;
-+ case nsXPTType::T_BOOL : *d = (PRUint64)s->val.b; break;
-+ case nsXPTType::T_CHAR : *d = (PRUint64)s->val.c; break;
-+ case nsXPTType::T_WCHAR : *d = (PRUint64)s->val.wc; break;
-+ default:
-+ // all the others are plain pointer types
-+ *d = (PRUint64)s->val.p;
-+ break;
-+ }
-+ }
-+}
-+
-+/*
-+ * XPTC_PUBLIC_API(nsresult)
-+ * XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
-+ * PRUint32 paramCount, nsXPTCVariant* params, void* vt)
-+ */
-+__asm__(
-+ "#### XPTC_InvokeByIndex ####\n"
-+".text\n\t"
-+ ".align 5\n\t"
-+ ".globl XPTC_InvokeByIndex\n\t"
-+ ".ent XPTC_InvokeByIndex\n"
-+"XPTC_InvokeByIndex:\n\t"
-+ ".frame $15,32,$26,0\n\t"
-+ ".mask 0x4008000,-32\n\t"
-+ "ldgp $29,0($27)\n"
-+"$XPTC_InvokeByIndex..ng:\n\t"
-+ "subq $30,32,$30\n\t"
-+ "stq $26,0($30)\n\t"
-+ "stq $15,8($30)\n\t"
-+ "bis $30,$30,$15\n\t"
-+ ".prologue 1\n\t"
-+
-+ /*
-+ * Allocate enough stack space to hold the greater of 6 or "paramCount"+1
-+ * parameters. (+1 for "this" pointer) Room for at least 6 parameters
-+ * is required for storage of those passed via registers.
-+ */
-+
-+ "bis $31,5,$2\n\t" /* count = MAX(5, "paramCount") */
-+ "cmplt $2,$18,$1\n\t"
-+ "cmovne $1,$18,$2\n\t"
-+ "s8addq $2,16,$1\n\t" /* room for count+1 params (8 bytes each) */
-+ "bic $1,15,$1\n\t" /* stack space is rounded up to 0 % 16 */
-+ "subq $30,$1,$30\n\t"
-+
-+ "stq $16,0($30)\n\t" /* save "that" (as "this" pointer) */
-+ "stq $17,16($15)\n\t" /* save "methodIndex" */
-+
-+ "addq $30,8,$16\n\t" /* pass stack pointer */
-+ "bis $18,$18,$17\n\t" /* pass "paramCount" */
-+ "bis $19,$19,$18\n\t" /* pass "params" */
-+ "bsr $26,$invoke_copy_to_stack..ng\n\t" /* call invoke_copy_to_stack */
-+
-+ /*
-+ * Copy the first 6 parameters to registers and remove from stack frame.
-+ * Both the integer and floating point registers are set for each parameter
-+ * except the first which is the "this" pointer. (integer only)
-+ * The floating point registers are all set as doubles since the
-+ * invoke_copy_to_stack function should have converted the floats.
-+ */
-+ "ldq $16,0($30)\n\t" /* integer registers */
-+ "ldq $17,8($30)\n\t"
-+ "ldq $18,16($30)\n\t"
-+ "ldq $19,24($30)\n\t"
-+ "ldq $20,32($30)\n\t"
-+ "ldq $21,40($30)\n\t"
-+ "ldt $f17,8($30)\n\t" /* floating point registers */
-+ "ldt $f18,16($30)\n\t"
-+ "ldt $f19,24($30)\n\t"
-+ "ldt $f20,32($30)\n\t"
-+ "ldt $f21,40($30)\n\t"
-+
-+ "addq $30,48,$30\n\t" /* remove params from stack */
-+
-+ /*
-+ * Call the virtual function with the constructed stack frame.
-+ */
-+ "bis $16,$16,$1\n\t" /* load "this" */
-+ "ldq $2,16($15)\n\t" /* load "methodIndex" */
-+ "ldq $1,0($1)\n\t" /* load vtable */
-+#if 0
-+ "s8addq $2,16,$2\n\t" /* vtable index = "methodIndex" * 8 + 16 */
-+#else
-+ "mulq $2, 8, $2\n\t"
-+ "addq $2, 0, $2\n\t" /* vtable index = "methodIndex" * 16 + 24 */
-+#endif
-+ "addq $1,$2,$1\n\t"
-+ "ldq $27,0($1)\n\t" /* load address of function */
-+ "jsr $26,($27),0\n\t" /* call virtual function */
-+ "ldgp $29,0($26)\n\t"
-+
-+ "bis $15,$15,$30\n\t"
-+ "ldq $26,0($30)\n\t"
-+ "ldq $15,8($30)\n\t"
-+ "addq $30,32,$30\n\t"
-+ "ret $31,($26),1\n\t"
-+ ".end XPTC_InvokeByIndex"
-+ );
-+
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp.orig Tue May 27 01:37:30 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp Tue May 27 01:37:04 2003
-@@ -0,0 +1,269 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Netscape Public License
-+ * Version 1.1 (the "License"); you may not use this file except in
-+ * compliance with the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/NPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is
-+ * Netscape Communications Corporation.
-+ * Portions created by the Initial Developer are Copyright (C) 1999
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either the GNU General Public License Version 2 or later (the "GPL"), or
-+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the NPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the NPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+/* Implement shared vtbl methods. */
-+
-+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */
-+
-+#include <sys/types.h>
-+#include <machine/cpu.h>
-+#include "xptcprivate.h"
-+
-+/* Prototype specifies unmangled function name and disables unused warning */
-+static nsresult
-+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args)
-+__asm__("PrepareAndDispatch") __attribute__((unused));
-+
-+static nsresult
-+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args)
-+{
-+ const PRUint8 PARAM_BUFFER_COUNT = 16;
-+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer
-+
-+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
-+ nsXPTCMiniVariant* dispatchParams = NULL;
-+ nsIInterfaceInfo* iface_info = NULL;
-+ const nsXPTMethodInfo* info;
-+ PRUint8 paramCount;
-+ PRUint8 i;
-+ nsresult result = NS_ERROR_FAILURE;
-+
-+ NS_ASSERTION(self,"no self");
-+
-+ self->GetInterfaceInfo(&iface_info);
-+ NS_ASSERTION(iface_info,"no interface info");
-+
-+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info);
-+ NS_ASSERTION(info,"no interface info");
-+
-+ paramCount = info->GetParamCount();
-+
-+ // setup variant array pointer
-+ if(paramCount > PARAM_BUFFER_COUNT)
-+ dispatchParams = new nsXPTCMiniVariant[paramCount];
-+ else
-+ dispatchParams = paramBuffer;
-+ NS_ASSERTION(dispatchParams,"no place for params");
-+
-+ // args[0] to args[NUM_ARG_REGS] hold floating point register values
-+ PRUint64* ap = args + NUM_ARG_REGS;
-+ for(i = 0; i < paramCount; i++, ap++)
-+ {
-+ const nsXPTParamInfo& param = info->GetParam(i);
-+ const nsXPTType& type = param.GetType();
-+ nsXPTCMiniVariant* dp = &dispatchParams[i];
-+
-+ if(param.IsOut() || !type.IsArithmetic())
-+ {
-+ dp->val.p = (void*) *ap;
-+ continue;
-+ }
-+ // else
-+ switch(type)
-+ {
-+ case nsXPTType::T_I8 : dp->val.i8 = (PRInt8) *ap; break;
-+ case nsXPTType::T_I16 : dp->val.i16 = (PRInt16) *ap; break;
-+ case nsXPTType::T_I32 : dp->val.i32 = (PRInt32) *ap; break;
-+ case nsXPTType::T_I64 : dp->val.i64 = (PRInt64) *ap; break;
-+ case nsXPTType::T_U8 : dp->val.u8 = (PRUint8) *ap; break;
-+ case nsXPTType::T_U16 : dp->val.u16 = (PRUint16) *ap; break;
-+ case nsXPTType::T_U32 : dp->val.u32 = (PRUint32) *ap; break;
-+ case nsXPTType::T_U64 : dp->val.u64 = (PRUint64) *ap; break;
-+ case nsXPTType::T_FLOAT :
-+ if(i < NUM_ARG_REGS)
-+ {
-+ // floats passed via registers are stored as doubles
-+ // in the first NUM_ARG_REGS entries in args
-+ dp->val.u64 = (PRUint64) args[i];
-+ dp->val.f = (float) dp->val.d; // convert double to float
-+ }
-+ else
-+ dp->val.u32 = (PRUint32) *ap;
-+ break;
-+ case nsXPTType::T_DOUBLE :
-+ // doubles passed via registers are also stored
-+ // in the first NUM_ARG_REGS entries in args
-+ dp->val.u64 = (i < NUM_ARG_REGS) ? args[i] : *ap;
-+ break;
-+ case nsXPTType::T_BOOL : dp->val.b = (PRBool) *ap; break;
-+ case nsXPTType::T_CHAR : dp->val.c = (char) *ap; break;
-+ case nsXPTType::T_WCHAR : dp->val.wc = (PRUnichar) *ap; break;
-+ default:
-+ NS_ASSERTION(0, "bad type");
-+ break;
-+ }
-+ }
-+
-+ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams);
-+
-+ NS_RELEASE(iface_info);
-+
-+ if(dispatchParams != paramBuffer)
-+ delete [] dispatchParams;
-+
-+ return result;
-+}
-+
-+/*
-+ * SharedStub()
-+ * Collects arguments and calls PrepareAndDispatch. The "methodIndex" is
-+ * passed to this function via $1 to preserve the argument registers.
-+ */
-+__asm__(
-+ "#### SharedStub ####\n"
-+".text\n\t"
-+ ".align 5\n\t"
-+ ".ent SharedStub\n"
-+"SharedStub:\n\t"
-+ ".frame $30,96,$26,0\n\t"
-+ ".mask 0x4000000,-96\n\t"
-+ "ldgp $29,0($27)\n"
-+"$SharedStub..ng:\n\t"
-+ "subq $30,96,$30\n\t"
-+ "stq $26,0($30)\n\t"
-+ ".prologue 1\n\t"
-+
-+ /*
-+ * Store arguments passed via registers to the stack.
-+ * Floating point registers are stored as doubles and converted
-+ * to floats in PrepareAndDispatch if necessary.
-+ */
-+ "stt $f17,16($30)\n\t" /* floating point registers */
-+ "stt $f18,24($30)\n\t"
-+ "stt $f19,32($30)\n\t"
-+ "stt $f20,40($30)\n\t"
-+ "stt $f21,48($30)\n\t"
-+ "stq $17,56($30)\n\t" /* integer registers */
-+ "stq $18,64($30)\n\t"
-+ "stq $19,72($30)\n\t"
-+ "stq $20,80($30)\n\t"
-+ "stq $21,88($30)\n\t"
-+
-+ /*
-+ * Call PrepareAndDispatch function.
-+ */
-+ "bis $1,$1,$17\n\t" /* pass "methodIndex" */
-+ "addq $30,16,$18\n\t" /* pass "args" */
-+ "bsr $26,$PrepareAndDispatch..ng\n\t"
-+
-+ "ldq $26,0($30)\n\t"
-+ "addq $30,96,$30\n\t"
-+ "ret $31,($26),1\n\t"
-+ ".end SharedStub"
-+ );
-+
-+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
-+/*
-+ * nsresult nsXPTCStubBase::Stub##n()
-+ * Sets register $1 to "methodIndex" and jumps to SharedStub.
-+ */
-+#define STUB_ENTRY(n) \
-+__asm__( \
-+ "#### Stub"#n" ####\n" \
-+".text\n\t" \
-+ ".align 5\n\t" \
-+ ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev\n\t" \
-+ ".ent _ZN14nsXPTCStubBase5Stub"#n"Ev\n" \
-+"_ZN14nsXPTCStubBase5Stub"#n"Ev:\n\t" \
-+ ".frame $30,0,$26,0\n\t" \
-+ "ldgp $29,0($27)\n" \
-+"$_ZN14nsXPTCStubBase5Stub"#n"Ev..ng:\n\t" \
-+ ".prologue 1\n\t" \
-+ "lda $1,"#n"\n\t" \
-+ "br $31,$SharedStub..ng\n\t" \
-+ ".end _ZN14nsXPTCStubBase5Stub"#n"Ev" \
-+ ); \
-+__asm__( \
-+ "#### Stub"#n" ####\n" \
-+".text\n\t" \
-+ ".align 5\n\t" \
-+ ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev\n\t" \
-+ ".ent _ZN14nsXPTCStubBase6Stub"#n"Ev\n" \
-+"_ZN14nsXPTCStubBase6Stub"#n"Ev:\n\t" \
-+ ".frame $30,0,$26,0\n\t" \
-+ "ldgp $29,0($27)\n" \
-+"$_ZN14nsXPTCStubBase6Stub"#n"Ev..ng:\n\t" \
-+ ".prologue 1\n\t" \
-+ "lda $1,"#n"\n\t" \
-+ "br $31,$SharedStub..ng\n\t" \
-+ ".end _ZN14nsXPTCStubBase6Stub"#n"Ev" \
-+ ); \
-+__asm__( \
-+ "#### Stub"#n" ####\n" \
-+".text\n\t" \
-+ ".align 5\n\t" \
-+ ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev\n\t" \
-+ ".ent _ZN14nsXPTCStubBase7Stub"#n"Ev\n" \
-+"_ZN14nsXPTCStubBase7Stub"#n"Ev:\n\t" \
-+ ".frame $30,0,$26,0\n\t" \
-+ "ldgp $29,0($27)\n" \
-+"$_ZN14nsXPTCStubBase7Stub"#n"Ev..ng:\n\t" \
-+ ".prologue 1\n\t" \
-+ "lda $1,"#n"\n\t" \
-+ "br $31,$SharedStub..ng\n\t" \
-+ ".end _ZN14nsXPTCStubBase7Stub"#n"Ev" \
-+ );
-+#else
-+/*
-+ * nsresult nsXPTCStubBase::Stub##n()
-+ * Sets register $1 to "methodIndex" and jumps to SharedStub.
-+ */
-+#define STUB_ENTRY(n) \
-+nsresult nsXPTCStubBase::Stub##n() \
-+{ \
-+ nsresult result; \
-+__asm__ __volatile__( \
-+ "ldah $29,0($27)\n\t" \
-+ "lda $29,0($29)\n\t" \
-+ "lda $1, "#n"\n\t" \
-+ "br $31, $SharedStub..ng\n\t" \
-+ "mov $0, %0\n\t" \
-+ : "=r" (result) \
-+ ); \
-+ return result; \
-+}
-+#endif
-+
-+#define SENTINEL_ENTRY(n) \
-+nsresult nsXPTCStubBase::Sentinel##n() \
-+{ \
-+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
-+ return NS_ERROR_NOT_IMPLEMENTED; \
-+}
-+
-+#include "xptcstubsdef.inc"
-+
diff --git a/www/firefox3-devel/files/patch-xptcall-ia64 b/www/firefox3-devel/files/patch-xptcall-ia64
deleted file mode 100644
index 65e17ebb6..000000000
--- a/www/firefox3-devel/files/patch-xptcall-ia64
+++ /dev/null
@@ -1,40 +0,0 @@
-$FreeBSD$
-
---- 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
-@@ -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
-@@ -24,7 +25,7 @@
-
- // 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
-@@ -6,6 +6,7 @@
- // 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::
-+SharedStub:
- // 9 arguments, first 8 are the input arguments of previous
- // function call. The last one is methodIndex, and is passed in memory
- .prologue
diff --git a/www/firefox3-devel/files/patch-xptcall-sparc64 b/www/firefox3-devel/files/patch-xptcall-sparc64
deleted file mode 100644
index 13745acf9..000000000
--- a/www/firefox3-devel/files/patch-xptcall-sparc64
+++ /dev/null
@@ -1,329 +0,0 @@
-$FreeBSD$
-
---- /dev/null Mon May 26 13:22:00 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp Mon May 26 04:12:55 2003
-@@ -0,0 +1,123 @@
-+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-+ *
-+ * The contents of this file are subject to the Mozilla Public
-+ * License Version 1.1 (the "License"); you may not use this file
-+ * except in compliance with the License. You may obtain a copy of
-+ * the License at http://www.mozilla.org/MPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS
-+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ * implied. See the License for the specific language governing
-+ * rights and limitations under the License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is Netscape
-+ * Communications Corporation. Portions created by Netscape are
-+ * Copyright (C) 2001 Netscape Communications Corporation. All
-+ * Rights Reserved.
-+ *
-+ * Contributor(s):
-+ * Stuart Parmenter <pavlov@netscape.com>
-+ */
-+
-+/* Implement shared vtbl methods. */
-+
-+#include "xptcprivate.h"
-+
-+#if defined(sparc) || defined(__sparc__)
-+
-+extern "C" nsresult
-+PrepareAndDispatch(nsXPTCStubBase* self, PRUint64 methodIndex, PRUint64* args)
-+{
-+
-+#define PARAM_BUFFER_COUNT 16
-+
-+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
-+ nsXPTCMiniVariant* dispatchParams = NULL;
-+ nsIInterfaceInfo* iface_info = NULL;
-+ const nsXPTMethodInfo* info;
-+ PRUint8 paramCount;
-+ PRUint8 i;
-+ nsresult result = NS_ERROR_FAILURE;
-+
-+ NS_ASSERTION(self,"no self");
-+
-+ self->GetInterfaceInfo(&iface_info);
-+ NS_ASSERTION(iface_info,"no interface info");
-+
-+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info);
-+ NS_ASSERTION(info,"no interface info");
-+
-+ paramCount = info->GetParamCount();
-+
-+ // setup variant array pointer
-+ if(paramCount > PARAM_BUFFER_COUNT)
-+ dispatchParams = new nsXPTCMiniVariant[paramCount];
-+ else
-+ dispatchParams = paramBuffer;
-+ NS_ASSERTION(dispatchParams,"no place for params");
-+
-+ PRUint64* ap = args;
-+ for(i = 0; i < paramCount; i++, ap++)
-+ {
-+ const nsXPTParamInfo& param = info->GetParam(i);
-+ const nsXPTType& type = param.GetType();
-+ nsXPTCMiniVariant* dp = &dispatchParams[i];
-+
-+ if(param.IsOut() || !type.IsArithmetic())
-+ {
-+ dp->val.p = (void*) *ap;
-+ continue;
-+ }
-+ // else
-+ switch(type)
-+ {
-+ case nsXPTType::T_I8 : dp->val.i8 = *((PRInt64*) ap); break;
-+ case nsXPTType::T_I16 : dp->val.i16 = *((PRInt64*) ap); break;
-+ case nsXPTType::T_I32 : dp->val.i32 = *((PRInt64*) ap); break;
-+ case nsXPTType::T_DOUBLE : dp->val.d = *((double*) ap); break;
-+ case nsXPTType::T_U64 : dp->val.u64 = *((PRUint64*) ap); break;
-+ case nsXPTType::T_I64 : dp->val.i64 = *((PRInt64*) ap); break;
-+ case nsXPTType::T_U8 : dp->val.u8 = *((PRUint64*) ap); break;
-+ case nsXPTType::T_U16 : dp->val.u16 = *((PRUint64*)ap); break;
-+ case nsXPTType::T_U32 : dp->val.u32 = *((PRUint64*)ap); break;
-+ case nsXPTType::T_FLOAT : dp->val.f = ((float*) ap)[1]; break;
-+ case nsXPTType::T_BOOL : dp->val.b = *((PRInt64*) ap); break;
-+ case nsXPTType::T_CHAR : dp->val.c = *((PRUint64*) ap); break;
-+ case nsXPTType::T_WCHAR : dp->val.wc = *((PRInt64*) ap); break;
-+ default:
-+ NS_ASSERTION(0, "bad type");
-+ break;
-+ }
-+ }
-+
-+ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams);
-+
-+ NS_RELEASE(iface_info);
-+
-+ if(dispatchParams != paramBuffer)
-+ delete [] dispatchParams;
-+
-+ return result;
-+}
-+
-+extern "C" int SharedStub(int, int*);
-+
-+#define STUB_ENTRY(n) \
-+nsresult nsXPTCStubBase::Stub##n() \
-+{ \
-+ int dummy; /* defeat tail-call optimization */ \
-+ return SharedStub(n, &dummy); \
-+}
-+
-+#define SENTINEL_ENTRY(n) \
-+nsresult nsXPTCStubBase::Sentinel##n() \
-+{ \
-+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
-+ return NS_ERROR_NOT_IMPLEMENTED; \
-+}
-+
-+#include "xptcstubsdef.inc"
-+
-+#endif /* sparc || __sparc__ */
---- /dev/null Mon May 26 13:22:00 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s Mon May 26 04:06:09 2003
-@@ -0,0 +1,104 @@
-+/* -*- Mode: asm; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-+ *
-+ * The contents of this file are subject to the Mozilla Public
-+ * License Version 1.1 (the "License"); you may not use this file
-+ * except in compliance with the License. You may obtain a copy of
-+ * the License at http://www.mozilla.org/MPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS
-+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ * implied. See the License for the specific language governing
-+ * rights and limitations under the License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is Netscape
-+ * Communications Corporation. Portions created by Netscape are
-+ * Copyright (C) 2001 Netscape Communications Corporation. All
-+ * Rights Reserved.
-+ *
-+ * Contributor(s):
-+ * Stuart Parmenter <pavlov@netscape.com>
-+ * Chris Seawood <cls@seawood.org>
-+ */
-+
-+/*
-+ Platform specific code to invoke XPCOM methods on native objects
-+ for sparcv9 Solaris.
-+
-+ See the SPARC Compliance Definition (SCD) Chapter 3
-+ for more information about what is going on here, including
-+ the use of BIAS (0x7ff).
-+ The SCD is available from http://www.sparc.com/.
-+*/
-+
-+ .global XPTC_InvokeByIndex
-+ .type XPTC_InvokeByIndex, #function
-+
-+/*
-+ XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
-+ PRUint32 paramCount, nsXPTCVariant* params);
-+
-+*/
-+XPTC_InvokeByIndex:
-+ save %sp,-(128 + 64),%sp ! room for the register window and
-+ ! struct pointer, rounded up to 0 % 64
-+ sll %i2,4,%l0 ! assume the worst case
-+ ! paramCount * 2 * 8 bytes
-+ cmp %l0, 0 ! are there any args? If not,
-+ be .invoke ! no need to copy args to stack
-+ nop
-+
-+ sub %sp,%l0,%sp ! create the additional stack space
-+ add %sp,0x7ff+136,%o0 ! step past the register window, the
-+ ! struct result pointer and the 'this' slot
-+ mov %i2,%o1 ! paramCount
-+ call invoke_copy_to_stack
-+ mov %i3,%o2 ! params
-+
-+!
-+! load arguments from stack into the outgoing registers
-+! BIAS is 0x7ff (2047)
-+!
-+
-+! load the %o1..5 64bit (extended word) output registers registers
-+ ldx [%sp + 0x7ff + 136],%o1 ! %i1
-+ ldx [%sp + 0x7ff + 144],%o2 ! %i2
-+ ldx [%sp + 0x7ff + 152],%o3 ! %i3
-+ ldx [%sp + 0x7ff + 160],%o4 ! %i4
-+ ldx [%sp + 0x7ff + 168],%o5 ! %i5
-+
-+! load the even number double registers starting with %d2
-+ ldd [%sp + 0x7ff + 136],%f2
-+ ldd [%sp + 0x7ff + 144],%f4
-+ ldd [%sp + 0x7ff + 152],%f6
-+ ldd [%sp + 0x7ff + 160],%f8
-+ ldd [%sp + 0x7ff + 168],%f10
-+ ldd [%sp + 0x7ff + 176],%f12
-+ ldd [%sp + 0x7ff + 184],%f14
-+ ldd [%sp + 0x7ff + 192],%f16
-+ ldd [%sp + 0x7ff + 200],%f18
-+ ldd [%sp + 0x7ff + 208],%f20
-+ ldd [%sp + 0x7ff + 216],%f22
-+ ldd [%sp + 0x7ff + 224],%f24
-+ ldd [%sp + 0x7ff + 232],%f26
-+ ldd [%sp + 0x7ff + 240],%f28
-+ ldd [%sp + 0x7ff + 248],%f30
-+
-+!
-+! calculate the target address from the vtable
-+!
-+.invoke:
-+ sll %i1,3,%l0 ! index *= 8
-+! add %l0,16,%l0 ! there are 2 extra entries in the vTable (16bytes)
-+ ldx [%i0],%l1 ! *that --> address of vtable
-+ ldx [%l0 + %l1],%l0 ! that->vtable[index * 8 + 16] --> address
-+
-+ jmpl %l0,%o7 ! call the routine
-+ mov %i0,%o0 ! move 'this' pointer to out register
-+
-+ mov %o0,%i0 ! propagate return value
-+ ret
-+ restore
-+
-+ .size XPTC_InvokeByIndex, .-XPTC_InvokeByIndex
---- /dev/null Mon May 26 14:00:00 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp Mon May 26 14:00:49 2003
-@@ -0,0 +1,91 @@
-+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-+ *
-+ * The contents of this file are subject to the Mozilla Public
-+ * License Version 1.1 (the "License"); you may not use this file
-+ * except in compliance with the License. You may obtain a copy of
-+ * the License at http://www.mozilla.org/MPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS
-+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ * implied. See the License for the specific language governing
-+ * rights and limitations under the License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is Netscape
-+ * Communications Corporation. Portions created by Netscape are
-+ * Copyright (C) 2001 Netscape Communications Corporation. All
-+ * Rights Reserved.
-+ *
-+ * Contributor(s):
-+ * Stuart Parmenter <pavlov@netscape.com>
-+ * Chris Seawood <cls@seawood.org>
-+ */
-+
-+
-+/* Platform specific code to invoke XPCOM methods on native objects */
-+
-+#include "xptcprivate.h"
-+
-+#if !defined(__sparc) && !defined(__sparc__)
-+#error "This code is for Sparc only"
-+#endif
-+
-+/* Prototype specifies unmangled function name */
-+extern "C" PRUint64
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s);
-+
-+extern "C" PRUint64
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
-+{
-+ /*
-+ We need to copy the parameters for this function to locals and use them
-+ from there since the parameters occupy the same stack space as the stack
-+ we're trying to populate.
-+ */
-+ PRUint64 *l_d = d;
-+ nsXPTCVariant *l_s = s;
-+ PRUint64 l_paramCount = paramCount;
-+ PRUint64 regCount = 0; // return the number of registers to load from the stack
-+
-+ for(PRUint64 i = 0; i < l_paramCount; i++, l_d++, l_s++)
-+ {
-+ if (regCount < 5) regCount++;
-+
-+ if (l_s->IsPtrData())
-+ {
-+ *l_d = (PRUint64)l_s->ptr;
-+ continue;
-+ }
-+ switch (l_s->type)
-+ {
-+ case nsXPTType::T_I8 : *((PRInt64*)l_d) = l_s->val.i8; break;
-+ case nsXPTType::T_I16 : *((PRInt64*)l_d) = l_s->val.i16; break;
-+ case nsXPTType::T_I32 : *((PRInt64*)l_d) = l_s->val.i32; break;
-+ case nsXPTType::T_I64 : *((PRInt64*)l_d) = l_s->val.i64; break;
-+
-+ case nsXPTType::T_U8 : *((PRUint64*)l_d) = l_s->val.u8; break;
-+ case nsXPTType::T_U16 : *((PRUint64*)l_d) = l_s->val.u16; break;
-+ case nsXPTType::T_U32 : *((PRUint64*)l_d) = l_s->val.u32; break;
-+ case nsXPTType::T_U64 : *((PRUint64*)l_d) = l_s->val.u64; break;
-+
-+ /* in the case of floats, we want to put the bits in to the
-+ 64bit space right justified... floats in the paramter array on
-+ sparcv9 use odd numbered registers.. %f1, %f3, so we have to skip
-+ the space that would be occupied by %f0, %f2, etc.
-+ */
-+ case nsXPTType::T_FLOAT : *(((float*)l_d) + 1) = l_s->val.f; break;
-+ case nsXPTType::T_DOUBLE: *((double*)l_d) = l_s->val.d; break;
-+ case nsXPTType::T_BOOL : *((PRInt64*)l_d) = l_s->val.b; break;
-+ case nsXPTType::T_CHAR : *((PRUint64*)l_d) = l_s->val.c; break;
-+ case nsXPTType::T_WCHAR : *((PRInt64*)l_d) = l_s->val.wc; break;
-+
-+ default:
-+ // all the others are plain pointer types
-+ *((void**)l_d) = l_s->val.p;
-+ break;
-+ }
-+ }
-+
-+ return regCount;
-+}
diff --git a/www/firefox3-devel/pkg-deinstall.in b/www/firefox3-devel/pkg-deinstall.in
deleted file mode 100644
index b9b0ca220..000000000
--- a/www/firefox3-devel/pkg-deinstall.in
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# Date created: Mon Nov 29, 2003
-# Whom: Thierry Thomas (<thierry@pompo.net>)
-# Fix the chrome registry.
-
-umask 022
-PATH=/bin:/usr/bin
-
-[ "x$1" = "x" ] && exit 1
-[ "x$2" != "xDEINSTALL" ] && exit 0
-
-MOZDIR=%%MOZDIR%%
-
-rm -rf ${MOZDIR}/chrome/overlayinfo
-rm -f ${MOZDIR}/chrome/*.rdf
-rm -f ${MOZDIR}/component.reg
-rm -f ${MOZDIR}/components.ini
-rm -f ${MOZDIR}/defaults.ini
-rm -f ${MOZDIR}/components/*.dat
-rm -rf ${MOZDIR}/extensions
-
-exit 0
diff --git a/www/firefox3-devel/pkg-descr b/www/firefox3-devel/pkg-descr
deleted file mode 100644
index 99b11c5e7..000000000
--- a/www/firefox3-devel/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-Firefox is an award winning, free, open-source web browser for many platforms
-and is based on the Mozilla codebase. It is small, fast and easy to use, and
-offers many advanced features:
- o Popup Blocking
- o Tabbed Browsing
- o Live Bookmarks (ie. RSS)
- o Extensions
- o Themes
- o FastFind
- o Improved Security
-
-WWW: http://www.mozilla.org/products/firefox/
diff --git a/www/firefox3-devel/pkg-install.in b/www/firefox3-devel/pkg-install.in
deleted file mode 100644
index f25aa1351..000000000
--- a/www/firefox3-devel/pkg-install.in
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# Date created: Mon Nov 29, 2003
-# Whom: Thierry Thomas (<thierry@pompo.net>)
-# Fix the chrome registry.
-
-umask 022
-PATH=/bin:/usr/bin:/usr/local/bin
-
-[ "x$1" = "x" ] && exit 1
-[ "x$2" != "xPOST-INSTALL" ] && exit 0
-
-MOZDIR=%%MOZDIR%%
-REGXPCOM=${MOZDIR}/regxpcom
-REGCHROME=${MOZDIR}/regchrome
-FIREFOX=${MOZDIR}/firefox-bin
-
-echo "===> Building Chrome's registry..."
-rm -rf ${MOZDIR}/chrome/overlayinfo
-rm -f ${MOZDIR}/chrome/*.rdf
-mkdir -p ${MOZDIR}/chrome/overlayinfo
-rm -f ${MOZDIR}/component.reg
-rm -rf ${MOZDIR}/extensions
-
-cd ${MOZDIR} || exit 1
-./run-mozilla.sh ${REGXPCOM} || true
-./run-mozilla.sh ${REGCHROME} || true
-./run-mozilla.sh ${FIREFOX} -register > /dev/null 2>&1
-
-if [ ! -d %%PREFIX%%/lib/browser_plugins ]; then
- mkdir -p %%PREFIX%%/lib/browser_plugins
-fi
-
-exit 0
diff --git a/www/firefox3-devel/pkg-message b/www/firefox3-devel/pkg-message
deleted file mode 100644
index 77f3adad8..000000000
--- a/www/firefox3-devel/pkg-message
+++ /dev/null
@@ -1,41 +0,0 @@
-======================================================================
-README FOR GNOMEVFS SUPPORT:
-Gnomevfs support is optional (disabled by default), and can be enabled by
-building with ``-DWITH_SMB''.
-
-It is new and currently has issues to be ironed out.
-
-You must delete your components registry for gnomevfs to register:
-
-rm ~/.mozilla/firefox/default.*/compreg.dat
-
-SMB issues:
-Network group, machine, and share browsing does not work correctly.
-
-SFTP:
-Only sftp access using public key authentication works. To easily
-setup public key authentication to "remote_host":
-
-ssh-keygen -t dsa
-cat ~/.ssh/id_dsa.pub | ssh remote_host "cat >> .ssh/authorized_keys"
-
-The SSH sever on remote_host must allow pub key authentication.
-
-======================================================================
-
-Any bug reports should be addressed to the maintainers at:
- gnome@FreeBSD.org
-You may also Cc: freebsd-ports@freebsd.org. Please do not send
-bug reports to any other addresses.
-
-Please include the following information with any bug report:
-* Output from 'uname -a'.
-* Date/time stamp from www/firefox/Makefile.
-* Where/when did the problem occur: configuring, building, or
- running firefox
-* How can you reproduce the problem?
-
-Thank you for your help in testing and reporting bugs, and we hope you
-enjoy using Firefox.
-The Maintainers (gnome@)
-======================================================================