Attachment 217918 Details for Bug 249279 – beehive-0.4.0.diff

[patch] beehive-0.4.0.diff

beehive-0.4.0.diff (text/plain), 2.73 KB, created by Lewis Cook on 2020-09-12 14:34:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lewis Cook

Created: 2020-09-12 14:34:48 UTC

Size: 2.73 KB

patch

obsolete

>Index: www/beehive/Makefile
>===================================================================
>--- www/beehive/Makefile	(revision 548092)
>+++ www/beehive/Makefile	(working copy)
>@@ -145,6 +145,7 @@
> USERS=		${_BEEHIVE_USER}
> GROUPS=		${_BEEHIVE_USER}
> 
>+PLIST_FILES=	bin/${PORTNAME}
> PORTDOCS=	README.md
> 
> OPTIONS_DEFINE=	DOCS
>@@ -157,9 +158,6 @@
> 	(cd ${WRKSRC} && \
> 		${LOCALBASE}/bin/go-bindata ${_BUILD_TAGS} --pkg api -o api/bindata.go --ignore config/.git assets/... config/...)
> 
>-post-install:
>-	@${MKDIR} ${STAGEDIR}${ETCDIR}
>-
> post-install-DOCS-on:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
> 	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
>Index: www/beehive/files/beehive.in
>===================================================================
>--- www/beehive/files/beehive.in	(revision 548092)
>+++ www/beehive/files/beehive.in	(working copy)
>@@ -31,46 +31,22 @@
> : ${beehive_user:="%%USERS%%"}
> : ${beehive_group:="%%GROUPS%%"}
> 
>-pidfile="/var/run/${name}.pid"
>+pidfiledir="/var/run/${name}"
>+pidfile="${pidfiledir}/${name}.pid"
> procname="%%PREFIX%%/bin/${name}"
> command="/usr/sbin/daemon"
> command_args="-f -p ${pidfile} ${procname} -bind ${beehive_bind} -canonicalurl ${beehive_url} -config ${beehive_config}"
> 
>-start_precmd="${name}_pre"
>-stop_cmd="${name}_stop"
>-stop_postcmd="${name}_poststop"
>+start_precmd="${name}_prestart"
> 
>-beehive_pre()
>+beehive_prestart()
> {
>-	/usr/bin/install -o ${beehive_user} -g ${beehive_group} -m 755 -- /dev/null ${pidfile}
>-
>+	if [ ! -d ${pidfiledir} ]; then 
>+		install -d -o ${beehive_user} -g ${beehive_group} ${pidfiledir}
>+	fi	
> 	if [ ! -d %%ETCDIR%% ]; then
>-		/bin/mkdir -p %%ETCDIR%%	
>+		install -d -o ${beehive_user} -g ${beehive_group} %%ETCDIR%%
> 	fi
>-
>-	/usr/sbin/chown ${beehive_user}:${beehive_group} %%ETCDIR%%
>-	/bin/chmod 0700 %%ETCDIR%%
>-	
>-	if [ -f ${beehive_config} ]; then
>-		/usr/sbin/chown ${beehive_user}:${beehive_group} ${beehive_config}
>-		/bin/chmod 0600 ${beehive_config}
>-	fi
> }
> 
>-beehive_stop()
>-{
>-	if [ -f ${pidfile} ]; then
>-		echo "Stopping ${name}."
>-		kill -INT `cat ${pidfile}` 2>/dev/null
>-	else
>-		echo "${name} is not running."
>-		return 1
>-	fi
>-}
>-
>-beehive_poststop()
>-{
>-	rm -f ${pidfile}
>-}
>-
> run_rc_command "$1"
>Index: www/beehive/pkg-plist
>===================================================================
>--- www/beehive/pkg-plist	(revision 548092)
>+++ www/beehive/pkg-plist	(nonexistent)
>@@ -1,2 +0,0 @@
>-bin/beehive
>-@dir %%ETCDIR%%
>
>Property changes on: www/beehive/pkg-plist
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Flags:

lcook: maintainer-approval+

Actions: View | Diff

Attachments on bug 249279: 217918