Update alpine to 0.999999 from 0.999

- This is still a development release so unfortunately no changelog

6 files changed, 40 insertions, 47 deletions

diff --git a/mail/alpine/Makefile b/mail/alpine/Makefile
index b06f8315d95..7515a1d0595 100644
--- a/mail/alpine/Makefile
+++ b/mail/alpine/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2007/10/11 13:14:48 tv Exp $
+# $NetBSD: Makefile,v 1.7 2007/12/09 22:17:54 abs Exp $
 #
 
-DISTNAME=	alpine-0.999
-PKGREVISION=	2
+DISTNAME=	alpine-0.999999
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cac.washington.edu/alpine/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/mail/alpine/distinfo b/mail/alpine/distinfo
index 88c488a0ffe..799545fb9ed 100644
--- a/mail/alpine/distinfo
+++ b/mail/alpine/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2007/07/02 09:38:34 abs Exp $
+$NetBSD: distinfo,v 1.5 2007/12/09 22:17:54 abs Exp $
 
-SHA1 (alpine-0.999.tar.bz2) = 023b562535922c842cc0d6fd2c74676881521b6b
-RMD160 (alpine-0.999.tar.bz2) = 10776c8ed45e76b109089bc3afb47f22577bd227
-Size (alpine-0.999.tar.bz2) = 4933915 bytes
-SHA1 (patch-aa) = 1269dcd9b9a86980ac02facc65ec5beb6dd45221
-SHA1 (patch-ab) = f0f4d6c8017cbb5bda8d46d7cb62b323c6e3a8d7
-SHA1 (patch-ac) = 2f0473a89b6676767c1b6bdc75a71eeb0fbad584
-SHA1 (patch-ad) = 5a1308c324f705c63a2be4542522923d9d4d95e9
+SHA1 (alpine-0.999999.tar.bz2) = 68ab8ce18f0a8fef8faecbc72c7bf7bd3319599e
+RMD160 (alpine-0.999999.tar.bz2) = c99cceda7e29a16c75430d899da3e24dc3a2555f
+Size (alpine-0.999999.tar.bz2) = 4811702 bytes
+SHA1 (patch-aa) = 03eb5204246fcd4e34b6361c1bd3b95afa705349
+SHA1 (patch-ab) = 9f1d7c15750511ff48a89ab6630632d3b39129e9
+SHA1 (patch-ac) = 9507ab3e83af31296846bf6982cc344fdbe635fa
+SHA1 (patch-ad) = 478f00ff3033fa859616644524ae4b047e713d7a
diff --git a/mail/alpine/patches/patch-aa b/mail/alpine/patches/patch-aa
index d81421e2ed3..cb862c4b960 100644
--- a/mail/alpine/patches/patch-aa
+++ b/mail/alpine/patches/patch-aa
@@ -1,15 +1,15 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/05/03 12:11:37 abs Exp $
+$NetBSD: patch-aa,v 1.2 2007/12/09 22:17:54 abs Exp $
 
---- alpine/after.c.orig	2007-04-01 00:06:28.000000000 +0100
+--- alpine/after.c.orig	2007-11-16 22:38:57.000000000 +0000
 +++ alpine/after.c
-@@ -60,8 +60,10 @@ start_after(AFTER_S *a)
+@@ -69,8 +69,10 @@ start_after(AFTER_S *a)
  	/* Initialize and set thread detached attribute */
  	pthread_attr_init(&attr);
  	pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE);
 +#if 	defined(PTHREAD_STACK_MIN)
  	stack = PTHREAD_STACK_MIN + 0x10000;
  	pthread_attr_setstacksize(&attr, stack);
-+#endif /*defined(PTHREAD_STACK_MIN)
++#endif /* defined(PTHREAD_STACK_MIN) */
  
