11 files changed, 8 insertions, 120 deletions
diff --git a/mail/mpop/Makefile b/mail/mpop/Makefile
index 338e5b9d530..23888b7735c 100644
--- a/mail/mpop/Makefile
+++ b/mail/mpop/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2006/06/25 03:32:23 reed Exp $
+# $NetBSD: Makefile,v 1.9 2007/03/16 19:05:17 reed Exp $
 #
 
-DISTNAME=	mpop-0.8.2
-PKGREVISION=	3
+DISTNAME=	mpop-1.0.7
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mpop/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/mail/mpop/PLIST b/mail/mpop/PLIST
index 9880ba8d86d..116a9b4cd41 100644
--- a/mail/mpop/PLIST
+++ b/mail/mpop/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.3 2006/04/17 07:07:24 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2007/03/16 19:05:17 reed Exp $
 bin/mpop
 info/mpop.info
 man/man1/mpop.1
 share/examples/mpop/mpoprc.example
 share/locale/de/LC_MESSAGES/mpop.mo
+share/locale/es/LC_MESSAGES/mpop.mo
 @dirrm share/examples/mpop
diff --git a/mail/mpop/distinfo b/mail/mpop/distinfo
index dd2465c2985..1b07356e16c 100644
--- a/mail/mpop/distinfo
+++ b/mail/mpop/distinfo
@@ -1,13 +1,5 @@
-$NetBSD: distinfo,v 1.2 2005/12/20 16:32:16 joerg Exp $
+$NetBSD: distinfo,v 1.3 2007/03/16 19:05:17 reed Exp $
 
