From owner-cvs-all@FreeBSD.ORG Fri Jan 16 20:47:07 2009 Return-Path: Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4D7D01065670; Fri, 16 Jan 2009 20:47:07 +0000 (UTC) (envelope-from makc@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 236338FC13; Fri, 16 Jan 2009 20:47:07 +0000 (UTC) (envelope-from makc@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0GKl7MO030553; Fri, 16 Jan 2009 20:47:07 GMT (envelope-from makc@repoman.freebsd.org) Received: (from makc@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0GKl717030538; Fri, 16 Jan 2009 20:47:07 GMT (envelope-from makc) Message-Id: <200901162047.n0GKl717030538@repoman.freebsd.org> From: Max Brazhnikov Date: Fri, 16 Jan 2009 20:47:06 +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/kdebase4-workspace Makefile X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Jan 2009 20:47:07 -0000 makc 2009-01-16 20:47:06 UTC FreeBSD ports repository Modified files: x11/kdebase4-workspace Makefile Log: Force commit: kdebase-workspace-4.1.4 and kdebase-runtime-4.1.1 install several the same files. Conflict has been set to avoid kdebase-workspace-4.1.4 package corruption on kdebase-runtime-4.1.1 deinstalling during update. See also UPDATING 20090114. Requested by: miwi Revision Changes Path 1.213 +0 -0 ports/x11/kdebase4-workspace/Makefile