Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 24 Apr 2014 21:49:07 +0000 (UTC)
From:      Antoine Brodin <antoine@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r352071 - head/www/xpi-adblock
Message-ID:  <201404242149.s3OLn7xI055786@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: antoine
Date: Thu Apr 24 21:49:07 2014
New Revision: 352071
URL: http://svnweb.freebsd.org/changeset/ports/352071
QAT: https://qat.redports.org/buildarchive/r352071/

Log:
  - No need to create in stagedir some symlinks that are regenerated by @exec
  (actually the symlinks were not created in stagedir, the line was totally buggy)
  
  - Generate a plist that is more check-stagedir friendly

Modified:
  head/www/xpi-adblock/Makefile.xpi

Modified: head/www/xpi-adblock/Makefile.xpi
==============================================================================
--- head/www/xpi-adblock/Makefile.xpi	Thu Apr 24 21:44:24 2014	(r352070)
+++ head/www/xpi-adblock/Makefile.xpi	Thu Apr 24 21:49:07 2014	(r352071)
@@ -171,11 +171,10 @@ do-install:
 	@if [ -d ${FILESDIR} -a -f ${FILESDIR}/chrome.manifest ] ; \
 		then ${INSTALL_DATA} ${FILESDIR}/chrome.manifest ${STAGEDIR}${_TD_FULL}/ ; fi
 	@${CHMOD} -R a+rX,go-w ${STAGEDIR}${_TD_FULL}/
-	@for _dir in ${XPI_LINKFARMS} ; { ${LN} -sf ${_TD_FULL} ${STAGEDR}$$_dir/ ${_Q} ; }
 	@${ECHO_CMD} '@exec ${INSTALL} -d ${XPI_SLDIRS_ALL:S,^${STAGEDIR}${PREFIX},%D,}' ${_A}
 	@${ECHO_CMD} '@exec for _dir in ${XPI_LINKFARMS} ; { ${LN} -sf ${_TD_FULL} $$_dir/ ${_Q}; }' ${_A}
 	@${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ; { ${RM} -f $$_dir/${XPI_ID} ; }' ${_A}
-	@${ECHO_CMD} '@unexec rmdir ${XPI_DIRS_TRY:S,^,%D/,} ${_Q}' ${_A}
+	@for _dir in ${XPI_DIRS_TRY} ; { ${ECHO_CMD} "@unexec rmdir %D/$$_dir ${_Q}" ${_A} ; }
 .endif
 
 .if !target(relink)



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