Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 12 Sep 1998 13:26:02 -0700 (PDT)
From:      Studded@dal.net
To:        FreeBSD-gnats-submit@FreeBSD.ORG
Subject:   ports/7910: New port, mergemaster script
Message-ID:  <199809122026.NAA17162@dt053nb4.san.rr.com>

next in thread | raw e-mail | index | archive | help

>Number:         7910
>Category:       ports
>Synopsis:       New port submission, mergemaster script
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:
>Keywords:
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Sep 12 13:30:01 PDT 1998
>Last-Modified:
>Originator:     Doug
>Organization:
AAAG
>Release:        FreeBSD 2.2.7-STABLE-0905 i386
>Environment:

	Should work on all FreeBSD systems. Tested on -Stable for 8 months,
-Current for 4 months. 

>Description:

	This is the long-awaited (by me anyway :) port of my mergemaster
script, formerly known as comproot. Details on how it works are in the DESCR
below. The script has a lot of options to handle various situations, including
an automatic mode for unattended operation.

>How-To-Repeat:

	DNA

>Fix:
	
	Commit the following port. :) I modeled this after the portlint port,
so I'm assuming that everything is correct. Feel free to make any changes
needed although it passes a portlint test with flying colors. :)

# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	mergemaster
#	mergemaster/files
#	mergemaster/files/md5
#	mergemaster/pkg
#	mergemaster/pkg/COMMENT
#	mergemaster/pkg/DESCR
#	mergemaster/pkg/PLIST
#	mergemaster/Makefile
#
echo c - mergemaster
mkdir -p mergemaster > /dev/null 2>&1
echo c - mergemaster/files
mkdir -p mergemaster/files > /dev/null 2>&1
echo x - mergemaster/files/md5
sed 's/^X//' >mergemaster/files/md5 << 'END-of-mergemaster/files/md5'
XMD5 (mergemaster-1.12.tar.gz) = afc041c471548a1098152a67890cce1b
END-of-mergemaster/files/md5
echo c - mergemaster/pkg
mkdir -p mergemaster/pkg > /dev/null 2>&1
echo x - mergemaster/pkg/COMMENT
sed 's/^X//' >mergemaster/pkg/COMMENT << 'END-of-mergemaster/pkg/COMMENT'
XScript to aid with merging configuration files during an upgrade
END-of-mergemaster/pkg/COMMENT
echo x - mergemaster/pkg/DESCR
sed 's/^X//' >mergemaster/pkg/DESCR << 'END-of-mergemaster/pkg/DESCR'
XThe mergemaster script is designed to aid you in updating the various
Xconfiguration and other files associated with FreeBSD.  The script
Xproduces a temporary root environment using /usr/src/etc/Makefile which
Xbuilds the temporary directory structure from / down, then populates that
Xenvironment with the various files. It then compares each file in that
Xenvironment to its installed counterpart. When the script finds a change
Xin the new file, or there is no installed version of the new file it
Xgives you four options to deal with it. You can install the new file as
Xis, delete the new file, merge the old and new files (as appropriate)
Xusing sdiff(1) or leave the file in the temporary root environment to
Xmerge by hand later.
END-of-mergemaster/pkg/DESCR
echo x - mergemaster/pkg/PLIST
sed 's/^X//' >mergemaster/pkg/PLIST << 'END-of-mergemaster/pkg/PLIST'
Xsbin/mergemaster
END-of-mergemaster/pkg/PLIST
echo x - mergemaster/Makefile
sed 's/^X//' >mergemaster/Makefile << 'END-of-mergemaster/Makefile'
X# New ports collection makefile for:	mergemaster
X# Version required:     1.12
X# Date created:		11 September 1998
X# Whom:			Doug <Studded@dal.net>
X#
X# $Id:$
X#
X
XDISTNAME=	mergemaster-1.12
XCATEGORIES=	sysutils
XMASTER_SITES=	ftp://ftp1.dal.net/dalnet/FreeBSD/ \
X		ftp://ftp2.dal.net/dalnet/FreeBSD/
X
XMAINTAINER=	Studded@dal.net
X
XNO_WRKSUBDIR=	yes
XNO_BUILD=	yes
X
XMAN1=		mergemaster.1
X
Xdo-install:
X	${INSTALL_SCRIPT} ${WRKDIR}/mergemaster ${PREFIX}/sbin/mergemaster
X	${INSTALL_MAN} ${WRKDIR}/mergemaster.1 ${PREFIX}/man/man1
X
X.include <bsd.port.mk>
END-of-mergemaster/Makefile
exit

>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199809122026.NAA17162>