Update to 2.3.3. See docs/CHANGES.txt for details, although the

highlights are: code reworked to support internationalization;
fixed security hole; added directives 'remove resent' and 'extra header'.
Note to maintainer: since this PR was first filed a few months ago, there
is now yet another version -- 2.4.  We're getting caught up on these, though.
PR:		ports/54080
Submitted by:	Gianmarco Giovannelli <gmarco@giovannelli.it> (maintainer).

3 files changed, 35 insertions, 27 deletions

diff --git a/mail/minimalist/Makefile b/mail/minimalist/Makefile
index b6b1781aeaac..dbca66e758c7 100644
--- a/mail/minimalist/Makefile
+++ b/mail/minimalist/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	minimalist
-PORTVERSION=	2.2.2
+PORTVERSION=	2.3.3r3
 CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.mml.org.ua/pub/minimalist/ \
+MASTER_SITES=	http://www.mml.org.ua/LIST/ \
 		http://www.giovannelli.it/~gmarco/files/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/./-/g:S/-/./}
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/r/-/}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	gmarco@giovannelli.it
@@ -20,21 +20,25 @@ NO_BUILD=	yes
 USE_REINPLACE=	yes
 
 post-patch:
-	@(cd ${WRKSRC}; ${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},' README \
-		minimalist.conf-sample minimalist.pl)
+	@(cd ${WRKSRC}; ${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},' docs/README \
+		minimalist.conf-sample minimalist.pl contrib/minimalist_request.pl)
 
 do-install:
-	@${MKDIR} ${PREFIX}/minimalist/sample
-	@${INSTALL_SCRIPT} ${WRKSRC}/minimalist.pl ${PREFIX}/bin
-	@${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/minimalist/
-	@${INSTALL_DATA} ${WRKSRC}/CHANGES.txt ${PREFIX}/minimalist/
-	@${INSTALL_DATA} ${WRKSRC}/minimalist.conf-sample ${PREFIX}/minimalist
+	@${MKDIR} ${PREFIX}/share/minimalist/FAQ
+	@${MKDIR} ${PREFIX}/share/minimalist/FAQ
+	@${MKDIR} ${PREFIX}/share/minimalist/sample
+	@${INSTALL_SCRIPT} ${WRKSRC}/minimalist.pl ${PREFIX}/bin/
+	@${INSTALL_SCRIPT} ${WRKSRC}/contrib/* ${PREFIX}/bin/
+	@${INSTALL_DATA} ${WRKSRC}/minimalist.conf-sample ${PREFIX}/share/minimalist/
 	@${INSTALL_DATA} ${WRKSRC}/minimalist.conf-sample ${PREFIX}/etc/minimalist.conf-sample
-	@${INSTALL_DATA} ${WRKSRC}/docs/* ${PREFIX}/minimalist/
-	@${INSTALL_DATA} ${WRKSRC}/sample/lists.lst ${PREFIX}/minimalist/
-	@${INSTALL_DATA} ${WRKSRC}/sample/sample/* ${PREFIX}/minimalist/sample/
+	@${INSTALL_DATA} ${WRKSRC}/docs/CHANGES.txt ${PREFIX}/share/minimalist/
+	@${INSTALL_DATA} ${WRKSRC}/docs/README ${PREFIX}/share/minimalist/
+	@${INSTALL_DATA} ${WRKSRC}/docs/virtual-domains.txt ${PREFIX}/share/minimalist/
+	@${INSTALL_DATA} ${WRKSRC}/docs/FAQ/* ${PREFIX}/share/minimalist/FAQ/
+	@${INSTALL_DATA} ${WRKSRC}/sample/lists.lst ${PREFIX}/share/minimalist/list.lst-sample
+	@${INSTALL_DATA} ${WRKSRC}/sample/sample/* ${PREFIX}/share/minimalist/sample/
 	@${ECHO_MSG} "-------------------------------------------------------------------"
-	@${ECHO_MSG} "Minimalist files are in: ${PREFIX}/minimalist"
+	@${ECHO_MSG} "Minimalist files are in: ${PREFIX}/share/minimalist"
 	@${ECHO_MSG} "Minimalist binary is: ${PREFIX}/bin/minimalist.pl"
 	@${ECHO_MSG} "Minimalist main config is: ${PREFIX}/etc/minimalist.conf-sample"
 	@${ECHO_MSG} ""
@@ -43,11 +47,11 @@ do-install:
 	@${ECHO_MSG} "Edit the ${PREFIX}/etc/minimalist.conf-sample and then copy "
 	@${ECHO_MSG} "or rename it to ${PREFIX}/etc/minimalist.conf"
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Check the ${PREFIX}/minimalist/README file to know how to modify"
+	@${ECHO_MSG} "Check the ${PREFIX}/share/minimalist/README file to know how to modify"
 	@${ECHO_MSG} "aliases file"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "A sample configuration for a mailing list can be"
-	@${ECHO_MSG} "found in ${PREFIX}/minimalist/sample."
+	@${ECHO_MSG} "found in ${PREFIX}/share/minimalist/sample."
 	@${ECHO_MSG} "-------------------------------------------------------------------"
 
 .include <bsd.port.mk>
diff --git a/mail/minimalist/distinfo b/mail/minimalist/distinfo
index 1a12c3935ea7..da2cc29eab29 100644
--- a/mail/minimalist/distinfo
+++ b/mail/minimalist/distinfo
@@ -1 +1 @@
-MD5 (minimalist-2.2-2.tgz) = 0b133d07774e382d8907d0e4e9bafb6b
+MD5 (minimalist-2.3.3-3.tgz) = d9cc1b4e2a5f98b74525545e042e6390
diff --git a/mail/minimalist/pkg-plist b/mail/minimalist/pkg-plist
index 76ef80dfbb00..129165f67fee 100644
--- a/mail/minimalist/pkg-plist
+++ b/mail/minimalist/pkg-plist
@@ -1,12 +1,16 @@
 bin/minimalist.pl
+bin/minimalist_request.pl
 etc/minimalist.conf-sample
-minimalist/README
-minimalist/CHANGES.txt
-minimalist/lists.lst
-minimalist/minimalist.conf-sample
-minimalist/sample/config
-minimalist/sample/footer
-minimalist/sample/info
-minimalist/virtual-domains.txt
-@dirrm minimalist/sample
-@dirrm minimalist
+share/minimalist/FAQ/postfix.mailloop
+share/minimalist/FAQ/sendmail.smrsh
+share/minimalist/README
+share/minimalist/CHANGES.txt
+share/minimalist/list.lst-sample
+share/minimalist/minimalist.conf-sample
+share/minimalist/sample/config
+share/minimalist/sample/footer
+share/minimalist/sample/info
+share/minimalist/virtual-domains.txt
+@dirrm share/minimalist/FAQ
+@dirrm share/minimalist/sample
+@dirrm share/minimalist