Update to SquirrelMail STABLE 2014/04/20. Also cleaning up

the Makefiles, and using @sample.

Notable changes include:

	* Add advanced control over the SSL context used when connecting to the
	  SMTP and IMAP servers over SSL/TLS (Thanks to Emmanuel Dreyfus)
	* Add ability to show login error from the IMAP server instead of
	  traditional "Unknown user or password incorrect" (thanks to Alain
	  Williams)
	* Allow SSL socket context to be specified as well
	* Make configuration tool show the SquirrelMail version
	* Better hook results testing
	* Add ability to use console.log for debugging
	* Turn off debugging by default
	* Add new attachments_top hook

6 files changed, 12 insertions, 21 deletions

diff --git a/mail/squirrelmail-decode/Makefile b/mail/squirrelmail-decode/Makefile
index 3d08801f0241..1cd776562808 100644
--- a/mail/squirrelmail-decode/Makefile
+++ b/mail/squirrelmail-decode/Makefile
@@ -14,7 +14,7 @@ LICENSE=		GPLv2
 
 RUN_DEPENDS=	${SQUIRRELDIR}/index.php:${PORTSDIR}/mail/squirrelmail
 
-USE_BZIP2=		yes
+USES=			tar:bzip2
 NO_BUILD=		yes
 
 DOCSDIR=		${PREFIX}/share/doc/squirrelmail/decode
@@ -24,11 +24,11 @@ SQUIRRELDIR?=	${PREFIX}/www/squirrelmail
 PLIST_SUB=		SQUIRRELDIR="${SQUIRRELDIR:S,^${PREFIX}/,,}"
 
 do-install:
-	${MKDIR} ${STAGEDIR}${SQUIRRELDIR}/functions/decode
+	@${MKDIR} ${STAGEDIR}${SQUIRRELDIR}/functions/decode
 .for DIR in eastasia x-mac
 	cd ${WRKSRC}/${DIR} && ${FIND} . | ${CPIO} -pdmu --quiet ${STAGEDIR}${SQUIRRELDIR}/functions/decode
 .endfor
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.decode ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/mail/squirrelmail-translations/distinfo b/mail/squirrelmail-translations/distinfo
index e8fe0dba6799..6fb609919de4 100644
--- a/mail/squirrelmail-translations/distinfo
+++ b/mail/squirrelmail-translations/distinfo
@@ -1,2 +1,2 @@
-SHA256 (squirrelmail/squirrelmail-20131229_0200-SVN.locales.tar.bz2) = 2eba57426a4646ba470d740fba2016bde133670d6d94a2633eb9bb1c7ce27274
-SIZE (squirrelmail/squirrelmail-20131229_0200-SVN.locales.tar.bz2) = 5250977
+SHA256 (squirrelmail/squirrelmail-20140420_0200-SVN.locales.tar.bz2) = fc851a791907e6d7e3bc2fde94a655014545e9471ec81fc87b85f06f3934a906
+SIZE (squirrelmail/squirrelmail-20140420_0200-SVN.locales.tar.bz2) = 5254092
diff --git a/mail/squirrelmail-translations/pkg-plist b/mail/squirrelmail-translations/pkg-plist
index aa40df1c0e67..d62fc2d458ec 100644
--- a/mail/squirrelmail-translations/pkg-plist
+++ b/mail/squirrelmail-translations/pkg-plist
@@ -2956,8 +2956,6 @@
 @dirrmtry %%SQUIRRELDIR%%/locale/ar/LC_MESSAGES/plugins
 @dirrmtry %%SQUIRRELDIR%%/locale/ar/LC_MESSAGES
 @dirrmtry %%SQUIRRELDIR%%/locale/ar
-@dirrmtry %%SQUIRRELDIR%%/locale
-@dirrmtry %%SQUIRRELDIR%%/images
 @dirrmtry %%SQUIRRELDIR%%/help/zh_CN
 @dirrmtry %%SQUIRRELDIR%%/help/uk_UA
 @dirrmtry %%SQUIRRELDIR%%/help/th_TH
