svn commit: r533164 - in head/emulators/i386-wine-devel: . files

Lorenzo Salvadore salvadore at FreeBSD.org
Mon Apr 27 20:00:08 UTC 2020 

Author: salvadore
Date: Mon Apr 27 20:00:07 2020
New Revision: 533164
URL: https://svnweb.freebsd.org/changeset/ports/533164

Log:
  emulators/i386-wine-devel: Style improvements
  
  - Reorder variables.
  - Remove tools for updating pkg-plist: they were broken by precedent commits
    and based on the python 2 script files/mergeplist.py, but python 2 is now
    EOL.
  - Move port-update target from Makefile.amd64 to Makefile and rename it
    distinfo-update as it does not update pkg-plist anymore.
  - Remove EXTRACT_SUFX and use properly USES=tar:txz instead.
  - Remove references to removed wine staging ports in CONFLICTS_INSTALL.
  
  Approved by:	tcberner (co-mentor)
  Differential Revision:	https://reviews.freebsd.org/D24550

Deleted:
  head/emulators/i386-wine-devel/files/mergeplist.py
Modified:
  head/emulators/i386-wine-devel/Makefile
  head/emulators/i386-wine-devel/Makefile.amd64
  head/emulators/i386-wine-devel/Makefile.i386

Modified: head/emulators/i386-wine-devel/Makefile
==============================================================================
--- head/emulators/i386-wine-devel/Makefile	Mon Apr 27 19:47:26 2020	(r533163)
+++ head/emulators/i386-wine-devel/Makefile	Mon Apr 27 20:00:07 2020	(r533164)
@@ -18,4 +18,20 @@ COMMENT=	32-bit Microsoft Windows compatibility enviro
 
 ONLY_FOR_ARCHS=	i386 amd64
 
+CONFLICTS_INSTALL=	wine-[0-9]* wine-devel-[0-9]* i386-wine-[0-9]*
+
+PKGINSTALL=	${.CURDIR}/files/pkg-install
+PKGDEINSTALL=	${PKGINSTALL}
+
+distinfo-update:
+	${RM} ${.CURDIR}/distinfo ${.CURDIR}/distinfo~
+.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} ${.CURDIR}/distinfo >> ${.CURDIR}/distinfo~
+	${RM} ${.CURDIR}/distinfo
+.endfor
+	${SED} -e '2,$${' -e '/^TIMESTAMP/d' -e '}' distinfo~ > ${.CURDIR}/distinfo
+	${RM} ${.CURDIR}/distinfo~
+
 .include <bsd.port.mk>

Modified: head/emulators/i386-wine-devel/Makefile.amd64
==============================================================================
--- head/emulators/i386-wine-devel/Makefile.amd64	Mon Apr 27 19:47:26 2020	(r533163)
+++ head/emulators/i386-wine-devel/Makefile.amd64	Mon Apr 27 20:00:07 2020	(r533164)
@@ -5,37 +5,23 @@ DISTVERSION=	5.5
 PORTEPOCH=	1
 MASTER_SITES=	LOCAL/salvadore/i386-wine-devel/${DIST_SUBDIR}/
 DISTNAME=	${PKGNAME}
-EXTRACT_SUFX=	.txz
 DIST_SUBDIR=	FreeBSD:${OSREL:C/\..*//}:amd64
 
 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
+USES=		tar:txz desktop-file-utils
 BUNDLE_LIBS=	yes
+PKGMESSAGE=	${WRKDIR}/pkg-message
 
-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}=""
@@ -56,9 +42,15 @@ PLIST_SUB+=	NOOSREL${osrel}=""
 
 .if ${OPSYS} != FreeBSD || (!(${OSVERSION} >= 1103000 && ${OSVERSION} < 1200000) && !(${OSVERSION} >= 1201000 && ${OSVERSION} < 1300000) && !(${OSVERSION} >= 1300084 && ${OSVERSION} < 1400000))
 IGNORE=		binaries compiled for FreeBSD 11.3+, 12.1+ and 13.0-CURRENT (OSVERSION >= 1300084) only
-DISTFILES=
 .endif
 
+OPTIONS_DEFINE=	GECKO MONO
+GECKO_DESC=     Bundle Gecko MSI package for Wine
+MONO_DESC=      Bundle Mono MSI package for Wine
+
+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
+
 do-extract:
 	@${RM} -r ${WRKDIR}
 	@${MKDIR} ${WRKDIR}
@@ -66,20 +58,3 @@ do-extract:
 
 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/i386-wine-devel/Makefile.i386
==============================================================================
--- head/emulators/i386-wine-devel/Makefile.i386	Mon Apr 27 19:47:26 2020	(r533163)
+++ head/emulators/i386-wine-devel/Makefile.i386	Mon Apr 27 20:00:07 2020	(r533164)
@@ -2,16 +2,10 @@
 # $FreeBSD$
 
 # Use the wine port to do most of the heavy lifting
-SLAVEDIR?=	${.CURDIR}
-MASTERDIR=	${SLAVEDIR}/../wine-devel
-PKGINSTALL=	${SLAVEDIR}/files/pkg-install
-PKGDEINSTALL=	${PKGINSTALL}
+MASTERDIR=	${.CURDIR}/../wine-devel
 
 RUN_DEPENDS=	mesa-dri>0:graphics/mesa-dri
 
-CONFLICTS_INSTALL?=	wine-[0-9]* wine-staging-[0-9]* wine-devel-[0-9]* \
-			i386-wine-[0-9]* i386-wine-staging-[0-9]*
-
 ACTUAL-PACKAGE-DEPENDS=	${DO_NADA}
 WINELIBDIR=	${PREFIX}/lib32
 CONFIGURE_ARGS+=	--bindir=${PREFIX}/bin32 --libdir=${WINELIBDIR}
@@ -31,7 +25,7 @@ post-install-script:
 	# Fix pkg-plist references
 	${REINPLACE_CMD} -e 's!lib/!lib32/!g' ${TMPPLIST}
 	# Install bounce script to access the 32-bit executables
-	${INSTALL_SCRIPT} ${SLAVEDIR}/files/binbounce ${STAGEDIR}${PREFIX}/bin/wine
+	${INSTALL_SCRIPT} ${.CURDIR}/files/binbounce ${STAGEDIR}${PREFIX}/bin/wine
 	for i in `${GREP} ^bin ${TMPPLIST} | ${XARGS} -n1 basename` ; do \
 		[ "$${i}" = "wine" ] || ${LN} -f ${STAGEDIR}${PREFIX}/bin/wine ${STAGEDIR}${PREFIX}/bin/$${i} ; \
 		${ECHO_CMD} bin32/$${i} >> ${TMPPLIST} ; \
@@ -68,7 +62,7 @@ post-install-script:
 		fi ; \
 	done
 	# Install nvidia patching script
-	${INSTALL_SCRIPT} ${SLAVEDIR}/files/nvidia.sh ${STAGEDIR}${DATADIR}/patch-nvidia.sh
+	${INSTALL_SCRIPT} ${.CURDIR}/files/nvidia.sh ${STAGEDIR}${DATADIR}/patch-nvidia.sh
 	${ECHO_CMD} ${DATADIR:S|$(PREFIX)/||}/patch-nvidia.sh >> ${TMPPLIST}
 
 .include "${MASTERDIR}/Makefile"

More information about the svn-ports-head mailing list