Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 30 Mar 2018 22:19:51 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r466008 - in head/www: mattermost-server mattermost-webapp
Message-ID:  <201803302219.w2UMJpxd093341@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mat
Date: Fri Mar 30 22:19:51 2018
New Revision: 466008
URL: https://svnweb.freebsd.org/changeset/ports/466008

Log:
  Cleanup a bit.
  
  Sponsored by:	Absolight

Modified:
  head/www/mattermost-server/Makefile   (contents, props changed)
  head/www/mattermost-webapp/Makefile   (contents, props changed)

Modified: head/www/mattermost-server/Makefile
==============================================================================
--- head/www/mattermost-server/Makefile	Fri Mar 30 21:36:22 2018	(r466007)
+++ head/www/mattermost-server/Makefile	Fri Mar 30 22:19:51 2018	(r466008)
@@ -32,8 +32,6 @@ MATTERMOSTD_GROUP=	mattermost
 USERS=		${MATTERMOSTD_USER}
 GROUPS=		${MATTERMOSTD_GROUP}
 
-.include <bsd.port.pre.mk>
-
 pre-build:
 	@${MKDIR} ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME}
 	@cd ${WRKSRC} && \
@@ -48,10 +46,8 @@ do-build:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/platform ${STAGEDIR}${PREFIX}/bin/mattermostd
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/mattermost
-	${CP} ${WRKSRC}/config/default.json ${STAGEDIR}${PREFIX}/etc/mattermost/config.json.sample
+	${INSTALL_DATA} ${WRKSRC}/config/default.json ${STAGEDIR}${PREFIX}/etc/mattermost/config.json.sample
 	${MKDIR} ${STAGEDIR}${WWWDIR}
-	${CP} -R ${WRKSRC}/fonts ${STAGEDIR}${WWWDIR}
-	${CP} -R ${WRKSRC}/i18n ${STAGEDIR}${WWWDIR}
-	${CP} -R ${WRKSRC}/templates ${STAGEDIR}${WWWDIR}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} 'fonts i18n templates' ${STAGEDIR}${WWWDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/www/mattermost-webapp/Makefile
==============================================================================
--- head/www/mattermost-webapp/Makefile	Fri Mar 30 21:36:22 2018	(r466007)
+++ head/www/mattermost-webapp/Makefile	Fri Mar 30 22:19:51 2018	(r466008)
@@ -13,6 +13,7 @@ COMMENT=	Webapp of Mattermost server
 LICENSE=	APACHE20
 
 NO_BUILD=	yes
+NO_ARCH=	yes
 
 WWWDIR=		${PREFIX}/www/mattermost
 
@@ -25,11 +26,9 @@ GROUPS=		${MATTERMOSTD_GROUP}
 PLIST_SUB=	MATTERMOSTD_USER=${MATTERMOSTD_USER} \
 			MATTERMOSTD_GROUP=${MATTERMOSTD_GROUP}
 
-.include <bsd.port.pre.mk>
-
 do-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR}
-	${CP} -R ${WRKDIR}/mattermost/client ${STAGEDIR}${WWWDIR}
+	cd ${WRKDIR}/mattermost && ${COPYTREE_SHARE} client ${STAGEDIR}${WWWDIR}
 	${MKDIR} ${STAGEDIR}${WWWDIR}/client/plugins
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>



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