Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 23 Oct 2015 16:18:45 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r400032 - head/www/webgrind
Message-ID:  <201510231618.t9NGIjP8029922@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Fri Oct 23 16:18:45 2015
New Revision: 400032
URL: https://svnweb.freebsd.org/changeset/ports/400032

Log:
  - Add NO_ARCH
  - Switch to options helpers
  - Silence post-patch
  - Switch to plist owner/perm handling, fixing build from non-root
  
  PR:		203565
  Submitted by:	amdmi3
  Approved by:	maintainer timeout (lwhsu, 2 weeks)

Modified:
  head/www/webgrind/Makefile
  head/www/webgrind/pkg-plist

Modified: head/www/webgrind/Makefile
==============================================================================
--- head/www/webgrind/Makefile	Fri Oct 23 16:02:38 2015	(r400031)
+++ head/www/webgrind/Makefile	Fri Oct 23 16:18:45 2015	(r400032)
@@ -21,22 +21,20 @@ SNAPSHOT=	20140207
 USE_PHP=	yes
 
 NO_BUILD=	yes
+NO_ARCH=	yes
 
-.include <bsd.port.options.mk>
+PLIST_SUB=	WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
 
-.if ${PORT_OPTIONS:MCALLGRAPH}
-USES+=		python
-RUN_DEPENDS+=	dot:${PORTSDIR}/graphics/graphviz
-.endif
+CALLGRAPH_USES=		python
+CALLGRAPH_RUN_DEPENDS=	dot:${PORTSDIR}/graphics/graphviz
 
-post-patch:
-	${REINPLACE_CMD} -e 's,/usr/bin/python,/usr/local/bin/python,' ${WRKSRC}/config.php
+post-patch-CALLGRAPH-on:
+	@${REINPLACE_CMD} -e 's,/usr/bin/python,${PYTHON_CMD},' ${WRKSRC}/config.php
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} "*" ${STAGEDIR}${WWWDIR} "! -name *.bak")
 
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}
 	@${FIND} ${STAGEDIR}${WWWDIR} -type f -exec ${CHMOD} 0444 {} \;
 	@${FIND} ${STAGEDIR}${WWWDIR} -type d -exec ${CHMOD} 0755 {} \;
 

Modified: head/www/webgrind/pkg-plist
==============================================================================
--- head/www/webgrind/pkg-plist	Fri Oct 23 16:02:38 2015	(r400031)
+++ head/www/webgrind/pkg-plist	Fri Oct 23 16:18:45 2015	(r400032)
@@ -1,3 +1,5 @@
+@owner %%WWWOWN%%
+@group %%WWWGRP%%
 %%WWWDIR%%/README.md
 %%WWWDIR%%/config.php
 %%WWWDIR%%/img/asc.gif
@@ -38,9 +40,11 @@
 %%WWWDIR%%/styles/style.css
 %%WWWDIR%%/templates/fileviewer.phtml
 %%WWWDIR%%/templates/index.phtml
-@dirrm %%WWWDIR%%/templates
-@dirrm %%WWWDIR%%/styles
-@dirrm %%WWWDIR%%/library
-@dirrm %%WWWDIR%%/js
-@dirrm %%WWWDIR%%/img
-@dirrm %%WWWDIR%%
+@dir %%WWWDIR%%/templates
+@dir %%WWWDIR%%/styles
+@dir %%WWWDIR%%/library
+@dir %%WWWDIR%%/js
+@dir %%WWWDIR%%/img
+@dir %%WWWDIR%%
+@owner
+@group



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