From owner-cvs-ports@FreeBSD.ORG Thu Sep 29 11:07:20 2005 Return-Path: X-Original-To: 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 3B0E416A41F; Thu, 29 Sep 2005 11:07:20 +0000 (GMT) (envelope-from novel@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EBEDE43D49; Thu, 29 Sep 2005 11:07:19 +0000 (GMT) (envelope-from novel@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 j8TB7JWP011529; Thu, 29 Sep 2005 11:07:19 GMT (envelope-from novel@repoman.freebsd.org) Received: (from novel@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j8TB7JF3011528; Thu, 29 Sep 2005 11:07:19 GMT (envelope-from novel) Message-Id: <200509291107.j8TB7JF3011528@repoman.freebsd.org> From: Roman Bogorodskiy Date: Thu, 29 Sep 2005 11:07:19 +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/japanese/jls Makefile ports/sysutils/sleuthkit Makefile X-BeenThere: cvs-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Sep 2005 11:07:20 -0000 novel 2005-09-29 11:07:19 UTC FreeBSD ports repository Modified files: japanese/jls Makefile sysutils/sleuthkit Makefile Log: Mark CONFLICTS - both install bin/jls and jls.1 man. PR: 86698 Submitted by: Fumiyoshi TAOKA Revision Changes Path 1.16 +2 -0 ports/japanese/jls/Makefile 1.9 +2 -0 ports/sysutils/sleuthkit/Makefile