Import of pkgsrc-2013Q2

sysutils/wipe/patches/patch-aa

@@ -0,0 +1,27 @@
+$NetBSD: patch-aa,v 1.2 2010/01/27 20:37:48 joerg Exp $
+
+--- Makefile.in.orig	2003-08-30 20:18:03.000000000 -0500
++++ Makefile.in
+@@ -57,15 +57,15 @@ info:   $(BIN_OUT)
+ 	@ldd $(BIN_OUT)
+ 
+ install: $(BIN_OUT)
+-	$(INSTALL_BIN) -d $(bindir)
+-	$(INSTALL_BIN) -s $(BIN_OUT) $(bindir)
+-	$(INSTALL) -d $(mandir)/man1
+-	$(INSTALL) -o root -m 0644 wipe.1 $(mandir)/man1/
++	$(BSD_INSTALL_PROGRAM_DIR) ${DESTDIR}$(bindir)
++	$(BSD_INSTALL_PROGRAM) $(BIN_OUT) ${DESTDIR}$(bindir)
++	$(BSD_INSTALL_MAN_DIR) ${DESTDIR}$(mandir)/man1
++	$(BSD_INSTALL_MAN) wipe.1 ${DESTDIR}$(mandir)/man1/
+-	rm -rf $(datadir)/doc/wipe*
++	rm -rf ${DESTDIR}$(datadir)/doc/wipe*
+-	$(INSTALL) -d $(datadir)/doc/wipe
++	$(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(datadir)/doc/wipe
+ 
+ 	for file in $(DOCS); do \
+-		$(INSTALL) -o root -m 0644 $$file $(datadir)/doc/wipe/; \
++		$(BSD_INSTALL_DATA) $$file ${DESTDIR}$(datadir)/doc/wipe/; \
+ 	done
+ 
+ install_home: $(BIN_OUT)

sysutils/wipe/patches/patch-ab

@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2005/11/10 16:31:25 joerg Exp $
+
+--- main.c.orig	2005-11-10 16:11:18.000000000 +0000
++++ main.c
+@@ -49,8 +49,6 @@
+ char *argvzero;
+ int exit_code;
+ 
+-extern int errno;
+-
+ struct opt_s options;                 /* cmd line options                        */
+ 
+ public int main(int argc, char **argv)

sysutils/wipe/patches/patch-ac

@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1 2005/11/10 16:31:25 joerg Exp $
+
+--- wipe.c.orig	2005-11-10 16:11:51.000000000 +0000
++++ wipe.c
+@@ -55,7 +55,6 @@
+ #include "rand.h"
+ #include "wipe.h"
+ 
+-extern int errno;
+ extern int exit_code;
+ extern char *argvzero;
+ extern struct opt_s options;

sysutils/wipe/patches/patch-ad

@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2005/11/10 16:31:25 joerg Exp $
+
+--- rand.c.orig	2005-11-10 16:13:03.000000000 +0000
++++ rand.c
+@@ -35,7 +35,7 @@
+ #include "rand.h"
+ 
+ extern char *argvzero;
+-extern int errno, exit_code;
++extern int exit_code;
+ extern struct opt_s options;
+ 
+ int entropyfd;

sysutils/wipe/patches/patch-ae

@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.1 2005/11/10 16:31:25 joerg Exp $
+
+--- dir.c.orig	2005-11-10 16:13:27.000000000 +0000
++++ dir.c
+@@ -46,7 +46,6 @@
+ #include "io.h"
+ #include "dir.h"
+ 
+-extern int errno;
+ extern int exit_code;
+ extern char *argvzero;
+ extern struct opt_s options;

sysutils/wipe/patches/patch-af

@@ -0,0 +1,12 @@
+$NetBSD: patch-af,v 1.1 2005/11/10 16:31:25 joerg Exp $
+
+--- file.c.orig	2005-11-10 16:13:33.000000000 +0000
++++ file.c
+@@ -43,7 +43,6 @@
+ #include "prompt.h"
+ #include "wipe.h"
+ 
+-extern int errno;
+ extern int exit_code;
+ extern char *argvzero;
+ 

sysutils/wipe/patches/patch-ag

@@ -0,0 +1,12 @@
+$NetBSD: patch-ag,v 1.1 2005/11/10 16:31:25 joerg Exp $
+
+--- io.c.orig	2005-11-10 16:13:36.000000000 +0000
++++ io.c
+@@ -42,7 +42,6 @@
+ #include "main.h"
+ #include "io.h"
+ 
+-extern int errno;
+ extern int exit_code;
+ extern char *argvzero;
+ extern struct opt_s options;

sysutils/wipe/patches/patch-ah

@@ -0,0 +1,117 @@
+$NetBSD: patch-ah,v 1.3 2013/06/17 06:09:06 dholland Exp $
+
+- Don't declare own errno.
+- DragonFly BSD's partinfo is not the standard BSD partinfo.
+- NetBSD no longer supports the partinfo ioctl. Use the
+  available alternatives, which is kind of messy.
+
+--- blkdev.c.orig	2003-08-03 23:07:29.000000000 +0000
++++ blkdev.c
+@@ -44,10 +44,20 @@
+ # endif
+ #endif
+ 
++#if defined(__DragonFly__)
++# include <sys/diskslice.h>
++# define BSD_BLKDEV
++#elif defined(__NetBSD__)
++# include <sys/disklabel.h>
++# include <sys/disk.h>
++# include <sys/param.h> /* for DEV_BSIZE, XXX */
++# 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 +73,6 @@
+ #include "wipe.h"
+ #include "blkdev.h"
+ 
+-extern int errno;
+ extern int exit_code;
+ extern char *argvzero;
+ extern struct opt_s options;
+@@ -128,7 +137,13 @@ public int destroy_blkdev(struct file_s 
+   int code;
+ 
+ #ifdef BSD_BLKDEV
++#ifdef DIOCGPART
+   struct partinfo pinfo;
++#else
++  struct disklabel lab;
++  struct dkwedge_info dkw;
++  int use_dkw;
++#endif
+ #endif
+ 
+ #ifdef NO_BLKDEV
+@@ -160,12 +175,26 @@ public int destroy_blkdev(struct file_s 
+     }
+ 
+ #ifdef BSD_BLKDEV
++# ifdef DIOCGPART
+   if (ioctl(f->fd, DIOCGPART, &pinfo))
+     {
+       fprintf(stderr, "\r%s: ioctl failed, can't get disklabel for `%s': %s\n",
+ 	      argvzero, f->name, strerror(errno));
+       exit_code = errno; return FAILED;
+     }
++# else
++  if (ioctl(f->fd, DIOCGDINFO, &lab) == 0) {
++     use_dkw = 0;
++  }
++  else if (ioctl(f->fd, DIOCGWEDGEINFO, &dkw) == 0) {
++     use_dkw = 1;
++  }
++  else {
++     fprintf(stderr, "\r%s: ioctl failed, can't get disklabel for `%s': %s\n",
++	     argvzero, f->name, strerror(errno));
++     exit_code = errno; return FAILED;
++  }
++# endif
+ #endif
+ 
+   if (options.sectors == 0)
+@@ -182,15 +211,35 @@ 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
++#  if defined(DIOCGPART)
+       options.sectors = pinfo.part->p_size;
++#  else
++      options.sectors = use_dkw ?
++	 dkw.dkw_size : lab.d_partitions[DISKPART(f->st.st_rdev)].p_size;
++#  endif
++# endif
+ #endif
+     }
+ 
+   if (options.sector_size == 0)
+     {
+-#ifdef BSD_BLKDEV
++#if defined(__DragonFly__)
++      options.sector_size = pinfo.media_blocks;
++#elif defined(BSD_BLKDEV)
++# if defined(DIOCGPART)
+       options.sector_size = pinfo.disklab->d_secsize;
++# else
++      /*
++       * XXX: we ought to use DIOCGDISKINFO to get the sector size,
++       * but that requires proplib and probably 500+ lines of code.
++       * So punt and use DEV_BSIZE...
++       */
++      options.sector_size = use_dkw ? DEV_BSIZE : lab.d_secsize;
++# endif
+ #else
+       options.sector_size = SECTOR_SIZE;
+ #endif