From owner-svn-ports-all@freebsd.org Tue Oct 4 08:21:41 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 627BAAF45C2; Tue, 4 Oct 2016 08:21:41 +0000 (UTC) (envelope-from brnrd@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 40281326; Tue, 4 Oct 2016 08:21:41 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u948LeT7060107; Tue, 4 Oct 2016 08:21:40 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u948Le3m060105; Tue, 4 Oct 2016 08:21:40 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201610040821.u948Le3m060105@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Tue, 4 Oct 2016 08:21:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r423243 - head/mail/roundcube 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: Tue, 04 Oct 2016 08:21:41 -0000 Author: brnrd Date: Tue Oct 4 08:21:40 2016 New Revision: 423243 URL: https://svnweb.freebsd.org/changeset/ports/423243 Log: 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 [1] Approved by: Maintainer timeout Modified: head/mail/roundcube/Makefile head/mail/roundcube/distinfo Modified: head/mail/roundcube/Makefile ============================================================================== --- head/mail/roundcube/Makefile Tue Oct 4 07:51:49 2016 (r423242) +++ head/mail/roundcube/Makefile Tue Oct 4 08:21:40 2016 (r423243) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= roundcube -DISTVERSION= 1.2.0 -PORTREVISION= 1 +DISTVERSION= 1.2.1 PORTEPOCH= 1 CATEGORIES?= mail www MASTER_SITES= https://github.com/roundcube/roundcubemail/releases/download/${DISTVERSION}/ @@ -16,14 +15,14 @@ LICENSE= GPLv3 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 +30,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 +39,17 @@ GD_DESC= Enable GD support (image conver PSPELL_DESC= Enable PSpell support (internal spellcheck) NSC_DESC= Install network spellchecker -.include +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_pgsql -.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 +60,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 +67,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 Modified: head/mail/roundcube/distinfo ============================================================================== --- head/mail/roundcube/distinfo Tue Oct 4 07:51:49 2016 (r423242) +++ head/mail/roundcube/distinfo Tue Oct 4 08:21:40 2016 (r423243) @@ -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 = 1475568853 +SHA256 (roundcubemail-1.2.1-complete.tar.gz) = 271aabea275739b5a1f66510b02b79818aa218ffbac2abc9ff168e20a9031d45 +SIZE (roundcubemail-1.2.1-complete.tar.gz) = 3854668