pkg/44786: pkgsrc 2010Q4 samba35 "somtimes" build with samba4 support

[Wolfgang.Stukenbrock%nagler-company.com@localhost]

>Number:         44786
>Category:       pkg
>Synopsis:       pkgsrc 2010Q4 samba35 "somtimes" build with samba4 support
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Tue Mar 29 10:30:00 +0000 2011
>Originator:     Dr. W. Stukenbrock
>Release:        pkgsrc 2010Q4
>Organization:
Dr. Nagler & Company GmbH
>Environment:
        
        
System: NetBSD test-s0 4.0 NetBSD 4.0 (NSW-WS) #0: Tue Aug 17 17:28:09 CEST 
2010 wgstuken@test-s0:/usr/src/sys/arch/amd64/compile/NSW-WS amd64
Architecture: x86_64
Machine: amd64
>Description:
        The configure option --enable-merged-build is not set by pkgsrc
        build stuff. So if python has been installed prior to the build
        of samba35, samba4 support is included otherwise not.
        This should be controlled by a package option.
        In any case the functionality should not depend on the fact that
        some packages has been build before.
>How-To-Repeat:
        build samba35 with and without python 2.x available on the system
>Fix:
        The following patch to /usr/pkgsrc/net/samba/options.mk will
        add a samba4 option for samba35 and disable it by default.
        remark: This file is shared accross all samba version.
                Therefore I add the new option only for 3.5.x versions,
                at least this is my intention with the
                ".if empty(VERSION:C/^3\.5\..*$//)" ...

/usr/pkg/bin/gdiff -u options.mk.orig-param options.mk
--- options.mk.orig-param       2010-12-06 17:40:50.000000000 +0100
+++ options.mk  2011-03-29 12:25:56.227884000 +0200
@@ -11,6 +11,10 @@
 PKG_SUPPORTED_OPTIONS= ads cups fam ldap pam winbind
 PKG_SUGGESTED_OPTIONS= ads ldap pam winbind
 
+.if empty(VERSION:C/^3\.5\..*$//)
+PKG_SUPPORTED_OPTIONS+= samba4
+.endif
+
 .include "../../mk/bsd.fast.prefs.mk"
 
 SAMBA_ACL_OPSYS=       AIX Darwin FreeBSD HPUX IRIX Linux OSF1 SunOS
@@ -23,6 +27,16 @@
 SAMBA_STATIC_MODULES:= # empty
 
 ###
+### choose samba4 support
+###
+.if !empty(PKG_OPTIONS:Msamba4)
+.  include "../../lang/python26/buildlink3.mk"
+CONFIGURE_ARGS+=       --enable-merged-build=yes
+.else
+CONFIGURE_ARGS+=       --enable-merged-build=no
+.endif
+
+###
 ### Allow Samba to join as a member server of an Active Directory domain.
 ###
 .if !empty(PKG_OPTIONS:Mads)

>Unformatted: