Date: Sun, 4 Dec 2016 21:03:15 +0000 (UTC) From: Jason Unovitch <junovitch@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r427804 - branches/2016Q4/mail/roundcube Message-ID: <201612042103.uB4L3FK3002738@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: junovitch Date: Sun Dec 4 21:03:14 2016 New Revision: 427804 URL: https://svnweb.freebsd.org/changeset/ports/427804 Log: MFH: r423243 r423250 r423479 r427802 mail/roundcube: Update to 1.2.1 - Update to 1.2.1 - Add missing .htaccess file in WWWDIR [1] - Switch WANT_PHP_WEB to USES= php:web - Add description for DB options group - Convert all ${PORT_OPTIONS:Mfoo} to OPTIONS framework - Convert target conditionals to target-OPT-on PR: 196016 [1] Submitted by: Lukasz Wasikowski <lukasz@wasikowski.net> [1] Approved by: Maintainer timeout mail/roundcube: fix dependency when using SQLite, bump PORTREVISION mail/roundcube: 1.2.1 -> 1.2.2 PR: 196026 Changes: https://github.com/roundcube/roundcubemail/wiki/Changelog#release-122 Submitted by: brnrd Approved by: ale (maintainer timeout) mail/roundcube: update 1.2.2 -> 1.2.3; add NO_ARCH while here Changes: https://github.com/roundcube/roundcubemail/wiki/Changelog#release-123 PR: 214925 Submitted by: brnrd Security: https://vuxml.FreeBSD.org/freebsd/125f5958-b611-11e6-a9a5-b499baebfeaf.html Approved by: ports-secteam (with hat) Modified: branches/2016Q4/mail/roundcube/Makefile branches/2016Q4/mail/roundcube/distinfo Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/mail/roundcube/Makefile ============================================================================== --- branches/2016Q4/mail/roundcube/Makefile Sun Dec 4 21:03:13 2016 (r427803) +++ branches/2016Q4/mail/roundcube/Makefile Sun Dec 4 21:03:14 2016 (r427804) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= roundcube -DISTVERSION= 1.2.0 -PORTREVISION= 1 +DISTVERSION= 1.2.3 PORTEPOCH= 1 CATEGORIES?= mail www MASTER_SITES= https://github.com/roundcube/roundcubemail/releases/download/${DISTVERSION}/ @@ -13,17 +12,18 @@ COMMENT= Fully skinnable XHTML/CSS webma LICENSE= GPLv3 +NO_ARCH= yes NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME}mail-${DISTVERSION} -RCUBECOMP= SQL config index.php installer logs plugins program robots.txt skins temp vendor +RCUBECOMP= SQL config .htaccess index.php installer logs \ + plugins program robots.txt skins temp vendor PORTDOCS= CHANGELOG INSTALL README.md UPGRADING -USES= cpe +USES= cpe php:web CPE_PRODUCT= webmail CPE_VENDOR= roundcube -WANT_PHP_WEB= yes USE_PHP= pcre mbstring session iconv dom xml json intl zip filter openssl fileinfo exif OPTIONS_DEFINE= LDAP GD PSPELL NSC DOCS @@ -31,6 +31,7 @@ OPTIONS_SINGLE= DB OPTIONS_SINGLE_DB= MYSQL PGSQL SQLITE OPTIONS_DEFAULT=MYSQL +DB_DESC= Database backend MYSQL_DESC= Use MySQL backend PGSQL_DESC= Use PostgreSQL backend SQLITE_DESC= Use SQLite backend @@ -39,44 +40,17 @@ GD_DESC= Enable GD support (image conver PSPELL_DESC= Enable PSpell support (internal spellcheck) NSC_DESC= Install network spellchecker -.include <bsd.port.options.mk> +GD_VARS= use_php+=gd +LDAP_VARS= use_php+=ldap +MYSQL_VARS= use_php+=pdo_mysql +NSC_IMPLIES= PSPELL +NSC_VARS= use_php+=simplexml rcubecomp+=spellchecker.php +PGSQL_VARS= use_php+=pdo_pgsql +PSPELL_VARS= use_php+=pspell +SQLITE_VARS= use_php+=pdo_sqlite -.if ${PORT_OPTIONS:MMYSQL} -USE_PHP+= pdo_mysql -.endif - -.if ${PORT_OPTIONS:MPGSQL} -USE_PHP+= pdo_pgsql -.endif - -.if ${PORT_OPTIONS:MSQLITE} -USE_PHP+= pdo_sqlite -.endif - -.if ${PORT_OPTIONS:MLDAP} -USE_PHP+= ldap -.endif - -.if ${PORT_OPTIONS:MGD} -USE_PHP+= gd -.endif - -.if ${PORT_OPTIONS:MPSPELL} || ${PORT_OPTIONS:MNSC} -USE_PHP+= pspell -.endif - -.if ${PORT_OPTIONS:MNSC} -RCUBECOMP+= spellchecker.php -USE_PHP+= simplexml -PLIST_SUB+= SPELLCHECK="" -.else -PLIST_SUB+= SPELLCHECK="@comment " -.endif - -.if ${PORT_OPTIONS:MNSC} -post-extract: +post-extract-NSC: @${CP} ${FILESDIR}/spellchecker.php ${WRKSRC} -.endif post-patch: @${FIND} ${WRKSRC} -name \*.orig -type f -delete @@ -87,12 +61,6 @@ do-install: .for i in ${RCUBECOMP} @cd ${WRKSRC} && ${COPYTREE_SHARE} ${i} ${STAGEDIR}${WWWDIR} .endfor -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${STAGEDIR}${DOCSDIR} -.for i in ${PORTDOCS} - @${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/ -.endfor -.endif @(cd ${WRKSRC}; ${FIND} bin ${RCUBECOMP} -not -type d) | ${SORT} | \ ${SED} -ne 's,^,${WWWDIR_REL}/,p' >> ${TMPPLIST} @${ECHO_CMD} '@exec chown ${WWWOWN}:${WWWGRP} %D/${WWWDIR_REL}/logs' \ @@ -100,4 +68,10 @@ do-install: @${ECHO_CMD} '@exec chown ${WWWOWN}:${WWWGRP} %D/${WWWDIR_REL}/temp' \ >> ${TMPPLIST} +do-install-DOCS-on: + ${MKDIR} ${STAGEDIR}${DOCSDIR} +.for i in ${PORTDOCS} + @${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/ +.endfor + .include <bsd.port.mk> Modified: branches/2016Q4/mail/roundcube/distinfo ============================================================================== --- branches/2016Q4/mail/roundcube/distinfo Sun Dec 4 21:03:13 2016 (r427803) +++ branches/2016Q4/mail/roundcube/distinfo Sun Dec 4 21:03:14 2016 (r427804) @@ -1,3 +1,3 @@ -TIMESTAMP = 1465476478 -SHA256 (roundcubemail-1.2.0-complete.tar.gz) = 574895da03b5ad78eaf0843a78e0c0ab734a9327b4ba47b72405b768cb2854cc -SIZE (roundcubemail-1.2.0-complete.tar.gz) = 3748290 +TIMESTAMP = 1480409130 +SHA256 (roundcubemail-1.2.3-complete.tar.gz) = d7f1d041557639c442691a1e5fa791ab77aa97327a0d328a22e0220f3cb2ca97 +SIZE (roundcubemail-1.2.3-complete.tar.gz) = 3894127
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612042103.uB4L3FK3002738>