6 files changed, 53 insertions, 60 deletions

diff --git a/www/hypermail/Makefile b/www/hypermail/Makefile
index aac2f763e70d..cf511989da4b 100644
--- a/www/hypermail/Makefile
+++ b/www/hypermail/Makefile
@@ -1,20 +1,19 @@
 # New ports collection makefile for:	hypermail
-# Version required:			20b3
+# Version required:			2b28
 # Date created:				23 Dec 1997
 # Whom:					mjhsieh
 #
 # $FreeBSD$
 #
 
-DISTNAME=       hypermail
-PKGNAME= 	hypermail-${HYPERMAIL_VERSION}
-CATEGORIES=     www
-MASTER_SITES=   ftp://ftp.landfield.com/hypermail/ \
+DISTNAME= 	hypermail-${HYPERMAIL_VERSION}
+CATEGORIES=	www
+MASTER_SITES=	ftp://ftp.landfield.com/hypermail/ \
 		ftp://ftp.faqs.org/hypermail/
 
-MAINTAINER=     veers@disturbed.net
+MAINTAINER=	veers@disturbed.net
 
-HYPERMAIL_VERSION=	20b3
+HYPERMAIL_VERSION=	2b28
 WRKSRC=		${WRKDIR}/hypermail-${HYPERMAIL_VERSION}
 HAS_CONFIGURE=  yes
 
diff --git a/www/hypermail/distinfo b/www/hypermail/distinfo
index 3ed91498a833..ff465624f9a5 100644
--- a/www/hypermail/distinfo
+++ b/www/hypermail/distinfo
@@ -1 +1 @@
-MD5 (hypermail.tar.gz) = 81c7e1eb1e7d483bb2dadfd348e9dcb6
+MD5 (hypermail-2b28.tar.gz) = 1ec78d8b6ea22dd4b2486b10424482c4
diff --git a/www/hypermail/files/patch-ac b/www/hypermail/files/patch-ac
index 3cef7639cd73..6a2249f8cbe0 100644
--- a/www/hypermail/files/patch-ac
+++ b/www/hypermail/files/patch-ac
@@ -1,14 +1,11 @@
-diff -r -u ../hypermail-orig/Makefile.in ./Makefile.in
---- Makefile.in	Thu Aug 20 23:12:36 1998
-+++ Makefile.in	Tue Jan  5 06:52:58 1988
-@@ -22,7 +22,7 @@
- # Compiler to use
- CC=@CC@
+--- Makefile.in	Mon Nov 22 16:08:43 1999
++++ Makefile.in.new	Mon Nov 22 16:08:24 1999
+@@ -28,7 +28,7 @@
   
--CFLAGS=@CFLAGS@
-+CFLAGS?=@CFLAGS@
+ # Compiler to use
+ CC=@CC@ 
+-CFLAGS=@CFLAGS@ $(WARNINGS)
++CFLAGS?=@CFLAGS@ $(WARNINGS)
+ LIBS=@LIBS@
  LDFLAGS=@LDFLAGS@
  
- all:   hypermail support 
-
-diff -r -u ../hypermail-orig/configure ./configure
diff --git a/www/hypermail/files/patch-ae b/www/hypermail/files/patch-ae
index 6b4c621058c6..1622ebc620de 100644
--- a/www/hypermail/files/patch-ae
+++ b/www/hypermail/files/patch-ae
@@ -1,22 +1,20 @@
-diff -r -u ../hypermail-orig/src/Makefile.in ./src/Makefile.in
---- src/Makefile.in	Thu Aug 20 23:12:36 1998
-+++ src/Makefile.in	Tue Jan  5 06:53:02 1988
-@@ -16,7 +16,7 @@
+--- 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
  
- CC=@CC@
-  
--CFLAGS=@CFLAGS@
-+CFLAGS?=@CFLAGS@
- LDFLAGS=@LDFLAGS@
-  
+-CFLAGS=@CFLAGS@ $(WARNINGS)
++CFLAGS?=@CFLAGS@ $(WARNINGS)
+ YACC=@YACC@
  NETLIBS=@LIBS@
