From b5b45c758671df49c492cea5040de73af45c3185 Mon Sep 17 00:00:00 2001
From: frueauf <frueauf@pkgsrc.org>
Date: Tue, 2 Sep 2003 12:27:46 +0000
Subject: Update fetchmail{conf} to 6.2.4.

Based on pr pkg/22650 by Adrian Portelli.

Changes since 6.2.3:
* Updated German, Spanish, Catalan, and Turkish translations.
* IDLE is now supported using no-ops even if the server doesn't support
  the IMAP IDLE extension.
* Sunil Shetye's patch to do better password shrouding.
* Sunil Shetye's bug-fix rollup patch.
* Introduce a translation item for the word "seen".
* Back out the hack to deal with lack of byte stuffing on some POP3 servers.
* Thomas Steudten's patch to improve SMTP handling of 550 errors.
---
 mail/fetchmail/Makefile         |  4 +--
 mail/fetchmail/distinfo         |  8 +++---
 mail/fetchmail/patches/patch-ae | 54 ++++++++++++++++++++---------------------
 3 files changed, 33 insertions(+), 33 deletions(-)

(limited to 'mail/fetchmail')

diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 7894f623f16..3e7b4921cca 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.130 2003/07/21 16:56:45 martti Exp $
+# $NetBSD: Makefile,v 1.131 2003/09/02 12:27:46 frueauf Exp $
 
-DISTNAME=	fetchmail-6.2.3
+DISTNAME=	fetchmail-6.2.4
 CATEGORIES=	mail
 MASTER_SITES=	http://catb.org/~esr/fetchmail/ \
 		http://sunsite.unc.edu/pub/Linux/system/mail/pop/
diff --git a/mail/fetchmail/distinfo b/mail/fetchmail/distinfo
index 80ae771b11e..d509f3aaeef 100644
--- a/mail/fetchmail/distinfo
+++ b/mail/fetchmail/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.23 2003/07/20 14:52:45 frueauf Exp $
+$NetBSD: distinfo,v 1.24 2003/09/02 12:27:46 frueauf Exp $
 
-SHA1 (fetchmail-6.2.3.tar.gz) = d075e500357ddd21a886a479172e05d8fbec4d31
-Size (fetchmail-6.2.3.tar.gz) = 1239344 bytes
+SHA1 (fetchmail-6.2.4.tar.gz) = 99b1b1c41e9853e1c9e88c57b51ec83a08a18adc
+Size (fetchmail-6.2.4.tar.gz) = 1247210 bytes
 SHA1 (patch-aa) = 3c8aaac5d53c1069995ab74ad99bc5e64843a507
 SHA1 (patch-ab) = 009a97639502365f8b6ec4e854622620391a812f
 SHA1 (patch-ac) = ef0e651807bb0942ca79ed3b10ffc000f71bd330
 SHA1 (patch-ad) = b6bffc59f28992fa0d3de0f9dad250c73bbeffc6
-SHA1 (patch-ae) = 7fee4d167528d942d720c282900ad77aacff2310
+SHA1 (patch-ae) = 1b7a2e5a2e32cf54a9c690939dae3cac7e2a00cc
 SHA1 (patch-af) = 06e7b84566b0d3ed50b56f88baf23f15ae21eb21
diff --git a/mail/fetchmail/patches/patch-ae b/mail/fetchmail/patches/patch-ae
index 1ca238615c5..eed27af579c 100644
--- a/mail/fetchmail/patches/patch-ae
+++ b/mail/fetchmail/patches/patch-ae
@@ -1,15 +1,15 @@
-$NetBSD: patch-ae,v 1.10 2003/07/20 14:52:45 frueauf Exp $
+$NetBSD: patch-ae,v 1.11 2003/09/02 12:27:47 frueauf Exp $
 
 --- po/cs.po-orig	Fri Jul 18 00:05:55 2003
 +++ po/cs.po	Sun Jul 20 16:31:26 2003
 @@ -63,12 +63,12 @@
- #: driver.c:351
+ #: driver.c:354
  #, c-format
  msgid "\t%d msg %d octets long skipped by fetchmail.\n"
 -msgstr "\t%d. zpráva o délce %d v bajtech byla fetchmailem přeskočena.\n"
 +msgstr "\t%d. zpráva o délce %d bajtů byla fetchmailem přeskočena.\n"
  
- #: driver.c:444
+ #: driver.c:450
  #, fuzzy, c-format
  msgid "skipping message %s@%s:%d (%d octets)"
 -msgstr "zprávu %d (počet oktetů: %d) vynechávám"
