Index: head/www/mattermost-server/Makefile =================================================================== --- head/www/mattermost-server/Makefile (revision 500720) +++ head/www/mattermost-server/Makefile (revision 500721) @@ -1,53 +1,53 @@ # $FreeBSD$ PORTNAME= mattermost-server -PORTVERSION= 5.6.2 +PORTVERSION= 5.10.0 DISTVERSIONPREFIX= v CATEGORIES= www MAINTAINER= loic.blot@unix-experience.fr COMMENT= Open source Slack-alternative in Golang and React LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt ONLY_FOR_ARCHS= amd64 armv6 armv7 i386 BUILD_DEPENDS= go>=1.8.1:lang/go RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss \ mattermost-webapp>=${PORTVERSION}:www/mattermost-webapp GO_LDFLAGS= -X github.com/mattermost/mattermost-server/model.BuildNumber=${PORTVERSION} USE_RC_SUBR= mattermostd USE_GITHUB= yes GH_ACCOUNT= mattermost WWWDIR= ${PREFIX}/www/mattermost MATTERMOSTD_USER= mattermost MATTERMOSTD_GROUP= mattermost USERS= ${MATTERMOSTD_USER} GROUPS= ${MATTERMOSTD_GROUP} pre-build: @${MKDIR} ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME} @cd ${WRKSRC} && \ - ${MV} api4 app cmd doc einterfaces imports jobs manualtesting \ - mlog migrations model plugin services store utils web wsapi vendor \ + ${MV} api4 app cmd config doc einterfaces imports jobs manualtesting \ + mlog migrations model plugin services store testlib utils web wsapi vendor \ ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME} do-build: @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${GH_PROJECT} && \ ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go install -ldflags="${GO_LDFLAGS}" ./... do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/mattermost ${STAGEDIR}${PREFIX}/bin/mattermostd ${MKDIR} ${STAGEDIR}${PREFIX}/etc/mattermost - ${INSTALL_DATA} ${WRKSRC}/config/default.json ${STAGEDIR}${PREFIX}/etc/mattermost/config.json.sample + ${INSTALL_DATA} ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME}/config/default.json ${STAGEDIR}${PREFIX}/etc/mattermost/config.json.sample ${MKDIR} ${STAGEDIR}${WWWDIR} cd ${WRKSRC} && ${COPYTREE_SHARE} 'fonts i18n templates' ${STAGEDIR}${WWWDIR} .include Index: head/www/mattermost-server/distinfo =================================================================== --- head/www/mattermost-server/distinfo (revision 500720) +++ head/www/mattermost-server/distinfo (revision 500721) @@ -1,3 +1,3 @@ TIMESTAMP = 1545771660 -SHA256 (mattermost-mattermost-server-v5.6.2_GH0.tar.gz) = bb8f47045f23e4c8750da806183531b612706da84bdc7b818a735276369c2dcd -SIZE (mattermost-mattermost-server-v5.6.2_GH0.tar.gz) = 10285985 +SHA256 (mattermost-mattermost-server-v5.10.0_GH0.tar.gz) = 56f3391ad0c4df2369bc0c8d6ac15907a7bc4c21e8df0ff236285f8202c856a2 +SIZE (mattermost-mattermost-server-v5.10.0_GH0.tar.gz) = 16743454 Index: head/www/mattermost-server/files/mattermostd.in =================================================================== --- head/www/mattermost-server/files/mattermostd.in (revision 500720) +++ head/www/mattermost-server/files/mattermostd.in (revision 500721) @@ -1,56 +1,57 @@ #!/bin/sh # $FreeBSD$ # PROVIDE: mattermostd # REQUIRE: DAEMON NETWORKING # BEFORE: LOGIN # KEYWORD: shutdown # Add the following lines to /etc/rc.conf to enable mattermostdb: # mattermostd_enable="YES" # # mattermostd_enable (bool): Set to YES to enable influxd # Default: NO # mattermostd_conf (str): influxd configuration file # Default: ${PREFIX}/etc/mattermostd.conf # mattermostd_user (str): influxd daemon user # Default: mattermostd # mattermostd_group (str): influxd daemon group # Default: mattermostd # mattermostd_flags (str): Extra flags passed to influxd # # mattermostd_facility (str): Syslog facility to use # Default: daemon # mattermostd_priority (str): Syslog priority to use # Default: info . /etc/rc.subr name="mattermostd" rcvar=mattermostd_enable load_rc_config $name : ${mattermostd_enable:="NO"} : ${mattermostd_user:="mattermost"} : ${mattermostd_group:="mattermost"} : ${mattermostd_flags:="--disableconfigwatch"} : ${mattermostd_facility:="daemon"} : ${mattermostd_priority:="info"} +: ${mattermostd_tag:="mattermostd"} : ${mattermostd_conf:="%%PREFIX%%/etc/mattermost/config.json"} : ${mattermostd_options:="${mattermostd_flags} --config=${mattermostd_conf}"} # daemon mattermostd_pidfile="/var/run/${name}.pid" procname="%%PREFIX%%/bin/${name}" command=/usr/sbin/daemon start_cmd="mattermostd_startcmd_daemon" mattermostd_startcmd_daemon() { echo "Starting ${name}." cd /usr/local/www/mattermost && \ - /usr/sbin/daemon -p ${mattermostd_pidfile} -S -s ${mattermostd_priority} -l ${mattermostd_facility} \ + /usr/sbin/daemon -p ${mattermostd_pidfile} -S -s ${mattermostd_priority} -l ${mattermostd_facility} -T ${mattermostd_tag} \ -u ${mattermostd_user} ${procname} ${mattermostd_options} } run_rc_command "$1" Index: head/www/mattermost-server/pkg-plist =================================================================== --- head/www/mattermost-server/pkg-plist (revision 500720) +++ head/www/mattermost-server/pkg-plist (revision 500721) @@ -1,42 +1,41 @@ bin/mattermostd etc/mattermost/config.json.sample %%WWWDIR%%/fonts/OFL.txt %%WWWDIR%%/fonts/nunito-bold.ttf %%WWWDIR%%/i18n/de.json %%WWWDIR%%/i18n/en.json %%WWWDIR%%/i18n/es.json %%WWWDIR%%/i18n/fr.json %%WWWDIR%%/i18n/it.json %%WWWDIR%%/i18n/ja.json %%WWWDIR%%/i18n/ko.json %%WWWDIR%%/i18n/nl.json %%WWWDIR%%/i18n/pl.json %%WWWDIR%%/i18n/pt-BR.json %%WWWDIR%%/i18n/ro.json %%WWWDIR%%/i18n/ru.json %%WWWDIR%%/i18n/tr.json %%WWWDIR%%/i18n/uk.json %%WWWDIR%%/i18n/zh-CN.json %%WWWDIR%%/i18n/zh-TW.json -%%WWWDIR%%/templates/complete_saml_extension_body.html %%WWWDIR%%/templates/deactivate_body.html %%WWWDIR%%/templates/email_change_body.html %%WWWDIR%%/templates/email_change_verify_body.html %%WWWDIR%%/templates/email_footer.html %%WWWDIR%%/templates/email_info.html %%WWWDIR%%/templates/globalrelay_compliance_export.html %%WWWDIR%%/templates/globalrelay_compliance_export_message.html %%WWWDIR%%/templates/globalrelay_compliance_export_participant_row.html %%WWWDIR%%/templates/invite_body.html %%WWWDIR%%/templates/mfa_change_body.html %%WWWDIR%%/templates/password_change_body.html %%WWWDIR%%/templates/post_batched_body.html %%WWWDIR%%/templates/post_batched_post_full.html %%WWWDIR%%/templates/post_batched_post_generic.html %%WWWDIR%%/templates/post_body_full.html %%WWWDIR%%/templates/post_body_generic.html %%WWWDIR%%/templates/reset_body.html %%WWWDIR%%/templates/signin_change_body.html %%WWWDIR%%/templates/unsupported_browser.html %%WWWDIR%%/templates/verify_body.html %%WWWDIR%%/templates/welcome_body.html