From owner-cvs-ports@FreeBSD.ORG  Wed Jan 21 07:10:37 2004
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 E2B9B16A4CE; Wed, 21 Jan 2004 07:10:37 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 2A3CA43D31; Wed, 21 Jan 2004 07:10:37 -0800 (PST)
	(envelope-from eivind@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 i0LFAa0B071378;
	Wed, 21 Jan 2004 07:10:36 -0800 (PST)
	(envelope-from eivind@repoman.freebsd.org)
Received: (from eivind@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0LFAaOr071377;
	Wed, 21 Jan 2004 07:10:36 -0800 (PST)
	(envelope-from eivind)
Message-Id: <200401211510.i0LFAaOr071377@repoman.freebsd.org>
From: Eivind Eklund <eivind@FreeBSD.org>
Date: Wed, 21 Jan 2004 07:10:36 -0800 (PST)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: ports/sysutils/etcmerge
	Makefileports/sysutils/etcmerge/src etcmerge.8 etcmerge.sh
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: Wed, 21 Jan 2004 15:10:38 -0000

eivind      2004/01/21 07:10:36 PST

  FreeBSD ports repository

  Modified files:
    sysutils/etcmerge    Makefile 
    sysutils/etcmerge/src etcmerge.8 etcmerge.sh 
  Log:
  Update to version 0.4:
  * Update docs with a better mergemaster procedure and better markup.
    Partially submitted by: ITO Tsuyoshi <tsuyoshi@is.s.u-tokyo.ac.jp>
  
  * Make etcmerge show usage information when run with no arguments.
    Noticed by: Daniel O'Connor <doconnor@gsoft.com.au>
  
  Revision  Changes    Path
  1.6       +2 -2      ports/sysutils/etcmerge/Makefile
  1.3       +17 -5     ports/sysutils/etcmerge/src/etcmerge.8
  1.5       +6 -1      ports/sysutils/etcmerge/src/etcmerge.sh