* Fix build on -CURRENT

* Silence a portlint nit wrt to the order of PORTREVISION in the Makefile
* Don't use --enable-reorder on non-i386 archs
* Mark BROKEN for now on alpha as there is still a core dump during
  post-build
* Use USE_GNOMENG

Submitted by:	Peter Kostouros <kpeter@melbpc.org.au> (patch for -CURRENT)
		me (everything else)

10 files changed, 165 insertions, 25 deletions

diff --git a/www/mozilla-devel/Makefile b/www/mozilla-devel/Makefile
index 1576e0c..7d08a64 100644
--- a/www/mozilla-devel/Makefile
+++ b/www/mozilla-devel/Makefile
@@ -7,8 +7,8 @@
 
 PORTNAME=	mozilla
 PORTVERSION=	1.0
-PORTEPOCH=	1
 PORTREVISION=	1
+PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA} \
 		http://people.FreeBSD.org/~sobomax/:local
@@ -21,8 +21,7 @@ MAINTAINER=	gnome@FreeBSD.org
 
 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
 		freetype-config:${PORTSDIR}/print/freetype2
-LIB_DEPENDS=	ORBit.2:${PORTSDIR}/devel/ORBit \
-		jpeg.9:${PORTSDIR}/graphics/jpeg \
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		mng.1:${PORTSDIR}/graphics/libmng \
 		freetype.9:${PORTSDIR}/print/freetype2
@@ -36,7 +35,8 @@ EXTRACT_AFTER_ARGS=	| tar -xf - -X ${FILESDIR}/tar-exclude
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	orbit gtk12
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=					\
 		--disable-auto-deps		\
@@ -54,7 +54,6 @@ CONFIGURE_ARGS=					\
 		--disable-optimize		\
 		--disable-pedantic		\
 		--disable-plaintext-editor-only	\
-		--enable-reorder		\
 		--enable-strip			\
 		--enable-svg			\
 		--disable-tests			\
@@ -98,6 +97,14 @@ MAKE_ENV=	LD_LIBRARY_PATH=${WRKSRC}/dist/bin \
 		MOZ_INTERNAL_LIBART_LGPL=1
 ALL_TARGET=	default
 
+.if ${ARCH} == "i386"
+CONFIGURE_ARGS+=	--enable-reorder
+.endif
+
+.if ${ARCH} == "alpha"
+BROKEN=	"core dumps on alpha during post-build"
+.endif
+
 .if exists(${LOCALBASE}/include/freetype/freetype.h)
 BROKEN="You must upgrade your freetype port to 1.3.1_2 or higher before installing Mozilla.  If you have 1.3.1_2 installed, please remove ${LOCALBASE}/include/freetype, then build Mozilla"
 .endif
diff --git a/www/mozilla-devel/files/patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86.h b/www/mozilla-devel/files/patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86.h
new file mode 100644
index 0000000..2224e67
--- /dev/null
+++ b/www/mozilla-devel/files/patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86.h
@@ -0,0 +1,21 @@
+--- xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h.orig	Fri Jun 21 01:12:40 2002
++++ xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h	Fri Jun 21 01:41:51 2002
+@@ -94,8 +94,16 @@
+  * gcc is that the system gcc defines __FreeBSD_cc_version.  This variable
+  * can also identify the period of time that 4.0-CURRENT used thunks.
+  */
+-#if defined(__FreeBSD_cc_version) && \
+-    (__FreeBSD_cc_version < 400002 || __FreeBSD_cc_version > 400003)
++
++/* It seems we need to use thunks in FreeBSD -CURRENT after gcc-3.1 was merged.
++ * This solves a problem wherein regxpcom and/or regchrome would seg fault
++ * after running for a while.  This problem has also exhibited itself on 
++ * the alpha platform.  Therefore, use thunks on all versions of
++ * -CURRENT that are using gcc-3.1.
++ */
++#if defined(__FreeBSD_cc_version) && \
++    (__FreeBSD_cc_version < 400002 || __FreeBSD_cc_version > 400003) && \
++    (__FreeBSD_cc_version < 500003)
+ #define CFRONT_STYLE_THIS_ADJUST
+ #else
+ #define THUNK_BASED_THIS_ADJUST
diff --git a/www/mozilla-vendor/Makefile b/www/mozilla-vendor/Makefile
index 1576e0c..7d08a64 100644
--- a/www/mozilla-vendor/Makefile
+++ b/www/mozilla-vendor/Makefile
@@ -7,8 +7,8 @@
 
 PORTNAME=	mozilla
 PORTVERSION=	1.0
-PORTEPOCH=	1
 PORTREVISION=	1
+PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA} \
 		http://people.FreeBSD.org/~sobomax/:local
