[pkgsrc/trunk]: pkgsrc/security/john don't override CC, LD, etc.

[grant <grant%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e2447a3e14e9
branches:  trunk
changeset: 477100:e2447a3e14e9
user:      grant <grant%pkgsrc.org@localhost>
date:      Sat Jun 26 19:06:04 2004 +0000

description:
don't override CC, LD, etc.

diffstat:

 security/john/Makefile         |   4 +++-
 security/john/distinfo         |   4 ++--
 security/john/patches/patch-aa |  25 ++++++++++++++++++++-----
 3 files changed, 25 insertions(+), 8 deletions(-)

diffs (70 lines):

diff -r e521ab11ce83 -r e2447a3e14e9 security/john/Makefile
--- a/security/john/Makefile    Sat Jun 26 18:53:17 2004 +0000
+++ b/security/john/Makefile    Sat Jun 26 19:06:04 2004 +0000
@@ -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 @@
 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 -r e521ab11ce83 -r e2447a3e14e9 security/john/distinfo
--- a/security/john/distinfo    Sat Jun 26 18:53:17 2004 +0000
+++ b/security/john/distinfo    Sat Jun 26 19:06:04 2004 +0000
@@ -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 -r e521ab11ce83 -r e2447a3e14e9 security/john/patches/patch-aa
--- a/security/john/patches/patch-aa    Sat Jun 26 18:53:17 2004 +0000
+++ b/security/john/patches/patch-aa    Sat Jun 26 19:06:04 2004 +0000
@@ -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 =