diff --git a/sysutils/bacula11-server/files/pkg-deinstall.server.in b/sysutils/bacula11-server/files/pkg-deinstall.server.in
new file mode 100644
index 000000000000..05da0eb6a7f6
--- /dev/null
+++ b/sysutils/bacula11-server/files/pkg-deinstall.server.in
@@ -0,0 +1,34 @@
+#!/bin/sh
+
+PATH=/bin:/usr/bin:/usr/sbin
+
+# Note how to delete UID/GID
+USER=%%BACULA_USER%%
+GROUP=%%BACULA_GROUP%%
+UID=%%BACULA_UID%%
+GID=%%BACULA_UID%%
+BACULA_DIR=%%BACULA_DIR%%
+
+TMPFILE=/tmp/services-$RANDOM-$$
+
+case "$2" in
+"DEINSTALL")
+	# Delete entries in /etc/services
+        sed -e '/# Bacula port start/,/# Bacula port end/{' \
+            -e 'd' \
+            -e '}' /etc/services > $TMPFILE
+        mv -f $TMPFILE /etc/services
+
+	if [ -d ${BACULA_DIR} ]; then
+	    rmdir ${BACULA_DIR};
+	fi
+	if [ -d ${BACULA_DIR} ]; then
+	    echo "Check if ${BACULA_DIR} is empty and delete it to permanently remove the bacula port."
+	fi
+
+	if pw usershow "${USER}" 2>/dev/null 1>&2; then
+	    echo "To delete Bacula user permanently, use 'pw userdel ${USER}'"
+	    echo "To delete Bacula group permanently, use 'pw groupdel ${GROUP}'"
+	fi
+        ;;
+esac
diff --git a/sysutils/bacula11-server/files/pkg-install.server.in b/sysutils/bacula11-server/files/pkg-install.server.in
new file mode 100644
index 000000000000..12e044538074
--- /dev/null
+++ b/sysutils/bacula11-server/files/pkg-install.server.in
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+PATH=/bin:/usr/bin:/usr/sbin
+
+# Always add lines in /etc/services
+grep -q "bacula-dir" /etc/services
+if [ "$?" != "0" ]; then
+    echo "# Bacula port start
+bacula-dir      9101/tcp   #Bacula director daemon
+bacula-fd       9102/tcp   #Bacula file daemon
+bacula-sd       9103/tcp   #Bacula storage daemon
+# Bacula port end" >> /etc/services
+fi
diff --git a/sysutils/bacula13-server/files/pkg-deinstall.server.in b/sysutils/bacula13-server/files/pkg-deinstall.server.in
new file mode 100644
index 000000000000..05da0eb6a7f6
--- /dev/null
+++ b/sysutils/bacula13-server/files/pkg-deinstall.server.in
@@ -0,0 +1,34 @@
+#!/bin/sh
+
+PATH=/bin:/usr/bin:/usr/sbin
+
+# Note how to delete UID/GID
+USER=%%BACULA_USER%%
+GROUP=%%BACULA_GROUP%%
+UID=%%BACULA_UID%%
+GID=%%BACULA_UID%%
+BACULA_DIR=%%BACULA_DIR%%
+
+TMPFILE=/tmp/services-$RANDOM-$$
+
+case "$2" in
+"DEINSTALL")
+	# Delete entries in /etc/services
+        sed -e '/# Bacula port start/,/# Bacula port end/{' \
+            -e 'd' \
+            -e '}' /etc/services > $TMPFILE
+        mv -f $TMPFILE /etc/services
+
+	if [ -d ${BACULA_DIR} ]; then
+	    rmdir ${BACULA_DIR};
+	fi
+	if [ -d ${BACULA_DIR} ]; then
+	    echo "Check if ${BACULA_DIR} is empty and delete it to permanently remove the bacula port."
+	fi
+
+	if pw usershow "${USER}" 2>/dev/null 1>&2; then
+	    echo "To delete Bacula user permanently, use 'pw userdel ${USER}'"
+	    echo "To delete Bacula group permanently, use 'pw groupdel ${GROUP}'"
+	fi
+        ;;
+esac
diff --git a/sysutils/bacula13-server/files/pkg-install.server.in b/sysutils/bacula13-server/files/pkg-install.server.in
new file mode 100644
index 000000000000..12e044538074
--- /dev/null
+++ b/sysutils/bacula13-server/files/pkg-install.server.in
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+PATH=/bin:/usr/bin:/usr/sbin
+
+# Always add lines in /etc/services
+grep -q "bacula-dir" /etc/services
+if [ "$?" != "0" ]; then
+    echo "# Bacula port start
+bacula-dir      9101/tcp   #Bacula director daemon
+bacula-fd       9102/tcp   #Bacula file daemon
+bacula-sd       9103/tcp   #Bacula storage daemon
+# Bacula port end" >> /etc/services
+fi
diff --git a/sysutils/bacula9-server/files/pkg-deinstall.server.in b/sysutils/bacula9-server/files/pkg-deinstall.server.in
new file mode 100644
index 000000000000..05da0eb6a7f6
--- /dev/null
+++ b/sysutils/bacula9-server/files/pkg-deinstall.server.in
@@ -0,0 +1,34 @@
+#!/bin/sh
+
+PATH=/bin:/usr/bin:/usr/sbin
+
+# Note how to delete UID/GID
+USER=%%BACULA_USER%%
+GROUP=%%BACULA_GROUP%%
+UID=%%BACULA_UID%%
+GID=%%BACULA_UID%%
+BACULA_DIR=%%BACULA_DIR%%
+
+TMPFILE=/tmp/services-$RANDOM-$$
+
+case "$2" in
+"DEINSTALL")
+	# Delete entries in /etc/services
+        sed -e '/# Bacula port start/,/# Bacula port end/{' \
+            -e 'd' \
+            -e '}' /etc/services > $TMPFILE
+        mv -f $TMPFILE /etc/services
+
+	if [ -d ${BACULA_DIR} ]; then
+	    rmdir ${BACULA_DIR};
+	fi
+	if [ -d ${BACULA_DIR} ]; then
+	    echo "Check if ${BACULA_DIR} is empty and delete it to permanently remove the bacula port."
+	fi
+
+	if pw usershow "${USER}" 2>/dev/null 1>&2; then
+	    echo "To delete Bacula user permanently, use 'pw userdel ${USER}'"
+	    echo "To delete Bacula group permanently, use 'pw groupdel ${GROUP}'"
+	fi
+        ;;
+esac
diff --git a/sysutils/bacula9-server/files/pkg-install.server.in b/sysutils/bacula9-server/files/pkg-install.server.in
new file mode 100644
index 000000000000..12e044538074
--- /dev/null
+++ b/sysutils/bacula9-server/files/pkg-install.server.in
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+PATH=/bin:/usr/bin:/usr/sbin
+
+# Always add lines in /etc/services
+grep -q "bacula-dir" /etc/services
+if [ "$?" != "0" ]; then
+    echo "# Bacula port start
+bacula-dir      9101/tcp   #Bacula director daemon
+bacula-fd       9102/tcp   #Bacula file daemon
+bacula-sd       9103/tcp   #Bacula storage daemon
+# Bacula port end" >> /etc/services
+fi
diff --git a/sysutils/mkjail/Makefile b/sysutils/mkjail/Makefile
index 6492f3a606a4..340c91a46104 100644
--- a/sysutils/mkjail/Makefile
+++ b/sysutils/mkjail/Makefile
@@ -1,25 +1,25 @@
 PORTNAME=	mkjail
