Attachment #209913 for bug #242625

Lines 14-20 PKGDEINSTALL= ${PKGINSTALL} Link Here

(-)b/emulators/i386-wine-devel/Makefile.i386 (-1 / +5 lines)
14		14
15	RUN_DEPENDS= mesa-dri>0:graphics/mesa-dri	15	RUN_DEPENDS= mesa-dri>0:graphics/mesa-dri
16		16
17	CONFLICTS_INSTALL?= wine-[0-9]* wine-staging-[0-9]* wine-devel-[0-9]* \	17	CONFLICTS_INSTALL?= wine-[0-9]* wine-staging-[0-9]* \
18	i386-wine-[0-9]* i386-wine-staging-[0-9]*	18	i386-wine-[0-9]* i386-wine-staging-[0-9]*
19		19
20	ACTUAL-PACKAGE-DEPENDS= ${DO_NADA}	20	ACTUAL-PACKAGE-DEPENDS= ${DO_NADA}
Lines 77-79 post-install-script: Link Here
77	${ECHO_CMD} ${DATADIR:S\|$(PREFIX)/\|\|}/patch-nvidia.sh >> ${TMPPLIST}	77	${ECHO_CMD} ${DATADIR:S\|$(PREFIX)/\|\|}/patch-nvidia.sh >> ${TMPPLIST}
78		78
79	.include "${MASTERDIR}/Makefile"	79	.include "${MASTERDIR}/Makefile"
		80
		81	.if empty(PORT_OPTIONS:MWOW64)
		82	CONFLICTS_INSTALL+= wine-devel-[0-9]*
		83	.endif





PORTNAME=	wine
DISTVERSION=	4.21
PORTEPOCH=	2
CATEGORIES=	emulators
MASTER_SITES=	SF/${PORTNAME}/Source \
		http://mirrors.ibiblio.org/wine/source/4.x/

USES=		bison desktop-file-utils gmake localbase shebangfix tar:xz xorg

CONFLICTS_INSTALL=	wine-[0-9]* wine-staging-[0-9]* i386-wine-[0-9]* \
			i386-wine-staging-[0-9]*

GNU_CONFIGURE=	yes
CONFIGURE_ARGS+=--verbose \


SUB_FILES=	pkg-message

OPTIONS_DEFINE=	CUPS DOCS DOSBOX GCC GNUTLS HAL LDAP LIBXSLT MPG123 OPENAL STAGING V4L VKD3D VULKAN WINEMAKER X11 GECKO MONO WOW64

OPTIONS_DEFINE=	CUPS DOCS DOSBOX GCC GNUTLS HAL LDAP LIBXSLT MPG123 OPENAL STAGING V4L VKD3D VULKAN WINEMAKER X11 GECKO MONO
OPTIONS_DEFAULT=GCC GNUTLS X11
OPTIONS_SUB=	yes



.include <bsd.port.pre.mk>

.if empty(PORT_OPTIONS:MWOW64) || ${ARCH} == amd64
PORTDATA=	l_intl.nls wine.inf
.endif

.if empty(PORT_OPTIONS:MWOW64)
CONFLICTS_INSTALL+=	i386-wine-devel-[0-9]*
.endif

.if ${ARCH} == amd64
# Wine is composed of three parts:
#  - wine (aka this port) is the 32-bit component and runs 32-bit programs (on FreeBSD/i386)

CONFIGURE_ARGS+=	--enable-win64 --libdir=${PREFIX}/lib
PLIST_SUB+=		WINE32="@comment " WINE64=""

# Wine assumes a WoW64 package is available, however WoW64 is not yet
# available on FreeBSD. Also fix the desktop file.
post-patch:
	${REINPLACE_CMD} 's|/wine|/wine64|g' ${WRKSRC}/tools/wineapploader.in
	${REINPLACE_CMD} '/Exec/s|wine|wine64|g' ${WRKSRC}/loader/wine.desktop

.else
PLIST_SUB+=		WINE32="" WINE64="@comment "
.endif

.endfor
	${INSTALL_DATA} ${WRKSRC}/programs/winedbg/README ${STAGEDIR}${DOCSDIR}/README.winedbg
	${INSTALL_DATA} ${WRKSRC}/tools/winedump/README ${STAGEDIR}${DOCSDIR}/README.winedump
