CVS commit: pkgsrc/net/samba4

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Jan  3 19:36:45 UTC 2019

Modified Files:
        pkgsrc/net/samba4: Makefile PLIST buildlink3.mk

Log Message:
samba4: use external tevent and tdb; bump revision


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 pkgsrc/net/samba4/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/net/samba4/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/samba4/buildlink3.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/samba4/Makefile
diff -u pkgsrc/net/samba4/Makefile:1.57 pkgsrc/net/samba4/Makefile:1.58
--- pkgsrc/net/samba4/Makefile:1.57     Sat Dec 22 01:13:52 2018
+++ pkgsrc/net/samba4/Makefile  Thu Jan  3 19:36:45 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.57 2018/12/22 01:13:52 adam Exp $
+# $NetBSD: Makefile,v 1.58 2019/01/03 19:36:45 adam Exp $
 
 DISTNAME=      samba-4.9.4
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    net
 MASTER_SITES=  http://download.samba.org/pub/samba/stable/
 
@@ -10,7 +10,7 @@ HOMEPAGE=     http://www.samba.org/
 COMMENT=       SMB/CIFS protocol server suite
 LICENSE=       gnu-gpl-v3
 
-CONFLICTS+=    ja-samba-[0-9]* tdb-[0-9]* winbind-[0-9]*
+CONFLICTS+=    ja-samba-[0-9]* winbind-[0-9]*
 
 GCC_REQD+=     4.4
 BUILD_DEPENDS+=        libxslt-[0-9]*:../../textproc/libxslt
@@ -90,7 +90,6 @@ CONFIGURE_ARGS+=      --with-libiconv=${BUILD
 CONFIGURE_ARGS+=       --abi-check-disable
 CONFIGURE_ARGS+=       --disable-symbol-versions
 CONFIGURE_ARGS+=       --enable-gnutls
-#CONFIGURE_ARGS+=      --bundled-libraries=!crypto,ldb,ntdb,!talloc,tdb,tevent
 .if defined(MAKE_JOBS) && !empty(MAKE_JOBS) && !(defined(MAKE_JOBS_SAFE) && !empty(MAKE_JOBS_SAFE:M[nN][oO]))
 CONFIGURE_ARGS+=       --jobs=${MAKE_JOBS}
 .else
@@ -222,12 +221,14 @@ PY_PATCHPLIST=    yes
 .include "../../archivers/libarchive/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../databases/lmdb/buildlink3.mk"
+.include "../../databases/tdb/buildlink3.mk"
 .include "../../devel/cmocka/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
 BUILDLINK_API_DEPENDS.talloc+= talloc>=2.1.9
 .include "../../devel/talloc/buildlink3.mk"
+.include "../../devel/tevent/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"

Index: pkgsrc/net/samba4/PLIST
diff -u pkgsrc/net/samba4/PLIST:1.18 pkgsrc/net/samba4/PLIST:1.19
--- pkgsrc/net/samba4/PLIST:1.18        Sat Dec 22 01:13:52 2018
+++ pkgsrc/net/samba4/PLIST     Thu Jan  3 19:36:45 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2018/12/22 01:13:52 adam Exp $
+@comment $NetBSD: PLIST,v 1.19 2019/01/03 19:36:45 adam Exp $
 bin/cifsdd
 bin/dbwrap_tool
 bin/findsmb
@@ -38,10 +38,6 @@ bin/smbstatus
 bin/smbtar
 bin/smbtorture
 bin/smbtree
-bin/tdbbackup
-bin/tdbdump
-bin/tdbrestore
-bin/tdbtool
 bin/testparm
 bin/wbinfo
 include/charset.h
@@ -230,8 +226,6 @@ lib/pkgconfig/samdb.pc
 lib/pkgconfig/smbclient.pc
 lib/pkgconfig/wbclient.pc
 ${PYSITELIB}/_ldb_text.py
-${PYSITELIB}/_tdb_text.py
-${PYSITELIB}/_tevent.so
 ${PYSITELIB}/ldb.so
 ${PYSITELIB}/samba/__init__.py
 ${PYSITELIB}/samba/_glue.so
@@ -522,8 +516,6 @@ ${PYSITELIB}/samba/werror.so
 ${PYSITELIB}/samba/xattr.py
 ${PYSITELIB}/samba/xattr_native.so
 ${PYSITELIB}/samba/xattr_tdb.so
-${PYSITELIB}/tdb.so
-${PYSITELIB}/tevent.py
 lib/samba/auth/script.${SOEXT}
 lib/samba/bind9/dlz_bind9.${SOEXT}
 lib/samba/bind9/dlz_bind9_10.${SOEXT}
@@ -721,10 +713,6 @@ lib/samba/private/libsocket-blocking-sam
 lib/samba/private/libsys-rw-samba4.so
 lib/samba/private/libtalloc-report-samba4.so
 lib/samba/private/libtdb-wrap-samba4.so
-lib/samba/private/libtdb.so.1
-lib/samba/private/libtdb.so.1.3.16
-lib/samba/private/libtevent.so.0
-lib/samba/private/libtevent.so.0.9.37
 lib/samba/private/libtime-basic-samba4.so
 lib/samba/private/libtorture-samba4.so
 lib/samba/private/libtrusts-util-samba4.so
@@ -864,10 +852,6 @@ man/man8/smbd.8
 man/man8/smbpasswd.8
 man/man8/smbspool.8
 man/man8/smbspool_krb5_wrapper.8
-man/man8/tdbbackup.8
-man/man8/tdbdump.8
-man/man8/tdbrestore.8
-man/man8/tdbtool.8
 man/man8/vfs_acl_tdb.8
 man/man8/vfs_acl_xattr.8
 man/man8/vfs_aio_fork.8

Index: pkgsrc/net/samba4/buildlink3.mk
diff -u pkgsrc/net/samba4/buildlink3.mk:1.1 pkgsrc/net/samba4/buildlink3.mk:1.2
--- pkgsrc/net/samba4/buildlink3.mk:1.1 Sat Dec 22 01:13:52 2018
+++ pkgsrc/net/samba4/buildlink3.mk     Thu Jan  3 19:36:45 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2018/12/22 01:13:52 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2019/01/03 19:36:45 adam Exp $
 
 BUILDLINK_TREE+=       samba
 
@@ -11,11 +11,13 @@ BUILDLINK_PKGSRCDIR.samba?= ../../net/sa
 .include "../../archivers/libarchive/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../databases/lmdb/buildlink3.mk"
+.include "../../databases/tdb/buildlink3.mk"
 .include "../../devel/cmocka/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/talloc/buildlink3.mk"
+.include "../../devel/tevent/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"