Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 11 Jul 2014 23:16:20 +0000 (UTC)
From:      Nicola Vitale <nivit@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r361592 - head/www/apache-forrest
Message-ID:  <201407112316.s6BNGKu7016810@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: nivit
Date: Fri Jul 11 23:16:20 2014
New Revision: 361592
URL: http://svnweb.freebsd.org/changeset/ports/361592
QAT: https://qat.redports.org/buildarchive/r361592/

Log:
  - Fix build on 8.X and 9.X, where make(1) does not support
    the @ modifier
  
  PR:	191765
  Submitted by:	Dan Lukes <dan@obluda.cz>

Modified:
  head/www/apache-forrest/Makefile

Modified: head/www/apache-forrest/Makefile
==============================================================================
--- head/www/apache-forrest/Makefile	Fri Jul 11 22:43:47 2014	(r361591)
+++ head/www/apache-forrest/Makefile	Fri Jul 11 23:16:20 2014	(r361592)
@@ -16,9 +16,12 @@ COMMENT=		Tool for rapid development of 
 ANT=			${STAGEDIR}${DATADIR}/tools/ant/bin/ant
 ANT_TARGET=		local-deploy
 
-IGNORE_FILES=		KEYS README.txt .gitignore *.bak *.bat \
-			*.orig forrest ant index.html
-IGNORE_FILES:=		${IGNORE_FILES:@f@-and ! -name ${f}@}
+IGNORE_FILES=		! -name *\.bak -and ! -name *\.bat \
+			-and ! -name *\.orig -and ! -name .gitignore \
+			-and ! -name KEYS -and ! -name README.txt \
+			-and ! -name ant -and ! -name forrest \
+			-and ! -name index.html
+
 INSTALL_WRKSRC=		${WRKSRC}/build
 
 JAVA_VERSION=		1.6+
@@ -42,7 +45,7 @@ post-patch:
 
 do-install:
 	@cd ${WRKSRC}; \
-	${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} '${IGNORE_FILES:[2..-1]}'
+	${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} '${IGNORE_FILES}'
 	@${INSTALL_SCRIPT} ${WRKSRC}/bin/forrest ${STAGEDIR}${DATADIR}/bin/forrest
 	@${INSTALL_SCRIPT} ${WRKSRC}/tools/ant/bin/ant ${STAGEDIR}${DATADIR}/tools/ant/bin/ant
 	@${LN} -sf ../${DATADIR_REL}/bin/forrest ${STAGEDIR}${PREFIX}/bin/forrest



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