Get rid of MACIHNE_ARCH

o JAVA_VENDOR= freebsd bsdjava for amd64 implies bsdjava.
freebsd is ignored

11 files changed, 0 insertions, 39 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index d1f73d9853f9..1c9237be1d67 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -51,9 +51,6 @@ WITHOUT_CPU_CFLAGS=	true
 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
 JAVA_BUILD=	jdk
-.if ${MACHINE_ARCH} == amd64 # cannot use ARCH
-JAVA_VENDOR=	bsdjava
-.else
 JAVA_VENDOR=	freebsd bsdjava
 .endif
 .endif
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index d96858a4c177..a272745ff47e 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -49,12 +49,8 @@ WITHOUT_CPU_CFLAGS=	true
 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
 JAVA_BUILD=	jdk
-.if ${MACHINE_ARCH} == amd64 # cannot use ARCH
-JAVA_VENDOR=	bsdjava
-.else
 JAVA_VENDOR=	freebsd bsdjava
 .endif
-.endif
 
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.localized>
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index d96858a4c177..a272745ff47e 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -49,12 +49,8 @@ WITHOUT_CPU_CFLAGS=	true
 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
 JAVA_BUILD=	jdk
-.if ${MACHINE_ARCH} == amd64 # cannot use ARCH
-JAVA_VENDOR=	bsdjava
-.else
 JAVA_VENDOR=	freebsd bsdjava
 .endif
-.endif
 
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.localized>
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index d1f73d9853f9..1c9237be1d67 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -51,9 +51,6 @@ WITHOUT_CPU_CFLAGS=	true
 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
 JAVA_BUILD=	jdk
-.if ${MACHINE_ARCH} == amd64 # cannot use ARCH
-JAVA_VENDOR=	bsdjava
-.else
 JAVA_VENDOR=	freebsd bsdjava
 .endif
 .endif
diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index d1f73d9853f9..1c9237be1d67 100644
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/Makefile
@@ -51,9 +51,6 @@ WITHOUT_CPU_CFLAGS=	true
 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
 JAVA_BUILD=	jdk
-.if ${MACHINE_ARCH} == amd64 # cannot use ARCH
-JAVA_VENDOR=	bsdjava
-.else
 JAVA_VENDOR=	freebsd bsdjava
 .endif
 .endif
diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile
index d96858a4c177..a272745ff47e 100644
--- a/editors/openoffice.org-2.0/Makefile
+++ b/editors/openoffice.org-2.0/Makefile
@@ -49,12 +49,8 @@ WITHOUT_CPU_CFLAGS=	true
 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
 JAVA_BUILD=	jdk
-.if ${MACHINE_ARCH} == amd64 # cannot use ARCH
-JAVA_VENDOR=	bsdjava
-.else
 JAVA_VENDOR=	freebsd bsdjava
 .endif
-.endif
 
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.localized>
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index d96858a4c177..a272745ff47e 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -49,12 +49,8 @@ WITHOUT_CPU_CFLAGS=	true
 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
 JAVA_BUILD=	jdk
-.if ${MACHINE_ARCH} == amd64 # cannot use ARCH
-JAVA_VENDOR=	bsdjava
-.else
 JAVA_VENDOR=	freebsd bsdjava
 .endif
-.endif
 
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.localized>
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index d96858a4c177..a272745ff47e 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -49,12 +49,8 @@ WITHOUT_CPU_CFLAGS=	true
 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
 JAVA_BUILD=	jdk
-.if ${MACHINE_ARCH} == amd64 # cannot use ARCH
-JAVA_VENDOR=	bsdjava
-.else
 JAVA_VENDOR=	freebsd bsdjava
 .endif
-.endif
 
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.localized>
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index d1f73d9853f9..1c9237be1d67 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -51,9 +51,6 @@ WITHOUT_CPU_CFLAGS=	true
 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
 JAVA_BUILD=	jdk
-.if ${MACHINE_ARCH} == amd64 # cannot use ARCH
-JAVA_VENDOR=	bsdjava
-.else
 JAVA_VENDOR=	freebsd bsdjava
 .endif
 .endif
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index d96858a4c177..a272745ff47e 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -49,12 +49,8 @@ WITHOUT_CPU_CFLAGS=	true
 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
 JAVA_BUILD=	jdk
-.if ${MACHINE_ARCH} == amd64 # cannot use ARCH
-JAVA_VENDOR=	bsdjava
-.else
 JAVA_VENDOR=	freebsd bsdjava
 .endif
-.endif
 
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.localized>
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index d1f73d9853f9..1c9237be1d67 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -51,9 +51,6 @@ WITHOUT_CPU_CFLAGS=	true
 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
 JAVA_BUILD=	jdk
-.if ${MACHINE_ARCH} == amd64 # cannot use ARCH
-JAVA_VENDOR=	bsdjava
-.else
 JAVA_VENDOR=	freebsd bsdjava
 .endif
 .endif