diff options
| author | wiz <wiz@pkgsrc.org> | 2012-05-12 07:37:50 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2012-05-12 07:37:50 +0000 |
| commit | 160ba2a0ec65e02055fd20ef3f32c9c191780e6d (patch) | |
| tree | 5fd0537a27c6445bf07ff39056b843dd5a8ce38e /net | |
| parent | 4406df51670fef2d84a13e2982806f852d7b754d (diff) | |
| download | pkgsrc-160ba2a0ec65e02055fd20ef3f32c9c191780e6d.tar.gz | |
Add CONFLICTS with new man-pages package. For details, see
man-pages/Makefile.
Diffstat (limited to 'net')
| -rw-r--r-- | net/libbind/Makefile | 4 | ||||
| -rw-r--r-- | net/tnftpd/Makefile | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/net/libbind/Makefile b/net/libbind/Makefile index 041a46892de..a4131f14503 100644 --- a/net/libbind/Makefile +++ b/net/libbind/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2012/03/12 04:39:16 joerg Exp $ +# $NetBSD: Makefile,v 1.4 2012/05/12 07:37:51 wiz Exp $ # DISTNAME= libbind-6.0 @@ -13,6 +13,8 @@ LICENSE= isc PKG_DESTDIR_SUPPORT= user-destdir +CONFLICTS= man-pages-[0-9]* + GNU_CONFIGURE= yes USE_LIBTOOL= yes diff --git a/net/tnftpd/Makefile b/net/tnftpd/Makefile index 616c1bff394..3c534453c40 100644 --- a/net/tnftpd/Makefile +++ b/net/tnftpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2010/03/24 14:12:44 lukem Exp $ +# $NetBSD: Makefile,v 1.22 2012/05/12 07:37:51 wiz Exp $ # DISTNAME= tnftpd-20100324 @@ -13,6 +13,7 @@ PKG_DESTDIR_SUPPORT= user-destdir CONFLICTS= wu-ftpd-[0-9]* CONFLICTS+= kth-krb4-[0-9]* CONFLICTS+= lukemftpd-[0-9]* +CONFLICTS= man-pages-[0-9]* GNU_CONFIGURE= YES MANCOMPRESSED_IF_MANZ= YES |