Attachment #188581 for bug #224113

Lines 62-70 do-install: Link Here

(-)b/Makefile (-2 / +15 lines)
62	${INSTALL_SCRIPT} ${WRKDIR}/gogs-rm-data ${STAGEDIR}${PREFIX}/bin/	62	${INSTALL_SCRIPT} ${WRKDIR}/gogs-rm-data ${STAGEDIR}${PREFIX}/bin/
63	${INSTALL_SCRIPT} ${WRKDIR}/gogs-service ${STAGEDIR}${PREFIX}/etc/rc.d/gogs	63	${INSTALL_SCRIPT} ${WRKDIR}/gogs-service ${STAGEDIR}${PREFIX}/etc/rc.d/gogs
64	@(cd ${WRKSRC} && ${COPYTREE_SHARE} "conf public templates" ${STAGEDIR}${PREFIX}/libexec/${PORTNAME})	64	@(cd ${WRKSRC} && ${COPYTREE_SHARE} "conf public templates" ${STAGEDIR}${PREFIX}/libexec/${PORTNAME})
		65
		66	@${MKDIR} ${STAGEDIR}${ETCDIR}
		67	@${INSTALL_DATA} ${WRKSRC}/conf/app.ini ${STAGEDIR}${ETCDIR}/app.ini.sample
		68
65	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/custom/conf	69	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/custom/conf
66	${INSTALL_DATA} ${WRKSRC}/conf/app.ini ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/custom/conf/	70	@${MKDIR} ${STAGEDIR}${ETCDIR}/https
67	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/custom/https	71	@${LN} -sf ${ETCDIR}/https ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/custom/https
		72
68	@${MKDIR} ${STAGEDIR}${GOGS_DBDIR}/data ${STAGEDIR}${GOGS_DBDIR}/repositories ${STAGEDIR}${GOGS_DBDIR}/home	73	@${MKDIR} ${STAGEDIR}${GOGS_DBDIR}/data ${STAGEDIR}${GOGS_DBDIR}/repositories ${STAGEDIR}${GOGS_DBDIR}/home
69	@${LN} -sf ${GOGS_DBDIR}/data ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/data	74	@${LN} -sf ${GOGS_DBDIR}/data ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/data
70	@${MKDIR} ${STAGEDIR}${GOGS_LOGDIR}	75	@${MKDIR} ${STAGEDIR}${GOGS_LOGDIR}
Lines 72-75 do-install: Link Here
72	@${MKDIR} ${STAGEDIR}${DOCSDIR}	77	@${MKDIR} ${STAGEDIR}${DOCSDIR}
73	${INSTALL_DATA} ${PORTDOCS:S\|^\|${WRKSRC}/\|} ${STAGEDIR}${DOCSDIR}	78	${INSTALL_DATA} ${PORTDOCS:S\|^\|${WRKSRC}/\|} ${STAGEDIR}${DOCSDIR}
74		79
		80	post-install:
		81	${SED} -I '' '/^# \!\!\!/d' ${STAGEDIR}${ETCDIR}/app.ini.sample
		82	@if [ ! -f ${ETCDIR}/app.ini ]; then \
		83	${CP} -p ${STAGEDIR}${ETCDIR}/app.ini.sample ${STAGEDIR}${ETCDIR}/app.ini ; \
		84	fi
		85	@${LN} -sf ${ETCDIR}/app.ini ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/custom/conf/app.ini
		86
		87
75	.include <bsd.port.mk>	88	.include <bsd.port.mk>

Lines 24-29 stop_cmd="%%PORTNAME%%_stop" Link Here

(-)b/files/gogs-service.in (-1 / +2 lines)
24	load_rc_config ${name}	24	load_rc_config ${name}
25		25
26	: ${%%PORTNAME%%_enable="NO"}	26	: ${%%PORTNAME%%_enable="NO"}
		27	: ${%%PORTNAME%%_config="/usr/local/etc/gogs/app.ini"}
