From ktsin@acm.org  Mon Mar 24 22:43:30 2003
Return-Path: <ktsin@acm.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 7CE0337B401
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 24 Mar 2003 22:43:30 -0800 (PST)
Received: from smtp15.singnet.com.sg (smtp15.singnet.com.sg [165.21.6.35])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1C14443F75
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 24 Mar 2003 22:43:29 -0800 (PST)
	(envelope-from ktsin@acm.org)
Received: from webmail.micronclean (bb-203-125-61-236.singnet.com.sg [203.125.61.236])
	by smtp15.singnet.com.sg (8.12.8/8.12.8) with ESMTP id h2P6hRpx010244
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 25 Mar 2003 14:43:27 +0800
Received: from melati.no-ip.org ([202.75.190.50])
	by webmail.micronclean (8.11.6/8.11.6) with ESMTP id h2P6hOj05415
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 25 Mar 2003 14:43:25 +0800
Received: from melati.no-ip.org (melati [127.0.0.1])
	by melati.no-ip.org (8.12.8/8.12.8/cyrus) with ESMTP id h2P6gMRQ001485
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 25 Mar 2003 14:42:22 +0800 (MYT)
	(envelope-from ktsin@melati.no-ip.org)
Received: (from ktsin@localhost)
	by melati.no-ip.org (8.12.8/8.12.8/Submit) id h2P6fxn4001453;
	Tue, 25 Mar 2003 14:41:59 +0800 (MYT)
	(envelope-from ktsin)
Message-Id: <200303250641.h2P6fxn4001453@melati.no-ip.org>
Date: Tue, 25 Mar 2003 14:41:59 +0800 (MYT)
From: KT Sin <ktsin@acm.org>
Reply-To: KT Sin <ktsin@acm.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: samba-2.2.8: winbind is always selected during build
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         50264
>Category:       ports
>Synopsis:       samba-2.2.8: winbind is always selected during build
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 24 22:50:08 PST 2003
>Closed-Date:    Tue Mar 25 06:52:57 PST 2003
>Last-Modified:  Tue Mar 25 06:52:57 PST 2003
>Originator:     KT Sin
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD melati.no-ip.org 5.0-CURRENT FreeBSD 5.0-CURRENT #0: Mon Mar 24 16:29:19 MYT 2003 ktsin@melati.no-ip.org:/usr/src/sys/i386/compile/MELATI i386


	
>Description:
	
After the last commit, samba 2.2.8 insists on building with winbind enabled regardless of whether WITH_WINBIND is defined or not. See also PR ports/50112.

>How-To-Repeat:
	
>Fix:

Think below is what you want:

--- Makefile.orig	Mon Mar 24 23:55:28 2003
+++ Makefile	Tue Mar 25 10:52:51 2003
@@ -35,8 +35,8 @@
 RECYCLE?=       "@comment "
 LIBSAMBA?=      "@comment "
 BUILD_VFS?=     "@comment "
-WITH_WINBIND?=  "@comment "
-WITH_WINBIND_AUTH_CHALLENGE?= "@comment "
+WINBIND?=       "@comment "
+WINBIND_AUTH_CHALLENGE?= "@comment "
 
 .if defined(WITH_AUDIT)
 AUDIT=		""
@@ -113,12 +113,12 @@
 
 .if defined(WITH_WINBIND)
 CONFIGURE_ARGS+=	--with-winbind
-WITH_WINBIND=	""
+WINBIND=	""
 .endif
 
 .if defined(WITH_WINBIND_AUTH_CHALLENGE)
 CONFIGURE_ARGS+=	--with-winbind-auth-challenge
-WITH_WINBIND_AUTH_CHALLENGE=	""
+WINBIND_AUTH_CHALLENGE=	""
 .endif
 
 pre-fetch:
@@ -171,8 +171,8 @@
 		RECYCLE=${RECYCLE} \
 		LIBSAMBA=${LIBSAMBA} \
 		BUILD_VFS=${BUILD_VFS} \
-		WITH_WINBIND=${WITH_WINBIND} \
-		WITH_WINBIND_AUTH_CHALLENGE=${WITH_WINBIND_AUTH_CHALLENGE}
+		WINBIND=${WINBIND} \
+		WINBIND_AUTH_CHALLENGE=${WINBIND_AUTH_CHALLENGE}
 
 .if defined(WITH_RECYCLE) || defined(WITH_AUDIT)
 post-build:
--- pkg-plist.orig	Mon Mar 24 23:55:28 2003
+++ pkg-plist	Tue Mar 25 11:03:33 2003
@@ -15,8 +15,8 @@
 bin/tdbbackup
 bin/testparm
 bin/testprns
-%%WITH_WINBIND_AUTH_CHALLENGE%%bin/wbinfo
-%%WITH_WINBIND%%sbin/winbindd
+%%WINBIND_AUTH_CHALLENGE%%bin/wbinfo
+%%WINBIND%%sbin/winbindd
 etc/codepages/codepage.1125
 etc/codepages/unicode_map.1125
 etc/codepages/unicode_map.KOI8-U
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: obraun 
State-Changed-When: Tue Mar 25 06:51:45 PST 2003 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=50264 
>Unformatted:
