From owner-svn-ports-all@freebsd.org Sun Oct 30 16:19:28 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3CA76C26EC1; Sun, 30 Oct 2016 16:19:28 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 17D4D1E24; Sun, 30 Oct 2016 16:19:28 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9UGJR5S017965; Sun, 30 Oct 2016 16:19:27 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9UGJQBC017957; Sun, 30 Oct 2016 16:19:26 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <201610301619.u9UGJQBC017957@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Sun, 30 Oct 2016 16:19:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r424954 - in head: . mail/squirrelmail mail/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.23 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, 30 Oct 2016 16:19:28 -0000 Author: adamw Date: Sun Oct 30 16:19:26 2016 New Revision: 424954 URL: https://svnweb.freebsd.org/changeset/ports/424954 Log: Update squirrelmail to 20161030 sources, which most notably brings much better php70 support. The optional database backend has switched from PEAR to PDO, so include an UPDATING note about it. Modified: head/UPDATING head/mail/squirrelmail-translations/Makefile head/mail/squirrelmail-translations/distinfo head/mail/squirrelmail/Makefile head/mail/squirrelmail/bsd.squirrelmail.mk head/mail/squirrelmail/distinfo head/mail/squirrelmail/pkg-help Modified: head/UPDATING ============================================================================== --- head/UPDATING Sun Oct 30 16:15:54 2016 (r424953) +++ head/UPDATING Sun Oct 30 16:19:26 2016 (r424954) @@ -6,6 +6,15 @@ You should get into the habit of checkin you update your ports collection, before attempting any port upgrades. 20161030: + AFFECTS: users of mail/squirrelmail + AUTHOR: adamw@FreeBSD.org + + For better php70 support, the squirrelmail port has switched from + PEAR database access to PDO. If you are using squirrelmail with + a database backend, you'll need to install a corresponding PDO + database module, such as php56-pdo_sqlite. + +20161030: AFFECTS: users of security/srm AUTHOR: rakuco@FreeBSD.org Modified: head/mail/squirrelmail-translations/Makefile ============================================================================== --- head/mail/squirrelmail-translations/Makefile Sun Oct 30 16:15:54 2016 (r424953) +++ head/mail/squirrelmail-translations/Makefile Sun Oct 30 16:19:26 2016 (r424954) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= squirrelmail-translations -PORTVERSION= 20160216 +PORTVERSION= 20161030 CATEGORIES= mail www MASTER_SITES= LOCAL/adamw/squirrelmail DISTNAME= squirrelmail-${PORTVERSION}_0200-SVN.locales Modified: head/mail/squirrelmail-translations/distinfo ============================================================================== --- head/mail/squirrelmail-translations/distinfo Sun Oct 30 16:15:54 2016 (r424953) +++ head/mail/squirrelmail-translations/distinfo Sun Oct 30 16:19:26 2016 (r424954) @@ -1,2 +1,3 @@ -SHA256 (squirrelmail/squirrelmail-20160216_0200-SVN.locales.tar.bz2) = 1a8cf0d118c4bf35bced197bce0ba688a9a0e7499e3d4f0d88283cab82ac58e5 -SIZE (squirrelmail/squirrelmail-20160216_0200-SVN.locales.tar.bz2) = 5253689 +TIMESTAMP = 1477843914 +SHA256 (squirrelmail/squirrelmail-20161030_0200-SVN.locales.tar.bz2) = 6cf0e335b99309244e883dfabfdac3d14b60eb04215efd4fecc0b2fb1b381750 +SIZE (squirrelmail/squirrelmail-20161030_0200-SVN.locales.tar.bz2) = 5254292 Modified: head/mail/squirrelmail/Makefile ============================================================================== --- head/mail/squirrelmail/Makefile Sun Oct 30 16:15:54 2016 (r424953) +++ head/mail/squirrelmail/Makefile Sun Oct 30 16:19:26 2016 (r424954) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= squirrelmail -PORTVERSION= 20160216 +PORTVERSION= 20161030 CATEGORIES= mail www MASTER_SITES= LOCAL/adamw/squirrelmail DISTNAME= ${PORTNAME}-${PORTVERSION}_0200-SVN.stable @@ -13,21 +13,18 @@ COMMENT= Webmail system which accesses m LICENSE= GPLv2 -# This snapshot tarball contains php 5.4 and 5.5 compatibility -# patches, but the only guaranteed compatibility is with php 5.3. -# If you encounter problems, downgrade to php 5.3. - +USES= cpe gettext perl5 php:web tar:bzip2 USE_PHP= session hash gettext mbstring pcre openssl xml -WANT_PHP_WEB= yes - -USES= cpe gettext perl5 tar:bzip2 USE_PERL5= run NO_ARCH= yes WRKSRC= ${WRKDIR}/${PORTNAME}.stable/${PORTNAME} OPTIONS_DEFINE= DATABASE LDAP DOCS -DATABASE_DESC= PEAR database support (must also install a driver) +DATABASE_DESC= PDO database support (must also install a driver) + +DATABASE_USE= PHP=pdo +LDAP_USE= PHP=ldap # if you were using WITHOUT_WWWDIR, use SQUIRRELDIR=${PREFIX}/squirrelmail SQUIRRELDIR?= ${WWWDIR} @@ -47,9 +44,6 @@ SUB_LIST= SQUIRRELDIR=${SQUIRRELDIR} SMU CONFLICTS= squirreloutlook-[0-9]* -DATABASE_RUN_DEPENDS= ${LOCALBASE}/share/pear/DB.php:databases/pear-DB -LDAP_USE= PHP=ldap - post-patch: @${REINPLACE_CMD} -e 's|ispell|${LOCALBASE}/bin/aspell|g' \ ${WRKSRC}/plugins/squirrelspell/sqspell_config.php Modified: head/mail/squirrelmail/bsd.squirrelmail.mk ============================================================================== --- head/mail/squirrelmail/bsd.squirrelmail.mk Sun Oct 30 16:15:54 2016 (r424953) +++ head/mail/squirrelmail/bsd.squirrelmail.mk Sun Oct 30 16:19:26 2016 (r424954) @@ -48,7 +48,9 @@ NO_BUILD= yes NO_ARCH= yes NO_WRKSUBDIR= yes USE_PHP?= yes -WANT_PHP_WEB= yes +.if empty(USES:Mphp*) +USES+= php:web +.endif SQUIRREL_PLUGIN_NAME?= ${PORTNAME} PLIST_SUB+= SQUIRREL_PLUGIN_NAME=${SQUIRREL_PLUGIN_NAME} Modified: head/mail/squirrelmail/distinfo ============================================================================== --- head/mail/squirrelmail/distinfo Sun Oct 30 16:15:54 2016 (r424953) +++ head/mail/squirrelmail/distinfo Sun Oct 30 16:19:26 2016 (r424954) @@ -1,2 +1,3 @@ -SHA256 (squirrelmail/squirrelmail-20160216_0200-SVN.stable.tar.bz2) = 6302b030805f194b34e48b329815a3911be7f2c1a5dbd1786955078ea3e0ea1a -SIZE (squirrelmail/squirrelmail-20160216_0200-SVN.stable.tar.bz2) = 560164 +TIMESTAMP = 1477843339 +SHA256 (squirrelmail/squirrelmail-20161030_0200-SVN.stable.tar.bz2) = 5a187955b048e557276b73c74bc38dfa78e2f63e4d3273163ef1e5283f2874e6 +SIZE (squirrelmail/squirrelmail-20161030_0200-SVN.stable.tar.bz2) = 560672 Modified: head/mail/squirrelmail/pkg-help ============================================================================== --- head/mail/squirrelmail/pkg-help Sun Oct 30 16:15:54 2016 (r424953) +++ head/mail/squirrelmail/pkg-help Sun Oct 30 16:19:26 2016 (r424954) @@ -1,5 +1,5 @@ -If you enable the PEAR database framework option, you still need to install a -database-specific PEAR driver. +If you enable the PDO database framework option, you still need to install a +database-specific PDO driver. -SquirrelMail is only compatible with old-style pear-DB drivers, not the newer -MDB2 drivers. +For example, if you're using php 7.0, you could install php70-pdo_sqlite, +from /usr/ports/databases/php70-pdo_sqlite.