- update to 2.1.8

- use %%DOCSDIR%%

5 files changed, 34 insertions, 33 deletions

diff --git a/www/hypermail/Makefile b/www/hypermail/Makefile
index 95bb909e43e7..c51045b82d17 100644
--- a/www/hypermail/Makefile
+++ b/www/hypermail/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	hypermail
-PORTVERSION=	2.1.6
+PORTVERSION=	2.1.8
 CATEGORIES=	www mail
 MASTER_SITES=	http://isc.hypermail.org/dist/
 
diff --git a/www/hypermail/distinfo b/www/hypermail/distinfo
index eab225aa0ed6..e79cd656dafb 100644
--- a/www/hypermail/distinfo
+++ b/www/hypermail/distinfo
@@ -1 +1 @@
-MD5 (hypermail-2.1.6.tar.gz) = 461f37e29786924858ac32aa17d01862
+MD5 (hypermail-2.1.8.tar.gz) = bacd95589f2f3ca426631461fd9237dd
diff --git a/www/hypermail/files/patch-docs::Makefile.in b/www/hypermail/files/patch-docs::Makefile.in
index 5d78c465a566..23af9a78274a 100644
--- a/www/hypermail/files/patch-docs::Makefile.in
+++ b/www/hypermail/files/patch-docs::Makefile.in
@@ -1,20 +1,20 @@
-$FreeBSD$
-
---- docs/Makefile.in.old        Sun Feb  2 20:48:59 2003
-+++ docs/Makefile.in    Sun Feb  2 20:55:31 2003
-@@ -39,11 +39,15 @@
-	$(INSTALL_PROG) -c -m 0644 hmrc.4 $(mandir)/man4
-
+--- docs/Makefile.in.orig	Thu Apr 10 15:31:21 2003
++++ docs/Makefile.in	Thu Jan  8 00:25:29 2004
+@@ -41,7 +41,9 @@
+ 	$(INSTALL_PROG) -c -m 0644 hmrc.4 $(mandir)/man4
+ 
  install.html:
 +.if !defined(NOPORTDOCS)
-	@(if [ ! -d $(htmldir) ]; then mkdir -p $(htmldir); fi)
+ 	@(if [ ! -d $(htmldir) ]; then mkdir -p $(htmldir); fi)
 +	@(if [ ! -d $(imagedir) ]; then mkdir -p $(imagedir); fi)
-	$(INSTALL_PROG) -c -m 0644 hr.yellow.gif $(imagedir)
-	$(INSTALL_PROG) -c -m 0644 hypermail.gif $(imagedir)
-	$(INSTALL_PROG) -c -m 0644 hypermail.html $(htmldir)
-+	$(INSTALL_PROG) -c -m 0644 hypermail-faq.html $(htmldir)
-	$(INSTALL_PROG) -c -m 0644 customizing.html $(htmldir)
-	$(INSTALL_PROG) -c -m 0644 hmrc.html $(htmldir)
+ 	$(INSTALL_PROG) -c -m 0644 hr.yellow.png $(htmldir)
+ 	$(INSTALL_PROG) -c -m 0644 hypermail.png $(htmldir)
+ 	$(INSTALL_PROG) -c -m 0644 stars.png $(htmldir)
+@@ -50,6 +52,7 @@
+ 	$(INSTALL_PROG) -c -m 0644 hypermail-faq.html $(htmldir)
+ 	$(INSTALL_PROG) -c -m 0644 customizing.html $(htmldir)
+ 	$(INSTALL_PROG) -c -m 0644 hmrc.html $(htmldir)
 +.endif
-
+ 
  clean:
+ clobber:
diff --git a/www/hypermail/files/patch-src::proto.h b/www/hypermail/files/patch-src::proto.h
index 3c17c6afe68a..c66a4702a15c 100644
--- a/www/hypermail/files/patch-src::proto.h
+++ b/www/hypermail/files/patch-src::proto.h
@@ -1,11 +1,11 @@
---- src/proto.h.orig	Mon Dec 24 12:40:11 2001
-+++ src/proto.h	Mon Dec 24 12:40:19 2001
-@@ -88,7 +88,7 @@
+--- src/proto.h.orig	Thu Jul  3 18:00:18 2003
++++ src/proto.h	Thu Jan  8 00:27:25 2004
+@@ -94,7 +94,7 @@
+ char *PushString(struct Push *, const char *);
+ char *PushNString(struct Push *, const char *, int);
+ 
+-char *strcasestr (char *, const char *);
++// char *strcasestr (char *, const char *);
  char *strsav(const char *);
  char *strreplace(char *, char *);
  void strcpymax(char *, const char *, int);
--char *strcasestr(char *, const char *);
-+/* char *strcasestr(char *, const char *); */
- char *stripzone(char *);
- int numstrchr(char *, char);
- char *getvalue(char *);
diff --git a/www/hypermail/pkg-plist b/www/hypermail/pkg-plist
index e820ebf1c2fe..dd1be01afbd9 100644
--- a/www/hypermail/pkg-plist
+++ b/www/hypermail/pkg-plist
@@ -1,11 +1,12 @@
 bin/hypermail
 bin/msg2archive
 bin/rdmsg
-%%PORTDOCS%%share/doc/hypermail/customizing.html
-%%PORTDOCS%%share/doc/hypermail/hmrc.html
-%%PORTDOCS%%share/doc/hypermail/images/hr.yellow.gif
-%%PORTDOCS%%share/doc/hypermail/hypermail-faq.html
-%%PORTDOCS%%share/doc/hypermail/images/hypermail.gif
-%%PORTDOCS%%share/doc/hypermail/hypermail.html
-%%PORTDOCS%%@dirrm share/doc/hypermail/images
-%%PORTDOCS%%@dirrm share/doc/hypermail
+%%PORTDOCS%%%%DOCSDIR%%/archive_search.html
+%%PORTDOCS%%%%DOCSDIR%%/customizing.html
+%%PORTDOCS%%%%DOCSDIR%%/hmrc.html
+%%PORTDOCS%%%%DOCSDIR%%/hr.yellow.png
+%%PORTDOCS%%%%DOCSDIR%%/hypermail-faq.html
+%%PORTDOCS%%%%DOCSDIR%%/hypermail.html
+%%PORTDOCS%%%%DOCSDIR%%/hypermail.png
+%%PORTDOCS%%%%DOCSDIR%%/stars.png
+%%PORTDOCS%%@dirrm %%DOCSDIR%%