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

[Lorenzo Salvadore]

Author: salvadore
Date: Mon May  4 20:46:07 2020
New Revision: 533985
URL: https://svnweb.freebsd.org/changeset/ports/533985

Log:
  emulators/i386-wine: Add USES=desktop-file-utils
  
  Also fix DISTNAME in emulators/i386-wine{-devel} so that PORTREVISION bumps
  do not break the ports and, while here, sort alphabetically USES in
  emulators/i386-wine-devel/Makefile.amd64.
  
  Approved by:	gerald (mentor)

Modified:
  head/emulators/i386-wine-devel/Makefile.amd64
  head/emulators/i386-wine/Makefile
  head/emulators/i386-wine/Makefile.amd64

Modified: head/emulators/i386-wine-devel/Makefile.amd64
==============================================================================
--- head/emulators/i386-wine-devel/Makefile.amd64	Mon May  4 20:39:12 2020	(r533984)
+++ head/emulators/i386-wine-devel/Makefile.amd64	Mon May  4 20:46:07 2020	(r533985)
@@ -4,7 +4,7 @@
 DISTVERSION=	5.5
 PORTEPOCH=	1
 MASTER_SITES=	LOCAL/salvadore/i386-wine-devel/${DIST_SUBDIR}/
-DISTNAME=	${PKGNAME}
+DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSION},${PORTEPOCH}
 DIST_SUBDIR=	FreeBSD:${OSREL:C/\..*//}:amd64
 
 LICENSE=        LGPL21 LGPL3
@@ -18,7 +18,7 @@ EXTRACT_AFTER_ARGS=	-C / --exclude +COMPACT_MANIFEST -
 NO_BUILD=	yes
 SUB_FILES=	pkg-message
 USE_LDCONFIG32=	${PREFIX}/lib32 ${PREFIX}/lib32/wine
-USES=		tar:txz desktop-file-utils
+USES=		desktop-file-utils tar:txz
 BUNDLE_LIBS=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
 

Modified: head/emulators/i386-wine/Makefile
==============================================================================
--- head/emulators/i386-wine/Makefile	Mon May  4 20:39:12 2020	(r533984)
+++ head/emulators/i386-wine/Makefile	Mon May  4 20:46:07 2020	(r533985)
@@ -9,6 +9,7 @@ PORTNAME=	wine
 # define a dummy DISTVERSION to avoid errors with poudriere bulk -a
 # on architectures unsupported by this port
 DISTVERSION?=	0
+PORTREVISION=	1
 PKGNAMEPREFIX=	i386-
 CATEGORIES=	emulators
 

Modified: head/emulators/i386-wine/Makefile.amd64
==============================================================================
--- head/emulators/i386-wine/Makefile.amd64	Mon May  4 20:39:12 2020	(r533984)
+++ head/emulators/i386-wine/Makefile.amd64	Mon May  4 20:46:07 2020	(r533985)
@@ -4,7 +4,7 @@
 DISTVERSION=	5.0
 PORTEPOCH=	1
 MASTER_SITES=	LOCAL/salvadore/i386-wine/${DIST_SUBDIR}/
-DISTNAME=	${PKGNAME}
+DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${DISTVERSION},${PORTEPOCH}
 DIST_SUBDIR=	FreeBSD:${OSREL:C/\..*//}:amd64
 
 LICENSE=        LGPL21 LGPL3
@@ -18,7 +18,7 @@ EXTRACT_AFTER_ARGS=	-C / --exclude +COMPACT_MANIFEST -
 NO_BUILD=	yes
 SUB_FILES=	pkg-message
 USE_LDCONFIG32=	${PREFIX}/lib32 ${PREFIX}/lib32/wine
-USES=		tar:txz
+USES=		desktop-file-utils tar:txz
 BUNDLE_LIBS=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
 PORTSCOUT=	limitw:1,even