From owner-freebsd-ports Fri Sep 10 15: 0: 6 1999 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 66C271511A for ; Fri, 10 Sep 1999 15:00:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id PAA29127; Fri, 10 Sep 1999 15:00:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from dt014nb6.san.rr.com (dt014nb6.san.rr.com [24.30.129.182]) by hub.freebsd.org (Postfix) with ESMTP id EE749152AF for ; Fri, 10 Sep 1999 14:51:08 -0700 (PDT) (envelope-from doug@dt014nb6.san.rr.com) Received: (from doug@localhost) by dt014nb6.san.rr.com (8.9.3/8.8.8) id OAA73521; Fri, 10 Sep 1999 14:51:08 -0700 (PDT) (envelope-from doug) Message-Id: <199909102151.OAA73521@dt014nb6.san.rr.com> Date: Fri, 10 Sep 1999 14:51:08 -0700 (PDT) From: Doug@gorean.org Reply-To: Doug@gorean.org To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/13688: [PATCH] Upgrade mergemaster port Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 13688 >Category: ports >Synopsis: [PATCH] Upgrade mergemaster port >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: Fri Sep 10 15:00:01 PDT 1999 >Closed-Date: >Last-Modified: >Originator: Doug >Release: FreeBSD 3.2-STABLE i386 >Organization: AAAG >Environment: DNA >Description: I'm the author of mergemaster and maintainer of the port. This is an upgrade to the latest version which has many nice new features. From the CHANGES file: Thanks to (in no particular order) Mark Murray, Brian Somers, Kris Kennaway Adrian Colley and Andy Farkas for their excellent suggestions used to improve this version. ---------------------------- revision 1.36 Release ready ---------------------------- revision 1.35 Add a test for "no" to strict to make the rc file easier to read ---------------------------- revision 1.34 Clean up some text messages Move the rm password files command up ---------------------------- revision 1.33 Put "quotes" back around case variables, for pedantic purposes if nothing else Add "Merge again?" option Add support for reading $HOME/.mergemasterrc Finally fix install modes problem using one-line perl script Use "if command; then" instead of testing $? ---------------------------- revision 1.32 Add -m option to specify source directory ---------------------------- revision 1.31 Fix up the special case code ---------------------------- revision 1.30 First run of special case handling for various files ---------------------------- revision 1.29 Fix one more small typo in the case conversion ---------------------------- revision 1.28 fix small typo ---------------------------- revision 1.27 many more [ -> case changes ---------------------------- revision 1.26 Bring case statements into line with more standard format Fix OLDID bogon ---------------------------- revision 1.25 Work with the $Id -> $FreeBSD change in 4.0-Current ---------------------------- >How-To-Repeat: DNA >Fix: Apply the following patch: diff -ur mergemaster.Dist/Makefile mergemaster/Makefile --- mergemaster.Dist/Makefile Thu Sep 2 12:45:57 1999 +++ mergemaster/Makefile Fri Sep 10 14:45:00 1999 @@ -1,17 +1,17 @@ # New ports collection makefile for: mergemaster -# Version required: 1.24 +# Version required: 1.36 # Date created: 11 September 1998 -# Whom: Doug Barton +# Whom: Doug Barton # # $FreeBSD: ports/sysutils/mergemaster/Makefile,v 1.6 1999/08/31 01:59:53 peter Exp $ # -DISTNAME= mergemaster-1.24 +DISTNAME= mergemaster-1.36 CATEGORIES= sysutils -MASTER_SITES= http://doug.simplenet.com/FreeBSD/ \ +MASTER_SITES= http://freebsd.simplenet.com/Downloads/ \ http://home.san.rr.com/freebsd/ -MAINTAINER= Studded@gorean.org +MAINTAINER= Doug@gorean.org NO_WRKSUBDIR= yes NO_BUILD= yes diff -ur mergemaster.Dist/files/md5 mergemaster/files/md5 --- mergemaster.Dist/files/md5 Mon May 10 01:17:00 1999 +++ mergemaster/files/md5 Fri Sep 10 14:45:21 1999 @@ -1 +1 @@ -MD5 (mergemaster-1.24.tar.gz) = 5a14cea34cdd090ec8fa94c63beb1447 +MD5 (mergemaster-1.36.tar.gz) = 3b376a2e0337cf851a133dac7a99cfd9 Thanks, and sorry for the delay, Doug >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message