[Midnightbsd-cvs] mports [24192] trunk/security/wipe/files: fix build

[laffer1 at midnightbsd.org]

Revision: 24192
          http://svnweb.midnightbsd.org/mports/?rev=24192
Author:   laffer1
Date:     2018-09-04 09:53:26 -0400 (Tue, 04 Sep 2018)
Log Message:
-----------
fix build

Modified Paths:
--------------
    trunk/security/wipe/files/patch-Makefile.in
    trunk/security/wipe/files/patch-blkdev.c
    trunk/security/wipe/files/patch-prompt.c

Modified: trunk/security/wipe/files/patch-Makefile.in
===================================================================
--- trunk/security/wipe/files/patch-Makefile.in	2018-09-04 13:52:04 UTC (rev 24191)
+++ trunk/security/wipe/files/patch-Makefile.in	2018-09-04 13:53:26 UTC (rev 24192)
@@ -1,6 +1,6 @@
---- Makefile.in.orig     Sat Aug 30 18:18:03 2003
-+++ Makefile.in          Sat Mar  5 00:24:22 2005
-@@ -60,13 +60,6 @@
+--- Makefile.in.orig	2009-11-01 21:11:30 UTC
++++ Makefile.in
+@@ -60,13 +60,7 @@ install: $(BIN_OUT)
  	$(INSTALL_BIN) -d $(bindir)
  	$(INSTALL_BIN) -s $(BIN_OUT) $(bindir)
  	$(INSTALL) -d $(mandir)/man1
@@ -11,6 +11,7 @@
 -	for file in $(DOCS); do \
 -		$(INSTALL) -o root -m 0644 $$file $(datadir)/doc/wipe/; \
 -	done
++	$(INSTALL) -o root -g wheel -m 0444 wipe.1 $(mandir)/man1/
  
  install_home: $(BIN_OUT)
  	strip $(BIN_OUT)

Modified: trunk/security/wipe/files/patch-blkdev.c
===================================================================
--- trunk/security/wipe/files/patch-blkdev.c	2018-09-04 13:52:04 UTC (rev 24191)
+++ trunk/security/wipe/files/patch-blkdev.c	2018-09-04 13:53:26 UTC (rev 24192)
@@ -1,6 +1,17 @@
---- blkdev.c.orig   Sun Aug  3 16:07:29 2003
-+++ blkdev.c        Sat Mar  5 00:23:40 2005
-@@ -128,6 +128,10 @@
+--- blkdev.c.orig	2009-04-06 02:09:27 UTC
++++ blkdev.c
+@@ -46,7 +46,9 @@
+ 
+ #ifdef HAVE_SYS_DISKLABEL_H
+ # include <sys/disklabel.h>
+-# define BSD_BLKDEV
++# ifdef DIOCGDINFO
++#  define BSD_BLKDEV
++# endif
+ #endif
+ 
+ #ifndef LINUX_BLKDEV
+@@ -141,6 +143,10 @@ public int destroy_blkdev(struct file_s 
    int code;
  
  #ifdef BSD_BLKDEV
@@ -11,7 +22,7 @@
    struct partinfo pinfo;
  #endif
  
-@@ -160,7 +164,7 @@
+@@ -173,7 +179,7 @@ public int destroy_blkdev(struct file_s 
      }
  
  #ifdef BSD_BLKDEV

Modified: trunk/security/wipe/files/patch-prompt.c
===================================================================
--- trunk/security/wipe/files/patch-prompt.c	2018-09-04 13:52:04 UTC (rev 24191)
+++ trunk/security/wipe/files/patch-prompt.c	2018-09-04 13:53:26 UTC (rev 24192)
@@ -1,5 +1,5 @@
---- prompt.c.orig	2009-04-25 20:18:13.000000000 -0700
-+++ prompt.c	2009-10-18 15:29:39.000000000 -0700
+--- prompt.c.orig	2009-04-26 03:18:13 UTC
++++ prompt.c
 @@ -41,9 +41,9 @@
  
  #include "std.h"
@@ -11,7 +11,7 @@
  #include "wipe.h"
  #include "blkdev.h"
  #include "prompt.h"
-@@ -69,7 +69,10 @@
+@@ -69,7 +69,10 @@ public void prompt_destroy(struct file_s
      }
  #endif
  
@@ -23,7 +23,7 @@
  
    permdenied = access(f->name, perm);
    if (options.interactive) /* force overrides interaction */
-@@ -119,7 +122,10 @@
+@@ -119,7 +122,10 @@ public void prompt_destroy(struct file_s
  
  	      fgets(prompt, sizeof(prompt), stdin);