From owner-freebsd-ports  Sun Sep 27 21:50:09 1998
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Received: (from majordom@localhost)
          by hub.freebsd.org (8.8.8/8.8.8) id VAA29063
          for freebsd-ports-outgoing; Sun, 27 Sep 1998 21:50:09 -0700 (PDT)
          (envelope-from owner-freebsd-ports@FreeBSD.ORG)
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
          by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id VAA29037
          for <freebsd-ports@FreeBSD.org>; Sun, 27 Sep 1998 21:50:05 -0700 (PDT)
          (envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.8.8/8.8.5) id VAA22534;
	Sun, 27 Sep 1998 21:50:01 -0700 (PDT)
Received: from dt053nb4.san.rr.com (dt053nb4.san.rr.com [204.210.34.180])
          by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id VAA28595
          for <FreeBSD-gnats-submit@freebsd.org>; Sun, 27 Sep 1998 21:46:13 -0700 (PDT)
          (envelope-from dougdougdougdoug@dt053nb4.san.rr.com)
Received: (from root@localhost)
	by dt053nb4.san.rr.com (8.8.8/8.8.8) id VAA15165;
	Sun, 27 Sep 1998 21:29:16 -0700 (PDT)
	(envelope-from dougdougdougdoug)
Message-Id: <199809280429.VAA15165@dt053nb4.san.rr.com>
Date: Sun, 27 Sep 1998 21:29:16 -0700 (PDT)
From: Studded@dal.net
Reply-To: Studded@dal.net
To: FreeBSD-gnats-submit@FreeBSD.ORG
X-Send-Pr-Version: 3.2
Subject: ports/8068: [PATCH] Upgrade to mergemaster port
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         8068
>Category:       ports
>Synopsis:       [PATCH] Upgrade to 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:   Sun Sep 27 21:50:00 PDT 1998
>Last-Modified:
>Originator:     Doug
>Organization:
AAAG
>Release:        FreeBSD 2.2.7-STABLE-0920 i386
>Environment:

	DNA

>Description:

	Upgrade to mergemaster script. 

1. Improves documentation, including moving the manual page to section 8.
2. Fixes a problem where a bad umask or a cranky sdiff could possibly blat
file ownership and/or perms. 
3. Allow user to specify umask on the command line.
4. Improved error handling and added some warnings.
5. Uses 'install' instead of 'mv' to install the files.

>How-To-Repeat:

	DNA

>Fix:
	
	Apply the following patch:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/sysutils/mergemaster/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- Makefile	1998/09/17 22:35:42	1.1.1.1
+++ Makefile	1998/09/28 03:58:59
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	mergemaster
-# Version required:     1.14
+# Version required:     1.17
 # Date created:		11 September 1998
 # Whom:			Doug <Studded@dal.net>
 #
 # $Id: Makefile,v 1.1.1.1 1998/09/17 22:35:42 steve Exp $
 #
 
-DISTNAME=	mergemaster-1.14
+DISTNAME=	mergemaster-1.17
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp1.dal.net/dalnet/FreeBSD/ \
 		ftp://ftp2.dal.net/dalnet/FreeBSD/
@@ -16,10 +16,10 @@
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
-MAN1=		mergemaster.1
+MAN8=		mergemaster.8
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/mergemaster ${PREFIX}/sbin/mergemaster
-	${INSTALL_MAN} ${WRKDIR}/mergemaster.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKDIR}/mergemaster.8 ${PREFIX}/man/man8
 
 .include <bsd.port.mk>
Index: files/md5
===================================================================
RCS file: /home/ncvs/ports/sysutils/mergemaster/files/md5,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 md5
--- md5	1998/09/17 22:35:42	1.1.1.1
+++ md5	1998/09/28 03:59:29
@@ -1 +1 @@
-MD5 (mergemaster-1.14.tar.gz) = bf20b138dda9d04265ea7d7ba4da00c5
+MD5 (mergemaster-1.17.tar.gz) = a7e6d302b9ba253dd6dbdebc87bb1aa6
>Audit-Trail:
>Unformatted:

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