33 files changed, 12 insertions, 69 deletions

diff --git a/mail/squirrelmail-abook_import_export-plugin/Makefile b/mail/squirrelmail-abook_import_export-plugin/Makefile
index d0a4f15c67ef..872e7ce49949 100644
--- a/mail/squirrelmail-abook_import_export-plugin/Makefile
+++ b/mail/squirrelmail-abook_import_export-plugin/Makefile
@@ -13,8 +13,6 @@ COMMENT=	Allows for the importing of addressbooks from a CSV (comma separated va
 
 SQUIRREL_PLUGIN_NAME=	${PORTNAME:S/-/_/}
 
-NO_STAGE=	yes
-
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
 .include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-askuserinfo-plugin/Makefile b/mail/squirrelmail-askuserinfo-plugin/Makefile
index 87b089070b5f..ebbdde06677a 100644
--- a/mail/squirrelmail-askuserinfo-plugin/Makefile
+++ b/mail/squirrelmail-askuserinfo-plugin/Makefile
@@ -9,8 +9,6 @@ DISTNAME=	${PORTNAME}.${PORTVERSION}-1.4.0
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Ask user to enter Full name and Email address at initial logon
 
-NO_STAGE=	yes
-
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
 .include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-avelsieve-plugin/Makefile b/mail/squirrelmail-avelsieve-plugin/Makefile
index d2f171e13efb..6787081cd6a6 100644
--- a/mail/squirrelmail-avelsieve-plugin/Makefile
+++ b/mail/squirrelmail-avelsieve-plugin/Makefile
@@ -9,8 +9,6 @@ CATEGORIES=		mail www
 MAINTAINER=	neil@darlow.co.uk
 COMMENT=	SquirrelMail plugin for Server-Side Mail Filtering management
 
-NO_STAGE=	yes
-
 pre-install:
 	${RM} -Rf ${WRKSRC}/${SQUIRREL_PLUGIN_NAME}/po
 	${FIND} ${WRKSRC}/${SQUIRREL_PLUGIN_NAME} -type f \
diff --git a/mail/squirrelmail-calendar_file_backend-plugin/Makefile b/mail/squirrelmail-calendar_file_backend-plugin/Makefile
index a345749a907f..94b011c79c0f 100644
--- a/mail/squirrelmail-calendar_file_backend-plugin/Makefile
+++ b/mail/squirrelmail-calendar_file_backend-plugin/Makefile
@@ -10,8 +10,6 @@ DISTNAME=		${PORTNAME}-${PORTVERSION}-2.0
 MAINTAINER=		ports@FreeBSD.org
 COMMENT=		File backend for SquirrelMail Calendar plugin
 
-NO_STAGE=		yes
-
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
 .include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-change_ldappass-plugin/Makefile b/mail/squirrelmail-change_ldappass-plugin/Makefile
index a68deac79f12..07ad73b8b47e 100644
--- a/mail/squirrelmail-change_ldappass-plugin/Makefile
+++ b/mail/squirrelmail-change_ldappass-plugin/Makefile
@@ -17,8 +17,6 @@ USES=		gettext
 
 USE_GENERIC_PKGMESSAGE=	yes
 
-NO_STAGE=	yes
-
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
 .include <bsd.port.mk>
diff --git a/mail/squirrelmail-change_sqlpass-plugin/Makefile b/mail/squirrelmail-change_sqlpass-plugin/Makefile
index cf9bd59d3d12..687e8e413050 100644
--- a/mail/squirrelmail-change_sqlpass-plugin/Makefile
+++ b/mail/squirrelmail-change_sqlpass-plugin/Makefile
@@ -16,8 +16,6 @@ RUN_DEPENDS=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
 
 SQUIRREL_PLUGIN_NAME=	${PORTNAME:S/-/_/}
 
-NO_STAGE=	yes
-
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
 .include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-check_quota-plugin/Makefile b/mail/squirrelmail-check_quota-plugin/Makefile
index 133dfdea0dde..5ca480c3ed35 100644
--- a/mail/squirrelmail-check_quota-plugin/Makefile
+++ b/mail/squirrelmail-check_quota-plugin/Makefile
@@ -14,8 +14,6 @@ USE_SM_COMPAT=	YES
 
 SQUIRREL_PLUGIN_NAME=	${PORTNAME:S/-/_/}
 
-NO_STAGE=	yes
-
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
 .include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-compatibility-plugin/Makefile b/mail/squirrelmail-compatibility-plugin/Makefile
index fa37116ef8ad..44216716e656 100644
--- a/mail/squirrelmail-compatibility-plugin/Makefile
+++ b/mail/squirrelmail-compatibility-plugin/Makefile
@@ -9,8 +9,6 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-1.0
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Required by many plugins for compatibility with SquirrelMail
 
-NO_STAGE=	yes
-
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
 .include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-email_footer-plugin/Makefile b/mail/squirrelmail-email_footer-plugin/Makefile
index 355daae65111..16b9d630655c 100644
--- a/mail/squirrelmail-email_footer-plugin/Makefile
+++ b/mail/squirrelmail-email_footer-plugin/Makefile
@@ -15,8 +15,6 @@ USE_GENERIC_PKGMESSAGE=	yes
 
 LICENSE=	GPLv2
 
-NO_STAGE=	yes
-
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
 .include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-login_auth-plugin/Makefile b/mail/squirrelmail-login_auth-plugin/Makefile
index 80c0d8e49289..6319feafadf2 100644
--- a/mail/squirrelmail-login_auth-plugin/Makefile
+++ b/mail/squirrelmail-login_auth-plugin/Makefile
@@ -14,8 +14,6 @@ COMMENT=		Automatically log in user based on HTTP authentication
 
 SQUIRREL_PLUGIN_NAME=	${PORTNAME}
 
-NO_STAGE=	yes
-
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
 .include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-login_notes-plugin/Makefile b/mail/squirrelmail-login_notes-plugin/Makefile
index 5aaf0bae4b1e..74bbda25e19f 100644
--- a/mail/squirrelmail-login_notes-plugin/Makefile
+++ b/mail/squirrelmail-login_notes-plugin/Makefile
@@ -15,8 +15,6 @@ LICENSE=	GPLv2
 USE_SM_COMPAT=	yes
 USE_GENERIC_PKGMESSAGE=	yes
 
-NO_STAGE=	yes
-
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
 .include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-mark_read-plugin/Makefile b/mail/squirrelmail-mark_read-plugin/Makefile
index 4df5c7caa69c..c1b30f04ce31 100644
--- a/mail/squirrelmail-mark_read-plugin/Makefile
+++ b/mail/squirrelmail-mark_read-plugin/Makefile
@@ -14,7 +14,6 @@ USE_SM_COMPAT=	YES
 
 SQUIRREL_PLUGIN_NAME=	${PORTNAME:S/-/_/}
 
-NO_STAGE=	yes
 post-patch:
 	@${RM} ${WRKSRC}/${SQUIRREL_PLUGIN_NAME}/mark_read.php.orig
 
diff --git a/mail/squirrelmail-multilogin-plugin/Makefile b/mail/squirrelmail-multilogin-plugin/Makefile
index f7b9647d72bc..4a8563322753 100644
--- a/mail/squirrelmail-multilogin-plugin/Makefile
+++ b/mail/squirrelmail-multilogin-plugin/Makefile
@@ -13,8 +13,6 @@ COMMENT=	Allows manual selection of login server on login page
 USE_SM_COMPAT=	yes
 USE_GENERIC_PKGMESSAGE=	yes
 
-NO_STAGE=	yes
-
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
 .include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-notes-plugin/Makefile b/mail/squirrelmail-notes-plugin/Makefile
index 48dd1b92aa77..63b9c0e6e6f7 100644
--- a/mail/squirrelmail-notes-plugin/Makefile
+++ b/mail/squirrelmail-notes-plugin/Makefile
@@ -13,8 +13,6 @@ COMMENT=		Allows you to create notes
 USE_SM_COMPAT=	yes
 USE_GENERIC_PKGMESSAGE=	yes
 
-NO_STAGE=	yes
-
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
 .include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-notify-plugin/Makefile b/mail/squirrelmail-notify-plugin/Makefile
index 3735d0919fe2..7290f198dc6b 100644
--- a/mail/squirrelmail-notify-plugin/Makefile
+++ b/mail/squirrelmail-notify-plugin/Makefile
@@ -12,8 +12,6 @@ COMMENT=		Notify when new mail arrives
 
 USE_SM_COMPAT=	yes
 
-NO_STAGE=	yes
-
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
 .include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-password_forget-plugin/Makefile b/mail/squirrelmail-password_forget-plugin/Makefile
index 9b07c2f16aa6..30618aa62252 100644
--- a/mail/squirrelmail-password_forget-plugin/Makefile
+++ b/mail/squirrelmail-password_forget-plugin/Makefile
@@ -12,8 +12,6 @@ COMMENT=	Prevent reuse of login details by browsers at public terminals
 
 USE_SM_COMPAT=	yes
 
-NO_STAGE=	yes
-
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
 .include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-pupdate-plugin/Makefile b/mail/squirrelmail-pupdate-plugin/Makefile
index dd47661e74f5..5dbe812efa39 100644
--- a/mail/squirrelmail-pupdate-plugin/Makefile
+++ b/mail/squirrelmail-pupdate-plugin/Makefile
@@ -14,8 +14,6 @@ LICENSE=	GPLv2
 
 USE_GENERIC_PKGMESSAGE=	yes
 
-NO_STAGE=	yes
-
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
 .include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-qmailadmin_login-plugin/Makefile b/mail/squirrelmail-qmailadmin_login-plugin/Makefile
index 16ef0a311027..f76e1fe48622 100644
--- a/mail/squirrelmail-qmailadmin_login-plugin/Makefile
+++ b/mail/squirrelmail-qmailadmin_login-plugin/Makefile
@@ -14,8 +14,6 @@ RUN_DEPENDS=	${PREFIX}/www/cgi-bin.default/qmailadmin/qmailadmin:${PORTSDIR}/mai
 
 USE_GENERIC_PKGMESSAGE=	yes
 
-NO_STAGE=	yes
-
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
 .include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-quota_usage-plugin/Makefile b/mail/squirrelmail-quota_usage-plugin/Makefile
index 56d85c0bccf1..1acbf0f8aacc 100644
--- a/mail/squirrelmail-quota_usage-plugin/Makefile
+++ b/mail/squirrelmail-quota_usage-plugin/Makefile
@@ -13,8 +13,6 @@ COMMENT=		View quota and current usage
 USE_SM_COMPAT=	yes
 USE_GENERIC_PKGMESSAGE=	yes
 
-NO_STAGE=	yes
-
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
 .include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-sasql-plugin/Makefile b/mail/squirrelmail-sasql-plugin/Makefile
index 559c03a37331..b7c93c6b0a63 100644
--- a/mail/squirrelmail-sasql-plugin/Makefile
+++ b/mail/squirrelmail-sasql-plugin/Makefile
@@ -14,8 +14,6 @@ RUN_DEPENDS=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
 USE_SM_COMPAT=	yes
 USE_GENERIC_PKGMESSAGE=	yes
 
-NO_STAGE=	yes
-
 post-patch:
 	@${REINPLACE_CMD} -e "s/\(\$$imap_server_type == \'cyrus\'\)/\1 || \$$imap_server_type == \'courier\'/g" \
 		-e 's/session_register/sqsession_register/g' \
diff --git a/mail/squirrelmail-secure_login-plugin/Makefile b/mail/squirrelmail-secure_login-plugin/Makefile
index bad461e90ded..7a48b87dd6c6 100644
--- a/mail/squirrelmail-secure_login-plugin/Makefile
+++ b/mail/squirrelmail-secure_login-plugin/Makefile
@@ -13,8 +13,6 @@ LICENSE=	GPLv2
 
 USE_GENERIC_PKGMESSAGE=	yes
 
-NO_STAGE=	yes
-
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
 .include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-shared_calendars-plugin/Makefile b/mail/squirrelmail-shared_calendars-plugin/Makefile
index 7477b020683b..638b5fce0bc0 100644
--- a/mail/squirrelmail-shared_calendars-plugin/Makefile
+++ b/mail/squirrelmail-shared_calendars-plugin/Makefile
@@ -16,8 +16,6 @@ USE_SM_COMPAT=	yes
 USE_GENERIC_PKGMESSAGE=	yes
 _SMSRCDIR=	calendar
 
-NO_STAGE=	yes
-
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
 .include <bsd.port.mk>
diff --git a/mail/squirrelmail-spam-buttons-plugin/Makefile b/mail/squirrelmail-spam-buttons-plugin/Makefile
index 315b005ac92f..49e7bfa236bb 100644
--- a/mail/squirrelmail-spam-buttons-plugin/Makefile
+++ b/mail/squirrelmail-spam-buttons-plugin/Makefile
@@ -15,7 +15,6 @@ USE_SM_COMPAT=	yes
 
 SQUIRREL_PLUGIN_NAME=	${PORTNAME:S/-/_/}
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
 
diff --git a/mail/squirrelmail-squirrel_logger-plugin/Makefile b/mail/squirrelmail-squirrel_logger-plugin/Makefile
index aafd46c5ec83..18e30e5d960a 100644
--- a/mail/squirrelmail-squirrel_logger-plugin/Makefile
+++ b/mail/squirrelmail-squirrel_logger-plugin/Makefile
@@ -12,8 +12,6 @@ COMMENT=	Logging functionality for your webmail interface
 
 USE_SM_COMPAT=	yes
 
-NO_STAGE=	yes
-
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
 .include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-timeout_user-plugin/Makefile b/mail/squirrelmail-timeout_user-plugin/Makefile
index fa3559b6bf8f..fd5aaefac5e0 100644
--- a/mail/squirrelmail-timeout_user-plugin/Makefile
+++ b/mail/squirrelmail-timeout_user-plugin/Makefile
@@ -14,7 +14,6 @@ LICENSE=	GPLv2
 USE_SM_COMPAT=	yes
 USE_GENERIC_PKGMESSAGE=	yes
 
-NO_STAGE=	yes
 
 post-patch:
 	@${MV} ${WRKSRC}/${SQUIRREL_PLUGIN_NAME}/config.php ${WRKSRC}/${SQUIRREL_PLUGIN_NAME}/config.php.sample
diff --git a/mail/squirrelmail-tmda-plugin/Makefile b/mail/squirrelmail-tmda-plugin/Makefile
index 4ba74585e481..4833916701a5 100644
--- a/mail/squirrelmail-tmda-plugin/Makefile
+++ b/mail/squirrelmail-tmda-plugin/Makefile
@@ -31,7 +31,6 @@ PLIST_SUB+=	SQUIRRELDIR=squirrelmail
 TMDATOOLDIR?=	${SQUIRRELDIR}/plugins/${SQUIRREL_PLUGIN_NAME}
 PLIST_SUB+=	TMDATOOLDIR=plugins/${SQUIRREL_PLUGIN_NAME}
 
-NO_STAGE=	yes
 pre-everything::
 	@${ECHO} "The plugin expects SquirrelMail install in ${SQUIRRELDIR}"
 	@${ECHO} "To use the old location ${PREFIX}/squirrelmail define WITHOUT_WWWDIR=yes"
@@ -44,9 +43,9 @@ post-patch:
 	@${RM} ${WRKSRC}/tmdatools_config.php.sample.bak
 
 do-install:
-	@${MKDIR} ${TMDATOOLDIR}
-	@${CP} -Rp ${WRKSRC}/ ${TMDATOOLDIR}
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${TMDATOOLDIR}
+	@${MKDIR} ${STAGEDIR}${TMDATOOLDIR}
+	@${CP} -Rp ${WRKSRC}/ ${STAGEDIR}${TMDATOOLDIR}
+	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${TMDATOOLDIR}
 	@${RM} -f ${WRKSRC}/tmdatools_config.php.sample.bak
 
 post-install:
diff --git a/mail/squirrelmail-unsafe_image_rules-plugin/Makefile b/mail/squirrelmail-unsafe_image_rules-plugin/Makefile
index 72cf6758cd49..864a1e9ca3d7 100644
--- a/mail/squirrelmail-unsafe_image_rules-plugin/Makefile
+++ b/mail/squirrelmail-unsafe_image_rules-plugin/Makefile
@@ -14,8 +14,6 @@ USE_SM_COMPAT=	yes
 
 SQUIRREL_PLUGIN_NAME=	${PORTNAME:S/-/_/}
 
-NO_STAGE=	yes
-
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
 .include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-user_special_mailboxes-plugin/Makefile b/mail/squirrelmail-user_special_mailboxes-plugin/Makefile
index 79471f2b0c33..2131a49045c2 100644
--- a/mail/squirrelmail-user_special_mailboxes-plugin/Makefile
+++ b/mail/squirrelmail-user_special_mailboxes-plugin/Makefile
@@ -14,8 +14,6 @@ USE_SM_COMPAT=	yes
 
 SQUIRREL_PLUGIN_NAME=	${PORTNAME:S/-/_/}
 
-NO_STAGE=	yes
-
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
 .include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-vlogin-plugin/Makefile b/mail/squirrelmail-vlogin-plugin/Makefile
index 6aebe932ce46..07d1eae6e2a5 100644
--- a/mail/squirrelmail-vlogin-plugin/Makefile
+++ b/mail/squirrelmail-vlogin-plugin/Makefile
@@ -14,7 +14,6 @@ USE_SM_COMPAT=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
 
@@ -24,8 +23,8 @@ pre-install::
 .if !defined(NOPORTDOCS)
 	cd ${WRKSRC}/${PORTNAME}/docs \
 	&& ${RM} .htaccess index.php \
-	&& ${MKDIR} ${DOCSDIR} \
-	&& ${COPYTREE_SHARE} \* ${DOCSDIR} \
+	&& ${MKDIR} ${STAGEDIR}${DOCSDIR} \
+	&& ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR} \
 	&& cd ${WRKSRC}/${PORTNAME} \
 	&& ${RM} -rf README docs
 .else
