From erik@bz.bzflag.bz  Wed Jan  9 20:31:10 2013
Return-Path: <erik@bz.bzflag.bz>
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
	by hub.freebsd.org (Postfix) with ESMTP id E4CEBABE
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  9 Jan 2013 20:31:10 +0000 (UTC)
	(envelope-from erik@bz.bzflag.bz)
Received: from bz.bzflag.bz (BZ.BZFLAG.BZ [63.246.136.16])
	by mx1.freebsd.org (Postfix) with SMTP id 88D51B1D
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  9 Jan 2013 20:31:10 +0000 (UTC)
Received: (qmail 46036 invoked by uid 6112); 9 Jan 2013 20:31:10 -0000
Message-Id: <20130109203110.46035.qmail@bz.bzflag.bz>
Date: 9 Jan 2013 20:31:10 -0000
From: Erik Greenwald <erik@bz.bzflag.bz>
Reply-To: Erik Greenwald <erik@bz.bzflag.bz>
To: FreeBSD-gnats-submit@freebsd.org
Cc: erik@elfga.com
Subject: [Maintainer Update]  sysutils/diskscrub  2.2 -> 2.5.2
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         175167
>Category:       ports
>Synopsis:       [Maintainer Update]  sysutils/diskscrub  2.2 -> 2.5.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    ak
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jan 09 20:40:00 UTC 2013
>Closed-Date:    Sat Jan 12 03:56:10 UTC 2013
>Last-Modified:  Sat Jan 12 04:00:00 UTC 2013
>Originator:     Erik Greenwald
>Release:        
>Organization:
>Environment:
>Description:
Update from 2.2 to 2.5.2.
files/extrapatch-freebsd4 is deleted
files/patch-src_util.h is added
Updated header to new style.
>How-To-Repeat:
>Fix:

--- sysutils_diskscrub.patch begins here ---
Index: sysutils/diskscrub/Makefile
===================================================================
--- sysutils/diskscrub/Makefile	(revision 310123)
+++ sysutils/diskscrub/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	diskscrub
-# Date created:		28 November 2006
-# Whom:			Erik Greenwald <erik@smluc.org>
-#
+# Created by: Erik Greenwald <erik@smluc.org>
 # $FreeBSD$
-#
 
 PORTNAME=	diskscrub
-PORTVERSION=	2.2
+PORTVERSION=	2.5.2
 CATEGORIES=	sysutils
 MASTER_SITES=	GOOGLE_CODE
 DISTNAME=	scrub-${PORTVERSION}