27		28
28	is_process_running() {	29	is_process_running() {
29	local pidfile=$1	30	local pidfile=$1
Lines 47-53 stop_daemon() { Link Here
47	touch $logfile	48	touch $logfile
48	chmod 640 $logfile	49	chmod 640 $logfile
49	cd %%PREFIX%%/libexec/%%PORTNAME%%	50	cd %%PREFIX%%/libexec/%%PORTNAME%%
50	/usr/sbin/daemon -P $pidfile -u %%GOGS_USER%% %%PREFIX%%/libexec/%%PORTNAME%%/%%PORTNAME%% web >>$logfile 2>&1	51	/usr/sbin/daemon -P $pidfile -u %%GOGS_USER%% %%PREFIX%%/libexec/%%PORTNAME%%/%%PORTNAME%% web --config ${%%PORTNAME%%_config} >>$logfile 2>&1
51	if is_process_running $pidfile; then	52	if is_process_running $pidfile; then
52	echo "started %%PORTNAME%% (pid=$(cat $pidfile))"	53	echo "started %%PORTNAME%% (pid=$(cat $pidfile))"
53	else	54	else

Lines 13-19 You can also run %%PORTNAME%% manually with a command: Link Here

(-)b/files/pkg-message.in (-1 / +1 lines)
13	Connect to %%PORTNAME%% on the default port 3000:	13	Connect to %%PORTNAME%% on the default port 3000:
14	http://localhost:3000	14	http://localhost:3000
15		15
16	Configuration file is %%PREFIX%%/libexec/%%PORTNAME%%/custom/conf/app.ini.	16	Configuration file is %%ETCDIR%%/app.ini.
17	You can only edit it when %%PORTNAME%% isn't running.	17	You can only edit it when %%PORTNAME%% isn't running.
18		18
19	%%PORTNAME_FANCY%% needs an SSH daemon, so make sure sure you execute:	19	%%PORTNAME_FANCY%% needs an SSH daemon, so make sure sure you execute:

Lines 1-6 Link Here

(-)b/pkg-plist (-2 / +9 lines)
1	bin/gogs	1	bin/gogs
2	bin/gogs-rm-data	2	bin/gogs-rm-data
3	@(%%GOGS_USER%%,%%GOGS_GROUP%%,640) libexec/gogs/custom/conf/app.ini	3	@owner %%GOGS_USER%%
		4	@group %%GOGS_GROUP%%
		5	@sample %%ETCDIR%%/app.ini.sample %%ETCDIR%%/app.ini
		6	@owner
		7	@group
		8	libexec/gogs/custom/conf/app.ini
		9	libexec/gogs/custom/https
4	etc/rc.d/gogs	10	etc/rc.d/gogs
5	libexec/gogs/conf/app.ini	11	libexec/gogs/conf/app.ini
6	libexec/gogs/conf/gitignore/Actionscript	12	libexec/gogs/conf/gitignore/Actionscript
Lines 1719-1726 libexec/gogs/templates/user/settings/security.tmpl Link Here
1719	libexec/gogs/templates/user/settings/sshkeys.tmpl	1725	libexec/gogs/templates/user/settings/sshkeys.tmpl
1720	libexec/gogs/templates/user/settings/two_factor_enable.tmpl	1726	libexec/gogs/templates/user/settings/two_factor_enable.tmpl
1721	libexec/gogs/templates/user/settings/two_factor_recovery_codes.tmpl	1727	libexec/gogs/templates/user/settings/two_factor_recovery_codes.tmpl
		1728	@dir(%%GOGS_USER%%,%%GOGS_GROUP%%,750) %%ETCDIR%%
		1729	@dir(%%GOGS_USER%%,%%GOGS_GROUP%%,750) %%ETCDIR%%/https
1722	@dir(%%GOGS_USER%%,%%GOGS_GROUP%%,750) libexec/gogs/custom/conf	1730	@dir(%%GOGS_USER%%,%%GOGS_GROUP%%,750) libexec/gogs/custom/conf
1723	@dir(%%GOGS_USER%%,%%GOGS_GROUP%%,750) libexec/gogs/custom/https
1724	@dir(%%GOGS_USER%%,%%GOGS_GROUP%%,750) %%GOGS_DBDIR%%/data	1731	@dir(%%GOGS_USER%%,%%GOGS_GROUP%%,750) %%GOGS_DBDIR%%/data
1725	@dir(%%GOGS_USER%%,%%GOGS_GROUP%%,750) %%GOGS_DBDIR%%/home	1732	@dir(%%GOGS_USER%%,%%GOGS_GROUP%%,750) %%GOGS_DBDIR%%/home
1726	@dir(%%GOGS_USER%%,%%GOGS_GROUP%%,750) %%GOGS_DBDIR%%/repositories	1733	@dir(%%GOGS_USER%%,%%GOGS_GROUP%%,750) %%GOGS_DBDIR%%/repositories

Return to bug 224113