diff --git a/mail/squirrelmail-websearch-plugin/Makefile b/mail/squirrelmail-websearch-plugin/Makefile
index b987649a328e..ca4558f3c13e 100644
--- a/mail/squirrelmail-websearch-plugin/Makefile
+++ b/mail/squirrelmail-websearch-plugin/Makefile
@@ -16,8 +16,6 @@ USE_GENERIC_PKGMESSAGE=	yes
 
 SQUIRREL_PLUGIN_CONFIG=	${SQUIRREL_PLUGIN_NAME}.conf.php
 
-NO_STAGE=	yes
-
 post-patch:
 	@${MV} ${WRKSRC}/${_SMSRCDIR}/${SQUIRREL_PLUGIN_CONFIG}.dist ${WRKSRC}/${_SMSRCDIR}/${SQUIRREL_PLUGIN_CONFIG}.sample
 
diff --git a/mail/squirrelmail-wetteronline-plugin/Makefile b/mail/squirrelmail-wetteronline-plugin/Makefile
index 695e6e6b2416..ac13c96ab7ed 100644
--- a/mail/squirrelmail-wetteronline-plugin/Makefile
+++ b/mail/squirrelmail-wetteronline-plugin/Makefile
@@ -11,8 +11,6 @@ COMMENT=		Plugin for the weather in Germany
 
 USE_SM_COMPAT=	yes
 
