7 files changed, 22 insertions, 73 deletions

diff --git a/www/hypermail/Makefile b/www/hypermail/Makefile
index d5544c3a505a..bf74f3397470 100644
--- a/www/hypermail/Makefile
+++ b/www/hypermail/Makefile
@@ -6,15 +6,19 @@
 #
 
 PORTNAME=	hypermail
-PORTVERSION=	2b30
-CATEGORIES=	www
-MASTER_SITES=	ftp://ftp.landfield.com/hypermail/ \
-		ftp://ftp.faqs.org/hypermail/
+PORTVERSION=	2.1.1
+CATEGORIES=	www mail
+MASTER_SITES=	http://www.landfield.com/hypermail/dist/
 
-MAINTAINER=	veers@disturbed.net
+MAINTAINER=	petef@databit.net
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--with-htmldir=${PREFIX}/share/hypermail
+CONFIGURE_ARGS=	--with-htmldir=${PREFIX}/share/doc/hypermail
+
+.if defined(WITH_GDBM)
+CONFIGURE_ARGS+=	--with-gdbm
+LIB_DEPENDS+=	gdbm.2:${PORTSDIR}/databases/gdbm
+.endif
 
 MAN1=		hypermail.1
 MAN4=		hmrc.4
diff --git a/www/hypermail/distinfo b/www/hypermail/distinfo
index e11022da8ed7..ac0f9a128fbb 100644
--- a/www/hypermail/distinfo
+++ b/www/hypermail/distinfo
@@ -1 +1 @@
-MD5 (hypermail-2b30.tar.gz) = 5baf7d89bd3bd80ca7e0dff5a6ed98f9
+MD5 (hypermail-2.1.1.tar.gz) = ed4386bba50790b67c9985c2286b2023
diff --git a/www/hypermail/files/patch-ac b/www/hypermail/files/patch-ac
deleted file mode 100644
index 6a2249f8cbe0..000000000000
--- a/www/hypermail/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in	Mon Nov 22 16:08:43 1999
-+++ Makefile.in.new	Mon Nov 22 16:08:24 1999
-@@ -28,7 +28,7 @@
-  
- # Compiler to use
- CC=@CC@ 
--CFLAGS=@CFLAGS@ $(WARNINGS)
-+CFLAGS?=@CFLAGS@ $(WARNINGS)
- LIBS=@LIBS@
- LDFLAGS=@LDFLAGS@
- 
diff --git a/www/hypermail/files/patch-ae b/www/hypermail/files/patch-ae
deleted file mode 100644
index 1622ebc620de..000000000000
--- a/www/hypermail/files/patch-ae
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/Makefile.in.orig	Mon Nov 22 15:37:06 1999
-+++ src/Makefile.in	Sun Dec 12 20:56:59 1999
-@@ -27,7 +27,7 @@
- #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@ $(WARNINGS)
-+CFLAGS?=@CFLAGS@ $(WARNINGS)
- YACC=@YACC@
- NETLIBS=@LIBS@
- LDFLAGS=@LDFLAGS@
-@@ -70,7 +70,7 @@
- 	$(YACC) getdate.y
- 	@mv -f y.tab.c getdate.c
- 
--install: all
-+install:
- 	@if [ ! -d $(bindir) ]; then mkdir -p $(bindir); fi
- 	$(INSTALL_PROG) -s -c -m 0755 hypermail$(SUFFIX) $(bindir)
- 
diff --git a/www/hypermail/files/patch-af b/www/hypermail/files/patch-af
deleted file mode 100644
index 48c44a74cd60..000000000000
--- a/www/hypermail/files/patch-af
+++ /dev/null
@@ -1,29 +0,0 @@
---- archive/Makefile.in	Wed Nov 17 17:44:29 1999
-+++ archive/Makefile.in.new	Mon Nov 22 16:21:56 1999
-@@ -14,7 +14,7 @@
- #WARNINGS=$(WNOERROR) -ansi -pedantic -Wall -Wtraditional -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline -Dlint
- 
- CC=@CC@ $(WARNINGS)
--CFLAGS=@CFLAGS@
-+CFLAGS?=@CFLAGS@
- INSTALL_PROG=@INSTALL@
- 
- ###################################################
-@@ -25,7 +25,7 @@
- #
- # PLEASE read the README in this directory before continuing.
- 
--PROGS = msg2archive$(SUFFIX) rdmsg$(SUFFIX)
-+PROGS =
- 
- all: $(PROGS) 
- 
-@@ -48,7 +48,7 @@
- 	rm -f $(OBJS) Lint.out
- 	rm -f $(PROGS)
- 
--install: $(bindir)/msg2archive$(SUFFIX) $(bindir)/rdmsg$(SUFFIX)
-+install:
- 
- $(bindir)/msg2archive$(SUFFIX):  msg2archive$(SUFFIX)
- 	@if [ ! -d $(bindir) ]; then mkdir $(bindir); fi
diff --git a/www/hypermail/pkg-descr b/www/hypermail/pkg-descr
index 0cdf020926d0..69bca0b0dd85 100644
--- a/www/hypermail/pkg-descr
+++ b/www/hypermail/pkg-descr
@@ -7,3 +7,6 @@ incrementally updated, and Hypermail is set by default to only update
 archives when changes are detected.
 
 WWW: http://www.landfield.com/hypermail/
+
+- Pete
+petef@databits.net
diff --git a/www/hypermail/pkg-plist b/www/hypermail/pkg-plist
index 014d136300bb..bd7362ab05dd 100644
--- a/www/hypermail/pkg-plist
+++ b/www/hypermail/pkg-plist
@@ -1,7 +1,9 @@
 bin/hypermail
-share/hypermail/hr.yellow.gif
-share/hypermail/hypermail.gif
-share/hypermail/hypermail.html
-share/hypermail/customizing.html
-share/hypermail/hmrc.html
-@dirrm share/hypermail
+bin/msg2archive
+bin/rdmsg
+%%PORTDOCS%%share/doc/hypermail/customizing.html
+%%PORTDOCS%%share/doc/hypermail/hmrc.html
+%%PORTDOCS%%share/doc/hypermail/hr.yellow.gif
+%%PORTDOCS%%share/doc/hypermail/hypermail-faq.html
+%%PORTDOCS%%share/doc/hypermail/hypermail.gif
+%%PORTDOCS%%@dirrm share/doc/hypermail