svn commit: r398821 - head/security/maia

[Dmitry Marakasov]

Author: amdmi3
Date: Thu Oct  8 13:19:42 2015
New Revision: 398821
URL: https://svnweb.freebsd.org/changeset/ports/398821

Log:
  - Move file owner handling to plist, fix stage as non-root
  
  PR:		203287
  Submitted by:	amdmi3
  Approved by:	maintainer timeout (ek at purplehat.org, 2 weeks)

Modified:
  head/security/maia/Makefile
  head/security/maia/pkg-plist

Modified: head/security/maia/Makefile
==============================================================================
--- head/security/maia/Makefile	Thu Oct  8 12:56:37 2015	(r398820)
+++ head/security/maia/Makefile	Thu Oct  8 13:19:42 2015	(r398821)
@@ -338,7 +338,6 @@ post-patch:
 do-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR}
 	@cd ${WRKSRC}/php && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
-	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}/
 	${LN} -s ${PREFIX}/share/smarty ${STAGEDIR}${WWWDIR}/libs/Smarty
 	${MKDIR} -p ${STAGEDIR}${DATADIR}
 	@cd ${WRKSRC}/scripts && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/scripts
@@ -350,11 +349,10 @@ do-install:
 	${INSTALL} -m 640 ${WRKSRC}/maiad.conf.dist ${STAGEDIR}${ETCDIR}/maiad.conf.dist
 	${INSTALL} -m 640 ${WRKSRC}/maia.conf.dist ${STAGEDIR}${ETCDIR}/maia.conf.dist
 
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.post.mk>

Modified: head/security/maia/pkg-plist
==============================================================================
--- head/security/maia/pkg-plist	Thu Oct  8 12:56:37 2015	(r398820)
+++ head/security/maia/pkg-plist	Thu Oct  8 13:19:42 2015	(r398821)
@@ -40,6 +40,8 @@ sbin/maiad
 %%DATADIR%%/scripts/send-quarantine-reminders.pl
 %%DATADIR%%/scripts/stats-snapshot.pl
 @mode
+ at owner %%WWWOWN%%
+ at group %%WWWGRP%%
 %%WWWDIR%%/admin/configtest.php
 %%WWWDIR%%/admin/dblib.php
 %%WWWDIR%%/admin/internal-init.php
@@ -59,11 +61,7 @@ sbin/maiad
 %%WWWDIR%%/chart_rules.php
 %%WWWDIR%%/chart_stats.php
 %%WWWDIR%%/chart_virus.php
- at mode 640
- at group %%WWWGRP%%
-%%WWWDIR%%/config.php.dist
- at group
- at mode
+@(%%WWWOWN%%,%%WWWGRP%%,640) %%WWWDIR%%/config.php.dist
 %%WWWDIR%%/confirm.php
 %%WWWDIR%%/constants.php
 %%WWWDIR%%/core.php
@@ -909,7 +907,53 @@ sbin/maiad
 %%WWWDIR%%/ximpersonate.php
 %%WWWDIR%%/xlogin.php
 %%WWWDIR%%/xsettings.php
- at dir %%WWWDIR%%/themes/desert_sand/compiled
- at dir %%WWWDIR%%/themes/dgm/compiled
- at dir %%WWWDIR%%/themes/ocean_surf/compiled
 @dir %%WWWDIR%%/web
+ at dir %%WWWDIR%%/themes/ocean_surf/templates/settings
+ at dir %%WWWDIR%%/themes/ocean_surf/templates
+ at dir %%WWWDIR%%/themes/ocean_surf/javascript
+ at dir %%WWWDIR%%/themes/ocean_surf/images
+ at dir %%WWWDIR%%/themes/ocean_surf/css/images
+ at dir %%WWWDIR%%/themes/ocean_surf/css
+ at dir %%WWWDIR%%/themes/ocean_surf/compiled
+ at dir %%WWWDIR%%/themes/ocean_surf/code
+ at dir %%WWWDIR%%/themes/ocean_surf
+ at dir %%WWWDIR%%/themes/dgm/templates
+ at dir %%WWWDIR%%/themes/dgm/images
+ at dir %%WWWDIR%%/themes/dgm/css
+ at dir %%WWWDIR%%/themes/dgm/compiled
+ at dir %%WWWDIR%%/themes/dgm/code
+ at dir %%WWWDIR%%/themes/dgm
+ at dir %%WWWDIR%%/themes/desert_sand/templates/welcome
+ at dir %%WWWDIR%%/themes/desert_sand/templates/settings
+ at dir %%WWWDIR%%/themes/desert_sand/templates
+ at dir %%WWWDIR%%/themes/desert_sand/javascript
+ at dir %%WWWDIR%%/themes/desert_sand/images
+ at dir %%WWWDIR%%/themes/desert_sand/css/images
+ at dir %%WWWDIR%%/themes/desert_sand/css
+ at dir %%WWWDIR%%/themes/desert_sand/compiled
+ at dir %%WWWDIR%%/themes/desert_sand/code
+ at dir %%WWWDIR%%/themes/desert_sand
+ at dir %%WWWDIR%%/themes
+ at dir %%WWWDIR%%/overlib/mini
+ at dir %%WWWDIR%%/overlib
+ at dir %%WWWDIR%%/maia_db
+ at dir %%WWWDIR%%/locale/sv
+ at dir %%WWWDIR%%/locale/ru
+ at dir %%WWWDIR%%/locale/pt
+ at dir %%WWWDIR%%/locale/no
+ at dir %%WWWDIR%%/locale/nl
+ at dir %%WWWDIR%%/locale/it
+ at dir %%WWWDIR%%/locale/hu
+ at dir %%WWWDIR%%/locale/fr
+ at dir %%WWWDIR%%/locale/en
+ at dir %%WWWDIR%%/locale/de
+ at dir %%WWWDIR%%/locale/da
+ at dir %%WWWDIR%%/locale/cs
+ at dir %%WWWDIR%%/libs/jquery/images
+ at dir %%WWWDIR%%/libs/jquery
+ at dir %%WWWDIR%%/libs
+ at dir %%WWWDIR%%/images
+ at dir %%WWWDIR%%/admin
+ at dir %%WWWDIR%%
+ at owner
+ at group