-NO_STAGE=	yes
-
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
 .include <bsd.port.post.mk>
diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index 7b0a36e38b15..33df747c5588 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -38,7 +38,7 @@ USERS=		${SMUSER}
 GROUPS=		${SMGROUP}
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION} \
-			SQUIRRELDIR="${SQUIRRELDIR:S,^${PREFIX}/,,}" \
+		SQUIRRELDIR="${SQUIRRELDIR:S,^${PREFIX}/,,}" \
 
 SUB_FILES=	pkg-message
 SUB_LIST=	SQUIRRELDIR=${SQUIRRELDIR} SMUSER=${SMUSER} SMGROUP=${SMGROUP}
diff --git a/mail/squirrelmail/bsd.squirrelmail.mk b/mail/squirrelmail/bsd.squirrelmail.mk
index d65bbb255af1..7fe1f235f58b 100644
--- a/mail/squirrelmail/bsd.squirrelmail.mk
+++ b/mail/squirrelmail/bsd.squirrelmail.mk
@@ -55,7 +55,7 @@ SUB_LIST+=		SQUIRREL_PLUGIN_NAME=${SQUIRREL_PLUGIN_NAME}
 
 # As with mail/squirreldir, if you were using WITHOUT_WWWDIR=yes,
 # set SQUIRRELDIR=${PREFIX}/squirrelmail
