Bug 258395 - ftp/bftpd: update port to remove unnecessary patch
Summary: ftp/bftpd: update port to remove unnecessary patch
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Rainer Hurling
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2021-09-09 20:58 UTC by Jesse Smith
Modified: 2021-09-10 13:27 UTC (History)
2 users (show)

See Also:


Attachments
Remove unnecessary patch file (836 bytes, text/plain)
2021-09-09 20:58 UTC, Jesse Smith
jsmith: maintainer-approval+
Details
patch to remove patchfile and pet portlint (1.84 KB, patch)
2021-09-10 05:48 UTC, Rainer Hurling
jsmith: maintainer-approval+
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Jesse Smith 2021-09-09 20:58:48 UTC
Created attachment 227796 [details]
Remove unnecessary patch file

The attached patch removes the file "files/patch-commands.c" from the FreeBSD port of ftp/bftpd. The patch-commands.c file adjusts included headers for Bftpd which should no longer be needed.

I've tested this on FreeBSD 12.x and the port still builds and runs the same with or without the patch-commands.c file in the port.
Comment 1 Rainer Hurling freebsd_committer 2021-09-10 05:48:07 UTC
Created attachment 227799 [details]
patch to remove patchfile and pet portlint

Hi Jesse,

Thanks for the patch. While testing it on Poudriere, 'portlint -AC' gives the following warnings:

WARN: Makefile: [32]: possible use of "${FIND} ... ${XARGS} ${RM}" when "${FIND} ... -delete" will work.
WARN: Makefile: "USES" has to appear earlier.


To turn off the first warning, only USES= had to be moved in the Makefile.

When testing '@${FIND} ${WRKSRC} -name CVS -delete' it turned out that the sources no longer contain a file named CVS. Therefore the whole line can be omitted.

I have therefore attached a patch that not only deletes the files directory, but also takes into account the two changes in the Makefile.

Please check if I understood everything correctly and if the patch works as expected.
Comment 2 Jesse Smith 2021-09-10 12:53:16 UTC
This change looks good to me. Please go ahead with applying the new patch which also fixes the Makefile.
Comment 3 commit-hook freebsd_committer 2021-09-10 13:23:07 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c3c3d04764ff6d1999b34cb807383999babf7bda

commit c3c3d04764ff6d1999b34cb807383999babf7bda
Author:     Jesse Smith <jsmith@resonatingmedia.com>
AuthorDate: 2021-09-10 05:39:54 +0000
Commit:     Rainer Hurling <rhurlin@FreeBSD.org>
CommitDate: 2021-09-10 13:21:52 +0000

    ftp/bftpd: Remove unnecessary patchfile

    While here, pet portlint and remove unneeded post-patch.

    PR:             258395

 ftp/bftpd/Makefile                      |  5 ++---
 ftp/bftpd/files/patch-commands.c (gone) | 27 ---------------------------
 2 files changed, 2 insertions(+), 30 deletions(-)
Comment 4 Rainer Hurling freebsd_committer 2021-09-10 13:27:53 UTC
Committed.

Thanks for the fast reponse :)