Fix build on DragonFly 1.6+.

6 files changed, 78 insertions, 22 deletions

diff --git a/mail/yatsvrs/distinfo b/mail/yatsvrs/distinfo
index ab03fde3639..11a270f2c85 100644
--- a/mail/yatsvrs/distinfo
+++ b/mail/yatsvrs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2006/02/24 19:12:18 joerg Exp $
+$NetBSD: distinfo,v 1.12 2006/09/22 18:58:59 joerg Exp $
 
 SHA1 (yatsvrs-5.00p6.tar.gz) = be94b29c8631acc1d7b3c4313501b6d674e6b43f
 RMD160 (yatsvrs-5.00p6.tar.gz) = 9920ac63a2477100ddc54196c76d6d700b144642
@@ -20,7 +20,7 @@ SHA1 (patch-ao) = f697fe18121dcee1a279b5e4e8d318789cef8211
 SHA1 (patch-ap) = f42ade29527d1910f271c10797f6bd8d9f3710cc
 SHA1 (patch-aq) = ea2d7d2f21ebe3aea163d6de0a95060be2ecc381
 SHA1 (patch-ar) = 8f26f7a180790070e1137c9840c1e0edcfc02a66
-SHA1 (patch-as) = a91b38a9267f0aca96a644dbe9c16f124b5ddee8
+SHA1 (patch-as) = 5156e666d446cecf582aab900f911e568f7e8d8a
 SHA1 (patch-at) = 73704aa7d506c5a97f4fef3cc03e6ac8e983497e
 SHA1 (patch-au) = 63aa76a7a9c55c9877fe2a336903828d193c3658
 SHA1 (patch-av) = 4c87a76438f97fcafa29083c37d3a225bd219cc2
diff --git a/mail/yatsvrs/patches/patch-as b/mail/yatsvrs/patches/patch-as
index da048ee91ca..95a94e81f4c 100644
--- a/mail/yatsvrs/patches/patch-as
+++ b/mail/yatsvrs/patches/patch-as
@@ -1,8 +1,22 @@
-$NetBSD: patch-as,v 1.4 2006/01/08 19:30:02 joerg Exp $
+$NetBSD: patch-as,v 1.5 2006/09/22 18:58:59 joerg Exp $
 
 --- yatd/dfree.c.orig	2001-07-09 03:32:52.000000000 +0000
 +++ yatd/dfree.c
