diff --git a/lib/libdpv/dpv.3 b/lib/libdpv/dpv.3
index a2f99b2f7af1..62dd2e94d736 100644
--- a/lib/libdpv/dpv.3
+++ b/lib/libdpv/dpv.3
@@ -55,8 +55,7 @@ library can display progress with one of
 .Xr dialog 3 ,
 .Xr dialog 1 ,
 or
-.Xr Xdialog 1
-.Pq x11/xdialog from the ports tree .
+.Xr Xdialog 1 Pq Pa ports/x11/xdialog .
 .Pp
 The
 .Fn dpv
@@ -152,7 +151,7 @@ argument will bump the width of the gauge widget.
 Prompts wider than the maximum width will wrap
 .Po
 unless using
-.Xr Xdialog 1 ;
+.Xr Xdialog 1 Pq Pa ports/x11/xdialog ;
 see BUGS section below
 .Pc .
 .It Dv DPV_NO_LABELS
@@ -405,7 +404,7 @@ Override command string used to launch
 .Xr dialog 1
 .Pq requires Dv DPV_DISPLAY_DIALOG
 or
-.Xr Xdialog 1
+.Xr Xdialog 1 Pq Pa ports/x11/xdialog
 .Pq requires Dv DPV_DISPLAY_XDIALOG ;
 default is either
 .Ql dialog
@@ -428,8 +427,9 @@ used as a prefix to
 .It Ev USE_COLOR
 If set and NULL,
 disables the use of color when using
-.Xr dialog 1
-.Pq does not apply to Xr Xdialog 1 .
+.Xr dialog 1 .
+Does not apply to
+.Xr Xdialog 1 Pq Pa ports/x11/xdialog .
 .It Ev msg_done Ev msg_fail Ev msg_pending
 Internationalization strings for overriding the default English strings
 .Ql Done ,
@@ -456,7 +456,7 @@ or desired values.
 .El
 .Sh SEE ALSO
 .Xr dialog 1 ,
-.Xr Xdialog 1 ,
+.Xr Xdialog 1 Pq Pa ports/x11/xdialog ,
 .Xr dialog 3
 .Sh HISTORY
 The
@@ -466,7 +466,7 @@ library first appeared in
 .Sh AUTHORS
 .An Devin Teske Aq dteske@FreeBSD.org
 .Sh BUGS
-.Xr Xdialog 1 ,
+.Xr Xdialog 1 Pq Pa ports/x11/xdialog ,
 when given both
 .Ql Fl -title Ar title
 .Po
@@ -485,12 +485,12 @@ member of
 .Pc ,
 displays the backtitle in place of the title and vice-versa.
 .Pp
-.Xr Xdialog 1
+.Xr Xdialog 1 Pq Pa ports/x11/xdialog
 does not wrap long prompt texts received after initial launch.
 This is a known issue with the
 .Ql --gauge
 widget in
-.Xr Xdialog 1 .
+.Xr Xdialog 1 Pq Pa ports/x11/xdialog .
 Embed escaped newlines within prompt text to force line breaks.
 .Pp
 .Xr dialog 1
@@ -501,7 +501,7 @@ This is a known issue with
 and does not affect
 .Xr dialog 3
 or
-.Xr Xdialog 1 .
+.Xr Xdialog 1 Pq Pa ports/x11/xdialog .
 .Pp
 If an application ignores
 .Ev USE_COLOR
@@ -520,7 +520,7 @@ to unset
 .Ev USE_COLOR ,
 forcing interpretation of color sequences.
 This does not effect
-.Xr Xdialog 1 ,
+.Xr Xdialog 1 Pq Pa ports/x11/xdialog ,
 which renders the color escape sequences as plain text.
 See
 .Do
diff --git a/usr.bin/dpv/dpv.1 b/usr.bin/dpv/dpv.1
index 801389529946..fc8857e25c62 100644
--- a/usr.bin/dpv/dpv.1
+++ b/usr.bin/dpv/dpv.1
@@ -90,7 +90,7 @@ progress is displayed using one of
 .Xr dialog 1
 .Pq see Ql Fl D ,
 or instead
-.Xr Xdialog 1
+.Xr Xdialog 1 Pq Pa ports/x11/xdialog
 .Pq see Ql Fl X .
 .Pp
 The following options are available:
@@ -104,7 +104,7 @@ Display
 .Ar backtitle
 on the backdrop, at top-left, behind the dialog widget.
 When using
-.Xr Xdialog 1 ,
+.Xr Xdialog 1 Pq Pa ports/x11/xdialog ,
 this is displayed inside the window
 .Pq at the top
 followed by a separator line.
