Date: Thu, 27 Oct 2016 22:07:51 -0400 From: "Jason E. Hale" <jhale@freebsd.org> To: Jochen Neumeister <joneum@bsdproject.de> Cc: Franco Fichtner <franco@lastsummer.de>, "freebsd-ports@freebsd.org" <freebsd-ports@freebsd.org> Subject: Re: make makepatch Message-ID: <CAJE75NEeY%2Bn9xfrNB-H0VK_HdQLXM1%2BLSjcmmyYr1qCGKErTNQ@mail.gmail.com> In-Reply-To: <61b51cd8-18d2-8f70-77c7-ed7dd92c4a0c@bsdproject.de> References: <730bd5a8-d6c2-7e8f-5240-b7d4b6209884@bsdproject.de> <D00C1F21-1BDF-4372-9197-62C72A8CEE92@lastsummer.de> <6a431a63-7692-a667-5fa2-4de3d55d5189@bsdproject.de> <1FA8BED7-A46D-43B8-AE74-C99229350352@lastsummer.de> <61b51cd8-18d2-8f70-77c7-ed7dd92c4a0c@bsdproject.de>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, Oct 27, 2016 at 2:28 AM, Jochen Neumeister <joneum@bsdproject.de> wrote:
>
>
> On 27.10.2016 08:08, Franco Fichtner wrote:
>>> On 27 Oct 2016, at 7:53 AM, Jochen Neumeister <joneum@bsdproject.de> wrote:
>>>
>>> No, make makepatch delete the patches into /files and:
>> If there are no patches in files/ maybe you have no patches applied
>> in the work/ dir? Does running "make patch" before makepatch help?
>>
>>
> Hm that is interesting.
>
> make patch: there are 3 patches into /file
>
> make makepatch: now the 3 files are removed, but:
>
> make makepatch
> Generated patch-wpagui.cpp
> The previous patches have been placed here:
> /usr/home/joneum/dev/ports/net/wpa_gui/work/.makepatch-tmp/archived-patches
>
> Now I'm confused. After "make patch" and "make makepatch", there is only
> one "new" patch in files:
>
> /home/joneum/dev/ports/net/wpa_gui/files # ls
> patch-wpagui.cpp pkg-message.in
>
> and in work/.makepatch-tmp/archived-patches: # ls
> patch-os_unix.c patch-wpa_ctrl.c patch-wpagui.cpp
>
> Is this now right, that i can only use the new patch in /files? With
> "make clean" i delete the work folder and the old patches.
Here is the problem:
The port redefines WRKSRC by setting WRKSRC_SUBDIR=
wpa_supplicant/wpa_gui-qt4, but the two patches that did not get
generated are outside of WRKSRC. The easiest thing to do is:
1) clean everything up
2) run "make patch"
3) add PATCH_WRKSRC= ${WRKDIR}/${DISTNAME} to the port Makefile
4) run "make makepatch"
That should regenerate the patches and subsequently rename them.
Remind the committer to do "svn mv" to rename the patches instead of
deleting and re-adding them.
Cheers,
Jason
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAJE75NEeY%2Bn9xfrNB-H0VK_HdQLXM1%2BLSjcmmyYr1qCGKErTNQ>