- Add USES=samba to handle dependency on samba

  Valid ARGS:  build, env, lib, run (default: build,run)
- Add SAMBA_DEFAULT to bsd.default-versions.mk (default: 4.3)
- Remove obsolete samba36 ports
- Modify samba4x ports to install libsmbclient
- Convert the ports tree to USES=samba

Reviewed by:	mat
Differential Revision:	https://reviews.freebsd.org/D8919

1 files changed, 0 insertions, 163 deletions

diff --git a/net/samba36/files/patch-source3__m4__aclocal.m4 b/net/samba36/files/patch-source3__m4__aclocal.m4
deleted file mode 100644
index 357dcf2e8366..000000000000
--- a/net/samba36/files/patch-source3__m4__aclocal.m4
+++ /dev/null
@@ -1,163 +0,0 @@
---- ./source3/m4/aclocal.m4.orig	2012-09-14 08:12:09.000000000 +0000
-+++ ./source3/m4/aclocal.m4	2012-10-20 13:13:36.975802862 +0000
-@@ -385,7 +385,7 @@
-   ac_new_flags=""
-   for i in [$]$1; do
-     case [$]i in
--    -I/usr/include|-I/usr/include/) ;;
-+    -I/usr/include|-I/usr/include/|-I%%LOCALBASE%%/include/|-I%%LOCALBASE%%/include) f=1;;
-     *) ac_new_flags="[$]ac_new_flags [$]i" ;;
-     esac
-   done
-@@ -437,104 +437,81 @@
-   dnl those with the standalone portable libiconv installed).
-   AC_MSG_CHECKING(for iconv in $1)
-     jm_cv_func_iconv="no"
-+    jm_cv_include=""
-     jm_cv_lib_iconv=""
--    jm_cv_giconv=no
-+    jm_cv_giconv="no"
-     jm_save_LIBS="$LIBS"
- 
--  dnl Check for include in giconv.h but no lib needed
--  if test "$jm_cv_func_iconv" != yes; then
--    AC_TRY_LINK([#include <stdlib.h>
-+    dnl Check for include in funny place but no lib needed
-+    if test "$jm_cv_func_iconv" != yes; then 
-+      AC_TRY_LINK([#include <stdlib.h>
- #include <giconv.h>],
-       [iconv_t cd = iconv_open("","");
-        iconv(cd,NULL,NULL,NULL,NULL);
-        iconv_close(cd);],
--       jm_cv_func_iconv=yes
--       jm_cv_include="giconv.h"
--       jm_cv_giconv="yes"
--       jm_cv_lib_iconv="")
-+      jm_cv_func_iconv=yes
-+      jm_cv_include="giconv.h"
-+      jm_cv_lib_iconv=""
-+      jm_cv_giconv="yes")
- 
--    dnl Standard iconv.h include, lib in glibc or libc ...
--    if test "$jm_cv_func_iconv" != yes; then
--      AC_TRY_LINK([#include <stdlib.h>
-+      dnl Standard iconv.h include, lib in glibc or libc ...
-+      if test "$jm_cv_func_iconv" != yes; then
-+	AC_TRY_LINK([#include <stdlib.h>
- #include <iconv.h>],
--        [iconv_t cd = iconv_open("","");
-+	[iconv_t cd = iconv_open("","");
-          iconv(cd,NULL,NULL,NULL,NULL);
-          iconv_close(cd);],
--         jm_cv_include="iconv.h"
--         jm_cv_func_iconv=yes
--         jm_cv_lib_iconv="")
--
--      dnl Include in giconv.h, libgiconv needed to link
--      if test "$jm_cv_func_iconv" != yes; then
--        jm_save_LIBS="$LIBS"
--        LIBS="$LIBS -lgiconv"
--        AC_TRY_LINK([#include <stdlib.h>
-+	jm_cv_func_iconv=yes
-+	jm_cv_include="iconv.h"
-+	jm_cv_lib_iconv="")
-+
-+	dnl Include in giconv.h, libgiconv needed to link
-+	if test "$jm_cv_func_iconv" != yes; then
-+	  jm_save_LIBS="$LIBS"
-+	  LIBS="$LIBS -lgiconv"
-+          AC_TRY_LINK([#include <stdlib.h>
- #include <giconv.h>],
--          [iconv_t cd = iconv_open("","");
-+	  [iconv_t cd = iconv_open("","");
-            iconv(cd,NULL,NULL,NULL,NULL);
-            iconv_close(cd);],
--          jm_cv_lib_iconv=yes
-           jm_cv_func_iconv=yes
-           jm_cv_include="giconv.h"
--          jm_cv_giconv=yes
--          jm_cv_lib_iconv="giconv")
-+          jm_cv_lib_iconv="giconv"
-+          jm_cv_giconv=yes)
- 
--        LIBS="$jm_save_LIBS"
-+	  LIBS="$jm_save_LIBS"
- 
--        dnl Include in iconv.h, libiconv needed to link
--        if test "$jm_cv_func_iconv" != yes; then
--          jm_save_LIBS="$LIBS"
--          LIBS="$LIBS -liconv"
--          AC_TRY_LINK([#include <stdlib.h>
-+	dnl Include in iconv.h, libiconv needed to link
-+	  if test "$jm_cv_func_iconv" != yes; then
-+	    jm_save_LIBS="$LIBS"
-+	    LIBS="$LIBS -liconv"
-+	    AC_TRY_LINK([#include <stdlib.h>
- #include <iconv.h>],
--            [iconv_t cd = iconv_open("","");
--             iconv(cd,NULL,NULL,NULL,NULL);
--             iconv_close(cd);],
--            jm_cv_include="iconv.h"
--            jm_cv_func_iconv=yes
--            jm_cv_lib_iconv="iconv")
--          LIBS="$jm_save_LIBS"
--
--          dnl Include in biconv.h, libbiconv needed to link
--          if test "$jm_cv_func_iconv" != yes; then
--            jm_save_LIBS="$LIBS"
--            LIBS="$LIBS -lbiconv"
--            AC_TRY_LINK([#include <stdlib.h>
--#include <biconv.h>],
--              [iconv_t cd = iconv_open("","");
--               iconv(cd,NULL,NULL,NULL,NULL);
--               iconv_close(cd);],
--              jm_cv_lib_iconv=yes
--              jm_cv_func_iconv=yes
--              jm_cv_include="biconv.h"
--              jm_cv_biconv=yes
--              jm_cv_lib_iconv="biconv")
-+	    [iconv_t cd = iconv_open("","");
-+	     iconv(cd,NULL,NULL,NULL,NULL);
-+	     iconv_close(cd);],
-+	    jm_cv_func_iconv=yes
-+	    jm_cv_include="iconv.h"
-+	    jm_cv_lib_iconv="iconv")
- 
--            LIBS="$jm_save_LIBS"
--          fi
--        fi
-+	    LIBS="$jm_save_LIBS"
-+	  fi
-+	fi
-       fi
-     fi
--  fi
--  if test "$jm_cv_func_iconv" = yes; then
--    if test "$jm_cv_giconv" = yes; then
--      AC_DEFINE(HAVE_GICONV, 1, [What header to include for iconv() function: giconv.h])
--      AC_MSG_RESULT(yes)
--      ICONV_FOUND=yes
--    else
--      if test "$jm_cv_biconv" = yes; then
--        AC_DEFINE(HAVE_BICONV, 1, [What header to include for iconv() function: biconv.h])
--        AC_MSG_RESULT(yes)
--        ICONV_FOUND=yes
-+    if test "$jm_cv_func_iconv" = yes; then
-+      if test "$jm_cv_giconv" = yes; then
-+	AC_DEFINE(HAVE_GICONV, 1, [What header to include for iconv() function: giconv.h])
-+	AC_MSG_RESULT(yes)
-+	ICONV_FOUND=yes
-       else 
-         AC_DEFINE(HAVE_ICONV, 1, [What header to include for iconv() function: iconv.h])
-         AC_MSG_RESULT(yes)
-         ICONV_FOUND=yes
-       fi
-+    else
-+      AC_MSG_RESULT(no)
-     fi
--  else
--    AC_MSG_RESULT(no)
--  fi
- ])
- 
- AC_DEFUN(rjs_CHARSET,[