Index: sysutils/diskscrub/distinfo
===================================================================
--- sysutils/diskscrub/distinfo	(revision 310123)
+++ sysutils/diskscrub/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (scrub-2.2.tar.bz2) = cb1e6f06c4e9d7b54acebb8a04f51a4e2d2a61a8c4f009796f1f825301b2da17
-SIZE (scrub-2.2.tar.bz2) = 145004
+SHA256 (scrub-2.5.2.tar.bz2) = 51ee4963759cf07b186bb583ef2839618c1131bbbbdfae849ca76a2259cbc461
+SIZE (scrub-2.5.2.tar.bz2) = 161468
Index: sysutils/diskscrub/files/extrapatch-freebsd4
===================================================================
--- sysutils/diskscrub/files/extrapatch-freebsd4	(revision 310123)
+++ sysutils/diskscrub/files/extrapatch-freebsd4	(working copy)
@@ -1,16 +0,0 @@
---- getsize.c.orig	Thu Aug 17 05:15:45 2006
-+++ getsize.c	Tue Nov 28 23:00:49 2006
-@@ -81,6 +81,13 @@
- #elif defined(__FreeBSD__)
- /* scrub-1.7 tested freebsd 5.3-RELEASE-p5 */
- #include <sys/ioctl.h>
-+#include <sys/queue.h>
-+
-+#ifndef DIOCGMEDIASIZE
-+#define DIOCGMEDIASIZE  _IOR('d', 129, off_t)   /* Get media size in bytes */
-+#endif
-+
-+#include <sys/disklabel.h>
- #include <sys/disk.h>
- 
- off_t 
Index: sysutils/diskscrub/files/patch-src_util.h
===================================================================
--- sysutils/diskscrub/files/patch-src_util.h	(revision 0)
+++ sysutils/diskscrub/files/patch-src_util.h	(working copy)
@@ -0,0 +1,11 @@
+--- src/util.h.orig	2013-01-09 15:24:03.000000000 -0500
++++ src/util.h	2013-01-09 15:24:22.000000000 -0500
+@@ -24,6 +24,8 @@
+  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ \*****************************************************************************/
+ 
++#include <sys/mman.h>
++
+ #ifdef HAVE_STDBOOL_H
+ #include <stdbool.h>
+ #else
--- sysutils_diskscrub.patch ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->ak 
Responsible-Changed-By: ak 
Responsible-Changed-When: Sat Jan 12 03:56:01 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=175167 
State-Changed-From-To: open->closed 
State-Changed-By: ak 
State-Changed-When: Sat Jan 12 03:56:09 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=175167 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/175167: commit references a PR
Date: Sat, 12 Jan 2013 03:55:19 +0000 (UTC)

 Author: ak
 Date: Sat Jan 12 03:55:10 2013
 New Revision: 310261
 URL: http://svnweb.freebsd.org/changeset/ports/310261
 
 Log:
   - Update to 2.5.2
   - Convert Makefile headers to new style
   
   PR:	ports/175167
   Submitted by:	Erik Greenwald <erik@bz.bzflag.bz> (maintainer)
 
 Added:
   head/sysutils/diskscrub/files/patch-src_util.h   (contents, props changed)
 Deleted:
   head/sysutils/diskscrub/files/extrapatch-freebsd4
 Modified:
   head/sysutils/diskscrub/Makefile   (contents, props changed)
   head/sysutils/diskscrub/distinfo   (contents, props changed)
 
 Modified: head/sysutils/diskscrub/Makefile
 ==============================================================================
 --- head/sysutils/diskscrub/Makefile	Sat Jan 12 03:06:37 2013	(r310260)
 +++ head/sysutils/diskscrub/Makefile	Sat Jan 12 03:55:10 2013	(r310261)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	diskscrub
 -# Date created:		28 November 2006
 -# Whom:			Erik Greenwald <erik@smluc.org>
 -#
 +# Created by: Erik Greenwald <erik@smluc.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	diskscrub
 -PORTVERSION=	2.2
 +PORTVERSION=	2.5.2
  CATEGORIES=	sysutils
  MASTER_SITES=	GOOGLE_CODE
  DISTNAME=	scrub-${PORTVERSION}
 
 Modified: head/sysutils/diskscrub/distinfo
 ==============================================================================
 --- head/sysutils/diskscrub/distinfo	Sat Jan 12 03:06:37 2013	(r310260)
 +++ head/sysutils/diskscrub/distinfo	Sat Jan 12 03:55:10 2013	(r310261)
 @@ -1,2 +1,2 @@
 -SHA256 (scrub-2.2.tar.bz2) = cb1e6f06c4e9d7b54acebb8a04f51a4e2d2a61a8c4f009796f1f825301b2da17
 -SIZE (scrub-2.2.tar.bz2) = 145004
 +SHA256 (scrub-2.5.2.tar.bz2) = 51ee4963759cf07b186bb583ef2839618c1131bbbbdfae849ca76a2259cbc461
 +SIZE (scrub-2.5.2.tar.bz2) = 161468
 
 Added: head/sysutils/diskscrub/files/patch-src_util.h
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/sysutils/diskscrub/files/patch-src_util.h	Sat Jan 12 03:55:10 2013	(r310261)
 @@ -0,0 +1,11 @@
 +--- src/util.h.orig	2013-01-09 15:24:03.000000000 -0500
 ++++ src/util.h	2013-01-09 15:24:22.000000000 -0500
 +@@ -24,6 +24,8 @@
 +  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
 + \*****************************************************************************/
 + 
 ++#include <sys/mman.h>
 ++
 + #ifdef HAVE_STDBOOL_H
 + #include <stdbool.h>
 + #else
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
