From owner-cvs-all@FreeBSD.ORG  Wed Aug 24 22:42:00 2005
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: 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 8190116A41F;
	Wed, 24 Aug 2005 22:42:00 +0000 (GMT)
	(envelope-from lofi@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3FBF843D49;
	Wed, 24 Aug 2005 22:42:00 +0000 (GMT)
	(envelope-from lofi@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j7OMg0xh082008;
	Wed, 24 Aug 2005 22:42:00 GMT
	(envelope-from lofi@repoman.freebsd.org)
Received: (from lofi@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7OMg0la082007;
	Wed, 24 Aug 2005 22:42:00 GMT (envelope-from lofi)
Message-Id: <200508242242.j7OMg0la082007@repoman.freebsd.org>
From: Michael Nottebrock <lofi@FreeBSD.org>
Date: Wed, 24 Aug 2005 22:42:00 +0000 (UTC)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: ports/x11/kdelibs3 Makefile
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
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: Wed, 24 Aug 2005 22:42:00 -0000

lofi        2005-08-24 22:42:00 UTC

  FreeBSD ports repository

  Modified files:
    x11/kdelibs3         Makefile 
  Log:
  Fix CONFLICTS with kdeadmin.
  
  Approved by: portmgr (linimon)
  
  Revision  Changes    Path
  1.180     +3 -2      ports/x11/kdelibs3/Makefile