aboutsummaryrefslogtreecommitdiff
path: root/security/john/Makefile
diff options
context:
space:
mode:
authorDavid E. O'Brien <obrien@FreeBSD.org>1998-12-07 08:59:21 +0000
committerDavid E. O'Brien <obrien@FreeBSD.org>1998-12-07 08:59:21 +0000
commit489a7164cb518a9fb09457d186954b0a22dd6719 (patch)
tree7e476e3739bb9566a691d9d20445d702f033705a /security/john/Makefile
parent279abe36d74e0c3d49362d3535fc060b25ec9581 (diff)
downloadports-489a7164cb518a9fb09457d186954b0a22dd6719.tar.gz
ports-489a7164cb518a9fb09457d186954b0a22dd6719.zip
Upgrade to version 1.6.
Adds a new target for Intel MMX chips. (AMD K-6 already had their own target) Define "HAVE_MMX" to turn on optimizations for Intel MMX chipes. Define "HAVE_K6" to turn on opts for AMD K6 chips.
Notes
Notes: svn path=/head/; revision=15168
Diffstat (limited to 'security/john/Makefile')
-rw-r--r--security/john/Makefile46
1 files changed, 30 insertions, 16 deletions
diff --git a/security/john/Makefile b/security/john/Makefile
index b13dca3c213c..71e947ac6ac5 100644
--- a/security/john/Makefile
+++ b/security/john/Makefile
@@ -4,28 +4,49 @@
# Date created: Sun Mar 09, 1997
# Whom: David O'Brien (obrien@FreeBSD.org)
#
-# $Id: Makefile,v 1.5 1998/07/28 01:49:59 obrien Exp $
+# $Id: Makefile,v 1.6 1998/07/28 01:56:02 obrien Exp $
#
-DISTNAME= john-1.5
+DISTNAME= john-1.6
CATEGORIES= security
MASTER_SITES= http://www.false.com/security/john/ \
ftp://ftp.false.com/pub/security/john/
MAINTAINER= obrien@FreeBSD.org
-PATCH_SITES= ${MASTER_SITES}
-PATCHFILES= john-1.5-bugfix.diff
-
RESTRICTED= "contains crypto (crypt())"
-WRKSRC= ${WRKDIR}/${DISTNAME}/src
+.include <bsd.port.pre.mk>
+
+OSNAME= ${OPSYS:S/F/f/:S/N/n/:S/O/o/:S/B/b/:S/S/s/:S/D/d/}
+
+.if (${ARCH} == "i386")
+ARCHNAME= x86
+.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
+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= ${OSNAME}-${ARCHNAME}-any
+ALL_TARGET:= ${ALL_TARGET:S/BINFMT$/a.out/}
.endif
+WRKSRC= ${WRKDIR}/${DISTNAME}/src
+
+pre-fetch:
+ @${ECHO} "Building for ${ALL_TARGET}"
+
do-configure:
@${MV} ${WRKDIR}/${DISTNAME}/run/john.ini ${WRKDIR}/${DISTNAME}/run/john.ini.in
@${SED} -e "s:~/all.chr:${PREFIX}/share/john/all.chr:" \
@@ -50,11 +71,4 @@ do-install:
@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/doc/* ${PREFIX}/share/doc/john
.endif
-.include <bsd.port.mk>
-
-OSNAME!= /usr/bin/uname -s | ${TR} [A-Z] [a-z]
-.if (${ARCH} == "i386")
-ARCHNAME= x86
-.else
-ARCHNAME= ${ARCH}
-.endif
+.include <bsd.port.post.mk>