svn commit: r528442 - in head/emulators: i386-wine i386-wine-devel
Piotr Kubaj
pkubaj at FreeBSD.org
Sat Mar 14 21:00:41 UTC 2020
Author: pkubaj
Date: Sat Mar 14 21:00:40 2020
New Revision: 528442
URL: https://svnweb.freebsd.org/changeset/ports/528442
Log:
emulators/i386-wine*: further unbreak poudriere bulk -a
Previous commits uncovered another error:
[00:02:28] Warning: (emulators/i386-wine-devel): Error: Duplicated origin for -: emulators/i386-wine-devel AND emulators/i386-wine. Rerun with -v to see which ports are depending on these.
This is because PORTNAME and PORTVERSION are not defined.
Submitted by: salvadore (maintainer)
Modified:
head/emulators/i386-wine-devel/Makefile
head/emulators/i386-wine-devel/Makefile.amd64
head/emulators/i386-wine-devel/Makefile.i386
head/emulators/i386-wine/Makefile
head/emulators/i386-wine/Makefile.amd64
head/emulators/i386-wine/Makefile.i386
Modified: head/emulators/i386-wine-devel/Makefile
==============================================================================
--- head/emulators/i386-wine-devel/Makefile Sat Mar 14 21:00:22 2020 (r528441)
+++ head/emulators/i386-wine-devel/Makefile Sat Mar 14 21:00:40 2020 (r528442)
@@ -5,7 +5,16 @@
# - i386 specific port to be slave to ${PORTSDIR}/emulators/wine-devel
# - amd64 specific port to be normal port (based on binary package)
+PORTNAME= wine
+# define a dummy DISTVERSION to avoid errors with poudriere bulk -a
+# on architectures unsupported by this port
+DISTVERSION?= 0
+PKGNAMEPREFIX= i386-
+PKGNAMESUFFIX= -devel
CATEGORIES= emulators
+
+MAINTAINER= salvadore at FreeBSD.org
+COMMENT= 32-bit Microsoft Windows compatibility environment for 64-bit FreeBSD
ONLY_FOR_ARCHS= i386 amd64
Modified: head/emulators/i386-wine-devel/Makefile.amd64
==============================================================================
--- head/emulators/i386-wine-devel/Makefile.amd64 Sat Mar 14 21:00:22 2020 (r528441)
+++ head/emulators/i386-wine-devel/Makefile.amd64 Sat Mar 14 21:00:40 2020 (r528442)
@@ -1,19 +1,13 @@
# Created by: David Naylor <dbn at FreeBSD.org>
# $FreeBSD$
-PORTNAME= wine
-PORTVERSION= 4.0.r1
+DISTVERSION= 4.0.r1
PORTREVISION= 1
PORTEPOCH= 1
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
Modified: head/emulators/i386-wine-devel/Makefile.i386
==============================================================================
--- head/emulators/i386-wine-devel/Makefile.i386 Sat Mar 14 21:00:22 2020 (r528441)
+++ head/emulators/i386-wine-devel/Makefile.i386 Sat Mar 14 21:00:40 2020 (r528442)
@@ -1,11 +1,6 @@
# Created by: David Naylor <dbn at FreeBSD.org>
# $FreeBSD$
-PKGNAMEPREFIX= i386-
-
-MAINTAINER= salvadore at FreeBSD.org
-COMMENT?= 32-bit Microsoft Windows compatibility environment for 64-bit FreeBSD
-
# Use the wine port to do most of the heavy lifting
SLAVEDIR?= ${.CURDIR}
MASTERDIR= ${SLAVEDIR}/../wine-devel
Modified: head/emulators/i386-wine/Makefile
==============================================================================
--- head/emulators/i386-wine/Makefile Sat Mar 14 21:00:22 2020 (r528441)
+++ head/emulators/i386-wine/Makefile Sat Mar 14 21:00:40 2020 (r528442)
@@ -5,7 +5,15 @@
# - i386 specific port to be slave to ${PORTSDIR}/emulators/wine
# - amd64 specific port to be normal port (based on binary package)
+PORTNAME= wine
+# define a dummy DISTVERSION to avoid errors with poudriere bulk -a
+# on architectures unsupported by this port
+DISTVERSION?= 0
+PKGNAMEPREFIX= i386-
CATEGORIES= emulators
+
+MAINTAINER= salvadore at FreeBSD.org
+COMMENT= 32-bit Microsoft Windows compatibility environment for 64-bit FreeBSD
ONLY_FOR_ARCHS= i386 amd64
Modified: head/emulators/i386-wine/Makefile.amd64
==============================================================================
--- head/emulators/i386-wine/Makefile.amd64 Sat Mar 14 21:00:22 2020 (r528441)
+++ head/emulators/i386-wine/Makefile.amd64 Sat Mar 14 21:00:40 2020 (r528442)
@@ -1,18 +1,13 @@
# Created by: David Naylor <dbn at FreeBSD.org>
# $FreeBSD$
-PORTNAME= wine
-PORTVERSION= 3.0.4
+DISTVERSION= 3.0.4
PORTREVISION= 1
PORTEPOCH= 1
MASTER_SITES= LOCAL/dbn/repos/wine/${DIST_SUBDIR}/
-PKGNAMEPREFIX= i386-
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
Modified: head/emulators/i386-wine/Makefile.i386
==============================================================================
--- head/emulators/i386-wine/Makefile.i386 Sat Mar 14 21:00:22 2020 (r528441)
+++ head/emulators/i386-wine/Makefile.i386 Sat Mar 14 21:00:40 2020 (r528442)
@@ -1,11 +1,6 @@
# Created by: David Naylor <dbn at FreeBSD.org>
# $FreeBSD$
-PKGNAMEPREFIX= i386-
-
-MAINTAINER= salvadore at FreeBSD.org
-COMMENT?= 32-bit Microsoft Windows compatibility environment for 64-bit FreeBSD
-
# Use the wine port to do most of the heavy lifting
SLAVEDIR?= ${.CURDIR}
MASTERDIR= ${SLAVEDIR}/../wine
More information about the svn-ports-all
mailing list