improved CC and CFLAGS support

4 files changed, 33 insertions, 13 deletions

diff --git a/security/crack/Makefile b/security/crack/Makefile
index f9e6cbdbc21..5009d41ff2c 100644
--- a/security/crack/Makefile
+++ b/security/crack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2009/05/29 00:00:20 agc Exp $
+# $NetBSD: Makefile,v 1.26 2010/01/03 14:30:37 schwarz Exp $
 
 DISTNAME=	crack5.0
 PKGNAME=	crack-5.0
@@ -37,7 +37,7 @@ pre-build:
 	@${CHMOD} a+rx ${WRKSRC}/Crack
 
 do-build:
-	cd ${WRKSRC} ; ./Crack -makeonly
+	cd ${WRKSRC} ; env ${MAKE_ENV} ./Crack -makeonly
 
 do-install:
 	@${INSTALL_DATA_DIR} ${PREFIX}/libexec/crack
diff --git a/security/crack/distinfo b/security/crack/distinfo
index a78ee8da54b..a2ef606094b 100644
--- a/security/crack/distinfo
+++ b/security/crack/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.7 2005/12/08 18:37:53 joerg Exp $
+$NetBSD: distinfo,v 1.8 2010/01/03 14:30:37 schwarz Exp $
 
 SHA1 (crack5.0.tar.gz) = e5e59d1e5e9e42c816a4dbd3f24cc13e16a31365
 RMD160 (crack5.0.tar.gz) = a6785bc5d6f197451f3d404ff7ce91231e474dfb
 Size (crack5.0.tar.gz) = 2964507 bytes
-SHA1 (patch-aa) = 6316b2243d4308422bb2fc9d3d3878f1605f0c67
+SHA1 (patch-aa) = 528dfd47336abb5350bfc7c9e2943f998a39ff0f
 SHA1 (patch-ab) = a60df3b47288abf28e44400e4035580da765e279
-SHA1 (patch-ac) = efa6903c59be394db1282d0760d55953a955e1ee
+SHA1 (patch-ac) = 59bfe74852944db6ab933e10cb8cc83bf8795fa5
 SHA1 (patch-ad) = 49387a2aa147ff543d57e660dbe0d8b2861d8f52
 SHA1 (patch-ae) = 184937092de34e5268c6e0bb2742ba5bb126c351
diff --git a/security/crack/patches/patch-aa b/security/crack/patches/patch-aa
index eafaed0d594..0a9a50aec6d 100644
--- a/security/crack/patches/patch-aa
+++ b/security/crack/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.4 2005/04/29 16:59:02 kristerw Exp $
+$NetBSD: patch-aa,v 1.5 2010/01/03 14:30:37 schwarz Exp $
 
---- Crack.orig	Fri Dec 20 17:09:41 1996
-+++ Crack
+--- Crack.orig	1996-12-21 02:09:41.000000000 +0100
++++ Crack	2010-01-03 15:01:01.000000000 +0100
 @@ -1,4 +1,4 @@
 -#!/bin/sh
 +#!@@SH@@
@@ -19,7 +19,18 @@ $NetBSD: patch-aa,v 1.4 2005/04/29 16:59:02 kristerw Exp $
  
  # compiler options for crack 5.0
  #
-@@ -108,41 +108,11 @@ node=`uname -n`                         
+@@ -42,8 +42,8 @@
+ #
+ 
+ # vanilla unix cc
+-CC=cc
+-CFLAGS="-g -O $C5FLAGS"
++#CC=cc
++CFLAGS="$CFLAGS $C5FLAGS"
+ #LIBS=-lcrypt # uncomment only if necessary to use stdlib crypt(), eg: NetBSD MD5
+ 
+ # gcc 2.7.2
+@@ -108,41 +108,11 @@
  # home base
  ###
  
@@ -63,7 +74,7 @@ $NetBSD: patch-aa,v 1.4 2005/04/29 16:59:02 kristerw Exp $
  
  ###
  # Flagwaving
-@@ -279,110 +249,76 @@ fi
+@@ -279,110 +249,76 @@
  # Sanity test bindir - written in gruntscript for clarity.
  ###
  
diff --git a/security/crack/patches/patch-ac b/security/crack/patches/patch-ac
index 747383d8152..b2bdaed07eb 100644
--- a/security/crack/patches/patch-ac
+++ b/security/crack/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1 1999/10/04 17:35:52 bouyer Exp $
+$NetBSD: patch-ac,v 1.2 2010/01/03 14:30:37 schwarz Exp $
 
---- src/libdes/Makefile.orig	Thu Dec 19 01:29:21 1996
-+++ src/libdes/Makefile	Fri Jan 31 11:14:52 1997
+--- src/libdes/Makefile.orig	1996-12-19 10:29:21.000000000 +0100
++++ src/libdes/Makefile	2010-01-03 15:22:36.000000000 +0100
 @@ -10,7 +10,7 @@
  # If you are on a DEC Alpha, edit des.h and change the DES_LONG
  # define to 'unsigned int'.  I have seen this give a %20 speedup.
@@ -11,3 +11,12 @@ $NetBSD: patch-ac,v 1.1 1999/10/04 17:35:52 bouyer Exp $
  
  # Version 1.94 has changed the strings_to_key function so that it is
  # now compatible with MITs when the string is longer than 8 characters.
+@@ -35,7 +35,7 @@
+ 
+ OPTS= $(OPTS0) $(OPTS1) $(OPTS2)
+ 
+-CC=cc
++#CC=cc
+ CFLAGS= -O $(OPTS) $(CFLAG)
+ 
+ #CC=gcc