pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/net/samba4 net/samba4: use devel/talloc package instea...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/734ee8b20fcd
branches:  trunk
changeset: 376268:734ee8b20fcd
user:      nonaka <nonaka%pkgsrc.org@localhost>
date:      Wed Feb 28 03:38:49 2018 +0000

description:
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.

diffstat:

 net/samba4/Makefile |  8 +++++---
 net/samba4/PLIST    |  7 +------
 2 files changed, 6 insertions(+), 9 deletions(-)

diffs (64 lines):

diff -r b19e90167a79 -r 734ee8b20fcd net/samba4/Makefile
--- a/net/samba4/Makefile       Wed Feb 28 01:52:31 2018 +0000
+++ b/net/samba4/Makefile       Wed Feb 28 03:38:49 2018 +0000
@@ -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+=      --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 @@
 .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"
diff -r b19e90167a79 -r 734ee8b20fcd net/samba4/PLIST
--- a/net/samba4/PLIST  Wed Feb 28 01:52:31 2018 +0000
+++ b/net/samba4/PLIST  Wed Feb 28 03:38:49 2018 +0000
@@ -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/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/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/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



Home | Main Index | Thread Index | Old Index