From owner-freebsd-ports  Mon May 10  1:10: 4 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 C519C156C2
	for <freebsd-ports@FreeBSD.org>; Mon, 10 May 1999 01:10:01 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id BAA88117;
	Mon, 10 May 1999 01:10:01 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: from dt051nc7.san.rr.com (dt051nc7.san.rr.com [204.210.32.199])
	by hub.freebsd.org (Postfix) with ESMTP id 1559515105
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 10 May 1999 01:08:04 -0700 (PDT)
	(envelope-from doug@dt051nc7.san.rr.com)
Received: (from doug@localhost)
	by dt051nc7.san.rr.com (8.8.8/8.8.8) id BAA04237;
	Mon, 10 May 1999 01:08:04 -0700 (PDT)
	(envelope-from doug)
Message-Id: <199905100808.BAA04237@dt051nc7.san.rr.com>
Date: Mon, 10 May 1999 01:08:04 -0700 (PDT)
From: Studded@gorean.org
Reply-To: Studded@gorean.org
To: FreeBSD-gnats-submit@freebsd.org
X-Send-Pr-Version: 3.2
Subject: ports/11622: Upgrade mergemaster port
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         11622
>Category:       ports
>Synopsis:       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:   Mon May 10 01:10:01 PDT 1999
>Closed-Date:
>Last-Modified:
>Originator:     Doug
>Release:        FreeBSD 2.2.8-RELEASE i386
>Organization:
AAAG
>Environment:

	DNA

>Description:

	Upgrade mergemaster port to version 1.24.

>How-To-Repeat:

	DNA

>Fix:

	Apply the following patch:


diff -ur mergemaster.old/Makefile mergemaster/Makefile
--- mergemaster.old/Makefile	Tue Sep 29 14:53:59 1998
+++ mergemaster/Makefile	Mon May 10 00:17:21 1999
@@ -1,17 +1,18 @@
 # New ports collection makefile for:	mergemaster
-# Version required:     1.17
+# Version required:     1.24
 # Date created:		11 September 1998
-# Whom:			Doug <Studded@dal.net>
+# Whom:			Doug Barton <Studded@gorean.org>
 #
 # $Id: Makefile,v 1.3 1998/09/29 21:53:59 alex Exp $
 #
 
-DISTNAME=	mergemaster-1.17
+DISTNAME=	mergemaster-1.24
 CATEGORIES=	sysutils
-MASTER_SITES=	ftp://ftp1.dal.net/dalnet/FreeBSD/ \
-		ftp://ftp2.dal.net/dalnet/FreeBSD/
+MASTER_SITES=	ftp://ftp.dal.net/dalnet/FreeBSD/ \
+		http://doug.simplenet.com/FreeBSD/ \
+		http://home.san.rr.com/freebsd/
 
-MAINTAINER=	Studded@dal.net
+MAINTAINER=	Studded@gorean.org
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
diff -ur mergemaster.old/files/md5 mergemaster/files/md5
--- mergemaster.old/files/md5	Mon Sep 28 02:22:00 1998
+++ mergemaster/files/md5	Mon May 10 00:19:54 1999
@@ -1 +1 @@
-MD5 (mergemaster-1.17.tar.gz) = a7e6d302b9ba253dd6dbdebc87bb1aa6
+MD5 (mergemaster-1.24.tar.gz) = 5a14cea34cdd090ec8fa94c63beb1447

Thanks,

Doug

>Release-Note:
>Audit-Trail:
>Unformatted:


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