$OpenBSD: patch-src_Makefile_legacy,v 1.4 2020/12/31 20:41:07 naddy Exp $
Index: src/Makefile.legacy
--- src/Makefile.legacy.orig
+++ src/Makefile.legacy
@@ -170,7 +170,7 @@ BENCH_DES_BS_OBJS_DEPEND = \
 	DES_bs_b.o
 
 BENCH_MD5_OBJS_DEPEND = \
-	MD5_fmt.o MD5_std.o md5crypt_common.o
+	MD5_fmt.o MD5_std.o md5crypt_common.o md5.o
 
 BENCH_BF_OBJS_DEPEND = \
 	BF_fmt.o BF_std.o BF_common.o
@@ -976,11 +976,9 @@ openbsd-alpha:
 openbsd-sparc64:
 	$(LN) sparc64.h arch.h
 	@echo "#define JOHN_BLD" '"'$@'"' > john_build_rule.h
-	$(MAKE_ORIG) $(PROJ) \
-		CFLAGS="$(CFLAGS) -m64 -mcpu=ultrasparc" \
-		LDFLAGS="$(LDFLAGS) -m64"
+	$(MAKE_ORIG) $(PROJ)
 	@echo "Failing after this point just means some helper tools did not build:"
-	$(MAKE_ORIG) $(PROJ_PCAP) CFLAGS="$(CFLAGS) -m64"
+	$(MAKE_ORIG) $(PROJ_PCAP)
 	@echo "All done"
 
 openbsd-sparc:
@@ -1718,7 +1716,7 @@ generic: generic.h
 	$(RM) arch.h
 	ln -s generic.h arch.h
 	@echo "#define JOHN_BLD" '"'$@'"' > john_build_rule.h
-	$(MAKE_ORIG) $(PROJ)
+	$(MAKE_ORIG) $(PROJ) $(PROJ_PCAP)
 
 generic.h:
 	$(RM) arch.h
@@ -1919,7 +1917,7 @@ john.com: john.asm
 
 ../run/cprepair: cprepair.c unicode.c unicode.h options.h misc.h misc.c \
 
-	$(CC) -Wall -O3 -s -DNOT_JOHN -D_JOHN_MISC_NO_LOG cprepair.c unicode.c \
+	$(CC) -Wall $(COPTFLAGS) -s -DNOT_JOHN -D_JOHN_MISC_NO_LOG cprepair.c unicode.c \
 	misc.c memory.c -o ../run/cprepair
 
 ../run/tgtsnarf: tgtsnarf.o