-SQUIRRELDIR?=	${PREFIX}/www/squirrelmail
+SQUIRRELDIR?=		${PREFIX}/www/squirrelmail
 PLIST_SUB+=		SQUIRRELDIR=${SQUIRRELDIR:S,${PREFIX}/,,}
 SUB_LIST+=		SQUIRRELDIR=${SQUIRRELDIR}
 
@@ -92,19 +92,19 @@ _SMSRCDIR?=	${SQUIRREL_PLUGIN_NAME}
 .if !target(do-install)
 do-install:
 	cd ${WRKSRC}/${_SMSRCDIR} && ${FIND} -d . | \
-		${CPIO} -dump ${SQUIRRELDIR}/plugins/${SQUIRREL_PLUGIN_NAME} >/dev/null 2>&1 && \
-	${FIND} ${SQUIRRELDIR}/plugins/${SQUIRREL_PLUGIN_NAME} \
+		${CPIO} -dump ${STAGEDIR}${SQUIRRELDIR}/plugins/${SQUIRREL_PLUGIN_NAME} >/dev/null 2>&1 && \
+	${FIND} ${STAGEDIR}${SQUIRRELDIR}/plugins/${SQUIRREL_PLUGIN_NAME} \
 		-type d -exec chmod 755 {} \; && \
-	${FIND} ${SQUIRRELDIR}/plugins/${SQUIRREL_PLUGIN_NAME} \
+	${FIND} ${STAGEDIR}${SQUIRRELDIR}/plugins/${SQUIRREL_PLUGIN_NAME} \
 		-type f -exec chmod 644 {} \;
 .endif
 
 .if !target(post-install)
 post-install:
 .ifndef WITHOUT_ACTIVATE
-.if exists( ${SQUIRRELDIR}/config/config.php )
+.if exists( ${STAGEDIR}${SQUIRRELDIR}/config/config.php )
 	@${ECHO_CMD} "Activating plug-in in SquirrelMail"
-	${SQUIRRELDIR}/config/conf.pl --install-plugin ${SQUIRREL_PLUGIN_NAME}
+	${STAGEDIR}${SQUIRRELDIR}/config/conf.pl --install-plugin ${SQUIRREL_PLUGIN_NAME}
 .endif
 .else
 	@${ECHO_CMD} "To activate the plug-in in SquirrelMail use"