-SHA1 (mpop-0.8.2.tar.bz2) = 240fbe3e93051a50e403f342b0dab822e91cdb15
-RMD160 (mpop-0.8.2.tar.bz2) = ea1fc39769ea14cc62c07847a695524baa462867
-Size (mpop-0.8.2.tar.bz2) = 475994 bytes
-SHA1 (patch-aa) = f00003c71808c318600bd18ee50c1f632e7a1006
-SHA1 (patch-ab) = c97dea52e61819e49327b17dffdff4a6d6aefb17
-SHA1 (patch-ac) = 05c878df4516531343e6ce3e57962cacaca3866b
-SHA1 (patch-ad) = 6ea860bee1170307f054a40e676e5aa7a8c74e5a
-SHA1 (patch-ae) = 555ef410dea68c958d91c55161019ee714c0c6ca
-SHA1 (patch-af) = 4f2e902b6d00a80ad82e0e15e98cec599f332431
-SHA1 (patch-ag) = 4031c770fd4b4d31264b296b51bec8cdff801239
-SHA1 (patch-ah) = c106ab8b33adba014e135e58c9fcd5f513e6d82e
+SHA1 (mpop-1.0.7.tar.bz2) = fe3172882114d2f17501a069128a117c33b2f096
+RMD160 (mpop-1.0.7.tar.bz2) = cc1f9e1ba2f643e509c8992705c00906aec39e00
+Size (mpop-1.0.7.tar.bz2) = 557870 bytes
diff --git a/mail/mpop/patches/patch-aa b/mail/mpop/patches/patch-aa
deleted file mode 100644
index 067661f51b7..00000000000
--- a/mail/mpop/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2005/12/20 16:32:16 joerg Exp $
-
---- src/conf.c.orig	2005-12-20 16:21:47.000000000 +0000
-+++ src/conf.c
-@@ -31,7 +31,6 @@
- #include <string.h>
- #include <ctype.h>
- #include <errno.h>
--extern int errno;
- 
- #include "gettext.h"
- #include "xalloc.h"
diff --git a/mail/mpop/patches/patch-ab b/mail/mpop/patches/patch-ab
deleted file mode 100644
index ab810a6dc92..00000000000
--- a/mail/mpop/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2005/12/20 16:32:16 joerg Exp $
-
---- src/mpop.c.orig	2005-12-20 16:23:42.000000000 +0000
-+++ src/mpop.c
-@@ -32,7 +32,6 @@
- #include <string.h>
- #include <ctype.h>
- #include <errno.h>
--extern int errno;
- #include <time.h>
- #include <getopt.h>
- extern char *optarg;
diff --git a/mail/mpop/patches/patch-ac b/mail/mpop/patches/patch-ac
deleted file mode 100644
index 764bc371fba..00000000000
--- a/mail/mpop/patches/patch-ac
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/12/20 16:32:16 joerg Exp $
-
---- src/net.c.orig	2005-12-20 16:24:08.000000000 +0000
-+++ src/net.c
-@@ -43,7 +43,6 @@
- #define NI_MAXHOST 1025
- #endif
- #include <errno.h>
--extern int errno;
- #else /* UNIX */
- #include <unistd.h>
- #include <fcntl.h>
-@@ -57,7 +56,6 @@ extern int h_errno;
- #include <arpa/inet.h>
- #include <netdb.h>
- #include <errno.h>
--extern int errno;
- #endif /* UNIX */
- 
- #include "gettext.h"
diff --git a/mail/mpop/patches/patch-ad b/mail/mpop/patches/patch-ad
deleted file mode 100644
index f88b5b79d8a..00000000000
--- a/mail/mpop/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/12/20 16:32:16 joerg Exp $
-
---- src/os_env.c.orig	2005-12-20 16:24:52.000000000 +0000
-+++ src/os_env.c
-@@ -29,7 +29,6 @@
- #include <stdlib.h>
- #include <string.h>
- #include <errno.h>
--extern int errno;
- #include <fcntl.h>
- #include <sys/types.h>
- #include <sys/stat.h>
diff --git a/mail/mpop/patches/patch-ae b/mail/mpop/patches/patch-ae
deleted file mode 100644
index d51e18894d5..00000000000
--- a/mail/mpop/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2005/12/20 16:32:16 joerg Exp $
-
---- src/pop3.c.orig	2005-12-20 16:25:21.000000000 +0000
-+++ src/pop3.c
-@@ -34,7 +34,6 @@
- #include <strings.h>
- #include <ctype.h>
- #include <errno.h>
--extern int errno;
- 
- #ifdef USE_GSASL
- #include <gsasl.h>
diff --git a/mail/mpop/patches/patch-af b/mail/mpop/patches/patch-af
deleted file mode 100644
index ae5c38dd78a..00000000000
--- a/mail/mpop/patches/patch-af
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-af,v 1.1 2005/12/20 16:32:16 joerg Exp $
-
---- src/uidls.c.orig	2005-12-20 16:26:58.000000000 +0000
-+++ src/uidls.c
-@@ -30,7 +30,6 @@
- #include <limits.h>
- #include <string.h>
- #include <errno.h>
--extern int errno;
- 
- #include "gettext.h"
- #include "xalloc.h"
diff --git a/mail/mpop/patches/patch-ag b/mail/mpop/patches/patch-ag
deleted file mode 100644
index f10e77f6c1e..00000000000
--- a/mail/mpop/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2005/12/20 16:32:16 joerg Exp $
-
---- src/delivery.c.orig	2005-12-20 16:23:14.000000000 +0000
-+++ src/delivery.c
-@@ -32,7 +32,6 @@
- #include <sys/time.h>
- #include <time.h>
- #include <errno.h>
--extern int errno;
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sysexits.h>
diff --git a/mail/mpop/patches/patch-ah b/mail/mpop/patches/patch-ah
deleted file mode 100644
index 86e88958c07..00000000000
--- a/mail/mpop/patches/patch-ah
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2005/12/20 16:32:16 joerg Exp $
-
---- src/tls.c.orig	2005-12-20 16:27:32.000000000 +0000
-+++ src/tls.c
-@@ -33,7 +33,6 @@
- #include <limits.h>
- #include <time.h>
- #include <errno.h>
--extern int errno;
- 
- #ifdef HAVE_GNUTLS
- #include <gnutls/gnutls.h>