4 files changed, 45 insertions, 44 deletions

diff --git a/mail/postfixadmin/Makefile b/mail/postfixadmin/Makefile
index 76d17a64ff64..07538cd0bcf3 100644
--- a/mail/postfixadmin/Makefile
+++ b/mail/postfixadmin/Makefile
@@ -6,13 +6,15 @@
 #
 
 PORTNAME=	postfixadmin
-PORTVERSION=	2.2.1.1
+PORTVERSION=	2.3
 CATEGORIES=	mail www
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
+DISTNAME=	${PORTNAME}_${PORTVERSION}
 
-MAINTAINER=	terry@sucked-in.com
+MAINTAINER=	tabmow@freenode.net
 COMMENT=	PHP web-based management tool for Postfix virtual domains and users
 
+WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 NO_BUILD=	yes
 
 SUB_FILES+=	pkg-message
@@ -23,7 +25,7 @@ OPTIONS+=	PGSQL "PostgreSQL back-end (use pgsql PHP extension)" off
 
 .include <bsd.port.pre.mk>
 
-USE_PHP=	pcre session
+USE_PHP=	pcre session mbstring
 
 .if !defined(WITHOUT_MYSQL)
 USE_PHP+=	mysql
@@ -51,22 +53,24 @@ do-install:
 	@${MKDIR} ${PREFIX}/www/postfixadmin/admin
 	@${MKDIR} ${PREFIX}/www/postfixadmin/images
 	@${MKDIR} ${PREFIX}/www/postfixadmin/languages
+	@${MKDIR} ${PREFIX}/www/postfixadmin/model
 	@${MKDIR} ${PREFIX}/www/postfixadmin/templates
 	@${MKDIR} ${PREFIX}/www/postfixadmin/users
