diff options
| author | Lorenzo Salvadore <salvadore@FreeBSD.org> | 2020-03-11 19:49:34 +0000 |
|---|---|---|
| committer | Lorenzo Salvadore <salvadore@FreeBSD.org> | 2020-03-11 19:49:34 +0000 |
| commit | 88cc445eec383de75577690e2374f8ebf74a3a42 (patch) | |
| tree | c78a5ce6068d38b94daf19ec8ef50438e8c4d264 /emulators/i386-wine-devel | |
| parent | 029231102cf82ab6236493c69a5427323b00651d (diff) | |
| download | ports-88cc445eec383de75577690e2374f8ebf74a3a42.tar.gz ports-88cc445eec383de75577690e2374f8ebf74a3a42.zip | |
emulators/i386-wine-devel: Use standard ports infrastructure for ARCH
Until now i386-wine-devel 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 of bsd.ports.pre.mk and
bsd.ports.post.mk by emulators/wine-devel [1], master port for
i386-wine-devel: those files must be included only if they have not
already been included by i386-wine-devel.
Approved by: gerald (mentor, maintainer [1])
Notes
Notes:
svn path=/head/; revision=528249
Diffstat (limited to 'emulators/i386-wine-devel')
| -rw-r--r-- | emulators/i386-wine-devel/Makefile | 10 | ||||
| -rw-r--r-- | emulators/i386-wine-devel/Makefile.amd64 (renamed from emulators/i386-wine-devel/Makefile.inc) | 7 |
2 files changed, 2 insertions, 15 deletions
diff --git a/emulators/i386-wine-devel/Makefile b/emulators/i386-wine-devel/Makefile index 1d7c8c7d8fa5..edfef0d13978 100644 --- a/emulators/i386-wine-devel/Makefile +++ b/emulators/i386-wine-devel/Makefile @@ -5,12 +5,6 @@ # - i386 specific port to be slave to ${PORTSDIR}/emulators/wine-devel # - 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> diff --git a/emulators/i386-wine-devel/Makefile.inc b/emulators/i386-wine-devel/Makefile.amd64 index c4db4516f004..357101813cac 100644 --- a/emulators/i386-wine-devel/Makefile.inc +++ b/emulators/i386-wine-devel/Makefile.amd64 @@ -32,8 +32,6 @@ EXTRACT_AFTER_ARGS= -C / --exclude +COMPACT_MANIFEST --exclude +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} @@ -46,9 +44,6 @@ BUNDLE_LIBS= yes GECKO_RUN_DEPENDS= ${DATADIR}/gecko/wine-gecko-2.47.1-x86.msi:emulators/wine-gecko-devel MONO_RUN_DEPENDS= ${DATADIR}/mono/wine-mono-4.9.4.msi:emulators/wine-mono-devel -# Included for OPSYS and OSVERSION -.include <bsd.port.pre.mk> - .for osrel in 11 12 13 .if ${OSREL:C/\..*//} == ${osrel} PLIST_SUB+= OSREL${osrel}="" @@ -94,5 +89,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> |