[pkgsrc/pkgsrc-2017Q1]: pkgsrc/net/transmission Pullup ticket #5489 - request...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e4a9bf728f03
branches:  pkgsrc-2017Q1
changeset: 360431:e4a9bf728f03
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Wed Jun 21 18:51:30 2017 +0000

description:
Pullup ticket #5489 - requested by sevan
net/transmission: build fix for Dragonfly

Revisions pulled up:
- net/transmission/distinfo                                     1.10-1.11
- net/transmission/patches/patch-libtransmission_platform-quota.c 1.4-1.5

---
   Module Name:    pkgsrc
   Committed By:   maya
   Date:           Mon Jun 19 13:21:35 UTC 2017

   Modified Files:
           pkgsrc/net/transmission: distinfo
   Added Files:
           pkgsrc/net/transmission/patches:
   patch-libtransmission_platform-quota.c

   Log Message:
   Apply patch that reportedly fixes the build on DragonflyBSD

   >From Aleksej Lebedev (From dragonfly dports) in pkgsrc-users

---
   Module Name:    pkgsrc
   Committed By:   maya
   Date:           Mon Jun 19 13:33:46 UTC 2017

   Modified Files:
           pkgsrc/net/transmission: distinfo
           pkgsrc/net/transmission/patches:
   patch-libtransmission_platform-quota.c

   Log Message:
   Add last missing hunk for dflybsd build, missed in previous commit.

diffstat:

 net/transmission/distinfo                                       |   3 +-
 net/transmission/patches/patch-libtransmission_platform-quota.c |  42 ++++++++++
 2 files changed, 44 insertions(+), 1 deletions(-)

diffs (60 lines):

diff -r 521c12a80de5 -r e4a9bf728f03 net/transmission/distinfo
--- a/net/transmission/distinfo Wed Jun 21 18:45:27 2017 +0000
+++ b/net/transmission/distinfo Wed Jun 21 18:51:30 2017 +0000
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.9 2016/04/15 09:28:39 wiz Exp $
+$NetBSD: distinfo,v 1.9.8.1 2017/06/21 18:51:30 bsiegert Exp $
 
 SHA1 (transmission-2.92.tar.xz) = 2140feba45c4471392033d21b86b6f3ef780d88e
 RMD160 (transmission-2.92.tar.xz) = 6da78ce333fa2ea69aa4954c3b052a818ce7c93e
 SHA512 (transmission-2.92.tar.xz) = 4d99476bee88cedcc4238a0eee64a4089016933cbfc1cfb1cca023ad4ebcfe46375c9e7651a17af4aeaaf1feb19cbd8166aa56ef7992d9e745a7bbcbe8efca11
 Size (transmission-2.92.tar.xz) = 3378116 bytes
 SHA1 (patch-ab) = 796faa7c61762dc3ffe563748e55160c827149d2
+SHA1 (patch-libtransmission_platform-quota.c) = 2d9758d24c4329021e0774ac9f8bb3dd94592965
 SHA1 (patch-qt_qtr.pro) = 8d83709175fb4b9a88c3766b130b39160aeadaa3
diff -r 521c12a80de5 -r e4a9bf728f03 net/transmission/patches/patch-libtransmission_platform-quota.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/transmission/patches/patch-libtransmission_platform-quota.c   Wed Jun 21 18:51:30 2017 +0000
@@ -0,0 +1,42 @@
+$NetBSD$
+
+Fix dragonflybsd build
+
+--- libtransmission/platform-quota.c.orig      2017-06-19 12:56:41.129003307 +0000
++++ libtransmission/platform-quota.c
+@@ -18,6 +18,8 @@
+  #include <sys/types.h> /* types needed by quota.h */
+  #if defined(__FreeBSD__) || defined(__OpenBSD__)
+   #include <ufs/ufs/quota.h> /* quotactl() */
++ #elif defined (__DragonFly__)
++  #include <vfs/ufs/quota.h> /* quotactl */
+  #elif defined (__NetBSD__)
+   #include <sys/param.h>
+   #ifndef statfs
+@@ -244,12 +246,16 @@ getquota (const char * device)
+ static int64_t
+ getquota (const char * device)
+ {
++#ifdef __DragonFly__
++  struct ufs_dqblk dq;
++#else
+   struct dqblk dq;
++#endif
+   int64_t limit;
+   int64_t freespace;
+   int64_t spaceused;
+ 
+-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
++#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) || defined(__APPLE__)
+   if (quotactl(device, QCMD(Q_GETQUOTA, USRQUOTA), getuid(), (caddr_t) &dq) == 0)
+     {
+ #elif defined(__sun)
+@@ -281,7 +287,7 @@ getquota (const char * device)
+           /* No quota enabled for this user */
+           return -1;
+         }
+-#if defined(__FreeBSD__) || defined(__OpenBSD__)
++#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
+       spaceused = (int64_t) dq.dqb_curblocks >> 1;
+ #elif defined(__APPLE__)
+       spaceused = (int64_t) dq.dqb_curbytes;