From 489a7164cb518a9fb09457d186954b0a22dd6719 Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Mon, 7 Dec 1998 08:59:21 +0000
Subject: [PATCH] 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.
---
 security/john/Makefile | 48 +++++++++++++++++++++++++++---------------
 security/john/distinfo |  3 +--
 2 files changed, 32 insertions(+), 19 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
-.if defined(HAVE_K6)
-ALL_TARGET=	${OSNAME}-${ARCHNAME}-k6
+.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
-ALL_TARGET=	${OSNAME}-${ARCHNAME}-any
+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/}
+.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>
diff --git a/security/john/distinfo b/security/john/distinfo
index 447ae1361616..f1d0e8e21397 100644
--- a/security/john/distinfo
+++ b/security/john/distinfo
@@ -1,2 +1 @@
-MD5 (john-1.5.tar.gz) = 2f8a5032f5f0156953e471cc5b349b71
-MD5 (john-1.5-bugfix.diff) = bfea5bf94acc0ff3d3d355fb47815df7
+MD5 (john-1.6.tar.gz) = aae782f160041b2bdc624b0a84054e32