git: 24c3ca24da5d - main - sysutils/appjail{,-devel}: Use PORTEXAMPLES to simplify pkg-plist

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Jesús Daniel Colmenares Oviedo <dtxdf_at_FreeBSD.org>
Date: Sun, 20 Sep 2026 01:02:22 UTC
The branch main has been updated by dtxdf:

URL: https://cgit.FreeBSD.org/ports/commit/?id=24c3ca24da5de10fafa8b4b1df7b9ea0d6aebcf2

commit 24c3ca24da5de10fafa8b4b1df7b9ea0d6aebcf2
Author:     Jesús Daniel Colmenares Oviedo <dtxdf@FreeBSD.org>
AuthorDate: 2026-09-20 00:58:07 +0000
Commit:     Jesús Daniel Colmenares Oviedo <dtxdf@FreeBSD.org>
CommitDate: 2026-09-20 01:01:06 +0000

    sysutils/appjail{,-devel}: Use PORTEXAMPLES to simplify pkg-plist
---
 sysutils/appjail-devel/Makefile  | 8 +++++++-
 sysutils/appjail-devel/pkg-plist | 9 ---------
 sysutils/appjail/Makefile        | 8 +++++++-
 sysutils/appjail/pkg-plist       | 9 ---------
 4 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/sysutils/appjail-devel/Makefile b/sysutils/appjail-devel/Makefile
index a3f8b8b85c5f..b2663efc8df4 100644
--- a/sysutils/appjail-devel/Makefile
+++ b/sysutils/appjail-devel/Makefile
@@ -24,8 +24,9 @@ CONFLICTS=	appjail
 SUB_FILES=	pkg-message
 
 PORTDOCS=	README.md
+PORTEXAMPLES=	*
 
-OPTIONS_DEFINE=		DEBOOTSTRAP DOAS DOCS GIT OCI PKGBASE X11
+OPTIONS_DEFINE=		DEBOOTSTRAP DOAS DOCS EXAMPLES GIT OCI PKGBASE X11
 OPTIONS_DEFAULT=	OCI PKGBASE
 OPTIONS_RADIO=		SECRETS
 OPTIONS_RADIO_SECRETS=	AGE RAGE
@@ -61,4 +62,9 @@ post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}/${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}/${DOCSDIR}
 
+post-install-EXAMPLES-on:
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	@cd ${WRKSRC}/share/examples/appjail && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
+	@cd ${WRKSRC}/share/examples/appjail && ${CHMOD} +x hooks/pre.d/*.sh
+
 .include <bsd.port.mk>
diff --git a/sysutils/appjail-devel/pkg-plist b/sysutils/appjail-devel/pkg-plist
index 829bf3fb96cc..0b55f22d298b 100644
--- a/sysutils/appjail-devel/pkg-plist
+++ b/sysutils/appjail-devel/pkg-plist
@@ -184,15 +184,6 @@ libexec/appjail/mksock/mksock
 %%DATADIR%%/scripts/runas.sh
 %%DATADIR%%/scripts/super-mv.sh
 %%DATADIR%%/scripts/xresize-exec.sh
-%%EXAMPLESDIR%%/appjail.conf
-%%EXAMPLESDIR%%/templates/bridge.conf
-%%EXAMPLESDIR%%/templates/freebsd-oci.conf
-%%EXAMPLESDIR%%/templates/linux.conf
-%%EXAMPLESDIR%%/templates/vnet.conf
-%%EXAMPLESDIR%%/templates/xorg.conf
-%%EXAMPLESDIR%%/hooks/pre.d/history.sh
-%%EXAMPLESDIR%%/hooks/pre.d/security-group.sh
-%%EXAMPLESDIR%%/hooks/pre.d/security-table.sh
 share/man/man1/appjail-apply.1.gz
 share/man/man1/appjail-checkOld.1.gz
 share/man/man1/appjail-cmd.1.gz
diff --git a/sysutils/appjail/Makefile b/sysutils/appjail/Makefile
index 4f57f43d885f..6943cf7a1581 100644
--- a/sysutils/appjail/Makefile
+++ b/sysutils/appjail/Makefile
@@ -19,8 +19,9 @@ ALL_TARGET=	utils-strip
 CONFLICTS=	appjail-devel
 
 PORTDOCS=	README.md
+PORTEXAMPLES=	*
 
-OPTIONS_DEFINE=		DEBOOTSTRAP DOAS DOCS GIT OCI PKGBASE X11
+OPTIONS_DEFINE=		DEBOOTSTRAP DOAS DOCS EXAMPLES GIT OCI PKGBASE X11
 OPTIONS_DEFAULT=	OCI PKGBASE
 OPTIONS_RADIO=		SECRETS
 OPTIONS_RADIO_SECRETS=	AGE RAGE
@@ -52,6 +53,11 @@ do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}/${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}/${DOCSDIR}
 
+do-install-EXAMPLES-on:
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	@cd ${WRKSRC}/share/examples/appjail && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
+	@cd ${WRKSRC}/share/examples/appjail && ${CHMOD} +x hooks/pre.d/*.sh
+
 post-install:
 	${MKDIR} ${STAGEDIR}/${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/share/examples/appjail/appjail.conf ${STAGEDIR}/${ETCDIR}/appjail.conf.sample
diff --git a/sysutils/appjail/pkg-plist b/sysutils/appjail/pkg-plist
index 829bf3fb96cc..0b55f22d298b 100644
--- a/sysutils/appjail/pkg-plist
+++ b/sysutils/appjail/pkg-plist
@@ -184,15 +184,6 @@ libexec/appjail/mksock/mksock
 %%DATADIR%%/scripts/runas.sh
 %%DATADIR%%/scripts/super-mv.sh
 %%DATADIR%%/scripts/xresize-exec.sh
-%%EXAMPLESDIR%%/appjail.conf
-%%EXAMPLESDIR%%/templates/bridge.conf
-%%EXAMPLESDIR%%/templates/freebsd-oci.conf
-%%EXAMPLESDIR%%/templates/linux.conf
-%%EXAMPLESDIR%%/templates/vnet.conf
-%%EXAMPLESDIR%%/templates/xorg.conf
-%%EXAMPLESDIR%%/hooks/pre.d/history.sh
-%%EXAMPLESDIR%%/hooks/pre.d/security-group.sh
-%%EXAMPLESDIR%%/hooks/pre.d/security-table.sh
 share/man/man1/appjail-apply.1.gz
 share/man/man1/appjail-checkOld.1.gz
 share/man/man1/appjail-cmd.1.gz