From owner-cvs-ports@FreeBSD.ORG  Wed Jul 30 09:55:37 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 9E3C037B401; Wed, 30 Jul 2003 09:55:36 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id EAFCD43F75; Wed, 30 Jul 2003 09:55:35 -0700 (PDT)
	(envelope-from eivind@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6UGtZ0U056734;
	Wed, 30 Jul 2003 09:55:35 -0700 (PDT)
	(envelope-from eivind@repoman.freebsd.org)
Received: (from eivind@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6UGtZZA056728;
	Wed, 30 Jul 2003 09:55:35 -0700 (PDT)
Message-Id: <200307301655.h6UGtZZA056728@repoman.freebsd.org>
From: Eivind Eklund <eivind@FreeBSD.org>
Date: Wed, 30 Jul 2003 09:55:35 -0700 (PDT)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: ports/sysutils Makefile ports/sysutils/etcmerge
 Makefile pkg-descr pkg-plist ports/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, 30 Jul 2003 16:55:38 -0000

eivind      2003/07/30 09:55:35 PDT

  FreeBSD ports repository

  Modified files:
    sysutils             Makefile 
  Added files:
    sysutils/etcmerge    Makefile pkg-descr pkg-plist 
    sysutils/etcmerge/src etcmerge.8 etcmerge.sh 
  Log:
  3-way merge for /etc (mergemaster replacement)
  
  Revision  Changes    Path
  1.391     +1 -0      ports/sysutils/Makefile
  1.1       +34 -0     ports/sysutils/etcmerge/Makefile (new)
  1.1       +4 -0      ports/sysutils/etcmerge/pkg-descr (new)
  1.1       +1 -0      ports/sysutils/etcmerge/pkg-plist (new)
  1.1       +269 -0    ports/sysutils/etcmerge/src/etcmerge.8 (new)
  1.1       +401 -0    ports/sysutils/etcmerge/src/etcmerge.sh (new)