@@ -249,10 +249,12 @@ and
 .Ql Fl a
 to bump the dialog width.
 Prompts wider than the maximum width will wrap
-.Pq unless using Xr Xdialog 1 ; see BUGS section below .
+unless using
+.Xr Xdialog 1 Pq Pa ports/x11/xdialog ;
+see BUGS section below.
 .It Fl X
 Enable X11 mode by using
-.Xr Xdialog 1
+.Xr Xdialog 1 Pq Pa ports/x11/xdialog
 instead of
 .Xr dialog 1
 or
@@ -289,7 +291,7 @@ Override command string used to launch
 .Xr dialog 1
 .Pq requires Ql Fl D
 or
-.Xr Xdialog 1
+.Xr Xdialog 1 Pq Pa ports/x11/xdialog
 .Pq requires Ql Fl X ;
 default is either
 .Ql dialog
@@ -309,8 +311,9 @@ is either not set or NULL, used as a prefix to
 .Pq i.e., Ql $HOME/.dialogrc .
 .It Ev USE_COLOR
 If set and NULL, disables the use of color when using
-.Xr dialog 1
-.Pq does not apply to Xr Xdialog 1 .
+.Xr dialog 1 .
+Does not apply to
+.Xr Xdialog 1 Pq Pa ports/x11/xdialog .
 .El
 .Sh DEPENDENCIES
 If using
@@ -320,7 +323,7 @@ is required.
 .Pp
 If using
 .Ql Fl X ,
-.Xr Xdialog 1
+.Xr Xdialog 1 Pq Pa ports/x11/xdialog
 is required.
 .Sh FILES
 .Bl -tag -width "$HOME/.dialogrc" -compact
@@ -379,7 +382,7 @@ dpv -o /dev/md42 "Zeroing md42" < /dev/zero
 .Sh SEE ALSO
 .Xr dialog 1 ,
 .Xr sh 1 ,
-.Xr Xdialog 1 ,
+.Xr Xdialog 1 Pq Pa ports/x11/xdialog ,
 .Xr dialog 3
 .Sh HISTORY
 A
@@ -389,7 +392,7 @@ utility first appeared in
 .Sh AUTHORS
 .An Devin Teske Aq dteske@FreeBSD.org
 .Sh BUGS
-.Xr Xdialog 1 ,
+.Xr Xdialog 1 Pq Pa ports/x11/xdialog ,
 when given both
 .Ql Fl -title Ar title
 .Pq see above Ql Fl t Ar title
@@ -398,12 +401,12 @@ and
 .Pq see above Ql Fl b Ar backtitle ,
 displays the backtitle in place of the title and vice-versa.
 .Pp
-.Xr Xdialog 1
+.Xr Xdialog 1 Pq Pa ports/x11/xdialog
 does not wrap long prompt texts received after initial launch.
 This is a known issue with the
 .Ql --gauge
 widget in
-.Xr Xdialog 1 .
+.Xr Xdialog 1 Pq Pa ports/x11/xdialog .
 .Pp
 .Xr dialog 1
 does not display the first character after a series of escaped escape-sequences
@@ -413,7 +416,7 @@ This is a known issue with
 and does not affect
 .Xr dialog 3
 or
-.Xr Xdialog 1 .
+.Xr Xdialog 1 Pq Pa ports/x11/xdialog .
 .Pp
 If your application ignores
 .Ev USE_COLOR
@@ -436,7 +439,7 @@ to unset
 .Ev USE_COLOR ,
 forcing interpretation of color sequences.
 This does not effect
-.Xr Xdialog 1 ,
+.Xr Xdialog 1 Pq Pa ports/x11/xdialog ,
 which renders the color escape sequences as plain text.
 See
 .Do
diff --git a/usr.sbin/bsdconfig/bsdconfig.8 b/usr.sbin/bsdconfig/bsdconfig.8
index e009ba94c305..2be1b6d291a4 100644
--- a/usr.sbin/bsdconfig/bsdconfig.8
+++ b/usr.sbin/bsdconfig/bsdconfig.8
@@ -79,7 +79,7 @@ As root, always prompt-for and validate
 username/password before starting.
 .It Fl X
 Use
-.Xr Xdialog 1
+.Xr Xdialog 1 Pq Pa ports/x11/xdialog
 in place of
 .Xr dialog 1 .
 .El
@@ -110,7 +110,7 @@ sub-utility to allow installation/re-installation of the FreeBSD Documentation
 set(s).
 .It Cm dot
 Generate a graphviz
-.Xr dot 1
+.Xr dot 1 Pq Pa ports/graphics/graphviz
 language file
 .Pq printed on stdout
 visualizing the