- Update to 2.2.1

3 files changed, 80 insertions, 64 deletions

diff --git a/mail/vexim/Makefile b/mail/vexim/Makefile
index d5ef5902e7de..4b3370d67ac8 100644
--- a/mail/vexim/Makefile
+++ b/mail/vexim/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	vexim
-PORTVERSION=	2.0.1
-PORTREVISION=	1
+PORTVERSION=	2.2.1
 CATEGORIES=	mail www
 MASTER_SITES=	http://silverwraith.com/vexim/
 DISTNAME=	${PORTNAME}${PORTVERSION}
@@ -44,18 +43,21 @@ post-patch:
 do-install:
 	@${ECHO} "Installing in ${VEXIMDIR}"
 	${MKDIR} ${PREFIX}/${VEXIMDIR}
-	cd ${WRKSRC}/vexim && ${FIND} . \
+	cd ${WRKSRC}/vexim && ${FIND} . \! -path '*.svn*' \
 		-type d -exec ${MKDIR} ${PREFIX}/${VEXIMDIR}/{} \;  \
-		-o -type f -exec ${INSTALL_DATA} {} ${PREFIX}/${VEXIMDIR}/{} \;
+		-o \! -path '*.svn*' -type f \
+		-exec ${INSTALL_DATA} {} ${PREFIX}/${VEXIMDIR}/{} \;
 	${MKDIR} ${DATADIR}
-	cd ${WRKSRC}/setup && ${FIND} . \
+	cd ${WRKSRC}/setup && ${FIND} . \! -path '*.svn*' \
 		-type d -exec ${MKDIR} ${DATADIR}/{} \; \
-		-o -type f -exec ${INSTALL_DATA} {} ${DATADIR}/{} \;
+		-o \! -path '*.svn*' -type f \
+		-exec ${INSTALL_DATA} {} ${DATADIR}/{} \;
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${FIND} docs \
+	cd ${WRKSRC} && ${FIND} docs \! -path '*.svn*' \
 		-type d -exec ${MKDIR} ${DOCSDIR}/{} \; \
-		-o -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \;
+		-o \! -path '*.svn*' -type f \
+		-exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \;
 .for i in INSTALL LICENSE README TODO
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
diff --git a/mail/vexim/distinfo b/mail/vexim/distinfo
index 0176d823bcd5..66485cf7789c 100644
--- a/mail/vexim/distinfo
+++ b/mail/vexim/distinfo
@@ -1,3 +1,3 @@
-MD5 (vexim2.0.1.tar.gz) = e0e667e64bc578f64d87d20b749c67d5
-SHA256 (vexim2.0.1.tar.gz) = a30a9acd6d81dee9a3a72fc7444266505ad79c10166d9a041e6f60b8316bcb68
-SIZE (vexim2.0.1.tar.gz) = 87667
+MD5 (vexim2.2.1.tar.gz) = ddb810b1ebf14b70dd48765764e07ee3
+SHA256 (vexim2.2.1.tar.gz) = 6f057b6c008cacb9d9dbb7c2b69c3c4b4be43f3d2f3d9db811c8ba43ad073a79
+SIZE (vexim2.2.1.tar.gz) = 232441
diff --git a/mail/vexim/pkg-plist b/mail/vexim/pkg-plist
index a78eca1262c2..348e61d6857e 100644
--- a/mail/vexim/pkg-plist
+++ b/mail/vexim/pkg-plist
@@ -17,76 +17,90 @@
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-www/vexim/locale/en_EN/LC_MESSAGES/en.po
-www/vexim/locale/en_EN/LC_MESSAGES/messages.mo
-www/vexim/locale/ro_RO/LC_MESSAGES/messages.mo
-www/vexim/locale/ro_RO/LC_MESSAGES/ro.po
-www/vexim/locale/hu_HU/LC_MESSAGES/hu.po
-www/vexim/locale/hu_HU/LC_MESSAGES/messages.mo
-www/vexim/locale/de_DE/LC_MESSAGES/de.po
-www/vexim/locale/de_DE/LC_MESSAGES/messages.mo
-www/vexim/images/check.gif
-www/vexim/images/trashcan.gif
+%%PORTDOCS%%%%DOCSDIR%%/docs/vexim-group-router.conf
+%%PORTDOCS%%%%DOCSDIR%%/docs/vexim-group.txt
+www/vexim/admin.php
+www/vexim/adminalias.php
+www/vexim/adminaliasadd.php
+www/vexim/adminaliasaddsubmit.php
+www/vexim/adminaliaschange.php
+www/vexim/adminaliaschangesubmit.php
+www/vexim/adminaliasdelete.php
+www/vexim/admincatchall.php
+www/vexim/admincatchalladd.php
+www/vexim/admincatchallsubmit.php
+www/vexim/adminfail.php
+www/vexim/adminfailadd.php
+www/vexim/adminfailaddsubmit.php
+www/vexim/adminfailchange.php
+www/vexim/adminfailchangesubmit.php
+www/vexim/adminfaildelete.php
+www/vexim/admingroup.php
+www/vexim/admingroupadd.php
+www/vexim/admingroupaddsubmit.php
+www/vexim/admingroupchange.php
+www/vexim/admingroupchangesubmit.php
+www/vexim/admingroupcontentaddsubmit.php
+www/vexim/admingroupcontentdeletesubmit.php
+www/vexim/admingroupdelete.php
+www/vexim/adminlists.php
+www/vexim/adminuser.php
+www/vexim/adminuseradd.php
+www/vexim/adminuseraddsubmit.php
+www/vexim/adminuserblocksubmit.php
+www/vexim/adminuserchange.php
+www/vexim/adminuserchangesubmit.php
+www/vexim/adminuserdelete.php
 www/vexim/config/authpostmaster.php
 www/vexim/config/authsite.php
 www/vexim/config/authuser.php
