3 files changed, 34 insertions, 35 deletions

diff --git a/mail/postfixadmin/Makefile b/mail/postfixadmin/Makefile
index 0cc59c06c8a2..04399ace4293 100644
--- a/mail/postfixadmin/Makefile
+++ b/mail/postfixadmin/Makefile
@@ -6,16 +6,14 @@
 #
 
 PORTNAME=	postfixadmin
-PORTVERSION=	2.2.0
+PORTVERSION=	2.2.1.1
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	postfixadmin
-DISTNAME=	${PORTNAME}_${PORTVERSION}
 
-MAINTAINER=	ports.maintainer@evilphi.com
+MAINTAINER=	terry@sucked-in.com
 COMMENT=	PHP web-based management tool for Postfix virtual domains and users
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 NO_BUILD=	yes
 
 SUB_FILES+=	pkg-message
@@ -45,31 +43,31 @@ IGNORE=	needs at least one database back-end
 .endif
 
 post-patch:
-		@${FIND} ${WRKSRC} -name '*.orig' -delete
+	@${FIND} ${WRKSRC} -name '*.orig' -delete
 
 do-install:
-		@${MKDIR} ${PREFIX}/www/postfixadmin/VIRTUAL_VACATION
-		@${MKDIR} ${PREFIX}/www/postfixadmin/ADDITIONS
-		@${MKDIR} ${PREFIX}/www/postfixadmin/css
-		@${MKDIR} ${PREFIX}/www/postfixadmin/admin
-		@${MKDIR} ${PREFIX}/www/postfixadmin/images
-		@${MKDIR} ${PREFIX}/www/postfixadmin/languages
-		@${MKDIR} ${PREFIX}/www/postfixadmin/templates
-		@${MKDIR} ${PREFIX}/www/postfixadmin/users
-		@${INSTALL_DATA} ${WRKSRC}/*.php ${PREFIX}/www/postfixadmin
-		@${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}/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
+	@${MKDIR} ${PREFIX}/www/postfixadmin/VIRTUAL_VACATION
+	@${MKDIR} ${PREFIX}/www/postfixadmin/ADDITIONS
+	@${MKDIR} ${PREFIX}/www/postfixadmin/css
+	@${MKDIR} ${PREFIX}/www/postfixadmin/admin
+	@${MKDIR} ${PREFIX}/www/postfixadmin/images
+	@${MKDIR} ${PREFIX}/www/postfixadmin/languages
+	@${MKDIR} ${PREFIX}/www/postfixadmin/templates
+	@${MKDIR} ${PREFIX}/www/postfixadmin/users
+	@${INSTALL_DATA} ${WRKSRC}/*.php ${PREFIX}/www/postfixadmin
+	@${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}/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
 
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
@@ -77,10 +75,10 @@ do-install:
 .endif
 
 post-install:
-		@${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
-		@${CHMOD} 640 ${PREFIX}/www/postfixadmin/users/*.php
-		${CAT} ${PKGMESSAGE}
+	@${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
+	@${CHMOD} 640 ${PREFIX}/www/postfixadmin/users/*.php
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/mail/postfixadmin/distinfo b/mail/postfixadmin/distinfo
index af8fb940e3e5..40db1480323d 100644
--- a/mail/postfixadmin/distinfo
+++ b/mail/postfixadmin/distinfo
@@ -1,3 +1,3 @@
-MD5 (postfixadmin_2.2.0.tar.gz) = 1e3271d3851dbaae54be048be7cef3bd
-SHA256 (postfixadmin_2.2.0.tar.gz) = abb6bcfe9a0475cc2f67b84b217490c0edf6d1e8fe5deae119f731e54d59a644
-SIZE (postfixadmin_2.2.0.tar.gz) = 951421
+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
diff --git a/mail/postfixadmin/pkg-plist b/mail/postfixadmin/pkg-plist
index 2914ac6366ca..22a48269333e 100644
--- a/mail/postfixadmin/pkg-plist
+++ b/mail/postfixadmin/pkg-plist
@@ -74,6 +74,7 @@ www/postfixadmin/languages/language-update.sh
 www/postfixadmin/languages/language.php
 www/postfixadmin/languages/lt.lang
 www/postfixadmin/languages/mk.lang
+www/postfixadmin/languages/nb.lang
 www/postfixadmin/languages/nl.lang
 www/postfixadmin/languages/nn.lang
 www/postfixadmin/languages/pl.lang