diff options
| author | markd <markd> | 2004-07-13 12:27:13 +0000 |
|---|---|---|
| committer | markd <markd> | 2004-07-13 12:27:13 +0000 |
| commit | 00c0e127450d78e5c7fe4c24d9817971472b5e5d (patch) | |
| tree | 7806a79ffbf6a0e244648d6d52c045cc68201366 /mail | |
| parent | d201b9484cd2d53acd7cdaa426f0c122e217b4a4 (diff) | |
| download | pkgsrc-00c0e127450d78e5c7fe4c24d9817971472b5e5d.tar.gz | |
Fix build on recent NetBSD-current (statvfs).
Patch from Julian C. Dunn in PR 25481 slightly modified by me.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/sendmail/distinfo | 4 | ||||
| -rw-r--r-- | mail/sendmail/patches/patch-ag | 30 |
2 files changed, 29 insertions, 5 deletions
diff --git a/mail/sendmail/distinfo b/mail/sendmail/distinfo index ca06fd5d8b8..78b1839a898 100644 --- a/mail/sendmail/distinfo +++ b/mail/sendmail/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.16 2004/03/27 22:07:32 tron Exp $ +$NetBSD: distinfo,v 1.17 2004/07/13 12:27:13 markd Exp $ SHA1 (sendmail.8.12.11.tar.gz) = ce1ba0e50740c548f8555f1a905d8514e6637f95 Size (sendmail.8.12.11.tar.gz) = 1899112 bytes @@ -8,4 +8,4 @@ SHA1 (patch-ac) = 96c19300b4188dbcbd202768eea912f675dadc27 SHA1 (patch-ad) = 7232cc7ceb46a2dbf631d61185e4c6ca4af18a13 SHA1 (patch-ae) = ae06caa125fe4d4fc85123dc0a5d0016cd099ebd SHA1 (patch-af) = d26481845328adad6d46fdf797785ec2ad003e28 -SHA1 (patch-ag) = 68bdd03affc2d4c81f65fc32bef7c5c958d5c1a7 +SHA1 (patch-ag) = b2e7c13de58ba90d149382e93095227c9ad39329 diff --git a/mail/sendmail/patches/patch-ag b/mail/sendmail/patches/patch-ag index e30a1e0d4d2..fd51a2c1625 100644 --- a/mail/sendmail/patches/patch-ag +++ b/mail/sendmail/patches/patch-ag @@ -1,8 +1,32 @@ -$NetBSD: patch-ag,v 1.6 2003/09/15 11:47:28 markd Exp $ +$NetBSD: patch-ag,v 1.7 2004/07/13 12:27:13 markd Exp $ ---- include/sm/conf.h.orig 2003-09-15 22:16:32.000000000 +1200 +--- include/sm/conf.h.orig 2004-01-07 13:52:16.000000000 +1300 +++ include/sm/conf.h -@@ -890,6 +890,9 @@ extern unsigned int sleepX __P((unsigned +@@ -780,7 +780,11 @@ extern unsigned int sleepX __P((unsigned + # ifndef LA_TYPE + # define LA_TYPE LA_SUBR + # endif /* ! LA_TYPE */ ++#if defined(__NetBSD__) && (__NetBSD_Version__ > 200030000) ++# define SFS_TYPE SFS_STATVFS /* use <sys/statvfs.h> statfs() impl */ ++#else + # define SFS_TYPE SFS_MOUNT /* use <sys/mount.h> statfs() impl */ ++#endif + # define SPT_TYPE SPT_PSSTRINGS /* use PS_STRINGS pointer */ + # endif /* defined(BSD4_4) && !defined(__bsdi__) && !defined(__GNU__) */ + +@@ -894,7 +898,11 @@ extern unsigned int sleepX __P((unsigned + # ifndef LA_TYPE + # define LA_TYPE LA_SUBR + # endif /* ! LA_TYPE */ ++#if defined(__NetBSD__) && (__NetBSD_Version__ > 200030000) ++# define SFS_TYPE SFS_STATVFS /* use <sys/statvfs.h> statfs() impl */ ++#else + # define SFS_TYPE SFS_MOUNT /* use <sys/mount.h> statfs() impl */ ++#endif + # if defined(__NetBSD__) && (NetBSD > 199307 || NetBSD0_9 > 1) + # undef SPT_TYPE + # define SPT_TYPE SPT_BUILTIN /* setproctitle is in libc */ +@@ -902,6 +910,9 @@ extern unsigned int sleepX __P((unsigned # if defined(__NetBSD__) && ((__NetBSD_Version__ > 102070000) || (NetBSD1_2 > 8) || defined(NetBSD1_4) || defined(NetBSD1_3)) # define HASURANDOMDEV 1 /* has /dev/urandom(4) */ # endif /* defined(__NetBSD__) && ((__NetBSD_Version__ > 102070000) || (NetBSD1_2 > 8) || defined(NetBSD1_4) || defined(NetBSD1_3)) */ |