[pkgsrc/trunk]: pkgsrc/x11/xdaemon2 Fixed a typo (CONFLICT => CONFLICTS). Sor...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7786fc69b49f
branches:  trunk
changeset: 501570:7786fc69b49f
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Oct 23 23:04:00 2005 +0000

description:
Fixed a typo (CONFLICT => CONFLICTS). Sorted PLIST. Bumped PKGREVISION.

diffstat:

 x11/xdaemon2/Makefile |  6 +++---
 x11/xdaemon2/PLIST    |  4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (34 lines):

diff -r e924b11a7159 -r 7786fc69b49f x11/xdaemon2/Makefile
--- a/x11/xdaemon2/Makefile     Sun Oct 23 23:02:37 2005 +0000
+++ b/x11/xdaemon2/Makefile     Sun Oct 23 23:04:00 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2005/07/19 02:30:01 grant Exp $
+# $NetBSD: Makefile,v 1.13 2005/10/23 23:04:00 rillig Exp $
 
 DISTNAME=      xdaemon-2.0
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    games x11
 MASTER_SITES=  ${MASTER_SITE_LOCAL}
 DISTFILES=     ${PIX} Daemon.README
@@ -12,7 +12,7 @@
 
 DEPENDS+=      xteddy-2.*:../../x11/xteddy2
 
-CONFLICT+=     xdaemon-1.*
+CONFLICTS+=    xdaemon-1.*
 
 #WRKSRC=       ${WRKDIR}
 DIST_SUBDIR=   xdaemon
diff -r e924b11a7159 -r 7786fc69b49f x11/xdaemon2/PLIST
--- a/x11/xdaemon2/PLIST        Sun Oct 23 23:02:37 2005 +0000
+++ b/x11/xdaemon2/PLIST        Sun Oct 23 23:04:00 2005 +0000
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:12:03 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/10/23 23:04:00 rillig Exp $
 bin/xdaemon
 bin/xdaemon2
+share/doc/xdaemon.README
 share/xteddy/xdaemon.png
 share/xteddy/xdaemon2.png
-share/doc/xdaemon.README