@@ -2986,5 +2984,3 @@
 @dirrmtry %%SQUIRRELDIR%%/help/cs_CZ
 @dirrmtry %%SQUIRRELDIR%%/help/ca_ES
 @dirrmtry %%SQUIRRELDIR%%/help/bg_BG
-@dirrmtry %%SQUIRRELDIR%%/help
-@dirrmtry %%SQUIRRELDIR%%
diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index ea007467b4e3..3e9b023e6ab0 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	squirrelmail
-PORTVERSION=	20131229
-PORTREVISION=	1
+PORTVERSION=	20140420
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	adamw/squirrelmail
@@ -22,8 +21,7 @@ LICENSE=	GPLv2
 USE_PHP=	session mhash gettext mbstring pcre openssl xml
 WANT_PHP_WEB=	yes
 
-USE_BZIP2=	yes
-USES=		gettext
+USES=		gettext tar:bzip2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}.stable/${PORTNAME}
 
@@ -85,7 +83,7 @@ do-build:
 
 	@${ECHO} "left_refresh=300" >> ${WRKSRC}/data/default_pref
 	@${MV} ${WRKSRC}/config/config_local.php ${WRKSRC}/config/config_local.php.sample
-	@${MV} ${WRKSRC}/data/default_pref ${WRKSRC}/data/default_pref-dist
+	@${MV} ${WRKSRC}/data/default_pref ${WRKSRC}/data/default_pref.sample
 	@${MKDIR} ${WRKSRC}/attach
 	@${CP} -p ${WRKSRC}/data/.htaccess ${WRKSRC}/attach/.htaccess
 
diff --git a/mail/squirrelmail/distinfo b/mail/squirrelmail/distinfo
index 5ec1a8767e6a..78bd8080e25e 100644
--- a/mail/squirrelmail/distinfo
+++ b/mail/squirrelmail/distinfo
@@ -1,2 +1,2 @@
-SHA256 (squirrelmail/squirrelmail-20131229_0200-SVN.stable.tar.bz2) = 0839e01d857081b91a8049eb5faee4120f267fe5babcbb08a59312348c0c48b0
-SIZE (squirrelmail/squirrelmail-20131229_0200-SVN.stable.tar.bz2) = 550388
+SHA256 (squirrelmail/squirrelmail-20140420_0200-SVN.stable.tar.bz2) = 1651f177a43aab7d07dbb1982adaf178000cb0ee6d208bfccd126bbb01415db9
+SIZE (squirrelmail/squirrelmail-20140420_0200-SVN.stable.tar.bz2) = 552142
diff --git a/mail/squirrelmail/pkg-plist b/mail/squirrelmail/pkg-plist
index f9a792580161..9041ce8b8f44 100644
--- a/mail/squirrelmail/pkg-plist
+++ b/mail/squirrelmail/pkg-plist
@@ -25,14 +25,11 @@ etc/periodic/daily/111.clean-squirrelmail
 %%SQUIRRELDIR%%/config/.htaccess
 %%SQUIRRELDIR%%/config/conf.pl
 %%SQUIRRELDIR%%/config/config_default.php
-@unexec if cmp -s %D/www/squirrelmail/config/config_local.php %D/www/squirrelmail/config/config_local.php.sample; then rm -f %D/www/squirrelmail/config/config_local.php; fi
-%%SQUIRRELDIR%%/config/config_local.php.sample
+@sample %%SQUIRRELDIR%%/config/config_local.php.sample
 %%SQUIRRELDIR%%/config/index.php
 %%SQUIRRELDIR%%/configure
 %%SQUIRRELDIR%%/data/.htaccess
-@unexec if cmp -s %D/www/squirrelmail/data/default_pref-dist %D/www/squirrelmail/data/default_pref; then rm -f %D/www/squirrelmail/data/default_pref; fi
-%%SQUIRRELDIR%%/data/default_pref-dist
-@exec if [ ! -f %D/www/squirrelmail/data/default_pref ]; then cp -p %D/%F %B/default_pref; fi
+@sample %%SQUIRRELDIR%%/data/default_pref.sample
 %%SQUIRRELDIR%%/data/index.php
 @exec chown %%SMUSER%%:%%SMGROUP%% %B
 @exec chmod 750 %B