Thu Jul 9 11:49:44 2015 UTC ()
Use nbcompat and add patch comments.  Fixes build on SunOS.


(jperkin)
diff -r1.9 -r1.10 pkgsrc/security/destroy/distinfo
diff -r1.1 -r1.2 pkgsrc/security/destroy/patches/patch-Makefile
diff -r1.3 -r1.4 pkgsrc/security/destroy/patches/patch-aa
cvs diff -r1.9 -r1.10 pkgsrc/security/destroy/distinfo (expand / switch to unified diff)

--- pkgsrc/security/destroy/distinfo 2012/03/01 16:27:57 1.9
+++ pkgsrc/security/destroy/distinfo 2015/07/09 11:49:44 1.10
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.9 2012/03/01 16:27:57 hans Exp $ 1$NetBSD: distinfo,v 1.10 2015/07/09 11:49:44 jperkin Exp $
2 2
3SHA1 (destroy-20040415.tar.gz) = c2a24155858e9236c8cba2bb5f45687d778b1fde 3SHA1 (destroy-20040415.tar.gz) = c2a24155858e9236c8cba2bb5f45687d778b1fde
4RMD160 (destroy-20040415.tar.gz) = b1132ee8c226b6239c1da5591081d9fbccb9c284 4RMD160 (destroy-20040415.tar.gz) = b1132ee8c226b6239c1da5591081d9fbccb9c284
5Size (destroy-20040415.tar.gz) = 4261 bytes 5Size (destroy-20040415.tar.gz) = 4261 bytes
6SHA1 (patch-Makefile) = 04d541387a969b2f96342699bb97ae9bb1148aca 6SHA1 (patch-Makefile) = d0dcf65e23697631a190789993f12c5dac05f8f6
7SHA1 (patch-aa) = b7447b4c3abc553594b8dab779037086e1572c03 7SHA1 (patch-aa) = 8f306959799a0b988d6260cda49f229bb0f9b4fa
cvs diff -r1.1 -r1.2 pkgsrc/security/destroy/patches/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/security/destroy/patches/patch-Makefile 2012/03/01 16:27:57 1.1
+++ pkgsrc/security/destroy/patches/patch-Makefile 2015/07/09 11:49:44 1.2
@@ -1,10 +1,12 @@ @@ -1,10 +1,12 @@
1$NetBSD: patch-Makefile,v 1.1 2012/03/01 16:27:57 hans Exp $ 1$NetBSD: patch-Makefile,v 1.2 2015/07/09 11:49:44 jperkin Exp $
2 2
3--- Makefile.orig 2012-03-01 16:16:00.542669085 +0100 3Append CPPFLAGS and LIBS.
4+++ Makefile 2004-04-15 17:19:49.000000000 +0200 4
 5--- Makefile.orig 2004-04-15 15:19:49.000000000 +0000
 6+++ Makefile
5@@ -14,4 +14,4 @@ CFLAGS?= ${CFLAGS} 7@@ -14,4 +14,4 @@ CFLAGS?= ${CFLAGS}
6 LDFLAGS?= 8 LDFLAGS?=
7  9
8 all: 10 all:
9- ${CC} ${CFLAGS} ${LDFLAGS} -o ${PORTNAME} destroy.c 11- ${CC} ${CFLAGS} ${LDFLAGS} -o ${PORTNAME} destroy.c
10+ ${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o ${PORTNAME} destroy.c ${LIBS} 12+ ${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o ${PORTNAME} destroy.c ${LIBS}
cvs diff -r1.3 -r1.4 pkgsrc/security/destroy/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/security/destroy/patches/patch-aa 2005/11/01 18:52:45 1.3
+++ pkgsrc/security/destroy/patches/patch-aa 2015/07/09 11:49:44 1.4
@@ -1,20 +1,35 @@ @@ -1,20 +1,35 @@
1$NetBSD: patch-aa,v 1.3 2005/11/01 18:52:45 tv Exp $ 1$NetBSD: patch-aa,v 1.4 2015/07/09 11:49:44 jperkin Exp $
2 2
3--- destroy.c.orig 2004-04-15 11:21:38.000000000 -0400 3Use nbcompat.
 4
 5--- destroy.c.orig 2004-04-15 15:21:38.000000000 +0000
4+++ destroy.c 6+++ destroy.c
5@@ -196,6 +196,7 @@ void traverse(char **argv, int fflag, in 7@@ -43,7 +43,12 @@
 8 #include <fcntl.h>
 9 #include <unistd.h>
 10 #include <errno.h>
 11+#if defined(HAVE_NBCOMPAT_H)
 12+#include <nbcompat.h>
 13+#include <nbcompat/fts.h>
 14+#else
 15 #include <fts.h>
 16+#endif
 17
 18 #define MAXBUFFSIZE 8192
 19
 20@@ -196,6 +201,7 @@ void traverse(char **argv, int fflag, in
6 } 21 }
7 break; 22 break;
8  23
9+#ifdef S_IFWHT 24+#ifdef S_IFWHT
10 case S_IFWHT: /* whiteout */ 25 case S_IFWHT: /* whiteout */
11 if(fflag) { 26 if(fflag) {
12 if(!qflag) { 27 if(!qflag) {
13@@ -206,6 +207,7 @@ void traverse(char **argv, int fflag, in 28@@ -206,6 +212,7 @@ void traverse(char **argv, int fflag, in
14 fprintf(stderr, "Whiteout: \t %s \t Skipping... no '-f' flag set!\n", p->fts_accpath); 29 fprintf(stderr, "Whiteout: \t %s \t Skipping... no '-f' flag set!\n", p->fts_accpath);
15 } 30 }
16 break; 31 break;
17+#endif 32+#endif
18  33
19 default:  34 default:
20 if(!qflag) { 35 if(!qflag) {