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