6 files changed, 66 insertions, 31 deletions
diff --git a/mail/hypermail/Makefile b/mail/hypermail/Makefile
index 09f13e29ef1..fae9141f6bf 100644
--- a/mail/hypermail/Makefile
+++ b/mail/hypermail/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2004/10/03 00:12:53 tv Exp $
+# $NetBSD: Makefile,v 1.9 2004/10/20 10:10:47 grant Exp $
 #
 
-DISTNAME=	hypermail-2.1.7
-PKGREVISION=	1
+DISTNAME=	hypermail-2.1.8
 CATEGORIES=	mail www
 MASTER_SITES=	http://www.hypermail.org/dist/
 
@@ -15,9 +14,6 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-gdbm=${BUILDLINK_PREFIX.gdbm}
 CONFIGURE_ARGS+=	--with-htmldir=${PREFIX}/share/doc/html/hypermail
 
-pre-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/hypermail/images
-
 .include "../../databases/gdbm/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/hypermail/PLIST b/mail/hypermail/PLIST
index 932104d338e..ea6f896def9 100644
--- a/mail/hypermail/PLIST
+++ b/mail/hypermail/PLIST
@@ -1,13 +1,17 @@
-@comment $NetBSD: PLIST,v 1.2 2003/03/05 09:46:36 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/10/20 10:10:47 grant Exp $
 bin/hypermail
 bin/msg2archive
 bin/rdmsg
 man/man1/hypermail.1
 man/man4/hmrc.4
+share/doc/html/hypermail/archive_search.html
 share/doc/html/hypermail/customizing.html
 share/doc/html/hypermail/hmrc.html
+share/doc/html/hypermail/hr.yellow.png
+share/doc/html/hypermail/hypermail-faq.html
 share/doc/html/hypermail/hypermail.html
-share/doc/html/hypermail/images/hr.yellow.gif
-share/doc/html/hypermail/images/hypermail.gif
+share/doc/html/hypermail/hypermail.png
+share/doc/html/hypermail/stars.png
+@exec ${MKDIR} %D/share/doc/html/hypermail/images
 @dirrm share/doc/html/hypermail/images
 @dirrm share/doc/html/hypermail
diff --git a/mail/hypermail/distinfo b/mail/hypermail/distinfo
index b50c410e533..1aacffeb609 100644
--- a/mail/hypermail/distinfo
+++ b/mail/hypermail/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2004/09/08 13:09:54 sketch Exp $
+$NetBSD: distinfo,v 1.6 2004/10/20 10:10:47 grant Exp $
 
-SHA1 (hypermail-2.1.7.tar.gz) = cf30d00e662e4906e00946b2a4808103f22c347a
-Size (hypermail-2.1.7.tar.gz) = 990553 bytes
+SHA1 (hypermail-2.1.8.tar.gz) = acb357832c52c91e43f58d13e20c0599440d3df9
+Size (hypermail-2.1.8.tar.gz) = 1238173 bytes
 SHA1 (patch-aa) = c67e4a22cddee828d2c2039f1e4ca2a667ce48b8
-SHA1 (patch-ab) = 39283ed784c607f614d10ec5db49a49fa23aeaf8
-SHA1 (patch-ac) = 86509290456d71642f0f202d504ebcd65922785a
-SHA1 (patch-ad) = 19a1ff838d5b61029c4bdc88998cdd56f891e9d6
+SHA1 (patch-ac) = 0b173d255d0b6b4024ece4ce7fc4ea85ce6c2322
+SHA1 (patch-ad) = ec9220c81d8f8831ac66b1f9d4979523e631ddeb
+SHA1 (patch-ae) = 4e0f1054ead76f8cbff4eaceac926ff664c6a7ff
diff --git a/mail/hypermail/patches/patch-ac b/mail/hypermail/patches/patch-ac
index 33021cc5af9..20002635b20 100644
--- a/mail/hypermail/patches/patch-ac
+++ b/mail/hypermail/patches/patch-ac
@@ -1,13 +1,32 @@
-$NetBSD: patch-ac,v 1.2 2004/06/17 12:54:49 grant Exp $
+$NetBSD: patch-ac,v 1.3 2004/10/20 10:10:47 grant Exp $
 
---- src/Makefile.in.orig	2003-02-14 11:35:14.000000000 +1100
+--- src/Makefile.in.orig	2003-07-04 08:23:07.000000000 +1000
 +++ src/Makefile.in
