Update mail/fdm to fdm-1.9.

pkgsrc changes:
 o Update MASTER_SITES and HOMEPAGE to current reality.
 o Convert the package in order to use GNU_CONFIGURE and add aclocal,
   auto{conf,make} to USE_TOOLS (the configure is not provided by upstream
   and need to be generated).
 o Avoid mremap(2) usage. The NetBSD's mremap(2) isn't compatible (and probably
   also other systems does not have it) so use mmap(2) instead.

Changes:
 o Add support for STARTTLS on IMAP and POP3, from Markus Bachmann.
 o Add "lock-wait" option to make fdm wait the global lock (lock-file option)
   rather than exiting with an error immediately. Also add "lock-time" option
   for the lock file timeout rather than a fixed 10 seconds. Requested by
   Todd C. Miller.
 o Add "ignore-errors" flag to instruct fdm to ignore delivery errors and
   continue to the next mail, requested by Todd C. Miller.
 o Delete Courier support.
 o Delete regress/*
 o Convert fdm to use autoconf and automake
 o Various misc bug fixes

5 files changed, 26 insertions, 44 deletions

diff --git a/mail/fdm/Makefile b/mail/fdm/Makefile
index f0c35612062..2003d9b1460 100644
--- a/mail/fdm/Makefile
+++ b/mail/fdm/Makefile
@@ -1,24 +1,30 @@
-# $NetBSD: Makefile,v 1.7 2015/01/05 13:56:46 mef Exp $
+# $NetBSD: Makefile,v 1.8 2015/09/25 13:08:44 leot Exp $
 
-DISTNAME=		fdm-1.8
-CATEGORIES=		mail
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=fdm/}
+DISTNAME=	fdm-1.9
+CATEGORIES=	mail
+MASTER_SITES=	${MASTER_SITE_GITHUB:=nicm/}
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://fdm.sourceforge.net/
-COMMENT=		Fetch or receive mail and deliver it in various ways
-LICENSE=		modified-bsd
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	https://github.com/nicm/fdm/
+COMMENT=	Fetch or receive mail and deliver it in various ways
+LICENSE=	modified-bsd
 
-HAS_CONFIGURE=		yes
+GNU_CONFIGURE=	yes
+USE_TOOLS+=	aclocal autoconf automake yacc pax
 
 INSTALLATION_DIRS+=	${EGDIR} ${DOCDIR}
 EGDIR=			${PREFIX}/share/examples/fdm
 DOCDIR=			${PREFIX}/share/doc/fdm
 
-USE_TOOLS+=		yacc pax
+CONFIGURE_ENV+=	ac_cv_func_mremap=no	# avoid mremap(2)
+
+CFLAGS.NetBSD+=	-D_OPENBSD_SOURCE	# needed for strtonum(3)
 
 .include "options.mk"
 
+pre-configure:
+	cd ${WRKSRC} && ./autogen.sh
+
 post-install:
 	cd ${WRKSRC}/examples && pax -rwpam . ${DESTDIR}${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/MANUAL ${DESTDIR}${DOCDIR}
diff --git a/mail/fdm/distinfo b/mail/fdm/distinfo
index eb1de92ede1..3e6283a3887 100644
--- a/mail/fdm/distinfo
+++ b/mail/fdm/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.5 2015/01/05 13:56:46 mef Exp $
+$NetBSD: distinfo,v 1.6 2015/09/25 13:08:44 leot Exp $
 
-SHA1 (fdm-1.8.tar.gz) = 25c0ebc0c2b43984d04c82d0ba3909acf7403df7
-RMD160 (fdm-1.8.tar.gz) = 460bd3ced27caf248878d803c0efefd090b8e0b1
-Size (fdm-1.8.tar.gz) = 193220 bytes
-SHA1 (patch-aa) = 1464ecfca828c93b90a2700a2329273992cd1959
-SHA1 (patch-fdm.h) = aa13bc8507c9918fb56ff65e64a83b3b5d29ce14
+SHA1 (fdm-1.9.tar.gz) = 818bf39418ae4b170b4c3aa7c852015bf4802d7a
+RMD160 (fdm-1.9.tar.gz) = f44d009ac29cdf244509ce032270758be7f4be32
+Size (fdm-1.9.tar.gz) = 175815 bytes
+SHA1 (patch-fdm.h) = 98d01387d0e17d782950571c1b25e8faf841649b
diff --git a/mail/fdm/options.mk b/mail/fdm/options.mk
index 80c6c9a57a7..57dbb907725 100644
--- a/mail/fdm/options.mk
+++ b/mail/fdm/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2013/10/03 11:12:43 obache Exp $
+# $NetBSD: options.mk,v 1.2 2015/09/25 13:08:44 leot Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.fdm
 PKG_SUPPORTED_OPTIONS=	debug pcre
@@ -10,7 +10,7 @@ PKG_SUGGESTED_OPTIONS=	pcre
 # Debug
 #
 .if !empty(PKG_OPTIONS:Mdebug)
-   MAKE_ENV+=	FDEBUG=1
+CONFIGURE_ARGS+=	--enable-debug
 .endif
 
 #
diff --git a/mail/fdm/patches/patch-aa b/mail/fdm/patches/patch-aa
deleted file mode 100644
index 131b14097c7..00000000000
--- a/mail/fdm/patches/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2015/01/05 13:56:46 mef Exp $
-
---- Makefile.orig	2014-12-02 14:17:21.000000000 +0000
-+++ Makefile
-@@ -68,12 +68,12 @@ regress:	fdm
- 		cd regress && ${MAKE}
- 
- install:	all
--		${INSTALLDIR} ${DESTDIR}${PREFIX}/bin
--		${INSTALLBIN} fdm ${DESTDIR}${PREFIX}/bin/
--		${INSTALLDIR} ${DESTDIR}${PREFIX}/man/man1
--		${INSTALLMAN} fdm.1 ${DESTDIR}${PREFIX}/man/man1/
--		${INSTALLDIR} ${DESTDIR}${PREFIX}/man/man5
--		${INSTALLMAN} fdm.conf.5 ${DESTDIR}${PREFIX}/man/man5/
-+		${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
-+		${BSD_INSTALL_PROGRAM} fdm ${DESTDIR}${PREFIX}/bin/
-+		${BSD_INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-+		${BSD_INSTALL_MAN} fdm.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
-+		${BSD_INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
-+		${BSD_INSTALL_MAN} fdm.conf.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/
- 
- uninstall:
- 		rm -f ${DESTDIR}${PREFIX}/bin/fdm
diff --git a/mail/fdm/patches/patch-fdm.h b/mail/fdm/patches/patch-fdm.h
index 0b989bddb28..d0effe5962d 100644
--- a/mail/fdm/patches/patch-fdm.h
+++ b/mail/fdm/patches/patch-fdm.h
@@ -1,11 +1,11 @@
-$NetBSD: patch-fdm.h,v 1.2 2013/10/03 11:12:43 obache Exp $
+$NetBSD: patch-fdm.h,v 1.3 2015/09/25 13:08:44 leot Exp $
 
 MAXNAMLEN is not POSIX. For systems that does not define it use NAME_MAX
 macro instead.
 
---- fdm.h.orig	2011-10-10 13:36:29.000000000 +0000
+--- fdm.h.orig	2015-09-14 14:40:44.000000000 +0000
 +++ fdm.h
-@@ -76,6 +76,10 @@
+@@ -72,6 +72,10 @@
  
  extern char	*__progname;