diff --git a/x11/bosd/Makefile b/x11/bosd/Makefile
index cdd055aa2c41..85982d9e5ecc 100644
--- a/x11/bosd/Makefile
+++ b/x11/bosd/Makefile
@@ -1,41 +1,49 @@
 PORTNAME=	bosd
 DISTVERSION=	10.4
+PORTREVISION=	1
 CATEGORIES=	x11
 
 MAINTAINER=	dteske@FreeBSD.org
 COMMENT=	X11 on-screen display engine
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libpng16.so:graphics/png
 
-USES=		localbase:ldflags pkgconfig python:build,run shebangfix xorg
+USES=		localbase:ldflags pkgconfig shebangfix xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	FrauBSD
 USE_LDCONFIG=	yes
 USE_XORG=	x11 xext xft xrandr xrender
 
 SHEBANG_FILES=	examples/*.py tools/glyph.py
 
 # FreeBSD keeps .pc files under libdata/pkgconfig.
 # PYTHON= drives the example glyph build (no bare python3 on PATH).
 MAKE_ARGS=	PKGCONFIGDIR="${PREFIX}/libdata/pkgconfig" \
 		PYTHON="${PYTHON_CMD}"
 ALL_TARGET=	all example
 
-OPTIONS_DEFINE=		TESTS
+OPTIONS_DEFINE=		EXAMPLES TESTS
 OPTIONS_DEFAULT=	TESTS
 OPTIONS_SUB=		yes
 
+TESTS_DESC=		Install the test suite
+EXAMPLES_USES=		python:build,run
+EXAMPLES_USES_OFF=	python:build
 TESTS_MAKE_ARGS=	INSTALL_TESTS=yes
 TESTS_MAKE_ARGS_OFF=	INSTALL_TESTS=no
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/bosd \
 		${STAGEDIR}${PREFIX}/lib/libbosd.so.4
 	${INSTALL_DATA} ${WRKSRC}/CHANGELOG.md ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/*.png ${STAGEDIR}${DATADIR}
 
+# Upstream install always copies the example scripts.
+post-install-EXAMPLES-off:
+	${RM} -r ${STAGEDIR}${EXAMPLESDIR}
+
 .include <bsd.port.mk>
diff --git a/x11/bosd/pkg-plist b/x11/bosd/pkg-plist
index c4d25996ca42..902a8366f739 100644
--- a/x11/bosd/pkg-plist
+++ b/x11/bosd/pkg-plist
@@ -1,85 +1,85 @@
 bin/bosd
 include/bosd.h
 lib/libbosd.so
 lib/libbosd.so.4
 libdata/pkgconfig/bosd.pc
 share/bosd/airplane-off.png
 share/bosd/airplane-on.png
 share/bosd/audio-headphones.png
 share/bosd/audio-speakers.png
 share/bosd/auto-rotate-off.png
 share/bosd/auto-rotate-on.png
 share/bosd/bsd.png
 share/bosd/lid-awake.png
 share/bosd/lid-s0ix.png
 share/bosd/mirror-extend-none.png
 share/bosd/mirror-extend.png
 share/bosd/mirror-none.png
 share/bosd/mirror-off.png
 share/bosd/mirror-on.png
 share/bosd/tile-float.png
 share/bosd/tile-on.png
 share/doc/bosd/CHANGELOG.md
 share/doc/bosd/README.md
-share/examples/bosd/airplane.py
-share/examples/bosd/audio.py
-share/examples/bosd/auto-rotate.py
-share/examples/bosd/bsd.py
-share/examples/bosd/glyph.py
-share/examples/bosd/lid.py
-share/examples/bosd/mirror.py
-share/examples/bosd/tile.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airplane.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/audio.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auto-rotate.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bsd.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glyph.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lid.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mirror.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tile.py
 share/man/man1/bosd.1.gz
 share/man/man3/bosd.3.gz
 %%TESTS%%share/bosd/tests/run
 %%TESTS%%share/bosd/tests/bar_01.sh
 %%TESTS%%share/bosd/tests/bar_02_alpha.sh
 %%TESTS%%share/bosd/tests/bar_03_no_outline.sh
 %%TESTS%%share/bosd/tests/bar_04_overage.sh
 %%TESTS%%share/bosd/tests/bar_05_offsets.sh
 %%TESTS%%share/bosd/tests/bar_06_color.sh
 %%TESTS%%share/bosd/tests/bar_07_prev.sh
 %%TESTS%%share/bosd/tests/bar_08_captions.sh
 %%TESTS%%share/bosd/tests/bar_09_face.sh
 %%TESTS%%share/bosd/tests/bar_10_caption_alpha.sh
 %%TESTS%%share/bosd/tests/bar_11_scale.sh
 %%TESTS%%share/bosd/tests/coexist_01.sh
 %%TESTS%%share/bosd/tests/coexist_02_icon_bar.sh
 %%TESTS%%share/bosd/tests/coexist_03_countdown_bar.sh
 %%TESTS%%share/bosd/tests/coexist_04_htext_bar.sh
 %%TESTS%%share/bosd/tests/coexist_05_icon_captions_bar.sh
 %%TESTS%%share/bosd/tests/coexist_06_countdown_captions_bar.sh
 %%TESTS%%share/bosd/tests/coexist_07_htext_captions_bar.sh
 %%TESTS%%share/bosd/tests/countdown_01.sh
 %%TESTS%%share/bosd/tests/countdown_02.sh
 %%TESTS%%share/bosd/tests/countdown_03_scale_adorn.sh
 %%TESTS%%share/bosd/tests/htext_01.sh
 %%TESTS%%share/bosd/tests/htext_02_alpha.sh
 %%TESTS%%share/bosd/tests/htext_03_offsets.sh
 %%TESTS%%share/bosd/tests/htext_04_checkmark.sh
 %%TESTS%%share/bosd/tests/htext_05_badge.sh
 %%TESTS%%share/bosd/tests/htext_06_color_badge.sh
 %%TESTS%%share/bosd/tests/htext_07_face_badge.sh
 %%TESTS%%share/bosd/tests/htext_08_scale.sh
 %%TESTS%%share/bosd/tests/htext_09_scale_badge.sh
 %%TESTS%%share/bosd/tests/icon_01.sh
 %%TESTS%%share/bosd/tests/icon_02_badge.sh
 %%TESTS%%share/bosd/tests/icon_03_scale.sh
 %%TESTS%%share/bosd/tests/icon_04_scale_badge.sh
 %%TESTS%%share/bosd/tests/icon_05_alpha.sh
 %%TESTS%%share/bosd/tests/icon_06_outline_alpha.sh
 %%TESTS%%share/bosd/tests/icon_07_below.sh
 %%TESTS%%share/bosd/tests/icon_08_above.sh
 %%TESTS%%share/bosd/tests/icon_09_offsets.sh
 %%TESTS%%share/bosd/tests/icon_10_color.sh
 %%TESTS%%share/bosd/tests/icon_11_face.sh
 %%TESTS%%share/bosd/tests/lib.sh
 %%TESTS%%share/bosd/tests/stext_01.sh
 %%TESTS%%share/bosd/tests/stext_02_alpha.sh
 %%TESTS%%share/bosd/tests/stext_03_no_outline.sh
 %%TESTS%%share/bosd/tests/stext_04_color.sh
 %%TESTS%%share/bosd/tests/stext_05_face.sh
 %%TESTS%%share/bosd/tests/stext_06_scale.sh
 %%TESTS%%share/bosd/tests/stext_07_offsets.sh
 %%TESTS%%share/bosd/tests/stext_08_newline.sh
 %%TESTS%%share/bosd/tests/stext_09_space.sh