mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00
Code Issues Releases Activity

Add Firefox after a repo copy from mozilla-firebird. Firefox is the next

Browse Source 
release of the Firebird web browser with a new name to avoid conflicts with
the Firebird database.  This is version 0.8.

http://www.mozilla.org/products/firefox/releases/

* Update to 0.8 and change name to firefox [1]
* Make PLIST from a fake installation [1]
* Restore original credit and portname in Makefile [1]
* Optionally install headers and IDL files [2]
* Use PERL instead of REINPLACE_CMD in a few places [1]
* Use OPTIONS
* Enable the Inspector extension
* Fix another possible esound related problem
* Enable basic optimizations if WITH_DEBUG is not specified

PR:		62631 [2]
Submitted by:	trevor [1] [2]
This commit is contained in:
Joe Marcus Clarke 2004-02-11 07:16:17 +00:00
parent 2d6ec12e4c
commit 6593022e89
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=100632
275 changed files with 2103 additions and 33720 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
www/firefox-devel/Makefile
View File

@ -1,18 +1,16 @@
# New ports collection makefile for: mozilla-firebird
# Date created: May 31, 2003
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
# New ports collection makefile for: phoenix
# Date created: 2002/10/21
# Whom: Alan Eldridge <alane@FreeBSD.org>
#
# $FreeBSD$
#
PORTNAME= firebird
PORTVERSION= 0.7
PORTREVISION= 3
PORTNAME= firefox
PORTVERSION= 0.8
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= firebird/releases/${PORTVERSION}
PKGNAMEPREFIX= mozilla-
DISTNAME= MozillaFirebird-source-${PORTVERSION}
MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${PORTVERSION}
DISTNAME= ${PORTNAME}-source-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
COMMENT= Web browser based on the browser portion of Mozilla
@ -25,33 +23,34 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \
freetype-config:${PORTSDIR}/print/freetype2
CONFIGURE_ENV= WITH_GTK2=yes
USE_X_PREFIX= yes
ALL_TARGET= default
USE_ICONV= yes
CONFIGURE_ENV= WITH_GTK2=yes
FAKEDIR= ${WRKDIR}/fake
FAKESUBDIR= ${FAKEDIR}/lib/${PORTNAME}
HAS_CONFIGURE= yes
JREDIR= ${LOCALBASE}/jdk1.3.1/jre
ESD_LIB= libesd.so.2
LOCAL_PREFIX= ${PREFIX}/lib/${PORTNAME}
NO_MTREE= yes
PLIST= ${WRKDIR}/plist
PLUGINSDIR= ${PREFIX}lib/browser_plugins
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gtk20 libidl
USE_ICONV= yes
USE_PERL5= yes
USE_REINPLACE= yes
HAS_CONFIGURE= yes
USE_X_PREFIX= yes
WRKSRC= ${WRKDIR}/mozilla
NO_MTREE= yes
WRKSRC= ${WRKDIR}/mozilla
LOCAL_SUBDIR= lib/${PORTNAME}
LOCAL_PREFIX= ${PREFIX}/${LOCAL_SUBDIR}
JREDIR= ${LOCALBASE}/jdk1.3.1/jre
PLUGINSDIR= ${PREFIX}/lib/browser_plugins
OPTIONS= DEBUG "Build a debugging image" off \
HEADERS "Install headers and IDL files" off \
LOGGING "Enable additional log messages" off \
OPTIMIZED_CFLAGS "Enable some additional optimizations" off \
XFT "Enable support for anti-aliased fonts" on
.include <bsd.port.pre.mk>
#.if ${PERL_LEVEL} < 500601
#.undef NO_IGNORE
#BROKEN= Mozilla Firebird only supports the ports versions of Perl.
#BROKEN+=If you have installed a Perl port, and are getting this message,
#BROKEN+=please make sure you have given the command \'use.perl port\'.
#.endif # ${PERL_LEVEL} < 500601
.if defined(WITH_DEBUG)
WITH_LOGGING= yes
CONFIGURE_ENV+= WITH_DEBUG=yes
@ -76,7 +75,7 @@ CFLAGS+= ${PTHREAD_CFLAGS}
LDFLAGS+= -L${X11BASE}/lib
LIBS+= ${PTHREAD_LIBS}
EXTRA_SCRIPTS= firebird.rb
EXTRA_SCRIPTS= ${PORTNAME}.rb
.if ${ARCH} == "alpha" && ${OSVERSION} < 500035
IGNORE= "core dumps on alpha during post-build"
@ -94,67 +93,64 @@ post-extract::
-e 's|@LIBS@|${LIBS}|' \
-e 's|@X11BASE@|${X11BASE}|' \
-e 's|@LOCALBASE@|${LOCALBASE}|' \
-e 's|@PREFIX@|${LOCAL_PREFIX}|' \
-e 's|@PREFIX@|${FAKEDIR}/lib/firefox|' \
-e 's|@PERL@|${PERL5}|' \
<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
post-patch:
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' \
${WRKSRC}/build/unix/run-mozilla.sh
@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g' \
@${PERL} -pi -e 's|-lc_r|${PTHREAD_LIBS}|g' \
${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
${WRKSRC}/nsprpub/config/FreeBSD.mk \
@${PERL} -pi -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 '/accessibility.typeaheadfind.enablesound/s/true/false/' \
@${PERL} -pi -e 's|libesd\.so\.0|${ESD_LIB}|g' \
${WRKSRC}/widget/src/gtk2/nsSound.cpp
@${REINPLACE_CMD} -e \
'/accessibility.typeaheadfind.enablesound/s/true/false/' \
${WRKSRC}/modules/libpref/src/init/all.js \
${WRKSRC}/browser/app/profile/all.js \
${WRKSRC}/calendar/sunbird/app/profile/all.js
pre-install:
${RM} -fr ${LOCAL_PREFIX}
-${MKDIR} ${PLUGINSDIR}
@${RM} -rf ${FAKEDIR} ${PLIST}
@${MKDIR} ${FAKEDIR} ${FAKEDIR}/lib/browser_plugins
@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
Makefile ${MAKE_ARGS} install
.if !defined (WITH_HEADERS)
@${RM} -fr ${FAKEDIR}/share/idl ${FAKEDIR}/include
.endif
.for ii in firefox Firefox firefox-config ${EXTRA_SCRIPTS}
@${ECHO_CMD} bin/${ii} >> ${PLIST}
.endfor
@cd ${FAKEDIR}; ${FIND} * ! -type d | ${SORT} >>${PLIST}; \
${FIND} * -type d -empty | ${SORT} | ${SED} -e \
"s:^:@exec ${MKDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \
${FIND} * -type d -empty | ${SORT} -r | ${SED} -e \
"s:^:@unexec ${RMDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \
${FIND} * -type d ! -empty | ${SORT} -r | ${SED} -e "s:^:@dirrm :" | \
${GREP} / >> ${PLIST}
do-install:
cd ${FAKEDIR} && ${FIND} * | ${CPIO} -dmp --quiet ${PREFIX}
post-install:
.for i in ${EXTRA_SCRIPTS}
${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin
.endfor # i in ${EXTRA_SCRIPTS}
${RM} -f ${PREFIX}/bin/firebird
${LN} -s ${LOCAL_PREFIX}/bin/MozillaFirebird \
${PREFIX}/bin/firebird
${RM} -f ${PREFIX}/bin/MozillaFirebird
${LN} -s ${LOCAL_PREFIX}/bin/MozillaFirebird \
${PREFIX}/bin/MozillaFirebird
${RM} -f ${PREFIX}/bin/firebird-config
${LN} -s ${LOCAL_PREFIX}/bin/mozilla-config \
${PREFIX}/bin/firebird-config
-${RM} -f ${PLUGINSDIR}/libjavaplugin_oji.so
.endfor
.for ii in f F
${RM} -f ${PREFIX}/bin/${ii}irefox
${LN} -sf ${LOCAL_PREFIX}/bin/firefox ${PREFIX}/bin/${ii}irefox
.endfor
${RM} -f ${PREFIX}/bin/firefox-config
${LN} -sf ${LOCAL_PREFIX}/bin/mozilla-config \
${PREFIX}/bin/firefox-config
${RM} -f ${PLUGINSDIR}/libjavaplugin_oji.so
-${LN} -sf \
${JREDIR}/plugin/${ARCH}/ns600/libjavaplugin_oji.so \
${PLUGINSDIR}/libjavaplugin_oji.so
${RM} -fr ${LOCAL_PREFIX}/share/idl
${RM} -fr ${LOCAL_PREFIX}/include
cons-plist:
-${RM} -f ${PLIST}
${TOUCH} ${PLIST}
${ECHO_CMD} bin/firebird >>${PLIST}
${ECHO_CMD} bin/MozillaFirebird >>${PLIST}
${ECHO_CMD} bin/firebird-config >>${PLIST}
.for i in ${EXTRA_SCRIPTS}
${ECHO_CMD} bin/${i} >>${PLIST}
.endfor # i in ${EXTRA_SCRIPTS}
cd ${PREFIX}; \
${FIND} ${LOCAL_SUBDIR} ! -type d | ${SORT} >>${PLIST}; \
${FIND} ${LOCAL_SUBDIR} -type d -empty | ${SORT} \
| ${SED} -e "s:^:@exec ${MKDIR} %D/:" -e "s:$$: || true:" \
>> ${PLIST}; \
${FIND} ${LOCAL_SUBDIR} -type d -empty | ${SORT} -r \
| ${SED} -e "s:^:@unexec ${RMDIR} %D/:" -e "s:$$: || true:" \
>> ${PLIST}; \
${FIND} ${LOCAL_SUBDIR} -type d ! -empty | ${SORT} -r \
| ${SED} -e "s:^:@dirrm :" >> ${PLIST}
.include <bsd.port.post.mk>

4
www/firefox-devel/distinfo
View File

@ -1,2 +1,2 @@
$FreeBSD$
MD5 (MozillaFirebird-source-0.7.tar.gz) = 35112566a3dca5bdf363972056afc462
MD5 (firefox-source-0.8.tar.bz2) = cdc85152f4219bf3e3f1a8dc46e04654
SIZE (firefox-source-0.8.tar.bz2) = 31102943

4
www/firefox-devel/files/firebird.rb → www/firefox-devel/files/firefox.rb
View File

@ -68,10 +68,10 @@ end
IO::popen("xwininfo -display #{$display} -root -tree") {
|io|
if NAME != "firebird"
if NAME != "firefox"
$windows = io.grep(%r<"Mozilla"\s+"navigator:\s*browser">)
else
$windows = io.grep(%r<MozillaFirebird-bin.*>)
$windows = io.grep(%r<MozillaFirefox-bin.*>)
end
}

6
www/firefox-devel/files/mkdistfile
View File

@ -1,7 +1,7 @@
#!/bin/sh
# -*-shell-script-*-
#
# mkdistfile -- maintainer's utility to make a firebird distfile
# mkdistfile -- maintainer's utility to make a firefox distfile
#
# Copyright (c) 2002, Alan Eldridge
# All rights reserved.
@ -165,7 +165,7 @@ 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 firebird-$REV.tar.bz2 ..."
tar -cjpf firebird-$REV.tar.bz2 mozilla
status "making firefox-$REV.tar.bz2 ..."
tar -cjpf firefox-$REV.tar.bz2 mozilla
status "done."
#EOF

3
www/firefox-devel/files/mozconfig.in
View File

@ -43,13 +43,14 @@ ac_add_options --disable-ldap
ac_add_options --disable-pedantic
ac_add_options --disable-profilesharing
ac_add_options --disable-installer
ac_add_options --enable-extensions=cookie,xml-rpc,xmlextras,p3p,pref,transformiix,universalchardet,typeaheadfind,webservices
ac_add_options --enable-extensions=cookie,xml-rpc,xmlextras,p3p,pref,transformiix,universalchardet,typeaheadfind,webservices,inspector
######################################################################
# conditional from port Makefile
if test -n "$WITH_DEBUG"; then
ac_add_options --enable-debug
else
ac_add_options --disable-debug
ac_add_options --enable-optimize
fi # test -n "$WITH_DEBUG"
if test -n "$WITH_LOGGING"; then
ac_add_options --enable-logging

2
www/firefox-devel/files/patch-Double.cpp
View File

@ -1,3 +1,5 @@
$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 @@

27
www/firefox-devel/files/patch-build_unix_run-mozilla.sh
View File

@ -1,30 +1,13 @@
--- build/unix/run-mozilla.sh.orig Fri Apr 18 23:12:28 2003
+++ build/unix/run-mozilla.sh Sat May 31 19:03:29 2003
$FreeBSD$
--- build/unix/run-mozilla.sh.orig Mon Feb 9 19:25:14 2004
+++ build/unix/run-mozilla.sh Mon Feb 9 21:18:11 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"}
+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"}
@@ -402,7 +402,7 @@
fi
fi
# Font path for Xft
-FONTCONFIG_PATH="/etc/fonts:${MOZILLA_FIVE_HOME}/res/Xft"
+FONTCONFIG_PATH="%%PREFIX%%/etc/fonts:${MOZILLA_FIVE_HOME}/res/Xft"
export FONTCONFIG_PATH
if [ "$moz_debug" -eq 1 ]
@@ -445,6 +445,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

2
www/firefox-devel/files/patch-config-mkdepend-imakemdep.h
View File

@ -1,3 +1,5 @@
$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 @@

2
www/firefox-devel/files/patch-config-rules.mk
View File

@ -1,3 +1,5 @@
$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 @@

57
www/firefox-devel/files/patch-config_preprocess.pl
View File

@ -1,57 +0,0 @@
$FreeBSD$
--- config/preprocessor.pl.orig Tue Sep 2 17:53:55 2003
+++ config/preprocessor.pl Sat Oct 18 23:00:35 2003
@@ -73,16 +73,39 @@
########################################################################
package main;
-use File::Spec 0.8;
+use File::Spec;
use File::Spec::Unix; # on all platforms, because the #include syntax is unix-based
+use File::Basename;
+use Cwd;
+
+# This code is taken from File::Spec::Unix 0.8.
+sub rel2abs {
+ my ($path, $base) = @_;
+
+ if ( ! File::Spec->file_name_is_absolute( $path ) ) {
+ if ( !defined( $base ) || $base eq '' ) {
+ $base = cwd() ;
+ }
+ elsif ( ! File::Spec->file_name_is_absolute( $base ) ) {
+ $base = rel2abs( $base );
+ }
+ else {
+ $base = File::Spec->canonpath( $base );
+ }
+
+ $path = File::Spec->catdir( $base, $path );
+ }
+
+ return File::Spec->canonpath( $path );
+}
+# End code from File::Spec::Unix
sub include {
my($stack, $filename) = @_;
my $directory = $stack->{'variables'}->{'DIRECTORY'};
if ($filename ne '-') {
- $filename = File::Spec->rel2abs($filename, $directory);
- my($volume, $path) = File::Spec->splitpath($filename);
- $directory = File::Spec->catpath($volume, $path, '');
+ $filename = rel2abs($filename, $directory);
+ $directory = File::Spec->catdir(File::Basename::dirname($filename));
}
local $stack->{'variables'}->{'DIRECTORY'} = $directory;
local $stack->{'variables'}->{'FILE'} = $filename;
@@ -376,7 +399,7 @@
my $stack = shift;
return if $stack->disabled;
die "argument expected\n" unless @_;
- main::include($stack, File::Spec->catpath(File::Spec::Unix->splitpath(@_)));
+ main::include($stack, File::Spec->catfile(File::Basename::dirname(@_), File::Basename::basename(@_)));
}
sub filter {

2
www/firefox-devel/files/patch-directory-c-sdk-ldap-libraries-liblber-lber-int.h
View File

@ -1,3 +1,5 @@
$FreeBSD$
--- directory/c-sdk/ldap/libraries/liblber/lber-int.h Tue Mar 26 13:53:23 2002
+++ directory/c-sdk/ldap/libraries/liblber/lber-int.h Sat Dec 13 13:02:49 2003
@@ -236,15 +236,15 @@

48
www/firefox-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp Normal file
View File

@ -0,0 +1,48 @@
$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");

14
www/firefox-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h Normal file
View File

@ -0,0 +1,14 @@
$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);

57
www/firefox-devel/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp
View File

@ -1,57 +0,0 @@
--- gfx/src/gtk/nsFontMetricsXft.cpp.save Thu Aug 7 12:14:49 2003
+++ gfx/src/gtk/nsFontMetricsXft.cpp Thu Aug 7 12:33:45 2003
@@ -106,6 +106,7 @@
FcPattern *mPattern;
FcPattern *mFontName;
FcCharSet *mCharset;
+ int mNotXft;
};
class nsFontXftInfo;
@@ -1051,7 +1052,7 @@
// font in our loaded list that supports the character
for (PRInt32 i = 0, end = mLoadedFonts.Count(); i < end; ++i) {
nsFontXft *font = (nsFontXft *)mLoadedFonts.ElementAt(i);
- if (font->HasChar(PRUint32(aChar)))
+ if (font->HasChar(PRUint32(aChar)) && font->GetXftFont())
return font;
}
@@ -1492,7 +1493,7 @@
// this character.
for (PRInt32 j = 0, end = mLoadedFonts.Count(); j < end; ++j) {
font = (nsFontXft *)mLoadedFonts.ElementAt(j);
- if (font->HasChar(c)) {
+ if (font->HasChar(c) && font->GetXftFont()) {
currFont = font;
goto FoundFont; // for speed -- avoid "if" statement
}
@@ -1922,6 +1923,7 @@
FcPatternReference(mFontName);
mXftFont = nsnull;
+ mNotXft = 0;
// set up our charset
mCharset = nsnull;
@@ -1948,7 +1950,7 @@
XftFont *
nsFontXft::GetXftFont(void)
{
- if (!mXftFont) {
+ if (!mXftFont && !mNotXft) {
FcPattern *pat = FcFontRenderPrepare(0, mPattern, mFontName);
if (!pat)
return nsnull;
@@ -1967,8 +1969,10 @@
FcPatternDel(pat, FC_SPACING);
mXftFont = XftFontOpenPattern(GDK_DISPLAY(), pat);
- if (!mXftFont)
+ if (!mXftFont) {
FcPatternDestroy(pat);
+ mNotXft = 1;
+ }
}
return mXftFont;

2
www/firefox-devel/files/patch-nspr-unix.c
View File

@ -1,3 +1,5 @@
$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 @@

2
www/firefox-devel/files/patch-nsprpub-pr-include-md-_freebsd.cfg
View File

@ -1,3 +1,5 @@
$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 @@

14
www/firefox-devel/files/patch-nsprpub-pr-include-md-_freebsd.h
View File

@ -1,11 +1,11 @@
--- nsprpub/pr/include/md/_freebsd.h.orig Thu Jan 16 15:09:12 2003
+++ nsprpub/pr/include/md/_freebsd.h Sun Feb 1 15:21:56 2004
@@ -48,6 +48,12 @@
#define _PR_SI_ARCHITECTURE "x86"
#elif defined(__alpha)
$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(__sparc__)
#define _PR_SI_ARCHITECTURE "sparc"
+#elif defined(__ia64__)
+#define _PR_SI_ARCHITECTURE "ia64"
+#elif defined(__amd64__)

2
www/firefox-devel/files/patch-nsprpub-pr-src-io-prprf.c
View File

@ -1,3 +1,5 @@
$FreeBSD$
--- nsprpub/pr/src/io/prprf.c Wed Feb 26 15:53:42 2003
+++ nsprpub/pr/src/io/prprf.c Thu Oct 16 22:50:40 2003
@@ -52,5 +52,8 @@

11
www/firefox-devel/files/patch-nsprpub-pr-src-misc-prtime.c
View File

@ -1,11 +0,0 @@
--- nsprpub/pr/src/misc/prtime.c.orig Thu Feb 27 01:01:02 2003
+++ nsprpub/pr/src/misc/prtime.c Thu May 22 16:46:49 2003
@@ -1666,7 +1666,7 @@
*/
#if defined(SUNOS4) || (__GLIBC__ >= 2) || defined(XP_BEOS) \
- || defined(NETBSD)
+ || defined(NETBSD) || defined(__FreeBSD__)
a.tm_zone = NULL;
a.tm_gmtoff = tm->tm_params.tp_gmt_offset + tm->tm_params.tp_dst_offset;
#endif

2
www/firefox-devel/files/patch-security-coreconf-FreeBSD.mk
View File

@ -1,3 +1,5 @@
$FreeBSD$
--- 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 @@

72
www/firefox-devel/files/patch-typeaheadfind-nosound
View File

@ -1,72 +0,0 @@
--- extensions/typeaheadfind/src/nsTypeAheadFind.cpp.orig Sun Feb 8 01:13:31 2004
+++ extensions/typeaheadfind/src/nsTypeAheadFind.cpp Sun Feb 8 01:19:17 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) {
prefBranch->GetCharPref("accessibility.typeaheadfind.soundURL",
getter_Copies(soundStr));
}
@@ -612,7 +612,7 @@
return NS_OK;
}
- if (!mIsSoundInitialized) {
+ if (!mIsSoundInitialized && mIsSoundEnabled) {
// This makes sure system sound library is loaded so that
// there's no lag before the first sound is played
// by waiting for the first keystroke, we still get the startup time benefits.
@@ -760,11 +760,13 @@
// It keeps us from accidentally hitting backspace too many times and
// going back in history when we really just wanted to clear
// the find string.
+ if (mIsSoundEnabled) {
nsCOMPtr<nsISound> soundInterface =
do_CreateInstance("@mozilla.org/sound;1");
if (soundInterface) {
soundInterface->Beep(); // beep to warn
}
+ }
mIsBackspaceProtectOn = PR_FALSE;
}
else {
@@ -1009,7 +1011,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
@@ -1056,7 +1060,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");
--- extensions/typeaheadfind/src/nsTypeAheadFind.h.orig Sun Feb 8 01:11:53 2004
+++ extensions/typeaheadfind/src/nsTypeAheadFind.h Sun Feb 8 01:19:29 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);

2
www/firefox-devel/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
View File

@ -1,3 +1,5 @@
$FreeBSD$
--- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Sun Feb 1 15:39:59 2004
+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Sun Feb 1 15:40:11 2004
@@ -8,7 +8,7 @@

2
www/firefox-devel/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in
View File

@ -1,3 +1,5 @@
$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 @@

2
www/firefox-devel/files/patch-xptcall-alpha
View File

@ -1,3 +1,5 @@
$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 @@

2
www/firefox-devel/files/patch-xptcall-amd64
View File

@ -1,3 +1,5 @@
$FreeBSD$
--- /dev/null Wed Dec 31 16:00:00 1969
+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_amd64_freebsd.cpp Thu Oct 16 22:59:43 2003
@@ -0,0 +1,174 @@

2
www/firefox-devel/files/patch-xptcall-ia64
View File

@ -1,3 +1,5 @@
$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 @@

2
www/firefox-devel/files/patch-xptcall-sparc64
View File

@ -1,3 +1,5 @@
$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 @@

6
www/firefox-devel/pkg-descr
View File

@ -1,6 +1,6 @@
Mozilla Firebird is the next generation browser from the Mozilla project. See
the Mozilla Firebird project page for more details.
Mozilla Firefox is the next-generation browser from the Mozilla project. See
its home page for more details.
WWW: http://www.mozilla.org/projects/firebird/
WWW: http://www.mozilla.org/products/firefox/
-- AlanE <alane@freebsd.org>

6
www/firefox-devel/pkg-message
View File

@ -6,14 +6,14 @@ bug reports to any other addresses.
Please include the following information with any bug report:
* Output from 'uname -a'.
* Date/time stamp from www/mozilla-firebird/Makefile.
* Date/time stamp from www/firefox/Makefile.
* Perl version used (/usr/bin/perl --version or
/usr/local/bin/perl --version for -current).
* Where/when did the problem occur: configuring, building, or
running mozilla-firebird?
running firefox
* How can you reproduce the problem?
Thank you for your help in testing and reporting bugs, and we hope you
enjoy using Firebird.
enjoy using Firefox.
The Maintainers (gnome@)
======================================================================

3386
www/firefox-devel/pkg-plist
View File

File diff suppressed because it is too large Load Diff

134
www/firefox-esr/Makefile
View File

@ -1,18 +1,16 @@
# New ports collection makefile for: mozilla-firebird
# Date created: May 31, 2003
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
# New ports collection makefile for: phoenix
# Date created: 2002/10/21
# Whom: Alan Eldridge <alane@FreeBSD.org>
#
# $FreeBSD$
#
PORTNAME= firebird
PORTVERSION= 0.7
PORTREVISION= 3
PORTNAME= firefox
PORTVERSION= 0.8
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= firebird/releases/${PORTVERSION}
PKGNAMEPREFIX= mozilla-
DISTNAME= MozillaFirebird-source-${PORTVERSION}
MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${PORTVERSION}
DISTNAME= ${PORTNAME}-source-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
COMMENT= Web browser based on the browser portion of Mozilla
@ -25,33 +23,34 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \
freetype-config:${PORTSDIR}/print/freetype2
CONFIGURE_ENV= WITH_GTK2=yes
USE_X_PREFIX= yes
ALL_TARGET= default
USE_ICONV= yes
CONFIGURE_ENV= WITH_GTK2=yes
FAKEDIR= ${WRKDIR}/fake
FAKESUBDIR= ${FAKEDIR}/lib/${PORTNAME}
HAS_CONFIGURE= yes
JREDIR= ${LOCALBASE}/jdk1.3.1/jre
ESD_LIB= libesd.so.2
LOCAL_PREFIX= ${PREFIX}/lib/${PORTNAME}
NO_MTREE= yes
PLIST= ${WRKDIR}/plist
PLUGINSDIR= ${PREFIX}lib/browser_plugins
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gtk20 libidl
USE_ICONV= yes
USE_PERL5= yes
USE_REINPLACE= yes
HAS_CONFIGURE= yes
USE_X_PREFIX= yes
WRKSRC= ${WRKDIR}/mozilla
NO_MTREE= yes
WRKSRC= ${WRKDIR}/mozilla
LOCAL_SUBDIR= lib/${PORTNAME}
LOCAL_PREFIX= ${PREFIX}/${LOCAL_SUBDIR}
JREDIR= ${LOCALBASE}/jdk1.3.1/jre
PLUGINSDIR= ${PREFIX}/lib/browser_plugins
OPTIONS= DEBUG "Build a debugging image" off \
HEADERS "Install headers and IDL files" off \
LOGGING "Enable additional log messages" off \
OPTIMIZED_CFLAGS "Enable some additional optimizations" off \
XFT "Enable support for anti-aliased fonts" on
.include <bsd.port.pre.mk>
#.if ${PERL_LEVEL} < 500601
#.undef NO_IGNORE
#BROKEN= Mozilla Firebird only supports the ports versions of Perl.
#BROKEN+=If you have installed a Perl port, and are getting this message,
#BROKEN+=please make sure you have given the command \'use.perl port\'.
#.endif # ${PERL_LEVEL} < 500601
.if defined(WITH_DEBUG)
WITH_LOGGING= yes
CONFIGURE_ENV+= WITH_DEBUG=yes
@ -76,7 +75,7 @@ CFLAGS+= ${PTHREAD_CFLAGS}
LDFLAGS+= -L${X11BASE}/lib
LIBS+= ${PTHREAD_LIBS}
EXTRA_SCRIPTS= firebird.rb
EXTRA_SCRIPTS= ${PORTNAME}.rb
.if ${ARCH} == "alpha" && ${OSVERSION} < 500035
IGNORE= "core dumps on alpha during post-build"
@ -94,67 +93,64 @@ post-extract::
-e 's|@LIBS@|${LIBS}|' \
-e 's|@X11BASE@|${X11BASE}|' \
-e 's|@LOCALBASE@|${LOCALBASE}|' \
-e 's|@PREFIX@|${LOCAL_PREFIX}|' \
-e 's|@PREFIX@|${FAKEDIR}/lib/firefox|' \
-e 's|@PERL@|${PERL5}|' \
<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
post-patch:
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' \
${WRKSRC}/build/unix/run-mozilla.sh
@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g' \
@${PERL} -pi -e 's|-lc_r|${PTHREAD_LIBS}|g' \
${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
${WRKSRC}/nsprpub/config/FreeBSD.mk \
@${PERL} -pi -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 '/accessibility.typeaheadfind.enablesound/s/true/false/' \
@${PERL} -pi -e 's|libesd\.so\.0|${ESD_LIB}|g' \
${WRKSRC}/widget/src/gtk2/nsSound.cpp
@${REINPLACE_CMD} -e \
'/accessibility.typeaheadfind.enablesound/s/true/false/' \
${WRKSRC}/modules/libpref/src/init/all.js \
${WRKSRC}/browser/app/profile/all.js \
${WRKSRC}/calendar/sunbird/app/profile/all.js
pre-install:
${RM} -fr ${LOCAL_PREFIX}
-${MKDIR} ${PLUGINSDIR}
@${RM} -rf ${FAKEDIR} ${PLIST}
@${MKDIR} ${FAKEDIR} ${FAKEDIR}/lib/browser_plugins
@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
Makefile ${MAKE_ARGS} install
.if !defined (WITH_HEADERS)
@${RM} -fr ${FAKEDIR}/share/idl ${FAKEDIR}/include
.endif
.for ii in firefox Firefox firefox-config ${EXTRA_SCRIPTS}
@${ECHO_CMD} bin/${ii} >> ${PLIST}
.endfor
@cd ${FAKEDIR}; ${FIND} * ! -type d | ${SORT} >>${PLIST}; \
${FIND} * -type d -empty | ${SORT} | ${SED} -e \
"s:^:@exec ${MKDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \
${FIND} * -type d -empty | ${SORT} -r | ${SED} -e \
"s:^:@unexec ${RMDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \
${FIND} * -type d ! -empty | ${SORT} -r | ${SED} -e "s:^:@dirrm :" | \
${GREP} / >> ${PLIST}
do-install:
cd ${FAKEDIR} && ${FIND} * | ${CPIO} -dmp --quiet ${PREFIX}
post-install:
.for i in ${EXTRA_SCRIPTS}
${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin
.endfor # i in ${EXTRA_SCRIPTS}
${RM} -f ${PREFIX}/bin/firebird
${LN} -s ${LOCAL_PREFIX}/bin/MozillaFirebird \
${PREFIX}/bin/firebird
${RM} -f ${PREFIX}/bin/MozillaFirebird
${LN} -s ${LOCAL_PREFIX}/bin/MozillaFirebird \
${PREFIX}/bin/MozillaFirebird
${RM} -f ${PREFIX}/bin/firebird-config
${LN} -s ${LOCAL_PREFIX}/bin/mozilla-config \
${PREFIX}/bin/firebird-config
-${RM} -f ${PLUGINSDIR}/libjavaplugin_oji.so
.endfor
.for ii in f F
${RM} -f ${PREFIX}/bin/${ii}irefox
${LN} -sf ${LOCAL_PREFIX}/bin/firefox ${PREFIX}/bin/${ii}irefox
.endfor
${RM} -f ${PREFIX}/bin/firefox-config
${LN} -sf ${LOCAL_PREFIX}/bin/mozilla-config \
${PREFIX}/bin/firefox-config
${RM} -f ${PLUGINSDIR}/libjavaplugin_oji.so
-${LN} -sf \
${JREDIR}/plugin/${ARCH}/ns600/libjavaplugin_oji.so \
${PLUGINSDIR}/libjavaplugin_oji.so
${RM} -fr ${LOCAL_PREFIX}/share/idl
${RM} -fr ${LOCAL_PREFIX}/include
cons-plist:
-${RM} -f ${PLIST}
${TOUCH} ${PLIST}
${ECHO_CMD} bin/firebird >>${PLIST}
${ECHO_CMD} bin/MozillaFirebird >>${PLIST}
${ECHO_CMD} bin/firebird-config >>${PLIST}
.for i in ${EXTRA_SCRIPTS}
${ECHO_CMD} bin/${i} >>${PLIST}
.endfor # i in ${EXTRA_SCRIPTS}
cd ${PREFIX}; \
${FIND} ${LOCAL_SUBDIR} ! -type d | ${SORT} >>${PLIST}; \
${FIND} ${LOCAL_SUBDIR} -type d -empty | ${SORT} \
| ${SED} -e "s:^:@exec ${MKDIR} %D/:" -e "s:$$: || true:" \
>> ${PLIST}; \
${FIND} ${LOCAL_SUBDIR} -type d -empty | ${SORT} -r \
| ${SED} -e "s:^:@unexec ${RMDIR} %D/:" -e "s:$$: || true:" \
>> ${PLIST}; \
${FIND} ${LOCAL_SUBDIR} -type d ! -empty | ${SORT} -r \
| ${SED} -e "s:^:@dirrm :" >> ${PLIST}
.include <bsd.port.post.mk>

4
www/firefox-esr/distinfo
View File

@ -1,2 +1,2 @@
$FreeBSD$
MD5 (MozillaFirebird-source-0.7.tar.gz) = 35112566a3dca5bdf363972056afc462
MD5 (firefox-source-0.8.tar.bz2) = cdc85152f4219bf3e3f1a8dc46e04654
SIZE (firefox-source-0.8.tar.bz2) = 31102943

4
www/firefox/files/firebird.rb → www/firefox-esr/files/firefox.rb
View File

@ -68,10 +68,10 @@ end
IO::popen("xwininfo -display #{$display} -root -tree") {
|io|
if NAME != "firebird"
if NAME != "firefox"
$windows = io.grep(%r<"Mozilla"\s+"navigator:\s*browser">)
else
$windows = io.grep(%r<MozillaFirebird-bin.*>)
$windows = io.grep(%r<MozillaFirefox-bin.*>)
end
}

6
www/firefox-esr/files/mkdistfile
View File

@ -1,7 +1,7 @@
#!/bin/sh
# -*-shell-script-*-
#
# mkdistfile -- maintainer's utility to make a firebird distfile
# mkdistfile -- maintainer's utility to make a firefox distfile
#
# Copyright (c) 2002, Alan Eldridge
# All rights reserved.
@ -165,7 +165,7 @@ 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 firebird-$REV.tar.bz2 ..."
tar -cjpf firebird-$REV.tar.bz2 mozilla
status "making firefox-$REV.tar.bz2 ..."
tar -cjpf firefox-$REV.tar.bz2 mozilla
status "done."
#EOF

3
www/firefox-esr/files/mozconfig.in
View File

@ -43,13 +43,14 @@ ac_add_options --disable-ldap
ac_add_options --disable-pedantic
ac_add_options --disable-profilesharing
ac_add_options --disable-installer
ac_add_options --enable-extensions=cookie,xml-rpc,xmlextras,p3p,pref,transformiix,universalchardet,typeaheadfind,webservices
ac_add_options --enable-extensions=cookie,xml-rpc,xmlextras,p3p,pref,transformiix,universalchardet,typeaheadfind,webservices,inspector
######################################################################
# conditional from port Makefile
if test -n "$WITH_DEBUG"; then
ac_add_options --enable-debug
else
ac_add_options --disable-debug
ac_add_options --enable-optimize
fi # test -n "$WITH_DEBUG"
if test -n "$WITH_LOGGING"; then
ac_add_options --enable-logging

2
www/firefox-esr/files/patch-Double.cpp
View File

@ -1,3 +1,5 @@
$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 @@

27
www/firefox-esr/files/patch-build_unix_run-mozilla.sh
View File

@ -1,30 +1,13 @@
--- build/unix/run-mozilla.sh.orig Fri Apr 18 23:12:28 2003
+++ build/unix/run-mozilla.sh Sat May 31 19:03:29 2003
$FreeBSD$
--- build/unix/run-mozilla.sh.orig Mon Feb 9 19:25:14 2004
+++ build/unix/run-mozilla.sh Mon Feb 9 21:18:11 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"}
+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"}
@@ -402,7 +402,7 @@
fi
fi
# Font path for Xft
-FONTCONFIG_PATH="/etc/fonts:${MOZILLA_FIVE_HOME}/res/Xft"
+FONTCONFIG_PATH="%%PREFIX%%/etc/fonts:${MOZILLA_FIVE_HOME}/res/Xft"
export FONTCONFIG_PATH
if [ "$moz_debug" -eq 1 ]
@@ -445,6 +445,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

2
www/firefox-esr/files/patch-config-mkdepend-imakemdep.h
View File

@ -1,3 +1,5 @@
$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 @@

2
www/firefox-esr/files/patch-config-rules.mk
View File

@ -1,3 +1,5 @@
$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 @@

57
www/firefox-esr/files/patch-config_preprocess.pl
View File

@ -1,57 +0,0 @@
$FreeBSD$
--- config/preprocessor.pl.orig Tue Sep 2 17:53:55 2003
+++ config/preprocessor.pl Sat Oct 18 23:00:35 2003
@@ -73,16 +73,39 @@
########################################################################
package main;
-use File::Spec 0.8;
+use File::Spec;
use File::Spec::Unix; # on all platforms, because the #include syntax is unix-based
+use File::Basename;
+use Cwd;
+
+# This code is taken from File::Spec::Unix 0.8.
+sub rel2abs {
+ my ($path, $base) = @_;
+
+ if ( ! File::Spec->file_name_is_absolute( $path ) ) {
+ if ( !defined( $base ) || $base eq '' ) {
+ $base = cwd() ;
+ }
+ elsif ( ! File::Spec->file_name_is_absolute( $base ) ) {
+ $base = rel2abs( $base );
+ }
+ else {
+ $base = File::Spec->canonpath( $base );
+ }
+
+ $path = File::Spec->catdir( $base, $path );
+ }
+
+ return File::Spec->canonpath( $path );
+}
+# End code from File::Spec::Unix
sub include {
my($stack, $filename) = @_;
my $directory = $stack->{'variables'}->{'DIRECTORY'};
if ($filename ne '-') {
- $filename = File::Spec->rel2abs($filename, $directory);
- my($volume, $path) = File::Spec->splitpath($filename);
- $directory = File::Spec->catpath($volume, $path, '');
+ $filename = rel2abs($filename, $directory);
+ $directory = File::Spec->catdir(File::Basename::dirname($filename));
}
local $stack->{'variables'}->{'DIRECTORY'} = $directory;
local $stack->{'variables'}->{'FILE'} = $filename;
@@ -376,7 +399,7 @@
my $stack = shift;
return if $stack->disabled;
die "argument expected\n" unless @_;
- main::include($stack, File::Spec->catpath(File::Spec::Unix->splitpath(@_)));
+ main::include($stack, File::Spec->catfile(File::Basename::dirname(@_), File::Basename::basename(@_)));
}
sub filter {

2
www/firefox-esr/files/patch-directory-c-sdk-ldap-libraries-liblber-lber-int.h
View File

@ -1,3 +1,5 @@
$FreeBSD$
--- directory/c-sdk/ldap/libraries/liblber/lber-int.h Tue Mar 26 13:53:23 2002
+++ directory/c-sdk/ldap/libraries/liblber/lber-int.h Sat Dec 13 13:02:49 2003
@@ -236,15 +236,15 @@

48
www/firefox-esr/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp Normal file
View File

@ -0,0 +1,48 @@
$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");

14
www/firefox-esr/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h Normal file
View File

@ -0,0 +1,14 @@
$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);

57
www/firefox-esr/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp
View File

@ -1,57 +0,0 @@
--- gfx/src/gtk/nsFontMetricsXft.cpp.save Thu Aug 7 12:14:49 2003
+++ gfx/src/gtk/nsFontMetricsXft.cpp Thu Aug 7 12:33:45 2003
@@ -106,6 +106,7 @@
FcPattern *mPattern;
FcPattern *mFontName;
FcCharSet *mCharset;
+ int mNotXft;
};
class nsFontXftInfo;
@@ -1051,7 +1052,7 @@
// font in our loaded list that supports the character
for (PRInt32 i = 0, end = mLoadedFonts.Count(); i < end; ++i) {
nsFontXft *font = (nsFontXft *)mLoadedFonts.ElementAt(i);
- if (font->HasChar(PRUint32(aChar)))
+ if (font->HasChar(PRUint32(aChar)) && font->GetXftFont())
return font;
}
@@ -1492,7 +1493,7 @@
// this character.
for (PRInt32 j = 0, end = mLoadedFonts.Count(); j < end; ++j) {
font = (nsFontXft *)mLoadedFonts.ElementAt(j);
- if (font->HasChar(c)) {
+ if (font->HasChar(c) && font->GetXftFont()) {
currFont = font;
goto FoundFont; // for speed -- avoid "if" statement
}
@@ -1922,6 +1923,7 @@
FcPatternReference(mFontName);
mXftFont = nsnull;
+ mNotXft = 0;
// set up our charset
mCharset = nsnull;
@@ -1948,7 +1950,7 @@
XftFont *
nsFontXft::GetXftFont(void)
{
- if (!mXftFont) {
+ if (!mXftFont && !mNotXft) {
FcPattern *pat = FcFontRenderPrepare(0, mPattern, mFontName);
if (!pat)
return nsnull;
@@ -1967,8 +1969,10 @@
FcPatternDel(pat, FC_SPACING);
mXftFont = XftFontOpenPattern(GDK_DISPLAY(), pat);
- if (!mXftFont)
+ if (!mXftFont) {
FcPatternDestroy(pat);
+ mNotXft = 1;
+ }
}
return mXftFont;

2
www/firefox-esr/files/patch-nspr-unix.c
View File

@ -1,3 +1,5 @@
$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 @@

2
www/firefox-esr/files/patch-nsprpub-pr-include-md-_freebsd.cfg
View File

@ -1,3 +1,5 @@
$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 @@

14
www/firefox-esr/files/patch-nsprpub-pr-include-md-_freebsd.h
View File

@ -1,11 +1,11 @@
--- nsprpub/pr/include/md/_freebsd.h.orig Thu Jan 16 15:09:12 2003
+++ nsprpub/pr/include/md/_freebsd.h Sun Feb 1 15:21:56 2004
@@ -48,6 +48,12 @@
#define _PR_SI_ARCHITECTURE "x86"
#elif defined(__alpha)
$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(__sparc__)
#define _PR_SI_ARCHITECTURE "sparc"
+#elif defined(__ia64__)
+#define _PR_SI_ARCHITECTURE "ia64"
+#elif defined(__amd64__)

2
www/firefox-esr/files/patch-nsprpub-pr-src-io-prprf.c
View File

@ -1,3 +1,5 @@
$FreeBSD$
--- nsprpub/pr/src/io/prprf.c Wed Feb 26 15:53:42 2003
+++ nsprpub/pr/src/io/prprf.c Thu Oct 16 22:50:40 2003
@@ -52,5 +52,8 @@

11
www/firefox-esr/files/patch-nsprpub-pr-src-misc-prtime.c
View File

@ -1,11 +0,0 @@
--- nsprpub/pr/src/misc/prtime.c.orig Thu Feb 27 01:01:02 2003
+++ nsprpub/pr/src/misc/prtime.c Thu May 22 16:46:49 2003
@@ -1666,7 +1666,7 @@
*/
#if defined(SUNOS4) || (__GLIBC__ >= 2) || defined(XP_BEOS) \
- || defined(NETBSD)
+ || defined(NETBSD) || defined(__FreeBSD__)
a.tm_zone = NULL;
a.tm_gmtoff = tm->tm_params.tp_gmt_offset + tm->tm_params.tp_dst_offset;
#endif

2
www/firefox-esr/files/patch-security-coreconf-FreeBSD.mk
View File

@ -1,3 +1,5 @@
$FreeBSD$
--- 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 @@

72
www/firefox-esr/files/patch-typeaheadfind-nosound
View File

@ -1,72 +0,0 @@
--- extensions/typeaheadfind/src/nsTypeAheadFind.cpp.orig Sun Feb 8 01:13:31 2004
+++ extensions/typeaheadfind/src/nsTypeAheadFind.cpp Sun Feb 8 01:19:17 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) {
prefBranch->GetCharPref("accessibility.typeaheadfind.soundURL",
getter_Copies(soundStr));
}
@@ -612,7 +612,7 @@
return NS_OK;
}
- if (!mIsSoundInitialized) {
+ if (!mIsSoundInitialized && mIsSoundEnabled) {
// This makes sure system sound library is loaded so that
// there's no lag before the first sound is played
// by waiting for the first keystroke, we still get the startup time benefits.
@@ -760,11 +760,13 @@
// It keeps us from accidentally hitting backspace too many times and
// going back in history when we really just wanted to clear
// the find string.
+ if (mIsSoundEnabled) {
nsCOMPtr<nsISound> soundInterface =
do_CreateInstance("@mozilla.org/sound;1");
if (soundInterface) {
soundInterface->Beep(); // beep to warn
}
+ }
mIsBackspaceProtectOn = PR_FALSE;
}
else {
@@ -1009,7 +1011,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
@@ -1056,7 +1060,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");
--- extensions/typeaheadfind/src/nsTypeAheadFind.h.orig Sun Feb 8 01:11:53 2004
+++ extensions/typeaheadfind/src/nsTypeAheadFind.h Sun Feb 8 01:19:29 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);

2
www/firefox-esr/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
View File

@ -1,3 +1,5 @@
$FreeBSD$
--- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Sun Feb 1 15:39:59 2004
+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Sun Feb 1 15:40:11 2004
@@ -8,7 +8,7 @@

2
www/firefox-esr/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in
View File

@ -1,3 +1,5 @@
$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 @@

2
www/firefox-esr/files/patch-xptcall-alpha
View File

@ -1,3 +1,5 @@
$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 @@

2
www/firefox-esr/files/patch-xptcall-amd64
View File

@ -1,3 +1,5 @@
$FreeBSD$
--- /dev/null Wed Dec 31 16:00:00 1969
+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_amd64_freebsd.cpp Thu Oct 16 22:59:43 2003
@@ -0,0 +1,174 @@

2
www/firefox-esr/files/patch-xptcall-ia64
View File

@ -1,3 +1,5 @@
$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 @@

2
www/firefox-esr/files/patch-xptcall-sparc64
View File

@ -1,3 +1,5 @@
$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 @@

6
www/firefox-esr/pkg-descr
View File

@ -1,6 +1,6 @@
Mozilla Firebird is the next generation browser from the Mozilla project. See
the Mozilla Firebird project page for more details.
Mozilla Firefox is the next-generation browser from the Mozilla project. See
its home page for more details.
WWW: http://www.mozilla.org/projects/firebird/
WWW: http://www.mozilla.org/products/firefox/
-- AlanE <alane@freebsd.org>

6
www/firefox-esr/pkg-message
View File

@ -6,14 +6,14 @@ bug reports to any other addresses.
Please include the following information with any bug report:
* Output from 'uname -a'.
* Date/time stamp from www/mozilla-firebird/Makefile.
* Date/time stamp from www/firefox/Makefile.
* Perl version used (/usr/bin/perl --version or
/usr/local/bin/perl --version for -current).
* Where/when did the problem occur: configuring, building, or
running mozilla-firebird?
running firefox
* How can you reproduce the problem?
Thank you for your help in testing and reporting bugs, and we hope you
enjoy using Firebird.
enjoy using Firefox.
The Maintainers (gnome@)
======================================================================

3386
www/firefox-esr/pkg-plist
View File

File diff suppressed because it is too large Load Diff

134
www/firefox/Makefile
View File

@ -1,18 +1,16 @@
# New ports collection makefile for: mozilla-firebird
# Date created: May 31, 2003
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
# New ports collection makefile for: phoenix
# Date created: 2002/10/21
# Whom: Alan Eldridge <alane@FreeBSD.org>
#
# $FreeBSD$
#
PORTNAME= firebird
PORTVERSION= 0.7
PORTREVISION= 3
PORTNAME= firefox
PORTVERSION= 0.8
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= firebird/releases/${PORTVERSION}
PKGNAMEPREFIX= mozilla-
DISTNAME= MozillaFirebird-source-${PORTVERSION}
MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${PORTVERSION}
DISTNAME= ${PORTNAME}-source-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
COMMENT= Web browser based on the browser portion of Mozilla
@ -25,33 +23,34 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \
freetype-config:${PORTSDIR}/print/freetype2
CONFIGURE_ENV= WITH_GTK2=yes
USE_X_PREFIX= yes
ALL_TARGET= default
USE_ICONV= yes
CONFIGURE_ENV= WITH_GTK2=yes
FAKEDIR= ${WRKDIR}/fake
FAKESUBDIR= ${FAKEDIR}/lib/${PORTNAME}
HAS_CONFIGURE= yes
JREDIR= ${LOCALBASE}/jdk1.3.1/jre
ESD_LIB= libesd.so.2
LOCAL_PREFIX= ${PREFIX}/lib/${PORTNAME}
NO_MTREE= yes
PLIST= ${WRKDIR}/plist
PLUGINSDIR= ${PREFIX}lib/browser_plugins
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gtk20 libidl
USE_ICONV= yes
USE_PERL5= yes
USE_REINPLACE= yes
HAS_CONFIGURE= yes
USE_X_PREFIX= yes
WRKSRC= ${WRKDIR}/mozilla
NO_MTREE= yes
WRKSRC= ${WRKDIR}/mozilla
LOCAL_SUBDIR= lib/${PORTNAME}
LOCAL_PREFIX= ${PREFIX}/${LOCAL_SUBDIR}
JREDIR= ${LOCALBASE}/jdk1.3.1/jre
PLUGINSDIR= ${PREFIX}/lib/browser_plugins
OPTIONS= DEBUG "Build a debugging image" off \
HEADERS "Install headers and IDL files" off \
LOGGING "Enable additional log messages" off \
OPTIMIZED_CFLAGS "Enable some additional optimizations" off \
XFT "Enable support for anti-aliased fonts" on
.include <bsd.port.pre.mk>
#.if ${PERL_LEVEL} < 500601
#.undef NO_IGNORE
#BROKEN= Mozilla Firebird only supports the ports versions of Perl.
#BROKEN+=If you have installed a Perl port, and are getting this message,
#BROKEN+=please make sure you have given the command \'use.perl port\'.
#.endif # ${PERL_LEVEL} < 500601
.if defined(WITH_DEBUG)
WITH_LOGGING= yes
CONFIGURE_ENV+= WITH_DEBUG=yes
@ -76,7 +75,7 @@ CFLAGS+= ${PTHREAD_CFLAGS}
LDFLAGS+= -L${X11BASE}/lib
LIBS+= ${PTHREAD_LIBS}
EXTRA_SCRIPTS= firebird.rb
EXTRA_SCRIPTS= ${PORTNAME}.rb
.if ${ARCH} == "alpha" && ${OSVERSION} < 500035
IGNORE= "core dumps on alpha during post-build"
@ -94,67 +93,64 @@ post-extract::
-e 's|@LIBS@|${LIBS}|' \
-e 's|@X11BASE@|${X11BASE}|' \
-e 's|@LOCALBASE@|${LOCALBASE}|' \
-e 's|@PREFIX@|${LOCAL_PREFIX}|' \
-e 's|@PREFIX@|${FAKEDIR}/lib/firefox|' \
-e 's|@PERL@|${PERL5}|' \
<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
post-patch:
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' \
${WRKSRC}/build/unix/run-mozilla.sh
@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g' \
@${PERL} -pi -e 's|-lc_r|${PTHREAD_LIBS}|g' \
${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
${WRKSRC}/nsprpub/config/FreeBSD.mk \
@${PERL} -pi -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 '/accessibility.typeaheadfind.enablesound/s/true/false/' \
@${PERL} -pi -e 's|libesd\.so\.0|${ESD_LIB}|g' \
${WRKSRC}/widget/src/gtk2/nsSound.cpp
@${REINPLACE_CMD} -e \
'/accessibility.typeaheadfind.enablesound/s/true/false/' \
${WRKSRC}/modules/libpref/src/init/all.js \
${WRKSRC}/browser/app/profile/all.js \
${WRKSRC}/calendar/sunbird/app/profile/all.js
pre-install:
${RM} -fr ${LOCAL_PREFIX}
-${MKDIR} ${PLUGINSDIR}
@${RM} -rf ${FAKEDIR} ${PLIST}
@${MKDIR} ${FAKEDIR} ${FAKEDIR}/lib/browser_plugins
@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
Makefile ${MAKE_ARGS} install
.if !defined (WITH_HEADERS)
@${RM} -fr ${FAKEDIR}/share/idl ${FAKEDIR}/include
.endif
.for ii in firefox Firefox firefox-config ${EXTRA_SCRIPTS}
@${ECHO_CMD} bin/${ii} >> ${PLIST}
.endfor
@cd ${FAKEDIR}; ${FIND} * ! -type d | ${SORT} >>${PLIST}; \
${FIND} * -type d -empty | ${SORT} | ${SED} -e \
"s:^:@exec ${MKDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \
${FIND} * -type d -empty | ${SORT} -r | ${SED} -e \
"s:^:@unexec ${RMDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \
${FIND} * -type d ! -empty | ${SORT} -r | ${SED} -e "s:^:@dirrm :" | \
${GREP} / >> ${PLIST}
do-install:
cd ${FAKEDIR} && ${FIND} * | ${CPIO} -dmp --quiet ${PREFIX}
post-install:
.for i in ${EXTRA_SCRIPTS}
${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin
.endfor # i in ${EXTRA_SCRIPTS}
${RM} -f ${PREFIX}/bin/firebird
${LN} -s ${LOCAL_PREFIX}/bin/MozillaFirebird \
${PREFIX}/bin/firebird
${RM} -f ${PREFIX}/bin/MozillaFirebird
${LN} -s ${LOCAL_PREFIX}/bin/MozillaFirebird \
${PREFIX}/bin/MozillaFirebird
${RM} -f ${PREFIX}/bin/firebird-config
${LN} -s ${LOCAL_PREFIX}/bin/mozilla-config \
${PREFIX}/bin/firebird-config
-${RM} -f ${PLUGINSDIR}/libjavaplugin_oji.so
.endfor
.for ii in f F
${RM} -f ${PREFIX}/bin/${ii}irefox
${LN} -sf ${LOCAL_PREFIX}/bin/firefox ${PREFIX}/bin/${ii}irefox
.endfor
${RM} -f ${PREFIX}/bin/firefox-config
${LN} -sf ${LOCAL_PREFIX}/bin/mozilla-config \
${PREFIX}/bin/firefox-config
${RM} -f ${PLUGINSDIR}/libjavaplugin_oji.so
-${LN} -sf \
${JREDIR}/plugin/${ARCH}/ns600/libjavaplugin_oji.so \
${PLUGINSDIR}/libjavaplugin_oji.so
${RM} -fr ${LOCAL_PREFIX}/share/idl
${RM} -fr ${LOCAL_PREFIX}/include
cons-plist:
-${RM} -f ${PLIST}
${TOUCH} ${PLIST}
${ECHO_CMD} bin/firebird >>${PLIST}
${ECHO_CMD} bin/MozillaFirebird >>${PLIST}
${ECHO_CMD} bin/firebird-config >>${PLIST}
.for i in ${EXTRA_SCRIPTS}
${ECHO_CMD} bin/${i} >>${PLIST}
.endfor # i in ${EXTRA_SCRIPTS}
cd ${PREFIX}; \
${FIND} ${LOCAL_SUBDIR} ! -type d | ${SORT} >>${PLIST}; \
${FIND} ${LOCAL_SUBDIR} -type d -empty | ${SORT} \
| ${SED} -e "s:^:@exec ${MKDIR} %D/:" -e "s:$$: || true:" \
>> ${PLIST}; \
${FIND} ${LOCAL_SUBDIR} -type d -empty | ${SORT} -r \
| ${SED} -e "s:^:@unexec ${RMDIR} %D/:" -e "s:$$: || true:" \
>> ${PLIST}; \
${FIND} ${LOCAL_SUBDIR} -type d ! -empty | ${SORT} -r \
| ${SED} -e "s:^:@dirrm :" >> ${PLIST}
.include <bsd.port.post.mk>

4
www/firefox/distinfo
View File

@ -1,2 +1,2 @@
$FreeBSD$
MD5 (MozillaFirebird-source-0.7.tar.gz) = 35112566a3dca5bdf363972056afc462
MD5 (firefox-source-0.8.tar.bz2) = cdc85152f4219bf3e3f1a8dc46e04654
SIZE (firefox-source-0.8.tar.bz2) = 31102943

4
www/firefox10/files/firebird.rb → www/firefox/files/firefox.rb
View File

@ -68,10 +68,10 @@ end
IO::popen("xwininfo -display #{$display} -root -tree") {
|io|
if NAME != "firebird"
if NAME != "firefox"
$windows = io.grep(%r<"Mozilla"\s+"navigator:\s*browser">)
else
$windows = io.grep(%r<MozillaFirebird-bin.*>)
$windows = io.grep(%r<MozillaFirefox-bin.*>)
end
}

6
www/firefox/files/mkdistfile
View File

@ -1,7 +1,7 @@
#!/bin/sh
# -*-shell-script-*-
#
# mkdistfile -- maintainer's utility to make a firebird distfile
# mkdistfile -- maintainer's utility to make a firefox distfile
#
# Copyright (c) 2002, Alan Eldridge
# All rights reserved.
@ -165,7 +165,7 @@ 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 firebird-$REV.tar.bz2 ..."
tar -cjpf firebird-$REV.tar.bz2 mozilla
status "making firefox-$REV.tar.bz2 ..."
tar -cjpf firefox-$REV.tar.bz2 mozilla
status "done."
#EOF

3
www/firefox/files/mozconfig.in
View File

@ -43,13 +43,14 @@ ac_add_options --disable-ldap
ac_add_options --disable-pedantic
ac_add_options --disable-profilesharing
ac_add_options --disable-installer
ac_add_options --enable-extensions=cookie,xml-rpc,xmlextras,p3p,pref,transformiix,universalchardet,typeaheadfind,webservices
ac_add_options --enable-extensions=cookie,xml-rpc,xmlextras,p3p,pref,transformiix,universalchardet,typeaheadfind,webservices,inspector
######################################################################
# conditional from port Makefile
if test -n "$WITH_DEBUG"; then
ac_add_options --enable-debug
else
ac_add_options --disable-debug
ac_add_options --enable-optimize
fi # test -n "$WITH_DEBUG"
if test -n "$WITH_LOGGING"; then
ac_add_options --enable-logging

2
www/firefox/files/patch-Double.cpp
View File

@ -1,3 +1,5 @@
$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 @@

27
www/firefox/files/patch-build_unix_run-mozilla.sh
View File

@ -1,30 +1,13 @@
--- build/unix/run-mozilla.sh.orig Fri Apr 18 23:12:28 2003
+++ build/unix/run-mozilla.sh Sat May 31 19:03:29 2003
$FreeBSD$
--- build/unix/run-mozilla.sh.orig Mon Feb 9 19:25:14 2004
+++ build/unix/run-mozilla.sh Mon Feb 9 21:18:11 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"}
+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"}
@@ -402,7 +402,7 @@
fi
fi
# Font path for Xft
-FONTCONFIG_PATH="/etc/fonts:${MOZILLA_FIVE_HOME}/res/Xft"
+FONTCONFIG_PATH="%%PREFIX%%/etc/fonts:${MOZILLA_FIVE_HOME}/res/Xft"
export FONTCONFIG_PATH
if [ "$moz_debug" -eq 1 ]
@@ -445,6 +445,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

2
www/firefox/files/patch-config-mkdepend-imakemdep.h
View File

@ -1,3 +1,5 @@
$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 @@

2
www/firefox/files/patch-config-rules.mk
View File

@ -1,3 +1,5 @@
$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 @@

57
www/firefox/files/patch-config_preprocess.pl
View File

@ -1,57 +0,0 @@
$FreeBSD$
--- config/preprocessor.pl.orig Tue Sep 2 17:53:55 2003
+++ config/preprocessor.pl Sat Oct 18 23:00:35 2003
@@ -73,16 +73,39 @@
########################################################################
package main;
-use File::Spec 0.8;
+use File::Spec;
use File::Spec::Unix; # on all platforms, because the #include syntax is unix-based
+use File::Basename;
+use Cwd;
+
+# This code is taken from File::Spec::Unix 0.8.
+sub rel2abs {
+ my ($path, $base) = @_;
+
+ if ( ! File::Spec->file_name_is_absolute( $path ) ) {
+ if ( !defined( $base ) || $base eq '' ) {
+ $base = cwd() ;
+ }
+ elsif ( ! File::Spec->file_name_is_absolute( $base ) ) {
+ $base = rel2abs( $base );
+ }
+ else {
+ $base = File::Spec->canonpath( $base );
+ }
+
+ $path = File::Spec->catdir( $base, $path );
+ }
+
+ return File::Spec->canonpath( $path );
+}
+# End code from File::Spec::Unix
sub include {
my($stack, $filename) = @_;
my $directory = $stack->{'variables'}->{'DIRECTORY'};
if ($filename ne '-') {
- $filename = File::Spec->rel2abs($filename, $directory);
- my($volume, $path) = File::Spec->splitpath($filename);
- $directory = File::Spec->catpath($volume, $path, '');
+ $filename = rel2abs($filename, $directory);
+ $directory = File::Spec->catdir(File::Basename::dirname($filename));
}
local $stack->{'variables'}->{'DIRECTORY'} = $directory;
local $stack->{'variables'}->{'FILE'} = $filename;
@@ -376,7 +399,7 @@
my $stack = shift;
return if $stack->disabled;
die "argument expected\n" unless @_;
- main::include($stack, File::Spec->catpath(File::Spec::Unix->splitpath(@_)));
+ main::include($stack, File::Spec->catfile(File::Basename::dirname(@_), File::Basename::basename(@_)));
}
sub filter {

2
www/firefox/files/patch-directory-c-sdk-ldap-libraries-liblber-lber-int.h
View File

@ -1,3 +1,5 @@
$FreeBSD$
--- directory/c-sdk/ldap/libraries/liblber/lber-int.h Tue Mar 26 13:53:23 2002
+++ directory/c-sdk/ldap/libraries/liblber/lber-int.h Sat Dec 13 13:02:49 2003
@@ -236,15 +236,15 @@

48
www/firefox/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp Normal file
View File

@ -0,0 +1,48 @@
$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");

14
www/firefox/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h Normal file
View File

@ -0,0 +1,14 @@
$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);

57
www/firefox/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp
View File

@ -1,57 +0,0 @@
--- gfx/src/gtk/nsFontMetricsXft.cpp.save Thu Aug 7 12:14:49 2003
+++ gfx/src/gtk/nsFontMetricsXft.cpp Thu Aug 7 12:33:45 2003
@@ -106,6 +106,7 @@
FcPattern *mPattern;
FcPattern *mFontName;
FcCharSet *mCharset;
+ int mNotXft;
};
class nsFontXftInfo;
@@ -1051,7 +1052,7 @@
// font in our loaded list that supports the character
for (PRInt32 i = 0, end = mLoadedFonts.Count(); i < end; ++i) {
nsFontXft *font = (nsFontXft *)mLoadedFonts.ElementAt(i);
- if (font->HasChar(PRUint32(aChar)))
+ if (font->HasChar(PRUint32(aChar)) && font->GetXftFont())
return font;
}
@@ -1492,7 +1493,7 @@
// this character.
for (PRInt32 j = 0, end = mLoadedFonts.Count(); j < end; ++j) {
font = (nsFontXft *)mLoadedFonts.ElementAt(j);
- if (font->HasChar(c)) {
+ if (font->HasChar(c) && font->GetXftFont()) {
currFont = font;
goto FoundFont; // for speed -- avoid "if" statement
}
@@ -1922,6 +1923,7 @@
FcPatternReference(mFontName);
mXftFont = nsnull;
+ mNotXft = 0;
// set up our charset
mCharset = nsnull;
@@ -1948,7 +1950,7 @@
XftFont *
nsFontXft::GetXftFont(void)
{
- if (!mXftFont) {
+ if (!mXftFont && !mNotXft) {
FcPattern *pat = FcFontRenderPrepare(0, mPattern, mFontName);
if (!pat)
return nsnull;
@@ -1967,8 +1969,10 @@
FcPatternDel(pat, FC_SPACING);
mXftFont = XftFontOpenPattern(GDK_DISPLAY(), pat);
- if (!mXftFont)
+ if (!mXftFont) {
FcPatternDestroy(pat);
+ mNotXft = 1;
+ }
}
return mXftFont;

2
www/firefox/files/patch-nspr-unix.c
View File

@ -1,3 +1,5 @@
$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 @@

2
www/firefox/files/patch-nsprpub-pr-include-md-_freebsd.cfg
View File

@ -1,3 +1,5 @@
$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 @@

14
www/firefox/files/patch-nsprpub-pr-include-md-_freebsd.h
View File

@ -1,11 +1,11 @@
--- nsprpub/pr/include/md/_freebsd.h.orig Thu Jan 16 15:09:12 2003
+++ nsprpub/pr/include/md/_freebsd.h Sun Feb 1 15:21:56 2004
@@ -48,6 +48,12 @@
#define _PR_SI_ARCHITECTURE "x86"
#elif defined(__alpha)
$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(__sparc__)
#define _PR_SI_ARCHITECTURE "sparc"
+#elif defined(__ia64__)
+#define _PR_SI_ARCHITECTURE "ia64"
+#elif defined(__amd64__)

2
www/firefox/files/patch-nsprpub-pr-src-io-prprf.c
View File

@ -1,3 +1,5 @@
$FreeBSD$
--- nsprpub/pr/src/io/prprf.c Wed Feb 26 15:53:42 2003
+++ nsprpub/pr/src/io/prprf.c Thu Oct 16 22:50:40 2003
@@ -52,5 +52,8 @@

11
www/firefox/files/patch-nsprpub-pr-src-misc-prtime.c
View File

@ -1,11 +0,0 @@
--- nsprpub/pr/src/misc/prtime.c.orig Thu Feb 27 01:01:02 2003
+++ nsprpub/pr/src/misc/prtime.c Thu May 22 16:46:49 2003
@@ -1666,7 +1666,7 @@
*/
#if defined(SUNOS4) || (__GLIBC__ >= 2) || defined(XP_BEOS) \
- || defined(NETBSD)
+ || defined(NETBSD) || defined(__FreeBSD__)
a.tm_zone = NULL;
a.tm_gmtoff = tm->tm_params.tp_gmt_offset + tm->tm_params.tp_dst_offset;
#endif

2
www/firefox/files/patch-security-coreconf-FreeBSD.mk
View File

@ -1,3 +1,5 @@
$FreeBSD$
--- 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 @@

72
www/firefox/files/patch-typeaheadfind-nosound
View File

@ -1,72 +0,0 @@
--- extensions/typeaheadfind/src/nsTypeAheadFind.cpp.orig Sun Feb 8 01:13:31 2004
+++ extensions/typeaheadfind/src/nsTypeAheadFind.cpp Sun Feb 8 01:19:17 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) {
prefBranch->GetCharPref("accessibility.typeaheadfind.soundURL",
getter_Copies(soundStr));
}
@@ -612,7 +612,7 @@
return NS_OK;
}
- if (!mIsSoundInitialized) {
+ if (!mIsSoundInitialized && mIsSoundEnabled) {
// This makes sure system sound library is loaded so that
// there's no lag before the first sound is played
// by waiting for the first keystroke, we still get the startup time benefits.
@@ -760,11 +760,13 @@
// It keeps us from accidentally hitting backspace too many times and
// going back in history when we really just wanted to clear
// the find string.
+ if (mIsSoundEnabled) {
nsCOMPtr<nsISound> soundInterface =
do_CreateInstance("@mozilla.org/sound;1");
if (soundInterface) {
soundInterface->Beep(); // beep to warn
}
+ }
mIsBackspaceProtectOn = PR_FALSE;
}
else {
@@ -1009,7 +1011,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
@@ -1056,7 +1060,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");
--- extensions/typeaheadfind/src/nsTypeAheadFind.h.orig Sun Feb 8 01:11:53 2004
+++ extensions/typeaheadfind/src/nsTypeAheadFind.h Sun Feb 8 01:19:29 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);

2
www/firefox/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
View File

@ -1,3 +1,5 @@
$FreeBSD$
--- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Sun Feb 1 15:39:59 2004
+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Sun Feb 1 15:40:11 2004
@@ -8,7 +8,7 @@

2
www/firefox/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in
View File

@ -1,3 +1,5 @@
$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 @@

2
www/firefox/files/patch-xptcall-alpha
View File

@ -1,3 +1,5 @@
$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 @@

2
www/firefox/files/patch-xptcall-amd64
View File

@ -1,3 +1,5 @@
$FreeBSD$
--- /dev/null Wed Dec 31 16:00:00 1969
+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_amd64_freebsd.cpp Thu Oct 16 22:59:43 2003
@@ -0,0 +1,174 @@

2
www/firefox/files/patch-xptcall-ia64
View File

@ -1,3 +1,5 @@
$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 @@

2
www/firefox/files/patch-xptcall-sparc64
View File

@ -1,3 +1,5 @@
$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 @@

6
www/firefox/pkg-descr
View File

@ -1,6 +1,6 @@
Mozilla Firebird is the next generation browser from the Mozilla project. See
the Mozilla Firebird project page for more details.
Mozilla Firefox is the next-generation browser from the Mozilla project. See
its home page for more details.
WWW: http://www.mozilla.org/projects/firebird/
WWW: http://www.mozilla.org/products/firefox/
-- AlanE <alane@freebsd.org>

6
www/firefox/pkg-message
View File

@ -6,14 +6,14 @@ bug reports to any other addresses.
Please include the following information with any bug report:
* Output from 'uname -a'.
* Date/time stamp from www/mozilla-firebird/Makefile.
* Date/time stamp from www/firefox/Makefile.
* Perl version used (/usr/bin/perl --version or
/usr/local/bin/perl --version for -current).
* Where/when did the problem occur: configuring, building, or
running mozilla-firebird?
running firefox
* How can you reproduce the problem?
Thank you for your help in testing and reporting bugs, and we hope you
enjoy using Firebird.
enjoy using Firefox.
The Maintainers (gnome@)
======================================================================

3386
www/firefox/pkg-plist
View File

File diff suppressed because it is too large Load Diff

134
www/firefox10/Makefile
View File

@ -1,18 +1,16 @@
# New ports collection makefile for: mozilla-firebird
# Date created: May 31, 2003
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
# New ports collection makefile for: phoenix
# Date created: 2002/10/21
# Whom: Alan Eldridge <alane@FreeBSD.org>
#
# $FreeBSD$
#
PORTNAME= firebird
PORTVERSION= 0.7
PORTREVISION= 3
PORTNAME= firefox
PORTVERSION= 0.8
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= firebird/releases/${PORTVERSION}
PKGNAMEPREFIX= mozilla-
DISTNAME= MozillaFirebird-source-${PORTVERSION}
MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${PORTVERSION}
DISTNAME= ${PORTNAME}-source-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
COMMENT= Web browser based on the browser portion of Mozilla
@ -25,33 +23,34 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \
freetype-config:${PORTSDIR}/print/freetype2
CONFIGURE_ENV= WITH_GTK2=yes
USE_X_PREFIX= yes
ALL_TARGET= default
USE_ICONV= yes
CONFIGURE_ENV= WITH_GTK2=yes
FAKEDIR= ${WRKDIR}/fake
FAKESUBDIR= ${FAKEDIR}/lib/${PORTNAME}
HAS_CONFIGURE= yes
JREDIR= ${LOCALBASE}/jdk1.3.1/jre
ESD_LIB= libesd.so.2
LOCAL_PREFIX= ${PREFIX}/lib/${PORTNAME}
NO_MTREE= yes
PLIST= ${WRKDIR}/plist
PLUGINSDIR= ${PREFIX}lib/browser_plugins
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gtk20 libidl
USE_ICONV= yes
USE_PERL5= yes
USE_REINPLACE= yes
HAS_CONFIGURE= yes
USE_X_PREFIX= yes
WRKSRC= ${WRKDIR}/mozilla
NO_MTREE= yes
WRKSRC= ${WRKDIR}/mozilla
LOCAL_SUBDIR= lib/${PORTNAME}
LOCAL_PREFIX= ${PREFIX}/${LOCAL_SUBDIR}
JREDIR= ${LOCALBASE}/jdk1.3.1/jre
PLUGINSDIR= ${PREFIX}/lib/browser_plugins
OPTIONS= DEBUG "Build a debugging image" off \
HEADERS "Install headers and IDL files" off \
LOGGING "Enable additional log messages" off \
OPTIMIZED_CFLAGS "Enable some additional optimizations" off \
XFT "Enable support for anti-aliased fonts" on
.include <bsd.port.pre.mk>
#.if ${PERL_LEVEL} < 500601
#.undef NO_IGNORE
#BROKEN= Mozilla Firebird only supports the ports versions of Perl.
#BROKEN+=If you have installed a Perl port, and are getting this message,
#BROKEN+=please make sure you have given the command \'use.perl port\'.
#.endif # ${PERL_LEVEL} < 500601
.if defined(WITH_DEBUG)
WITH_LOGGING= yes
CONFIGURE_ENV+= WITH_DEBUG=yes
@ -76,7 +75,7 @@ CFLAGS+= ${PTHREAD_CFLAGS}
LDFLAGS+= -L${X11BASE}/lib
LIBS+= ${PTHREAD_LIBS}
EXTRA_SCRIPTS= firebird.rb
EXTRA_SCRIPTS= ${PORTNAME}.rb
.if ${ARCH} == "alpha" && ${OSVERSION} < 500035
IGNORE= "core dumps on alpha during post-build"
@ -94,67 +93,64 @@ post-extract::
-e 's|@LIBS@|${LIBS}|' \
-e 's|@X11BASE@|${X11BASE}|' \
-e 's|@LOCALBASE@|${LOCALBASE}|' \
-e 's|@PREFIX@|${LOCAL_PREFIX}|' \
-e 's|@PREFIX@|${FAKEDIR}/lib/firefox|' \
-e 's|@PERL@|${PERL5}|' \
<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
post-patch:
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' \
${WRKSRC}/build/unix/run-mozilla.sh
@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g' \
@${PERL} -pi -e 's|-lc_r|${PTHREAD_LIBS}|g' \
${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
${WRKSRC}/nsprpub/config/FreeBSD.mk \
@${PERL} -pi -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 '/accessibility.typeaheadfind.enablesound/s/true/false/' \
@${PERL} -pi -e 's|libesd\.so\.0|${ESD_LIB}|g' \
${WRKSRC}/widget/src/gtk2/nsSound.cpp
@${REINPLACE_CMD} -e \
'/accessibility.typeaheadfind.enablesound/s/true/false/' \
${WRKSRC}/modules/libpref/src/init/all.js \
${WRKSRC}/browser/app/profile/all.js \
${WRKSRC}/calendar/sunbird/app/profile/all.js
pre-install:
${RM} -fr ${LOCAL_PREFIX}
-${MKDIR} ${PLUGINSDIR}
@${RM} -rf ${FAKEDIR} ${PLIST}
@${MKDIR} ${FAKEDIR} ${FAKEDIR}/lib/browser_plugins
@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
Makefile ${MAKE_ARGS} install
.if !defined (WITH_HEADERS)
@${RM} -fr ${FAKEDIR}/share/idl ${FAKEDIR}/include
.endif
.for ii in firefox Firefox firefox-config ${EXTRA_SCRIPTS}
@${ECHO_CMD} bin/${ii} >> ${PLIST}
.endfor
@cd ${FAKEDIR}; ${FIND} * ! -type d | ${SORT} >>${PLIST}; \
${FIND} * -type d -empty | ${SORT} | ${SED} -e \
"s:^:@exec ${MKDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \
${FIND} * -type d -empty | ${SORT} -r | ${SED} -e \
"s:^:@unexec ${RMDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \
${FIND} * -type d ! -empty | ${SORT} -r | ${SED} -e "s:^:@dirrm :" | \
${GREP} / >> ${PLIST}
do-install:
cd ${FAKEDIR} && ${FIND} * | ${CPIO} -dmp --quiet ${PREFIX}
post-install:
.for i in ${EXTRA_SCRIPTS}
${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin
.endfor # i in ${EXTRA_SCRIPTS}
${RM} -f ${PREFIX}/bin/firebird
${LN} -s ${LOCAL_PREFIX}/bin/MozillaFirebird \
${PREFIX}/bin/firebird
${RM} -f ${PREFIX}/bin/MozillaFirebird
${LN} -s ${LOCAL_PREFIX}/bin/MozillaFirebird \
${PREFIX}/bin/MozillaFirebird
${RM} -f ${PREFIX}/bin/firebird-config
${LN} -s ${LOCAL_PREFIX}/bin/mozilla-config \
${PREFIX}/bin/firebird-config
-${RM} -f ${PLUGINSDIR}/libjavaplugin_oji.so
.endfor
.for ii in f F
${RM} -f ${PREFIX}/bin/${ii}irefox
${LN} -sf ${LOCAL_PREFIX}/bin/firefox ${PREFIX}/bin/${ii}irefox
.endfor
${RM} -f ${PREFIX}/bin/firefox-config
${LN} -sf ${LOCAL_PREFIX}/bin/mozilla-config \
${PREFIX}/bin/firefox-config
${RM} -f ${PLUGINSDIR}/libjavaplugin_oji.so
-${LN} -sf \
${JREDIR}/plugin/${ARCH}/ns600/libjavaplugin_oji.so \
${PLUGINSDIR}/libjavaplugin_oji.so
${RM} -fr ${LOCAL_PREFIX}/share/idl
${RM} -fr ${LOCAL_PREFIX}/include
cons-plist:
-${RM} -f ${PLIST}
${TOUCH} ${PLIST}
${ECHO_CMD} bin/firebird >>${PLIST}
${ECHO_CMD} bin/MozillaFirebird >>${PLIST}
${ECHO_CMD} bin/firebird-config >>${PLIST}
.for i in ${EXTRA_SCRIPTS}
${ECHO_CMD} bin/${i} >>${PLIST}
.endfor # i in ${EXTRA_SCRIPTS}
cd ${PREFIX}; \
${FIND} ${LOCAL_SUBDIR} ! -type d | ${SORT} >>${PLIST}; \
${FIND} ${LOCAL_SUBDIR} -type d -empty | ${SORT} \
| ${SED} -e "s:^:@exec ${MKDIR} %D/:" -e "s:$$: || true:" \
>> ${PLIST}; \
${FIND} ${LOCAL_SUBDIR} -type d -empty | ${SORT} -r \
| ${SED} -e "s:^:@unexec ${RMDIR} %D/:" -e "s:$$: || true:" \
>> ${PLIST}; \
${FIND} ${LOCAL_SUBDIR} -type d ! -empty | ${SORT} -r \
| ${SED} -e "s:^:@dirrm :" >> ${PLIST}
.include <bsd.port.post.mk>

4
www/firefox10/distinfo
View File

@ -1,2 +1,2 @@
$FreeBSD$
MD5 (MozillaFirebird-source-0.7.tar.gz) = 35112566a3dca5bdf363972056afc462
MD5 (firefox-source-0.8.tar.bz2) = cdc85152f4219bf3e3f1a8dc46e04654
SIZE (firefox-source-0.8.tar.bz2) = 31102943

4
www/firefox-esr/files/firebird.rb → www/firefox10/files/firefox.rb
View File

@ -68,10 +68,10 @@ end
IO::popen("xwininfo -display #{$display} -root -tree") {
|io|
if NAME != "firebird"
if NAME != "firefox"
$windows = io.grep(%r<"Mozilla"\s+"navigator:\s*browser">)
else
$windows = io.grep(%r<MozillaFirebird-bin.*>)
$windows = io.grep(%r<MozillaFirefox-bin.*>)
end
}

6
www/firefox10/files/mkdistfile
View File

@ -1,7 +1,7 @@
#!/bin/sh
# -*-shell-script-*-
#
# mkdistfile -- maintainer's utility to make a firebird distfile
# mkdistfile -- maintainer's utility to make a firefox distfile
#
# Copyright (c) 2002, Alan Eldridge
# All rights reserved.
@ -165,7 +165,7 @@ 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 firebird-$REV.tar.bz2 ..."
tar -cjpf firebird-$REV.tar.bz2 mozilla
status "making firefox-$REV.tar.bz2 ..."
tar -cjpf firefox-$REV.tar.bz2 mozilla
status "done."
#EOF

3
www/firefox10/files/mozconfig.in
View File

@ -43,13 +43,14 @@ ac_add_options --disable-ldap
ac_add_options --disable-pedantic
ac_add_options --disable-profilesharing
ac_add_options --disable-installer
ac_add_options --enable-extensions=cookie,xml-rpc,xmlextras,p3p,pref,transformiix,universalchardet,typeaheadfind,webservices
ac_add_options --enable-extensions=cookie,xml-rpc,xmlextras,p3p,pref,transformiix,universalchardet,typeaheadfind,webservices,inspector
######################################################################
# conditional from port Makefile
if test -n "$WITH_DEBUG"; then
ac_add_options --enable-debug
else
ac_add_options --disable-debug
ac_add_options --enable-optimize
fi # test -n "$WITH_DEBUG"
if test -n "$WITH_LOGGING"; then
ac_add_options --enable-logging

2
www/firefox10/files/patch-Double.cpp
View File

@ -1,3 +1,5 @@
$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 @@

27
www/firefox10/files/patch-build_unix_run-mozilla.sh
View File

@ -1,30 +1,13 @@
--- build/unix/run-mozilla.sh.orig Fri Apr 18 23:12:28 2003
+++ build/unix/run-mozilla.sh Sat May 31 19:03:29 2003
$FreeBSD$
--- build/unix/run-mozilla.sh.orig Mon Feb 9 19:25:14 2004
+++ build/unix/run-mozilla.sh Mon Feb 9 21:18:11 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"}
+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"}
@@ -402,7 +402,7 @@
fi
fi
# Font path for Xft
-FONTCONFIG_PATH="/etc/fonts:${MOZILLA_FIVE_HOME}/res/Xft"
+FONTCONFIG_PATH="%%PREFIX%%/etc/fonts:${MOZILLA_FIVE_HOME}/res/Xft"
export FONTCONFIG_PATH
if [ "$moz_debug" -eq 1 ]
@@ -445,6 +445,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

2
www/firefox10/files/patch-config-mkdepend-imakemdep.h
View File

@ -1,3 +1,5 @@
$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 @@

2
www/firefox10/files/patch-config-rules.mk
View File

@ -1,3 +1,5 @@
$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 @@

57
www/firefox10/files/patch-config_preprocess.pl
View File

@ -1,57 +0,0 @@
$FreeBSD$
--- config/preprocessor.pl.orig Tue Sep 2 17:53:55 2003
+++ config/preprocessor.pl Sat Oct 18 23:00:35 2003
@@ -73,16 +73,39 @@
########################################################################
package main;
-use File::Spec 0.8;
+use File::Spec;
use File::Spec::Unix; # on all platforms, because the #include syntax is unix-based
+use File::Basename;
+use Cwd;
+
+# This code is taken from File::Spec::Unix 0.8.
+sub rel2abs {
+ my ($path, $base) = @_;
+
+ if ( ! File::Spec->file_name_is_absolute( $path ) ) {
+ if ( !defined( $base ) || $base eq '' ) {
+ $base = cwd() ;
+ }
+ elsif ( ! File::Spec->file_name_is_absolute( $base ) ) {
+ $base = rel2abs( $base );
+ }
+ else {
+ $base = File::Spec->canonpath( $base );
+ }
+
+ $path = File::Spec->catdir( $base, $path );
+ }
+
+ return File::Spec->canonpath( $path );
+}
+# End code from File::Spec::Unix
sub include {
my($stack, $filename) = @_;
my $directory = $stack->{'variables'}->{'DIRECTORY'};
if ($filename ne '-') {
- $filename = File::Spec->rel2abs($filename, $directory);
- my($volume, $path) = File::Spec->splitpath($filename);
- $directory = File::Spec->catpath($volume, $path, '');
+ $filename = rel2abs($filename, $directory);
+ $directory = File::Spec->catdir(File::Basename::dirname($filename));
}
local $stack->{'variables'}->{'DIRECTORY'} = $directory;
local $stack->{'variables'}->{'FILE'} = $filename;
@@ -376,7 +399,7 @@
my $stack = shift;
return if $stack->disabled;
die "argument expected\n" unless @_;
- main::include($stack, File::Spec->catpath(File::Spec::Unix->splitpath(@_)));
+ main::include($stack, File::Spec->catfile(File::Basename::dirname(@_), File::Basename::basename(@_)));
}
sub filter {

Some files were not shown because too many files have changed in this diff Show More