cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* honor CFLAGS (will also build on alpha now)

Browse Source 
* drop obsolete patches for i386 a.out
* don't require MMX support on i386

ok benoit@
This commit is contained in:
naddy 2012-04-13 09:12:21 +00:00
parent a96f028cca
commit ed872aafd0
2 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
security/john/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.45 2011/11/26 10:31:37 benoit Exp $
# $OpenBSD: Makefile,v 1.46 2012/04/13 09:12:21 naddy Exp $
COMMENT = extremely fast password cracker
DISTNAME = john-1.7.9
REVISION = 0
CATEGORIES = security
HOMEPAGE = http://www.openwall.com/john/
@ -22,12 +23,13 @@ MASTER_SITES = ${HOMEPAGE}/g/
WRKSRC = ${WRKDIST}/src
MAKE_FLAGS = CC=${CC} AS=${CC} LD=${CC} \
CFLAGS="${CFLAGS} -c" LDFLAGS="${LDFLAGS}"
CFLAGS="${CFLAGS} -c" LDFLAGS="${LDFLAGS}" \
OPT_NORMAL="" OPT_INLINE=""
REGRESS_TARGET = check
.if ${MACHINE_ARCH} == "i386"
ALL_TARGET= openbsd-x86-mmx
ALL_TARGET= openbsd-x86-any
.elif ${MACHINE_ARCH} == "amd64"
ALL_TARGET= openbsd-x86-64
.elif ${MACHINE_ARCH} == "sparc"

30
security/john/patches/patch-src_Makefile
View File

@ -1,21 +1,13 @@
$OpenBSD: patch-src_Makefile,v 1.9 2011/11/26 10:31:39 benoit Exp $
--- src/Makefile.orig Wed Nov 23 01:19:21 2011
+++ src/Makefile Fri Nov 25 18:30:51 2011
@@ -325,7 +325,7 @@ freebsd-x86-any-a.out:
$(LN) x86-any.h arch.h
$(MAKE) $(PROJ) \
JOHN_OBJS="$(JOHN_OBJS) x86.o" \
- ASFLAGS="$(ASFLAGS) -DUNDERSCORES -DALIGN_LOG -DBSD"
+ ASFLAGS="$(ASFLAGS) -DBSD"
$OpenBSD: patch-src_Makefile,v 1.10 2012/04/13 09:12:21 naddy Exp $
--- src/Makefile.orig Thu Apr 12 12:57:24 2012
+++ src/Makefile Thu Apr 12 12:58:14 2012
@@ -389,8 +389,7 @@ openbsd-ppc64:
freebsd-alpha:
$(LN) alpha.h arch.h
@@ -359,7 +359,7 @@ openbsd-x86-any-a.out:
$(LN) x86-any.h arch.h
$(MAKE) $(PROJ) \
JOHN_OBJS="$(JOHN_OBJS) x86.o" \
- ASFLAGS="$(ASFLAGS) -DUNDERSCORES -DALIGN_LOG -DBSD"
+ ASFLAGS="$(ASFLAGS) -DALIGN_LOG -DBSD"
openbsd-pa-risc:
$(LN) pa-risc.h arch.h
- $(MAKE) $(PROJ) \
- CFLAGS="-c -Wall -O3 -fomit-frame-pointer"
+ $(MAKE) $(PROJ)
openbsd-alpha:
$(LN) alpha.h arch.h
openbsd-vax:
$(LN) vax.h arch.h