-DISTVERSION=	0.0.4
+DISTVERSION=	0.0.3
 CATEGORIES=	sysutils
 
 MAINTAINER=	fuz@FreeBSD.org
 COMMENT=	Fat jail creation script
 WWW=		https://github.com/mkjail/mkjail
 
 LICENSE=	BSD2CLAUSE
 
 OPTIONS_DEFINE=	DOCS
 
 USE_GITHUB=	yes
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 do-install:
 		cd ${WRKSRC}/src && ${CP} -a bin share etc ${STAGEDIR}${PREFIX}
 
 post-install-DOCS-on:
 		${MKDIR} ${STAGEDIR}${DOCSDIR}
 		${INSTALL_MAN} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/sysutils/mkjail/distinfo b/sysutils/mkjail/distinfo
index 740c8e1115ea..6cd644cefcda 100644
--- a/sysutils/mkjail/distinfo
+++ b/sysutils/mkjail/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1693773851
-SHA256 (mkjail-mkjail-0.0.4_GH0.tar.gz) = 280c632905918d080223c7b072c2893129422c266420192e7d34a41e4edaa04f
-SIZE (mkjail-mkjail-0.0.4_GH0.tar.gz) = 7334
+TIMESTAMP = 1631795814
+SHA256 (mkjail-mkjail-0.0.3_GH0.tar.gz) = 42dbe2237d9e54ef9b5a6ecad4b3e224cef1be02bf33493a3ac83ea653de0455
+SIZE (mkjail-mkjail-0.0.3_GH0.tar.gz) = 7628