CVS commit: pkgsrc/net/samba4

["NONAKA Kimihiro" <nonaka%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nonaka
Date:           Wed Feb 28 03:38:49 UTC 2018

Modified Files:
        pkgsrc/net/samba4: Makefile PLIST

Log Message:
net/samba4: use devel/talloc package instead of bundled library.

I'd like to install net/samba4 and net/freeradius on the same server.
But devel/talloc on which net/freeradius depends conflicts bundled talloc
library used in net/samba.
net/samba also should use devel/talloc package.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 pkgsrc/net/samba4/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/net/samba4/PLIST

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.38 pkgsrc/net/samba4/Makefile:1.39
--- pkgsrc/net/samba4/Makefile:1.38     Sun Jan 28 20:11:00 2018
+++ pkgsrc/net/samba4/Makefile  Wed Feb 28 03:38:49 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2018/01/28 20:11:00 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2018/02/28 03:38:49 nonaka Exp $
 
 DISTNAME=      samba-${VERSION}
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    net
 MASTER_SITES=  http://download.samba.org/pub/samba/stable/
 
@@ -90,7 +90,7 @@ CONFIGURE_ARGS+=      --with-libiconv=${BUILD
 #CONFIGURE_ARGS+=      --bundled-libraries=com_err
 CONFIGURE_ARGS+=       --enable-gnutls
 CONFIGURE_ARGS+=       --abi-check-disable
-#CONFIGURE_ARGS+=      --bundled-libraries=!crypto,ldb,ntdb,talloc,tdb,tevent
+#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
@@ -200,4 +200,6 @@ PY_PATCHPLIST=      yes
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
+BUILDLINK_API_DEPENDS.talloc+= talloc>=2.1.9
+.include "../../devel/talloc/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/samba4/PLIST
diff -u pkgsrc/net/samba4/PLIST:1.12 pkgsrc/net/samba4/PLIST:1.13
--- pkgsrc/net/samba4/PLIST:1.12        Wed May 24 15:51:32 2017
+++ pkgsrc/net/samba4/PLIST     Wed Feb 28 03:38:49 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2017/05/24 15:51:32 he Exp $
+@comment $NetBSD: PLIST,v 1.13 2018/02/28 03:38:49 nonaka Exp $
 bin/cifsdd
 bin/dbwrap_tool
 bin/eventlogadm
@@ -422,7 +422,6 @@ ${PYSITELIB}/samba/web_server/__init__.p
 ${PYSITELIB}/samba/xattr.py
 ${PYSITELIB}/samba/xattr_native.so
 ${PYSITELIB}/samba/xattr_tdb.so
-${PYSITELIB}/talloc.so
 ${PYSITELIB}/tdb.so
 ${PYSITELIB}/tevent.py
 lib/samba/auth/script.so
@@ -580,8 +579,6 @@ lib/samba/private/libprinting-migrate-sa
 lib/samba/private/libprocess-model-samba4.so
 lib/samba/private/libpyldb-util.so.1
 lib/samba/private/libpyldb-util.so.1.1.29
-lib/samba/private/libpytalloc-util.so.2
-lib/samba/private/libpytalloc-util.so.2.1.9
 lib/samba/private/libregistry-samba4.so
 lib/samba/private/libreplace-samba4.so
 lib/samba/private/libroken-samba4.so.19
@@ -610,8 +607,6 @@ lib/samba/private/libsmbpasswdparser-sam
 lib/samba/private/libsocket-blocking-samba4.so
 lib/samba/private/libsys-rw-samba4.so
 lib/samba/private/libtalloc-report-samba4.so
-lib/samba/private/libtalloc.so.2
-lib/samba/private/libtalloc.so.2.1.9
 lib/samba/private/libtdb-wrap-samba4.so
 lib/samba/private/libtdb.so.1
 lib/samba/private/libtdb.so.1.3.12