Uodate hypermail to 2.3.0.

Based on PR 46440 by Uwe Klaus.

Version Changes for Hypermail
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
============================
HYPERMAIL VERSION 2.3.0:
============================
Jose Kahan (Oct 27, 2009)

  - Added two new accesskeys in messages: 't' ->  next message
    in thread, 'd' -> next message

 Jose Kahan (Oct 26, 2009)
  - Updated hmrc.4 and hmrc.html to descrbie the new features.

 Jose Kahan (Oct 26, 2009)
  Various fixes / enhancements developed at W3C by Fumihiro Kato,
  Daigo Matsubara and myself:
  - Markup changes for deleted messages that are kept.
  - New directive: htmlmessage_deleted for setting a custom HTML
    message for the body of deleted messages.
  - New directive: delete_incremental to disable deleting of existing
    messages in the archive when doing an incremental add of a new
    message. In some setups, if this feature is enabled, replies to
    deleted messages will cause uncontrolled markup escape and
    expansion. Feature is enabled by default.
  - Updated list of known protocol uris that hypermail will convert
    into links.
  - Bug fix: setup.c:MakeConfig() CFG_SWITCH was using long instead of
    int.
  - New directive: fragment_prefix for customizing the prefix that is
    put before each URI fragment in a message. Default value is "msg",
    the previous hard-coded value.
  - New directive: email_address_obfuscation foro enablingemail
    address obfuscation using numeric character reference.
  - New directive: inline_addlink to add in-line links to content that
    is stored in the attachments subdirectory. 'inline_types" must
    also be enabled.
  - New directive: inreplyto_command, gives a URI template to a script
    that hypermail will link to if it's unable to find a corresponding
    Message-Id in the archive's messages.

 Peter McCluskey (May 13, 2008)
  Change from Fumihiro Kato to fix bug that sometimes caused a charset
   problem when Content-Type is us-ascii but message headers
   include other encoded text like utf-8.

 Peter McCluskey (Nov 14, 2007)
  Applied xhtml patch from Zvi Har'El.

 Peter McCluskey (Oct 1, 2007)
  Changes from Fumihiro Kato to fix bugs on 64 bit systems and some
   possible buffer overflow problems.
  Change in rules about whether to escape urls; it now seems to escape them
   when found in the middle of the line the same way it has been doing when
   they are at the start of a line.

 Peter McCluskey (Feb 16, 2007)
  Changes from Rick van der Zwet:
   cosmetic = tweaking the interface a small bit (right align, the message
   numbers, years in the date listing
   spamify-domain = obfuscate the body of the message as well (will also
   obfuscate 'ssh rick@foo.bar' this of course), moved the domain obfuscate
   yes/no to the general to make the function more portable
 Changes from Mike Fabian changing int to size_t.

 Peter McCluskey (Mar 27, 2006)
  Add rel="nofollow" to text message URLs (option txtsuffix = 1).

 Peter McCluskey (Mar 14, 2006)
  Fixed a core dump with linkquotes = 1 caused by Daigo's changes.

 Peter McCluskey (Sep 30, 2005)
  Fixed missing links at top when show_index_links is 1 or 3.

 Peter McCluskey (Aug 4, 2005)
  Fixed double counting of messages deleted with the delete_msgnum option,
  which sometimes caused top level index page to show wrong number of
  messages and not link to a folder.

 Peter McCluskey (Jul 29, 2005)
  Changed to sort on sender date rather than from date when displaying
  sender date as a result of use_sender_date = 1.

 Peter McCluskey (Jun 23, 2005)
  Some small changes from Vincent McIntyre to make date-range in index of
  folders link to default index page, to use CSS instead of <th> to
  distinguish that column, and some whitespace changes.
  Added explanation of how to handle strcasestr prototype error to INSTALL.

 Peter McCluskey (Mar 19, 2005)
  Fixes to files_by_thread option submitted by Oliver Meili.

 Peter McCluskey (Dec 2, 2004)
  Patch from Ulf Härnhammar to fix two format string bugs in Hypermail.
  They could have caused crashes if using incremental mode on edited
  pre-existing archives with data like "%n%n%n%n%n%n%n%n" in certain lines.

 Peter McCluskey (Nov 28, 2004)
  Add filename_base option.

 Peter McCluskey (Sep 29, 2004)
  Add support for JAVT timezone.
  Add mailbox_date_trimmer to contrib, faq.

 Peter McCluskey (Jun 2, 2004)
  Add language code substitution cookie patch from Shane Wegner.

============================
HYPERMAIL VERSION 2.2.0:
============================
 Peter McCluskey (May 25, 2004)
  Changed some of the addresses to hypermail-project.org.
  Made the "We delete ... " message print only if progress != 0.

 Peter McCluskey (Mar 23, 2004)
   Changes to speed up incremental update when there are deleted files if
  using usegdbm (it's still slow if usegdbm = 0).

============================
HYPERMAIL VERSION 2.1.9:
============================
 Peter McCluskey (Feb 23, 2004)
  Released version 2.1.9 tar file.

 Peter McCluskey (Feb 17, 2004)
  Add use_sender_date option.
  Fix instructions for doing "make install" so that the documentation will
  be installed.

 Peter McCluskey (Feb 5, 2004)
  Update much of the documentation.

 Peter McCluskey (Feb 4, 2004)
  Change default in setup.c for spamprotect and spamprotect_id to On.

 Peter McCluskey (Feb 2, 2004)
  Add set_report_new_file and set_report_new_folder options.

 Peter McCluskey (Jan 23, 2004)
  Add in missing <a name="end"> for index files.
  Removed a misleading, nonportable timezone string from link titles in
 toplevel index pages.

 Peter McCluskey (Jan 9, 2004)
  Change to make mbox_shortened option work a little better with
 discard_dup_msgids = 0.
  Change folder_by_date option to use "From " date rather than "Date: "
 to decide which subdirectory to use. This makes it consistent with
 top level index page.

 Peter McCluskey (Dec 26, 2003)
  Add increment = -1 mode to enable automatic determination of whether
 to update or append in most cases.

 Peter McCluskey (Dec 3, 2003)
  Added a mbox_shortened option to handle mboxes that have had messages
 deleted from the start of the mbox.

 Peter McCluskey (Dec 1, 2003)
  Fix mismatch in <ul>, </ul> in date.html with indextable = 0.

 Peter McCluskey (Nov 17, 2003)
  Add a check for the problem with the starting message number that was
 partly fixed on Oct 1. Now old archives with a startmsgnum = 0 .hmrc but
 a first message of 0001.html in this case will be treated as if startmsgnum
 was 0.

 Peter McCluskey (Nov 15, 2003)
  Add Portugese support from Hugo Cisneiros.

 Peter McCluskey (Oct 1, 2003)
  Fix some problems with starting message number that caused bugs when
  increment = 1, linkquotes = 1 and using folder_by_date.

 Peter McCluskey (Sep 11, 2003)
  Fixes to make pcre work.

 Peter McCluskey (Sep 3, 2003)
  Applied patches from Mike McDonald to use nowrap option in the author and
 date columns in the index tables and get rid of all of the 'width=100%'
 options to the tables.

 Peter McCluskey (Sep 3, 2003)
  French language improvements from Olivier Kaloudoff.

 Peter McCluskey (Sep 1, 2003)
  Applied patches from Mike McDonald to make spamify_replacedomain use
 set_antispam_at, change printdates to include the dates in the table
 version of the bydate index, and make the table use the whole screen
 width instead of 80%.

 Jose Kahan (Aug  18, 2003)
  - Changed to lowercase the suffixes added to the message indexes. That is,
    from "archive name By Date" to "archive name by date" because the
    upper case seemed out of style as we don't have any control on what
    is the string used for the archive's name. Did this change only for
    the English messages as I don't know if this convention works well for
    other languages.

 Jose Kahan (Aug  18, 2003)
  - Made the links to the different indexes show the index of the current entry.
    This change originated from the feedback we got on the WAI enhanced archievs.
    People find that this small changes increases the usability of the archive.

 Jose Kahan (Aug  18, 2003)
  - The links to the first message (aka #first) were not working in the
    by attachment, by author, and by subject indexes.

 Peter McCluskey (Aug 16, 2003)
  - applied fix from Jean-Charles Meyrignac to handle 0x1A in mbox.

 Jose Kahan (Aug  14, 2003)
  - After receiving more feedback, reverted the changes done for converting the
    displayed value of the Date: header. The reason is that users like to know
    when they send a message. This information was getting lost because we
    were converting the date to the local time.
  - Made the Received on date be  shown in converted local time.
  - Added a new configuration option, indexdateformat, so that people can
    specify a different format for indexes than the one used elsewhere. If this
    variable is not defined., it'll use the dateformat by default.
  - Made the index by date compare dates independently of the value of dateformat.

 Jose Kahan (Aug  13, 2003)
  - Made the Received on footnote line use the same date format as that used for the
    Date: header on top of the messages.

 Jose Kahan (Aug  18, 2003)
  - Small WAI change to the list of indexes to show the entry corresponding to
    the current index, but outside of a link. This comes from feedback, where
    people said it was less distracting to see the same index to links all
    the time.

 Jose Kahan (Aug  18, 2003)
  - Add the <title> WAI enhancement that I had forgotten to do for messages.
    The new format is: [subject] from [author] on [date] ([mailing list label]).
    I also removed the 64 characters maximum limit check we had on the title.
    The reason is that this is not part of the HTML specification, but rather
    a writing style. Dominique says we shouldn't be so strict in this case. In
    addition, just adding a \0 after 64 characters could break entity names and
    generate invalid HTML.

 Jose Kahan (Aug  13, 2003)
  - The mailcommand option didn't work when applied to a paragraph that had
    a previously converted href string that includes the '@' char. I added
    a quick hack to ConvURlsString to avoid doing the mailto: convertion if an href
    already exists in that line. The best solution would be to do something
    similar to ConvURLsWithHrefs.
    Also fixed a memory leak.

 Peter McCluskey (Aug 8, 2003)
  - Applied haof fixes from Bernhard Reiter.

 Jose Kahan (Aug  4, 2003)
  - As a side effect of PNK's use of an SGML entity for the @ char, the
    mailcommand option stopped working on all the headers except for
    the To: one.

 Jose Kahan (Aug  1, 2003)
  - In order to guarantee the validity of XHTML documents, changed the
    behavior of hypermail when including customized footers. Previously,
    when using this option, the custom markup had to include the </body>
    and </html> end tags. As we also need to include a </div> in some
    cases for XHTML and it's much harder to guess when to add it, I
    made hypermail always add those three end tags as needed, regardless
    of whether the custom footer option is being used.

 Jose Kahan (Jul 30, 2003)
  - After talking with Dom Hazel-Massieux, I added some extra WAI enhancements
    to the list of indexes generated by hypermai. Specifically, the date
    is shown in a verbose name in the title attribute of each entry and in
    an abbreviated version in the markup that's being displayed.

 Jose Kahan (Jul 30, 2003)
  - When rebuilding an archive, the attachment files were not being overwritten
    correctly. . Fixed this by adding an O_TRUNC flag.

 Jose Kahan (Jul 29, 2003)
  - Removed a memory leak in file.c as reported by insure.
  - The ietf-mbox option didn't work on "quoted printable" encoded attachments.

 Peter McCluskey (July 22, 2003)
   Fix show_msg_links = 3 option (Jose's changes assumed it didn't exist).
   Updates to German from Tobias Weber.

 Kent Landfield (Jul 14, 2003)
   - When show_headers was used in print.c, the newline was not recognized
     early enough in printheaders. A check was added to assure the newline
     was recognized properly.

 Kent Landfield (Jul 10, 2003)
  - Small typo in print.c corrected.
       fprintf(fp, "%s ^lt;<em>%s</em>&gt;"...

6 files changed, 32 insertions, 26 deletions

diff --git a/mail/hypermail/Makefile b/mail/hypermail/Makefile
index dae3ae6aa2d..dd9c32cebc7 100644
--- a/mail/hypermail/Makefile
+++ b/mail/hypermail/Makefile
@@ -1,26 +1,32 @@
-# $NetBSD: Makefile,v 1.16 2012/03/03 00:13:29 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2012/08/13 12:41:10 obache Exp $
 #
 
-DISTNAME=	hypermail-2.1.8
-PKGREVISION=	3
+DISTNAME=	hypermail-2.3.0
 CATEGORIES=	mail www
-MASTER_SITES=	http://www.hypermail.org/dist/
+MASTER_SITES=	${HOMEPAGE} \
+		${MASTER_SITE_SOURCEFORGE:=hypermail/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.hypermail.org/
+HOMEPAGE=	http://www.hypermail-project.org/
 COMMENT=	Creates indexed, threaded HTML archives of email
+LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+WRKSRC=		${WRKDIR}/${PKGBASE}
+
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		yacc
 
+LDFLAGS+=		-liconv
+
 CONFIGURE_ARGS+=	--with-gdbm=${BUILDLINK_PREFIX.gdbm}
 CONFIGURE_ARGS+=	--with-htmldir=${DESTDIR}${PREFIX}/share/doc/html/hypermail
 
 INSTALL_MAKE_FLAGS+=	prefix=${DESTDIR}${PREFIX} \
 			mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
 
+.include "../../converters/libiconv/buildlink3.mk"
 .include "../../databases/gdbm/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/hypermail/distinfo b/mail/hypermail/distinfo
index 37e4e3174c8..8baabc35264 100644
--- a/mail/hypermail/distinfo
+++ b/mail/hypermail/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.7 2005/02/24 09:59:22 agc Exp $
+$NetBSD: distinfo,v 1.8 2012/08/13 12:41:10 obache Exp $
 
-SHA1 (hypermail-2.1.8.tar.gz) = acb357832c52c91e43f58d13e20c0599440d3df9
-RMD160 (hypermail-2.1.8.tar.gz) = 377bab9c7028cb684be1bfcbed70ae2ba777255c
-Size (hypermail-2.1.8.tar.gz) = 1238173 bytes
-SHA1 (patch-aa) = c67e4a22cddee828d2c2039f1e4ca2a667ce48b8
-SHA1 (patch-ac) = 0b173d255d0b6b4024ece4ce7fc4ea85ce6c2322
-SHA1 (patch-ad) = ec9220c81d8f8831ac66b1f9d4979523e631ddeb
-SHA1 (patch-ae) = 4e0f1054ead76f8cbff4eaceac926ff664c6a7ff
+SHA1 (hypermail-2.3.0.tar.gz) = 6d06175b6c5aa290b1d26a4daa06b79a8d30adbd
+RMD160 (hypermail-2.3.0.tar.gz) = 65565776556847cd317672d9014d5b4aadd5b34c
+Size (hypermail-2.3.0.tar.gz) = 1280010 bytes
+SHA1 (patch-aa) = 732a169bf1d9b77a9309bf5186e11a78ded404d3
+SHA1 (patch-ac) = 838800f64acfd524156bfa37d32ed9c47b42f020
+SHA1 (patch-ad) = d429ea0077d229ae03f20fe287b2ff84fe3a756c
+SHA1 (patch-ae) = 9ee94990ef630ccf7377a3d7ce7bed3cffa3f895
diff --git a/mail/hypermail/patches/patch-aa b/mail/hypermail/patches/patch-aa
index 41a982d2bd3..314ac0b02bd 100644
--- a/mail/hypermail/patches/patch-aa
+++ b/mail/hypermail/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2004/06/17 12:54:49 grant Exp $
+$NetBSD: patch-aa,v 1.4 2012/08/13 12:41:10 obache Exp $
 
---- configure.orig	2003-02-14 11:11:16.000000000 +1100
+--- configure.orig	2005-10-25 05:59:46.000000000 +0000
 +++ configure
-@@ -544,14 +544,6 @@ fi
+@@ -546,14 +546,6 @@ fi
  
  
  
diff --git a/mail/hypermail/patches/patch-ac b/mail/hypermail/patches/patch-ac
index 20002635b20..1c4d2b7d17e 100644
--- a/mail/hypermail/patches/patch-ac
+++ b/mail/hypermail/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.3 2004/10/20 10:10:47 grant Exp $
+$NetBSD: patch-ac,v 1.4 2012/08/13 12:41:10 obache Exp $
 
---- src/Makefile.in.orig	2003-07-04 08:23:07.000000000 +1000
+--- src/Makefile.in.orig	2007-02-16 19:53:00.000000000 +0000
 +++ src/Makefile.in
 @@ -24,15 +24,15 @@ CC=@CC@
  # Installation program to use
@@ -26,7 +26,7 @@ $NetBSD: patch-ac,v 1.3 2004/10/20 10:10:47 grant Exp $
  	$(CC) -c $(CFLAGS) $<
  
 -all:    pcre/.libs/libpcre.a @FNV_DEP@ hypermail$(SUFFIX) mail$(SUFFIX) lang$(SUFFIX)
-+all:    @FNV_DEP@ hypermail$(SUFFIX) mail$(SUFFIX) lang$(SUFFIX)
++all:    @FNV_DEP@ hypermail$(SUFFIX) lang$(SUFFIX)
  
  pcre/.libs/libpcre.a:
- 	@cd pcre; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)"
+ 	@cd pcre; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" ; rm -f .libs/lib*.so*
diff --git a/mail/hypermail/patches/patch-ad b/mail/hypermail/patches/patch-ad
index 37ebf723f3e..17cc47d7972 100644
--- a/mail/hypermail/patches/patch-ad
+++ b/mail/hypermail/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.2 2004/10/20 10:10:47 grant Exp $
+$NetBSD: patch-ad,v 1.3 2012/08/13 12:41:10 obache Exp $
 
---- src/proto.h.orig	2003-07-04 09:00:18.000000000 +1000
+--- src/proto.h.orig	2009-10-20 16:54:26.000000000 +0000
 +++ src/proto.h
-@@ -94,7 +94,9 @@ char *PushByte(struct Push *, char);
+@@ -104,7 +104,9 @@ char *PushByte(struct Push *, char);
  char *PushString(struct Push *, const char *);
  char *PushNString(struct Push *, const char *, int);
  
 +#ifndef HAVE_STRCASESTR
- char *strcasestr (char *, const char *);
+ char *strcasestr (const char *, const char *);
 +#endif
  char *strsav(const char *);
  char *strreplace(char *, char *);
diff --git a/mail/hypermail/patches/patch-ae b/mail/hypermail/patches/patch-ae
index b54f589d292..e914e9b962a 100644
--- a/mail/hypermail/patches/patch-ae
+++ b/mail/hypermail/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.1 2004/10/20 10:10:47 grant Exp $
+$NetBSD: patch-ae,v 1.2 2012/08/13 12:41:10 obache Exp $
 
---- Makefile.in.orig	2003-02-14 05:57:37.000000000 +1100
+--- Makefile.in.orig	2003-02-13 18:57:37.000000000 +0000
 +++ Makefile.in
 @@ -28,9 +28,9 @@ INSTALL_PROG=@INSTALL@