Attachment 246253 Details for Bug 274953 – Makefile maintenance & dependency cleanup

[patch] Makefile maintenance & dependency cleanup

0001-emulators-wine-devel-Makefile-maintenance-dependency.patch (text/plain), 8.68 KB, created by Alastair Hogge on 2023-11-12 02:07:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alastair Hogge

Created: 2023-11-12 02:07:29 UTC

Size: 8.68 KB

patch

obsolete

>From 8c94cf8a93c3902f1c9fa63915c2a9f41985c261 Mon Sep 17 00:00:00 2001
>From: Alastair Hogge <agh@riseup.net>
>Date: Sun, 12 Nov 2023 10:03:35 +0800
>Subject: [PATCH] emulators/wine-devel: Makefile maintenance & dependency
> cleanup
>
>* Add missing USES=gnome and USE=GNOME=glib20 for GSTREAMER dependencies
>* port{clippy,fmt,lint} house keeping
>* Switch to bsd.port.options.mk/bsd.port.mk inclusion pair
>* Add ${STRIP_CMD} to GNU configure environment variable ac_cv_prog_STRIP
>
> PR:		274953
>---
> emulators/wine-devel/Makefile | 184 +++++++++++++++++++---------------
> 1 file changed, 101 insertions(+), 83 deletions(-)
>
>diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
>index e02736209c96..9eafea8427ec 100644
>--- a/emulators/wine-devel/Makefile
>+++ b/emulators/wine-devel/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	wine
> DISTVERSION=	8.20
>+PORTREVISION=	1
> PORTEPOCH=	1
> CATEGORIES=	emulators
> MASTER_SITES=	https://dl.winehq.org/wine/source/8.x/
>@@ -15,51 +16,56 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> ONLY_FOR_ARCHS=	amd64 i386
> 
>-BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex llvm${_LLVM_VERSION}>=0:devel/llvm${_LLVM_VERSION}
>+BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex \
>+		llvm${_LLVM_VERSION}>=0:devel/llvm${_LLVM_VERSION}
> 
>-USES=		bison cpe desktop-file-utils gmake localbase \
>-		pkgconfig sdl shebangfix tar:xz
>+USES=		bison cpe desktop-file-utils gmake localbase pkgconfig sdl \
>+		shebangfix tar:xz
>+CPE_VENDOR=	winehq
> USE_GCC=	yes
>+.if !defined(USE_LDCONFIG32)
>+USE_LDCONFIG=	${_WINELIBDIR} ${_WINELIBDIR}/wine
>+.endif
> USE_SDL=	sdl2
> 
>-CPE_VENDOR=	winehq
>+SHEBANG_FILES=	tools/make_requests tools/winedump/function_grep.pl \
>+		tools/winemaker/winemaker
>+
>+GNU_CONFIGURE=		yes
>+CONFIGURE_ARGS+=	--disable-kerberos \
>+			--disable-tests \
>+			--verbose \
>+			--with-mingw \
>+			--with-pthread \
>+			--with-sdl \
>+			--without-capi \
>+			--without-coreaudio \
>+			--without-dbus \
>+			--without-gettext \
>+			--without-gettextpo \
>+			--without-gphoto \
>+			--without-gssapi \
>+			--without-inotify \
>+			--without-krb5 \
>+			--without-netapi \
>+			--without-opencl \
>+			--without-osmesa \
>+			--without-pcap \
>+			--without-pcsclite \
>+			--without-pulse \
>+			--without-sane \
>+			--without-udev \
>+			--without-unwind \
>+			--without-usb \
>+			--without-wayland \
>+			CROSSCC="clang" \
>+			CROSSCFLAGS="-isystem ${FILESDIR}/clang"
>+CONFIGURE_ENV=		ac_cv_prog_STRIP="${STRIP_CMD}" \
>+			CPPBIN="${CPP}" \
>+			FLEX="${LOCALBASE}/bin/flex"
> 
> CONFLICTS_INSTALL=	wine
> 
>-GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS+=--verbose \
>-		--disable-kerberos \
>-		--disable-tests \
>-		--without-capi \
>-		--without-coreaudio \
>-		--without-dbus \
>-		--without-gettext --without-gettextpo \
>-		--without-gphoto \
>-		--without-gssapi \
>-		--without-inotify \
>-		--without-krb5 \
>-		--with-mingw CROSSCC="clang" CROSSCFLAGS="-isystem ${FILESDIR}/clang" \
>-		--without-netapi \
>-		--without-opencl \
>-		--without-osmesa \
>-		--without-pcap \
>-		--without-pcsclite \
>-		--with-pthread \
>-		--without-pulse \
>-		--without-sane \
>-		--with-sdl \
>-		--without-udev \
>-		--without-unwind \
>-		--without-usb \
>-		--without-wayland
>-CONFIGURE_ENV=	CPPBIN="${CPP}" FLEX="${LOCALBASE}/bin/flex"
>-WINELIBDIR=	${PREFIX}/lib
>-.if !defined(USE_LDCONFIG32)
>-USE_LDCONFIG=	${WINELIBDIR} ${WINELIBDIR}/wine
>-.endif
>-SHEBANG_FILES=	tools/make_requests tools/winemaker/winemaker \
>-		tools/winedump/function_grep.pl
>-
> BINARY_ALIAS+=	clang=${LOCALBASE}/bin/clang${_LLVM_VERSION} \
> 		lld-link=${LOCALBASE}/bin/lld-link${_LLVM_VERSION}
> 
>@@ -67,51 +73,48 @@ SUB_FILES=	pkg-message
> 
> PORTDATA=	wine.inf
> 
>-OPTIONS_DEFINE=	CUPS DOCS DOSBOX GNUTLS V4L WINEMAKER X11 GECKO MONO
>-OPTIONS_DEFAULT=ALSA GNUTLS X11
>-OPTIONS_RADIO=	AUDIO
>+OPTIONS_DEFINE=		CUPS DOCS DOSBOX GECKO GNUTLS MONO V4L WINEMAKER X11
>+OPTIONS_DEFAULT=	ALSA GNUTLS X11
>+OPTIONS_RADIO=		AUDIO
> OPTIONS_RADIO_AUDIO=	ALSA OSS
>-OPTIONS_SUB=	yes
>+OPTIONS_SUB=		yes
> 
> DOSBOX_DESC=	Use DOSBox to run MS-DOS programs
>-WINEMAKER_DESC=	Fully support winemaker (requires Perl)
> GECKO_DESC=	Bundle Gecko MSI package for Wine
> MONO_DESC=	Bundle Mono MSI package for Wine
>+WINEMAKER_DESC=	Fully support winemaker (requires Perl)
> 
>-ALSA_CONFIGURE_WITH=	alsa
>-ALSA_USES=		gstreamer
> ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
> ALSA_RUN_DEPENDS=	alsa-plugins>0:audio/alsa-plugins
>-
>-CUPS_CONFIGURE_WITH=	cups
>+ALSA_USES=		gnome gstreamer
>+ALSA_USE=		GNOME=glib20
>+ALSA_CONFIGURE_WITH=	alsa
> CUPS_LIB_DEPENDS=	libcups.so:print/cups
>-
>+CUPS_CONFIGURE_WITH=	cups
> DOSBOX_RUN_DEPENDS=	dosbox:emulators/dosbox
>-
> GECKO_RUN_DEPENDS=	wine-gecko-devel>0:emulators/wine-gecko-devel
>-
>-GNUTLS_CONFIGURE_WITH=	gnutls
> GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
>-
>+GNUTLS_CONFIGURE_WITH=	gnutls
> MONO_RUN_DEPENDS=	wine-mono-devel>0:emulators/wine-mono-devel
>-
>+OSS_USES=		gnome gstreamer
>+OSS_USE=		GNOME=glib20
> OSS_CONFIGURE_WITH=	oss
>-OSS_USES=		gstreamer
>-
>-V4L_CONFIGURE_WITH=	v4l2
> V4L_BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
> V4L_LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
>-
>+V4L_CONFIGURE_WITH=	v4l2
> WINEMAKER_RUN_DEPENDS=	p5-XML-LibXML>0:textproc/p5-XML-LibXML
>-
>-X11_CONFIGURE_WITH=	x fontconfig freetype opengl xinerama xinput2 xrandr xrender
>-X11_USES=		gl xorg
>-X11_USE=		GL=glu XORG=x11,xext,xcomposite,xcursor,xi,xinerama,xrandr,xrender
> X11_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
> 			libfreetype.so:print/freetype2 \
> 			libvulkan.so:graphics/vulkan-loader
>+X11_USES=		gl xorg
>+X11_USE=		GL=glu \
>+			XORG=x11,xcomposite,xcursor,xext,xi,xinerama,xrandr,xrender
>+X11_CONFIGURE_WITH=	fontconfig freetype opengl x xinerama xinput2 xrandr \
>+			xrender
> 
>-.include <bsd.port.pre.mk>
>+_WINELIBDIR=	${PREFIX}/lib
>+
>+.include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MALSA} || ${PORT_OPTIONS:MOSS}
> CONFIGURE_ARGS+=	--with-gstreamer
>@@ -137,41 +140,56 @@ _LLVM_VERSION=	${LLVM_DEFAULT}
> #       64-bit component [wine64] that runs 32-bit programs on FreeBSD/amd64.
> 
> # --libdir is required since Wine defaults to "${PREFIX}/lib64" on amd64.
>-CONFIGURE_ARGS+=	--enable-win64 --libdir=${PREFIX}/lib
>-PLIST_SUB+=		WINE32="@comment " WINE64="" WINEARCH="x86_64"
>+CONFIGURE_ARGS+=	--enable-win64 \
>+			--libdir=${PREFIX}/lib
>+PLIST_SUB+=		WINE32="@comment " \
>+			WINE64="" \
>+			WINEARCH="x86_64"
> 
> # Wine assumes a WoW64 package is available, which is not the case on
> # FreeBSD yet.
> post-patch:
>-	${REINPLACE_CMD} '/Exec/s|wine|wine64|g' ${WRKSRC}/loader/wine.desktop
>-
>+	${REINPLACE_CMD} '/Exec/s|wine|wine64|g' \
>+		${WRKSRC}/loader/wine.desktop
> .else
> EXTRA_PATCHES+=	files/extra-patch-tools-winebuild-res32
>-PLIST_SUB+=		WINE32="" WINE64="@comment " WINEARCH="i386"
>+PLIST_SUB+=	WINE32="" \
>+		WINE64="@comment " \
>+		WINEARCH="i386"
> .endif
> 
> pre-build:
>-	cd ${WRKSRC} && ${MAKE_CMD} depend
>+	(cd ${WRKSRC} && \
>+		${MAKE_CMD} depend)
> 
> post-install:
> .if ${ARCH} == i386
>-	${MV} ${STAGEDIR}${PREFIX}/bin/wineserver	${STAGEDIR}${PREFIX}/bin/wineserver32
>-	${MV} ${STAGEDIR}${PREFIX}/bin/wine		${STAGEDIR}${PREFIX}/bin/wine.bin
>-	-${ELFCTL} -e +noaslr				${STAGEDIR}${PREFIX}/bin/wine.bin
>-	${INSTALL_SCRIPT} ${FILESDIR}/wine.sh		${STAGEDIR}${PREFIX}/bin/wine
>+	${MV} ${STAGEDIR}${PREFIX}/bin/wineserver \
>+		${STAGEDIR}${PREFIX}/bin/wineserver32
>+	${MV} ${STAGEDIR}${PREFIX}/bin/wine \
>+		${STAGEDIR}${PREFIX}/bin/wine.bin
>+	${ELFCTL} -e +noaslr ${STAGEDIR}${PREFIX}/bin/wine.bin
>+	${INSTALL_SCRIPT} ${FILESDIR}/wine.sh \
>+		${STAGEDIR}${PREFIX}/bin/wine
> .else
>-	${MV} ${STAGEDIR}${PREFIX}/bin/wine64		${STAGEDIR}${PREFIX}/bin/wine64.bin
>-	-${ELFCTL} -e +noaslr				${STAGEDIR}${PREFIX}/bin/wine64.bin
>-	${INSTALL_SCRIPT} ${FILESDIR}/wine.sh		${STAGEDIR}${PREFIX}/bin/wine64
>-	${INSTALL_SCRIPT} ${FILESDIR}/wine-wow64.sh	${STAGEDIR}${PREFIX}/bin/wine
>-	${INSTALL_SCRIPT} ${FILESDIR}/pkg32.sh		${STAGEDIR}${DATADIR}/pkg32.sh
>+	${MV} ${STAGEDIR}${PREFIX}/bin/wine64 \
>+		${STAGEDIR}${PREFIX}/bin/wine64.bin
>+	${ELFCTL} -e +noaslr ${STAGEDIR}${PREFIX}/bin/wine64.bin
>+	${INSTALL_SCRIPT} ${FILESDIR}/wine.sh \
>+		${STAGEDIR}${PREFIX}/bin/wine64
>+	${INSTALL_SCRIPT} ${FILESDIR}/wine-wow64.sh \
>+		${STAGEDIR}${PREFIX}/bin/wine
>+	${INSTALL_SCRIPT} ${FILESDIR}/pkg32.sh \
>+		${STAGEDIR}${DATADIR}/pkg32.sh
> .endif
>-
>-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	${MKDIR} ${STAGEDIR}${DOCSDIR}
> .for i in README ANNOUNCE AUTHORS
>-	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
>+	${INSTALL_DATA} ${WRKSRC}/${i} \
>+		${STAGEDIR}${DOCSDIR}
> .endfor
>-	${INSTALL_DATA} ${WRKSRC}/programs/winedbg/README ${STAGEDIR}${DOCSDIR}/README.winedbg
>-	${INSTALL_DATA} ${WRKSRC}/tools/winedump/README ${STAGEDIR}${DOCSDIR}/README.winedump
>+	${INSTALL_DATA} ${WRKSRC}/programs/winedbg/README \
>+		${STAGEDIR}${DOCSDIR}/README.winedbg
>+	${INSTALL_DATA} ${WRKSRC}/tools/winedump/README \
>+		${STAGEDIR}${DOCSDIR}/README.winedump
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>-- 
>2.42.1
>

Actions: View | Diff

Attachments on bug 274953: 246179 | 246253 | 246270