head	1.4;
access;
symbols
	RELEASE_6_1_0:1.3
	RELEASE_5_5_0:1.3
	RELEASE_6_0_0:1.2
	RELEASE_5_4_0:1.2
	RELEASE_4_11_0:1.2
	RELEASE_5_3_0:1.2
	RELEASE_4_10_0:1.2
	RELEASE_5_2_1:1.1
	RELEASE_5_2_0:1.1
	RELEASE_4_9_0:1.1
	RELEASE_5_1_0:1.1
	RELEASE_4_8_0:1.1;
locks; strict;
comment	@# @;


1.4
date	2006.05.09.06.18.39;	author vd;	state dead;
branches;
next	1.3;

1.3
date	2005.12.31.04.28.08;	author ehaupt;	state Exp;
branches;
next	1.2;

1.2
date	2004.04.18.17.21.06;	author pav;	state Exp;
branches;
next	1.1;

1.1
date	2003.01.16.02.31.42;	author edwin;	state Exp;
branches;
next	;


desc
@@


1.4
log
@* Fix MMX detection logic
* Define custom paths using CFLAGS instead of patching the source [1]

PR:		ports/96991
Submitted by:	Rainer Alves <rainer.alves@@gmail.com> (maintainer)
Requested by:	solar@@openwall.com (author) [1]
@
text
@--- Makefile.orig	Mon Dec 12 19:53:36 2005
+++ Makefile	Sat Dec 31 01:30:01 2005
@@@@ -3,10 +3,10 @@@@
 # Copyright (c) 1996-2005 by Solar Designer
 #
 
-CPP = gcc
-CC = gcc
-AS = gcc
-LD = gcc
+CC ?= gcc
+CPP = $(CC)
+AS = $(CC)
+LD = $(CC)
 CP = cp
 LN = ln -sf
 RM = rm -f
@@@@ -15,7 +15,8 @@@@
 PERL = perl
 NULL = /dev/null
 CPPFLAGS = -E
-CFLAGS = -c -Wall -O2 -fomit-frame-pointer
+CFLAGS ?= -O2
+CFLAGS += -c -Wall -fomit-frame-pointer
 ASFLAGS = -c
 LDFLAGS = -s
 OPT_NORMAL = -funroll-loops
@


1.3
log
@- Update to 1.6.40
- Be more picky about whats PORTDOCS and what not
- Moved john.conf from ${DATADIR} to ${PREFIX}/etc
- Preserve existing/changed config file on install/deinstall
- Remove files/patch-john.conf
@
text
@@


1.2
log
@- Update to 1.6.37

PR:		ports/65623
Submitted by:	Dominic Marks <dom@@helenmarks.co.uk> (maintainer)
@
text
@d1 2
a2 2
--- Makefile	Sun Nov 30 02:02:25 2003
+++ Makefile	Wed Apr 14 15:34:42 2004
d4 1
a4 1
 # Copyright (c) 1996-2003 by Solar Designer
d18 2
a19 2
@@@@ -14,7 +14,8 @@@@
 SED = sed
@


1.1
log
@security/john 1.6 -> 1.6.32

PR:		ports/47124
Submitted by:	Dominic Marks <dom@@cus.org.uk>
@
text
@d1 2
a2 2
--- Makefile	Wed Apr 10 14:35:25 2002
+++ Makefile	Wed Jan 15 23:28:44 2003
d4 1
a4 1
 # Copyright (c) 1996-2002 by Solar Designer
@