-	@${INSTALL_DATA} ${WRKSRC}/*.php ${PREFIX}/www/postfixadmin
+	(cd ${WRKSRC}/ && \
+	${COPYTREE_SHARE} \*.php ${PREFIX}/www/postfixadmin "! -name config.inc.php")
+	@${CP} ${WRKSRC}/config.inc.php ${PREFIX}/www/postfixadmin/config.inc.php.sample
+	@${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}/VIRTUAL_VACATION/* ${PREFIX}/www/postfixadmin/VIRTUAL_VACATION
 	@${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
 	@${INSTALL_DATA} ${WRKSRC}/languages/* ${PREFIX}/www/postfixadmin/languages
+	@${INSTALL_DATA} ${WRKSRC}/model/* ${PREFIX}/www/postfixadmin/model
 	@${INSTALL_DATA} ${WRKSRC}/templates/* ${PREFIX}/www/postfixadmin/templates
 	@${INSTALL_DATA} ${WRKSRC}/users/* ${PREFIX}/www/postfixadmin/users
-	@[ -f ${PREFIX}/www/postfixadmin/config.inc.php ] || \
-		${CP} ${PREFIX}/www/postfixadmin/config.inc.php.sample \
-			${PREFIX}/www/postfixadmin/config.inc.php
+	@${CP} -R ${WRKSRC}/VIRTUAL_VACATION/* ${PREFIX}/www/postfixadmin/VIRTUAL_VACATION
 
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
@@ -74,6 +78,9 @@ do-install:
 .endif
 
 post-install:
+	@if [ ! -f ${PREFIX}/www/postfixadmin/config.inc.php ]; then \
+		${CP} -p ${PREFIX}/www/postfixadmin/config.inc.php.sample ${PREFIX}/www/postfixadmin/config.inc.php ; \
+	fi
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/www/postfixadmin
 	@${CHMOD} 640 ${PREFIX}/www/postfixadmin/*.php ${PREFIX}/www/postfixadmin/css/*.css
 	@${CHMOD} 640 ${PREFIX}/www/postfixadmin/admin/*.php
diff --git a/mail/postfixadmin/distinfo b/mail/postfixadmin/distinfo
index 40db1480323d..fdc2538df083 100644
--- a/mail/postfixadmin/distinfo
+++ b/mail/postfixadmin/distinfo
@@ -1,3 +1,3 @@
-MD5 (postfixadmin-2.2.1.1.tar.gz) = d30f9b9ae5584308ad0cf84100f8ff24
-SHA256 (postfixadmin-2.2.1.1.tar.gz) = fbcebaf7dd607a8d7716f8ba14e352c515b30351cf52148298cd36a84ba803d7
-SIZE (postfixadmin-2.2.1.1.tar.gz) = 966600
+MD5 (postfixadmin_2.3.tar.gz) = a5f59a1f345a38bc01dd4f4d96bb7e1f
+SHA256 (postfixadmin_2.3.tar.gz) = e9fbb1dbb5567f01d87080427d42017c4afca85cfde5442219cb6b12023d1407
+SIZE (postfixadmin_2.3.tar.gz) = 1558791
diff --git a/mail/postfixadmin/files/patch-sendmail.php b/mail/postfixadmin/files/patch-sendmail.php
deleted file mode 100644
index 7e4790d4898f..000000000000
--- a/mail/postfixadmin/files/patch-sendmail.php
+++ /dev/null
@@ -1,24 +0,0 @@
---- sendmail.php	2007/12/02 13:59:33	250
-+++ sendmail.php	2008/06/29 16:11:37	396
-@@ -49,15 +49,20 @@
-    $fHeaders .= "MIME-Version: 1.0\n";
-    $fHeaders .= "Content-Type: text/plain; charset=utf-8\n";
-    $fHeaders .= "Content-Transfer-Encoding: 8bit\n";
-+   $fHeaders .= "\n";
- 
--   $fHeaders .= escape_string ($_POST['fBody']);
-+   $tBody = $_POST['fBody'];
-+   if (get_magic_quotes_gpc ())
-+   {
-+      $tBody = stripslashes($tBody);
-+   }
-+   $fHeaders .= $tBody;
- 
-    if (empty ($fTo) or !check_email ($fTo))
-    {
-       $error = 1;
-       $tTo = escape_string ($_POST['fTo']);
-       $tSubject = escape_string ($_POST['fSubject']);
--      $tBody = escape_string ($_POST['fBody']);
-       $tMessage = $PALANG['pSendmail_to_text_error'];
-    }
diff --git a/mail/postfixadmin/pkg-plist b/mail/postfixadmin/pkg-plist
index 22a48269333e..690eb19ce952 100644
--- a/mail/postfixadmin/pkg-plist
+++ b/mail/postfixadmin/pkg-plist
@@ -1,7 +1,7 @@
-www/postfixadmin/ADDITIONS/README.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/mailbox_remover.pl
 www/postfixadmin/ADDITIONS/mkeveryone.pl
@@ -10,23 +10,32 @@ 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
+www/postfixadmin/ADDITIONS/quota_usage.pl
+www/postfixadmin/ADDITIONS/README.TXT
 www/postfixadmin/ADDITIONS/virtualmaildel.php
-www/postfixadmin/CHANGELOG.TXT
-www/postfixadmin/GPL-LICENSE.TXT
-www/postfixadmin/INSTALL.TXT
-www/postfixadmin/LICENSE.TXT
+www/postfixadmin/VIRTUAL_VACATION/tests/asterisk-email.txt
+www/postfixadmin/VIRTUAL_VACATION/tests/facebook.txt
+www/postfixadmin/VIRTUAL_VACATION/tests/mailing-list.txt
+www/postfixadmin/VIRTUAL_VACATION/tests/mail-myself.txt
+www/postfixadmin/VIRTUAL_VACATION/tests/spam.txt
+www/postfixadmin/VIRTUAL_VACATION/tests/teodor-smtp-envelope-headers.txt
+www/postfixadmin/VIRTUAL_VACATION/tests/test.sh
+www/postfixadmin/VIRTUAL_VACATION/tests/test-email.txt
 www/postfixadmin/VIRTUAL_VACATION/FILTER_README
 www/postfixadmin/VIRTUAL_VACATION/INSTALL.TXT
 www/postfixadmin/VIRTUAL_VACATION/index.php
-www/postfixadmin/VIRTUAL_VACATION/mail-filter
 www/postfixadmin/VIRTUAL_VACATION/vacation.pl
+www/postfixadmin/CHANGELOG.TXT
+www/postfixadmin/GPL-LICENSE.TXT
+www/postfixadmin/INSTALL.TXT
+www/postfixadmin/LICENSE.TXT
 www/postfixadmin/admin/index.php
 www/postfixadmin/backup.php
 www/postfixadmin/broadcast-message.php
 www/postfixadmin/common.php
-www/postfixadmin/config.inc.php
 www/postfixadmin/create-admin.php
 www/postfixadmin/create-alias.php
+www/postfixadmin/create-alias-domain.php
 www/postfixadmin/create-domain.php
 www/postfixadmin/create-mailbox.php
 www/postfixadmin/css/default.css
@@ -97,15 +106,18 @@ www/postfixadmin/password.php
 www/postfixadmin/search.php
 www/postfixadmin/sendmail.php
 www/postfixadmin/setup.php
+www/postfixadmin/model/AliasHandler.php
+www/postfixadmin/model/UserHandler.php
+www/postfixadmin/model/VacationHandler.php
 www/postfixadmin/templates/admin_create-admin.php
 www/postfixadmin/templates/admin_create-domain.php
 www/postfixadmin/templates/admin_edit-admin.php
 www/postfixadmin/templates/admin_edit-domain.php
 www/postfixadmin/templates/admin_list-admin.php
 www/postfixadmin/templates/admin_list-domain.php
-www/postfixadmin/templates/admin_search.php
 www/postfixadmin/templates/broadcast-message.php
 www/postfixadmin/templates/create-alias.php
+www/postfixadmin/templates/create-alias-domain.php
 www/postfixadmin/templates/create-mailbox.php
 www/postfixadmin/templates/edit-alias.php
 www/postfixadmin/templates/edit-mailbox.php
@@ -140,6 +152,10 @@ www/postfixadmin/users/password.php
 www/postfixadmin/users/vacation.php
 www/postfixadmin/variables.inc.php
 www/postfixadmin/viewlog.php
+www/postfixadmin/xmlrpc.php
+@unexec if cmp -s %D/www/postfixadmin/config.inc.php.sample %D/www/postfixadmin/config.inc.php; then rm -f %D/www/postfixadmin/config.inc.php; fi
+www/postfixadmin/config.inc.php.sample
+@exec if [ ! -f %D/www/postfixadmin/config.inc.php ] ; then cp -p %D/%F %B/config.inc.php; fi
 %%PORTDOCS%%%%DOCSDIR%%/BACKUP_MX.txt
 %%PORTDOCS%%%%DOCSDIR%%/DOVECOT.txt
 %%PORTDOCS%%%%DOCSDIR%%/FAQ.txt
@@ -164,11 +180,13 @@ www/postfixadmin/viewlog.php
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/screenshots
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm www/postfixadmin/ADDITIONS
+@dirrm www/postfixadmin/VIRTUAL_VACATION/tests
 @dirrm www/postfixadmin/VIRTUAL_VACATION
 @dirrm www/postfixadmin/admin
 @dirrm www/postfixadmin/css
 @dirrm www/postfixadmin/images
 @dirrm www/postfixadmin/languages
+@dirrm www/postfixadmin/model/
 @dirrm www/postfixadmin/templates
 @dirrm www/postfixadmin/users
 @dirrm www/postfixadmin