svn commit: r522784 - in head/databases: db5 db6

[Steve Wills]

Hi,

On 1/12/20 7:47 AM, Matthias Andree wrote:
> Author: mandree
> Date: Sun Jan 12 12:47:53 2020
> New Revision: 522784
> URL: https://svnweb.freebsd.org/changeset/ports/522784
> 
> Log:
>    databases/db6, db5: fix JAVA-enabled build, suppress sed failed warnings
>    
>    Add JAVA_VERSION="7 8" to db6
>    Add REWARNFILE=/dev/null to db6 and db5

Individual ports aren't meant to set REWARNFILE. See below.

>    Reported by: Tommy P <tommyhp2 at gmail.com>
>    PR:          243278
>    MFH:         2020Q1 (blanket, fix broken build)
> 
> Modified:
>    head/databases/db5/Makefile
>    head/databases/db6/Makefile
> 
> Modified: head/databases/db5/Makefile
> ==============================================================================
> --- head/databases/db5/Makefile	Sun Jan 12 12:45:05 2020	(r522783)
> +++ head/databases/db5/Makefile	Sun Jan 12 12:47:53 2020	(r522784)
> @@ -38,6 +38,9 @@ USE_LDCONFIG=	yes
>   PLIST_SUB=	BDBMAJ=${BDBMAJ} BDBVER=${BDBVER}
>   MAKE_ARGS+=	docdir=${DOCSDIR}
>   CFLAGS+=	-Wall -Wextra
> +# we use REINPLACE_CMD with a glob that matches
> +# too broadly, suppress 'sed failed' warnings:
> +REWARNFILE=    /dev/null

Indeed the glob is too broad, but if the 5 files that this applies to 
were listed individually, that would still be replacing static content 
with sed, rather than a patch, which is not what section 4.4.3 of the 
Porters Handbook says:

https://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/slow-patch.html

I think this should look more like the attached patch. Similar changes 
are needed for db6.

Steve
-------------- next part --------------
A non-text attachment was scrubbed...
Name: db5_reinplace.diff
Type: text/x-patch
Size: 5627 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-head/attachments/20200112/17542453/attachment.bin>