From owner-svn-ports-head@FreeBSD.ORG Tue Feb 3 20:14:40 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C1E6A320; Tue, 3 Feb 2015 20:14:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9340186F; Tue, 3 Feb 2015 20:14:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t13KEecO050478; Tue, 3 Feb 2015 20:14:40 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t13KEe8t050476; Tue, 3 Feb 2015 20:14:40 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502032014.t13KEe8t050476@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 3 Feb 2015 20:14:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r378373 - in head/security/wipe: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2015 20:14:40 -0000 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 - 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 +-# 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