Third time's the charm. I hope. autoconf can bite me.

4 files changed, 24 insertions, 15 deletions

diff --git a/net/wu-ftpd/distinfo b/net/wu-ftpd/distinfo
index 9dd63a184db..dd11140ab37 100644
--- a/net/wu-ftpd/distinfo
+++ b/net/wu-ftpd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2012/04/08 04:49:56 dholland Exp $
+$NetBSD: distinfo,v 1.20 2012/04/08 05:11:13 dholland Exp $
 
 SHA1 (wu-ftpd/wu-ftpd-2.6.2.tar.gz) = e39112bd8a67f189b6a8da8dd81ceb00a910e271
 RMD160 (wu-ftpd/wu-ftpd-2.6.2.tar.gz) = 0b7451c185f80cf9a345f97b9642853e0323e3bd
@@ -23,7 +23,7 @@ SHA1 (patch-ak) = 8eca121c737498106a5e829cb166746436a87237
 SHA1 (patch-al) = b537901ac9e267a13247547d621215acd6595502
 SHA1 (patch-am) = 1b1cdf067382fce0cb6aa5e6ff605c15414b26ff
 SHA1 (patch-an) = fd1d50bd28b283df717c1ce5fe2f0d6f3eab4967
-SHA1 (patch-ao) = aa109f9d17e76207c3cae6dc33584c8b70f5092b
-SHA1 (patch-ap) = 13067ee5edade37774e406918d48adf1b63c8be2
-SHA1 (patch-configure_in) = 497232480d162f510ef4c2ad1f8cc91416724ffe
+SHA1 (patch-ao) = d64d90ec6d9b3cea66cdfe82e879c7d314551911
+SHA1 (patch-ap) = 993e4dd93b9ff56aac43d3472bca01ae2f890b26
+SHA1 (patch-configure_in) = 98cfb7718201651f7c6d7219c997bd853148435a
 SHA1 (patch-src_logwtmp_c) = c52a7950793dfed5a474e0d09a90bfc105a6dd4a
diff --git a/net/wu-ftpd/patches/patch-ao b/net/wu-ftpd/patches/patch-ao
index 9987419a58d..0ed570596f4 100644
--- a/net/wu-ftpd/patches/patch-ao
+++ b/net/wu-ftpd/patches/patch-ao
@@ -1,4 +1,4 @@
-$NetBSD: patch-ao,v 1.2 2012/04/08 04:43:51 dholland Exp $
+$NetBSD: patch-ao,v 1.3 2012/04/08 05:11:13 dholland Exp $
 
 - support netbsd-6 libquota API
 - support dragonfly quotas
@@ -17,16 +17,20 @@ this patch without thinking.
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
  echo "$as_me:5229: checking for $ac_header" >&5
-@@ -5271,7 +5271,7 @@ EOF
+@@ -5271,8 +5271,11 @@ EOF
  fi
  done
  
 -	if test $ac_cv_header_sys_quota.h = yes -o $ac_cv_header_sys_fs_ufs_quota_h = yes -o $ac_cv_header_ufs_quota_h = yes -o $ac_cv_header_jfs_quota_h = yes -o $ac_cv_header_ufs_ufs_quota_h = yes -o $ac_cv_header_linux_quota_h = yes; then
 +	if test $ac_cv_header_quota.h = yes -o $ac_cv_header_sys_quota.h = yes -o $ac_cv_header_sys_fs_ufs_quota_h = yes -o $ac_cv_header_ufs_quota_h = yes -o $ac_cv_header_jfs_quota_h = yes -o $ac_cv_header_ufs_ufs_quota_h = yes -o $ac_cv_header_linux_quota_h = yes; then
  		quota=yes
++		if test $ac_cv_header_quota_h = yes; then
++			LIBS="$LIBS -lquota"
++		fi
  	else
  		if test $quota = yes; then
