summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2003-10-19 03:44:15 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2003-10-19 03:44:15 +0000
commitec87d489f3c19bca94120cbfd92bd9ecb75f0b92 (patch)
tree581943db29621db9e22bfb096eab4ca12676028c /www
parentAdd virtual category elisp. (diff)
Update Mozilla to 1.5, and adjust the dependent ports accordingly. Note,
mozilla-devel has not been updated since it would cause INDEX conflicts with the GTK2 port.
Diffstat (limited to 'www')
-rw-r--r--www/epiphany/Makefile3
-rw-r--r--www/galeon/Makefile4
-rw-r--r--www/galeon2/Makefile4
-rw-r--r--www/mozilla/Makefile5
-rw-r--r--www/mozilla/distinfo2
-rw-r--r--www/mozilla/files/patch-Makefile.in16
-rw-r--r--www/mozilla/files/patch-nsprpub::pr::src::pthreads::ptio.c45
-rw-r--r--www/mozilla/files/patch-qt10
8 files changed, 49 insertions, 40 deletions
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index ffcdfcba439c..c35fabd6ef34 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -7,6 +7,7 @@
PORTNAME= epiphany
PORTVERSION= 1.0.3
+PORTREVISION= 1
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0
@@ -19,7 +20,7 @@ BUILD_DEPENDS= ${X11BASE}/include/mozilla${HEADERS_SUFX}/gtkembedmoz/gtkmozembed
${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
RUN_DEPENDS= ${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
-MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="1.4.1"
+MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="1.5"
MOZILLA= mozilla-gtk2
HEADERS_SUFX=
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index 08db12c13118..c08a8e55dbbf 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -7,7 +7,7 @@
PORTNAME= galeon
PORTVERSION= 1.2.12
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -20,7 +20,7 @@ BUILD_DEPENDS= ${X11BASE}/include/mozilla${HEADERS_SUFX}/gtkembedmoz/gtkmozembed
LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
RUN_DEPENDS= ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA}
-MOZ_CONFIGURE_ARGS=--with-mozilla-snapshot="1.4"
+MOZ_CONFIGURE_ARGS=--with-mozilla-snapshot="1.5b"
.if !defined(WITH_MOZILLA)
MOZILLA= mozilla
diff --git a/www/galeon2/Makefile b/www/galeon2/Makefile
index ea3c0c4cec1f..2cacf60ae525 100644
--- a/www/galeon2/Makefile
+++ b/www/galeon2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= galeon2
PORTVERSION= 1.3.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME:S/2$//}
@@ -20,7 +20,7 @@ BUILD_DEPENDS= ${X11BASE}/include/mozilla${HEADERS_SUFX}/gtkembedmoz/gtkmozembed
${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
RUN_DEPENDS= ${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
-MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="1.4"
+MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="1.5b"
MOZILLA= mozilla-gtk2
HEADERS_SUFX=
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index 403380aa4dc6..91ae1a03ebcf 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -6,14 +6,15 @@
#
PORTNAME?= mozilla
-PORTVERSION= 1.4.1
+PORTVERSION= 1.5
+PORTREVISION?= 0
PORTEPOCH?= 2
CATEGORIES?= www
MASTER_SITES= ${MASTER_SITE_MOZILLA} \
${MASTER_SITE_LOCAL:S/$/:local/}
MASTER_SITE_SUBDIR= mozilla/releases/${PORTNAME}${PORTVERSION:S/.rc/rc/}/src \
marcus/:local
-DISTFILES= ${PORTNAME}-${PORTVERSION:S/.rc/rc/}${EXTRACT_SUFX} \
+DISTFILES= ${PORTNAME}-source-${PORTVERSION:S/.rc/rc/}${EXTRACT_SUFX} \
libart_lgpl${EXTRACT_SUFX}:local
MAINTAINER= gnome@FreeBSD.org
diff --git a/www/mozilla/distinfo b/www/mozilla/distinfo
index 4a114b021cfd..0aef408ae34f 100644
--- a/www/mozilla/distinfo
+++ b/www/mozilla/distinfo
@@ -1,2 +1,2 @@
-MD5 (mozilla-1.4.1.tar.bz2) = a1b72d97981cabb6160526d8c8d97ac1
+MD5 (mozilla-source-1.5.tar.bz2) = 9d59651eac39a95da756d38fe5385896
MD5 (libart_lgpl.tar.bz2) = f332c3c026adc1c2c0ceb3ac5847d5f5
diff --git a/www/mozilla/files/patch-Makefile.in b/www/mozilla/files/patch-Makefile.in
index 43fa34684782..5480cb799b3d 100644
--- a/www/mozilla/files/patch-Makefile.in
+++ b/www/mozilla/files/patch-Makefile.in
@@ -1,16 +1,16 @@
---- Makefile.in.orig Thu May 30 20:39:07 2002
-+++ Makefile.in Wed Aug 28 13:55:32 2002
-@@ -70,8 +70,7 @@
- $(tier_0_dirs) \
- $(tier_1_dirs) \
+--- Makefile.in.orig Fri Aug 29 20:20:58 2003
++++ Makefile.in Sat Oct 18 15:34:15 2003
+@@ -67,8 +67,7 @@
$(tier_2_dirs) \
-- $(tier_9_dirs) \
+ $(tier_9_dirs) \
+ $(tier_40_dirs) \
+- $(tier_50_dirs) \
- $(NULL)
-+ $(tier_9_dirs)
++ $(tier_50_dirs)
ifdef GC_LEAK_DETECTOR
DIRS += gc/boehm
-@@ -90,7 +89,8 @@
+@@ -87,7 +86,8 @@
DIRS += $(tier_98_dirs)
endif
diff --git a/www/mozilla/files/patch-nsprpub::pr::src::pthreads::ptio.c b/www/mozilla/files/patch-nsprpub::pr::src::pthreads::ptio.c
index 4a965d4c7440..08346f235416 100644
--- a/www/mozilla/files/patch-nsprpub::pr::src::pthreads::ptio.c
+++ b/www/mozilla/files/patch-nsprpub::pr::src::pthreads::ptio.c
@@ -1,22 +1,29 @@
-Index: nsprpub/pr/src/pthreads/ptio.c
-diff -u nsprpub/pr/src/pthreads/ptio.c.orig nsprpub/pr/src/pthreads/ptio.c
---- nsprpub/pr/src/pthreads/ptio.c.orig Fri Apr 12 03:14:39 2002
-+++ nsprpub/pr/src/pthreads/ptio.c Tue Jul 30 18:52:11 2002
-@@ -3414,6 +3414,17 @@
+--- nsprpub/pr/src/pthreads/ptio.c.orig Mon Jul 14 17:59:47 2003
++++ nsprpub/pr/src/pthreads/ptio.c Fri Aug 29 15:39:46 2003
+@@ -189,7 +189,7 @@
+ #endif
+ #endif
+
+-#ifdef DARWIN
++#if defined(DARWIN) || defined(FREEBSD)
+ static PRBool _pr_ipv6_v6only_on_by_default;
+ /* The IPV6_V6ONLY socket option is not defined on Mac OS X 10.1. */
+ #ifndef IPV6_V6ONLY
+@@ -1154,7 +1154,7 @@
+ _pr_stderr = pt_SetMethods(2, PR_DESC_FILE, PR_FALSE, PR_TRUE);
+ PR_ASSERT(_pr_stdin && _pr_stdout && _pr_stderr);
+
+-#ifdef DARWIN
++#if defined(DARWIN) || defined(FREEBSD)
+ /* In Mac OS X v10.3 Panther Beta the IPV6_V6ONLY socket option
+ * is turned on by default, contrary to what RFC 3493, Section
+ * 5.3 says. So we have to turn it off. Find out whether we
+@@ -3462,7 +3462,7 @@
if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
else
{
-+#if (defined(_PR_INET6_PROBE) || defined(_PR_INET6)) && \
-+ defined(__FreeBSD__) && defined(IPV6_V6ONLY)
-+ if (domain == PR_AF_INET6) {
-+ int opt = 0;
-+ if (setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY,
-+ &opt, sizeof(opt))) {
-+ close(osfd);
-+ return NULL;
-+ }
-+ }
-+#endif
- fd = pt_SetMethods(osfd, ftype, PR_FALSE, PR_FALSE);
- if (fd == NULL) close(osfd);
- }
+-#ifdef DARWIN
++#if defined(DARWIN) || defined(FREEBSD)
+ if ((domain == AF_INET6) && _pr_ipv6_v6only_on_by_default)
+ {
+ int on = 0;
diff --git a/www/mozilla/files/patch-qt b/www/mozilla/files/patch-qt
index c72d0a591c4c..895814c6add7 100644
--- a/www/mozilla/files/patch-qt
+++ b/www/mozilla/files/patch-qt
@@ -1,14 +1,14 @@
---- configure.orig Wed Aug 27 11:00:21 2003
-+++ configure Sat Oct 11 12:22:54 2003
-@@ -11896,9 +11896,9 @@
+--- configure.orig Fri Aug 29 13:19:05 2003
++++ configure Sat Oct 18 15:43:27 2003
+@@ -11957,9 +11957,9 @@
-MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector irc universalchardet typeaheadfind webservices spellcheck"
+MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector universalchardet typeaheadfind webservices spellcheck"
--MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT xmlterm access-builtin datetime finger cview"
-+MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT irc xmlterm access-builtin datetime finger cview"
+-MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT xmlterm datetime finger cview layout-debug"
++MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT irc xmlterm datetime finger cview layout-debug"
# Check whether --enable-extensions or --disable-extensions was given.
if test "${enable_extensions+set}" = set; then