diff options
| -rw-r--r-- | databases/tdb/Makefile | 5 | ||||
| -rw-r--r-- | net/samba/Makefile | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/databases/tdb/Makefile b/databases/tdb/Makefile index 1e87aff3a4b..96e5b4b4a2d 100644 --- a/databases/tdb/Makefile +++ b/databases/tdb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/04/11 21:45:16 tv Exp $ +# $NetBSD: Makefile,v 1.8 2005/04/15 11:45:16 wiz Exp $ # DISTNAME= tdb-1.0.6 @@ -10,6 +10,9 @@ MAINTAINER= jmmv@NetBSD.org HOMEPAGE= http://www.sourceforge.net/projects/tdb/ COMMENT= Small database system which uses files to store data +# both install tdbtool and tdbdump +CONFLICTS+= samba-[0-9]* + GNU_CONFIGURE= YES USE_GNU_TOOLS+= make USE_LIBTOOL= YES diff --git a/net/samba/Makefile b/net/samba/Makefile index 40122a561ac..605c1fdcf7e 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.139 2005/04/11 21:46:59 tv Exp $ +# $NetBSD: Makefile,v 1.140 2005/04/15 11:45:16 wiz Exp $ DISTNAME= samba-3.0.10 PKGREVISION= 2 @@ -16,7 +16,7 @@ MAINTAINER= jlam@NetBSD.org HOMEPAGE= http://www.samba.org/ COMMENT= SMB/CIFS protocol server suite -CONFLICTS+= ja-samba-[0-9]* pam-smbpass-[0-9]* winbind-[0-9]* +CONFLICTS+= ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]* winbind-[0-9]* PKG_INSTALLATION_TYPES= overwrite pkgviews |