@@ -21,8 +21,7 @@ MAINTAINER=	gnome@FreeBSD.org
 
 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
 		freetype-config:${PORTSDIR}/print/freetype2
-LIB_DEPENDS=	ORBit.2:${PORTSDIR}/devel/ORBit \
-		jpeg.9:${PORTSDIR}/graphics/jpeg \
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		mng.1:${PORTSDIR}/graphics/libmng \
 		freetype.9:${PORTSDIR}/print/freetype2
@@ -36,7 +35,8 @@ EXTRACT_AFTER_ARGS=	| tar -xf - -X ${FILESDIR}/tar-exclude
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	orbit gtk12
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=					\
 		--disable-auto-deps		\
@@ -54,7 +54,6 @@ CONFIGURE_ARGS=					\
 		--disable-optimize		\
 		--disable-pedantic		\
 		--disable-plaintext-editor-only	\
-		--enable-reorder		\
 		--enable-strip			\
 		--enable-svg			\
 		--disable-tests			\
@@ -98,6 +97,14 @@ MAKE_ENV=	LD_LIBRARY_PATH=${WRKSRC}/dist/bin \
 		MOZ_INTERNAL_LIBART_LGPL=1
 ALL_TARGET=	default
 
+.if ${ARCH} == "i386"
+CONFIGURE_ARGS+=	--enable-reorder
+.endif
+
+.if ${ARCH} == "alpha"
+BROKEN=	"core dumps on alpha during post-build"
+.endif
+
 .if exists(${LOCALBASE}/include/freetype/freetype.h)
 BROKEN="You must upgrade your freetype port to 1.3.1_2 or higher before installing Mozilla.  If you have 1.3.1_2 installed, please remove ${LOCALBASE}/include/freetype, then build Mozilla"
 .endif
diff --git a/www/mozilla-vendor/files/patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86.h b/www/mozilla-vendor/files/patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86.h
new file mode 100644
index 0000000..2224e67
--- /dev/null
+++ b/www/mozilla-vendor/files/patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86.h
@@ -0,0 +1,21 @@
+--- xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h.orig	Fri Jun 21 01:12:40 2002
++++ xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h	Fri Jun 21 01:41:51 2002
+@@ -94,8 +94,16 @@
+  * gcc is that the system gcc defines __FreeBSD_cc_version.  This variable
+  * can also identify the period of time that 4.0-CURRENT used thunks.
+  */
+-#if defined(__FreeBSD_cc_version) && \
+-    (__FreeBSD_cc_version < 400002 || __FreeBSD_cc_version > 400003)
++
++/* It seems we need to use thunks in FreeBSD -CURRENT after gcc-3.1 was merged.
++ * This solves a problem wherein regxpcom and/or regchrome would seg fault
++ * after running for a while.  This problem has also exhibited itself on 
++ * the alpha platform.  Therefore, use thunks on all versions of
++ * -CURRENT that are using gcc-3.1.
++ */
++#if defined(__FreeBSD_cc_version) && \
++    (__FreeBSD_cc_version < 400002 || __FreeBSD_cc_version > 400003) && \
++    (__FreeBSD_cc_version < 500003)
+ #define CFRONT_STYLE_THIS_ADJUST
+ #else
+ #define THUNK_BASED_THIS_ADJUST
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index 1576e0c..7d08a64 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -7,8 +7,8 @@
 
 PORTNAME=	mozilla
 PORTVERSION=	1.0
-PORTEPOCH=	1
 PORTREVISION=	1
+PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA} \
 		http://people.FreeBSD.org/~sobomax/:local
@@ -21,8 +21,7 @@ MAINTAINER=	gnome@FreeBSD.org
 
 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
 		freetype-config:${PORTSDIR}/print/freetype2
-LIB_DEPENDS=	ORBit.2:${PORTSDIR}/devel/ORBit \
-		jpeg.9:${PORTSDIR}/graphics/jpeg \
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		mng.1:${PORTSDIR}/graphics/libmng \
 		freetype.9:${PORTSDIR}/print/freetype2
@@ -36,7 +35,8 @@ EXTRACT_AFTER_ARGS=	| tar -xf - -X ${FILESDIR}/tar-exclude
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	orbit gtk12
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=					\
 		--disable-auto-deps		\
@@ -54,7 +54,6 @@ CONFIGURE_ARGS=					\
 		--disable-optimize		\
 		--disable-pedantic		\
 		--disable-plaintext-editor-only	\
-		--enable-reorder		\
 		--enable-strip			\
 		--enable-svg			\
 		--disable-tests			\
@@ -98,6 +97,14 @@ MAKE_ENV=	LD_LIBRARY_PATH=${WRKSRC}/dist/bin \
 		MOZ_INTERNAL_LIBART_LGPL=1
 ALL_TARGET=	default
 