-@@ -5333,6 +5333,12 @@ echo $ECHO_N "checking whether quota sup
+ 			{ echo "$as_me:5278: WARNING: QUOTA not supported by OS - disabled" >&5
+@@ -5333,6 +5336,12 @@ echo $ECHO_N "checking whether quota sup
  #ifdef HAVE_UFS_UFS_QUOTA_H
  #include <ufs/ufs/quota.h>
  #endif
diff --git a/net/wu-ftpd/patches/patch-ap b/net/wu-ftpd/patches/patch-ap
index 998b0fb5aea..793d0013580 100644
--- a/net/wu-ftpd/patches/patch-ap
+++ b/net/wu-ftpd/patches/patch-ap
@@ -1,4 +1,4 @@
-$NetBSD: patch-ap,v 1.2 2012/04/08 04:43:51 dholland Exp $
+$NetBSD: patch-ap,v 1.3 2012/04/08 05:11:13 dholland Exp $
 
 - support netbsd-6 libquota API
 - avoid build failure on netbsd 5.99 proplib quotas
@@ -33,7 +33,7 @@ $NetBSD: patch-ap,v 1.2 2012/04/08 04:43:51 dholland Exp $
  #if defined(HAVE_STATVFS)
  #include <sys/statvfs.h>
  #elif defined(HAVE_SYS_VFS)
-@@ -91,8 +102,17 @@
+@@ -91,8 +102,18 @@
  #include "support/ftw.h"
  #endif
  
@@ -44,6 +44,7 @@ $NetBSD: patch-ap,v 1.2 2012/04/08 04:43:51 dholland Exp $
 +
  #ifdef QUOTA
 +#ifdef HAVE_NETBSD_LIBQUOTA
++#undef QUOTA_DEVICE
 +struct quotaval quota_blocks, quota_files;
 +#else
  struct dqblk quota;
@@ -204,7 +205,7 @@ $NetBSD: patch-ap,v 1.2 2012/04/08 04:43:51 dholland Exp $
      char mnt_fsname[MNTMAXSTR];
 -#ifdef HAS_NO_QUOTACTL
 +
-+#if defined(HAS_NETBSD_LIBQUOTA)
++#if defined(HAVE_NETBSD_LIBQUOTA)
 +    struct quotahandle *qh;
 +    struct quotakey qk;
 +
@@ -217,11 +218,11 @@ $NetBSD: patch-ap,v 1.2 2012/04/08 04:43:51 dholland Exp $
 +    qk.qk_idtype = QUOTA_IDTYPE_USER;
 +    qk.qk_id = uid;
 +    qk.qk_objtype = QUOTA_OBJTYPE_BLOCKS;
-+    if (quota_get(qh, &quota_blocks)) {
++    if (quota_get(qh, &qk, &quota_blocks)) {
 +       quotaval_clear(&quota_blocks);
 +    }
 +    qk.qk_objtype = QUOTA_OBJTYPE_FILES;
-+    if (quota_get(qh, &quota_files)) {
++    if (quota_get(qh, &qk, &quota_files)) {
 +       quotaval_clear(&quota_files);
 +    }
 +    quota_close(qh);
diff --git a/net/wu-ftpd/patches/patch-configure_in b/net/wu-ftpd/patches/patch-configure_in
index 812846fbc04..3136ac6b950 100644
--- a/net/wu-ftpd/patches/patch-configure_in
+++ b/net/wu-ftpd/patches/patch-configure_in
@@ -1,13 +1,13 @@
-$NetBSD: patch-configure_in,v 1.1 2012/04/08 04:43:51 dholland Exp $
+$NetBSD: patch-configure_in,v 1.2 2012/04/08 05:11:13 dholland Exp $
 
 - support netbsd-6 libquota API.
 
 caution: there's a dragonfly patch to configure in patch-ao that isn't
 reflected here. don't regen that from this without thinking.
 
---- configure.in~	2001-11-29 17:10:58.000000000 +0000
+--- configure.in.orig	2001-11-29 17:10:58.000000000 +0000
 +++ configure.in
-@@ -739,8 +739,8 @@ if test $paranoid = yes; then
+@@ -739,9 +739,12 @@ if test $paranoid = yes; then
  	AC_DEFINE(PARANOID)
  fi
  if test $quota != no; then
@@ -16,5 +16,9 @@ reflected here. don't regen that from this without thinking.
 +	AC_CHECK_HEADERS(quota.h sys/quota.h sys/fs/ufs_quota.h ufs/quota.h jfs/quota.h ufs/ufs/quota.h linux/quota.h)
 +	if test $ac_cv_header_quota.h = yes -o $ac_cv_header_sys_quota.h = yes -o $ac_cv_header_sys_fs_ufs_quota_h = yes -o $ac_cv_header_ufs_quota_h = yes -o $ac_cv_header_jfs_quota_h = yes -o $ac_cv_header_ufs_ufs_quota_h = yes -o $ac_cv_header_linux_quota_h = yes; then
  		quota=yes
++		if test $ac_cv_header_quota_h = yes; then
++			LIBS="$LIBS -lquota"
++		fi
  	else
  		if test $quota = yes; then
+ 			AC_MSG_WARN(QUOTA not supported by OS - disabled)