From 239c6dabd802f1e0aa83dbc45c42e45bd0f00bcd Mon Sep 17 00:00:00 2001
From: abs <abs>
Date: Sat, 29 Dec 2007 19:49:43 +0000
Subject: Update alpine to official 1.00 release (many thanks to upstream for
 taking back all patches). No changelog available

---
 doc/TODO                     |  3 +--
 mail/alpine/Makefile         |  5 ++---
 mail/alpine/distinfo         | 12 ++++--------
 mail/alpine/patches/patch-aa | 15 ---------------
 mail/alpine/patches/patch-ab | 15 ---------------
 mail/alpine/patches/patch-ac | 38 --------------------------------------
 mail/alpine/patches/patch-ad | 38 --------------------------------------
 7 files changed, 7 insertions(+), 119 deletions(-)
 delete mode 100644 mail/alpine/patches/patch-aa
 delete mode 100644 mail/alpine/patches/patch-ab
 delete mode 100644 mail/alpine/patches/patch-ac
 delete mode 100644 mail/alpine/patches/patch-ad

diff --git a/doc/TODO b/doc/TODO
index 7d5ac293273..1cb058ed2ac 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.6934 2007/12/29 10:18:34 wiz Exp $
+$NetBSD: TODO,v 1.6935 2007/12/29 19:50:14 abs Exp $
 
 Suggested new packages
 ======================
@@ -285,7 +285,6 @@ Suggested package updates
 	o alee-ttf-11.2
 	o algae-4.3.6
 	o aliados-0.2.0
-	o alpine-1.0
 	o amanda-2.5.2p1
 	o amanda-client-2.5.0
 	o amanda-common-2.5.0
diff --git a/mail/alpine/Makefile b/mail/alpine/Makefile
index c158c68fde6..073eaa433c4 100644
--- a/mail/alpine/Makefile
+++ b/mail/alpine/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2007/12/10 00:01:38 abs Exp $
+# $NetBSD: Makefile,v 1.9 2007/12/29 19:49:43 abs Exp $
 #
 
-DISTNAME=	alpine-0.999999
-PKGREVISION=	1
+DISTNAME=	alpine-1.00
 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 799545fb9ed..72535e0c68c 100644
--- a/mail/alpine/distinfo
+++ b/mail/alpine/distinfo
@@ -1,9 +1,5 @@
-$NetBSD: distinfo,v 1.5 2007/12/09 22:17:54 abs Exp $
+$NetBSD: distinfo,v 1.6 2007/12/29 19:49:44 abs Exp $
 
-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
+SHA1 (alpine-1.00.tar.bz2) = 1eae937d385f5a844fd52096fe428471928439fc
+RMD160 (alpine-1.00.tar.bz2) = d1ff2f90388e0107d5e4039fa35939b1def52ccf
+Size (alpine-1.00.tar.bz2) = 4792104 bytes
diff --git a/mail/alpine/patches/patch-aa b/mail/alpine/patches/patch-aa
deleted file mode 100644
index cb862c4b960..00000000000
--- a/mail/alpine/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2007/12/09 22:17:54 abs Exp $
-
---- alpine/after.c.orig	2007-11-16 22:38:57.000000000 +0000
-+++ alpine/after.c
-@@ -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) */
- 
- 	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
deleted file mode 100644
index 2bb1302807f..00000000000
--- a/mail/alpine/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2007/12/09 22:17:55 abs Exp $
-
---- pico/browse.c.orig	2007-12-06 19:57:49.000000000 +0000
-+++ pico/browse.c
-@@ -1402,8 +1402,8 @@ FileBrowse(char *dir, size_t dirlen, cha
- 	  case (CTRL|'M'):
- 	  Selected:
- 
--	    if((toupper(new_c) == 'S' && (gmode&MDBRONLY))
--	       || (toupper(new_c) == 'V' && !(gmode&MDBRONLY)))
-+	    if(((new_c == 'S' || new_c == 's') && (gmode&MDBRONLY))
-+	       || ((new_c == 'V' || new_c == 'v') && !(gmode&MDBRONLY)))
- 	      goto Default;
- 
- 	    if(gmp->current->mode == FIODIR){
diff --git a/mail/alpine/patches/patch-ac b/mail/alpine/patches/patch-ac
deleted file mode 100644
index ce36e38ae75..00000000000
--- a/mail/alpine/patches/patch-ac
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2007/12/09 22:17:55 abs Exp $
-
---- configure.ac.orig	2007-12-06 23:58:57.000000000 +0000
-+++ configure.ac
-@@ -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"
-+    ;;
-+  *-*-dragonfly*)
-+    systype="DFB"
-+    alpine_path_delim="/"
-+    alpine_local_maildir="/var/mail"
-     alpine_mode_readonly="(0600)"
-     alpine_c_client_target="neb"
-     ;;
-@@ -1365,7 +1372,7 @@ case "$host" in
-   *-*-freebsd*)
-     systype="BSF"
-     alpine_path_delim="/"
--    alpine_local_maildir="/usr/spool/mail"
-+    alpine_local_maildir="/var/mail"
-     alpine_mode_readonly="(0600)"
-     alpine_c_client_target="bsf"
-     LIBS="$LIBS $LIBINTL"
-@@ -1373,7 +1380,7 @@ case "$host" in
-   *-*-openbsd*)
-     systype="BSO"
-     alpine_path_delim="/"
--    alpine_local_maildir="/usr/spool/mail"
-+    alpine_local_maildir="/var/mail"
-     alpine_mode_readonly="(0600)"
-     alpine_c_client_target="bso"
-     LIBS="$LIBS $LIBINTL"
diff --git a/mail/alpine/patches/patch-ad b/mail/alpine/patches/patch-ad
deleted file mode 100644
index 4b119b68c6e..00000000000
--- a/mail/alpine/patches/patch-ad
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2007/12/09 22:17:55 abs Exp $
-
---- configure.orig	2007-12-07 00:05:15.000000000 +0000
-+++ configure
-@@ -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"
-+    ;;
-+  *-*-dragonfly*)
-+    systype="DFB"
-+    alpine_path_delim="/"
-+    alpine_local_maildir="/var/mail"
-     alpine_mode_readonly="(0600)"
-     alpine_c_client_target="neb"
-     ;;
-@@ -32932,7 +32939,7 @@ _ACEOF
-   *-*-freebsd*)
-     systype="BSF"
-     alpine_path_delim="/"
--    alpine_local_maildir="/usr/spool/mail"
-+    alpine_local_maildir="/var/mail"
-     alpine_mode_readonly="(0600)"
-     alpine_c_client_target="bsf"
-     LIBS="$LIBS $LIBINTL"
-@@ -32940,7 +32947,7 @@ _ACEOF
-   *-*-openbsd*)
-     systype="BSO"
-     alpine_path_delim="/"
--    alpine_local_maildir="/usr/spool/mail"
-+    alpine_local_maildir="/var/mail"
-     alpine_mode_readonly="(0600)"
-     alpine_c_client_target="bso"
-     LIBS="$LIBS $LIBINTL"
-- 
cgit v1.2.3