Unbreak for amd64

6 files changed, 24 insertions, 30 deletions

diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index a272745ff47e..de0de65c256a 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -58,10 +58,6 @@ JAVA_VENDOR=	freebsd bsdjava
 ONLY_FOR_ARCHS=	amd64 i386
 
 .if ${ARCH} == amd64
-BROKEN=		"Work in progress"
-.endif
-
-.if ${ARCH} == amd64
 GCC_TARGET=		x86_64-portbld-freebsd${OSREL}
 FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 .else
@@ -161,7 +157,10 @@ CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE
 #workarounds
 CONFIGURE_ARGS+=	--with-system-xrender-headers=yes #i62713#
 CONFIGURE_ARGS+=	--with-system-freetype #link error with internal one
-.if (${GCCVER} == 4.1.1)
+.if ${ARCH} == amd64
+WITHOUT_MOZILLA=	yes
+.endif
+.if (${GCCVER} == 4.1.2)
 LIB_DEPENDS=   boost_regex:${PORTSDIR}/devel/boost
 CONFIGURE_ARGS+=       --with-system-boost=yes #i58343#
 .endif
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index a272745ff47e..de0de65c256a 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -58,10 +58,6 @@ JAVA_VENDOR=	freebsd bsdjava
 ONLY_FOR_ARCHS=	amd64 i386
 
 .if ${ARCH} == amd64
-BROKEN=		"Work in progress"
-.endif
-
-.if ${ARCH} == amd64
 GCC_TARGET=		x86_64-portbld-freebsd${OSREL}
 FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 .else
@@ -161,7 +157,10 @@ CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE
 #workarounds
 CONFIGURE_ARGS+=	--with-system-xrender-headers=yes #i62713#
 CONFIGURE_ARGS+=	--with-system-freetype #link error with internal one
-.if (${GCCVER} == 4.1.1)
+.if ${ARCH} == amd64
+WITHOUT_MOZILLA=	yes
+.endif
+.if (${GCCVER} == 4.1.2)
 LIB_DEPENDS=   boost_regex:${PORTSDIR}/devel/boost
 CONFIGURE_ARGS+=       --with-system-boost=yes #i58343#
 .endif
diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile
index a272745ff47e..de0de65c256a 100644
--- a/editors/openoffice.org-2.0/Makefile
+++ b/editors/openoffice.org-2.0/Makefile
@@ -58,10 +58,6 @@ JAVA_VENDOR=	freebsd bsdjava
 ONLY_FOR_ARCHS=	amd64 i386
 
 .if ${ARCH} == amd64
-BROKEN=		"Work in progress"
-.endif
-
-.if ${ARCH} == amd64
 GCC_TARGET=		x86_64-portbld-freebsd${OSREL}
 FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 .else
@@ -161,7 +157,10 @@ CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE
 #workarounds
 CONFIGURE_ARGS+=	--with-system-xrender-headers=yes #i62713#
 CONFIGURE_ARGS+=	--with-system-freetype #link error with internal one
-.if (${GCCVER} == 4.1.1)
+.if ${ARCH} == amd64
+WITHOUT_MOZILLA=	yes
+.endif
+.if (${GCCVER} == 4.1.2)
 LIB_DEPENDS=   boost_regex:${PORTSDIR}/devel/boost
 CONFIGURE_ARGS+=       --with-system-boost=yes #i58343#
 .endif
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index a272745ff47e..de0de65c256a 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -58,10 +58,6 @@ JAVA_VENDOR=	freebsd bsdjava
 ONLY_FOR_ARCHS=	amd64 i386
 
 .if ${ARCH} == amd64
-BROKEN=		"Work in progress"
-.endif
-
-.if ${ARCH} == amd64
 GCC_TARGET=		x86_64-portbld-freebsd${OSREL}
 FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 .else
@@ -161,7 +157,10 @@ CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE
 #workarounds
 CONFIGURE_ARGS+=	--with-system-xrender-headers=yes #i62713#
 CONFIGURE_ARGS+=	--with-system-freetype #link error with internal one
-.if (${GCCVER} == 4.1.1)
+.if ${ARCH} == amd64
+WITHOUT_MOZILLA=	yes
+.endif
+.if (${GCCVER} == 4.1.2)
 LIB_DEPENDS=   boost_regex:${PORTSDIR}/devel/boost
 CONFIGURE_ARGS+=       --with-system-boost=yes #i58343#
 .endif
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index a272745ff47e..de0de65c256a 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -58,10 +58,6 @@ JAVA_VENDOR=	freebsd bsdjava
 ONLY_FOR_ARCHS=	amd64 i386
 
 .if ${ARCH} == amd64
-BROKEN=		"Work in progress"
-.endif
-
-.if ${ARCH} == amd64
 GCC_TARGET=		x86_64-portbld-freebsd${OSREL}
 FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 .else
@@ -161,7 +157,10 @@ CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE
 #workarounds
 CONFIGURE_ARGS+=	--with-system-xrender-headers=yes #i62713#
 CONFIGURE_ARGS+=	--with-system-freetype #link error with internal one
-.if (${GCCVER} == 4.1.1)
+.if ${ARCH} == amd64
+WITHOUT_MOZILLA=	yes
+.endif
+.if (${GCCVER} == 4.1.2)
 LIB_DEPENDS=   boost_regex:${PORTSDIR}/devel/boost
 CONFIGURE_ARGS+=       --with-system-boost=yes #i58343#
 .endif
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index a272745ff47e..de0de65c256a 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -58,10 +58,6 @@ JAVA_VENDOR=	freebsd bsdjava
 ONLY_FOR_ARCHS=	amd64 i386
 
 .if ${ARCH} == amd64
-BROKEN=		"Work in progress"
-.endif
-
-.if ${ARCH} == amd64
 GCC_TARGET=		x86_64-portbld-freebsd${OSREL}
 FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 .else
@@ -161,7 +157,10 @@ CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE
 #workarounds
 CONFIGURE_ARGS+=	--with-system-xrender-headers=yes #i62713#
 CONFIGURE_ARGS+=	--with-system-freetype #link error with internal one
-.if (${GCCVER} == 4.1.1)
+.if ${ARCH} == amd64
+WITHOUT_MOZILLA=	yes
+.endif
+.if (${GCCVER} == 4.1.2)
 LIB_DEPENDS=   boost_regex:${PORTSDIR}/devel/boost
 CONFIGURE_ARGS+=       --with-system-boost=yes #i58343#
 .endif