Make M13 work on a post no-thunk-vtable 4.0-CURRENT, and enable using

poll().

Enable MathML support.

Use bzip2, since it saves 5MB on the distfile.

Revamp the port a bit.

6 files changed, 51 insertions, 9 deletions

diff --git a/www/mozilla-devel/Makefile b/www/mozilla-devel/Makefile
index dd2f72e98d44..05898f3863c1 100644
--- a/www/mozilla-devel/Makefile
+++ b/www/mozilla-devel/Makefile
@@ -20,6 +20,8 @@ GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 WRKSRC=		${WRKDIR}/mozilla
+
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
@@ -36,6 +38,7 @@ CONFIGURE_ARGS=					\
 		--enable-double-buffer		\
 		--enable-editor			\
 		--enable-mailnews		\
+		--enable-mathml			\
 		--enable-optimize		\
 		--enable-pics			\
 		--enable-tests			\
@@ -49,6 +52,11 @@ CONFIGURE_ENV=	GLIB_CONFIG="${GLIB_CONFIG}"	\
 MAKE_ENV=	LD_LIBRARY_PATH=${WRKSRC}/dist/bin \
 		CC_ONLY_FLAGS="${FLAGS}" CCC_ONLY_FLAGS="${CXXFLAGS}"
 
+post-build:
+	@${SED} -e "s;@PREFIX@;${PREFIX};g" \
+		${FILESDIR}/mozilla.sh >${WRKSRC}/mozilla
+	@${CHMOD} 555 ${WRKSRC}/mozilla
+
 do-install:
 	${MKDIR} ${PREFIX}/lib/mozilla
 	${CHMOD} 755 ${PREFIX}/lib/mozilla
diff --git a/www/mozilla-devel/distinfo b/www/mozilla-devel/distinfo
index d3fe6265330e..aa69e0e19fa3 100644
--- a/www/mozilla-devel/distinfo
+++ b/www/mozilla-devel/distinfo
@@ -1 +1 @@
-MD5 (mozilla-source-M13.tar.gz) = cdd50243c8f12870e78d64f398b510dd
+MD5 (mozilla-source-M13.tar.bz2) = 49acd19d1943ba0f63e5919918d98b4f
diff --git a/www/mozilla-devel/files/mozilla.sh b/www/mozilla-devel/files/mozilla.sh
new file mode 100644
index 000000000000..921c334f6073
--- /dev/null
+++ b/www/mozilla-devel/files/mozilla.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+cd @PREFIX@/lib/mozilla
+exec ./mozilla $*
diff --git a/www/mozilla-devel/files/patch-ak b/www/mozilla-devel/files/patch-ak
new file mode 100644
index 000000000000..3b430ef27dc2
--- /dev/null
+++ b/www/mozilla-devel/files/patch-ak
@@ -0,0 +1,19 @@
+--- nsprpub/pr/include/md/_freebsd.h.orig	Wed Dec 22 15:39:04 1999
++++ nsprpub/pr/include/md/_freebsd.h	Thu Feb  3 03:48:20 2000
+@@ -21,6 +21,7 @@
+ 
+ #include "prthread.h"
+ 
++#include <sys/param.h>
+ #include <sys/syscall.h>
+ 
+ #define PR_LINKER_ARCH	"freebsd"
+@@ -49,7 +50,7 @@
+ #define _PR_HAVE_SOCKADDR_LEN
+ #define _PR_STAT_HAS_ST_ATIMESPEC
+ #define _PR_NO_LARGE_FILES
+-#if ( __FreeBSD__ > 2 )
++#if ( __FreeBSD_version >= 220000 ) && ( __FreeBSD_version < 400008 )
+ #if !defined(_PR_PTHREADS)
+ /*
+  * libc_r doesn't have poll().  Although libc has poll(), it is not
diff --git a/www/mozilla-devel/files/patch-mi b/www/mozilla-devel/files/patch-mi
index 51da7ba70d69..80768e265de9 100644
--- a/www/mozilla-devel/files/patch-mi
+++ b/www/mozilla-devel/files/patch-mi
@@ -1,15 +1,22 @@
-This patch make the FreeBSD port build obey the host's local settings
-for C, C++ compiler and (optimization) flags.
---- nsprpub/config/FreeBSD.mk.orig	Wed Apr 21 17:37:37 1999
-+++ nsprpub/config/FreeBSD.mk	Mon Oct 11 13:49:41 1999
-@@ -24,2 +23,0 @@
+--- nsprpub/config/FreeBSD.mk.orig	Wed Oct 20 14:19:53 1999
++++ nsprpub/config/FreeBSD.mk	Thu Feb  3 03:48:20 2000
+@@ -21,14 +21,16 @@
+ 
+ include $(MOD_DEPTH)/config/UNIX.mk
+ 
 -CC			= gcc
 -CCC			= g++
-@@ -26,0 +25,5 @@
+ RANLIB			= ranlib
 +CCC			= ${CXX}
 +
 +# During FreeBSD port build, CFLAGS contains all of the optimizations
 +# flags desired...
 +OPTIMIZER		=
-@@ -31 +33,0 @@
--OS_REL_CFLAGS		= -mno-486 -Di386
+ 
+ ifeq ($(OS_TEST),alpha)
+ CPU_ARCH		= alpha
+ else
+-OS_REL_CFLAGS		= -Di386
+ CPU_ARCH		= x86
+ endif
+ CPU_ARCH_TAG		= _$(CPU_ARCH)
diff --git a/www/mozilla-devel/pkg-plist b/www/mozilla-devel/pkg-plist
index fed74fa5b6a0..d31993938299 100644
--- a/www/mozilla-devel/pkg-plist
+++ b/www/mozilla-devel/pkg-plist
@@ -979,6 +979,7 @@ lib/mozilla/defaults/pref/unix.js
 lib/mozilla/defaults/pref/xpinstall.js
 lib/mozilla/defaults/profile/bookmarks.html
 lib/mozilla/defaults/profile/panels.rdf
+lib/mozilla/dtd/mathml.dtd
 lib/mozilla/geturl
 lib/mozilla/htmlrobot
 lib/mozilla/libDebugRobot.so
@@ -1295,6 +1296,7 @@ lib/mozilla/xpt_link
 @dirrm lib/mozilla/res/entityTables
 @dirrm lib/mozilla/res
 @dirrm lib/mozilla/plugins
+@dirrm lib/mozilla/dtd
 @dirrm lib/mozilla/defaults/profile
 @dirrm lib/mozilla/defaults/pref
 @dirrm lib/mozilla/defaults