[pkgsrc/trunk]: pkgsrc/x11/xdaemon Fixed typo (CONFLICT => CONFLICTS). Sorted...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/549ed8f3fc1e
branches:  trunk
changeset: 501568:549ed8f3fc1e
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Oct 23 23:01:49 2005 +0000

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

diffstat:

 x11/xdaemon/Makefile |   5 +++--
 x11/xdaemon/PLIST    |  12 ++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diffs (43 lines):

diff -r 57110cc55a95 -r 549ed8f3fc1e x11/xdaemon/Makefile
--- a/x11/xdaemon/Makefile      Sun Oct 23 22:59:18 2005 +0000
+++ b/x11/xdaemon/Makefile      Sun Oct 23 23:01:49 2005 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2005/07/19 02:29:50 grant Exp $
+# $NetBSD: Makefile,v 1.15 2005/10/23 23:01:49 rillig Exp $
 
 DISTNAME=      xdaemon-1.0
+PKGREVISION=   1
 CATEGORIES=    games x11
 MASTER_SITES=  ${MASTER_SITE_LOCAL}
 DISTFILES=     ${PIX} Daemon.README
@@ -11,7 +12,7 @@
 
 DEPENDS+=      xteddy-1.*:../../x11/xteddy
 
-CONFLICT+=     xdaemon-2.*
+CONFLICTS+=    xdaemon-2.*
 
 WRKSRC=                ${WRKDIR}
 DIST_SUBDIR=   xdaemon
diff -r 57110cc55a95 -r 549ed8f3fc1e x11/xdaemon/PLIST
--- a/x11/xdaemon/PLIST Sun Oct 23 22:59:18 2005 +0000
+++ b/x11/xdaemon/PLIST Sun Oct 23 23:01:49 2005 +0000
@@ -1,12 +1,12 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:12:02 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/10/23 23:01:49 rillig Exp $
 bin/xdaemon
 bin/xdaemon2
-share/xteddy/pixmaps/xdaemon_bw.xbm
+share/doc/xdaemon.README
 share/xteddy/pixmaps/xdaemon2_bw.xbm
+share/xteddy/pixmaps/xdaemon2_color.xpm
+share/xteddy/pixmaps/xdaemon2_icon.xbm
+share/xteddy/pixmaps/xdaemon2_mask.xbm
+share/xteddy/pixmaps/xdaemon_bw.xbm
 share/xteddy/pixmaps/xdaemon_color.xpm
-share/xteddy/pixmaps/xdaemon2_color.xpm
 share/xteddy/pixmaps/xdaemon_icon.xbm
-share/xteddy/pixmaps/xdaemon2_icon.xbm
 share/xteddy/pixmaps/xdaemon_mask.xbm
-share/xteddy/pixmaps/xdaemon2_mask.xbm
-share/doc/xdaemon.README