From 6e75ba1513542b8365965e80539b64f410aaf53b Mon Sep 17 00:00:00 2001 From: CyberLeo Date: Thu, 28 Mar 2019 16:30:20 -0500 Subject: [PATCH] misc-cdn/cdn-base: add bsdstats to default install --- cdn/ports/misc-cdn/cdn-base/Makefile | 13 +++++++++---- cdn/ports/misc-cdn/cdn-base/files/setup-cdn-base.in | 7 ++++++- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/cdn/ports/misc-cdn/cdn-base/Makefile b/cdn/ports/misc-cdn/cdn-base/Makefile index f6230ba..0c9df44 100644 --- a/cdn/ports/misc-cdn/cdn-base/Makefile +++ b/cdn/ports/misc-cdn/cdn-base/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= cdn-base -PORTVERSION= 1.0 -PORTREVISION= 2 +PORTVERSION= 1.1 +PORTREVISION= 0 CATEGORIES= misc-cdn MASTER_SITES= # None DISTFILES= # None @@ -14,10 +14,11 @@ VALID_CATEGORIES += misc-cdn NO_BUILD= yes -OPTIONS_DEFINE= GIT PV +OPTIONS_DEFINE= BSDSTATS GIT PV +BSDSTATS_DESC= Depend on sysutils/bsdstats for stat reporting GIT_DESC= Depend on devel/git PV_DESC= Depend on misc/pv for a progress bar -OPTIONS_DEFAULT=GIT PV +OPTIONS_DEFAULT=BSDSTATS GIT PV PLIST_FILES= %%DATADIR%%/setup-cdn-base SUB_FILES= pkg-message setup-cdn-base @@ -33,6 +34,10 @@ RUN_DEPENDS+= portmaster:${PORTSDIR}/ports-mgmt/portmaster \ .include +.if ${PORT_OPTIONS:MBSDSTATS} +RUN_DEPENDS+= bsdstats-send:${PORTSDIR}/sysutils/bsdstats +.endif + .if ${PORT_OPTIONS:MGIT} RUN_DEPENDS+= git:${PORTSDIR}/devel/git .endif diff --git a/cdn/ports/misc-cdn/cdn-base/files/setup-cdn-base.in b/cdn/ports/misc-cdn/cdn-base/files/setup-cdn-base.in index 5e790e5..725271b 100755 --- a/cdn/ports/misc-cdn/cdn-base/files/setup-cdn-base.in +++ b/cdn/ports/misc-cdn/cdn-base/files/setup-cdn-base.in @@ -14,7 +14,12 @@ do_bash_config() { %%PREFIX%%/share/bash-config/fixuser -i } -steps="patch_sudoers bash_config" +do_start_tor() { + sysrc tor_enable=YES + service tor start +} + +steps="patch_sudoers bash_config start_tor" for step in ${steps} do -- 2.42.0