head	1.3;
access;
symbols
	RELEASE_5_0_0:1.2
	RELEASE_4_7_0:1.2
	RELEASE_4_6_2:1.2
	RELEASE_4_6_1:1.2
	RELEASE_4_6_0:1.2
	RELEASE_5_0_DP1:1.2
	RELEASE_4_5_0:1.2
	RELEASE_4_4_0:1.2
	RELEASE_4_3_0:1.2
	RELEASE_4_2_0:1.2
	RELEASE_4_1_1:1.2
	RELEASE_4_1_0:1.2
	RELEASE_3_5_0:1.2
	RELEASE_4_0_0:1.2
	RELEASE_3_4_0:1.1;
locks; strict;
comment	@# @;


1.3
date	2003.01.16.02.31.42;	author edwin;	state dead;
branches;
next	1.2;

1.2
date	2000.02.07.02.45.45;	author kris;	state Exp;
branches;
next	1.1;

1.1
date	99.09.20.01.25.36;	author steve;	state Exp;
branches;
next	;


desc
@@


1.3
log
@security/john 1.6 -> 1.6.32

PR:		ports/47124
Submitted by:	Dominic Marks <dom@@cus.org.uk>
@
text
@--- Makefile.orig	Wed Dec  2 16:29:50 1998
+++ Makefile	Sun Feb  6 18:00:15 2000
@@@@ -3,17 +3,18 @@@@
 # Copyright (c) 1996-98 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
 SED = sed
 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
@@@@ -89,6 +90,7 @@@@
 	@@echo "freebsd-x86-any-a.out    FreeBSD, x86, a.out binaries"
 	@@echo "freebsd-x86-k6-a.out     FreeBSD, AMD K6, a.out binaries"
 	@@echo "freebsd-x86-any-elf      FreeBSD, x86, ELF binaries"
+	@@echo "freebsd-alpha-any-elf    FreeBSD, Alpha, ELF binaries"
 	@@echo "freebsd-x86-mmx-elf      FreeBSD, x86 with MMX, ELF binaries"
 	@@echo "freebsd-x86-k6-elf       FreeBSD, AMD K6, ELF binaries"
 	@@echo "openbsd-x86-any          OpenBSD, x86"
@@@@ -173,14 +175,19 @@@@
 	$(LN) x86-any.h arch.h
 	$(MAKE) $(PROJ) \
 		JOHN_OBJS="$(JOHN_OBJS) x86.o" \
-		CFLAGS="$(CFLAGS) -m486" \
+		CFLAGS="$(CFLAGS)" \
 		ASFLAGS="$(ASFLAGS) -DBSD"
 
+freebsd-alpha-any-elf:
+	$(LN) alpha.h arch.h
+	$(MAKE) $(PROJ) \
+		JOHN_OBJS="$(BITSLICE_OBJS) $(JOHN_OBJS) alpha.o"
+
 freebsd-x86-mmx-elf:
 	$(LN) x86-mmx.h arch.h
 	$(MAKE) $(PROJ) \
 		JOHN_OBJS="$(JOHN_OBJS) x86.o" \
-		CFLAGS="$(CFLAGS) -m486" \
+		CFLAGS="$(CFLAGS)" \
 		ASFLAGS="$(ASFLAGS) -DBSD"
 
 freebsd-x86-k6-elf:
@


1.2
log
@Respect CC and CFLAGS
@
text
@@


1.1
log
@Steal a few lines from the Linux/Alpha book so we can have this port on
FreeBSD/Alpha too.
@
text
@d1 27
a27 3
--- Makefile.orig	Sun Sep 19 16:22:44 1999
+++ Makefile	Sun Sep 19 16:25:16 1999
@@@@ -89,6 +89,7 @@@@
d35 3
a37 1
@@@@ -175,6 +176,11 @@@@
d39 2
a40 1
 		CFLAGS="$(CFLAGS) -m486" \
d42 1
a42 1
+
d47 1
a47 1
 
d50 7
@

