From owner-svn-ports-head@FreeBSD.ORG  Sun Nov 17 22:16:17 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 87223F9A;
 Sun, 17 Nov 2013 22:16:17 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7715428A7;
 Sun, 17 Nov 2013 22:16:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAHMGH0Y088860;
 Sun, 17 Nov 2013 22:16:17 GMT (envelope-from timur@svn.freebsd.org)
Received: (from timur@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAHMGHG0088856;
 Sun, 17 Nov 2013 22:16:17 GMT (envelope-from timur@svn.freebsd.org)
Message-Id: <201311172216.rAHMGHG0088856@svn.freebsd.org>
From: "Timur I. Bakeyev" <timur@FreeBSD.org>
Date: Sun, 17 Nov 2013 22:16:17 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r334130 - in head/net/samba36: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.16
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 17 Nov 2013 22:16:17 -0000

Author: timur
Date: Sun Nov 17 22:16:16 2013
New Revision: 334130
URL: http://svnweb.freebsd.org/changeset/ports/334130

Log:
  Attempt to fix broken init script. Hope, this time it's OK :)
  
  PR:		184037

Modified:
  head/net/samba36/Makefile
  head/net/samba36/files/samba.in

Modified: head/net/samba36/Makefile
==============================================================================
--- head/net/samba36/Makefile	Sun Nov 17 22:09:53 2013	(r334129)
+++ head/net/samba36/Makefile	Sun Nov 17 22:16:16 2013	(r334130)
@@ -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

Modified: head/net/samba36/files/samba.in
==============================================================================
--- head/net/samba36/files/samba.in	Sun Nov 17 22:09:53 2013	(r334129)
+++ head/net/samba36/files/samba.in	Sun Nov 17 22:16:16 2013	(r334130)
@@ -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