svn commit: r410885 - in head/security/wipe: . files
Dmitry Marakasov
amdmi3 at FreeBSD.org
Sat Mar 12 14:09:37 UTC 2016
Author: amdmi3
Date: Sat Mar 12 14:09:35 2016
New Revision: 410885
URL: https://svnweb.freebsd.org/changeset/ports/410885
Log:
- Clarify LICENSE
- Don't install unneeded docs
- Switch to options helpers
- Regenerate patches with `make makepatch`
Modified:
head/security/wipe/Makefile
head/security/wipe/files/patch-Makefile.in
head/security/wipe/files/patch-blkdev.c
head/security/wipe/files/patch-prompt.c
Modified: head/security/wipe/Makefile
==============================================================================
--- head/security/wipe/Makefile Sat Mar 12 14:08:23 2016 (r410884)
+++ head/security/wipe/Makefile Sat Mar 12 14:09:35 2016 (r410885)
@@ -9,14 +9,14 @@ MASTER_SITES= SF
MAINTAINER= ports at FreeBSD.org
COMMENT= File and block device wiping utility
-LICENSE= GPLv2
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/LICENSE
USES= tar:bzip2
GNU_CONFIGURE= yes
PLIST_FILES= bin/wipe man/man1/wipe.1.gz
-PORTDOCS= CHANGES INSTALL LICENSE README TESTING TODO copyright
+PORTDOCS= CHANGES README TESTING TODO
OPTIONS_DEFINE= DOCS
@@ -26,7 +26,9 @@ post-patch:
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
- ${MKDIR} ${STAGEDIR}${DOCSDIR}
+
+do-install-DOCS-on:
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
.for f in ${PORTDOCS}
${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
.endfor
Modified: head/security/wipe/files/patch-Makefile.in
==============================================================================
--- head/security/wipe/files/patch-Makefile.in Sat Mar 12 14:08:23 2016 (r410884)
+++ head/security/wipe/files/patch-Makefile.in Sat Mar 12 14:09:35 2016 (r410885)
@@ -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,7 @@
+--- 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
Modified: head/security/wipe/files/patch-blkdev.c
==============================================================================
--- head/security/wipe/files/patch-blkdev.c Sat Mar 12 14:08:23 2016 (r410884)
+++ head/security/wipe/files/patch-blkdev.c Sat Mar 12 14:09:35 2016 (r410885)
@@ -1,5 +1,5 @@
---- blkdev.c.orig 2009-04-06 06:09:27.000000000 +0400
-+++ blkdev.c 2015-02-03 23:00:08.000000000 +0300
+--- blkdev.c.orig 2009-04-06 02:09:27 UTC
++++ blkdev.c
@@ -46,7 +46,9 @@
#ifdef HAVE_SYS_DISKLABEL_H
@@ -11,7 +11,7 @@
#endif
#ifndef LINUX_BLKDEV
-@@ -141,6 +143,10 @@
+@@ -141,6 +143,10 @@ public int destroy_blkdev(struct file_s
int code;
#ifdef BSD_BLKDEV
@@ -22,7 +22,7 @@
struct partinfo pinfo;
#endif
-@@ -173,7 +179,7 @@
+@@ -173,7 +179,7 @@ public int destroy_blkdev(struct file_s
}
#ifdef BSD_BLKDEV
Modified: head/security/wipe/files/patch-prompt.c
==============================================================================
--- head/security/wipe/files/patch-prompt.c Sat Mar 12 14:08:23 2016 (r410884)
+++ head/security/wipe/files/patch-prompt.c Sat Mar 12 14:09:35 2016 (r410885)
@@ -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);
More information about the svn-ports-head
mailing list