- Allow staging as a regular user

- Bump portrevision as some files were not packaged with intended owner

2 files changed, 5 insertions, 216 deletions

diff --git a/deskutils/myitcrm/Makefile b/deskutils/myitcrm/Makefile
index b92f22a605bb..988be766afd6 100644
--- a/deskutils/myitcrm/Makefile
+++ b/deskutils/myitcrm/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	myitcrm
 PORTVERSION=	0.2.9.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils
 MASTER_SITES=	SF/myitcrm/
 DISTNAME=	MyITCRM1-${PORTVERSION}
@@ -18,8 +18,8 @@ USE_PHP=	mysql session xml
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/MyITCRM-${PORTVERSION}
 
+PLIST_SUB=	WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
 SUB_FILES=	pkg-message
-PLIST_DIRSTRY=	%%WWWDIR%%
 PATCH_STRIP=	-p1
 WRITEABLE=	conf.php.sample log/access.log cache
 PORTEXAMPLES=	htaccess.txt
@@ -63,7 +63,6 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} '${WWW_IGNORE}')
 .for ent in ${WRITEABLE}
-	@${CHOWN} ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}/${ent}
 	@${CHMOD} u+w ${STAGEDIR}${WWWDIR}/${ent}
 .endfor
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
diff --git a/deskutils/myitcrm/pkg-plist b/deskutils/myitcrm/pkg-plist
index eafbf6c4da71..8d46c34f7cf6 100644
--- a/deskutils/myitcrm/pkg-plist
+++ b/deskutils/myitcrm/pkg-plist
@@ -1,7 +1,7 @@
 %%WWWDIR%%/backup/.htaccess
 %%WWWDIR%%/backup/bigdump.php
 %%WWWDIR%%/cache/index.php
