circuit and xscreensaver both install a circuit.6 manpage.

Add @conflict markers.
This commit is contained in:
bernd 2007-01-16 10:11:53 +00:00
parent 0435472660
commit 3311692e39
4 changed files with 8 additions and 5 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.8 2006/11/13 10:08:12 steven Exp $
# $OpenBSD: Makefile,v 1.9 2007/01/16 10:11:53 bernd Exp $
COMMENT= "finish-the-cycle logic puzzle"
CATEGORIES= games
@ -6,6 +6,7 @@ CATEGORIES= games
MAINTAINER= Marc Espie <espie@openbsd.org>
DISTNAME= circuit-0.1.4
PKGNAME= ${DISTNAME}p0
MASTER_SITES= ftp://quatramaran.ens.fr/pub/cigaes/circuit/

View File

@ -1,3 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2004/09/15 00:46:08 espie Exp $
@comment $OpenBSD: PLIST,v 1.4 2007/01/16 10:11:53 bernd Exp $
@conflict xscreensaver-*
bin/circuit
@man man/man6/circuit.6

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.40 2007/01/04 20:19:55 steven Exp $
# $OpenBSD: Makefile,v 1.41 2007/01/16 10:11:53 bernd Exp $
COMMENT= "screen saver and locker for the X Window System"
DISTNAME= xscreensaver-5.01
PKGNAME= ${DISTNAME}p1
PKGNAME= ${DISTNAME}p2
CATEGORIES= x11
HOMEPAGE= http://www.jwz.org/xscreensaver/

View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.20 2006/11/09 08:27:51 dim Exp $
@comment $OpenBSD: PLIST,v 1.21 2007/01/16 10:11:53 bernd Exp $
@conflict circuit-*
@mode 4755
bin/xscreensaver
@mode