Page MenuHomeFreeBSD
Files F148119379

D52564.diff
No OneTemporary
Actions

D52564.diff
View Options

diff --git a/UPDATING b/UPDATING
--- a/UPDATING
+++ b/UPDATING
@@ -28,6 +28,10 @@
at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".)
20250918:
+ mandoc (including /usr/bin/man) has been moved to a new package,
+ FreeBSD-mandoc. If you have the minimal set installed, this package
+ will be installed automatically, otherwise you may want to install it.
+
Kyua has been moved to the FreeBSD-kyua package, and ATF has been moved
to the FreeBSD-atf* packages. If you have FreeBSD-tests installed,
these packages will be installed automatically, otherwise you should
diff --git a/release/packages/ucl/mandoc-all.ucl b/release/packages/ucl/mandoc-all.ucl
new file mode 100644
--- /dev/null
+++ b/release/packages/ucl/mandoc-all.ucl
@@ -0,0 +1,11 @@
+comment = "Online manual page reader"
+
+desc = <<EOD
+This packages provides man(1), a utility which can format and display system
+manual pages, along with the related utilities apropos(1) and makewhatis(8),
+and the mandoc(1) backend.
+EOD
+
+annotations {
+ set = minimal
+}
diff --git a/usr.bin/man/Makefile b/usr.bin/man/Makefile
--- a/usr.bin/man/Makefile
+++ b/usr.bin/man/Makefile
@@ -1,3 +1,5 @@
+PACKAGE= mandoc
+
SCRIPTS= man.sh
LINKS= ${BINDIR}/man ${BINDIR}/manpath
diff --git a/usr.bin/mandoc/Makefile b/usr.bin/mandoc/Makefile
--- a/usr.bin/mandoc/Makefile
+++ b/usr.bin/mandoc/Makefile
@@ -3,6 +3,8 @@
MANDOCDIR= ${SRCTOP}/contrib/mandoc
.PATH: ${MANDOCDIR}
+PACKAGE= mandoc
+
PROG= mandoc
MAN= mandoc.1 mandoc.db.5 eqn.7 mandoc_char.7 tbl.7 man.7 mdoc.7 roff.7
MLINKS= mandoc.1 mdocml.1
@@ -16,6 +18,10 @@
.error MK_MAN_UTILS should be set to yes when bootstrapping
.endif
+FILESGROUPS= TRIGGERS
+TRIGGERS= mandoc.ucl
+TRIGGERSDIR= /usr/share/pkg/triggers
+
LIBMAN_SRCS= man.c \
man_macro.c \
man_validate.c
diff --git a/usr.bin/mandoc/mandoc.ucl b/usr.bin/mandoc/mandoc.ucl
new file mode 100644
--- /dev/null
+++ b/usr.bin/mandoc/mandoc.ucl
@@ -0,0 +1,18 @@
+path_glob: "/usr/share/man/*"
+
+cleanup: {
+ type: lua
+ sandbox: false
+ script: <<EOD
+ os.remove("/usr/share/man/mandoc.db")
+EOD
+}
+
+trigger: {
+ type: lua
+ sandbox: false
+ script: <<EOD
+ print("Generating apropos(1) database...")
+ pkg.exec({"/usr/bin/makewhatis", "/usr/share/man"})
+EOD
+}

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 16, 10:24 PM (20 h, 13 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29746957
Default Alt Text
D52564.diff (2 KB)

Event Timeline