aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--www/firefox-esr/Makefile2
-rw-r--r--www/firefox-esr/distinfo6
-rw-r--r--www/firefox-esr/files/patch-configure18
-rw-r--r--www/firefox/Makefile2
-rw-r--r--www/firefox/distinfo6
-rw-r--r--www/firefox/files/patch-configure18
-rw-r--r--www/firefox36/Makefile2
-rw-r--r--www/firefox36/distinfo6
-rw-r--r--www/firefox36/files/patch-configure18
-rw-r--r--www/mozilla/Makefile.common1
10 files changed, 39 insertions, 40 deletions
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index 7e589cee330e..481dfc8825ff 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -7,7 +7,7 @@
#
PORTNAME= firefox
-DISTVERSION= 2.0.0.4
+DISTVERSION= 2.0.0.5
PORTREVISION= 0
PORTEPOCH= 1
CATEGORIES= www ipv6
diff --git a/www/firefox-esr/distinfo b/www/firefox-esr/distinfo
index 1005f245d41b..c40fbab15de1 100644
--- a/www/firefox-esr/distinfo
+++ b/www/firefox-esr/distinfo
@@ -1,3 +1,3 @@
-MD5 (firefox-2.0.0.4-source.tar.bz2) = 99c14794976b2532addfcd2d836c6bb2
-SHA256 (firefox-2.0.0.4-source.tar.bz2) = d533bb5699e5c9f7a3edf2380fb814db857b1fdc6e777fb475adeba2a22da1e7
-SIZE (firefox-2.0.0.4-source.tar.bz2) = 37321839
+MD5 (firefox-2.0.0.5-source.tar.bz2) = 5a6ca3e4ac3ebc335d473cd3f682a916
+SHA256 (firefox-2.0.0.5-source.tar.bz2) = edb04a63adf82ffe728a860e9eb6c9fdb228004bffd84344b5de8b01911a3bf6
+SIZE (firefox-2.0.0.5-source.tar.bz2) = 37392615
diff --git a/www/firefox-esr/files/patch-configure b/www/firefox-esr/files/patch-configure
index ee6087d2d948..92cb6ab27ea9 100644
--- a/www/firefox-esr/files/patch-configure
+++ b/www/firefox-esr/files/patch-configure
@@ -1,24 +1,24 @@
---- configure.orig Tue Aug 8 13:59:01 2006
-+++ configure Tue Sep 19 07:52:08 2006
+--- configure.orig 2007-07-11 12:44:47.000000000 -0400
++++ configure 2007-07-19 06:04:36.000000000 -0400
@@ -1047,7 +1047,7 @@
MOZJPEG=62
- MOZPNG=10207
+ MOZPNG=10217
-MOZZLIB=1.2.3
+MOZZLIB=1.2.2
NSPR_VERSION=4
NSS_VERSION=3
-@@ -10267,7 +10267,7 @@
+@@ -10403,7 +10403,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-liconv $LIBS"
+LIBS="-L$LOCALBASE/lib -liconv $LIBS"
cat > conftest.$ac_ext <<EOF
- #line 10273 "configure"
+ #line 10409 "configure"
#include "confdefs.h"
-@@ -10298,7 +10298,7 @@
+@@ -10434,7 +10434,7 @@
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
@@ -27,16 +27,16 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6
-@@ -10308,7 +10308,7 @@
+@@ -10444,7 +10444,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-liconv $LIBS"
+LIBS="-L$LOCALBASE/lib -liconv $LIBS"
cat > conftest.$ac_ext <<EOF
- #line 10314 "configure"
+ #line 10450 "configure"
#include "confdefs.h"
-@@ -10339,7 +10339,7 @@
+@@ -10475,7 +10475,7 @@
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 7e589cee330e..481dfc8825ff 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -7,7 +7,7 @@
#
PORTNAME= firefox
-DISTVERSION= 2.0.0.4
+DISTVERSION= 2.0.0.5
PORTREVISION= 0
PORTEPOCH= 1
CATEGORIES= www ipv6
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 1005f245d41b..c40fbab15de1 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,3 +1,3 @@
-MD5 (firefox-2.0.0.4-source.tar.bz2) = 99c14794976b2532addfcd2d836c6bb2
-SHA256 (firefox-2.0.0.4-source.tar.bz2) = d533bb5699e5c9f7a3edf2380fb814db857b1fdc6e777fb475adeba2a22da1e7
-SIZE (firefox-2.0.0.4-source.tar.bz2) = 37321839
+MD5 (firefox-2.0.0.5-source.tar.bz2) = 5a6ca3e4ac3ebc335d473cd3f682a916
+SHA256 (firefox-2.0.0.5-source.tar.bz2) = edb04a63adf82ffe728a860e9eb6c9fdb228004bffd84344b5de8b01911a3bf6
+SIZE (firefox-2.0.0.5-source.tar.bz2) = 37392615
diff --git a/www/firefox/files/patch-configure b/www/firefox/files/patch-configure
index ee6087d2d948..92cb6ab27ea9 100644
--- a/www/firefox/files/patch-configure
+++ b/www/firefox/files/patch-configure
@@ -1,24 +1,24 @@
---- configure.orig Tue Aug 8 13:59:01 2006
-+++ configure Tue Sep 19 07:52:08 2006
+--- configure.orig 2007-07-11 12:44:47.000000000 -0400
++++ configure 2007-07-19 06:04:36.000000000 -0400
@@ -1047,7 +1047,7 @@
MOZJPEG=62
- MOZPNG=10207
+ MOZPNG=10217
-MOZZLIB=1.2.3
+MOZZLIB=1.2.2
NSPR_VERSION=4
NSS_VERSION=3
-@@ -10267,7 +10267,7 @@
+@@ -10403,7 +10403,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-liconv $LIBS"
+LIBS="-L$LOCALBASE/lib -liconv $LIBS"
cat > conftest.$ac_ext <<EOF
- #line 10273 "configure"
+ #line 10409 "configure"
#include "confdefs.h"
-@@ -10298,7 +10298,7 @@
+@@ -10434,7 +10434,7 @@
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
@@ -27,16 +27,16 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6
-@@ -10308,7 +10308,7 @@
+@@ -10444,7 +10444,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-liconv $LIBS"
+LIBS="-L$LOCALBASE/lib -liconv $LIBS"
cat > conftest.$ac_ext <<EOF
- #line 10314 "configure"
+ #line 10450 "configure"
#include "confdefs.h"
-@@ -10339,7 +10339,7 @@
+@@ -10475,7 +10475,7 @@
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile
index 7e589cee330e..481dfc8825ff 100644
--- a/www/firefox36/Makefile
+++ b/www/firefox36/Makefile
@@ -7,7 +7,7 @@
#
PORTNAME= firefox
-DISTVERSION= 2.0.0.4
+DISTVERSION= 2.0.0.5
PORTREVISION= 0
PORTEPOCH= 1
CATEGORIES= www ipv6
diff --git a/www/firefox36/distinfo b/www/firefox36/distinfo
index 1005f245d41b..c40fbab15de1 100644
--- a/www/firefox36/distinfo
+++ b/www/firefox36/distinfo
@@ -1,3 +1,3 @@
-MD5 (firefox-2.0.0.4-source.tar.bz2) = 99c14794976b2532addfcd2d836c6bb2
-SHA256 (firefox-2.0.0.4-source.tar.bz2) = d533bb5699e5c9f7a3edf2380fb814db857b1fdc6e777fb475adeba2a22da1e7
-SIZE (firefox-2.0.0.4-source.tar.bz2) = 37321839
+MD5 (firefox-2.0.0.5-source.tar.bz2) = 5a6ca3e4ac3ebc335d473cd3f682a916
+SHA256 (firefox-2.0.0.5-source.tar.bz2) = edb04a63adf82ffe728a860e9eb6c9fdb228004bffd84344b5de8b01911a3bf6
+SIZE (firefox-2.0.0.5-source.tar.bz2) = 37392615
diff --git a/www/firefox36/files/patch-configure b/www/firefox36/files/patch-configure
index ee6087d2d948..92cb6ab27ea9 100644
--- a/www/firefox36/files/patch-configure
+++ b/www/firefox36/files/patch-configure
@@ -1,24 +1,24 @@
---- configure.orig Tue Aug 8 13:59:01 2006
-+++ configure Tue Sep 19 07:52:08 2006
+--- configure.orig 2007-07-11 12:44:47.000000000 -0400
++++ configure 2007-07-19 06:04:36.000000000 -0400
@@ -1047,7 +1047,7 @@
MOZJPEG=62
- MOZPNG=10207
+ MOZPNG=10217
-MOZZLIB=1.2.3
+MOZZLIB=1.2.2
NSPR_VERSION=4
NSS_VERSION=3
-@@ -10267,7 +10267,7 @@
+@@ -10403,7 +10403,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-liconv $LIBS"
+LIBS="-L$LOCALBASE/lib -liconv $LIBS"
cat > conftest.$ac_ext <<EOF
- #line 10273 "configure"
+ #line 10409 "configure"
#include "confdefs.h"
-@@ -10298,7 +10298,7 @@
+@@ -10434,7 +10434,7 @@
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
@@ -27,16 +27,16 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6
-@@ -10308,7 +10308,7 @@
+@@ -10444,7 +10444,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-liconv $LIBS"
+LIBS="-L$LOCALBASE/lib -liconv $LIBS"
cat > conftest.$ac_ext <<EOF
- #line 10314 "configure"
+ #line 10450 "configure"
#include "confdefs.h"
-@@ -10339,7 +10339,7 @@
+@@ -10475,7 +10475,7 @@
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common
index 6f9161e83bfd..58a99d553256 100644
--- a/www/mozilla/Makefile.common
+++ b/www/mozilla/Makefile.common
@@ -97,7 +97,6 @@ PKGDEINSTALL_INC?= ${MASTER_MOZDIR}/pkg-deinstall.in
EXTRACT_AFTER_ARGS?= | ${TAR} -xf - --exclude */CVS/* \
--exclude */macbuild/* \
--exclude */package/* \
- --exclude mozilla/modules/libimg/png \
--exclude mozilla/jpeg \
--exclude mozilla/dbm \
--exclude mozilla/security/nss \