- 	if(rc = pthread_create(&after_thread, &attr, do_after, (void *) a)){
+ 	if((rc = pthread_create(&after_thread, &attr, do_after, (void *) a)) != 0){
  	    after_active = 0;
diff --git a/mail/alpine/patches/patch-ab b/mail/alpine/patches/patch-ab
index 9b79ae5ff19..2bb1302807f 100644
--- a/mail/alpine/patches/patch-ab
+++ b/mail/alpine/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2007/05/17 21:58:58 abs Exp $
+$NetBSD: patch-ab,v 1.2 2007/12/09 22:17:55 abs Exp $
 
---- pico/browse.c.orig	2007-03-07 23:16:56.000000000 +0000
+--- pico/browse.c.orig	2007-12-06 19:57:49.000000000 +0000
 +++ pico/browse.c
-@@ -1399,8 +1399,8 @@ FileBrowse(char *dir, size_t dirlen, cha
+@@ -1402,8 +1402,8 @@ FileBrowse(char *dir, size_t dirlen, cha
  	  case (CTRL|'M'):
  	  Selected:
  
diff --git a/mail/alpine/patches/patch-ac b/mail/alpine/patches/patch-ac
index 47a5c36a1ff..ce36e38ae75 100644
--- a/mail/alpine/patches/patch-ac
+++ b/mail/alpine/patches/patch-ac
@@ -1,27 +1,24 @@
-$NetBSD: patch-ac,v 1.1 2007/06/12 13:29:51 joerg Exp $
+$NetBSD: patch-ac,v 1.2 2007/12/09 22:17:55 abs Exp $
 
---- configure.ac.orig	2007-06-12 13:04:37.000000000 +0000
+--- configure.ac.orig	2007-12-06 23:58:57.000000000 +0000
 +++ configure.ac
-@@ -1091,10 +1091,17 @@ case "$host" in
+@@ -1351,7 +1351,14 @@ case "$host" in
    *-*-netbsd*)
      systype="NEB"
      alpine_path_delim="/"
 -    alpine_local_maildir="/usr/spool/mail"
 +    alpine_local_maildir="/var/mail"
-     alpine_mode_readonly="(0600)"
-     alpine_c_client_target="neb"
-     ;;
++    alpine_mode_readonly="(0600)"
++    alpine_c_client_target="neb"
++    ;;
 +  *-*-dragonfly*)
 +    systype="DFB"
 +    alpine_path_delim="/"
 +    alpine_local_maildir="/var/mail"
-+    alpine_mode_readonly="(0600)"
-+    alpine_c_client_target="neb"
-+    ;;
-   *-*-bsdi*)
-     systype="BSI"
-     alpine_path_delim="/"
-@@ -1105,7 +1112,7 @@ case "$host" in
+     alpine_mode_readonly="(0600)"
+     alpine_c_client_target="neb"
+     ;;
+@@ -1365,7 +1372,7 @@ case "$host" in
    *-*-freebsd*)
      systype="BSF"
      alpine_path_delim="/"
@@ -30,7 +27,7 @@ $NetBSD: patch-ac,v 1.1 2007/06/12 13:29:51 joerg Exp $
      alpine_mode_readonly="(0600)"
      alpine_c_client_target="bsf"
      LIBS="$LIBS $LIBINTL"
-@@ -1113,7 +1120,7 @@ case "$host" in
+@@ -1373,7 +1380,7 @@ case "$host" in
    *-*-openbsd*)
      systype="BSO"
      alpine_path_delim="/"
diff --git a/mail/alpine/patches/patch-ad b/mail/alpine/patches/patch-ad
index dbdf1d8a495..4b119b68c6e 100644
--- a/mail/alpine/patches/patch-ad
+++ b/mail/alpine/patches/patch-ad
@@ -1,27 +1,24 @@
-$NetBSD: patch-ad,v 1.1 2007/06/12 13:29:51 joerg Exp $
+$NetBSD: patch-ad,v 1.2 2007/12/09 22:17:55 abs Exp $
 
---- configure.orig	2007-04-23 21:41:33.000000000 +0000
+--- configure.orig	2007-12-07 00:05:15.000000000 +0000
 +++ configure
-@@ -32062,10 +32062,17 @@ _ACEOF
+@@ -32918,7 +32918,14 @@ _ACEOF
    *-*-netbsd*)
      systype="NEB"
      alpine_path_delim="/"
 -    alpine_local_maildir="/usr/spool/mail"
 +    alpine_local_maildir="/var/mail"
-     alpine_mode_readonly="(0600)"
-     alpine_c_client_target="neb"
-     ;;
++    alpine_mode_readonly="(0600)"
++    alpine_c_client_target="neb"
++    ;;
 +  *-*-dragonfly*)
 +    systype="DFB"
 +    alpine_path_delim="/"
 +    alpine_local_maildir="/var/mail"
-+    alpine_mode_readonly="(0600)"
-+    alpine_c_client_target="neb"
-+    ;;
-   *-*-bsdi*)
-     systype="BSI"
-     alpine_path_delim="/"
-@@ -32076,7 +32083,7 @@ _ACEOF
+     alpine_mode_readonly="(0600)"
+     alpine_c_client_target="neb"
+     ;;
+@@ -32932,7 +32939,7 @@ _ACEOF
    *-*-freebsd*)
      systype="BSF"
      alpine_path_delim="/"
@@ -30,7 +27,7 @@ $NetBSD: patch-ad,v 1.1 2007/06/12 13:29:51 joerg Exp $
      alpine_mode_readonly="(0600)"
      alpine_c_client_target="bsf"
      LIBS="$LIBS $LIBINTL"
-@@ -32084,7 +32091,7 @@ _ACEOF
+@@ -32940,7 +32947,7 @@ _ACEOF
    *-*-openbsd*)
      systype="BSO"
      alpine_path_delim="/"