From e18f5b2b61bd48719c8c63135f60ff14cca3ce2d Mon Sep 17 00:00:00 2001
From: schwarz <schwarz>
Date: Sun, 22 Jan 2006 22:01:38 +0000
Subject: extended patch-aa to make sure Makefile will honor pkgsrc's CFLAGS
 settings

---
 security/tcp_wrappers/distinfo         |  4 ++--
 security/tcp_wrappers/patches/patch-aa | 21 ++++++++++++---------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/security/tcp_wrappers/distinfo b/security/tcp_wrappers/distinfo
index 30a0104b084..a4173c38707 100644
--- a/security/tcp_wrappers/distinfo
+++ b/security/tcp_wrappers/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.13 2005/05/26 02:25:22 markd Exp $
+$NetBSD: distinfo,v 1.14 2006/01/22 22:01:38 schwarz Exp $
 
 SHA1 (tcp_wrappers_7.6-ipv6.1.tar.gz) = d0b70d4f0c0ac0375d8283a18ec2b6d602f82fde
 RMD160 (tcp_wrappers_7.6-ipv6.1.tar.gz) = 948f5ac4ede3999273399b641474ca26fd967b70
 Size (tcp_wrappers_7.6-ipv6.1.tar.gz) = 144708 bytes
-SHA1 (patch-aa) = 06dfe3b11a086c575e626feee8c7096e46c3e1e5
+SHA1 (patch-aa) = 432ccfcf175ca37ff1758aa46c2970986f307fe3
 SHA1 (patch-ab) = e6b485b21623395a6ca6b1ce0054d3dc5c9b2232
 SHA1 (patch-ac) = a9cd493a470782e8f6bdd38fde6c746fb1e371c0
 SHA1 (patch-ad) = 2f2fa789599e2fca652e240f05bec8460287e79e
diff --git a/security/tcp_wrappers/patches/patch-aa b/security/tcp_wrappers/patches/patch-aa
index cde313b434a..caa2332e28d 100644
--- a/security/tcp_wrappers/patches/patch-aa
+++ b/security/tcp_wrappers/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.8 2004/12/07 15:15:25 wiz Exp $
+$NetBSD: patch-aa,v 1.9 2006/01/22 22:01:38 schwarz Exp $
 
 --- Makefile.orig	2000-08-21 19:59:52.000000000 +0200
-+++ Makefile
-@@ -44,7 +44,7 @@ what:
++++ Makefile	2006-01-22 22:46:17.000000000 +0100
+@@ -44,7 +44,7 @@
  #REAL_DAEMON_DIR=/usr/etc
  #
  # SysV.4 Solaris 2.x OSF AIX
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.8 2004/12/07 15:15:25 wiz Exp $
  #
  # BSD 4.4
  #REAL_DAEMON_DIR=/usr/libexec
-@@ -144,7 +144,7 @@ freebsd:
+@@ -144,7 +144,7 @@
  linux:
  	@make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
  	LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ=setenv.o \
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.8 2004/12/07 15:15:25 wiz Exp $
  
  # This is good for many SYSV+BSD hybrids with NIS, probably also for HP-UX 7.x.
  hpux hpux8 hpux9 hpux10:
-@@ -602,7 +602,7 @@ ACCESS	= -DHOSTS_ACCESS
+@@ -602,7 +602,7 @@
  # look for access control information. Watch out for the quotes and
  # backslashes when you make changes.
  
@@ -29,16 +29,19 @@ $NetBSD: patch-aa,v 1.8 2004/12/07 15:15:25 wiz Exp $
  
  ####################################################
  # Optional: dealing with host name/address conflicts
-@@ -669,7 +669,7 @@ HOSTNAME= -DALWAYS_HOSTNAME
+@@ -669,9 +669,9 @@
  # Protection against weird shells or weird make programs.
  
  SHELL	= /bin/sh
 -.c.o:;	$(CC) $(CFLAGS) -c $*.c
 +.c.o:;	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $*.c
  
- CFLAGS	= -O -DFACILITY=$(FACILITY) $(ACCESS) $(PARANOID) $(NETGROUP) \
+-CFLAGS	= -O -DFACILITY=$(FACILITY) $(ACCESS) $(PARANOID) $(NETGROUP) \
++CFLAGS+= -DFACILITY=$(FACILITY) $(ACCESS) $(PARANOID) $(NETGROUP) \
  	$(BUGS) $(SYSTYPE) $(AUTH) $(UMASK) \
-@@ -696,7 +696,7 @@ KIT	= README miscd.c tcpd.c fromhost.c h
+ 	-DREAL_DAEMON_DIR=\"$(REAL_DAEMON_DIR)\" $(STYLE) $(KILL_OPT) \
+ 	-DSEVERITY=$(SEVERITY) -DRFC931_TIMEOUT=$(RFC931_TIMEOUT) \
+@@ -696,7 +696,7 @@
  	refuse.c tcpdchk.8 setenv.c inetcf.c inetcf.h scaffold.c \
  	scaffold.h tcpdmatch.8 README.NIS
  
@@ -47,7 +50,7 @@ $NetBSD: patch-aa,v 1.8 2004/12/07 15:15:25 wiz Exp $
  
  all other: config-check tcpd tcpdmatch try-from safe_finger tcpdchk
  
-@@ -713,31 +713,29 @@ config-check:
+@@ -713,31 +713,29 @@
  cflags: config-check
  
  $(LIB):	$(LIB_OBJ)
-- 
cgit v1.2.3