firefox update
--ew6BAiZeqk4r7MaW
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Hi all,
the attached patch syncs our Firefox with FreeBSD.
This is not tested with GCC2 or non-citrus libc,
please do so :)
Joerg
--ew6BAiZeqk4r7MaW
Content-Type: text/plain; charset=utf-8
Content-Disposition: attachment; filename="firefox.diff"
Content-Transfer-Encoding: 8bit
Index: Makefile
===================================================================
RCS file: /home/joerg/wd/repository/dragonflybsd/dfports/www/firefox/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- Makefile 19 Nov 2004 20:11:09 -0000 1.1
+++ Makefile 18 Mar 2005 15:15:55 -0000
@@ -2,18 +2,17 @@
# Date created: 2002/10/21
# Whom: Alan Eldridge <alane@FreeBSD.org>
#
-# $FreeBSD: ports/www/firefox/Makefile,v 1.102 2004/11/13 08:23:09 ahze Exp $
-# $DragonFly: dfports/www/firefox/Makefile,v 1.1 2004/11/19 20:11:09 joerg Exp $
-#
+# $FreeBSD: ports/www/firefox/Makefile,v 1.118 2005/03/12 10:53:09 marcus Exp $
+# $DragonFly$
PORTNAME= firefox
-PORTVERSION= 1.0
-PORTREVISION= 1
+PORTVERSION= 1.0.1
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR= ${PORTNAME}/releases/1.0/source
-DISTNAME= ${PORTNAME}-1.0-source
+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
@@ -22,7 +21,6 @@
png.5:${PORTSDIR}/graphics/png \
mng.1:${PORTSDIR}/graphics/libmng
BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip
-RUN_DEPENDS= Xvfb:${X_VFBSERVER_PORT}
ALL_TARGET= default
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
@@ -34,14 +32,20 @@
PLUGINSDIR= ${PREFIX}/lib/browser_plugins
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GNOME= gtk20 libidl gnomehier
-USE_ICONV= yes
+USE_GNOME= gtk20 libidl gnomehier desktopfileutils
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}
@@ -57,12 +61,17 @@
${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 \
- NEW_ICON "Install the new Firefox branding icon" off
+ NEWTAB "Open external links in a new tab" on
.include <bsd.dfport.pre.mk>
@@ -72,9 +81,9 @@
.endif # defined(WITH_DEBUG)
.if defined(WITH_OPTIMIZED_CFLAGS)
-CFLAGS+= -O2
-CONFIGURE_ENV+= WITH_OPTIMIZE=-O2
+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)
@@ -128,10 +137,23 @@
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 ; \
@@ -145,6 +167,8 @@
${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/ ; \
@@ -162,6 +186,8 @@
@${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; \
@@ -169,17 +195,27 @@
${FAKEDIR}/bin/firefox \
${FAKEDIR}/bin/firefox-config
for i in ${EXTRA_SCRIPTS}; do \
- ${ECHO_CMD} bin/${i} ; \
+ ${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' \
+ ${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
@@ -188,6 +224,10 @@
&& ${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}
@@ -197,6 +237,7 @@
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 \
@@ -225,11 +266,10 @@
.for i in ${EXTRA_SCRIPTS}
${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin
.endfor
-.if defined(WITH_NEW_ICON)
- ${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \
- ${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm
-.endif # defined(WITH_NEW_ICON)
${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.dfport.post.mk>
Index: distinfo
===================================================================
RCS file: /home/joerg/wd/repository/dragonflybsd/dfports/www/firefox/distinfo,v
retrieving revision 1.1
diff -u -r1.1 distinfo
--- distinfo 19 Nov 2004 20:11:09 -0000 1.1
+++ distinfo 28 Feb 2005 15:21:57 -0000
@@ -1,2 +1,2 @@
-MD5 (firefox-1.0-source.tar.bz2) = 49c16a71f4de014ea471be81e46b1da8
-SIZE (firefox-1.0-source.tar.bz2) = 32686249
+MD5 (firefox-1.0.1-source.tar.bz2) = ebaea974fea9460ab7050fff76b41cb1
+SIZE (firefox-1.0.1-source.tar.bz2) = 32671529
Index: pkg-deinstall.in
===================================================================
RCS file: /home/joerg/wd/repository/dragonflybsd/dfports/www/firefox/pkg-deinstall.in,v
retrieving revision 1.1
diff -u -r1.1 pkg-deinstall.in
--- pkg-deinstall.in 19 Nov 2004 20:11:09 -0000 1.1
+++ pkg-deinstall.in 17 Mar 2005 15:10:43 -0000
@@ -1,7 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: ports/www/firefox/pkg-deinstall.in,v 1.3 2004/10/28 21:37:53 marcus Exp $
-# $DragonFly: dfports/www/firefox/pkg-deinstall.in,v 1.1 2004/11/19 20:11:09 joerg Exp $
+# $FreeBSD: ports/www/firefox/pkg-deinstall.in,v 1.4 2005/03/10 00:43:22 marcus Exp $
#
# Date created: Mon Nov 29, 2003
# Whom: Thierry Thomas (<thierry@pompo.net>)
Index: pkg-descr
===================================================================
RCS file: /home/joerg/wd/repository/dragonflybsd/dfports/www/firefox/pkg-descr,v
retrieving revision 1.1
diff -u -r1.1 pkg-descr
--- pkg-descr 19 Nov 2004 20:11:09 -0000 1.1
+++ pkg-descr 29 Dec 2004 03:25:23 -0000
@@ -1,6 +1,12 @@
-Mozilla Firefox is the next-generation browser from the Mozilla project. See
-its home page for more details.
+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/
-
--- AlanE <alane@freebsd.org>
+WWW: http://www.mozilla.org/products/firefox/
Index: pkg-install.in
===================================================================
RCS file: /home/joerg/wd/repository/dragonflybsd/dfports/www/firefox/pkg-install.in,v
retrieving revision 1.1
diff -u -r1.1 pkg-install.in
--- pkg-install.in 19 Nov 2004 20:11:09 -0000 1.1
+++ pkg-install.in 17 Mar 2005 15:10:43 -0000
@@ -1,7 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: ports/www/firefox/pkg-install.in,v 1.7 2004/11/10 00:58:53 marcus Exp $
-# $DragonFly: dfports/www/firefox/pkg-install.in,v 1.1 2004/11/19 20:11:09 joerg Exp $
+# $FreeBSD: ports/www/firefox/pkg-install.in,v 1.10 2005/03/10 00:43:22 marcus Exp $
#
# Date created: Mon Nov 29, 2003
# Whom: Thierry Thomas (<thierry@pompo.net>)
@@ -28,9 +27,10 @@
cd ${MOZDIR} || exit 1
./run-mozilla.sh ${REGXPCOM} || true
./run-mozilla.sh ${REGCHROME} || true
+./run-mozilla.sh ${FIREFOX} -register > /dev/null 2>&1
-# Instantiate the extension space as root.
-su - root -c "env PATH=${PATH} %%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${FIREFOX} -install-global-extension -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
-su - root -c "env PATH=${PATH} %%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${FIREFOX} -install-global-theme -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
+if [ ! -d %%PREFIX%%/lib/browser_plugins ]; then
+ mkdir -p %%PREFIX%%/lib/browser_plugins
+fi
exit 0
Index: files/firefox.desktop.in
===================================================================
RCS file: /home/joerg/wd/repository/dragonflybsd/dfports/www/firefox/files/firefox.desktop.in,v
retrieving revision 1.1
diff -u -r1.1 firefox.desktop.in
--- files/firefox.desktop.in 19 Nov 2004 20:11:09 -0000 1.1
+++ files/firefox.desktop.in 28 Feb 2005 15:21:57 -0000
@@ -1,8 +1,191 @@
[Desktop Entry]
-Name=Firefox
-Comment=Firefox Web Browser
+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쎃毗aren 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쎃毗are
+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쎃氟et
+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;
Index: files/firefox.rb
===================================================================
RCS file: /home/joerg/wd/repository/dragonflybsd/dfports/www/firefox/files/firefox.rb,v
retrieving revision 1.1
diff -u -r1.1 firefox.rb
--- files/firefox.rb 19 Nov 2004 20:11:09 -0000 1.1
+++ files/firefox.rb 17 Mar 2005 15:10:44 -0000
@@ -33,7 +33,7 @@
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.3 2004/10/12 00:04:40 marcus Exp $
+ $Id: firefox.rb,v 1.1 2005/03/05 01:49:02 marcus Exp $
2002-12-16 Alan Eldridge <alane@geeksrus.net>
Index: files/mkdistfile
===================================================================
RCS file: /home/joerg/wd/repository/dragonflybsd/dfports/www/firefox/files/mkdistfile,v
retrieving revision 1.1
diff -u -r1.1 mkdistfile
--- files/mkdistfile 19 Nov 2004 20:11:09 -0000 1.1
+++ files/mkdistfile 17 Mar 2005 15:10:44 -0000
@@ -33,7 +33,7 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
-# $FreeBSD: ports/www/firefox/files/mkdistfile,v 1.6 2004/02/11 07:16:17 marcus Exp $
+# $FreeBSD: ports/www/firefox/files/mkdistfile,v 1.7 2005/03/10 00:43:22 marcus Exp $
#
# 2002/10/21 alane@geeksrus.net
#
@@ -87,7 +87,7 @@
############################################################
# show version and exit
############################################################
-VERSION='$Revision: 1.6 $'
+VERSION='$Revision: 1.1 $'
VERSION=${VERSION#* }; VERSION=${VERSION% *}
version() { echo "$APPNAME $VERSION" \
"Copyright (c) 2002 Alan Eldridge"; exit $1;}
Index: files/moz_pis_S50cleanhome
===================================================================
RCS file: files/moz_pis_S50cleanhome
diff -N files/moz_pis_S50cleanhome
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/moz_pis_S50cleanhome 26 Feb 2005 09:32:01 -0000
@@ -0,0 +1,31 @@
+#!/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
Index: files/mozconfig.in
===================================================================
RCS file: /home/joerg/wd/repository/dragonflybsd/dfports/www/firefox/files/mozconfig.in,v
retrieving revision 1.1
diff -u -r1.1 mozconfig.in
--- files/mozconfig.in 19 Nov 2004 20:11:09 -0000 1.1
+++ files/mozconfig.in 17 Mar 2005 15:10:44 -0000
@@ -1,5 +1,5 @@
# .mozconfig.in -*-shell-script-*-
-# $FreeBSD: ports/www/firefox/files/mozconfig.in,v 1.27 2004/11/13 08:23:09 ahze Exp $
+# $FreeBSD: ports/www/firefox/files/mozconfig.in,v 1.30 2005/03/10 00:43:22 marcus Exp $
######################################################################
# standard opts from README
export MOZ_PHOENIX=1
@@ -9,6 +9,9 @@
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@"
@@ -22,6 +25,8 @@
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@
Index: files/patch-Double.cpp
===================================================================
RCS file: files/patch-Double.cpp
diff -N files/patch-Double.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-Double.cpp 19 Mar 2005 14:43:20 -0000
@@ -0,0 +1,64 @@
+$FreeBSD: ports/www/firefox/files/patch-Double.cpp,v 1.4 2005/03/10 00:43:22 marcus Exp $
+
+--- extensions/transformiix/source/base/Double.cpp.orig 2004-01-15 22:23:18.000000000 +0100
++++ extensions/transformiix/source/base/Double.cpp 2004-11-17 10:31:43.000000000 +0100
+@@ -49,12 +49,12 @@
+ */
+
+ //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ #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
+@@ -114,22 +114,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
Index: files/patch-browser_app_mozilla.in
===================================================================
RCS file: /home/joerg/wd/repository/dragonflybsd/dfports/www/firefox/files/patch-browser_app_mozilla.in,v
retrieving revision 1.1
diff -u -r1.1 patch-browser_app_mozilla.in
--- files/patch-browser_app_mozilla.in 19 Nov 2004 20:11:09 -0000 1.1
+++ files/patch-browser_app_mozilla.in 8 Mar 2005 14:18:10 -0000
@@ -1,42 +1,465 @@
---- browser/app/mozilla.in.orig Sat Nov 13 00:54:51 2004
-+++ browser/app/mozilla.in Sat Nov 13 00:57:22 2004
-@ -110,6 +110,7 @@
- # 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 "Cannot find mozilla runtime directory. Exiting."
- exit 1
-@@ -207,12 +207,31 @@
- script_args="$script_args -d $2"
- shift 2
- ;;
-+ -UILocale)
-+ moreargs="$moreargs -UILocale $2"
-+ _done_locale="YES"
-+ shift 2
-+ ;;
-+ -UIRegion)
-+ if [ -n "${_done_locale}" ]; then
-+ moreargs="$moreargs -UIRegion $2"
-+ fi
-+ shift 2
-+ ;;
- *)
- moreargs="$moreargs \"$1\""
- shift 1
- ;;
- esac
- done
-+
-+if [ ! -n "${_done_locale}" -a -n "${MOZILLA_UILOCALE}" ]; then
-+ if [ -n "${MOZILLA_UIREGION}" ]; then
-+ moreargs="-UIRegion ${MOZILLA_UIREGION} $moreargs"
+--- 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
-+ moreargs="-UILocale ${MOZILLA_UILOCALE} $moreargs"
++ 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
-+unset _done_locale
- export MRE_HOME
- eval "set -- $moreargs"
+-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
Index: files/patch-bugzilla149334
===================================================================
RCS file: files/patch-bugzilla149334
diff -N files/patch-bugzilla149334
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-bugzilla149334 10 Mar 2005 00:43:22 -0000
@@ -0,0 +1,342 @@
+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;
+ };
+
Index: files/patch-build_unix_run-mozilla.sh
===================================================================
RCS file: /home/joerg/wd/repository/dragonflybsd/dfports/www/firefox/files/patch-build_unix_run-mozilla.sh,v
retrieving revision 1.1
diff -u -r1.1 patch-build_unix_run-mozilla.sh
--- files/patch-build_unix_run-mozilla.sh 19 Nov 2004 20:11:09 -0000 1.1
+++ files/patch-build_unix_run-mozilla.sh 17 Mar 2005 15:10:44 -0000
@@ -1,4 +1,4 @@
-$FreeBSD: ports/www/firefox/files/patch-build_unix_run-mozilla.sh,v 1.5 2004/02/11 19:30:49 marcus Exp $
+$FreeBSD: ports/www/firefox/files/patch-build_unix_run-mozilla.sh,v 1.6 2005/03/10 00:43:22 marcus Exp $
--- build/unix/run-mozilla.sh.orig Mon Dec 15 12:27:28 2003
+++ build/unix/run-mozilla.sh Wed Feb 11 14:24:17 2004
Index: files/patch-config-mkdepend-imakemdep.h
===================================================================
RCS file: files/patch-config-mkdepend-imakemdep.h
diff -N files/patch-config-mkdepend-imakemdep.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-config-mkdepend-imakemdep.h 19 Mar 2005 14:42:51 -0000
@@ -0,0 +1,38 @@
+$FreeBSD: ports/www/firefox/files/patch-config-mkdepend-imakemdep.h,v 1.3 2005/03/10 00:43:22 marcus Exp $
+
+--- config/mkdepend/imakemdep.h.orig 1998-09-05 06:22:25.000000000 +0200
++++ config/mkdepend/imakemdep.h 2004-11-17 10:33:27.000000000 +0100
+@@ -235,7 +235,7 @@
+ #ifdef _CRAY
+ #define DEFAULT_CPP "/lib/pcpp"
+ #endif
+-#if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
++#if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+ #define DEFAULT_CPP "/usr/libexec/cpp"
+ #endif
+ #ifdef MACH
+@@ -273,10 +273,13 @@
+ #ifdef unix
+ "-Uunix", /* remove unix symbol so that filename unix.c okay */
+ #endif
+-#if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(MACH)
++#if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(MACH) || defined(__DragonFly__)
+ # ifdef __i386__
+ "-D__i386__",
+ # endif
++# if defined(__amd64__) || defined(__x86_64__)
++ "-D__amd64__ -D__x86_64__",
++# endif
+ # ifdef __GNUC__
+ "-traditional",
+ # endif
+@@ -710,6 +713,9 @@
+ #ifdef __sgi
+ {"__sgi", "1"},
+ #endif
++#ifdef __DragonFly__
++ {"__DragonFly__", "1"},
++#endif
+ #ifdef __FreeBSD__
+ {"__FreeBSD__", "1"},
+ #endif
Index: files/patch-config-rules.mk
===================================================================
RCS file: /home/joerg/wd/repository/dragonflybsd/dfports/www/firefox/files/patch-config-rules.mk,v
retrieving revision 1.1
diff -u -r1.1 patch-config-rules.mk
--- files/patch-config-rules.mk 19 Nov 2004 20:11:09 -0000 1.1
+++ files/patch-config-rules.mk 17 Mar 2005 15:10:44 -0000
@@ -1,4 +1,4 @@
-$FreeBSD: ports/www/firefox/files/patch-config-rules.mk,v 1.3 2004/02/11 07:16:17 marcus Exp $
+$FreeBSD: ports/www/firefox/files/patch-config-rules.mk,v 1.4 2005/03/10 00:43:22 marcus Exp $
--- config/rules.mk.orig Tue Aug 26 13:28:47 2003
+++ config/rules.mk Sun Feb 1 15:11:41 2004
Index: files/patch-config::mkdepend::Makefile.in
===================================================================
RCS file: files/patch-config::mkdepend::Makefile.in
diff -N files/patch-config::mkdepend::Makefile.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-config::mkdepend::Makefile.in 15 Dec 2004 06:03:30 -0000
@@ -0,0 +1,10 @@
+--- 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)
Index: files/patch-config::mkdepend::imakemdep.h
===================================================================
RCS file: files/patch-config::mkdepend::imakemdep.h
diff -N files/patch-config::mkdepend::imakemdep.h
--- files/patch-config::mkdepend::imakemdep.h 19 Nov 2004 20:11:09 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,36 +0,0 @@
---- config/mkdepend/imakemdep.h.orig 1998-09-05 06:22:25.000000000 +0200
-+++ config/mkdepend/imakemdep.h 2004-11-17 10:33:27.000000000 +0100
-@@ -235,7 +235,7 @@
- #ifdef _CRAY
- #define DEFAULT_CPP "/lib/pcpp"
- #endif
--#if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
-+#if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
- #define DEFAULT_CPP "/usr/libexec/cpp"
- #endif
- #ifdef MACH
-@@ -273,10 +273,13 @@
- #ifdef unix
- "-Uunix", /* remove unix symbol so that filename unix.c okay */
- #endif
--#if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(MACH)
-+#if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(MACH) || defined(__DragonFly__)
- # ifdef __i386__
- "-D__i386__",
- # endif
-+# if defined(__amd64__) || defined(__x86_64__)
-+ "-D__amd64__ -D__x86_64__",
-+# endif
- # ifdef __GNUC__
- "-traditional",
- # endif
-@@ -710,6 +713,9 @@
- #ifdef __sgi
- {"__sgi", "1"},
- #endif
-+#ifdef __DragonFly__
-+ {"__DragonFly__", "1"},
-+#endif
- #ifdef __FreeBSD__
- {"__FreeBSD__", "1"},
- #endif
Index: files/patch-extensions::transformiix::source::base::Double.cpp
===================================================================
RCS file: files/patch-extensions::transformiix::source::base::Double.cpp
diff -N files/patch-extensions::transformiix::source::base::Double.cpp
--- files/patch-extensions::transformiix::source::base::Double.cpp 19 Nov 2004 20:11:09 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,62 +0,0 @@
---- extensions/transformiix/source/base/Double.cpp.orig 2004-01-15 22:23:18.000000000 +0100
-+++ extensions/transformiix/source/base/Double.cpp 2004-11-17 10:31:43.000000000 +0100
-@@ -49,12 +49,12 @@
- */
-
- //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
- #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
-@@ -114,22 +114,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
Index: files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp
===================================================================
RCS file: /home/joerg/wd/repository/dragonflybsd/dfports/www/firefox/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp,v
retrieving revision 1.1
diff -u -r1.1 patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp
--- files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp 19 Nov 2004 20:11:09 -0000 1.1
+++ files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp 17 Mar 2005 15:10:44 -0000
@@ -1,4 +1,4 @@
-$FreeBSD: ports/www/firefox/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp,v 1.1 2004/02/11 07:16:17 marcus Exp $
+$FreeBSD: ports/www/firefox/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp,v 1.2 2005/03/10 00:43:22 marcus Exp $
--- 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
Index: files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h
===================================================================
RCS file: /home/joerg/wd/repository/dragonflybsd/dfports/www/firefox/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h,v
retrieving revision 1.1
diff -u -r1.1 patch-extensions_typeaheadfind_src_nsTypeAheadFind.h
--- files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h 19 Nov 2004 20:11:09 -0000 1.1
+++ files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h 17 Mar 2005 15:10:44 -0000
@@ -1,4 +1,4 @@
-$FreeBSD: ports/www/firefox/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h,v 1.1 2004/02/11 07:16:17 marcus Exp $
+$FreeBSD: ports/www/firefox/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h,v 1.2 2005/03/10 00:43:22 marcus Exp $
--- 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
Index: files/patch-nspr-unix.c
===================================================================
RCS file: /home/joerg/wd/repository/dragonflybsd/dfports/www/firefox/files/patch-nspr-unix.c,v
retrieving revision 1.1
diff -u -r1.1 patch-nspr-unix.c
--- files/patch-nspr-unix.c 19 Nov 2004 20:11:09 -0000 1.1
+++ files/patch-nspr-unix.c 17 Mar 2005 15:10:44 -0000
@@ -1,4 +1,4 @@
-$FreeBSD: ports/www/firefox/files/patch-nspr-unix.c,v 1.2 2004/02/11 07:16:17 marcus Exp $
+$FreeBSD: ports/www/firefox/files/patch-nspr-unix.c,v 1.3 2005/03/10 00:43:22 marcus Exp $
--- 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
Index: files/patch-nsprpub-pr-include-md-_freebsd.cfg
===================================================================
RCS file: /home/joerg/wd/repository/dragonflybsd/dfports/www/firefox/files/patch-nsprpub-pr-include-md-_freebsd.cfg,v
retrieving revision 1.1
diff -u -r1.1 patch-nsprpub-pr-include-md-_freebsd.cfg
--- files/patch-nsprpub-pr-include-md-_freebsd.cfg 19 Nov 2004 20:11:09 -0000 1.1
+++ files/patch-nsprpub-pr-include-md-_freebsd.cfg 17 Mar 2005 15:10:44 -0000
@@ -1,4 +1,4 @@
-$FreeBSD: ports/www/firefox/files/patch-nsprpub-pr-include-md-_freebsd.cfg,v 1.3 2004/02/11 07:16:17 marcus Exp $
+$FreeBSD: ports/www/firefox/files/patch-nsprpub-pr-include-md-_freebsd.cfg,v 1.4 2005/03/10 00:43:22 marcus Exp $
--- 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
Index: files/patch-nsprpub-pr-src-pthreads-ptio.c
===================================================================
RCS file: /home/joerg/wd/repository/dragonflybsd/dfports/www/firefox/files/patch-nsprpub-pr-src-pthreads-ptio.c,v
retrieving revision 1.1
diff -u -r1.1 patch-nsprpub-pr-src-pthreads-ptio.c
--- files/patch-nsprpub-pr-src-pthreads-ptio.c 19 Nov 2004 20:11:09 -0000 1.1
+++ files/patch-nsprpub-pr-src-pthreads-ptio.c 17 Mar 2005 15:10:44 -0000
@@ -1,4 +1,4 @@
-$FreeBSD: ports/www/firefox/files/patch-nsprpub-pr-src-pthreads-ptio.c,v 1.4 2004/02/11 07:16:17 marcus Exp $
+$FreeBSD: ports/www/firefox/files/patch-nsprpub-pr-src-pthreads-ptio.c,v 1.5 2005/03/10 00:43:22 marcus Exp $
--- 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
Index: files/patch-security-coreconf-FreeBSD.mk
===================================================================
RCS file: /home/joerg/wd/repository/dragonflybsd/dfports/www/firefox/files/patch-security-coreconf-FreeBSD.mk,v
retrieving revision 1.1
diff -u -r1.1 patch-security-coreconf-FreeBSD.mk
--- files/patch-security-coreconf-FreeBSD.mk 19 Nov 2004 20:11:09 -0000 1.1
+++ files/patch-security-coreconf-FreeBSD.mk 22 Nov 2004 04:04:52 -0000
@@ -1,14 +1,28 @@
-$FreeBSD: ports/www/firefox/files/patch-security-coreconf-FreeBSD.mk,v 1.2 2004/02/11 07:16:17 marcus Exp $
-
---- security/coreconf/FreeBSD.mk Thu Oct 16 23:03:47 2003
-+++ security/coreconf/FreeBSD.mk Thu Oct 16 22:53:11 2003
-@@ -44,5 +44,9 @@
+--- 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
Index: files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp
===================================================================
RCS file: files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp
diff -N files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp 25 Feb 2005 07:51:58 -0000
@@ -0,0 +1,29 @@
+--- 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);
Index: files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in
===================================================================
RCS file: /home/joerg/wd/repository/dragonflybsd/dfports/www/firefox/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in
--- files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in 19 Nov 2004 20:11:09 -0000 1.1
+++ files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in 17 Mar 2005 15:10:44 -0000
@@ -1,4 +1,4 @@
-$FreeBSD: ports/www/firefox/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in,v 1.4 2004/10/24 06:34:13 peter Exp $
+$FreeBSD: ports/www/firefox/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in,v 1.5 2005/03/10 00:43:22 marcus Exp $
--- 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
Index: files/patch-xptcall-alpha
===================================================================
RCS file: /home/joerg/wd/repository/dragonflybsd/dfports/www/firefox/files/patch-xptcall-alpha,v
retrieving revision 1.1
diff -u -r1.1 patch-xptcall-alpha
--- files/patch-xptcall-alpha 19 Nov 2004 20:11:09 -0000 1.1
+++ files/patch-xptcall-alpha 17 Mar 2005 15:10:44 -0000
@@ -1,4 +1,4 @@
-$FreeBSD: ports/www/firefox/files/patch-xptcall-alpha,v 1.2 2004/02/11 07:16:17 marcus Exp $
+$FreeBSD: ports/www/firefox/files/patch-xptcall-alpha,v 1.3 2005/03/10 00:43:22 marcus Exp $
--- 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
Index: files/patch-xptcall-ia64
===================================================================
RCS file: /home/joerg/wd/repository/dragonflybsd/dfports/www/firefox/files/patch-xptcall-ia64,v
retrieving revision 1.1
diff -u -r1.1 patch-xptcall-ia64
--- files/patch-xptcall-ia64 19 Nov 2004 20:11:09 -0000 1.1
+++ files/patch-xptcall-ia64 17 Mar 2005 15:10:44 -0000
@@ -1,4 +1,4 @@
-$FreeBSD: ports/www/firefox/files/patch-xptcall-ia64,v 1.2 2004/02/11 07:16:17 marcus Exp $
+$FreeBSD: ports/www/firefox/files/patch-xptcall-ia64,v 1.3 2005/03/10 00:43:22 marcus Exp $
--- 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
Index: files/patch-xptcall-sparc64
===================================================================
RCS file: /home/joerg/wd/repository/dragonflybsd/dfports/www/firefox/files/patch-xptcall-sparc64,v
retrieving revision 1.1
diff -u -r1.1 patch-xptcall-sparc64
--- files/patch-xptcall-sparc64 19 Nov 2004 20:11:09 -0000 1.1
+++ files/patch-xptcall-sparc64 17 Mar 2005 15:10:44 -0000
@@ -1,4 +1,4 @@
-$FreeBSD: ports/www/firefox/files/patch-xptcall-sparc64,v 1.3 2004/02/11 07:16:17 marcus Exp $
+$FreeBSD: ports/www/firefox/files/patch-xptcall-sparc64,v 1.4 2005/03/10 00:43:22 marcus Exp $
--- /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
--ew6BAiZeqk4r7MaW--