svn commit: r528249 - in head/emulators: i386-wine-devel wine-devel

Wed Mar 11 19:49:36 UTC 2020

Author: salvadore
Date: Wed Mar 11 19:49:34 2020
New Revision: 528249
URL: https://svnweb.freebsd.org/changeset/ports/528249

Log:
  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])

Added:
  head/emulators/i386-wine-devel/Makefile.amd64   (contents, props changed)
Deleted:
  head/emulators/i386-wine-devel/Makefile.inc
Modified:
  head/emulators/i386-wine-devel/Makefile
  head/emulators/wine-devel/Makefile

Modified: head/emulators/i386-wine-devel/Makefile
==============================================================================

--- head/emulators/i386-wine-devel/Makefile	Wed Mar 11 19:45:44 2020	(r528248)
+++ head/emulators/i386-wine-devel/Makefile	Wed Mar 11 19:49:34 2020	(r528249)
@@ -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>

Added: head/emulators/i386-wine-devel/Makefile.amd64
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/i386-wine-devel/Makefile.amd64	Wed Mar 11 19:49:34 2020	(r528249)
@@ -0,0 +1,91 @@
+# Created by: David Naylor <dbn at FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	wine
+PORTVERSION=	4.0.r1
+PORTREVISION=	1
+PORTEPOCH=	1
+CATEGORIES=	emulators
+MASTER_SITES=	LOCAL/dbn/repos/wine/${DIST_SUBDIR}/
+PKGNAMEPREFIX=	i386-
+PKGNAMESUFFIX=	-devel
+DISTNAME=	${PKGNAME}
+EXTRACT_SUFX=	.txz
+DIST_SUBDIR=	freebsd:${OSREL:C/\..*//}:x86:64
+
+MAINTAINER=	salvadore at FreeBSD.org
+COMMENT?=	32-bit Microsoft Windows compatibility environment for 64-bit FreeBSD
+
+LICENSE=        LGPL21 LGPL3
+LICENSE_COMB=   dual
+LICENSE_FILE=   ${WRKDIR}/LICENSE
+
+OPTIONS_DEFINE=	GECKO MONO
+GECKO_DESC=     Bundle Gecko MSI package for Wine
+MONO_DESC=      Bundle Mono MSI package for Wine
+
+CONFLICTS_INSTALL?=     wine-[0-9]* wine-staging-[0-9]* wine-devel-[0-9]* \
+                        i386-wine-[0-9]* i386-wine-staging-[0-9]*
+
+EXTRACT_AFTER_ARGS=	-C / --exclude +COMPACT_MANIFEST --exclude +MANIFEST \
+				--exclude +MTREE_DIRS --exclude share/licenses/'*' \
+				--exclude libdata/ldconfig32/${PKGNAMEPREFIX}${PORTNAME} \
+				-s '|/usr/local|${STAGEDIR}${PREFIX}|gs'
+NO_BUILD=	yes
+SLAVEDIR?=	${.CURDIR}
+PKGINSTALL=	${SLAVEDIR}/files/pkg-install
+PKGDEINSTALL=	${PKGINSTALL}
+PKGMESSAGE=	${WRKDIR}/pkg-message
+SUB_FILES=	pkg-message
+USE_LDCONFIG32=	${PREFIX}/lib32 ${PREFIX}/lib32/wine
+USES=		tar:xz desktop-file-utils
+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
+
+.for osrel in 11 12 13
+.if ${OSREL:C/\..*//} == ${osrel}
+PLIST_SUB+=	OSREL${osrel}=""
+.if ${PKGNAMESUFFIX} == -devel
+PLIST_SUB+=	DEVEL=""
+PLIST_SUB+=	OSREL${osrel}-DEVEL=""
+.else
+PLIST_SUB+=	DEVEL="@comment "
+PLIST_SUB+=	OSREL${osrel}-DEVEL="@comment "
+.endif
+.else
+PLIST_SUB+=	OSREL${osrel}="@comment "
+PLIST_SUB+=	OSREL${osrel}-DEVEL="@comment "
+.endif
+.endfor
+
+.if ${OPSYS} != FreeBSD || (!(${OSVERSION} >= 1103000 && ${OSVERSION} < 1200000) && !(${OSVERSION} >= 1200086 && ${OSVERSION} < 1300000) && !(${OSVERSION} >= 1300003 && ${OSVERSION} < 1400000))
+IGNORE=		binaries compiled for FreeBSD 11.3+, 12.0+ and -current only
+DISTFILES=
+.endif
+
+do-extract:
+	@${RM} -r ${WRKDIR}
+	@${MKDIR} ${WRKDIR}
+	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${EXTRACT_ONLY} -C ${WRKDIR} --include '/usr/local/share/licenses/${DISTNAME}/LICENSE' -s '|/usr/local/share/licenses/${DISTNAME}/||g'
+
+do-install:
+	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${EXTRACT_ONLY} ${EXTRACT_AFTER_ARGS}
+
+${PLIST}: checksum
+	${TAR} -tf ${_DISTDIR}/${EXTRACT_ONLY} ${EXTRACT_AFTER_ARGS} > /dev/null
+	${TAR} -tf ${_DISTDIR}/${EXTRACT_ONLY} ${EXTRACT_AFTER_ARGS} | ${GREP} -v '/$$\|ldconfig32' | ${SED} 's|/usr/local/||g' | sort > ${PLIST}
+
+port-update:
+	${RM} ${SLAVEDIR}/distinfo ${SLAVEDIR}/distinfo~ ${SLAVEDIR}/pkg-plist.*
+.for osrel in 11 12 13
+	${MAKE} fetch OSREL=${osrel} OSVERSION=${osrel}99999 _OSRELEASE=${osrel}
+	${MAKE} makesum OSREL=${osrel} OSVERSION=${osrel}99999 _OSRELEASE=${osrel}
+	${CAT} ${SLAVEDIR}/distinfo >> ${SLAVEDIR}/distinfo~
+	${RM} ${SLAVEDIR}/distinfo
+	${MAKE} pkg-plist.${osrel}${suffix:tu} PLIST=pkg-plist.${osrel}${suffix:tu} OSREL=${osrel} OSVERSION=${osrel}99999 _OSRELEASE=${osrel}
+.endfor
+	${SED} -e '2,$${' -e '/^TIMESTAMP/d' -e '}' distinfo~ > ${SLAVEDIR}/distinfo
+	python ${FILESDIR}/mergeplist.py ${SLAVEDIR}/pkg-plist.* > ${PLIST}
+	${RM} ${SLAVEDIR}/distinfo~ ${SLAVEDIR}/pkg-plist.*

Modified: head/emulators/wine-devel/Makefile
==============================================================================
--- head/emulators/wine-devel/Makefile	Wed Mar 11 19:45:44 2020	(r528248)
+++ head/emulators/wine-devel/Makefile	Wed Mar 11 19:49:34 2020	(r528249)
@@ -128,7 +128,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-devel slave port.
+.ifndef PKGNAMEPREFIX
 .include <bsd.port.pre.mk>
+.endif
 
 .if ${ARCH} == amd64
 # Wine is composed of three parts:
@@ -181,4 +185,6 @@ check-wine-devel-vs-staging:
 	  fi \
 	done
 
+.ifndef PKGNAMEPREFIX
 .include <bsd.port.post.mk>
+.endif