-@sample %%WWWDIR%%/conf.php.sample
+@sample(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/conf.php.sample
 %%WWWDIR%%/cron/.htaccess
 %%WWWDIR%%/cron/backup.php
 %%WWWDIR%%/cron/index.php
@@ -860,7 +860,7 @@
 %%WWWDIR%%/language/english.xml
 %%WWWDIR%%/language/english_US.xml
 %%WWWDIR%%/language/index.php
-%%WWWDIR%%/log/access.log
+@(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/log/access.log
 %%WWWDIR%%/log/index.php
 %%WWWDIR%%/login.php
 %%WWWDIR%%/modules/asset/index.php
@@ -1148,214 +1148,4 @@
 %%WWWDIR%%/upload/index.php
 %%WWWDIR%%/upload/rate_upload.csv
 %%WWWDIR%%/version.php
-@dirrm %%WWWDIR%%/upload
-@dirrm %%WWWDIR%%/upgrade/0292_0293
-@dirrm %%WWWDIR%%/upgrade/0291_0292
-@dirrm %%WWWDIR%%/upgrade/0290_0291
-@dirrm %%WWWDIR%%/upgrade/0281_0290
-@dirrm %%WWWDIR%%/upgrade
-@dirrm %%WWWDIR%%/templates/workorder/blocks
-@dirrm %%WWWDIR%%/templates/workorder
-@dirrm %%WWWDIR%%/templates/supplier
-@dirrm %%WWWDIR%%/templates/stats
-@dirrm %%WWWDIR%%/templates/schedule
-@dirrm %%WWWDIR%%/templates/refund
-@dirrm %%WWWDIR%%/templates/parts
-@dirrm %%WWWDIR%%/templates/invoice
-@dirrm %%WWWDIR%%/templates/expense
-@dirrm %%WWWDIR%%/templates/employees
-@dirrm %%WWWDIR%%/templates/customer
-@dirrm %%WWWDIR%%/templates/core
-@dirrm %%WWWDIR%%/templates/control
-@dirrm %%WWWDIR%%/templates/billing
-@dirrm %%WWWDIR%%/templates/asset
-@dirrm %%WWWDIR%%/templates
-@dirrm %%WWWDIR%%/modules/workorder
-@dirrm %%WWWDIR%%/modules/supplier
-@dirrm %%WWWDIR%%/modules/stats
-@dirrm %%WWWDIR%%/modules/schedule
-@dirrm %%WWWDIR%%/modules/refund
-@dirrm %%WWWDIR%%/modules/parts
-@dirrm %%WWWDIR%%/modules/invoice
-@dirrm %%WWWDIR%%/modules/expense
-@dirrm %%WWWDIR%%/modules/employees
-@dirrm %%WWWDIR%%/modules/customer
-@dirrm %%WWWDIR%%/modules/core/include
-@dirrm %%WWWDIR%%/modules/core
-@dirrm %%WWWDIR%%/modules/control
-@dirrm %%WWWDIR%%/modules/billing/payments
-@dirrm %%WWWDIR%%/modules/billing
-@dirrm %%WWWDIR%%/modules/asset
-@dirrm %%WWWDIR%%/modules
-@dirrmtry %%WWWDIR%%/log
-@dirrm %%WWWDIR%%/language
-@dirrm %%WWWDIR%%/js
-@dirrm %%WWWDIR%%/install
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/utils
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/img
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/themes/simple/skins/default
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/themes/simple/skins
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/themes/simple/langs
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/themes/simple/img
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/themes/simple
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/themes/advanced/skins/default
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/themes/advanced/skins
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/themes/advanced/langs
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/themes/advanced/js
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/themes/advanced/img
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/themes/advanced
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/themes
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/wordcount
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/visualchars
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/template/langs
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/template/js
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/template/css
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/template
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/table/langs
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/table/js
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/table/css
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/table
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/tabfocus
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/style/langs
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/style/js
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/style/css
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/style
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/spellchecker/img
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/spellchecker/css
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/spellchecker
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/searchreplace/js
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/searchreplace/css
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/searchreplace
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/save
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/print
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/preview/jscripts
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/preview
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/paste/langs
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/paste/js
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/paste
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/pagebreak/img
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/pagebreak/css
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/pagebreak
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/noneditable
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/nonbreaking
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/media/langs
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/media/js
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/media/img
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/media/css
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/media
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/legacyoutput
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/layer
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/insertdatetime
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/inlinepopups
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/iespell
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/fullscreen
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/fullpage/langs
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/fullpage/js
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/fullpage/css
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/fullpage
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/example/langs
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/example/js
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/example/img
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/example
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/emotions/langs
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/emotions/js
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/emotions/img
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/emotions
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/directionality
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/contextmenu
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/bbcode
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/autosave/langs
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/autosave
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/autoresize
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/advlist
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/advlink/langs
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/advlink/js
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/advlink/css
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/advlink
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/advimage/langs
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/advimage/js
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/advimage/img
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/advimage/css
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/advimage
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/advhr/langs
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/advhr/js
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/advhr/css
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins/advhr
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/plugins
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce/langs
-@dirrm %%WWWDIR%%/include/tinymce/jscripts/tiny_mce
-@dirrm %%WWWDIR%%/include/tinymce/jscripts
-@dirrm %%WWWDIR%%/include/tinymce
-@dirrm %%WWWDIR%%/include/swift/lib/dependency_maps
-@dirrm %%WWWDIR%%/include/swift/lib/classes/Swift/Transport/Esmtp/Auth
-@dirrm %%WWWDIR%%/include/swift/lib/classes/Swift/Transport/Esmtp
-@dirrm %%WWWDIR%%/include/swift/lib/classes/Swift/Transport
-@dirrm %%WWWDIR%%/include/swift/lib/classes/Swift/StreamFilters
-@dirrm %%WWWDIR%%/include/swift/lib/classes/Swift/Plugins/Reporters
-@dirrm %%WWWDIR%%/include/swift/lib/classes/Swift/Plugins/Pop
-@dirrm %%WWWDIR%%/include/swift/lib/classes/Swift/Plugins/Loggers
-@dirrm %%WWWDIR%%/include/swift/lib/classes/Swift/Plugins/Decorator
-@dirrm %%WWWDIR%%/include/swift/lib/classes/Swift/Plugins
-@dirrm %%WWWDIR%%/include/swift/lib/classes/Swift/Mime/Headers
-@dirrm %%WWWDIR%%/include/swift/lib/classes/Swift/Mime/HeaderEncoder
-@dirrm %%WWWDIR%%/include/swift/lib/classes/Swift/Mime/ContentEncoder
-@dirrm %%WWWDIR%%/include/swift/lib/classes/Swift/Mime
-@dirrm %%WWWDIR%%/include/swift/lib/classes/Swift/Mailer
-@dirrm %%WWWDIR%%/include/swift/lib/classes/Swift/KeyCache
-@dirrm %%WWWDIR%%/include/swift/lib/classes/Swift/Events
-@dirrm %%WWWDIR%%/include/swift/lib/classes/Swift/Encoder
-@dirrm %%WWWDIR%%/include/swift/lib/classes/Swift/CharacterStream
-@dirrm %%WWWDIR%%/include/swift/lib/classes/Swift/CharacterReaderFactory
-@dirrm %%WWWDIR%%/include/swift/lib/classes/Swift/CharacterReader
-@dirrm %%WWWDIR%%/include/swift/lib/classes/Swift/ByteStream
-@dirrm %%WWWDIR%%/include/swift/lib/classes/Swift
-@dirrm %%WWWDIR%%/include/swift/lib/classes
-@dirrm %%WWWDIR%%/include/swift/lib
-@dirrm %%WWWDIR%%/include/swift
-@dirrm %%WWWDIR%%/include/jscalendar/lang
-@dirrm %%WWWDIR%%/include/jscalendar
-@dirrm %%WWWDIR%%/include/fpdf/font/makefont
-@dirrm %%WWWDIR%%/include/fpdf/font
-@dirrm %%WWWDIR%%/include/fpdf
-@dirrm %%WWWDIR%%/include/dhtmlxcombo/imgs
-@dirrm %%WWWDIR%%/include/dhtmlxcombo/ext
-@dirrm %%WWWDIR%%/include/dhtmlxcombo
-@dirrm %%WWWDIR%%/include/SMARTY/plugins
-@dirrm %%WWWDIR%%/include/SMARTY/internals
-@dirrm %%WWWDIR%%/include/SMARTY
-@dirrm %%WWWDIR%%/include/ADODB/xsl
-@dirrm %%WWWDIR%%/include/ADODB/session/old
-@dirrm %%WWWDIR%%/include/ADODB/session
-@dirrm %%WWWDIR%%/include/ADODB/perf
-@dirrm %%WWWDIR%%/include/ADODB/pear/Auth/Container
-@dirrm %%WWWDIR%%/include/ADODB/pear/Auth
-@dirrm %%WWWDIR%%/include/ADODB/pear
-@dirrm %%WWWDIR%%/include/ADODB/lang
-@dirrm %%WWWDIR%%/include/ADODB/drivers
-@dirrm %%WWWDIR%%/include/ADODB/datadict
-@dirrm %%WWWDIR%%/include/ADODB/contrib
-@dirrm %%WWWDIR%%/include/ADODB
-@dirrm %%WWWDIR%%/include
-@dirrm %%WWWDIR%%/images/paypal
-@dirrm %%WWWDIR%%/images/paymate
-@dirrm %%WWWDIR%%/images/icons/16x16
-@dirrm %%WWWDIR%%/images/icons
-@dirrm %%WWWDIR%%/images/buttons
-@dirrm %%WWWDIR%%/images
-@dirrm %%WWWDIR%%/fonts
-@dirrm %%WWWDIR%%/css
-@dirrm %%WWWDIR%%/cron
-@dirrmtry %%WWWDIR%%/cache
-@dirrm %%WWWDIR%%/backup
+@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/cache