From owner-freebsd-questions@FreeBSD.ORG  Thu Jul 13 18:40:32 2006
Return-Path: <owner-freebsd-questions@FreeBSD.ORG>
X-Original-To: freebsd-questions@freebsd.org
Delivered-To: freebsd-questions@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 298FD16A4DE
	for <freebsd-questions@freebsd.org>;
	Thu, 13 Jul 2006 18:40:32 +0000 (UTC)
	(envelope-from yontege@hal.rescomp.berkeley.edu)
Received: from rescomp.berkeley.edu (keyserver.Rescomp.Berkeley.EDU
	[169.229.70.167])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1E26243D6D
	for <freebsd-questions@freebsd.org>;
	Thu, 13 Jul 2006 18:40:28 +0000 (GMT)
	(envelope-from yontege@hal.rescomp.berkeley.edu)
Received: by rescomp.berkeley.edu (Postfix, from userid 1032)
	id 274085B79C; Thu, 13 Jul 2006 11:40:20 -0700 (PDT)
Date: Thu, 13 Jul 2006 11:40:20 -0700
From: "Ian A. Tegebo" <yontege@rescomp.berkeley.edu>
To: freebsd-questions@freebsd.org
Message-ID: <20060713184019.GU21646@rescomp.berkeley.edu>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.5.9i
Cc: sysadmin@rescomp.berkeley.edu
Subject: Using mergemaster for non-base files
X-BeenThere: freebsd-questions@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: User questions <freebsd-questions.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
	<mailto:freebsd-questions-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-questions>
List-Post: <mailto:freebsd-questions@freebsd.org>
List-Help: <mailto:freebsd-questions-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
	<mailto:freebsd-questions-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Jul 2006 18:40:32 -0000

Is anyone using mergemaster for groups of files that are not being
updated from /usr/src?  I've been thinking of making a copy of 
/usr/src/etc/Makefile and then modifying it so that I can run mergemaster 
like this:

-------------------------- script --------------------------------------
MYTMP="/var/tmp/twiki_upgrade"
MYSRC="/var/tmp/new_twiki_src"
MYDST="/usr/local/www/twiki" 

mergemaster -t $MYTMP -m $MYSRC -D $MYDST
------------------------ end script ------------------------------------

The first problem I ran into was:

-------------------------- Error --------------------------------------
make: don't know how to make distrib-dirs. Stop
make: don't know how to make distrib-dirs. Stop

  *** FATAL ERROR: Cannot 'cd' to /var/tmp/new_twiki_src and install files to
        the temproot environment
------------------------ end Error -----------------------------------

Has anyone had any luck with something like this?  My approach will be
to write a Makefile in $MYSRC/etc/Makefile that will have targets:


$ grep -E '^[-a-zA-Z0-9_]+:' /usr/src/etc/Makefile
afterinstall:
distribute:
distribution:
distrib-dirs:
etc-examples:

--
Ian Tegebo
Residential Computing
UC Berkeley