Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 24 Oct 2019 11:17:20 +0000 (UTC)
From:      Alex Dupre <ale@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r515333 - head/mail/roundcube
Message-ID:  <201910241117.x9OBHKuc096432@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ale
Date: Thu Oct 24 11:17:20 2019
New Revision: 515333
URL: https://svnweb.freebsd.org/changeset/ports/515333

Log:
  Really fix the NSC option.
  
  For some unknown (at least to me) and weird reason even if spellchecker.php
  was appended to RCUBECOMP it didn't go in the for loop:
  
  @${ECHO} ${RCUBECOMP} # prints spellchecker.php
  .for i in ${RCUBECOMP}
  	@{ECHO} ${i} # never prints spellchecker.php
          @cd ${WRKSRC} && ${COPYTREE_SHARE} ${i} ${STAGEDIR}${WWWDIR}
  .endfor

Modified:
  head/mail/roundcube/Makefile

Modified: head/mail/roundcube/Makefile
==============================================================================
--- head/mail/roundcube/Makefile	Thu Oct 24 11:15:58 2019	(r515332)
+++ head/mail/roundcube/Makefile	Thu Oct 24 11:17:20 2019	(r515333)
@@ -46,16 +46,13 @@ 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
+NSC_VARS=	use_php+=simplexml
 PGSQL_VARS=	use_php+=pdo_pgsql
 PSPELL_VARS=	use_php+=pspell
 SQLITE_VARS=	use_php+=pdo_sqlite
 
 SUB_FILES=	newsyslog.conf
 
-post-extract-NSC-on:
-	@${CP} ${FILESDIR}/spellchecker.php ${WRKSRC}
-
 post-patch:
 	@${FIND} ${WRKSRC} -name \*.orig -type f -delete
 
@@ -71,6 +68,10 @@ do-install:
 		>> ${TMPPLIST}
 	@${ECHO_CMD} '@postexec chown ${WWWOWN}:${WWWGRP} %D/${WWWDIR_REL}/temp' \
 		>> ${TMPPLIST}
+
+do-install-NSC-on:
+	@${INSTALL_DATA} ${FILESDIR}/spellchecker.php ${STAGEDIR}${WWWDIR}
+	@${ECHO_CMD} '${WWWDIR_REL}/spellchecker.php' >> ${TMPPLIST}
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910241117.x9OBHKuc096432>