Re: git: e86886e38b29 - main - emulators/wine-devel: Sort and align Makefile - no functional changes

Le Fri, Oct 24, 2025 at 12:00:38AM +0200, Gerald Pfeifer a écrit :
> On Sun, 7 Sep 2025, Vladimir Druzenko wrote:
> >     emulators/wine-devel: Sort and align Makefile - no functional changes
> >     
> >     Fix warnings from portclippy, sort options and etc.
> 
> Is it a good idea to simply just follow what portclippy suggests?
> 
> > -USES=		bison cpe desktop-file-utils gmake \
> > -		llvm:min=17,build,noexport localbase \
> > -		pkgconfig sdl shebangfix tar:xz
> > +USES=		bison cpe desktop-file-utils gmake llvm:min=17,build,noexport \
> > +		localbase pkgconfig sdl shebangfix tar:xz
> 
> For example, is this really worth the churn and making history and
> `git blame` harder to follow? How is this sufficiently better?
> 
> > +WINELIBDIR=	${PREFIX}/lib
> > +.if !defined(USE_LDCONFIG32)
> > +USE_LDCONFIG=	${WINELIBDIR} ${WINELIBDIR}/wine
> > +.endif
> 
> This one simply moves code around without looking into it. I believe the 
> following patch should be added with a reference to
> 
>    commit 99af2239fc168cc980f622c3f98b6ab21af873aa
>    Author: Alexander Vereeken <Alexander88207@protonmail.com>
>    Date:   Tue Nov 16 06:09:39 2021 +0000
> 
>     emulators/i386-wine-devel: Remove port.
> 
> Something like
> 
>    Since removing emulators/i386-wine-devel with commit 99af2239fc in 
>    2021 we don't need to account for USE_LDCONFIG32 any longer and can
>    set USE_LDCONFIG unconditionally.
> 
>    This matches 904382ada0af for emulators/wine.
> 
> --- a/emulators/wine-devel/Makefile
> +++ b/emulators/wine-devel/Makefile
> @@ -22,10 +22,7 @@ USES=		bison cpe desktop-file-utils gmake llvm:min=17,build,noexport \
>  		localbase pkgconfig sdl shebangfix tar:xz
>  CPE_VENDOR=	winehq
>  USE_GCC=	yes
> -WINELIBDIR=	${PREFIX}/lib
> -.if !defined(USE_LDCONFIG32)
> -USE_LDCONFIG=	${WINELIBDIR} ${WINELIBDIR}/wine
> -.endif
> +USE_LDCONFIG=	${PREFIX}/lib ${PREFIX}/lib/wine
>  USE_SDL=	sdl2
>  
>  SHEBANG_FILES=	tools/make_requests tools/winemaker/winemaker \
> 
> What do you think, Thibault?
> 
> > -OPTIONS_DEFINE=	CUPS DOCS DOSBOX GNUTLS V4L WAYLAND X11 GECKO MONO
> :
> > +OPTIONS_DEFINE=		CUPS DOCS DOSBOX GECKO GNUTLS MONO V4L WAYLAND X11
> 
> This was sorted deliberately to keep GECKO and MONO at the end as they 
> additional modules being included (and in most cases not too relevant).
> It's fine to change that deliberately, though just because portclippy 
> recommended it, I'm not convinced.
> 
> Gerald

I do agree that following blindly portclippy is not always the best
idea.

I agree that we can put back GECKO and MONO at the end, but we need an
additional comment there to indicate to not move them to please portclippy.

Since I had no idea on the reason to why it was in this order, when
someone ask to sort it, and that it has no functional change I did not
have an argument to go against it.

For USE_LDCONFIG32 I haven't checked yet, but I assume it was not
defined on 32bit right ? Just when building the 32bit part on the
64bit port with i386-wine ?

As of now, I have the update to 10.17 that is awaiting to be picked up
here: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=290406

Once it is done, I can cherry pick your commit for USE_LDCONFIG and
add a commit to put GECKO and MONO at the end.

Have a good day.
-- 
Thibault Payet