@@ -18,35 +18,35 @@ $NetBSD: patch-ae,v 1.10 2003/07/20 14:52:45 frueauf Exp $
  #.
  #. * Invalid lengths are produced by Post Office/NT's
 @@ -97,12 +97,12 @@
- #: driver.c:494
+ #: driver.c:501
  #, fuzzy, c-format
  msgid "reading message %s@%s:%d of %d"
 -msgstr "čtu %d. zprávu z %d"
 +msgstr "čtu zprávu %s@%s:%d z %d"
  
- #: driver.c:499
+ #: driver.c:506
  #, c-format
  msgid " (%d %soctets)"
 -msgstr " (počet bajtů: %d %s)"
 +msgstr " (%d bajtů%s)"
  
- #: driver.c:500
+ #: driver.c:507
  msgid "header "
 @@ -111,31 +111,31 @@
- #: driver.c:570
+ #: driver.c:579
  #, c-format
  msgid " (%d body octets) "
 -msgstr " (počet bajtů v těle: %d)"
 +msgstr " (%d bajtů těla)"
  
- #: driver.c:638
+ #: driver.c:637
  #, fuzzy, c-format
  msgid ""
  "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
 -msgstr "zpráva %d má neočekávanou velikost (velikost je %d, očekáváno %d)\n"
 +msgstr "zpráva %s@%s:%d nemá očekávanou velikost (%d skutečných != %d očekávaných)\n"
  
- #: driver.c:668
+ #: driver.c:667
  msgid " retained\n"
 -msgstr "zachována(y)\n"
 +msgstr "zachováno\n"
@@ -72,58 +72,58 @@ $NetBSD: patch-ae,v 1.10 2003/07/20 14:52:45 frueauf Exp $
  msgid "SIGPIPE thrown from an MDA or a stream socket error\n"
 @@ -390,7 +390,7 @@
  #: driver.c:1263
- #, c-format
- msgid "%d %s (%d seen) for %s"
+ #, fuzzy, c-format
+ msgid "%d %s (%d %s) for %s"
 -msgstr "počet %2$s pro uživatele %4$s: %1$d (%3$d přečtených)"
 +msgstr "%d %s (%d přečtených) pro %s"
  
- #: driver.c:1264 driver.c:1269
+ #: driver.c:1264 driver.c:1271
  msgid "messages"
-@@ -403,12 +403,12 @@
- #: driver.c:1268
+@@ -407,12 +407,12 @@
+ #: driver.c:1270
  #, c-format
  msgid "%d %s for %s"
 -msgstr "počet %2$s pro uživatele %3$s: %1$d"
 +msgstr "%d %s pro %s"
  
- #: driver.c:1274
+ #: driver.c:1276
  #, c-format
  msgid " (%d octets).\n"
 -msgstr " (počet bajtů: %d).\n"
 +msgstr " (%d bajtů).\n"
  
- #: driver.c:1280
+ #: driver.c:1282
  #, c-format
-@@ -458,12 +458,12 @@
- #: driver.c:1492
+@@ -462,12 +462,12 @@
+ #: driver.c:1494
  #, c-format
  msgid "%s error while delivering to SMTP host %s\n"
 -msgstr "při odesílání SMTP protokolem na %2$s nastala chyba %1$s\n"
 +msgstr "chyba %s při doručování na SMTP server %s\n"
  
- #: driver.c:1494
+ #: driver.c:1496
  #, c-format
  msgid "%s error while fetching from %s\n"
 -msgstr "při stahování z %2$s nastala chyba %1$s\n"
 +msgstr "chyba %s při stahování z %s\n"
  
- #: driver.c:1502
+ #: driver.c:1504
  #, c-format
-@@ -880,7 +880,7 @@
- #: fetchmail.c:1317
+@@ -884,7 +884,7 @@
+ #: fetchmail.c:1326
  #, fuzzy, c-format
  msgid "%s querying %s (protocol %s) at %s: poll started\n"
 -msgstr "v %4$s %1$s stahuje protokolem %3$s z %2$s\n"
 +msgstr "v %s %s stahuje protokolem %s z %s XXX\n"
  
- #: fetchmail.c:1342
+ #: fetchmail.c:1351
  msgid "POP2 support is not configured.\n"
-@@ -2723,7 +2723,7 @@
+@@ -2691,7 +2691,7 @@
  
- #: transact.c:1262
+ #: transact.c:514
  msgid "message delimiter found while scanning headers\n"
 -msgstr "při prohledávání hlaviček byl nalezen oddělovač zprávy\n"
 +msgstr "při prohledávání hlaviček byl nalezen oddělovač zpráv\n"
  
- #: transact.c:1360
- msgid "writing message text\n"
+ #: transact.c:535
+ #, fuzzy
-- 
cgit v1.2.3