From 0d97007ea80a07acd766f40f3e17aeb8a1b53138 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Tue, 28 Dec 2004 16:09:47 +0000
Subject: Fix build on 2.0.

---
 devel/pwlib/distinfo         |  4 ++--
 devel/pwlib/patches/patch-ad | 35 ++++++++++-------------------------
 2 files changed, 12 insertions(+), 27 deletions(-)

(limited to 'devel/pwlib')

diff --git a/devel/pwlib/distinfo b/devel/pwlib/distinfo
index 2a11443d104..53a75187897 100644
--- a/devel/pwlib/distinfo
+++ b/devel/pwlib/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.12 2004/11/30 16:44:47 adam Exp $
+$NetBSD: distinfo,v 1.13 2004/12/28 16:09:47 wiz Exp $
 
 SHA1 (pwlib-v1_8_3-src-tar.gz) = d3a6eff571ebfd37889e75cbaef75983e6119d2e
 Size (pwlib-v1_8_3-src-tar.gz) = 1900922 bytes
 SHA1 (patch-aa) = f07517555dee8ba1a0b4ecad93aa36a57ae024b2
 SHA1 (patch-ab) = 7d7e09d5403a8b98c832e286eb8403d457164d0e
 SHA1 (patch-ac) = c0284e67ce689d774b715be4dc17214aa88c3d4a
-SHA1 (patch-ad) = e7da3f984d9c0800aba0c69583d28ebb8b1e3b6e
+SHA1 (patch-ad) = 6637d2a511a9cb71a3a53c8a5d3b7f6132d04958
 SHA1 (patch-af) = c38f646d75d57f17101ce42813f8e66232778447
 SHA1 (patch-ai) = 68e6b9ef55695a01193c1e77eb7960232311e695
 SHA1 (patch-aj) = 93e039bb60c5cb75abb916e2797c644b67a6b9b0
diff --git a/devel/pwlib/patches/patch-ad b/devel/pwlib/patches/patch-ad
index 3d09e5b9663..3f346b32b0d 100644
--- a/devel/pwlib/patches/patch-ad
+++ b/devel/pwlib/patches/patch-ad
@@ -1,33 +1,18 @@
-$NetBSD: patch-ad,v 1.3 2004/11/30 16:45:19 adam Exp $
+$NetBSD: patch-ad,v 1.4 2004/12/28 16:09:47 wiz Exp $
 
---- src/ptlib/unix/osutil.cxx.orig	2004-11-30 17:37:08.000000000 +0000
+--- src/ptlib/unix/osutil.cxx.orig	2004-09-23 07:00:10.000000000 +0200
 +++ src/ptlib/unix/osutil.cxx
-@@ -245,6 +245,7 @@
+@@ -243,8 +243,13 @@
+ #elif defined(P_FREEBSD) || defined(P_OPENBSD) || defined(P_NETBSD) || defined(P_MACOSX) || defined(P_MACOS)
+ #define P_USE_STRFTIME
  
++#if defined(__NetBSD__) && __NetBSD_Version__ > 200040000
++#include <sys/statvfs.h>
++#define statfs statvfs
++#else
  #include <sys/param.h>
  #include <sys/mount.h>
-+#include <sys/statvfs.h>
++#endif
  
  #elif defined(P_HPUX9) 
  #define P_USE_LANGINFO
-@@ -687,7 +688,7 @@ PString PDirectory::GetVolume() const
- 
- #elif defined(P_FREEBSD) || defined(P_OPENBSD) || defined(P_NETBSD) || defined(P_MACOSX) || defined(P_MACOS)
- 
--    struct statfs * mnt;
-+    struct statvfs * mnt;
-     int count = getmntinfo(&mnt, MNT_NOWAIT);
-     for (int i = 0; i < count; i++) {
-       if (stat(mnt[i].f_mntonname, &status) != -1 && status.st_dev == my_dev) {
-@@ -727,9 +728,9 @@ BOOL PDirectory::GetVolumeSpace(PInt64 &
- {
- #if defined(P_LINUX) || defined(P_FREEBSD) || defined(P_OPENBSD) || defined(P_NETBSD) || defined(P_MACOSX) || defined(P_MACOS)
- 
--  struct statfs fs;
-+  struct statvfs fs;
- 
--  if (statfs(operator+("."), &fs) == -1)
-+  if (statvfs(operator+("."), &fs) == -1)
-     return FALSE;
- 
-   clusterSize = fs.f_bsize;
-- 
cgit v1.2.3