Sun May 17 17:34:01 2009 UTC ()
include <time.h> and <utime.h> so that where time_t has been changed to 64-bit
values on NetBSD, we we get correctly referred to __utime50() which can handle
64-bit values. This fixes a problem where mailbox mtimes were being reset to 0

Note that this actually causes some build warnings as the code uses
"time_t tp[2]" instead of "struct utimbuf tp" (contains two time_t values)

Although the <os_bsi.h> file says it is used for BSDI, it seems to be used by
NetBSD and OpenBSD, both of which have the <utime.h> and <time.h>

bump PKGREVISION


(plunky)
diff -r1.19 -r1.20 pkgsrc/mail/alpine/Makefile
diff -r1.14 -r1.15 pkgsrc/mail/alpine/distinfo
diff -r0 -r1.4 pkgsrc/mail/alpine/patches/patch-aa

cvs diff -r1.19 -r1.20 pkgsrc/mail/alpine/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/alpine/Makefile 2009/05/01 11:58:46 1.19
+++ pkgsrc/mail/alpine/Makefile 2009/05/17 17:34:01 1.20
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.19 2009/05/01 11:58:46 abs Exp $ 1# $NetBSD: Makefile,v 1.20 2009/05/17 17:34:01 plunky Exp $
2# 2#
3 3
4DISTNAME= alpine-2.00 4DISTNAME= alpine-2.00
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= mail 6CATEGORIES= mail
7MASTER_SITES= ftp://ftp.cac.washington.edu/alpine/ 7MASTER_SITES= ftp://ftp.cac.washington.edu/alpine/
8DIST_SUBDIR= alpine-2.00 8DIST_SUBDIR= alpine-2.00
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11MAINTAINER= abs@NetBSD.org 11MAINTAINER= abs@NetBSD.org
12HOMEPAGE= http://www.washington.edu/alpine/ 12HOMEPAGE= http://www.washington.edu/alpine/
13COMMENT= Program for Internet News and E-mail 13COMMENT= Program for Internet News and E-mail
14 14
15PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
16 16
17.include "options.mk" 17.include "options.mk"
18 18

cvs diff -r1.14 -r1.15 pkgsrc/mail/alpine/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/alpine/distinfo 2009/05/01 11:58:46 1.14
+++ pkgsrc/mail/alpine/distinfo 2009/05/17 17:34:01 1.15
@@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
1$NetBSD: distinfo,v 1.14 2009/05/01 11:58:46 abs Exp $ 1$NetBSD: distinfo,v 1.15 2009/05/17 17:34:01 plunky Exp $
2 2
3SHA1 (alpine-2.00/alpine-2.00.tar.bz2) = dcbd3c5419954f484ccf706feaba31ce48cdebc4 3SHA1 (alpine-2.00/alpine-2.00.tar.bz2) = dcbd3c5419954f484ccf706feaba31ce48cdebc4
4RMD160 (alpine-2.00/alpine-2.00.tar.bz2) = 9e67704b23b3973d8b878e65ad9e6f5026c10d13 4RMD160 (alpine-2.00/alpine-2.00.tar.bz2) = 9e67704b23b3973d8b878e65ad9e6f5026c10d13
5Size (alpine-2.00/alpine-2.00.tar.bz2) = 5222673 bytes 5Size (alpine-2.00/alpine-2.00.tar.bz2) = 5222673 bytes
6SHA1 (alpine-2.00/fancy.patch.gz) = 2622d3e86a76908bf4d1ca63501c6dac75563348 6SHA1 (alpine-2.00/fancy.patch.gz) = 2622d3e86a76908bf4d1ca63501c6dac75563348
7RMD160 (alpine-2.00/fancy.patch.gz) = b877b97fd88fa73a8428d288f929579560faec4e 7RMD160 (alpine-2.00/fancy.patch.gz) = b877b97fd88fa73a8428d288f929579560faec4e
8Size (alpine-2.00/fancy.patch.gz) = 24556 bytes 8Size (alpine-2.00/fancy.patch.gz) = 24556 bytes
9SHA1 (alpine-2.00/maildir.patch.gz) = b1b790ca644c891f52f28663867b2deb032bb98c 9SHA1 (alpine-2.00/maildir.patch.gz) = b1b790ca644c891f52f28663867b2deb032bb98c
10RMD160 (alpine-2.00/maildir.patch.gz) = ffa3a6a588c76e33bc92fe26ddfb9f6e6dbefe20 10RMD160 (alpine-2.00/maildir.patch.gz) = ffa3a6a588c76e33bc92fe26ddfb9f6e6dbefe20
11Size (alpine-2.00/maildir.patch.gz) = 32100 bytes 11Size (alpine-2.00/maildir.patch.gz) = 32100 bytes
12SHA1 (alpine-2.00/searchheader.patch.gz) = 1c8dfaefa9a9ed502da454b5d1334c94bc1873c4 12SHA1 (alpine-2.00/searchheader.patch.gz) = 1c8dfaefa9a9ed502da454b5d1334c94bc1873c4
13RMD160 (alpine-2.00/searchheader.patch.gz) = cc1b2c3cf4cbceaf62e1c0378f5edf6bee619581 13RMD160 (alpine-2.00/searchheader.patch.gz) = cc1b2c3cf4cbceaf62e1c0378f5edf6bee619581
14Size (alpine-2.00/searchheader.patch.gz) = 1708 bytes 14Size (alpine-2.00/searchheader.patch.gz) = 1708 bytes
 15SHA1 (patch-aa) = c306613a297d61591d577b6968a31fc85b03f852

File Added: pkgsrc/mail/alpine/patches/Attic/patch-aa
$NetBSD: patch-aa,v 1.4 2009/05/17 17:34:01 plunky Exp $

include <time.h> and <utime.h> so that where time_t has been changed to 64-bit
values on NetBSD, we we get correctly referred to __utime50() which can handle
64-bit values. This fixes a problem where mailbox mtimes were being reset to 0

Note that this actually causes some build warnings as the code uses
"time_t tp[2]" instead of "struct utimbuf tp" (contains two time_t values)

Although the <os_bsi.h> file says it is used for BSDI, it seems to be used by
NetBSD and OpenBSD, both of which have the <utime.h> and <time.h>

  - plunky

--- imap/src/osdep/unix/os_bsi.h.orig	2008-06-04 19:18:34.000000000 +0100
+++ imap/src/osdep/unix/os_bsi.h	2009-05-17 18:00:44.000000000 +0100
@@ -34,6 +34,8 @@
 #include <fcntl.h>
 #include <syslog.h>
 #include <sys/file.h>
+#include <time.h>
+#include <utime.h>
 
 
 #include "env_unix.h"