+.if ${ARCH} == "i386"
+CONFIGURE_ARGS+=	--enable-reorder
+.endif
+
+.if ${ARCH} == "alpha"
+BROKEN=	"core dumps on alpha during post-build"
+.endif
+
 .if exists(${LOCALBASE}/include/freetype/freetype.h)
 BROKEN="You must upgrade your freetype port to 1.3.1_2 or higher before installing Mozilla.  If you have 1.3.1_2 installed, please remove ${LOCALBASE}/include/freetype, then build Mozilla"
 .endif
diff --git a/www/mozilla/files/patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86.h b/www/mozilla/files/patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86.h
new file mode 100644
index 0000000..2224e67
--- /dev/null
+++ b/www/mozilla/files/patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86.h
@@ -0,0 +1,21 @@
+--- xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h.orig	Fri Jun 21 01:12:40 2002
++++ xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h	Fri Jun 21 01:41:51 2002
+@@ -94,8 +94,16 @@
+  * gcc is that the system gcc defines __FreeBSD_cc_version.  This variable
+  * can also identify the period of time that 4.0-CURRENT used thunks.
+  */
+-#if defined(__FreeBSD_cc_version) && \
+-    (__FreeBSD_cc_version < 400002 || __FreeBSD_cc_version > 400003)
++
++/* It seems we need to use thunks in FreeBSD -CURRENT after gcc-3.1 was merged.
++ * This solves a problem wherein regxpcom and/or regchrome would seg fault
++ * after running for a while.  This problem has also exhibited itself on 
++ * the alpha platform.  Therefore, use thunks on all versions of
++ * -CURRENT that are using gcc-3.1.
++ */
++#if defined(__FreeBSD_cc_version) && \
++    (__FreeBSD_cc_version < 400002 || __FreeBSD_cc_version > 400003) && \
++    (__FreeBSD_cc_version < 500003)
+ #define CFRONT_STYLE_THIS_ADJUST
+ #else
+ #define THUNK_BASED_THIS_ADJUST
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 1576e0c..7d08a64 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -7,8 +7,8 @@
 
 PORTNAME=	mozilla
 PORTVERSION=	1.0
-PORTEPOCH=	1
 PORTREVISION=	1
+PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA} \
 		http://people.FreeBSD.org/~sobomax/:local
@@ -21,8 +21,7 @@ MAINTAINER=	gnome@FreeBSD.org
 
 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
 		freetype-config:${PORTSDIR}/print/freetype2
-LIB_DEPENDS=	ORBit.2:${PORTSDIR}/devel/ORBit \
-		jpeg.9:${PORTSDIR}/graphics/jpeg \
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		mng.1:${PORTSDIR}/graphics/libmng \
 		freetype.9:${PORTSDIR}/print/freetype2
@@ -36,7 +35,8 @@ EXTRACT_AFTER_ARGS=	| tar -xf - -X ${FILESDIR}/tar-exclude
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	orbit gtk12
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=					\
 		--disable-auto-deps		\
@@ -54,7 +54,6 @@ CONFIGURE_ARGS=					\
 		--disable-optimize		\
 		--disable-pedantic		\
 		--disable-plaintext-editor-only	\
-		--enable-reorder		\
 		--enable-strip			\
 		--enable-svg			\
 		--disable-tests			\
@@ -98,6 +97,14 @@ MAKE_ENV=	LD_LIBRARY_PATH=${WRKSRC}/dist/bin \
 		MOZ_INTERNAL_LIBART_LGPL=1
 ALL_TARGET=	default
 
+.if ${ARCH} == "i386"
+CONFIGURE_ARGS+=	--enable-reorder
+.endif
+
+.if ${ARCH} == "alpha"
+BROKEN=	"core dumps on alpha during post-build"
+.endif
+
 .if exists(${LOCALBASE}/include/freetype/freetype.h)
 BROKEN="You must upgrade your freetype port to 1.3.1_2 or higher before installing Mozilla.  If you have 1.3.1_2 installed, please remove ${LOCALBASE}/include/freetype, then build Mozilla"
 .endif
