- whiteouts are gone

- honor CC

security/tempwatch/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2002/12/29 20:31:41 fgsch Exp $
+# $OpenBSD: Makefile,v 1.14 2005/06/21 18:48:23 naddy Exp $
 
 COMMENT=		"temporary file auditing tool"
 
@@ -24,6 +24,7 @@ MASTER_SITES0=		http://www.atstake.com/research/advisories/1999/
 WRKDIST=		${WRKDIR}/temp-watch
 
 ALL_TARGET=		OpenBSD
+MAKE_FLAGS=		CC="${CC} ${CFLAGS}"
 
 NO_REGRESS=		Yes
 

security/tempwatch/patches/patch-Makefile

@@ -1,12 +1,12 @@
-$OpenBSD: patch-Makefile,v 1.1 2002/03/24 08:07:13 jsyn Exp $
---- Makefile.orig	Wed Nov 24 06:48:21 1999
-+++ Makefile	Wed Nov 24 06:48:35 1999
-@@ -9,7 +9,7 @@
- # debugging
- # DFLAGS = -DTEST -DDEBUG
- DFLAGS = -DREGEX
--CFLAGS =-O -Wall
-+#CFLAGS =-O -Wall
- XFLAGS =        # xtra cflags, set by systype targets
- XLIBS =         # xtra libs if necessary?
- # -Bstatic for sunos,  -static for gcc, etc.  You want this, trust me.
+$OpenBSD: patch-Makefile,v 1.2 2005/06/21 18:48:23 naddy Exp $
+--- Makefile.orig	Thu Sep 23 19:18:18 1999
++++ Makefile	Tue Jun 21 20:47:09 2005
+@@ -60,7 +60,7 @@ solaris25:
+ 
+ OpenBSD:
+ 	make -e $(ALL) $(MFLAGS) \
+-	XFLAGS='-DBSD -DREGEX -DREGCOMP_3C' CC="gcc $(CFLAGS)" STATIC=-static
++	XFLAGS='-DBSD -DREGEX -DREGCOMP_3C' STATIC=-static
+ 
+ generic:
+ 	make -e $(ALL) $(MFLAGS) \

security/tempwatch/patches/patch-list_utils_c

@@ -1,7 +1,21 @@
-$OpenBSD: patch-list_utils_c,v 1.1 2004/01/05 03:24:14 espie Exp $
---- list_utils.c.orig	2004-01-05 04:21:42.000000000 +0100
-+++ list_utils.c	2004-01-05 04:21:49.000000000 +0100
-@@ -168,7 +168,7 @@ printnode(struct listStruct *list, int a
+$OpenBSD: patch-list_utils_c,v 1.2 2005/06/21 18:48:23 naddy Exp $
+--- list_utils.c.orig	Thu Dec 24 06:00:44 1998
++++ list_utils.c	Tue Jun 21 20:41:05 2005
+@@ -143,7 +143,12 @@ printnode(struct listStruct *list, int a
+ 
+   getfilemodes(&list->statbuf, filemodes);
+ 
+-  sprintf(outputStr,"%.2s %-11.20s %-2d %-8.20s %-8.20s %-6ld %-10.20s "
++#ifdef SOLARIS25
++  sprintf(outputStr,
++#else
++  snprintf(outputStr, sizeof(outputStr),
++#endif
++  		    "%.2s %-11.20s %-2d %-8.20s %-8.20s %-6ld %-10.20s "
+                     "%.20s",
+           (action == ADDITION) ? "+ " : "- ", filemodes, 
+           (int)list->statbuf.st_nlink, username, groupname,
+@@ -168,7 +173,7 @@ printnode(struct listStruct *list, int a
  
    
  
@@ -10,3 +24,12 @@ $OpenBSD: patch-list_utils_c,v 1.1 2004/01/05 03:24:14 espie Exp $
    printf("%-11s %-2d %-8s %-8s %-6ld %-10s %-10s\n", filemodes,
            (int)list->statbuf.st_nlink, username, groupname, 
            list->statbuf.st_size, timehold, list->filename);
+@@ -299,7 +304,7 @@ void getfilemodes(struct stat *statbuf, 
+   else if (S_ISDOOR(mode))
+     holder[0] = 'p';
+ #else
+-#if defined (BSD)
++#if defined (BSD) && !defined(__OpenBSD__)
+   else if (S_ISWHT(mode))
+     holder[0] = '%';
+ #endif