Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 23 May 2003 23:05:16 -0400 (EDT)
From:      Trevor Johnson <trevor@jpj.net>
To:        Kris Kennaway <kris@FreeBSD.org>
Cc:        cvs-all@FreeBSD.org
Subject:   Re: ports/24292: update-patches target in ports/Mk/bsd.port.mk
Message-ID:  <20030523225404.F39036@blues.jpj.net>
In-Reply-To: <200305060515.h465FJjl075405@repoman.freebsd.org>
References:  <200305060515.h465FJjl075405@repoman.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
> 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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030523225404.F39036>