cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* fix a long-standing bug where files without RCS Ids wouldn't be compared;

Browse Source 
pointed out by brad@
* mention in man page that -r can be used with etcXX.tgz; from ian@
This commit is contained in:
naddy 2002-01-22 23:19:50 +00:00
parent 8bdef72f7e
commit bf465fdd20
4 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sysutils/mergemaster/Makefile
View File

@ -1,7 +1,8 @@
# $OpenBSD: Makefile,v 1.3 2001/10/25 16:14:51 naddy Exp $
# $OpenBSD: Makefile,v 1.4 2002/01/22 23:19:50 naddy Exp $
COMMENT= "aids with merging configuration files during an upgrade"
PKGNAME= ${DISTNAME}p1
DISTNAME= mergemaster-1.25
CATEGORIES= sysutils
NEED_VERSION= 1.402

0
sysutils/mergemaster/files/md5 → sysutils/mergemaster/distinfo
View File

24
sysutils/mergemaster/patches/patch-mergemaster_8
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-mergemaster_8,v 1.1.1.1 2001/09/27 17:30:11 naddy Exp $
--- mergemaster.8.orig Thu Sep 27 16:31:45 2001
+++ mergemaster.8 Thu Sep 27 16:34:06 2001
$OpenBSD: patch-mergemaster_8,v 1.2 2002/01/22 23:19:50 naddy Exp $
--- mergemaster.8.orig Thu Sep 27 16:20:58 2001
+++ mergemaster.8 Tue Jan 22 23:19:26 2002
@@ -44,7 +44,7 @@
is a Bourne shell script which is designed to aid you
in updating the various configuration and other files
@ -27,7 +27,21 @@ $OpenBSD: patch-mergemaster_8,v 1.1.1.1 2001/09/27 17:30:11 naddy Exp $
compare every file.
.Pp
.Nm
@@ -327,9 +327,9 @@ with all values commented out:
@@ -157,6 +157,13 @@ on a previously cleaned directory, skipp
the temporary root environment.
This option is compatible
with all other options.
+In particular, it can be used with
+.Fl t
+to specify the directory containing an extracted copy of the
+.Pa /etc
+distribution from an
+.Ox
+snapshot.
.It Fl v
Be more verbose about the process.
You should probably use
@@ -327,9 +334,9 @@ with all values commented out:
.Pp
.Pa /usr/src/etc/Makefile
.Rs
@ -40,7 +54,7 @@ $OpenBSD: patch-mergemaster_8,v 1.1.1.1 2001/09/27 17:30:11 naddy Exp $
.Re
.Sh DIAGNOSTICS
Exit status is 0 on successful completion, or if the user bails out
@@ -350,7 +350,7 @@ web pages in a much simpler form under t
@@ -350,7 +357,7 @@ web pages in a much simpler form under t
.Pa comproot
on 13 March 1998. The idea for creating the
temporary root environment comes from Nik Clayton's

15
sysutils/mergemaster/patches/patch-mergemaster_sh
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-mergemaster_sh,v 1.1.1.1 2001/09/27 17:30:11 naddy Exp $
$OpenBSD: patch-mergemaster_sh,v 1.2 2002/01/22 23:19:50 naddy Exp $
--- mergemaster.sh.orig Thu Sep 27 16:20:58 2001
+++ mergemaster.sh Thu Sep 27 19:18:53 2001
+++ mergemaster.sh Tue Jan 22 23:59:13 2002
@@ -351,7 +351,7 @@ SOURCEDIR=${SOURCEDIR:-/usr/src/etc}
# Define what CVS $Id tag to look for to aid portability.
@ -42,3 +42,14 @@ $OpenBSD: patch-mergemaster_sh,v 1.1.1.1 2001/09/27 17:30:11 naddy Exp $
# Get ready to start comparing files
@@ -730,8 +723,8 @@ for COMPFILE in `find . -type f -size +0
# If the files have the same $Id, delete the one in temproot so the
# user will have less to wade through if files are left to merge by hand.
#
- CVSID1=`grep "[$]${CVS_ID_TAG}:" ${DESTDIR}${COMPFILE#.} 2>/dev/null`
- CVSID2=`grep "[$]${CVS_ID_TAG}:" ${COMPFILE} 2>/dev/null`
+ CVSID1=`grep "[$]${CVS_ID_TAG}:" ${DESTDIR}${COMPFILE#.} 2>/dev/null` &&
+ CVSID2=`grep "[$]${CVS_ID_TAG}:" ${COMPFILE} 2>/dev/null` || CVSID1=no
case "${CVSID2}" in
"${CVSID1}")