From b84fdd1b472e2dda679b4d058ab7e3607cde6971 Mon Sep 17 00:00:00 2001 From: naddy Date: Sat, 17 Jun 2006 15:31:52 +0000 Subject: [PATCH] dictd-client and p5-Net-Dict clash over bin/dict --- net/dictd/Makefile | 4 ++-- net/dictd/pkg/PLIST | 3 ++- net/p5-Net-Dict/Makefile | 4 ++-- net/p5-Net-Dict/pkg/PLIST | 3 ++- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/net/dictd/Makefile b/net/dictd/Makefile index b3411af3bbe..4956e916316 100644 --- a/net/dictd/Makefile +++ b/net/dictd/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2006/04/19 17:11:52 alek Exp $ +# $OpenBSD: Makefile,v 1.2 2006/06/17 15:31:52 naddy Exp $ COMMENT= "Dictionary Server Protocol client" COMMENT-server= "Dictionary Server Protocol server" DISTNAME= dictd-1.9.15 -PKGNAME= ${DISTNAME:S/-/-client-/} +PKGNAME= ${DISTNAME:S/-/-client-/}p0 PKGNAME-server= ${DISTNAME:S/-/-server-/} CATEGORIES= net education diff --git a/net/dictd/pkg/PLIST b/net/dictd/pkg/PLIST index 0a8f0a7ec38..1f36c9cd4f7 100644 --- a/net/dictd/pkg/PLIST +++ b/net/dictd/pkg/PLIST @@ -1,4 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2006/04/19 17:11:52 alek Exp $ +@comment $OpenBSD: PLIST,v 1.2 2006/06/17 15:31:52 naddy Exp $ +@conflict p5-Net-Dict-* bin/dict bin/dictl @man man/man1/dict.1 diff --git a/net/p5-Net-Dict/Makefile b/net/p5-Net-Dict/Makefile index 13f9971d407..3b8783d7fc9 100644 --- a/net/p5-Net-Dict/Makefile +++ b/net/p5-Net-Dict/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2004/01/05 17:45:36 sturm Exp $ +# $OpenBSD: Makefile,v 1.2 2006/06/17 15:31:52 naddy Exp $ COMMENT= "Perl Interface to the DICT protocol" DISTNAME= Net-Dict-2.07 -PKGNAME= p5-${DISTNAME} +PKGNAME= p5-${DISTNAME}p0 CATEGORIES= net perl5 MAINTAINER= Sam Smith diff --git a/net/p5-Net-Dict/pkg/PLIST b/net/p5-Net-Dict/pkg/PLIST index 6c49f27126d..f4c5b08f75d 100644 --- a/net/p5-Net-Dict/pkg/PLIST +++ b/net/p5-Net-Dict/pkg/PLIST @@ -1,4 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.2 2004/09/15 18:17:43 espie Exp $ +@comment $OpenBSD: PLIST,v 1.3 2006/06/17 15:31:52 naddy Exp $ +@conflict dictd-client-* bin/dict @comment bin/tkdict ${P5SITE}/Net/