.if ${ARCH} == i386 && ${PORT_OPTIONS:MWOW64}
	for i in `${GREP} ^bin ${TMPPLIST} | ${XARGS} -n1 basename` ; do \
		[ "$${i}" = "wine" ] || ${RM} ${STAGEDIR}${PREFIX}/bin/$${i} ${STAGEDIR}${PREFIX}/bin32/$${i} ; \
	done
	${RM} -r ${STAGEDIR}${PREFIX}/include/wine
	${RM} -r ${STAGEDIR}${PREFIX}/man
	${RM} -r ${STAGEDIR}${PREFIX}/share/applications/wine.desktop
	${RM} -r ${STAGEDIR}${PREFIX}/share/wine/fonts
	${RM} -r ${STAGEDIR}${PREFIX}/share/wine/gecko
	${RM} -r ${STAGEDIR}${PREFIX}/share/wine/mono
	${RM} -r ${STAGEDIR}${PREFIX}/share/wine/*.inf
	${RM} -r ${STAGEDIR}${PREFIX}/share/wine/*.nls
	${RM} -r ${STAGEDIR}${DOCSDIR}
	${REINPLACE_CMD} -n -E -e "/^(@|bin\/wine$$|lib\/)/p" ${TMPPLIST}
.endif

check-wine-devel-vs-staging:
	@${GREP} %%STAGING%% pkg-plist | while read f; do \

Return to bug 242625

Lines 3-9 Link Here

(-)b/emulators/wine-devel/Makefile (-11 / +26 lines)
3		3
4	PORTNAME= wine	4	PORTNAME= wine
5	DISTVERSION= 4.21	5	DISTVERSION= 4.21
6	PORTEPOCH= 1	6	PORTEPOCH= 2
7	CATEGORIES= emulators	7	CATEGORIES= emulators
8	MASTER_SITES= SF/${PORTNAME}/Source \	8	MASTER_SITES= SF/${PORTNAME}/Source \
9	http://mirrors.ibiblio.org/wine/source/4.x/	9	http://mirrors.ibiblio.org/wine/source/4.x/
Lines 27-33 LIB_DEPENDS= libFAudio.so:audio/faudio \ Link Here
27	USES= bison desktop-file-utils gmake localbase shebangfix tar:xz xorg	27	USES= bison desktop-file-utils gmake localbase shebangfix tar:xz xorg
28		28
29	CONFLICTS_INSTALL= wine-[0-9]* wine-staging-[0-9]* i386-wine-[0-9]* \	29	CONFLICTS_INSTALL= wine-[0-9]* wine-staging-[0-9]* i386-wine-[0-9]* \
30	i386-wine-staging-[0-9]* i386-wine-devel-[0-9]*	30	i386-wine-staging-[0-9]*
31		31
32	GNU_CONFIGURE= yes	32	GNU_CONFIGURE= yes
33	CONFIGURE_ARGS+=--verbose \	33	CONFIGURE_ARGS+=--verbose \
Lines 55-63 SHEBANG_FILES= tools/make_requests tools/winemaker/winemaker \ Link Here
55		55
56	SUB_FILES= pkg-message	56	SUB_FILES= pkg-message
57		57
58	PORTDATA= l_intl.nls wine.inf	58	OPTIONS_DEFINE= CUPS DOCS DOSBOX GCC GNUTLS HAL LDAP LIBXSLT MPG123 OPENAL STAGING V4L VKD3D VULKAN WINEMAKER X11 GECKO MONO WOW64
59
60	OPTIONS_DEFINE= CUPS DOCS DOSBOX GCC GNUTLS HAL LDAP LIBXSLT MPG123 OPENAL STAGING V4L VKD3D VULKAN WINEMAKER X11 GECKO MONO
61	OPTIONS_DEFAULT=GCC GNUTLS X11	59	OPTIONS_DEFAULT=GCC GNUTLS X11
62	OPTIONS_SUB= yes	60	OPTIONS_SUB= yes
63		61
Lines 122-127 X11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ Link Here
122		120
123	.include <bsd.port.pre.mk>	121	.include <bsd.port.pre.mk>
124		122
		123	.if empty(PORT_OPTIONS:MWOW64) \|\| ${ARCH} == amd64
		124	PORTDATA= l_intl.nls wine.inf
		125	.endif
		126
		127	.if empty(PORT_OPTIONS:MWOW64)
		128	CONFLICTS_INSTALL+= i386-wine-devel-[0-9]*
		129	.endif
		130
125	.if ${ARCH} == amd64	131	.if ${ARCH} == amd64
126	# Wine is composed of three parts:	132	# Wine is composed of three parts:
127	# - wine (aka this port) is the 32-bit component and runs 32-bit programs (on FreeBSD/i386)	133	# - wine (aka this port) is the 32-bit component and runs 32-bit programs (on FreeBSD/i386)
Lines 137-148 X11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ Link Here
137	CONFIGURE_ARGS+= --enable-win64 --libdir=${PREFIX}/lib	143	CONFIGURE_ARGS+= --enable-win64 --libdir=${PREFIX}/lib
138	PLIST_SUB+= WINE32="@comment " WINE64=""	144	PLIST_SUB+= WINE32="@comment " WINE64=""
139		145
140	# Wine assumes a WoW64 package is available, however WoW64 is not yet
141	# available on FreeBSD. Also fix the desktop file.
142	post-patch:
143	${REINPLACE_CMD} 's\|/wine\|/wine64\|g' ${WRKSRC}/tools/wineapploader.in
144	${REINPLACE_CMD} '/Exec/s\|wine\|wine64\|g' ${WRKSRC}/loader/wine.desktop
145
146	.else	146	.else
147	PLIST_SUB+= WINE32="" WINE64="@comment "	147	PLIST_SUB+= WINE32="" WINE64="@comment "
148	.endif	148	.endif
Lines 175-180 post-install: Link Here
175	.endfor	175	.endfor
176	${INSTALL_DATA} ${WRKSRC}/programs/winedbg/README ${STAGEDIR}${DOCSDIR}/README.winedbg	176	${INSTALL_DATA} ${WRKSRC}/programs/winedbg/README ${STAGEDIR}${DOCSDIR}/README.winedbg
177	${INSTALL_DATA} ${WRKSRC}/tools/winedump/README ${STAGEDIR}${DOCSDIR}/README.winedump	177	${INSTALL_DATA} ${WRKSRC}/tools/winedump/README ${STAGEDIR}${DOCSDIR}/README.winedump
		178	.if ${ARCH} == i386 && ${PORT_OPTIONS:MWOW64}
		179	for i in `${GREP} ^bin ${TMPPLIST} \| ${XARGS} -n1 basename` ; do \
		180	[ "$${i}" = "wine" ] \|\| ${RM} ${STAGEDIR}${PREFIX}/bin/$${i} ${STAGEDIR}${PREFIX}/bin32/$${i} ; \
		181	done
		182	${RM} -r ${STAGEDIR}${PREFIX}/include/wine
		183	${RM} -r ${STAGEDIR}${PREFIX}/man
		184	${RM} -r ${STAGEDIR}${PREFIX}/share/applications/wine.desktop
		185	${RM} -r ${STAGEDIR}${PREFIX}/share/wine/fonts
		186	${RM} -r ${STAGEDIR}${PREFIX}/share/wine/gecko
		187	${RM} -r ${STAGEDIR}${PREFIX}/share/wine/mono
		188	${RM} -r ${STAGEDIR}${PREFIX}/share/wine/*.inf
		189	${RM} -r ${STAGEDIR}${PREFIX}/share/wine/*.nls
		190	${RM} -r ${STAGEDIR}${DOCSDIR}
		191	${REINPLACE_CMD} -n -E -e "/^(@\|bin\/wine$$\|lib\/)/p" ${TMPPLIST}
		192	.endif
178		193
179	check-wine-devel-vs-staging:	194	check-wine-devel-vs-staging:
180	@${GREP} %%STAGING%% pkg-plist \| while read f; do \	195	@${GREP} %%STAGING%% pkg-plist \| while read f; do \