+www/vexim/config/en.po
 www/vexim/config/functions.php
 www/vexim/config/header.php
-www/vexim/config/variables.php
-www/vexim/config/en.po
+www/vexim/config/httpheaders.php
+www/vexim/config/hu.po
 www/vexim/config/i18n.php
 www/vexim/config/template.pot
-www/vexim/config/hu.po
-www/vexim/config/httpheaders.php
-www/vexim/sitepasswordsubmit.php
-www/vexim/sitepassword.php
-www/vexim/sitedelete.php
-www/vexim/sitechangesubmit.php
-www/vexim/sitechange.php
-www/vexim/siteaddsubmit.php
-www/vexim/siteadd.php
-www/vexim/site.php
-www/vexim/logout.php
-www/vexim/login.php
+www/vexim/config/variables.php
+www/vexim/images/check.gif
+www/vexim/images/trashcan.gif
 www/vexim/index.php
-www/vexim/adminuserdelete.php
-www/vexim/adminuserchangesubmit.php
-www/vexim/adminuserchange.php
-www/vexim/adminuserblocksubmit.php
-www/vexim/adminuseraddsubmit.php
-www/vexim/adminuseradd.php
-www/vexim/adminuser.php
-www/vexim/adminlists.php
-www/vexim/adminfaildelete.php
-www/vexim/adminfailchangesubmit.php
-www/vexim/adminfailchange.php
-www/vexim/adminfailaddsubmit.php
-www/vexim/adminfailadd.php
-www/vexim/adminfail.php
-www/vexim/admincatchallsubmit.php
-www/vexim/admincatchalladd.php
-www/vexim/admincatchall.php
-www/vexim/adminaliasdelete.php
-www/vexim/adminaliaschangesubmit.php
-www/vexim/userchangesubmit.php
-www/vexim/adminaliasaddsubmit.php
-www/vexim/adminaliasadd.php
-www/vexim/adminalias.php
-www/vexim/admin.php
-www/vexim/adminaliaschange.php
-www/vexim/userchange.php
-www/vexim/userblocksubmit.php
+www/vexim/locale/de_DE/LC_MESSAGES/de.po
+www/vexim/locale/de_DE/LC_MESSAGES/messages.mo
+www/vexim/locale/en_EN/LC_MESSAGES/en.po
+www/vexim/locale/en_EN/LC_MESSAGES/messages.mo
+www/vexim/locale/es_ES/LC_MESSAGES/es.po
+www/vexim/locale/es_ES/LC_MESSAGES/messages.mo
+www/vexim/locale/hu_HU/LC_MESSAGES/hu.po
+www/vexim/locale/hu_HU/LC_MESSAGES/messages.mo
+www/vexim/locale/ro_RO/LC_MESSAGES/messages.mo
+www/vexim/locale/ro_RO/LC_MESSAGES/ro.po
+www/vexim/login.php
+www/vexim/logout.php
+www/vexim/site.php
+www/vexim/siteadd.php
+www/vexim/siteaddsubmit.php
+www/vexim/sitechange.php
+www/vexim/sitechangesubmit.php
+www/vexim/sitedelete.php
+www/vexim/sitepassword.php
+www/vexim/sitepasswordsubmit.php
 www/vexim/style.css
+www/vexim/userblocksubmit.php
+www/vexim/userchange.php
+www/vexim/userchangesubmit.php
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/clients
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm www/vexim/locale/en_EN/LC_MESSAGES
-@dirrm www/vexim/locale/en_EN
 @dirrm www/vexim/locale/ro_RO/LC_MESSAGES
 @dirrm www/vexim/locale/ro_RO
 @dirrm www/vexim/locale/hu_HU/LC_MESSAGES
 @dirrm www/vexim/locale/hu_HU
+@dirrm www/vexim/locale/es_ES/LC_MESSAGES
+@dirrm www/vexim/locale/es_ES
+@dirrm www/vexim/locale/en_EN/LC_MESSAGES
+@dirrm www/vexim/locale/en_EN
 @dirrm www/vexim/locale/de_DE/LC_MESSAGES
 @dirrm www/vexim/locale/de_DE
 @dirrm www/vexim/locale