-@@ -56,7 +56,7 @@ MAILOBJS=	mail.o ../libcgi/libcgi.a
+@@ -24,15 +24,15 @@ CC=@CC@
+ # Installation program to use
+ INSTALL_PROG=@INSTALL@ 
+ 
+-SPLINTFLAGS=-Ipcre 
++SPLINTFLAGS=
+  
+ #WNOERROR=-Werror
+ #WARNINGS=$(WNOERROR) -ansi -pedantic -Wall -Wtraditional -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline -Dlint
+ 
+-CFLAGS=@CFLAGS@ @INCLUDES@ -Ipcre -DTRIO_MINIMAL $(WARNINGS)
++CFLAGS=@CFLAGS@ @INCLUDES@ -DTRIO_MINIMAL $(WARNINGS)
+ YACC=@YACC@
+ NETLIBS=@LIBS@
+-LDFLAGS=@LDFLAGS@ -Lpcre/.libs
++LDFLAGS=@LDFLAGS@
+ MISC_LIBS= -lm -lpcre
+ OPT_LIBS=@EXTRA_LIBS@
+ 
+@@ -58,7 +58,7 @@ MAILOBJS=	mail.o ../libcgi/libcgi.a
  .c.o:
  	$(CC) -c $(CFLAGS) $<
  
--all:    pcre/libpcre.a @FNV_DEP@ hypermail$(SUFFIX) mail$(SUFFIX) lang$(SUFFIX)
+-all:    pcre/.libs/libpcre.a @FNV_DEP@ hypermail$(SUFFIX) mail$(SUFFIX) lang$(SUFFIX)
 +all:    @FNV_DEP@ hypermail$(SUFFIX) mail$(SUFFIX) lang$(SUFFIX)
  
- pcre/libpcre.a:
- 	@cd pcre; $(MAKE) libtool libpcre.a CC="$(CC)" CFLAGS="$(CFLAGS)"
+ pcre/.libs/libpcre.a:
+ 	@cd pcre; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)"
diff --git a/mail/hypermail/patches/patch-ad b/mail/hypermail/patches/patch-ad
index 02d2ee662a5..37ebf723f3e 100644
--- a/mail/hypermail/patches/patch-ad
+++ b/mail/hypermail/patches/patch-ad
@@ -1,14 +1,14 @@
-$NetBSD: patch-ad,v 1.1 2004/09/08 13:09:54 sketch Exp $
+$NetBSD: patch-ad,v 1.2 2004/10/20 10:10:47 grant Exp $
 
---- src/proto.h.orig	2004-09-08 14:03:21.000000000 +0100
-+++ src/proto.h	2004-09-08 14:03:36.000000000 +0100
-@@ -97,7 +97,9 @@
+--- src/proto.h.orig	2003-07-04 09:00:18.000000000 +1000
++++ src/proto.h
+@@ -94,7 +94,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 *);
++#endif
  char *strsav(const char *);
  char *strreplace(char *, char *);
  void strcpymax(char *, const char *, int);
-+#ifndef HAVE_STRCASESTR
- char *strcasestr(char *, const char *);
-+#endif
- char *stripzone(char *);
- int numstrchr(char *, char);
- char *getvalue(char *);
diff --git a/mail/hypermail/patches/patch-ae b/mail/hypermail/patches/patch-ae
new file mode 100644
index 00000000000..b54f589d292
--- /dev/null
+++ b/mail/hypermail/patches/patch-ae
@@ -0,0 +1,16 @@
+$NetBSD: patch-ae,v 1.1 2004/10/20 10:10:47 grant Exp $
+
+--- Makefile.in.orig	2003-02-14 05:57:37.000000000 +1100
++++ Makefile.in
+@@ -28,9 +28,9 @@ INSTALL_PROG=@INSTALL@
+  
+ # Compiler to use
+ CC=@CC@ 
+-CFLAGS=@CFLAGS@ @INCLUDES@ -Ipcre -DTRIO_MINIMAL $(WARNINGS)
++CFLAGS=@CFLAGS@ @INCLUDES@ -DTRIO_MINIMAL $(WARNINGS)
+ LIBS=@LIBS@
+-LDFLAGS=@LDFLAGS@ -Lpcre
++LDFLAGS=@LDFLAGS@
+ 
+ all:   hypermail support 
+