diff --git a/www/seamonkey/files/patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86.h b/www/seamonkey/files/patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86.h
new file mode 100644
index 0000000..2224e67
--- /dev/null
+++ b/www/seamonkey/files/patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86.h
@@ -0,0 +1,21 @@
+--- xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h.orig	Fri Jun 21 01:12:40 2002
++++ xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h	Fri Jun 21 01:41:51 2002
+@@ -94,8 +94,16 @@
+  * gcc is that the system gcc defines __FreeBSD_cc_version.  This variable
+  * can also identify the period of time that 4.0-CURRENT used thunks.
+  */
+-#if defined(__FreeBSD_cc_version) && \
+-    (__FreeBSD_cc_version < 400002 || __FreeBSD_cc_version > 400003)
++
++/* It seems we need to use thunks in FreeBSD -CURRENT after gcc-3.1 was merged.
++ * This solves a problem wherein regxpcom and/or regchrome would seg fault
++ * after running for a while.  This problem has also exhibited itself on 
++ * the alpha platform.  Therefore, use thunks on all versions of
++ * -CURRENT that are using gcc-3.1.
++ */
++#if defined(__FreeBSD_cc_version) && \
++    (__FreeBSD_cc_version < 400002 || __FreeBSD_cc_version > 400003) && \
++    (__FreeBSD_cc_version < 500003)
+ #define CFRONT_STYLE_THIS_ADJUST
+ #else
+ #define THUNK_BASED_THIS_ADJUST
diff --git a/www/seamonkey2/Makefile b/www/seamonkey2/Makefile
index 1576e0c..7d08a64 100644
--- a/www/seamonkey2/Makefile
+++ b/www/seamonkey2/Makefile
@@ -7,8 +7,8 @@
 
 PORTNAME=	mozilla
 PORTVERSION=	1.0
-PORTEPOCH=	1
 PORTREVISION=	1
+PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA} \
 		http://people.FreeBSD.org/~sobomax/:local
@@ -21,8 +21,7 @@ MAINTAINER=	gnome@FreeBSD.org
 
 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
 		freetype-config:${PORTSDIR}/print/freetype2
-LIB_DEPENDS=	ORBit.2:${PORTSDIR}/devel/ORBit \
-		jpeg.9:${PORTSDIR}/graphics/jpeg \
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		mng.1:${PORTSDIR}/graphics/libmng \
 		freetype.9:${PORTSDIR}/print/freetype2
@@ -36,7 +35,8 @@ EXTRACT_AFTER_ARGS=	| tar -xf - -X ${FILESDIR}/tar-exclude
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	orbit gtk12
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=					\
 		--disable-auto-deps		\
@@ -54,7 +54,6 @@ CONFIGURE_ARGS=					\
 		--disable-optimize		\
 		--disable-pedantic		\
 		--disable-plaintext-editor-only	\
-		--enable-reorder		\
 		--enable-strip			\
 		--enable-svg			\
 		--disable-tests			\
@@ -98,6 +97,14 @@ MAKE_ENV=	LD_LIBRARY_PATH=${WRKSRC}/dist/bin \
 		MOZ_INTERNAL_LIBART_LGPL=1
 ALL_TARGET=	default
 
+.if ${ARCH} == "i386"
+CONFIGURE_ARGS+=	--enable-reorder
+.endif
+
+.if ${ARCH} == "alpha"
+BROKEN=	"core dumps on alpha during post-build"
+.endif
+
 .if exists(${LOCALBASE}/include/freetype/freetype.h)
 BROKEN="You must upgrade your freetype port to 1.3.1_2 or higher before installing Mozilla.  If you have 1.3.1_2 installed, please remove ${LOCALBASE}/include/freetype, then build Mozilla"
 .endif
diff --git a/www/seamonkey2/files/patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86.h b/www/seamonkey2/files/patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86.h
new file mode 100644
index 0000000..2224e67
--- /dev/null
+++ b/www/seamonkey2/files/patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86.h
@@ -0,0 +1,21 @@
+--- xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h.orig	Fri Jun 21 01:12:40 2002
++++ xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h	Fri Jun 21 01:41:51 2002
+@@ -94,8 +94,16 @@
+  * gcc is that the system gcc defines __FreeBSD_cc_version.  This variable
+  * can also identify the period of time that 4.0-CURRENT used thunks.
+  */
+-#if defined(__FreeBSD_cc_version) && \
+-    (__FreeBSD_cc_version < 400002 || __FreeBSD_cc_version > 400003)
++
++/* It seems we need to use thunks in FreeBSD -CURRENT after gcc-3.1 was merged.
++ * This solves a problem wherein regxpcom and/or regchrome would seg fault
++ * after running for a while.  This problem has also exhibited itself on 
++ * the alpha platform.  Therefore, use thunks on all versions of
++ * -CURRENT that are using gcc-3.1.
++ */
++#if defined(__FreeBSD_cc_version) && \
++    (__FreeBSD_cc_version < 400002 || __FreeBSD_cc_version > 400003) && \
++    (__FreeBSD_cc_version < 500003)
+ #define CFRONT_STYLE_THIS_ADJUST
+ #else
+ #define THUNK_BASED_THIS_ADJUST