-@@ -50,7 +50,7 @@
- 
- $(OBJS): Makefile $(INCS)
+ LDFLAGS=@LDFLAGS@
+@@ -70,7 +70,7 @@
+ 	$(YACC) getdate.y
+ 	@mv -f y.tab.c getdate.c
  
 -install: all
-+install: 
- 	install -c -m 0755 hypermail $(bindir)
++install:
+ 	@if [ ! -d $(bindir) ]; then mkdir -p $(bindir); fi
+ 	$(INSTALL_PROG) -s -c -m 0755 hypermail$(SUFFIX) $(bindir)
  
- mail.install:
-
diff --git a/www/hypermail/files/patch-af b/www/hypermail/files/patch-af
index 9ebd53695fdb..48c44a74cd60 100644
--- a/www/hypermail/files/patch-af
+++ b/www/hypermail/files/patch-af
@@ -1,30 +1,29 @@
-diff -r -u ../hypermail-orig/archive/Makefile.in archive/Makefile.in
---- ../hypermail-orig/archive/Makefile.in	Thu Aug 20 23:12:36 1998
-+++ archive/Makefile.in	Tue Jan  5 08:21:50 1988
-@@ -11,7 +11,7 @@
+--- 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@
-  
+ CC=@CC@ $(WARNINGS)
 -CFLAGS=@CFLAGS@
 +CFLAGS?=@CFLAGS@
+ INSTALL_PROG=@INSTALL@
  
  ###################################################
+@@ -25,7 +25,7 @@
  #
-@@ -24,7 +24,7 @@
- # This is a SAMPLE file.
+ # PLEASE read the README in this directory before continuing.
  
- # PROGS = hmail hrdmsg isnmail isn-rdmsg wuftpdmail wu-rdmsg nu-mail nu-rdmsg na-mail na-rdmsg
--PROGS = htestmail htestrdmsg 
-+PROGS = 
+-PROGS = msg2archive$(SUFFIX) rdmsg$(SUFFIX)
++PROGS =
  
  all: $(PROGS) 
  
-@@ -75,7 +75,7 @@
- 	lint $(LINT_FLAGS) $(SOURCE) | tee Lint.out
+@@ -48,7 +48,7 @@
+ 	rm -f $(OBJS) Lint.out
+ 	rm -f $(PROGS)
  
- #install: $(bindir)/isnmail $(bindir)/isn-rdmsg
--install: $(bindir)/hmail $(bindir)/hrdmsg
-+install: 
+-install: $(bindir)/msg2archive$(SUFFIX) $(bindir)/rdmsg$(SUFFIX)
++install:
  
- install_all: \
- 	$(bindir)/hmail \
+ $(bindir)/msg2archive$(SUFFIX):  msg2archive$(SUFFIX)
+ 	@if [ ! -d $(bindir) ]; then mkdir $(bindir); fi
diff --git a/www/hypermail/pkg-plist b/www/hypermail/pkg-plist
index 6f6534b021fc..45fce8ddf470 100644
--- a/www/hypermail/pkg-plist
+++ b/www/hypermail/pkg-plist
@@ -1,7 +1,7 @@
 bin/hypermail
-share/doc/hypermail/hypermail.gif
-share/doc/hypermail/hypermail.html
-share/doc/hypermail/customizing.html
-share/doc/hypermail/hr.yellow.gif
-share/doc/hypermail/hmrc.html
-@dirrm share/doc/hypermail
+apache/htdocs/hypermail/hr.yellow.gif
+apache/htdocs/hypermail/hypermail.gif
+apache/htdocs/hypermail/hypermail.html
+apache/htdocs/hypermail/customizing.html
+apache/htdocs/hypermail/hmrc.html
+@dirrm apache/htdocs/hypermail