From owner-cvs-ports@FreeBSD.ORG  Thu Oct 16 23:09:40 2003
Return-Path: <owner-cvs-ports@FreeBSD.ORG>
Delivered-To: cvs-ports@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id BE99E16A4B3; Thu, 16 Oct 2003 23:09:40 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 4548743F85; Thu, 16 Oct 2003 23:09:40 -0700 (PDT)
	(envelope-from lofi@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9H69eXJ065709;
	Thu, 16 Oct 2003 23:09:40 -0700 (PDT)
	(envelope-from lofi@repoman.freebsd.org)
Received: (from lofi@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9H69df8065708;
	Thu, 16 Oct 2003 23:09:39 -0700 (PDT)
	(envelope-from lofi)
Message-Id: <200310170609.h9H69df8065708@repoman.freebsd.org>
From: Michael Nottebrock <lofi@FreeBSD.org>
Date: Thu, 16 Oct 2003 23:09:39 -0700 (PDT)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: ports/devel/kdevelop Makefile pkg-plist
 ports/devel/qt-designer Makefile ports/mail/xfmail Makefile
 ports/x11-toolkits/qt23 Makefile ports/x11-toolkits/qt32 Makefile
X-BeenThere: cvs-ports@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the ports tree <cvs-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-ports>
List-Post: <mailto:cvs-ports@freebsd.org>
List-Help: <mailto:cvs-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 17 Oct 2003 06:09:40 -0000

lofi        2003/10/16 23:09:39 PDT

  FreeBSD ports repository

  Modified files:
    devel/kdevelop       Makefile pkg-plist 
    devel/qt-designer    Makefile 
    mail/xfmail          Makefile 
    x11-toolkits/qt23    Makefile 
    x11-toolkits/qt32    Makefile 
  Log:
  Declare (or resolve) conflicts for KDE and QT.
  
  Revision  Changes    Path
  1.53      +3 -2      ports/devel/kdevelop/Makefile
  1.11      +0 -1      ports/devel/kdevelop/pkg-plist
  1.7       +15 -11    ports/devel/qt-designer/Makefile
  1.51      +3 -0      ports/mail/xfmail/Makefile
  1.108     +2 -0      ports/x11-toolkits/qt23/Makefile
  1.145     +2 -0      ports/x11-toolkits/qt32/Makefile