Date: Tue, 3 Feb 2015 20:14:40 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r378373 - in head/security/wipe: . files Message-ID: <201502032014.t13KEe8t050476@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Tue Feb 3 20:14:39 2015 New Revision: 378373 URL: https://svnweb.freebsd.org/changeset/ports/378373 QAT: https://qat.redports.org/buildarchive/r378373/ Log: - Fix build on recent current: properly handle removed ioctl - Add LICENSE_FILE - Fix whitespace - Remove unneeded options.mk include Modified: head/security/wipe/Makefile head/security/wipe/files/patch-blkdev.c Modified: head/security/wipe/Makefile ============================================================================== --- head/security/wipe/Makefile Tue Feb 3 20:12:55 2015 (r378372) +++ head/security/wipe/Makefile Tue Feb 3 20:14:39 2015 (r378373) @@ -10,8 +10,9 @@ MAINTAINER= ports@FreeBSD.org COMMENT= File and block device wiping utility LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/LICENSE -USES= tar:bzip2 +USES= tar:bzip2 GNU_CONFIGURE= yes PLIST_FILES= bin/wipe man/man1/wipe.1.gz @@ -19,8 +20,6 @@ PORTDOCS= CHANGES INSTALL LICENSE README OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - post-patch: @${REINPLACE_CMD} -e 's|@CFLAGS@|${CFLAGS}|' ${WRKSRC}/Makefile.in Modified: head/security/wipe/files/patch-blkdev.c ============================================================================== --- head/security/wipe/files/patch-blkdev.c Tue Feb 3 20:12:55 2015 (r378372) +++ head/security/wipe/files/patch-blkdev.c Tue Feb 3 20:14:39 2015 (r378373) @@ -1,6 +1,17 @@ ---- blkdev.c.orig Sun Aug 3 16:07:29 2003 -+++ blkdev.c Sat Mar 5 00:23:40 2005 -@@ -141,6 +141,10 @@ +--- blkdev.c.orig 2009-04-06 06:09:27.000000000 +0400 ++++ blkdev.c 2015-02-03 23:00:08.000000000 +0300 +@@ -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 @@ int code; #ifdef BSD_BLKDEV @@ -11,7 +22,7 @@ struct partinfo pinfo; #endif -@@ -173,7 +177,7 @@ +@@ -173,7 +179,7 @@ } #ifdef BSD_BLKDEV
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502032014.t13KEe8t050476>