resolve the CONFLICT between tdb and samba - make sambe use

an external libtdb instead of the internal duplicate

3 files changed, 14 insertions, 20 deletions

diff --git a/net/samba/Makefile b/net/samba/Makefile
index dd8bf5ae4ae..617df90bff4 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.223 2012/10/23 17:19:07 asau Exp $
+# $NetBSD: Makefile,v 1.224 2012/10/30 13:24:32 drochner Exp $
 
 .include "../../net/samba/Makefile.mirrors"
 
 DISTNAME=	samba-${VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	${SAMBA_MIRRORS:=stable/}
 
@@ -13,7 +13,7 @@ COMMENT=	SMB/CIFS protocol server suite
 LICENSE=	gnu-gpl-v3
 
 VERSION=	3.6.6
-CONFLICTS+=	ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]* winbind-[0-9]*
+CONFLICTS+=	ja-samba-[0-9]* pam-smbpass-[0-9]* winbind-[0-9]*
 
 FILESDIR=		${PKGDIR}/../../net/samba/files
 DESCR_SRC=		${PKGDIR}/../../net/samba/DESCR
@@ -46,7 +46,7 @@ FILES_SUBST+=		WINBINDD_RCD_SCRIPT=${WINBINDD_RCD_SCRIPT:Q}
 
 # mktemp is useful for the replacement adduser script, but don't require
 # a full dependency since it's not actually needed by samba.
-USE_TOOLS+=		gmake mktemp perl:run
+USE_TOOLS+=		gmake mktemp perl:run pkg-config
 REPLACE_PERL=		script/findsmb.in
 
 BROKEN_GETTEXT_DETECTION=yes
@@ -65,6 +65,7 @@ CONFIGURE_ARGS+=	--with-statedir=${SAMBA_STATEDIR}
 CONFIGURE_ARGS+=	--localstatedir=${SAMBA_VARDIR}
 CONFIGURE_ARGS+=	--with-mandir=${PREFIX}/${PKGMANDIR}
 CONFIGURE_ARGS+=	--with-swatdir=${PREFIX}/share/samba/swat
+CONFIGURE_ARGS+=	--enable-external-libtdb
 #
 # Explicitly disable samba4 merged-build option which is broken.
 #
@@ -117,6 +118,10 @@ SUBST_SED.paths+=	-e 's,@SH@,${SH},g'
 
 post-extract:
 	${CP} ${FILESDIR}/adduser.sh ${FILESDIR}/deluser.sh ${WRKDIR}
+	for n in tdbbackup.8 tdbdump.8 tdbtool.8; do \
+		${RM} ${WRKSRC}/../docs/manpages/$$n; \
+		${RM} ${WRKSRC}/../docs/htmldocs/manpages/$$n.html; \
+	done
 
 post-install:
 	${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/js
@@ -154,6 +159,8 @@ post-install:
 .include "../../devel/libuuid/buildlink3.mk"
 .endif
 .include "../../converters/libiconv/buildlink3.mk"
+BUILDLINK_API_DEPENDS.tdb+= tdb>=1.2.10
+.include "../../databases/tdb/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
diff --git a/net/samba/PLIST b/net/samba/PLIST
index 872866797b7..91925af6261 100644
--- a/net/samba/PLIST
+++ b/net/samba/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.50 2012/07/06 23:32:59 asau Exp $
+@comment $NetBSD: PLIST,v 1.51 2012/10/30 13:24:32 drochner Exp $
 bin/eventlogadm
 bin/findsmb
 bin/net
@@ -19,17 +19,12 @@ bin/smbstatus
 bin/smbta-util
 bin/smbtar
 bin/smbtree
-bin/tdbbackup
-bin/tdbdump
-bin/tdbrestore
-bin/tdbtool
 bin/testparm
 ${PLIST.winbind}bin/wbinfo
 include/libsmbclient.h
 include/netapi.h
 include/smb_share_modes.h
 include/talloc.h
-include/tdb.h
 ${PLIST.winbind}include/wbclient.h
 lib/libnetapi.${LIBEXT}
 lib/libnetapi.${LIBEXT}.0
@@ -40,9 +35,6 @@ lib/libsmbsharemodes.${LIBEXT}.0
 lib/libtalloc.${LIBEXT}
 lib/libtalloc.${LIBEXT}.2
 lib/libtalloc.${LIBEXT}.2.0.5
-lib/libtdb.${LIBEXT}
-lib/libtdb.${LIBEXT}.1
-lib/libtdb.${LIBEXT}.1.2.9
 ${PLIST.winbind}lib/libwbclient.${LIBEXT}
 ${PLIST.winbind}lib/libwbclient.${LIBEXT}.0
 ${PLIST.winbind}${NSS_WINBIND}
@@ -139,9 +131,6 @@ man/man8/smbpasswd.8
 man/man8/smbspool.8
 man/man8/smbta-util.8
 man/man8/swat.8
-man/man8/tdbbackup.8
-man/man8/tdbdump.8
-man/man8/tdbtool.8
 man/man8/vfs_acl_tdb.8
 man/man8/vfs_acl_xattr.8
 man/man8/vfs_aio_fork.8
@@ -506,9 +495,6 @@ share/samba/swat/help/manpages/smbta-util.8.html
 share/samba/swat/help/manpages/smbtar.1.html
 share/samba/swat/help/manpages/smbtree.1.html
 share/samba/swat/help/manpages/swat.8.html
-share/samba/swat/help/manpages/tdbbackup.8.html
-share/samba/swat/help/manpages/tdbdump.8.html
-share/samba/swat/help/manpages/tdbtool.8.html
 share/samba/swat/help/manpages/testparm.1.html
 share/samba/swat/help/manpages/vfs_acl_tdb.8.html
 share/samba/swat/help/manpages/vfs_acl_xattr.8.html
diff --git a/net/samba/buildlink3.mk b/net/samba/buildlink3.mk
index 2da55eeeee6..21576db1d6f 100644
--- a/net/samba/buildlink3.mk
+++ b/net/samba/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2012/01/30 15:44:02 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2012/10/30 13:24:32 drochner Exp $
 
 BUILDLINK_TREE+=	samba
 
@@ -10,6 +10,7 @@ BUILDLINK_ABI_DEPENDS.samba+=	samba>=3.0.34nb1
 BUILDLINK_PKGSRCDIR.samba?=	../../net/samba
 
 .include "../../converters/libiconv/buildlink3.mk"
+.include "../../databases/tdb/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
 .endif # SAMBA_BUILDLINK3_MK