[pkgsrc/pkgsrc-2006Q4]: pkgsrc/sysutils/bacula Pullup ticket 1976 - requested...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c7347bc98499
branches:  pkgsrc-2006Q4
changeset: 522942:c7347bc98499
user:      salo <salo%pkgsrc.org@localhost>
date:      Thu Jan 04 14:36:06 2007 +0000

description:
Pullup ticket 1976 - requested by ghen
add CONFLICT with bacula-clientonly in bacula

Revisions pulled up:
- pkgsrc/sysutils/bacula/Makefile                       1.20

   Module Name:         pkgsrc
   Committed By:        ghen
   Date:                Thu Jan  4 12:16:57 UTC 2007

   Modified Files:
        pkgsrc/sysutils/bacula: Makefile

   Log Message:
   bacula-client was reimported as bacula-clientonly, add a CONFLICT with the
   latter, too.

diffstat:

 sysutils/bacula/Makefile |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (12 lines):

diff -r ae65acefe779 -r c7347bc98499 sysutils/bacula/Makefile
--- a/sysutils/bacula/Makefile  Thu Jan 04 13:46:12 2007 +0000
+++ b/sysutils/bacula/Makefile  Thu Jan 04 14:36:06 2007 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2006/10/09 14:20:28 ghen Exp $
+# $NetBSD: Makefile,v 1.19.2.1 2007/01/04 14:36:06 salo Exp $
 
-CONFLICTS+=            bacula-client-[0-9]*
+CONFLICTS+=            bacula-client-[0-9]* bacula-clientonly-[0-9]*
 
 .include "options.mk"