[pkgsrc/trunk]: pkgsrc/sysutils/ntfsprogs Consistently use DIOCGDINFO.

[jakllsch <jakllsch%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3962bb619524
branches:  trunk
changeset: 632474:3962bb619524
user:      jakllsch <jakllsch%pkgsrc.org@localhost>
date:      Sun Mar 30 23:58:19 2014 +0000

description:
Consistently use DIOCGDINFO.

diffstat:

 sysutils/ntfsprogs/Makefile         |   4 ++--
 sysutils/ntfsprogs/distinfo         |   4 ++--
 sysutils/ntfsprogs/patches/patch-ae |  10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diffs (62 lines):

diff -r 7bb992afd63f -r 3962bb619524 sysutils/ntfsprogs/Makefile
--- a/sysutils/ntfsprogs/Makefile       Sun Mar 30 19:45:37 2014 +0000
+++ b/sysutils/ntfsprogs/Makefile       Sun Mar 30 23:58:19 2014 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2012/10/23 19:51:15 asau Exp $
+# $NetBSD: Makefile,v 1.11 2014/03/30 23:58:19 jakllsch Exp $
 
 DISTNAME=      ntfsprogs-2.0.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=linux-ntfs/}
 EXTRACT_SUFX=  .tar.bz2
diff -r 7bb992afd63f -r 3962bb619524 sysutils/ntfsprogs/distinfo
--- a/sysutils/ntfsprogs/distinfo       Sun Mar 30 19:45:37 2014 +0000
+++ b/sysutils/ntfsprogs/distinfo       Sun Mar 30 23:58:19 2014 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.12 2008/03/08 08:56:47 adam Exp $
+$NetBSD: distinfo,v 1.13 2014/03/30 23:58:19 jakllsch Exp $
 
 SHA1 (ntfsprogs-2.0.0.tar.bz2) = 75393dec021e73a922fe1fd034636de5a45f79a8
 RMD160 (ntfsprogs-2.0.0.tar.bz2) = aaef354ed7dab572c81f0eece89dd5994babfa8d
 Size (ntfsprogs-2.0.0.tar.bz2) = 678114 bytes
 SHA1 (patch-ab) = 2f277b21885c75c5ba63e9fcf37faca3bb0451dd
 SHA1 (patch-ac) = 94cf3266fb5109c8f6fd874e00c35b2ac642a9f1
-SHA1 (patch-ae) = 224e81c0ba3f530f52bbf646c1c66299b0519b3d
+SHA1 (patch-ae) = 0233d53dca5d9e8d39a6537a862c9b1143422381
 SHA1 (patch-af) = e89fb98fb9b365a7f24f7c9bcafb655594523622
 SHA1 (patch-ah) = b6da89fc9b5bbc83fa503dd887f3f2ec493ad7c7
 SHA1 (patch-am) = 8dfca2bb615662a18230e6816729808733e1c2d4
diff -r 7bb992afd63f -r 3962bb619524 sysutils/ntfsprogs/patches/patch-ae
--- a/sysutils/ntfsprogs/patches/patch-ae       Sun Mar 30 19:45:37 2014 +0000
+++ b/sysutils/ntfsprogs/patches/patch-ae       Sun Mar 30 23:58:19 2014 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.5 2008/03/08 08:56:47 adam Exp $
+$NetBSD: patch-ae,v 1.6 2014/03/30 23:58:19 jakllsch Exp $
 
---- libntfs/device.c.orig      2007-09-26 20:28:34.000000000 +0200
+--- libntfs/device.c.orig      2007-09-26 18:28:34.000000000 +0000
 +++ libntfs/device.c
 @@ -85,6 +85,10 @@
  #     define BLKBSZSET _IOW(0x12,113,size_t) /* Set device block size in bytes. */
@@ -17,7 +17,7 @@
                }
        }
  #endif
-+#ifdef DIOCGPART
++#ifdef DIOCGDINFO
 +      {
 +              struct stat st;
 +              if (dev->d_ops->stat(dev, &st) >= 0) {
@@ -27,8 +27,8 @@
 +                      if (dev->d_ops->ioctl(dev, DIOCGDINFO, &disklabel) >= 0) {
 +                              secsize = disklabel.d_secsize;
 +                              psize = disklabel.d_partitions[DISKPART(st.st_rdev)].p_size;
-+                              ntfs_log_debug("DIOCGPART nr %d byte blocks = %lld (0x%llx)\n",
-+                                              secsize, psize, psize);
++                              ntfs_log_debug("DIOCGDINFO part %d nr %d byte blocks = %lld (0x%llx)\n",
++                                              DISKPART(st.st_rdev), secsize, psize, psize);
 +                              return psize * secsize / block_size;
 +                      }
 +              }