From eab3f0104c826df805176fb6a6763d4e915913a5 Mon Sep 17 00:00:00 2001
From: xtraeme <xtraeme>
Date: Tue, 18 Nov 2003 14:03:14 +0000
Subject: Remove harcoded CFLAGS from Makefile, pass our CFLAGS instead. Patch
 provided by Christian Biere in PR pkg/23461.

Bump PKGREVISION.
---
 security/john/Makefile         |  3 ++-
 security/john/distinfo         |  3 ++-
 security/john/patches/patch-aa | 19 +++++++++++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 security/john/patches/patch-aa

diff --git a/security/john/Makefile b/security/john/Makefile
index b003564a9b2..69ea810eca0 100644
--- a/security/john/Makefile
+++ b/security/john/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:23 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/11/18 14:03:14 xtraeme Exp $
 #
 
 DISTNAME=	john-1.6
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
+PKGREVISION=	1
 CATEGORIES=	security textproc
 MASTER_SITES=	http://www.openwall.com/john/
 
diff --git a/security/john/distinfo b/security/john/distinfo
index 3a700cfe8bf..30715b853e4 100644
--- a/security/john/distinfo
+++ b/security/john/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 15:40:32 agc Exp $
+$NetBSD: distinfo,v 1.3 2003/11/18 14:03:14 xtraeme Exp $
 
 SHA1 (john-1.6.tar.gz) = b49d371496b8ba5e439665b83190b1e4d4640bea
 Size (john-1.6.tar.gz) = 497341 bytes
+SHA1 (patch-aa) = 207c2ba3bd17a3caec164d595ddeaba794afe016
diff --git a/security/john/patches/patch-aa b/security/john/patches/patch-aa
new file mode 100644
index 00000000000..a25b8a94b73
--- /dev/null
+++ b/security/john/patches/patch-aa
@@ -0,0 +1,19 @@
+$NetBSD: patch-aa,v 1.1 2003/11/18 14:03:14 xtraeme Exp $
+
+--- Makefile.orig	2003-11-18 14:51:45.000000000 +0100
++++ Makefile	2003-11-18 14:52:31.000000000 +0100
+@@ -13,11 +13,11 @@
+ SED = sed
+ NULL = /dev/null
+ CPPFLAGS = -E
+-CFLAGS = -c -Wall -O2 -fomit-frame-pointer
++CFLAGS += -c
+ ASFLAGS = -c
+ LDFLAGS = -s
+-OPT_NORMAL = -funroll-loops
+-OPT_INLINE = -finline-functions
++OPT_NORMAL = 
++OPT_INLINE =
+ 
+ JOHN_VERSION = 1.6
+ JOHN_ARCHIVE = john-$(JOHN_VERSION)
-- 
cgit v1.2.3