From owner-svn-ports-head@FreeBSD.ORG  Sun Jan 11 11:44:12 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
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 5B6215E6;
 Sun, 11 Jan 2015 11:44:12 +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 46468896;
 Sun, 11 Jan 2015 11:44:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0BBiCXQ072016;
 Sun, 11 Jan 2015 11:44:12 GMT (envelope-from mandree@FreeBSD.org)
Received: (from mandree@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0BBiClm072015;
 Sun, 11 Jan 2015 11:44:12 GMT (envelope-from mandree@FreeBSD.org)
Message-Id: <201501111144.t0BBiClm072015@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: mandree set sender to
 mandree@FreeBSD.org using -f
From: Matthias Andree <mandree@FreeBSD.org>
Date: Sun, 11 Jan 2015 11:44:12 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r376742 - head/sysutils/e2fsprogs/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
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Jan 2015 11:44:12 -0000

Author: mandree
Date: Sun Jan 11 11:44:11 2015
New Revision: 376742
URL: https://svnweb.freebsd.org/changeset/ports/376742
QAT: https://qat.redports.org/buildarchive/r376742/

Log:
  Fix build on HEAD since r276737 removed DIOCGDINFO.
  
  The code path that preferred DIOCGMEDIASIZE has been there for years
  (since FreeBSD 6.1 at the latest), but there was no guard that checked
  DIOCGINFO in one of the two getsize.c files.

Added:
  head/sysutils/e2fsprogs/files/patch-lib_blkid_getsize.c   (contents, props changed)

Added: head/sysutils/e2fsprogs/files/patch-lib_blkid_getsize.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/e2fsprogs/files/patch-lib_blkid_getsize.c	Sun Jan 11 11:44:11 2015	(r376742)
@@ -0,0 +1,20 @@
+--- lib/blkid/getsize.c.orig	2014-08-02 20:26:22 UTC
++++ lib/blkid/getsize.c
+@@ -127,7 +127,7 @@ blkid_loff_t blkid_get_dev_size(int fd)
+ 			return (blkid_loff_t)this_floppy.size << 9;
+ 	}
+ #endif
+-#ifdef HAVE_SYS_DISKLABEL_H
++#if defined(HAVE_SYS_DISKLABEL_H) && defined(DIOCGDINFO)
+ 	{
+ 		int part = -1;
+ 		struct disklabel lab;
+@@ -154,7 +154,7 @@ blkid_loff_t blkid_get_dev_size(int fd)
+ 				return pp->p_size << 9;
+ 		}
+ 	}
+-#endif /* HAVE_SYS_DISKLABEL_H */
++#endif /* defined(HAVE_SYS_DISKLABEL_H) && defined(DIOCGDINFO) */
+ 	{
+ #if defined(HAVE_FSTAT64) && !defined(__OSX_AVAILABLE_BUT_DEPRECATED)
+ 		struct stat64   st;