dictd-client and p5-Net-Dict clash over bin/dict

This commit is contained in:
naddy 2006-06-17 15:31:52 +00:00
parent 2b083c763d
commit b84fdd1b47
4 changed files with 8 additions and 6 deletions

View File

@ -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= "Dictionary Server Protocol client"
COMMENT-server= "Dictionary Server Protocol server" COMMENT-server= "Dictionary Server Protocol server"
DISTNAME= dictd-1.9.15 DISTNAME= dictd-1.9.15
PKGNAME= ${DISTNAME:S/-/-client-/} PKGNAME= ${DISTNAME:S/-/-client-/}p0
PKGNAME-server= ${DISTNAME:S/-/-server-/} PKGNAME-server= ${DISTNAME:S/-/-server-/}
CATEGORIES= net education CATEGORIES= net education

View File

@ -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/dict
bin/dictl bin/dictl
@man man/man1/dict.1 @man man/man1/dict.1

View File

@ -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" COMMENT= "Perl Interface to the DICT protocol"
DISTNAME= Net-Dict-2.07 DISTNAME= Net-Dict-2.07
PKGNAME= p5-${DISTNAME} PKGNAME= p5-${DISTNAME}p0
CATEGORIES= net perl5 CATEGORIES= net perl5
MAINTAINER= Sam Smith <s@msmith.net> MAINTAINER= Sam Smith <s@msmith.net>

View File

@ -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 bin/dict
@comment bin/tkdict @comment bin/tkdict
${P5SITE}/Net/ ${P5SITE}/Net/