Update to 2.1 + patch 26e.

OKed by:	MAINTAINER

4 files changed, 43 insertions, 23 deletions

diff --git a/mail/distribute/Makefile b/mail/distribute/Makefile
index 7132b032fa16..1f7233cdba01 100644
--- a/mail/distribute/Makefile
+++ b/mail/distribute/Makefile
@@ -6,16 +6,19 @@
 #
 
 PORTNAME=	distribute
-PORTVERSION=	2.1.24
+PORTVERSION= 	2.1.26
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.foretune.co.jp/pub/network/mail/distribute/
 DISTNAME=	${PORTNAME}-2.1-pl19
 
 PATCH_SITES=	${MASTER_SITES}BETA/
-PATCHFILES=	patch.20.gz patch.21e.gz patch.22e.gz patch.23e.gz patch.24e.gz
+PATCHFILES=	patch.20.gz patch.21e.gz patch.22e.gz patch.23e.gz \
+		patch.24e.gz patch.25e.gz patch.26e.gz
 
 MAINTAINER=	kuriyama@FreeBSD.org
 
+BUILD_DEPENDS=	${PREFIX}/lib/libmimekit.a:${PORTSDIR}/japanese/mimekit
+
 WRKSRC=		${WRKDIR}/distribute-pl19
 MAN1=		distribute.1
 DIST_SUBDIR=	distribute
@@ -28,17 +31,29 @@ MAJORDOMO_DIR=		${PREFIX}/majordomo	# mail/majordomo likes this
 MAJORDOMO_LIST_DIR=	${MAJORDOMO_DIR}/lists
 ARCHIVE_DIR=		/var/spool/mail-list
 DEF_DOMAINNAME=		your.domain.here
+DISTRIBUTE_OWNER=	majordom		# owner of distribute
+DISTRIBUTE_GROUP=	majordom		# group of distribute
 
 MAKE_ENV+=	DEFAULTCONFIG="-DDEF_SEQ_PATH=\\\"$(MAILINGLIST_DIR)\\\" \
 			-DDEF_RECIPIENT_PATH=\\\"$(MAILINGLIST_DIR)\\\" \
 			-DDEF_MAJORDOMO_RECIPIENT_PATH=\\\"$(MAJORDOMO_LIST_DIR)\\\" \
 			-DDEF_DOMAINNAME=\\\"$(DEF_DOMAINNAME)\\\" \
 			-DDEF_ARCHIVE_PATH=\\\"$(ARCHIVE_DIR)\\\"" \
+		DISTRIBUTE_OWNER="${DISTRIBUTE_OWNER}" \
+		DISTRIBUTE_GROUP="${DISTRIBUTE_GROUP}" \
 		INSTALL="${INSTALL}" \
 		INSTALL_MAN="${INSTALL_MAN}"
 
 post-build: message
 post-install: message
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${PREFIX}/share/doc/distribute
+	@ for file in BugList COPYRIGHT CREDITS ChangeLog INSTALL.JP NEWS \
+	  OPTIONS README README.FIRST ToDo; do \
+	    ${INSTALL_DATA} ${WRKSRC}/$$file ${PREFIX}/share/doc/distribute; \
+	done
+.endif
+
 message::
 	@${ECHO} "===> distribute was compiled with the following configuration:"
 	@${ECHO} "     membership file directory: ${MAILINGLIST_DIR}"
diff --git a/mail/distribute/distinfo b/mail/distribute/distinfo
index 9c5912eec726..55a1f478615a 100644
--- a/mail/distribute/distinfo
+++ b/mail/distribute/distinfo
@@ -4,3 +4,5 @@ MD5 (distribute/patch.21e.gz) = e9465e3a1f34d9fd6a5d40704024e3a7
 MD5 (distribute/patch.22e.gz) = 44e86eed0bb78522a2a5eab0dc8cb1dd
 MD5 (distribute/patch.23e.gz) = fb7043530b09b391568ee72f36cba2c0
 MD5 (distribute/patch.24e.gz) = 078daebdd79c62374f6c20c76a7c0c97
+MD5 (distribute/patch.25e.gz) = 5ebd709e50301105d613a1fd36f32464
+MD5 (distribute/patch.26e.gz) = d9ab9c605893c35d3f39b8beae9a9520
diff --git a/mail/distribute/files/patch-aa b/mail/distribute/files/patch-aa
index 117a4d620a54..d82023d1657b 100644
--- a/mail/distribute/files/patch-aa
+++ b/mail/distribute/files/patch-aa
@@ -1,27 +1,19 @@
---- Makefile.orig	Thu Oct  2 01:18:07 1997
-+++ Makefile	Thu Oct  2 01:21:10 1997
-@@ -66,7 +66,7 @@
- ##	-DDEF_ALIAS_CHAR_OPTION=\"b\"
+--- Makefile.orig	Thu Apr 11 11:25:35 2002
++++ Makefile	Thu Apr 11 11:27:10 2002
+@@ -85,16 +85,16 @@
+ #-D__USE_FIXED_PROTOTYPES__
  
- #
--DESTDIR=
-+DESTDIR= ${PREFIX}
- #
- CFLAGS=	-g ${OPTIONS} ${DEFAULTCONFIG} ${RCONFIG}
- # -Wall
-@@ -75,8 +75,8 @@
- MAKE=	make
- CC= 	${PURIFY} ${PURIFYOPTS} cc 
- 
--WHERE=	/usr/local/libexec
--MANDIR=	/usr/local/man
-+WHERE=	/sbin
-+MANDIR=	/man
+ PREFIX= /usr/local
+-WHERE=	${PREFIX}/libexec
++WHERE=	${PREFIX}/sbin
+ MANDIR=	${PREFIX}/man
  MANSEC=	1
  
  # Install as
-@@ -84,7 +84,7 @@
- GROUP=	daemon
+-OWNER=	daemon
+-GROUP=	daemon
++OWNER=	${DISTRIBUTE_OWNER}
++GROUP=	${DISTRIBUTE_GROUP}
  
  # install
 -INSTALL= install -c
@@ -29,7 +21,7 @@
  
  # perl
  PERL=perl
-@@ -130,11 +130,11 @@
+@@ -140,11 +140,11 @@
  	@size xarchive
  
  install: xdistribute distribute.1 xarchive
diff --git a/mail/distribute/pkg-plist b/mail/distribute/pkg-plist
index 601331738857..912db23496d5 100644
--- a/mail/distribute/pkg-plist
+++ b/mail/distribute/pkg-plist
@@ -1,2 +1,13 @@
 sbin/distribute
 sbin/archive
+%%PORTDOCS%%share/doc/distribute/BugList
+%%PORTDOCS%%share/doc/distribute/COPYRIGHT
+%%PORTDOCS%%share/doc/distribute/CREDITS
+%%PORTDOCS%%share/doc/distribute/ChangeLog
+%%PORTDOCS%%share/doc/distribute/INSTALL.JP
+%%PORTDOCS%%share/doc/distribute/NEWS
+%%PORTDOCS%%share/doc/distribute/OPTIONS
+%%PORTDOCS%%share/doc/distribute/README
+%%PORTDOCS%%share/doc/distribute/README.FIRST
+%%PORTDOCS%%share/doc/distribute/ToDo
+@dirrm share/doc/distribute