diff options
author | Adam Weinberger <adamw@FreeBSD.org> | 2016-10-30 16:19:26 +0000 |
---|---|---|
committer | Adam Weinberger <adamw@FreeBSD.org> | 2016-10-30 16:19:26 +0000 |
commit | 2c2e3eefde4fd78293e65d845fe6cfe0e2ff1f8e (patch) | |
tree | 869e4918a0a8237dafef4970a192186681018749 /mail/squirrelmail | |
parent | 8469005d4143e73831c907330105fb9b5c7ca5e4 (diff) | |
download | ports-2c2e3eefde4fd78293e65d845fe6cfe0e2ff1f8e.tar.gz ports-2c2e3eefde4fd78293e65d845fe6cfe0e2ff1f8e.zip |
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.
Notes
Notes:
svn path=/head/; revision=424954
Diffstat (limited to 'mail/squirrelmail')
-rw-r--r-- | mail/squirrelmail/Makefile | 18 | ||||
-rw-r--r-- | mail/squirrelmail/bsd.squirrelmail.mk | 4 | ||||
-rw-r--r-- | mail/squirrelmail/distinfo | 5 | ||||
-rw-r--r-- | mail/squirrelmail/pkg-help | 8 |
4 files changed, 16 insertions, 19 deletions
diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile index c81efc0a0b71..6062591622ca 100644 --- a/mail/squirrelmail/Makefile +++ b/mail/squirrelmail/Makefile @@ -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 mail over IMAP 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} SMUSER=${SMUSER} SMGROUP=${SMGROUP} 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 diff --git a/mail/squirrelmail/bsd.squirrelmail.mk b/mail/squirrelmail/bsd.squirrelmail.mk index 4ec2ad175634..8fb89e36e8f8 100644 --- a/mail/squirrelmail/bsd.squirrelmail.mk +++ b/mail/squirrelmail/bsd.squirrelmail.mk @@ -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} diff --git a/mail/squirrelmail/distinfo b/mail/squirrelmail/distinfo index 097e10546e39..38a76039c237 100644 --- a/mail/squirrelmail/distinfo +++ b/mail/squirrelmail/distinfo @@ -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 diff --git a/mail/squirrelmail/pkg-help b/mail/squirrelmail/pkg-help index 0cb06997d081..ceba0aba343f 100644 --- a/mail/squirrelmail/pkg-help +++ b/mail/squirrelmail/pkg-help @@ -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. |