Factor out "fetchmailconf", as suggested by Hubert Feyrer, so that

fetchmailconf can be made usable by naive users without forcing this
package to depend on py-Tk (and X). Incidently update to 5.2.4:

* Fix bug introduced in 5.2.2 that stopped --syslog from working.
* Update for es.po, fr.po, cs.po.
* Message-string macros eliminated from driver.c so gettext can see them.
* Various useful to version reporting & configure.in fixes by Chip Salzenberg.
* Bernhard Rosenkraenzer's fix for broken Kerberos V configuration.
* Make --logfile work in foreground.

5 files changed, 21 insertions, 17 deletions

diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 093176ed261..4e469642dae 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.61 2000/01/10 22:50:16 frueauf Exp $
+# $NetBSD: Makefile,v 1.62 2000/01/21 15:45:32 fredb Exp $
 #
 
-DISTNAME=       fetchmail-5.2.3
+DISTNAME=       fetchmail-5.2.4
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.ccil.org/pub/esr/fetchmail/ \
 		http://www.tuxedo.org/~esr/fetchmail/ \
diff --git a/mail/fetchmail/files/md5 b/mail/fetchmail/files/md5
index e66c3c385eb..cde6961cf06 100644
--- a/mail/fetchmail/files/md5
+++ b/mail/fetchmail/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.39 2000/01/10 22:50:17 frueauf Exp $
+$NetBSD: md5,v 1.40 2000/01/21 15:45:34 fredb Exp $
 
-MD5 (fetchmail-5.2.3.tar.gz) = ad21b1ac6a062bd8b8236c1e33299bf3
+MD5 (fetchmail-5.2.4.tar.gz) = b2a4f31cc279f77e0e418ecce54c4b91
diff --git a/mail/fetchmail/files/patch-sum b/mail/fetchmail/files/patch-sum
index 9b2f0198e21..d903f46b4e2 100644
--- a/mail/fetchmail/files/patch-sum
+++ b/mail/fetchmail/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.7 2000/01/10 22:50:17 frueauf Exp $
+$NetBSD: patch-sum,v 1.8 2000/01/21 15:45:34 fredb Exp $
 
 MD5 (patch-aa) = cc1298297934cf1b0821583ef27ac5d9
-MD5 (patch-ab) = 32e8423a8750fe451c76cbcc31418ecd
+MD5 (patch-ab) = 81269d478730c513ebddf3f64e6a45b3
 MD5 (patch-ac) = 9e39b55d1919bb0a3d95d4e9ecdb1c06
 MD5 (patch-ad) = da45661a42aca654307a83b8d00c6a18
diff --git a/mail/fetchmail/patches/patch-ab b/mail/fetchmail/patches/patch-ab
index 664a2270075..0fe8d1a7e10 100644
--- a/mail/fetchmail/patches/patch-ab
+++ b/mail/fetchmail/patches/patch-ab
@@ -1,13 +1,19 @@
-$NetBSD: patch-ab,v 1.11 2000/01/10 22:50:17 frueauf Exp $
+$NetBSD: patch-ab,v 1.12 2000/01/21 15:45:34 fredb Exp $
 
---- Makefile.in.orig	Tue Jan  4 07:58:45 2000
-+++ Makefile.in	Mon Jan 10 21:34:27 2000
-@@ -152,7 +152,7 @@
+--- Makefile.in.orig	Tue Jan  4 00:58:45 2000
++++ Makefile.in	Fri Jan 21 07:10:15 2000
+@@ -152,10 +152,10 @@
  	@echo "Installing fetchmail binary..."
  	$(INSTALL_PROGRAM) ./fetchmail $(bindir)/fetchmail
- 	@echo "Installing fetchmail configurator..."
+-	@echo "Installing fetchmail configurator..."
 -	$(INSTALL_PROGRAM) ${srcdir}/fetchmailconf $(bindir)/fetchmailconf
-+	$(BSD_INSTALL_SCRIPT) ${srcdir}/fetchmailconf $(bindir)/fetchmailconf
++#	@echo "Installing fetchmail configurator..."
++#	$(BSD_INSTALL_SCRIPT) ${srcdir}/fetchmailconf $(bindir)/fetchmailconf
  	@echo "Installing manual page..."
  	$(INSTALL_DATA) $(srcdir)/fetchmail.man $(mandir)/fetchmail.$(manext)
- 	rm -f $(mandir)/fetchmailconf.$(manext)
+-	rm -f $(mandir)/fetchmailconf.$(manext)
+-	ln -s $(mandir)/fetchmail.$(manext) $(mandir)/fetchmailconf.$(manext)
++#	rm -f $(mandir)/fetchmailconf.$(manext)
++#	ln -s $(mandir)/fetchmail.$(manext) $(mandir)/fetchmailconf.$(manext)
+ 	@echo "Installing language catalogs..."
+ 	@POMAKE@ install
diff --git a/mail/fetchmail/pkg/PLIST b/mail/fetchmail/pkg/PLIST
index a7a3b3ea7b7..c09d82728c7 100644
--- a/mail/fetchmail/pkg/PLIST
+++ b/mail/fetchmail/pkg/PLIST
@@ -1,8 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 1998/07/04 04:41:36 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.4 2000/01/21 15:45:35 fredb Exp $
 bin/fetchmail
-bin/fetchmailconf
-man/man1/fetchmail.1.gz
-man/man1/fetchmailconf.1.gz
+man/man1/fetchmail.1
 share/doc/fetchmail/README
 share/doc/fetchmail/COPYING
 share/doc/fetchmail/FAQ