mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-30 10:38:37 +00:00
Code Issues Releases Activity

MACHINE_ARCH fix.

Browse Source 
Submitted by:	FreshPorts Sanity Daemon <FreshPorts@FreshPorts.org>
Pointy hat to:  myself
This commit is contained in:
Maho Nakata 2006-05-31 03:05:19 +00:00
parent f411307653
commit 88f577aac6
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=164042
6 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
editors/openoffice-3/Makefile
View File

@ -55,7 +55,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
@ -65,11 +65,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
@ -84,7 +84,7 @@ INSTALLATION_BASEDIR?= openoffice.org-${OOOVERSION}
EXECBASE?= openoffice.org-${OOOVERSION}
DIST_SUBDIR= openoffice.org2.0
SIMPLEOSVER= ${OSREL:C/\.//g}
.if ${ARCH} == amd64
.if ${MACHINE_ARCH} == amd64
PACKAGE_BASENAME= OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}X86_64
.else
PACKAGE_BASENAME= OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}Intel

8
editors/openoffice.org-2-RC/Makefile
View File

@ -55,7 +55,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
@ -65,11 +65,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
@ -84,7 +84,7 @@ INSTALLATION_BASEDIR?= openoffice.org-${OOOVERSION}
EXECBASE?= openoffice.org-${OOOVERSION}
DIST_SUBDIR= openoffice.org2.0
SIMPLEOSVER= ${OSREL:C/\.//g}
.if ${ARCH} == amd64
.if ${MACHINE_ARCH} == amd64
PACKAGE_BASENAME= OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}X86_64
.else
PACKAGE_BASENAME= OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}Intel

8
editors/openoffice.org-2.0/Makefile
View File

@ -55,7 +55,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
@ -65,11 +65,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
@ -84,7 +84,7 @@ INSTALLATION_BASEDIR?= openoffice.org-${OOOVERSION}
EXECBASE?= openoffice.org-${OOOVERSION}
DIST_SUBDIR= openoffice.org2.0
SIMPLEOSVER= ${OSREL:C/\.//g}
.if ${ARCH} == amd64
.if ${MACHINE_ARCH} == amd64
PACKAGE_BASENAME= OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}X86_64
.else
PACKAGE_BASENAME= OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}Intel

8
editors/openoffice.org-2/Makefile
View File

@ -55,7 +55,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
@ -65,11 +65,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
@ -84,7 +84,7 @@ INSTALLATION_BASEDIR?= openoffice.org-${OOOVERSION}
EXECBASE?= openoffice.org-${OOOVERSION}
DIST_SUBDIR= openoffice.org2.0
SIMPLEOSVER= ${OSREL:C/\.//g}
.if ${ARCH} == amd64
.if ${MACHINE_ARCH} == amd64
PACKAGE_BASENAME= OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}X86_64
.else
PACKAGE_BASENAME= OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}Intel

8
editors/openoffice.org-3-RC/Makefile
View File

@ -55,7 +55,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
@ -65,11 +65,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
@ -84,7 +84,7 @@ INSTALLATION_BASEDIR?= openoffice.org-${OOOVERSION}
EXECBASE?= openoffice.org-${OOOVERSION}
DIST_SUBDIR= openoffice.org2.0
SIMPLEOSVER= ${OSREL:C/\.//g}
.if ${ARCH} == amd64
.if ${MACHINE_ARCH} == amd64
PACKAGE_BASENAME= OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}X86_64
.else
PACKAGE_BASENAME= OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}Intel

8
editors/openoffice.org-3/Makefile
View File

@ -55,7 +55,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
@ -65,11 +65,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
@ -84,7 +84,7 @@ INSTALLATION_BASEDIR?= openoffice.org-${OOOVERSION}
EXECBASE?= openoffice.org-${OOOVERSION}
DIST_SUBDIR= openoffice.org2.0
SIMPLEOSVER= ${OSREL:C/\.//g}
.if ${ARCH} == amd64
.if ${MACHINE_ARCH} == amd64
PACKAGE_BASENAME= OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}X86_64
.else
PACKAGE_BASENAME= OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}Intel