Date: Fri, 24 Oct 2025 00:00:38 +0200 (CEST) From: Gerald Pfeifer <gerald@pfeifer.com> To: Vladimir Druzenko <vvd@FreeBSD.org>, Thibault Payet <monwarez@mailoo.org> Cc: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: Re: git: e86886e38b29 - main - emulators/wine-devel: Sort and align Makefile - no functional changes Message-ID: <77b358bf-32fc-91c2-8fc8-22af3fe29287@pfeifer.com> In-Reply-To: <202509071427.587ERxSj015742@gitrepo.freebsd.org>
index | next in thread | previous in thread | raw e-mail
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
home |
help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?77b358bf-32fc-91c2-8fc8-22af3fe29287>