-@@ -72,12 +72,6 @@ quota_get_inode_current __P(( struct dqb
+@@ -39,6 +39,13 @@ typedef u_long quota_size_t;
+ # include <sys/quota.h>
+ #endif /* HAVE_SYS_QUOTA_H */
+ 
++#ifdef __DragonFly__
++#include <sys/param.h>
++#if __DragonFly_version >= 160000
++#define dqblk ufs_dqblk
++#endif
++#endif
++
+ static int 
+ quotactl_wrapper __P((const char *pPath, struct dqblk *quota_block));
+ static int 
+@@ -72,12 +79,6 @@ quota_get_inode_current __P(( struct dqb
  
  #define DEBUG_LOCAL
  
@@ -15,7 +29,7 @@ $NetBSD: patch-as,v 1.4 2006/01/08 19:30:02 joerg Exp $
  int DFreeCheck(pPath, pSizFree, pNodFree)
       char   * pPath;    /* ユーザーのホームディレクトリの位置 */
       OFF_T  * pSizFree; /* 空きブロック数 */
-@@ -99,7 +93,7 @@ int DFreeCheck(pPath, pSizFree, pNodFree
+@@ -99,7 +100,7 @@ int DFreeCheck(pPath, pSizFree, pNodFree
    nodLimit = *pNodFree; /* リミットのノード数を指定する */
  
  #ifdef DEBUG_LOCAL
@@ -24,7 +38,7 @@ $NetBSD: patch-as,v 1.4 2006/01/08 19:30:02 joerg Exp $
  	   sizLimit, nodLimit, sizeof (OFF_T));
  #endif /* DEBUG_LOCAL */
  
-@@ -122,23 +116,30 @@ int DFreeCheck(pPath, pSizFree, pNodFree
+@@ -122,23 +123,30 @@ int DFreeCheck(pPath, pSizFree, pNodFree
  #ifdef DEBUG_LOCAL
  # ifdef BSD44 
    LogDEBUG("statfs() returns:");
@@ -67,7 +81,7 @@ $NetBSD: patch-as,v 1.4 2006/01/08 19:30:02 joerg Exp $
  #ifdef STRUCT_STATFS_HAVE_F_FSTYPENAME
    LogDEBUG("  fstypename: %.256s", statfsBuf.f_fstypename);
  #endif
-@@ -311,7 +312,7 @@ int FuncDFree()
+@@ -311,7 +319,7 @@ int FuncDFree()
    nodFree = SysData.nodLimitFree;
  
  #ifdef DEBUG_LOCAL
@@ -76,7 +90,7 @@ $NetBSD: patch-as,v 1.4 2006/01/08 19:30:02 joerg Exp $
  	     sizFree, nodFree);
  #endif
      
-@@ -325,7 +326,7 @@ int FuncDFree()
+@@ -325,7 +333,7 @@ int FuncDFree()
      if (DFreeCheck(SysData.szUserFldrDir, &sizFree, &nodFree)){
        return FAILURE;
      }
@@ -85,7 +99,7 @@ $NetBSD: patch-as,v 1.4 2006/01/08 19:30:02 joerg Exp $
  #endif /* DONT_CHECKDFREE */
    return SUCCESS;
  }
-@@ -427,7 +428,7 @@ static inline quota_size_t quota_get_ino
+@@ -427,7 +435,7 @@ static inline quota_size_t quota_get_ino
  
  #ifdef STRUCT_DQBLK_CURRENT_FILES
    retval = (quota_size_t)quota_block->dqb_curfiles;
@@ -94,7 +108,7 @@ $NetBSD: patch-as,v 1.4 2006/01/08 19:30:02 joerg Exp $
  
    return retval;
  }
-@@ -449,12 +450,12 @@ static int quotactl_wrapper(pPath,quota_
+@@ -449,12 +457,12 @@ static int quotactl_wrapper(pPath,quota_
    switch( status ){
    case SUCCESS:
      LogDEBUG("quotactl() returns:");
@@ -113,7 +127,7 @@ $NetBSD: patch-as,v 1.4 2006/01/08 19:30:02 joerg Exp $
      return SUCCESS;
    case FAILURE:
      return FAILURE;
-@@ -494,7 +495,7 @@ static int quotactl_systemcall_support( 
+@@ -494,7 +502,7 @@ static int quotactl_systemcall_support( 
    status = quotactl(QCMD(Q_GETQUOTA, USRQUOTA),SysData.szMntFrom,
  		    SysData.pPwd->pw_uid, (caddr_t)quota_block);
    
diff --git a/net/wu-ftpd/distinfo b/net/wu-ftpd/distinfo
index ab72f5ac65f..592747e1978 100644
--- a/net/wu-ftpd/distinfo
+++ b/net/wu-ftpd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2005/12/18 18:54:26 joerg Exp $
+$NetBSD: distinfo,v 1.15 2006/09/22 19:44:01 joerg Exp $
 
 SHA1 (wu-ftpd/wu-ftpd-2.6.2.tar.gz) = e39112bd8a67f189b6a8da8dd81ceb00a910e271
 RMD160 (wu-ftpd/wu-ftpd-2.6.2.tar.gz) = 0b7451c185f80cf9a345f97b9642853e0323e3bd
@@ -17,9 +17,11 @@ SHA1 (patch-ae) = 9abb285c65bb3a764a838f22ee9bdc34371265e4
 SHA1 (patch-af) = 6f9fe289ea5af19ba4c85f63109e8e47e5b21bca
 SHA1 (patch-ag) = 59cc211f4770e5e447b2cd9ca7bd5ab3dc07fc3d
 SHA1 (patch-ah) = a5305d6b9f8d3e1145e6951eaf37f0cdd5c98edc
-SHA1 (patch-ai) = f46979e05d7dcd8568833f56cd6add45fffbc323
+SHA1 (patch-ai) = 0f90c45b24e370fc87b2028a73b15e483b01fa54
 SHA1 (patch-aj) = 65eef2815b2364aaa243cb93ce4a99fdf2eb9f10
 SHA1 (patch-ak) = 8eca121c737498106a5e829cb166746436a87237
 SHA1 (patch-al) = b537901ac9e267a13247547d621215acd6595502
 SHA1 (patch-am) = 1b1cdf067382fce0cb6aa5e6ff605c15414b26ff
 SHA1 (patch-an) = fd1d50bd28b283df717c1ce5fe2f0d6f3eab4967
+SHA1 (patch-ao) = 4b686fce75452665d3b1729a4175b2ba917b7df0
+SHA1 (patch-ap) = 977af5a2fa79360c1a213fa097dc3d6a79a527d5
diff --git a/net/wu-ftpd/patches/patch-ai b/net/wu-ftpd/patches/patch-ai
index 8b8c95142cd..a8168709ab7 100644
--- a/net/wu-ftpd/patches/patch-ai
+++ b/net/wu-ftpd/patches/patch-ai
@@ -1,6 +1,6 @@
-$NetBSD: patch-ai,v 1.9 2005/12/18 18:54:26 joerg Exp $
+$NetBSD: patch-ai,v 1.10 2006/09/22 19:44:01 joerg Exp $
 
---- src/ftpd.c.orig	2005-12-18 18:41:46.000000000 +0000
+--- src/ftpd.c.orig	2006-09-22 21:01:34.000000000 +0000
 +++ src/ftpd.c
 @@ -75,6 +75,7 @@
  #include <grp.h>
@@ -10,7 +10,15 @@ $NetBSD: patch-ai,v 1.9 2005/12/18 18:54:26 joerg Exp $
  
  #define VA_LOCAL_DECL	va_list ap;
  #define VA_START(f)	va_start(ap, f)
-@@ -88,6 +89,9 @@
+@@ -85,9 +86,17 @@
+ #ifdef HAVE_UFS_QUOTA_H
+ #include <ufs/quota.h>
+ #endif
++
++#if defined(__DragonFly__) && __DragonFly_version >= 160000
++#define dqblk ufs_dqblk
++#endif
++
  #ifdef HAVE_SYS_FS_UFS_QUOTA_H
  #include <sys/fs/ufs_quota.h>
  #endif
@@ -20,7 +28,7 @@ $NetBSD: patch-ai,v 1.9 2005/12/18 18:54:26 joerg Exp $
  
  #ifdef HAVE_SYS_SYSLOG_H
  #include <sys/syslog.h>
-@@ -214,7 +218,6 @@ int Send(FILE *sockfp, char *format,...)
+@@ -214,7 +223,6 @@ int Send(FILE *sockfp, char *format,...)
  
  /* File containing login names NOT to be used on this machine. Commonly used
   * to disallow uucp. */
@@ -28,7 +36,7 @@ $NetBSD: patch-ai,v 1.9 2005/12/18 18:54:26 joerg Exp $
  extern int pidfd;
  
  extern char *ctime(const time_t *);
-@@ -2370,7 +2373,8 @@ void end_login(void)
+@@ -2370,7 +2378,8 @@ void end_login(void)
      (void) seteuid((uid_t) 0);
      if (logged_in)
  	if (wtmp_logging)
@@ -38,7 +46,7 @@ $NetBSD: patch-ai,v 1.9 2005/12/18 18:54:26 joerg Exp $
      pw = NULL;
  #ifdef AFS_AUTH
      ktc_ForgetAllTokens();
-@@ -2869,7 +2873,8 @@ void pass(char *passwd)
+@@ -2869,7 +2878,8 @@ void pass(char *passwd)
  #ifdef DEBUG
  	syslog(LOG_DEBUG, "about to call wtmp");
  #endif
@@ -48,7 +56,7 @@ $NetBSD: patch-ai,v 1.9 2005/12/18 18:54:26 joerg Exp $
      }
      logged_in = 1;
  
-@@ -5459,7 +5464,9 @@ void reply(int n, char *fmt,...)
+@@ -5459,7 +5469,9 @@ void reply(int n, char *fmt,...)
  		*p = '\0';
  
  	    /* send a line...(note that this overrides dolreplies!) */
@@ -58,7 +66,7 @@ $NetBSD: patch-ai,v 1.9 2005/12/18 18:54:26 joerg Exp $
  
  	    if (p)
  		ptr = p + 1;	/* set to the next line... (\0 is handled in the while) */
-@@ -6083,6 +6090,8 @@ void dologout(int status)
+@@ -6083,6 +6095,8 @@ void dologout(int status)
  	(void) seteuid((uid_t) 0);
  	if (wtmp_logging)
  	    wu_logwtmp(ttyline, pw->pw_name, remotehost, 0);
@@ -67,7 +75,7 @@ $NetBSD: patch-ai,v 1.9 2005/12/18 18:54:26 joerg Exp $
      }
      if (logging)
  	syslog(LOG_INFO, "FTP session closed");
-@@ -7378,7 +7387,7 @@ int SockPrintf(FILE *sockfp, char *forma
+@@ -7378,7 +7392,7 @@ int SockPrintf(FILE *sockfp, char *forma
      char buf[32768];
  
      va_start(ap, format);
diff --git a/net/wu-ftpd/patches/patch-ao b/net/wu-ftpd/patches/patch-ao
new file mode 100644
index 00000000000..31560ca2996
--- /dev/null
+++ b/net/wu-ftpd/patches/patch-ao
@@ -0,0 +1,17 @@
+$NetBSD: patch-ao,v 1.1 2006/09/22 19:44:01 joerg Exp $
+
+--- configure.orig	2006-09-22 21:18:19.000000000 +0000
++++ configure
+@@ -5333,6 +5333,12 @@ echo $ECHO_N "checking whether quota sup
+ #ifdef HAVE_UFS_UFS_QUOTA_H
+ #include <ufs/ufs/quota.h>
+ #endif
++#if defined(__DragonFly__)
++# include <sys/param.h>
++# if __DragonFly_version >= 160000
++#  define dqblk ufs_dqblk
++# endif
++#endif
+ struct dqblk quota;
+ int
+ main ()
diff --git a/net/wu-ftpd/patches/patch-ap b/net/wu-ftpd/patches/patch-ap
new file mode 100644
index 00000000000..dc65e0b92fc
--- /dev/null
+++ b/net/wu-ftpd/patches/patch-ap
@@ -0,0 +1,15 @@
+$NetBSD: patch-ap,v 1.1 2006/09/22 19:44:01 joerg Exp $
+
+--- src/extensions.c.orig	2006-09-22 21:22:18.000000000 +0000
++++ src/extensions.c
+@@ -67,6 +67,10 @@
+ #include <sys/mnttab.h>
+ #endif
+ 
++#if defined(__DragonFly__) && __DragonFly_version >= 160000
++#define dqblk ufs_dqblk
++#endif
++
+ #if defined(HAVE_STATVFS)
+ #include <sys/statvfs.h>
+ #elif defined(HAVE_SYS_VFS)