git: 0cae7336b7c9 - main - poudriere: switch to portconfig

From: Baptiste Daroussin <bapt_at_FreeBSD.org>
Date: Wed, 11 Oct 2023 08:00:46 UTC
The branch main has been updated by bapt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0cae7336b7c9fcfceac895ee6b9104e01d6a04d1

commit 0cae7336b7c9fcfceac895ee6b9104e01d6a04d1
Author:     Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2023-10-11 08:00:11 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2023-10-11 08:00:11 +0000

    poudriere: switch to portconfig
    
    Make poudriere accept both portconfig and dialog4ports, default
    in portconfig
---
 ports-mgmt/poudriere-devel/Makefile | 10 +++++-----
 ports-mgmt/poudriere/Makefile       | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ports-mgmt/poudriere-devel/Makefile b/ports-mgmt/poudriere-devel/Makefile
index a6d3f4dd1c5c..8115d53cd85b 100644
--- a/ports-mgmt/poudriere-devel/Makefile
+++ b/ports-mgmt/poudriere-devel/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	poudriere
 DISTVERSION=	3.3.99.20220831
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	LOCAL/bdrewery/${PORTNAME}/ \
 		http://mirror.shatow.net/freebsd/${PORTNAME}/ \
@@ -22,15 +22,15 @@ GH_TAGNAME=	3.3.0-1135-g137c376a8
 GNU_CONFIGURE=	yes
 ETCDIR=		${PREFIX}/etc/poudriere.d
 
-OPTIONS_DEFINE=	BASH MANIFESTS DIALOG4PORTS EXAMPLES QEMU ZSH
-OPTIONS_DEFAULT=BASH MANIFESTS DIALOG4PORTS ZSH
+OPTIONS_DEFINE=	BASH MANIFESTS PORTCONFIG EXAMPLES QEMU ZSH
+OPTIONS_DEFAULT=BASH MANIFESTS PORTCONFIG ZSH
 OPTIONS_SUB=	yes
 
 MANIFESTS_DESC=		Install manifests for jail creation
 MANIFESTS_RUN_DEPENDS+=	freebsd-release-manifests>0:misc/freebsd-release-manifests
 
-DIALOG4PORTS_DESC=	Install dialog4ports for options command
-DIALOG4PORTS_RUN_DEPENDS=	dialog4ports>0:ports-mgmt/dialog4ports
+PORTCONFIG_DESC=	Install portconfig for options command
+PORTCONFIG_RUN_DEPENDS=	portconfig>0:ports-mgmt/portconfig
 
 QEMU_DESC=	Add qemu-user-static for non-x86 architectures
 QEMU_RUN_DEPENDS=	qemu-user-static>0:emulators/qemu-user-static
diff --git a/ports-mgmt/poudriere/Makefile b/ports-mgmt/poudriere/Makefile
index e8e8cb4dbebf..833bd0b353bf 100644
--- a/ports-mgmt/poudriere/Makefile
+++ b/ports-mgmt/poudriere/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	poudriere
 DISTVERSION=	3.3.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	LOCAL/bdrewery/${PORTNAME}/ \
 		http://mirror.shatow.net/freebsd/${PORTNAME}/ \
@@ -20,15 +20,15 @@ GH_ACCOUNT=	freebsd
 GNU_CONFIGURE=	yes
 ETCDIR=		${PREFIX}/etc/poudriere.d
 
-OPTIONS_DEFINE=	BASH MANIFESTS DIALOG4PORTS EXAMPLES QEMU ZSH
-OPTIONS_DEFAULT=BASH MANIFESTS DIALOG4PORTS ZSH
+OPTIONS_DEFINE=	BASH MANIFESTS PROTCONFIG EXAMPLES QEMU ZSH
+OPTIONS_DEFAULT=BASH MANIFESTS PORTCONFIG ZSH
 OPTIONS_SUB=	yes
 
 MANIFESTS_DESC=		Install manifests for jail creation
 MANIFESTS_RUN_DEPENDS+=	freebsd-release-manifests>0:misc/freebsd-release-manifests
 
-DIALOG4PORTS_DESC=	Install dialog4ports for options command
-DIALOG4PORTS_RUN_DEPENDS=	dialog4ports>0:ports-mgmt/dialog4ports
+PORTCONFIG_DESC=	Install dialog4ports for options command
+PORTCONFIG_RUN_DEPENDS=	portconfig>0:ports-mgmt/portconfig
 
 QEMU_DESC=	Add qemu-user-static for non-x86 architectures
 QEMU_RUN_DEPENDS=	qemu-user-static>0:emulators/qemu-user-static