From owner-svn-ports-all@FreeBSD.ORG Sun Apr 20 19:37:10 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C2F44FE0; Sun, 20 Apr 2014 19:37:10 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AD46C1CA2; Sun, 20 Apr 2014 19:37:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3KJbANE004153; Sun, 20 Apr 2014 19:37:10 GMT (envelope-from adamw@svn.freebsd.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3KJb9vQ004147; Sun, 20 Apr 2014 19:37:09 GMT (envelope-from adamw@svn.freebsd.org) Message-Id: <201404201937.s3KJb9vQ004147@svn.freebsd.org> From: Adam Weinberger Date: Sun, 20 Apr 2014 19:37:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351634 - in head/mail: squirrelmail squirrelmail-decode squirrelmail-translations X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Apr 2014 19:37:10 -0000 Author: adamw Date: Sun Apr 20 19:37:09 2014 New Revision: 351634 URL: http://svnweb.freebsd.org/changeset/ports/351634 QAT: https://qat.redports.org/buildarchive/r351634/ Log: 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 Modified: head/mail/squirrelmail-decode/Makefile head/mail/squirrelmail-translations/distinfo head/mail/squirrelmail-translations/pkg-plist head/mail/squirrelmail/Makefile head/mail/squirrelmail/distinfo head/mail/squirrelmail/pkg-plist Modified: head/mail/squirrelmail-decode/Makefile ============================================================================== --- head/mail/squirrelmail-decode/Makefile Sun Apr 20 19:15:17 2014 (r351633) +++ head/mail/squirrelmail-decode/Makefile Sun Apr 20 19:37:09 2014 (r351634) @@ -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 Modified: head/mail/squirrelmail-translations/distinfo ============================================================================== --- head/mail/squirrelmail-translations/distinfo Sun Apr 20 19:15:17 2014 (r351633) +++ head/mail/squirrelmail-translations/distinfo Sun Apr 20 19:37:09 2014 (r351634) @@ -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 Modified: head/mail/squirrelmail-translations/pkg-plist ============================================================================== --- head/mail/squirrelmail-translations/pkg-plist Sun Apr 20 19:15:17 2014 (r351633) +++ head/mail/squirrelmail-translations/pkg-plist Sun Apr 20 19:37:09 2014 (r351634) @@ -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%% Modified: head/mail/squirrelmail/Makefile ============================================================================== --- head/mail/squirrelmail/Makefile Sun Apr 20 19:15:17 2014 (r351633) +++ head/mail/squirrelmail/Makefile Sun Apr 20 19:37:09 2014 (r351634) @@ -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 Modified: head/mail/squirrelmail/distinfo ============================================================================== --- head/mail/squirrelmail/distinfo Sun Apr 20 19:15:17 2014 (r351633) +++ head/mail/squirrelmail/distinfo Sun Apr 20 19:37:09 2014 (r351634) @@ -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 Modified: head/mail/squirrelmail/pkg-plist ============================================================================== --- head/mail/squirrelmail/pkg-plist Sun Apr 20 19:15:17 2014 (r351633) +++ head/mail/squirrelmail/pkg-plist Sun Apr 20 19:37:09 2014 (r351634) @@ -25,14 +25,11 @@ etc/periodic/daily/111.clean-squirrelmai %%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