diff options
author | maho <maho@FreeBSD.org> | 2006-05-31 11:05:49 +0800 |
---|---|---|
committer | maho <maho@FreeBSD.org> | 2006-05-31 11:05:49 +0800 |
commit | e823d2ed2166d483b1640b8de50e987b9021448b (patch) | |
tree | 743e48962048d6748911811ddeb6f93fa2263532 /editors | |
parent | a6d6286361e41600ab67006bbb94013d7003da31 (diff) | |
download | freebsd-ports-gnome-e823d2ed2166d483b1640b8de50e987b9021448b.tar.gz freebsd-ports-gnome-e823d2ed2166d483b1640b8de50e987b9021448b.tar.zst freebsd-ports-gnome-e823d2ed2166d483b1640b8de50e987b9021448b.zip |
MACHINE_ARCH fix.
Submitted by: FreshPorts Sanity Daemon <FreshPorts@FreshPorts.org>
Pointy hat to: myself
Diffstat (limited to 'editors')
-rw-r--r-- | editors/openoffice-3-devel/Makefile | 8 | ||||
-rw-r--r-- | editors/openoffice.org-2-devel/Makefile | 8 | ||||
-rw-r--r-- | editors/openoffice.org-2.0-devel/Makefile | 8 | ||||
-rw-r--r-- | editors/openoffice.org-3-devel/Makefile | 8 | ||||
-rw-r--r-- | editors/openoffice.org-vcltesttool/Makefile | 8 |
5 files changed, 20 insertions, 20 deletions
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile index c52bb0d454c6..b72fe2475fef 100644 --- a/editors/openoffice-3-devel/Makefile +++ b/editors/openoffice-3-devel/Makefile @@ -57,7 +57,7 @@ BROKEN= "Work in progress" USE_JAVA= yes JAVA_VERSION= 1.4+ JAVA_BUILD= jdk -.if ${ARCH} == amd64 +.if ${MACHINE_ARCH} == amd64 JAVA_VENDOR= bsdjava .else JAVA_VENDOR= freebsd bsdjava @@ -67,11 +67,11 @@ JAVA_VENDOR= freebsd bsdjava .include <bsd.port.pre.mk> .include <${FILESDIR}/Makefile.localized> -.if ${ARCH} == amd64 +.if ${MACHINE_ARCH} == amd64 GCC_TARGET= x86_64-portbld-freebsd${OSREL} FREEBSD_ENV_SET= FreeBSDAMDEnv.Set .else -GCC_TARGET= ${ARCH}-portbld-freebsd${OSREL} +GCC_TARGET= ${MACHINE_ARCH}-portbld-freebsd${OSREL} FREEBSD_ENV_SET= FreeBSDIntelEnv.Set .endif @@ -88,7 +88,7 @@ INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} EXECBASE?= openoffice.org-${OOOTAG} DIST_SUBDIR= openoffice.org2.0 SIMPLEOSVER= ${OSREL:C/\.//g} -.if ${ARCH} == amd64 +.if ${MACHINE_ARCH} == amd64 PACKAGE_BASENAME= OOo_${OOOTAG}_${OPSYS}${SIMPLEOSVER}X86_64 .else PACKAGE_BASENAME= OOo_${OOOTAG}_${OPSYS}${SIMPLEOSVER}Intel diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile index c52bb0d454c6..b72fe2475fef 100644 --- a/editors/openoffice.org-2-devel/Makefile +++ b/editors/openoffice.org-2-devel/Makefile @@ -57,7 +57,7 @@ BROKEN= "Work in progress" USE_JAVA= yes JAVA_VERSION= 1.4+ JAVA_BUILD= jdk -.if ${ARCH} == amd64 +.if ${MACHINE_ARCH} == amd64 JAVA_VENDOR= bsdjava .else JAVA_VENDOR= freebsd bsdjava @@ -67,11 +67,11 @@ JAVA_VENDOR= freebsd bsdjava .include <bsd.port.pre.mk> .include <${FILESDIR}/Makefile.localized> -.if ${ARCH} == amd64 +.if ${MACHINE_ARCH} == amd64 GCC_TARGET= x86_64-portbld-freebsd${OSREL} FREEBSD_ENV_SET= FreeBSDAMDEnv.Set .else -GCC_TARGET= ${ARCH}-portbld-freebsd${OSREL} +GCC_TARGET= ${MACHINE_ARCH}-portbld-freebsd${OSREL} FREEBSD_ENV_SET= FreeBSDIntelEnv.Set .endif @@ -88,7 +88,7 @@ INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} EXECBASE?= openoffice.org-${OOOTAG} DIST_SUBDIR= openoffice.org2.0 SIMPLEOSVER= ${OSREL:C/\.//g} -.if ${ARCH} == amd64 +.if ${MACHINE_ARCH} == amd64 PACKAGE_BASENAME= OOo_${OOOTAG}_${OPSYS}${SIMPLEOSVER}X86_64 .else PACKAGE_BASENAME= OOo_${OOOTAG}_${OPSYS}${SIMPLEOSVER}Intel diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile index c52bb0d454c6..b72fe2475fef 100644 --- a/editors/openoffice.org-2.0-devel/Makefile +++ b/editors/openoffice.org-2.0-devel/Makefile @@ -57,7 +57,7 @@ BROKEN= "Work in progress" USE_JAVA= yes JAVA_VERSION= 1.4+ JAVA_BUILD= jdk -.if ${ARCH} == amd64 +.if ${MACHINE_ARCH} == amd64 JAVA_VENDOR= bsdjava .else JAVA_VENDOR= freebsd bsdjava @@ -67,11 +67,11 @@ JAVA_VENDOR= freebsd bsdjava .include <bsd.port.pre.mk> .include <${FILESDIR}/Makefile.localized> -.if ${ARCH} == amd64 +.if ${MACHINE_ARCH} == amd64 GCC_TARGET= x86_64-portbld-freebsd${OSREL} FREEBSD_ENV_SET= FreeBSDAMDEnv.Set .else -GCC_TARGET= ${ARCH}-portbld-freebsd${OSREL} +GCC_TARGET= ${MACHINE_ARCH}-portbld-freebsd${OSREL} FREEBSD_ENV_SET= FreeBSDIntelEnv.Set .endif @@ -88,7 +88,7 @@ INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} EXECBASE?= openoffice.org-${OOOTAG} DIST_SUBDIR= openoffice.org2.0 SIMPLEOSVER= ${OSREL:C/\.//g} -.if ${ARCH} == amd64 +.if ${MACHINE_ARCH} == amd64 PACKAGE_BASENAME= OOo_${OOOTAG}_${OPSYS}${SIMPLEOSVER}X86_64 .else PACKAGE_BASENAME= OOo_${OOOTAG}_${OPSYS}${SIMPLEOSVER}Intel diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile index c52bb0d454c6..b72fe2475fef 100644 --- a/editors/openoffice.org-3-devel/Makefile +++ b/editors/openoffice.org-3-devel/Makefile @@ -57,7 +57,7 @@ BROKEN= "Work in progress" USE_JAVA= yes JAVA_VERSION= 1.4+ JAVA_BUILD= jdk -.if ${ARCH} == amd64 +.if ${MACHINE_ARCH} == amd64 JAVA_VENDOR= bsdjava .else JAVA_VENDOR= freebsd bsdjava @@ -67,11 +67,11 @@ JAVA_VENDOR= freebsd bsdjava .include <bsd.port.pre.mk> .include <${FILESDIR}/Makefile.localized> -.if ${ARCH} == amd64 +.if ${MACHINE_ARCH} == amd64 GCC_TARGET= x86_64-portbld-freebsd${OSREL} FREEBSD_ENV_SET= FreeBSDAMDEnv.Set .else -GCC_TARGET= ${ARCH}-portbld-freebsd${OSREL} +GCC_TARGET= ${MACHINE_ARCH}-portbld-freebsd${OSREL} FREEBSD_ENV_SET= FreeBSDIntelEnv.Set .endif @@ -88,7 +88,7 @@ INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} EXECBASE?= openoffice.org-${OOOTAG} DIST_SUBDIR= openoffice.org2.0 SIMPLEOSVER= ${OSREL:C/\.//g} -.if ${ARCH} == amd64 +.if ${MACHINE_ARCH} == amd64 PACKAGE_BASENAME= OOo_${OOOTAG}_${OPSYS}${SIMPLEOSVER}X86_64 .else PACKAGE_BASENAME= OOo_${OOOTAG}_${OPSYS}${SIMPLEOSVER}Intel diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile index c52bb0d454c6..b72fe2475fef 100644 --- a/editors/openoffice.org-vcltesttool/Makefile +++ b/editors/openoffice.org-vcltesttool/Makefile @@ -57,7 +57,7 @@ BROKEN= "Work in progress" USE_JAVA= yes JAVA_VERSION= 1.4+ JAVA_BUILD= jdk -.if ${ARCH} == amd64 +.if ${MACHINE_ARCH} == amd64 JAVA_VENDOR= bsdjava .else JAVA_VENDOR= freebsd bsdjava @@ -67,11 +67,11 @@ JAVA_VENDOR= freebsd bsdjava .include <bsd.port.pre.mk> .include <${FILESDIR}/Makefile.localized> -.if ${ARCH} == amd64 +.if ${MACHINE_ARCH} == amd64 GCC_TARGET= x86_64-portbld-freebsd${OSREL} FREEBSD_ENV_SET= FreeBSDAMDEnv.Set .else -GCC_TARGET= ${ARCH}-portbld-freebsd${OSREL} +GCC_TARGET= ${MACHINE_ARCH}-portbld-freebsd${OSREL} FREEBSD_ENV_SET= FreeBSDIntelEnv.Set .endif @@ -88,7 +88,7 @@ INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} EXECBASE?= openoffice.org-${OOOTAG} DIST_SUBDIR= openoffice.org2.0 SIMPLEOSVER= ${OSREL:C/\.//g} -.if ${ARCH} == amd64 +.if ${MACHINE_ARCH} == amd64 PACKAGE_BASENAME= OOo_${OOOTAG}_${OPSYS}${SIMPLEOSVER}X86_64 .else PACKAGE_BASENAME= OOo_${OOOTAG}_${OPSYS}${SIMPLEOSVER}Intel |