aboutsummaryrefslogtreecommitdiff
path: root/security/john
diff options
context:
space:
mode:
authorKris Kennaway <kris@FreeBSD.org>2002-10-05 21:48:44 +0000
committerKris Kennaway <kris@FreeBSD.org>2002-10-05 21:48:44 +0000
commitba0c4e667cc067f33c9f08fbdcf1ea1827b4b26b (patch)
tree37a1c1ed270a838a7a31f0bb7bf936bffa321440 /security/john
parentcb00fd24efcbbca0b5b958a5276ee136f3a7d7ac (diff)
downloadports-ba0c4e667cc067f33c9f08fbdcf1ea1827b4b26b.tar.gz
ports-ba0c4e667cc067f33c9f08fbdcf1ea1827b4b26b.zip
Notes
Diffstat (limited to 'security/john')
-rw-r--r--security/john/Makefile27
1 files changed, 9 insertions, 18 deletions
diff --git a/security/john/Makefile b/security/john/Makefile
index ccf8a6ed350d..8a98570960f7 100644
--- a/security/john/Makefile
+++ b/security/john/Makefile
@@ -21,26 +21,17 @@ MAINTAINER= dominic_marks@btinternet.com
OSNAME= ${OPSYS:S/F/f/:S/N/n/:S/O/o/:S/B/b/:S/S/s/:S/D/d/}
-.if (${ARCH} == "i386")
+.if ${MACHINE_ARCH} == "i386"
ARCHNAME= x86
+. if ${MACHINE_CPU:Mk6}
+ALL_TARGET= ${OSNAME}-${ARCHNAME}-k6-elf
+. elif ${MACHINE_CPU:Mmmx}
+ALL_TARGET= ${OSNAME}-${ARCHNAME}-mmx-elf
+. else
+ALL_TARGET= ${OSNAME}-${ARCHNAME}-any-elf
+. endif
.else
-ARCHNAME= ${ARCH}
-.endif
-
-# could do something w/
-# if sysctl -n hw.model | grep AMD >/dev/null ; then echo AMD ; fi
-.if defined(HAVE_K6)
-ALL_TARGET= ${OSNAME}-${ARCHNAME}-k6-BINFMT
-.elif defined(HAVE_MMX)
-ALL_TARGET= ${OSNAME}-${ARCHNAME}-mmx-BINFMT
-.else
-ALL_TARGET= ${OSNAME}-${ARCHNAME}-any-BINFMT
-.endif
-
-.if ${PORTOBJFORMAT} == "elf"
-ALL_TARGET:= ${ALL_TARGET:S/BINFMT$/${PORTOBJFORMAT}/}
-.else
-ALL_TARGET:= ${ALL_TARGET:S/BINFMT$/a.out/}
+ARCHNAME= ${MACHINE_ARCH}
.endif
WRKSRC= ${WRKDIR}/${DISTNAME}/src