Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 23 Sep 2014 20:57:43 +0000 (UTC)
From:      Olli Hauer <ohauer@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r369122 - head/www/fusionpbx
Message-ID:  <201409232057.s8NKvhI8009918@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ohauer
Date: Tue Sep 23 20:57:42 2014
New Revision: 369122
URL: http://svnweb.freebsd.org/changeset/ports/369122
QAT: https://qat.redports.org/buildarchive/r369122/

Log:
  - do not overwrite other DEFAULT_VERSIONS defined in make.conf
      s/DEFAULT_VERSIONS=/DEFAULT_VERSIONS+=/
  - remove CHOWN in makefile and use COPYTREE_SHARE
  - trim pkg-plist to new format

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

Modified: head/www/fusionpbx/Makefile
==============================================================================
--- head/www/fusionpbx/Makefile	Tue Sep 23 20:57:42 2014	(r369121)
+++ head/www/fusionpbx/Makefile	Tue Sep 23 20:57:42 2014	(r369122)
@@ -21,7 +21,7 @@ USE_PHP=	dom filter ftp json pcre pdo pd
 		xsl zlib odbc
 USE_SQLITE=	yes
 
-DEFAULT_VERSIONS=php=5
+DEFAULT_VERSIONS+=php=5
 
 VARBASE=	/var
 
@@ -45,12 +45,7 @@ USE_PHP+=	mysql pdo_mysql
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
-	@${FIND} ${WRKSRC} -name '*.php' -exec ${CHMOD} 644 {} +
-	@cd ${WRKSRC}; ${FIND} . \
-		| ${CPIO} -pdm -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}
-	@${CHOWN} -R www:www ${STAGEDIR}${WWWDIR}
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR})
 	@${MKDIR} ${STAGEDIR}${VARBASE}/db/fusionpbx
-	@${CHMOD} -R 0744 ${STAGEDIR}${VARBASE}/db/fusionpbx
-	@${CHOWN} www:www ${STAGEDIR}${VARBASE}/db/fusionpbx
 
 .include <bsd.port.mk>

Modified: head/www/fusionpbx/pkg-plist
==============================================================================
--- head/www/fusionpbx/pkg-plist	Tue Sep 23 20:57:42 2014	(r369121)
+++ head/www/fusionpbx/pkg-plist	Tue Sep 23 20:57:42 2014	(r369122)
@@ -1352,255 +1352,5 @@
 %%WWWDIR%%/themes/enhanced/menu_background.png
 %%WWWDIR%%/themes/enhanced/root.php
 %%WWWDIR%%/themes/enhanced/template.php
