Fix unnecessary conflict with samba subports, in particular - libsmbclient.

3 files changed, 45 insertions, 14 deletions

diff --git a/databases/tdb/Makefile b/databases/tdb/Makefile
index 3579893a3021..49cf7a9fb58a 100644
--- a/databases/tdb/Makefile
+++ b/databases/tdb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		tdb
 PORTVERSION=		1.2.1
+PORTREVISION=		1
 PORTEPOCH=		1
 CATEGORIES=		databases
 MASTER_SITES=		ftp://ftp.samba.org/pub/%SUBDIR%/ \
@@ -17,7 +18,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=		timur@FreeBSD.org
 COMMENT=		Trivial Database
 
-CONFLICTS=		*samba3[0-4]*
+CONFLICTS=		*samba3[0-4]-3.*
 
 USE_PYTHON=		yes
 USE_GMAKE=		yes
@@ -26,10 +27,12 @@ GNU_CONFIGURE=		yes
 USE_GNOME=		pkgconfig
 USE_AUTOTOOLS=		autoconf:268 autoheader:268
 
+LICENSE=		GPLv3
+MAKE_JOBS_SAFE=		yes
+
 IPATHS=			-I${WRKSRC}/libreplace
 AUTOHEADER_ARGS=	${IPATHS}
 AUTOCONF_ARGS=		${IPATHS}
-
 PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
 PKGCONFIGDIR_REL?=	${PKGCONFIGDIR:S|^${PREFIX}/||}
 PYTHON_SITELIBDIR_REL?=	${PYTHONPREFIX_SITELIBDIR:S|^${PREFIX}/||}
@@ -52,10 +55,7 @@ PLIST_FILES=		bin/tdbbackup \
 
 pre-install:
 .for man in ${MAN8}
-			@${CP} ${FILESDIR}/${man} ${WRKSRC}/manpages
+			@${INSTALL_MAN} ${FILESDIR}/${man} ${WRKSRC}/manpages
 .endfor
 
-post-install:
-			@${LN} -sf libtdb.so.1 ${PREFIX}/lib/libtdb.so
-
 .include <bsd.port.mk>
diff --git a/databases/tdb/distinfo b/databases/tdb/distinfo
index 6ea486958c8f..ba295d26b66a 100644
--- a/databases/tdb/distinfo
+++ b/databases/tdb/distinfo
@@ -1,3 +1,2 @@
-MD5 (tdb-1.2.1.tar.gz) = 73ea81282a82e5c959d9c082af2d0215
 SHA256 (tdb-1.2.1.tar.gz) = ef423b934c5ddfeddaa3d3b1567072b0d6f7243bbae5fd363a1b090b0573cdfa
 SIZE (tdb-1.2.1.tar.gz) = 268142
diff --git a/databases/tdb/files/patch-tdb.mk b/databases/tdb/files/patch-tdb.mk
index 67ab863b289a..889f4479c372 100644
--- a/databases/tdb/files/patch-tdb.mk
+++ b/databases/tdb/files/patch-tdb.mk
@@ -1,15 +1,43 @@
---- ./tdb.mk.orig	2010-01-09 02:39:48.000000000 +0000
-+++ ./tdb.mk	2010-01-09 02:42:49.000000000 +0000
-@@ -6,7 +6,7 @@
+--- tdb.mk.orig	2010-02-08 16:12:57.000000000 +0100
++++ tdb.mk	2010-10-29 14:36:26.000000000 +0200
+@@ -5,8 +5,7 @@
+ PROGS_NOINSTALL = bin/tdbtest$(EXEEXT) bin/tdbtorture$(EXEEXT)
  ALL_PROGS = $(PROGS) $(PROGS_NOINSTALL)
  
- TDB_SONAME = libtdb.$(SHLIBEXT).1
+-TDB_SONAME = libtdb.$(SHLIBEXT).1
 -TDB_SOLIB = libtdb.$(SHLIBEXT).$(PACKAGE_VERSION)
 +TDB_SOLIB = libtdb.$(SHLIBEXT).1
  TDB_STLIB = libtdb.a
  
  TDB_LIB = $(TDB_STLIB) 
-@@ -67,7 +67,7 @@
+@@ -28,7 +27,7 @@
+ 
+ test:: abi_checks
+ 
+-test:: bin/tdbtorture$(EXEEXT) $(TDB_SONAME)
++test:: bin/tdbtorture$(EXEEXT) $(TDB_SOLIB)
+ 	$(LIB_PATH_VAR)=. bin/tdbtorture$(EXEEXT)
+ 
+ abi_checks::
+@@ -37,7 +36,7 @@
+ 
+ clean:: 
+ 	rm -f test.db test.tdb torture.tdb test.gdbm
+-	rm -f $(TDB_SONAME) $(TDB_SOLIB) $(TDB_STLIB) libtdb.$(SHLIBEXT)
++	rm -f $(TDB_SOLIB) $(TDB_STLIB) libtdb.$(SHLIBEXT)
+ 	rm -f $(ALL_PROGS) tdb.pc
+ 	rm -f tdb.exports.sort tdb.exports.check tdb.exports.check.sort
+ 	rm -f tdb.signatures.sort tdb.signatures.check tdb.signatures.check.sort
+@@ -70,7 +69,7 @@
+ 	mkdir -p $(DESTDIR)`$(PYTHON) -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1, prefix='$(prefix)')"`
+ 	cp tdb.$(SHLIBEXT) $(DESTDIR)`$(PYTHON) -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1, prefix='$(prefix)')"`
+ 
+-check-python:: build-python $(TDB_SONAME)
++check-python:: build-python $(TDB_SOLIB)
+ 	$(LIB_PATH_VAR)=. PYTHONPATH=".:$(tdbdir)" $(PYTHON) $(tdbdir)/python/tests/simple.py
+ 
+ clean::
+@@ -80,7 +79,7 @@
  	mkdir -p $(DESTDIR)$(bindir)
  	mkdir -p $(DESTDIR)$(includedir)
  	mkdir -p $(DESTDIR)$(libdir) 
@@ -18,16 +46,20 @@
  
  installbin:: all installdirs
  	cp $(PROGS) $(DESTDIR)$(bindir)
-@@ -76,7 +76,7 @@
+@@ -89,18 +88,13 @@
  	cp $(srcdir)/include/tdb.h $(DESTDIR)$(includedir)
  
  installlibs:: all installdirs
 -	cp tdb.pc $(DESTDIR)$(libdir)/pkgconfig
 +	cp tdb.pc $(DESTDIR)$(prefix)/libdata/pkgconfig
  	cp $(TDB_STLIB) $(TDB_SOLIB) $(DESTDIR)$(libdir)
+ 	rm -f $(DESTDIR)$(libdir)/libtdb.$(SHLIBEXT)
+ 	ln -s $(TDB_SOLIB) $(DESTDIR)$(libdir)/libtdb.$(SHLIBEXT)
+-	rm -f $(DESTDIR)$(libdir)/$(TDB_SONAME)
+-	ln -s $(TDB_SOLIB) $(DESTDIR)$(libdir)/$(TDB_SONAME)
  
  $(TDB_STLIB): $(TDB_OBJ)
-@@ -84,6 +84,3 @@
+ 	ar -rv $(TDB_STLIB) $(TDB_OBJ)
  
  libtdb.$(SHLIBEXT): $(TDB_SOLIB)
  	ln -fs $< $@