Date: Fri, 13 Mar 2020 21:11:06 +0000 (UTC) From: Lorenzo Salvadore <salvadore@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r528378 - in head/emulators: i386-wine wine Message-ID: <202003132111.02DLB6t5077293@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: salvadore Date: Fri Mar 13 21:11:06 2020 New Revision: 528378 URL: https://svnweb.freebsd.org/changeset/ports/528378 Log: emulators/i386-wine: Use standard ports infrastructure for ARCH This commit is the analogous for i386-wine of r528249 that concerns emulators/i386-wine-devel. Until now i386-wine defined its own ARCH variable and manually included Makefile.i386 for i386 systems and Makefile.inc for amd64 systems. This commit makes use of the standard ARCH variable and renames Makefile.inc to Makefile.amd64 so that the proper Makefile.${ARCH} is automatically included. This requires conditional inclusion bsd.ports.pre.mk and bsd.ports.post.mk by emulators/wine [1], master port for i386-wine: those files must be included only if they have not already been included by i386-wine. Approved by: gerald (mentor, maintainer [1]) Added: head/emulators/i386-wine/Makefile.amd64 - copied, changed from r528377, head/emulators/i386-wine/Makefile.inc Deleted: head/emulators/i386-wine/Makefile.inc Modified: head/emulators/i386-wine/Makefile head/emulators/wine/Makefile Modified: head/emulators/i386-wine/Makefile ============================================================================== --- head/emulators/i386-wine/Makefile Fri Mar 13 20:39:29 2020 (r528377) +++ head/emulators/i386-wine/Makefile Fri Mar 13 21:11:06 2020 (r528378) @@ -5,12 +5,6 @@ # - i386 specific port to be slave to ${PORTSDIR}/emulators/wine # - amd64 specific port to be normal port (based on binary package) -.if !defined(ARCH) -ARCH!= uname -p -.endif +ONLY_FOR_ARCHS= i386 amd64 -.if ${ARCH} == i386 -.include "${.CURDIR}/Makefile.i386" -.else -.include "${.CURDIR}/Makefile.inc" -.endif +.include <bsd.port.mk> Copied and modified: head/emulators/i386-wine/Makefile.amd64 (from r528377, head/emulators/i386-wine/Makefile.inc) ============================================================================== --- head/emulators/i386-wine/Makefile.inc Fri Mar 13 20:39:29 2020 (r528377, copy source) +++ head/emulators/i386-wine/Makefile.amd64 Fri Mar 13 21:11:06 2020 (r528378) @@ -31,8 +31,6 @@ EXTRACT_AFTER_ARGS= -C / --exclude +COMPACT_MANIFEST - --exclude libdata/ldconfig32/${PKGNAMEPREFIX}${PORTNAME} \ -s '|/usr/local|${STAGEDIR}${PREFIX}|gs' NO_BUILD= yes -ONLY_FOR_ARCHS= i386 amd64 -ONLY_FOR_ARCHS_REASON= wine only runs on x86 architecture SLAVEDIR?= ${.CURDIR} PKGINSTALL= ${SLAVEDIR}/files/pkg-install PKGDEINSTALL= ${PKGINSTALL} @@ -47,9 +45,6 @@ MONO_RUN_DEPENDS= ${DATADIR}/mono/wine-mono-4.9.4.msi: PORTSCOUT= limitw:1,even -# Included for OPSYS and OSVERSION -.include <bsd.port.pre.mk> - .for osrel in 11 12 13 .if ${OSREL:C/\..*//} == ${osrel} PLIST_SUB+= OSREL${osrel}="" @@ -86,5 +81,3 @@ port-update: ${SED} -e '2,$${' -e '/^TIMESTAMP/d' -e '}' distinfo~ > ${SLAVEDIR}/distinfo python ${FILESDIR}/mergeplist.py ${SLAVEDIR}/pkg-plist.* > ${PLIST} ${RM} ${SLAVEDIR}/distinfo~ ${SLAVEDIR}/pkg-plist.* - -.include <bsd.port.post.mk> Modified: head/emulators/wine/Makefile ============================================================================== --- head/emulators/wine/Makefile Fri Mar 13 20:39:29 2020 (r528377) +++ head/emulators/wine/Makefile Fri Mar 13 21:11:06 2020 (r528378) @@ -119,7 +119,11 @@ X11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig liblcms2.so:graphics/lcms2 \ libpng.so:graphics/png +# Include this only if it has not been already included by the +# i386-wine slave port. +.ifndef PKGNAMEPREFIX .include <bsd.port.pre.mk> +.endif .if ${ARCH} == amd64 # Wine is composed of three parts: @@ -160,4 +164,6 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/programs/winedbg/README ${STAGEDIR}${DOCSDIR}/README.winedbg ${INSTALL_DATA} ${WRKSRC}/tools/winedump/README ${STAGEDIR}${DOCSDIR}/README.winedump +.ifndef PKGNAMEPREFIX .include <bsd.port.post.mk> +.endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003132111.02DLB6t5077293>