From owner-freebsd-ports  Sun Jun 16  5:10:12 2002
Delivered-To: freebsd-ports@hub.freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id F14C737B404
	for <freebsd-ports@hub.freebsd.org>; Sun, 16 Jun 2002 05:10:01 -0700 (PDT)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g5GCA1U40541;
	Sun, 16 Jun 2002 05:10:01 -0700 (PDT)
	(envelope-from gnats)
Received: from unsane.de (p50804C65.dip.t-dialin.net [80.128.76.101])
	by hub.freebsd.org (Postfix) with ESMTP id 69E4337B406
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 16 Jun 2002 05:09:17 -0700 (PDT)
Received: from localhost (localhost.unsane.de [127.0.0.1])
	by unsane.de (Postfix) with ESMTP id 56068440
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 16 Jun 2002 14:09:15 +0200 (CEST)
Received: by unsane.de (Postfix, from userid 1001)
	id 8B38222C; Sun, 16 Jun 2002 14:09:14 +0200 (CEST)
Message-Id: <20020616120914.8B38222C@unsane.de>
Date: Sun, 16 Jun 2002 14:09:14 +0200 (CEST)
From: Oliver Braun <obraun@informatik.unibw-muenchen.de>
To: FreeBSD-gnats-submit@FreeBSD.org
X-Send-Pr-Version: 3.113
Subject: ports/39365: [MAINTAINER UPDATE] net/rsync: Fix after ${REINPLACE_CMD} commit
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-ports.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-ports>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-ports>
X-Loop: FreeBSD.org


>Number:         39365
>Category:       ports
>Synopsis:       [MAINTAINER UPDATE] net/rsync: Fix after ${REINPLACE_CMD} commit
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jun 16 05:10:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Oliver Braun
>Release:        FreeBSD 4.6-STABLE i386
>Organization:
>Environment:
System: FreeBSD galore.unsane.de 4.6-STABLE FreeBSD 4.6-STABLE #0: Sun Jun 16 12:43:32 CEST 2002 root@galore.unsane.de:/usr/obj/usr/src/sys/GALORE_OB i386


>Description:

Fix error on -current. sed(1) fails if backup file already exists.

Reported by bento
-> http://bento.freebsd.org/errorlogs/5-latest/rsync-2.5.5_1.log

Regards,
         Olli
>How-To-Repeat:
>Fix:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/rsync/Makefile,v
retrieving revision 1.71
diff -u -r1.71 Makefile
--- Makefile	2002/06/14 07:21:10	1.71
+++ Makefile	2002/06/16 12:03:29
@@ -47,9 +47,11 @@
 pre-configure:
 	@${REINPLACE_CMD} -e 's:/etc/:${PREFIX}/etc/:g'  \
 		${WRKSRC}/rsync.h ${WRKSRC}/rsync.1 ${WRKSRC}/rsyncd.conf.5
+	@${RM} ${WRKSRC}/rsync.h.bak
 	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' \
 		${WRKSRC}/rsync.h ${WRKSRC}/zlib/zutil.h
 .if defined(WITH_SSH)
+	@${RM} ${WRKSRC}/rsync.h.bak
 	@${REINPLACE_CMD} -e 's/"rsh"/"ssh"/g' ${WRKSRC}/rsync.h
 .endif
 
>Release-Note:
>Audit-Trail:
>Unformatted:

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