-@dirrm %%WWWDIR%%/app/gateways
-@dirrm %%WWWDIR%%/app/modules
-@dirrm %%WWWDIR%%/app/registrations
-@dirrm %%WWWDIR%%/app/xmpp
-@dirrm %%WWWDIR%%/app/park
-@dirrm %%WWWDIR%%/app/conferences_active
-@dirrm %%WWWDIR%%/app/call_broadcast
-@dirrm %%WWWDIR%%/app/call_center
-@dirrm %%WWWDIR%%/app/provision_editor/images/thumbnails
-@dirrm %%WWWDIR%%/app/provision_editor/images
-@dirrm %%WWWDIR%%/app/provision_editor
-@dirrm %%WWWDIR%%/app/sip_profiles/resources/xml/sip_profiles
-@dirrm %%WWWDIR%%/app/sip_profiles/resources/xml
-@dirrm %%WWWDIR%%/app/sip_profiles/resources
-@dirrm %%WWWDIR%%/app/sip_profiles
-@dirrm %%WWWDIR%%/app/ivr_menu/resources/classes
-@dirrm %%WWWDIR%%/app/ivr_menu/resources/functions
-@dirrm %%WWWDIR%%/app/ivr_menu/resources
-@dirrm %%WWWDIR%%/app/ivr_menu
-@dirrm %%WWWDIR%%/app/conferences
-@dirrm %%WWWDIR%%/app/voicemails/resources/classes
-@dirrm %%WWWDIR%%/app/voicemails/resources/switch/scripts
-@dirrm %%WWWDIR%%/app/voicemails/resources/switch
-@dirrm %%WWWDIR%%/app/voicemails/resources
-@dirrm %%WWWDIR%%/app/voicemails
-@dirrm %%WWWDIR%%/app/hot_desking/resources/xml/dialplan
-@dirrm %%WWWDIR%%/app/hot_desking/resources/xml
-@dirrm %%WWWDIR%%/app/hot_desking/resources
-@dirrm %%WWWDIR%%/app/hot_desking
-@dirrm %%WWWDIR%%/app/time_conditions
-@dirrm %%WWWDIR%%/app/content
-@dirrm %%WWWDIR%%/app/traffic_graph
-@dirrm %%WWWDIR%%/app/exec
-@dirrm %%WWWDIR%%/app/devices
-@dirrm %%WWWDIR%%/app/call_center_active
-@dirrm %%WWWDIR%%/app/conference_centers/resources/classes
-@dirrm %%WWWDIR%%/app/conference_centers/resources
-@dirrm %%WWWDIR%%/app/conference_centers
-@dirrm %%WWWDIR%%/app/grammar_edit/images/thumbnails
-@dirrm %%WWWDIR%%/app/grammar_edit/images
-@dirrm %%WWWDIR%%/app/grammar_edit
-@dirrm %%WWWDIR%%/app/voicemail_greetings
-@dirrm %%WWWDIR%%/app/fifo_list
-@dirrm %%WWWDIR%%/app/click_to_call
-@dirrm %%WWWDIR%%/app/follow_me
-@dirrm %%WWWDIR%%/app/dialplan_features/resources/xml/dialplan
-@dirrm %%WWWDIR%%/app/dialplan_features/resources/xml
-@dirrm %%WWWDIR%%/app/dialplan_features/resources
-@dirrm %%WWWDIR%%/app/dialplan_features
-@dirrm %%WWWDIR%%/app/sql_query
-@dirrm %%WWWDIR%%/app/calls_active
-@dirrm %%WWWDIR%%/app/dialplan_inbound
-@dirrm %%WWWDIR%%/app/login
-@dirrm %%WWWDIR%%/app/music_on_hold/resources/classes
-@dirrm %%WWWDIR%%/app/music_on_hold/resources
-@dirrm %%WWWDIR%%/app/music_on_hold
-@dirrm %%WWWDIR%%/app/calls/resources/classes
-@dirrm %%WWWDIR%%/app/calls/resources
-@dirrm %%WWWDIR%%/app/calls
-@dirrm %%WWWDIR%%/app/sip_status
-@dirrm %%WWWDIR%%/app/php_edit/images/thumbnails
-@dirrm %%WWWDIR%%/app/php_edit/images
-@dirrm %%WWWDIR%%/app/php_edit
-@dirrm %%WWWDIR%%/app/script_edit/images/thumbnails
-@dirrm %%WWWDIR%%/app/script_edit/images
-@dirrm %%WWWDIR%%/app/script_edit
-@dirrm %%WWWDIR%%/app/meetings
-@dirrm %%WWWDIR%%/app/services
-@dirrm %%WWWDIR%%/app/ring_groups
-@dirrm %%WWWDIR%%/app/adminer
-@dirrm %%WWWDIR%%/app/provision
-@dirrm %%WWWDIR%%/app/log_viewer
-@dirrm %%WWWDIR%%/app/hunt_groups
-@dirrm %%WWWDIR%%/app/call_flows
-@dirrm %%WWWDIR%%/app/fax
-@dirrm %%WWWDIR%%/app/extensions/resources/classes
-@dirrm %%WWWDIR%%/app/extensions/resources
-@dirrm %%WWWDIR%%/app/extensions
-@dirrm %%WWWDIR%%/app/system
-@dirrm %%WWWDIR%%/app/contacts
-@dirrm %%WWWDIR%%/app/vars
-@dirrm %%WWWDIR%%/app/xml_edit/images/thumbnails
-@dirrm %%WWWDIR%%/app/xml_edit/images
-@dirrm %%WWWDIR%%/app/xml_edit
-@dirrm %%WWWDIR%%/app/xml_cdr
-@dirrm %%WWWDIR%%/app/recordings
-@dirrm %%WWWDIR%%/app/dialplan/resources/xml/dialplan
-@dirrm %%WWWDIR%%/app/dialplan/resources/xml
-@dirrm %%WWWDIR%%/app/dialplan/resources
-@dirrm %%WWWDIR%%/app/dialplan
-@dirrm %%WWWDIR%%/app/destinations
-@dirrm %%WWWDIR%%/app/fifo
-@dirrm %%WWWDIR%%/app/schemas
-@dirrm %%WWWDIR%%/app/dialplan_outbound
-@dirrm %%WWWDIR%%/app/settings
-@dirrm %%WWWDIR%%/app
-@dirrm %%WWWDIR%%/core/databases
-@dirrm %%WWWDIR%%/core/upgrade
-@dirrm %%WWWDIR%%/core/default_settings
-@dirrm %%WWWDIR%%/core/user_settings
-@dirrm %%WWWDIR%%/core/backup
-@dirrm %%WWWDIR%%/core/apps
-@dirrm %%WWWDIR%%/core/domain_settings
-@dirrm %%WWWDIR%%/core/menu
-@dirrm %%WWWDIR%%/core/users/resources/classes
-@dirrm %%WWWDIR%%/core/users/resources
-@dirrm %%WWWDIR%%/core/users
-@dirrm %%WWWDIR%%/core
-@dirrm %%WWWDIR%%/images
-@dirrm %%WWWDIR%%/includes/templates/provision/polycom/vvx
-@dirrm %%WWWDIR%%/includes/templates/provision/polycom/650
-@dirrm %%WWWDIR%%/includes/templates/provision/polycom/8030
-@dirrm %%WWWDIR%%/includes/templates/provision/polycom
-@dirrm %%WWWDIR%%/includes/templates/provision/linksys/spa3102
-@dirrm %%WWWDIR%%/includes/templates/provision/linksys/spa2102
-@dirrm %%WWWDIR%%/includes/templates/provision/linksys/spa942
-@dirrm %%WWWDIR%%/includes/templates/provision/linksys
-@dirrm %%WWWDIR%%/includes/templates/provision/yealink/t20
-@dirrm %%WWWDIR%%/includes/templates/provision/yealink/t22
-@dirrm %%WWWDIR%%/includes/templates/provision/yealink
-@dirrm %%WWWDIR%%/includes/templates/provision/aastra/675x
-@dirrm %%WWWDIR%%/includes/templates/provision/aastra
-@dirrm %%WWWDIR%%/includes/templates/provision/cisco/spa504g
-@dirrm %%WWWDIR%%/includes/templates/provision/cisco/7960
-@dirrm %%WWWDIR%%/includes/templates/provision/cisco/spa303
-@dirrm %%WWWDIR%%/includes/templates/provision/cisco/spa525g
-@dirrm %%WWWDIR%%/includes/templates/provision/cisco/spa112
-@dirrm %%WWWDIR%%/includes/templates/provision/cisco/7940
-@dirrm %%WWWDIR%%/includes/templates/provision/cisco
-@dirrm %%WWWDIR%%/includes/templates/provision/grandstream
-@dirrm %%WWWDIR%%/includes/templates/provision/snom/820
-@dirrm %%WWWDIR%%/includes/templates/provision/snom/320
-@dirrm %%WWWDIR%%/includes/templates/provision/snom/300
-@dirrm %%WWWDIR%%/includes/templates/provision/snom
-@dirrm %%WWWDIR%%/includes/templates/provision
-@dirrm %%WWWDIR%%/includes/templates/conf/autoload_configs
-@dirrm %%WWWDIR%%/includes/templates/conf/chatplan
-@dirrm %%WWWDIR%%/includes/templates/conf/ivr_menus
-@dirrm %%WWWDIR%%/includes/templates/conf/dialplan/default
-@dirrm %%WWWDIR%%/includes/templates/conf/dialplan/public
-@dirrm %%WWWDIR%%/includes/templates/conf/dialplan/skinny-patterns
-@dirrm %%WWWDIR%%/includes/templates/conf/dialplan
-@dirrm %%WWWDIR%%/includes/templates/conf/lang/he/dir
-@dirrm %%WWWDIR%%/includes/templates/conf/lang/he/demo
-@dirrm %%WWWDIR%%/includes/templates/conf/lang/he/vm
-@dirrm %%WWWDIR%%/includes/templates/conf/lang/he
-@dirrm %%WWWDIR%%/includes/templates/conf/lang/fr/demo
-@dirrm %%WWWDIR%%/includes/templates/conf/lang/fr/dir
-@dirrm %%WWWDIR%%/includes/templates/conf/lang/fr/vm
-@dirrm %%WWWDIR%%/includes/templates/conf/lang/fr
-@dirrm %%WWWDIR%%/includes/templates/conf/lang/en/ivr
-@dirrm %%WWWDIR%%/includes/templates/conf/lang/en/demo
-@dirrm %%WWWDIR%%/includes/templates/conf/lang/en/vm
-@dirrm %%WWWDIR%%/includes/templates/conf/lang/en/dir
-@dirrm %%WWWDIR%%/includes/templates/conf/lang/en
-@dirrm %%WWWDIR%%/includes/templates/conf/lang/de/demo
-@dirrm %%WWWDIR%%/includes/templates/conf/lang/de/vm
-@dirrm %%WWWDIR%%/includes/templates/conf/lang/de
-@dirrm %%WWWDIR%%/includes/templates/conf/lang/ru/vm
-@dirrm %%WWWDIR%%/includes/templates/conf/lang/ru/demo
-@dirrm %%WWWDIR%%/includes/templates/conf/lang/ru/dir
-@dirrm %%WWWDIR%%/includes/templates/conf/lang/ru
-@dirrm %%WWWDIR%%/includes/templates/conf/lang
-@dirrm %%WWWDIR%%/includes/templates/conf/mrcp_profiles
-@dirrm %%WWWDIR%%/includes/templates/conf/skinny_profiles
-@dirrm %%WWWDIR%%/includes/templates/conf/directory/default
-@dirrm %%WWWDIR%%/includes/templates/conf/directory
-@dirrm %%WWWDIR%%/includes/templates/conf/jingle_profiles
-@dirrm %%WWWDIR%%/includes/templates/conf/sip_profiles/external
-@dirrm %%WWWDIR%%/includes/templates/conf/sip_profiles/internal
-@dirrm %%WWWDIR%%/includes/templates/conf/sip_profiles
-@dirrm %%WWWDIR%%/includes/templates/conf
-@dirrm %%WWWDIR%%/includes/templates
-@dirrm %%WWWDIR%%/includes/javascript
-@dirrm %%WWWDIR%%/includes/qr
-@dirrm %%WWWDIR%%/includes/edit_area/langs
-@dirrm %%WWWDIR%%/includes/edit_area/images
-@dirrm %%WWWDIR%%/includes/edit_area/plugins/charmap/jscripts
-@dirrm %%WWWDIR%%/includes/edit_area/plugins/charmap/langs
-@dirrm %%WWWDIR%%/includes/edit_area/plugins/charmap/css
-@dirrm %%WWWDIR%%/includes/edit_area/plugins/charmap/images
-@dirrm %%WWWDIR%%/includes/edit_area/plugins/charmap
-@dirrm %%WWWDIR%%/includes/edit_area/plugins/test/css
-@dirrm %%WWWDIR%%/includes/edit_area/plugins/test/images
-@dirrm %%WWWDIR%%/includes/edit_area/plugins/test/langs
-@dirrm %%WWWDIR%%/includes/edit_area/plugins/test
-@dirrm %%WWWDIR%%/includes/edit_area/plugins
-@dirrm %%WWWDIR%%/includes/edit_area/reg_syntax
-@dirrm %%WWWDIR%%/includes/edit_area
-@dirrm %%WWWDIR%%/includes/install/autoload_configs
-@dirrm %%WWWDIR%%/includes/install/sql
-@dirrm %%WWWDIR%%/includes/install/dialplan
-@dirrm %%WWWDIR%%/includes/install/sounds/en/us/callie/custom/16000
-@dirrm %%WWWDIR%%/includes/install/sounds/en/us/callie/custom/8000
-@dirrm %%WWWDIR%%/includes/install/sounds/en/us/callie/custom
-@dirrm %%WWWDIR%%/includes/install/sounds/en/us/callie
-@dirrm %%WWWDIR%%/includes/install/sounds/en/us
-@dirrm %%WWWDIR%%/includes/install/sounds/en
-@dirrm %%WWWDIR%%/includes/install/sounds
-@dirrm %%WWWDIR%%/includes/install/lang/en/wakeup
-@dirrm %%WWWDIR%%/includes/install/lang/en
-@dirrm %%WWWDIR%%/includes/install/lang
-@dirrm %%WWWDIR%%/includes/install/scripts/resources/functions
-@dirrm %%WWWDIR%%/includes/install/scripts/resources
-@dirrm %%WWWDIR%%/includes/install/scripts/app/xml_handler/resources/scripts/configuration
-@dirrm %%WWWDIR%%/includes/install/scripts/app/xml_handler/resources/scripts/dialplan
-@dirrm %%WWWDIR%%/includes/install/scripts/app/xml_handler/resources/scripts/directory/action
-@dirrm %%WWWDIR%%/includes/install/scripts/app/xml_handler/resources/scripts/directory
-@dirrm %%WWWDIR%%/includes/install/scripts/app/xml_handler/resources/scripts
-@dirrm %%WWWDIR%%/includes/install/scripts/app/xml_handler/resources
-@dirrm %%WWWDIR%%/includes/install/scripts/app/xml_handler
-@dirrm %%WWWDIR%%/includes/install/scripts/app/conference_center/resources/templates/en/us
-@dirrm %%WWWDIR%%/includes/install/scripts/app/conference_center/resources/templates/en
-@dirrm %%WWWDIR%%/includes/install/scripts/app/conference_center/resources/templates
-@dirrm %%WWWDIR%%/includes/install/scripts/app/conference_center/resources
-@dirrm %%WWWDIR%%/includes/install/scripts/app/conference_center
-@dirrm %%WWWDIR%%/includes/install/scripts/app/voicemail/resources/templates/en/gb
-@dirrm %%WWWDIR%%/includes/install/scripts/app/voicemail/resources/templates/en/us
-@dirrm %%WWWDIR%%/includes/install/scripts/app/voicemail/resources/templates/en
-@dirrm %%WWWDIR%%/includes/install/scripts/app/voicemail/resources/templates
-@dirrm %%WWWDIR%%/includes/install/scripts/app/voicemail/resources/functions
-@dirrm %%WWWDIR%%/includes/install/scripts/app/voicemail/resources/scripts
-@dirrm %%WWWDIR%%/includes/install/scripts/app/voicemail/resources
-@dirrm %%WWWDIR%%/includes/install/scripts/app/voicemail
-@dirrm %%WWWDIR%%/includes/install/scripts/app
-@dirrm %%WWWDIR%%/includes/install/scripts
-@dirrm %%WWWDIR%%/includes/install/htdocs
-@dirrm %%WWWDIR%%/includes/install
-@dirrm %%WWWDIR%%/includes/fpdf/font
-@dirrm %%WWWDIR%%/includes/fpdf
-@dirrm %%WWWDIR%%/includes/classes
-@dirrm %%WWWDIR%%/includes/jquery/flot
-@dirrm %%WWWDIR%%/includes/jquery
-@dirrm %%WWWDIR%%/includes/pop3
-@dirrm %%WWWDIR%%/includes/captcha/fonts
-@dirrm %%WWWDIR%%/includes/captcha
-@dirrm %%WWWDIR%%/includes
-@dirrm %%WWWDIR%%/resources/phpmailer/language
-@dirrm %%WWWDIR%%/resources/phpmailer
-@dirrm %%WWWDIR%%/resources
-@dirrm %%WWWDIR%%/secure
-@dirrm %%WWWDIR%%/themes/accessible
-@dirrm %%WWWDIR%%/themes/default/images/backgrounds
-@dirrm %%WWWDIR%%/themes/default/images
-@dirrm %%WWWDIR%%/themes/default
-@dirrm %%WWWDIR%%/themes/enhanced/images/backgrounds
-@dirrm %%WWWDIR%%/themes/enhanced/images
-@dirrm %%WWWDIR%%/themes/enhanced
-@dirrm %%WWWDIR%%/themes/classic
-@dirrm %%WWWDIR%%/themes
-@dirrmtry %%WWWDIR%%
-@unexec rmdir "/var/db/fusionpbx" >/dev/null 2>&1 || :
+@dir %%WWWDIR%%
+@dir(,,755) /var/db/fusionpbx



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