summaryrefslogtreecommitdiff
path: root/www/firefox36/files
diff options
context:
space:
mode:
authorAlan Eldridge <alane@FreeBSD.org>2002-11-10 18:05:10 +0000
committerAlan Eldridge <alane@FreeBSD.org>2002-11-10 18:05:10 +0000
commitc7685d56b96e054215e9a79614977c83df024a00 (patch)
tree4c68b6b6e2ebd5f015c572761de380f4c0123a44 /www/firefox36/files
parentUpdate to 5.2 to work around a wrong WRKSRC usage submitted in: (diff)
* PORTREVISION ==> 7.
* Allow building under -CURRENT. * Changes in LDFLAGS and CPPFLAGS passed to configure. * Removed stale javascript dirs (venkman) from plist. * Updated mkdistfile to remove more unneeded dirs. Used to make a new distfile from a cvs checkout. For maintainers only, really. * Disable bi-directional text in config. * Remove dupes from mozconfig.in. The problem with the martian file selection dialogs is gone. I am not sure of the cause, but apparently it had to do with either which version of the NSPR libs phoenix runs with or the link order of libraries. I don't care, as long as it doesn't do it, 'cause I do not read Martian. Should be running against its own set of NSPR libs now. (Note: you can't just use ldd to check this since the startup scripts play all kinds of fun games.) You are advised to remove $HOME/.phoenix before running the new version.
Notes
Notes: svn path=/head/; revision=69826
Diffstat (limited to 'www/firefox36/files')
-rw-r--r--www/firefox36/files/mkdistfile6
-rw-r--r--www/firefox36/files/mozconfig.in10
2 files changed, 11 insertions, 5 deletions
diff --git a/www/firefox36/files/mkdistfile b/www/firefox36/files/mkdistfile
index 08647ff78961..27f838bc2939 100644
--- a/www/firefox36/files/mkdistfile
+++ b/www/firefox36/files/mkdistfile
@@ -130,6 +130,12 @@ cat >>$exfile <<'EOF'
*/package
*/package/*
*/.cvsignore
+*/windows
+*/windows/*
+*/os2
+*/os2/*
+*/solaris
+*/solaris/*
mozilla/apache
mozilla/calendar
mozilla/cck
diff --git a/www/firefox36/files/mozconfig.in b/www/firefox36/files/mozconfig.in
index c93a5d2dec05..88823ea75c24 100644
--- a/www/firefox36/files/mozconfig.in
+++ b/www/firefox36/files/mozconfig.in
@@ -11,15 +11,14 @@ ac_add_options --disable-mailnews
ac_add_options --disable-composer
######################################################################
# FBSD specific
-export CPPFLAGS="-I@X11BASE@/include -I@LOCALBASE@/include"
+export CPPFLAGS="@CPPFLAGS@"
export CFLAGS="@CFLAGS@"
export LIBS="@LIBS@"
-export LDFLAGS="-L@X11BASE@/lib -L@LOCALBASE@/lib"
-export DSOFLAGS="${LDFLAGS}"
+export LDFLAGS="@LDFLAGS@"
export CONFIG_SH=/bin/sh
export XP_UNIX=1
-test -x /usr/bin/perl && export PERL=/usr/bin/perl \
- || export PERL=/usr/local/bin/perl
+mk_add_options XP_UNIX=1
+export PERL=/usr/local/bin/perl
mk_add_options PERL=$PERL
export GTK_CONFIG=@X11BASE@/bin/gtk12-config
mk_add_options GTK_CONFIG=$GTK_CONFIG
@@ -49,4 +48,5 @@ ac_add_options --disable-dtd-debug
ac_add_options --disable-auto-deps
ac_add_options --disable-pedantic
ac_add_options --disable-jsd
+ac_add_options --disable-bidi
######################################################################