ports/79259: [PATCH] net/samba: WITHOUT_{ADS,CUPS} fix

[Sean Farley]

>Number:         79259
>Category:       ports
>Synopsis:       [PATCH] net/samba: WITHOUT_{ADS,CUPS} fix
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Mar 26 18:00:10 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Sean Farley
>Release:        FreeBSD 5.4-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD thor.farley.org 5.4-PRERELEASE FreeBSD 5.4-PRERELEASE #0: Thu Mar 17 12:46:07 CST 2005
>Description:
This is a patch to fix the port to honor WITHOUT_ADS and WITHOUT_CUPS.

Port maintainer (timur at gnu.org) is cc'd.

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- samba-3.0.12_1,1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net/samba3.orig/Makefile /usr/ports/net/samba3/Makefile
--- /usr/ports/net/samba3.orig/Makefile	Sat Mar 26 11:48:51 2005
+++ /usr/ports/net/samba3/Makefile	Sat Mar 26 11:53:09 2005
@@ -93,7 +93,7 @@
 CONFIGURE_ARGS+=	--with-pam --with-readline --with-sendfile-support \
 			--without-libsmbclient --without-python
 
-.if defined(WITH_CUPS)
+.if !defined(WITHOUT_CUPS)
 LIB_DEPENDS+=		cups.2:${PORTSDIR}/print/cups-base
 CONFIGURE_ARGS+=	--enable-cups
 CUPS=			cups
@@ -216,7 +216,8 @@
 .endif
 
 # Common part
-.if defined(WITH_ADS)
+.if ((defined(WITH_ADS) && defined(PACKAGE_BUILDING)) ||\
+	(!defined(WITHOUT_ADS) && !defined(PACKAGE_BUILDING)))
 WANT_LDAP=		yes
 WANT_KRB5=		yes
 CONFIGURE_ARGS+=	--with-ads
--- samba-3.0.12_1,1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: