aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortimur <timur@FreeBSD.org>2013-11-18 06:16:16 +0800
committertimur <timur@FreeBSD.org>2013-11-18 06:16:16 +0800
commitd13b7aa2b353bd1c8fb601c7f365deabb6032b0b (patch)
tree22c0e2b3e3152391c554d02ee3bfdf354b5ec483
parent76996e4c1cc2a56dfe29499660e213177ec544a1 (diff)
downloadfreebsd-ports-gnome-d13b7aa2b353bd1c8fb601c7f365deabb6032b0b.tar.gz
freebsd-ports-gnome-d13b7aa2b353bd1c8fb601c7f365deabb6032b0b.tar.zst
freebsd-ports-gnome-d13b7aa2b353bd1c8fb601c7f365deabb6032b0b.zip
Attempt to fix broken init script. Hope, this time it's OK :)
PR: 184037
-rw-r--r--net/samba36/Makefile2
-rw-r--r--net/samba36/files/samba.in10
2 files changed, 6 insertions, 6 deletions
diff --git a/net/samba36/Makefile b/net/samba36/Makefile
index 426a77d34be0..173cf374055e 100644
--- a/net/samba36/Makefile
+++ b/net/samba36/Makefile
@@ -2,7 +2,7 @@
PORTNAME= ${SAMBA_BASENAME}36
PORTVERSION= 3.6.20
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= net
MASTER_SITES= ${MASTER_SITE_SAMBA}
MASTER_SITE_SUBDIR= samba samba/stable samba/pre
diff --git a/net/samba36/files/samba.in b/net/samba36/files/samba.in
index 77759040b5ec..98c2ca75a3d7 100644
--- a/net/samba36/files/samba.in
+++ b/net/samba36/files/samba.in
@@ -164,6 +164,11 @@ samba_config_init() {
fi
# Defaults
samba_enable=${samba_enable:=NO}
+ # Setup dependent variables
+ if [ -n "${rcvar}" ] && checkyesno "${rcvar}"; then
+ nmbd_enable=${nmbd_enable=YES}
+ smbd_enable=${smbd_enable=YES}
+ fi
nmbd_enable=${nmbd_enable:=NO}
smbd_enable=${smbd_enable:=NO}
%%WINBIND%% # Winbindd
@@ -175,11 +180,6 @@ samba_config_init() {
%%WINBIND%% fi
%%WINBIND%% winbindd_enable=${winbindd_enable:=NO}
%%WINBIND%% fi
- # Setup dependent variables
- if [ -n "${rcvar}" ] && checkyesno "${rcvar}"; then
- nmbd_enable=${nmbd_enable=YES}
- smbd_enable=${smbd_enable=YES}
- fi
}
# Load configuration variables