aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesús Daniel Colmenares Oviedo <dtxdf@FreeBSD.org>2025-11-09 18:45:41 +0000
committerJesús Daniel Colmenares Oviedo <dtxdf@FreeBSD.org>2025-11-09 19:06:28 +0000
commitcbbef72ee0a593611661f89ee30963eb95efbbb0 (patch)
treed165474830d29c252b557c89bfff829d5f81a4d6
parent06720897e774216156e98c35e436c6408fe690a0 (diff)
sysutils/appjail{,-devel}: Add PKG option
AppJail optionally depends on ${PKG_ORIGIN} to create a base directory using pkgbase. We enable the PKG option by default, as it will become the preferred method. PR: 290907 Reported by: pkaipila@gmail.com
-rw-r--r--sysutils/appjail-devel/Makefile12
-rw-r--r--sysutils/appjail/Makefile6
2 files changed, 13 insertions, 5 deletions
diff --git a/sysutils/appjail-devel/Makefile b/sysutils/appjail-devel/Makefile
index 792c6ed41a0a..a5eaabc1b4a9 100644
--- a/sysutils/appjail-devel/Makefile
+++ b/sysutils/appjail-devel/Makefile
@@ -1,5 +1,6 @@
PORTNAME= appjail
DISTVERSION= 4.5.0.20251106
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= sysutils
PKGNAMESUFFIX= -devel
@@ -25,17 +26,20 @@ SUB_FILES= pkg-message
PORTDOCS= README.md
-OPTIONS_DEFINE= DEBOOTSTRAP DOAS DOCS GIT OCI
+OPTIONS_DEFINE= DEBOOTSTRAP DOAS DOCS GIT OCI PKG
+OPTIONS_DEFAULT= PKG
-DEBOOTSTRAP_DESC= Support for Debian and Ubuntu jails
-DOAS_DESC= Add support for unprivileged users
-OCI_DESC= Add support for OCI
+DEBOOTSTRAP_DESC= Support for Debian and Ubuntu jails
+DOAS_DESC= Add support for unprivileged users
+OCI_DESC= Add support for OCI
+PKG_DESC= Add support for pkgbase
DEBOOTSTRAP_RUN_DEPENDS= debootstrap>0:sysutils/debootstrap
DOAS_RUN_DEPENDS= doas>0:security/doas
GIT_RUN_DEPENDS= git>0:devel/git
OCI_RUN_DEPENDS= buildah>0:sysutils/buildah \
jq>0:textproc/jq
+PKG_RUN_DEPENDS= ${LOCALBASE}/sbin/pkg:${PKG_ORIGIN}
post-install:
${MKDIR} ${STAGEDIR}/${ETCDIR}
diff --git a/sysutils/appjail/Makefile b/sysutils/appjail/Makefile
index fc0aed684a3f..a771849df3bd 100644
--- a/sysutils/appjail/Makefile
+++ b/sysutils/appjail/Makefile
@@ -1,6 +1,7 @@
PORTNAME= appjail
DISTVERSIONPREFIX= v
DISTVERSION= 4.5.0
+PORTREVISION= 1
CATEGORIES= sysutils
MAINTAINER= dtxdf@FreeBSD.org
@@ -20,17 +21,20 @@ CONFLICTS= appjail-devel
PORTDOCS= README.md
-OPTIONS_DEFINE= DEBOOTSTRAP DOAS DOCS GIT OCI
+OPTIONS_DEFINE= DEBOOTSTRAP DOAS DOCS GIT OCI PKG
+OPTIONS_DEFAULT= PKG
DEBOOTSTRAP_DESC= Support for Debian and Ubuntu jails
DOAS_DESC= Add support for unprivileged users
OCI_DESC= Add support for OCI
+PKG_DESC= Add support for pkgbase
DEBOOTSTRAP_RUN_DEPENDS= debootstrap>0:sysutils/debootstrap
DOAS_RUN_DEPENDS= doas>0:security/doas
GIT_RUN_DEPENDS= git>0:devel/git
OCI_RUN_DEPENDS= buildah>0:sysutils/buildah \
jq>0:textproc/jq
+PKG_RUN_DEPENDS= ${LOCALBASE}/sbin/pkg:${PKG_ORIGIN}
do-install-DOCS-on:
@${MKDIR} ${STAGEDIR}/${DOCSDIR}