4 files changed, 22 insertions, 9 deletions

diff --git a/mail/postfixadmin/Makefile b/mail/postfixadmin/Makefile
index 6f08681f736c..3d16c558e66a 100644
--- a/mail/postfixadmin/Makefile
+++ b/mail/postfixadmin/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	postfixadmin
-PORTVERSION=	2.3
-PORTREVISION=	1
+PORTVERSION=	2.3.2
 CATEGORIES=	mail www
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
-DISTNAME=	${PORTNAME}_${PORTVERSION}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}/${DISTNAME}
 
 MAINTAINER=	tabmow@freenode.net
 COMMENT=	PHP web-based management tool for Postfix virtual domains and users
@@ -47,9 +46,13 @@ IGNORE=	needs at least one database back-end
 post-patch:
 	@${FIND} ${WRKSRC} -name '*.orig' -delete
 
+pre-install:
+	@${RM} -rf ${WRKSRC}/ADDITIONS/squirrelmail-plugin
+
 do-install:
 	@${MKDIR} ${PREFIX}/www/postfixadmin/VIRTUAL_VACATION
 	@${MKDIR} ${PREFIX}/www/postfixadmin/ADDITIONS
+	@${MKDIR} ${PREFIX}/www/postfixadmin/ADDITIONS/cyrus
 	@${MKDIR} ${PREFIX}/www/postfixadmin/css
 	@${MKDIR} ${PREFIX}/www/postfixadmin/admin
 	@${MKDIR} ${PREFIX}/www/postfixadmin/images
@@ -63,7 +66,6 @@ do-install:
 	@${CP} -n ${WRKSRC}/config.inc.php ${PREFIX}/www/postfixadmin/config.inc.php
 	@${INSTALL_DATA} ${WRKSRC}/*.txt ${PREFIX}/www/postfixadmin
 	@${INSTALL_DATA} ${WRKSRC}/*.TXT ${PREFIX}/www/postfixadmin
-	@${INSTALL_DATA} ${WRKSRC}/ADDITIONS/* ${PREFIX}/www/postfixadmin/ADDITIONS
 	@${INSTALL_DATA} ${WRKSRC}/css/* ${PREFIX}/www/postfixadmin/css
 	@${INSTALL_DATA} ${WRKSRC}/admin/* ${PREFIX}/www/postfixadmin/admin
 	@${INSTALL_DATA} ${WRKSRC}/images/* ${PREFIX}/www/postfixadmin/images
@@ -72,6 +74,8 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/templates/* ${PREFIX}/www/postfixadmin/templates
 	@${INSTALL_DATA} ${WRKSRC}/users/* ${PREFIX}/www/postfixadmin/users
 	@${CP} -R ${WRKSRC}/VIRTUAL_VACATION/* ${PREFIX}/www/postfixadmin/VIRTUAL_VACATION
+	(cd ${WRKSRC}/ADDITIONS/ && \
+	${COPYTREE_SHARE} \* ${PREFIX}/www/postfixadmin/ADDITIONS/ "! -name squirrelmail-plugin")
 
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
diff --git a/mail/postfixadmin/distinfo b/mail/postfixadmin/distinfo
index fdc2538df083..15a68314c39e 100644
--- a/mail/postfixadmin/distinfo
+++ b/mail/postfixadmin/distinfo
@@ -1,3 +1,3 @@
-MD5 (postfixadmin_2.3.tar.gz) = a5f59a1f345a38bc01dd4f4d96bb7e1f
-SHA256 (postfixadmin_2.3.tar.gz) = e9fbb1dbb5567f01d87080427d42017c4afca85cfde5442219cb6b12023d1407
-SIZE (postfixadmin_2.3.tar.gz) = 1558791
+MD5 (postfixadmin-2.3.2.tar.gz) = d14a748049bebcc499578a3dd34a07b3
+SHA256 (postfixadmin-2.3.2.tar.gz) = 1729712448b732ecf6a8cfce3df262089899b520338e4fc26e876cac1de4a0c6
+SIZE (postfixadmin-2.3.2.tar.gz) = 1578191
diff --git a/mail/postfixadmin/files/pkg-message.in b/mail/postfixadmin/files/pkg-message.in
index 766fb69802aa..66a3faf6b04c 100644
--- a/mail/postfixadmin/files/pkg-message.in
+++ b/mail/postfixadmin/files/pkg-message.in
@@ -17,3 +17,4 @@ INSTALL / UPGRADE
 - Postfixadmin has brought about some changes, all database install/update scripts are now php web based
 - Browse to the webroot and run setup.php to install or update your current postfixadmin installation
 - For detailed information please read the INSTALL.TXT
+
diff --git a/mail/postfixadmin/pkg-plist b/mail/postfixadmin/pkg-plist
index 690eb19ce952..56af9c63e528 100644
--- a/mail/postfixadmin/pkg-plist
+++ b/mail/postfixadmin/pkg-plist
@@ -1,12 +1,19 @@
+www/postfixadmin/ADDITIONS/cyrus/Changelog
+www/postfixadmin/ADDITIONS/cyrus/cyrus-mailbox-postcreation.pl
+www/postfixadmin/ADDITIONS/cyrus/cyrus-mailbox-postdelete.pl
+www/postfixadmin/ADDITIONS/cyrus/cyrus-mailbox-postedit.pl
+www/postfixadmin/ADDITIONS/cyrus/cyrus.conf
+www/postfixadmin/ADDITIONS/cyrus/README.txt
+www/postfixadmin/ADDITIONS/cyrus/README-ES.txt
 www/postfixadmin/ADDITIONS/change_password.tgz
 www/postfixadmin/ADDITIONS/cleanupdirs.pl
 www/postfixadmin/ADDITIONS/convert-passwd-to-postfixadmin.pl
 www/postfixadmin/ADDITIONS/delete-mailq-by-domain.pl
 www/postfixadmin/ADDITIONS/fetchmail.pl
+www/postfixadmin/ADDITIONS/import_users_from_csv.py
 www/postfixadmin/ADDITIONS/mailbox_remover.pl
 www/postfixadmin/ADDITIONS/mkeveryone.pl
 www/postfixadmin/ADDITIONS/pfa_maildir_cleanup.pl
-www/postfixadmin/ADDITIONS/postfixadmin-0.3-1.4.tar.gz
 www/postfixadmin/ADDITIONS/postfixadmin-domain-postdeletion.sh
 www/postfixadmin/ADDITIONS/postfixadmin-mailbox-postcreation.sh
 www/postfixadmin/ADDITIONS/postfixadmin-mailbox-postdeletion.sh
@@ -179,6 +186,7 @@ www/postfixadmin/config.inc.php.sample
 %%PORTDOCS%%%%DOCSDIR%%/screenshots/postfixadmin-user-vacation.jpg
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/screenshots
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm www/postfixadmin/ADDITIONS/cyrus
 @dirrm www/postfixadmin/ADDITIONS
 @dirrm www/postfixadmin/VIRTUAL_VACATION/tests
 @dirrm www/postfixadmin/VIRTUAL_VACATION