Merge two patches that patch the same file.

3 files changed, 48 insertions, 52 deletions

diff --git a/sysutils/wipe/distinfo b/sysutils/wipe/distinfo
index 8337e2b8b5e..0b8782147ec 100644
--- a/sysutils/wipe/distinfo
+++ b/sysutils/wipe/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2011/01/10 06:12:16 obache Exp $
+$NetBSD: distinfo,v 1.6 2013/06/17 05:37:22 dholland Exp $
 
 SHA1 (wipe-2.2.0.tar.bz2) = 4dd18f260ecd91b726336b2788fa33db04d6691a
 RMD160 (wipe-2.2.0.tar.bz2) = 5d1861bd893e01e94205a7ac2efadb1c756da700
@@ -10,5 +10,4 @@ SHA1 (patch-ad) = 6288118d9b4a70844bbc94a8e9dc4748fc9459f8
 SHA1 (patch-ae) = e1145c395a9b0999d7fbf8a4cb79f1dc89aa29e1
 SHA1 (patch-af) = 23102dea6f821791d5b3bd2bb509c38ab6bf2a16
 SHA1 (patch-ag) = fd61d6b065eb22cabb697f2df073a3b9efde26a9
-SHA1 (patch-ah) = 4e5e65708282461161f3dd786b1012f8306dd849
-SHA1 (patch-ai) = 821f8bad164e2707fdab8fb2f44b1dde0ee82173
+SHA1 (patch-ah) = 4b50f2fb8fa9b3c091ad4d1e0c8d954d3931d2b9
diff --git a/sysutils/wipe/patches/patch-ah b/sysutils/wipe/patches/patch-ah
index 4b1b5f1b6d9..c3a832ce703 100644
--- a/sysutils/wipe/patches/patch-ah
+++ b/sysutils/wipe/patches/patch-ah
@@ -1,8 +1,28 @@
-$NetBSD: patch-ah,v 1.1 2005/11/10 16:31:25 joerg Exp $
+$NetBSD: patch-ah,v 1.2 2013/06/17 05:37:22 dholland Exp $
 
---- blkdev.c.orig	2005-11-10 16:15:38.000000000 +0000
+- DragonFly BSD's partinfo is not the standard BSD partinfo.
+- Don't declare own errno.
+
+--- blkdev.c.orig	2003-08-03 23:07:29.000000000 +0000
 +++ blkdev.c
-@@ -63,7 +63,6 @@
+@@ -44,10 +44,15 @@
+ # endif
+ #endif
+ 
+-#ifdef HAVE_SYS_DISKLABEL_H
++#ifdef __DragonFly__
++# include <sys/diskslice.h>
++# define BSD_BLKDEV
++#else
++#ifdef HAVE_SYS_DISKLABEL_H)
+ # include <sys/disklabel.h>
+ # define BSD_BLKDEV
+ #endif
++#endif
+ 
+ #ifndef LINUX_BLKDEV
+ # ifndef BSD_BLKDEV
+@@ -63,7 +68,6 @@
  #include "wipe.h"
  #include "blkdev.h"
  
@@ -10,3 +30,26 @@ $NetBSD: patch-ah,v 1.1 2005/11/10 16:31:25 joerg Exp $
  extern int exit_code;
  extern char *argvzero;
  extern struct opt_s options;
+@@ -182,14 +186,20 @@ public int destroy_blkdev(struct file_s 
+       options.sectors = tmp;
+ #endif
+ 
+-#ifdef BSD_BLKDEV
++#if defined(BSD_BLKDEV)
++# if defined(__DragonFly__)
++      options.sectors = pinfo.media_blocks;
++# else
+       options.sectors = pinfo.part->p_size;
++# endif
+ #endif
+     }
+ 
+   if (options.sector_size == 0)
+     {
+-#ifdef BSD_BLKDEV
++#if defined(__DragonFly__)
++      options.sector_size = pinfo.media_blocks;
++#elif defined(BSD_BLKDEV)
+       options.sector_size = pinfo.disklab->d_secsize;
+ #else
+       options.sector_size = SECTOR_SIZE;
diff --git a/sysutils/wipe/patches/patch-ai b/sysutils/wipe/patches/patch-ai
deleted file mode 100644
index 2da2d0280ac..00000000000
--- a/sysutils/wipe/patches/patch-ai
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2011/01/10 06:12:16 obache Exp $
-
-* DragonFly BSD's partinfo is not the standard BSD partinfo.
-
---- blkdev.c.orig	2011-01-09 11:55:42.000000000 +0000
-+++ blkdev.c
-@@ -44,10 +44,15 @@
- # endif
- #endif
- 
--#ifdef HAVE_SYS_DISKLABEL_H
-+#ifdef __DragonFly__
-+# include <sys/diskslice.h>
-+# define BSD_BLKDEV
-+#else
-+#ifdef HAVE_SYS_DISKLABEL_H)
- # include <sys/disklabel.h>
- # define BSD_BLKDEV
- #endif
-+#endif
- 
- #ifndef LINUX_BLKDEV
- # ifndef BSD_BLKDEV
-@@ -181,14 +186,20 @@ public int destroy_blkdev(struct file_s 
-       options.sectors = tmp;
- #endif
- 
--#ifdef BSD_BLKDEV
-+#if defined(BSD_BLKDEV)
-+# if defined(__DragonFly__)
-+      options.sectors = pinfo.media_blocks;
-+# else
-       options.sectors = pinfo.part->p_size;
-+# endif
- #endif
-     }
- 
-   if (options.sector_size == 0)
-     {
--#ifdef BSD_BLKDEV
-+#if defined(__DragonFly__)
-+      options.sector_size = pinfo.media_blocks;
-+#elif defined(BSD_BLKDEV)
-       options.sector_size = pinfo.disklab->d_secsize;
- #else
-       options.sector_size = SECTOR_SIZE;