diff options
author | Maho Nakata <maho@FreeBSD.org> | 2006-05-31 03:05:49 +0000 |
---|---|---|
committer | Maho Nakata <maho@FreeBSD.org> | 2006-05-31 03:05:49 +0000 |
commit | c5a587a7007f0feb27065e16068654b81abb1918 (patch) | |
tree | 347d0607f3072affd93c20bccf79e34ba6b590d6 /editors | |
parent | 88f577aac67278750f8578c0fbea2c60de6ace40 (diff) |
Notes
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 |