From owner-cvs-ports@FreeBSD.ORG  Fri May 23 20:05:21 2003
Return-Path: <owner-cvs-ports@FreeBSD.ORG>
Delivered-To: cvs-ports@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 0E90237B401; Fri, 23 May 2003 20:05:21 -0700 (PDT)
Received: from blues.jpj.net (blues.jpj.net [208.210.80.156])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id E9D4243F3F; Fri, 23 May 2003 20:05:17 -0700 (PDT)
	(envelope-from trevor@jpj.net)
Received: from blues.jpj.net (localhost.jpj.net [127.0.0.1])
	by blues.jpj.net (8.12.9/8.12.3) with ESMTP id h4O35GFg045328;
	Fri, 23 May 2003 23:05:16 -0400 (EDT)
	(envelope-from trevor@jpj.net)
Received: from localhost (trevor@localhost)h4O35Gk0045325;
	Fri, 23 May 2003 23:05:16 -0400 (EDT)
X-Authentication-Warning: blues.jpj.net: trevor owned process doing -bs
Date: Fri, 23 May 2003 23:05:16 -0400 (EDT)
From: Trevor Johnson <trevor@jpj.net>
To: Kris Kennaway <kris@FreeBSD.org>
In-Reply-To: <200305060515.h465FJjl075405@repoman.freebsd.org>
Message-ID: <20030523225404.F39036@blues.jpj.net>
References: <200305060515.h465FJjl075405@repoman.freebsd.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
cc: cvs-ports@FreeBSD.org
cc: freebsd-gnats-submit@FreeBSD.org
cc: cvs-all@FreeBSD.org
Subject: Re: ports/24292: update-patches target in ports/Mk/bsd.port.mk
X-BeenThere: cvs-ports@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the ports tree <cvs-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-ports>
List-Post: <mailto:cvs-ports@freebsd.org>
List-Help: <mailto:cvs-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 24 May 2003 03:05:21 -0000

> kris        2003/05/05 22:15:19 PDT
>
>   FreeBSD ports repository
>
>   Modified files:
>     Mk                   bsd.port.mk
>   Log:
>   - Add support for the Tools/scripts/update-patches script [1]

[...]

>   Submitted by:   trevor [1], lioux [2],
>                   Sergey Matveychuk <sem@ciam.ru> [3]
>   PR:             24292 [1], 47146 [3]

<URL:http://www.FreeBSD.org/cgi/query-pr.cgi?pr=24292>

>
>   Revision  Changes    Path
>   1.448     +94 -44    ports/Mk/bsd.port.mk
>
> <URL:http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/Mk/bsd.port.mk.diff?&r1=1.447&r2=1.448&f=u>

In a follow-up to the PR, I said:

 Date: Sat, 25 May 2002 11:18:46 -0400 (EDT)

 I have updated the patch to support PATCH_WRKSRC, which was introduced in
 revision 1.356 of bsd.port.mk.  See
 http://people.freebsd.org/~trevor/ports/update-patches-1.411.diff .

The patch from 2001 was committed instead of the updated patch from 2002.
The older one no longer works.  The following patch is the difference
between what is in bsd.port.mk and what I submitted last year, which also
had a whitespace change for readability.

Index: bsd.port.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.449
diff -u -r1.449 bsd.port.mk
--- bsd.port.mk	14 May 2003 16:47:31 -0000	1.449
+++ bsd.port.mk	24 May 2003 02:50:13 -0000
@@ -3421,7 +3421,9 @@
 # Generates patches.

 update-patches:
-	@toedit=`WRKSRC=${WRKSRC} PATCHDIR=${PATCHDIR} PATCH_LIST=${PATCHDIR}/patch-* \
+	@toedit=`PATCH_WRKSRC=${PATCH_WRKSRC} \
+		PATCHDIR=${PATCHDIR} \
+		PATCH_LIST=${PATCHDIR}/patch-* \
 		DIFF_ARGS=${DIFF_ARGS} DISTORIG=${DISTORIG} \
 		${SH} ${PORTSDIR}/Tools/scripts/update-patches`; \
 	case $$toedit in "");; \
-- 
Trevor Johnson