From owner-cvs-all@FreeBSD.ORG  Thu Feb  5 11:30:59 2004
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id B765416A4DB; Thu,  5 Feb 2004 11:30:59 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 72B5943D6B; Thu,  5 Feb 2004 11:30:44 -0800 (PST)
	(envelope-from lofi@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i15JTS0B008121;
	Thu, 5 Feb 2004 11:29:28 -0800 (PST)
	(envelope-from lofi@repoman.freebsd.org)
Received: (from lofi@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i15JTSZ7008120;
	Thu, 5 Feb 2004 11:29:28 -0800 (PST)
	(envelope-from lofi)
Message-Id: <200402051929.i15JTSZ7008120@repoman.freebsd.org>
From: Michael Nottebrock <lofi@FreeBSD.org>
Date: Thu, 5 Feb 2004 11:29:28 -0800 (PST)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: ports/x11/kdelibs3 Makefile
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Feb 2004 19:31:00 -0000

lofi        2004/02/05 11:29:28 PST

  FreeBSD ports repository

  Modified files:
    x11/kdelibs3         Makefile 
  Log:
  Some headers got moved from kdebase to kdelibs and now kdelibs-3.2.0
  install files conflicting with files from kdebase-3.1.x. Declare CONFLICTS
  as appropriate. This will not fix automatic portupgrading, but at least
  things should go smoothly with the necessary manual intervention of pkg_
  deleting kdebase-3.1.x. Sorry. :-(
  
  Revision  Changes    Path
  1.138     +2 -0      ports/x11/kdelibs3/Makefile