diff options
author | grant <grant@pkgsrc.org> | 2004-06-26 19:06:04 +0000 |
---|---|---|
committer | grant <grant@pkgsrc.org> | 2004-06-26 19:06:04 +0000 |
commit | 5d1455f21f0c64f37c3188f5bce98dcbd7f1ed18 (patch) | |
tree | 7b06fe8549cec0b429e1916e6f74aaf0990cf872 /security/john | |
parent | 3e7babfcb5ee364aa90182881af2603245b6dc59 (diff) | |
download | pkgsrc-5d1455f21f0c64f37c3188f5bce98dcbd7f1ed18.tar.gz |
don't override CC, LD, etc.
Diffstat (limited to 'security/john')
-rw-r--r-- | security/john/Makefile | 4 | ||||
-rw-r--r-- | security/john/distinfo | 4 | ||||
-rw-r--r-- | security/john/patches/patch-aa | 25 |
3 files changed, 25 insertions, 8 deletions
diff --git a/security/john/Makefile b/security/john/Makefile index 1dc1aaf7991..5fe1b6e36c9 100644 --- a/security/john/Makefile +++ b/security/john/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/01/20 12:25:34 agc Exp $ +# $NetBSD: Makefile,v 1.5 2004/06/26 19:06:04 grant Exp $ # DISTNAME= john-1.6 @@ -13,6 +13,8 @@ COMMENT= Unix Password Cracker WRKSRC= ${WRKDIR}/${DISTNAME}/src ALL_TARGET= generic +USE_BUILDLINK3= yes + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/../run/john ${PREFIX}/bin ${INSTALL_DATA_DIR} ${PREFIX}/share/john/ diff --git a/security/john/distinfo b/security/john/distinfo index 30715b853e4..344c87d0495 100644 --- a/security/john/distinfo +++ b/security/john/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2003/11/18 14:03:14 xtraeme Exp $ +$NetBSD: distinfo,v 1.4 2004/06/26 19:06:04 grant Exp $ SHA1 (john-1.6.tar.gz) = b49d371496b8ba5e439665b83190b1e4d4640bea Size (john-1.6.tar.gz) = 497341 bytes -SHA1 (patch-aa) = 207c2ba3bd17a3caec164d595ddeaba794afe016 +SHA1 (patch-aa) = 0c235ee26071e34a09ed894305707e4b5daf318f diff --git a/security/john/patches/patch-aa b/security/john/patches/patch-aa index a25b8a94b73..1055543a596 100644 --- a/security/john/patches/patch-aa +++ b/security/john/patches/patch-aa @@ -1,17 +1,32 @@ -$NetBSD: patch-aa,v 1.1 2003/11/18 14:03:14 xtraeme Exp $ +$NetBSD: patch-aa,v 1.2 2004/06/26 19:06:04 grant Exp $ ---- Makefile.orig 2003-11-18 14:51:45.000000000 +0100 -+++ Makefile 2003-11-18 14:52:31.000000000 +0100 -@@ -13,11 +13,11 @@ +--- Makefile.orig 1998-12-03 11:29:50.000000000 +1100 ++++ Makefile +@@ -3,21 +3,21 @@ + # Copyright (c) 1996-98 by Solar Designer + # + +-CPP = gcc +-CC = gcc +-AS = gcc +-LD = gcc ++#CPP = gcc ++#CC = gcc ++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 += -c ASFLAGS = -c - LDFLAGS = -s +-LDFLAGS = -s -OPT_NORMAL = -funroll-loops -OPT_INLINE = -finline-functions ++LDFLAGS += -s +OPT_NORMAL = +OPT_INLINE = |