Move major includes into /usr/share/bsdconfig for easy external access.

Reviewed by:	adrian (co-mentor)
Approved by:	adrian (co-mentor)

usr.sbin/bsdconfig/Makefile

@@ -12,6 +12,7 @@ SUBDIR=	console \
 	networking \
 	password \
 	security \
+	share \
 	startup \
 	timezone \
 	ttys \

usr.sbin/bsdconfig/bsdconfig

@@ -29,11 +29,13 @@
 #
 ############################################################ INCLUDES
 
+BSDCFG_SHARE="/usr/share/bsdconfig"
+. $BSDCFG_SHARE/common.subr || exit 1
+f_include $BSDCFG_SHARE/dialog.subr
+f_include $BSDCFG_SHARE/mustberoot.subr
+f_include $BSDCFG_SHARE/strings.subr
+
 BSDCFG_LIBE="/usr/libexec/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
-f_include $BSDCFG_LIBE/include/mustberoot.subr
-f_include $BSDCFG_LIBE/include/strings.subr
 f_include_lang $BSDCFG_LIBE/include/messages.subr
 
 ############################################################ FUNCTIONS

usr.sbin/bsdconfig/console/console

@@ -28,12 +28,12 @@
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_LIBE/include/mustberoot.subr
+f_include $BSDCFG_SHARE/mustberoot.subr
 
-APP_DIR="080.console"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="080.console"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )

usr.sbin/bsdconfig/console/font

@@ -28,13 +28,13 @@
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_LIBE/include/mustberoot.subr
+f_include $BSDCFG_SHARE/mustberoot.subr
-f_include $BSDCFG_LIBE/include/sysrc.subr
+f_include $BSDCFG_SHARE/sysrc.subr
 
-APP_DIR="080.console"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="080.console"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )

usr.sbin/bsdconfig/console/keymap

@@ -28,13 +28,13 @@
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_LIBE/include/mustberoot.subr
+f_include $BSDCFG_SHARE/mustberoot.subr
-f_include $BSDCFG_LIBE/include/sysrc.subr
+f_include $BSDCFG_SHARE/sysrc.subr
 
-APP_DIR="080.console"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="080.console"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )

usr.sbin/bsdconfig/console/repeat

@@ -28,13 +28,13 @@
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_LIBE/include/mustberoot.subr
+f_include $BSDCFG_SHARE/mustberoot.subr
-f_include $BSDCFG_LIBE/include/sysrc.subr
+f_include $BSDCFG_SHARE/sysrc.subr
 
-APP_DIR="080.console"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="080.console"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )

usr.sbin/bsdconfig/console/saver

@@ -28,13 +28,13 @@
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_LIBE/include/mustberoot.subr
+f_include $BSDCFG_SHARE/mustberoot.subr
-f_include $BSDCFG_LIBE/include/sysrc.subr
+f_include $BSDCFG_SHARE/sysrc.subr
 
-APP_DIR="080.console"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="080.console"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )

usr.sbin/bsdconfig/console/screenmap

@@ -28,13 +28,13 @@
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_LIBE/include/mustberoot.subr
+f_include $BSDCFG_SHARE/mustberoot.subr
-f_include $BSDCFG_LIBE/include/sysrc.subr
+f_include $BSDCFG_SHARE/sysrc.subr
 
-APP_DIR="080.console"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="080.console"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )

usr.sbin/bsdconfig/console/ttys

@@ -28,13 +28,13 @@
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_LIBE/include/mustberoot.subr
+f_include $BSDCFG_SHARE/mustberoot.subr
-f_include $BSDCFG_LIBE/include/sysrc.subr
+f_include $BSDCFG_SHARE/sysrc.subr
 
-APP_DIR="080.console"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="080.console"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )

usr.sbin/bsdconfig/diskmgmt/diskmgmt

@@ -28,12 +28,12 @@
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_LIBE/include/mustberoot.subr
+f_include $BSDCFG_SHARE/mustberoot.subr
 
-APP_DIR="050.diskmgmt"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="050.diskmgmt"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )

usr.sbin/bsdconfig/docsinstall/docsinstall

@@ -28,12 +28,12 @@
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_LIBE/include/mustberoot.subr
+f_include $BSDCFG_SHARE/mustberoot.subr
 
-APP_DIR="020.docsinstall"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="020.docsinstall"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )

usr.sbin/bsdconfig/dot/dot

@@ -28,11 +28,11 @@
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include_lang $BSDCFG_LIBE/include/messages.subr
 
-APP_DIR="dot"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="dot"
+f_include_lang $BSDCFG_LIBE/include/messages.subr
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )

usr.sbin/bsdconfig/include/Makefile

@@ -3,8 +3,7 @@
 NO_OBJ=
 
 FILESDIR=	${LIBEXECDIR}/bsdconfig/include
-FILES=		common.subr dialog.subr messages.subr mustberoot.subr \
+FILES=		messages.subr
-		strings.subr sysrc.subr
 
 beforeinstall:
 	mkdir -p ${DESTDIR}${FILESDIR}

usr.sbin/bsdconfig/mouse/disable

@@ -28,13 +28,13 @@
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_LIBE/include/mustberoot.subr
+f_include $BSDCFG_SHARE/mustberoot.subr
-f_include $BSDCFG_LIBE/include/sysrc.subr
+f_include $BSDCFG_SHARE/sysrc.subr
 
-APP_DIR="110.mouse"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="110.mouse"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )

usr.sbin/bsdconfig/mouse/enable

@@ -28,13 +28,13 @@
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_LIBE/include/mustberoot.subr
+f_include $BSDCFG_SHARE/mustberoot.subr
-f_include $BSDCFG_LIBE/include/sysrc.subr
+f_include $BSDCFG_SHARE/sysrc.subr
 
-APP_DIR="110.mouse"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="110.mouse"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )

usr.sbin/bsdconfig/mouse/flags

@@ -28,13 +28,13 @@
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_LIBE/include/mustberoot.subr
+f_include $BSDCFG_SHARE/mustberoot.subr
-f_include $BSDCFG_LIBE/include/sysrc.subr
+f_include $BSDCFG_SHARE/sysrc.subr
 
-APP_DIR="110.mouse"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="110.mouse"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )

usr.sbin/bsdconfig/mouse/mouse

@@ -28,12 +28,12 @@
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_LIBE/include/mustberoot.subr
+f_include $BSDCFG_SHARE/mustberoot.subr
 
-APP_DIR="110.mouse"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="110.mouse"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )

usr.sbin/bsdconfig/mouse/port

@@ -28,13 +28,13 @@
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_LIBE/include/mustberoot.subr
+f_include $BSDCFG_SHARE/mustberoot.subr
-f_include $BSDCFG_LIBE/include/sysrc.subr
+f_include $BSDCFG_SHARE/sysrc.subr
 
-APP_DIR="110.mouse"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="110.mouse"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )

usr.sbin/bsdconfig/mouse/type

@@ -28,13 +28,13 @@
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_LIBE/include/mustberoot.subr
+f_include $BSDCFG_SHARE/mustberoot.subr
-f_include $BSDCFG_LIBE/include/sysrc.subr
+f_include $BSDCFG_SHARE/sysrc.subr
 
-APP_DIR="110.mouse"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="110.mouse"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )

usr.sbin/bsdconfig/networking/Makefile

@@ -2,7 +2,7 @@
 
 NO_OBJ=
 
-SUBDIR= include
+SUBDIR= include share
 
 FILESDIR=	${LIBEXECDIR}/bsdconfig/120.networking
 FILES=		INDEX USAGE

usr.sbin/bsdconfig/networking/defaultrouter

@@ -28,13 +28,13 @@
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_LIBE/include/mustberoot.subr
+f_include $BSDCFG_SHARE/mustberoot.subr
+f_include $BSDCFG_SHARE/networking/routing.subr
 
-APP_DIR="120.networking"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="120.networking"
-f_include $BSDCFG_LIBE/$APP_DIR/include/routing.subr
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )

usr.sbin/bsdconfig/networking/devices

@@ -28,17 +28,17 @@
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_LIBE/include/mustberoot.subr
+f_include $BSDCFG_SHARE/mustberoot.subr
-f_include $BSDCFG_LIBE/include/sysrc.subr
+f_include $BSDCFG_SHARE/sysrc.subr
+f_include $BSDCFG_SHARE/networking/device.subr
+f_include $BSDCFG_SHARE/networking/ipaddr.subr
+f_include $BSDCFG_SHARE/networking/media.subr
+f_include $BSDCFG_SHARE/networking/netmask.subr
 
-APP_DIR="120.networking"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="120.networking"
-f_include $BSDCFG_LIBE/$APP_DIR/include/device.subr
-f_include $BSDCFG_LIBE/$APP_DIR/include/ipaddr.subr
-f_include $BSDCFG_LIBE/$APP_DIR/include/media.subr
-f_include $BSDCFG_LIBE/$APP_DIR/include/netmask.subr
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )

usr.sbin/bsdconfig/networking/hostname

@@ -28,13 +28,13 @@
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_LIBE/include/mustberoot.subr
+f_include $BSDCFG_SHARE/mustberoot.subr
+f_include $BSDCFG_SHARE/networking/hostname.subr
 
-APP_DIR="120.networking"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="120.networking"
-f_include $BSDCFG_LIBE/$APP_DIR/include/hostname.subr
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )

usr.sbin/bsdconfig/networking/include/Makefile

@@ -3,8 +3,7 @@
 NO_OBJ=
 
 FILESDIR=	${LIBEXECDIR}/bsdconfig/120.networking/include
-FILES=		common.subr device.subr hostname.subr ipaddr.subr media.subr \
+FILES=		messages.subr
-		messages.subr netmask.subr resolv.subr routing.subr
 
 beforeinstall:
 	mkdir -p ${DESTDIR}${FILESDIR}

usr.sbin/bsdconfig/networking/nameservers

@@ -28,13 +28,13 @@
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_LIBE/include/mustberoot.subr
+f_include $BSDCFG_SHARE/mustberoot.subr
+f_include $BSDCFG_SHARE/networking/resolv.subr
 
-APP_DIR="120.networking"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="120.networking"
-f_include $BSDCFG_LIBE/$APP_DIR/include/resolv.subr
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )

usr.sbin/bsdconfig/networking/networking

@@ -28,12 +28,12 @@
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_LIBE/include/mustberoot.subr
+f_include $BSDCFG_SHARE/mustberoot.subr
 
-APP_DIR="120.networking"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="120.networking"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
@@ -122,7 +122,7 @@ while :; do
 
 	   # Make subsequent uses of this menu faster by not performing
 	   # "ifconfig up" (limiting the pain one must endure). See also
-	   # `$BSDCFG_LIBE/$APP_DIR/include/device.subr'.
+	   # `$BSDCFG_SHARE/networking/device.subr'.
 	   #
 	   export DIALOG_MENU_NETDEV_KICK_INTERFACES=
 	   ;;

usr.sbin/bsdconfig/networking/share/Makefile

@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+NO_OBJ=
+
+FILESDIR=	${SHAREDIR}/bsdconfig/networking
+FILES=		common.subr device.subr hostname.subr ipaddr.subr media.subr \
+		netmask.subr resolv.subr routing.subr
+
+beforeinstall:
+	mkdir -p ${DESTDIR}${FILESDIR}
+
+.include <bsd.prog.mk>

usr.sbin/bsdconfig/networking/share/common.subr

@@ -28,8 +28,8 @@ if [ ! "$_NETWORKING_COMMON_SUBR" ]; then _NETWORKING_COMMON_SUBR=1
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
 
 ############################################################ FUNCTIONS
 

usr.sbin/bsdconfig/networking/share/device.subr

@@ -28,18 +28,18 @@ if [ ! "$_NETWORKING_DEVICE_SUBR" ]; then _NETWORKING_DEVICE_SUBR=1
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_LIBE/include/sysrc.subr
+f_include $BSDCFG_SHARE/sysrc.subr
+f_include $BSDCFG_SHARE/networking/common.subr
+f_include $BSDCFG_SHARE/networking/ipaddr.subr
+f_include $BSDCFG_SHARE/networking/media.subr
+f_include $BSDCFG_SHARE/networking/netmask.subr
+f_include $BSDCFG_SHARE/networking/resolv.subr
+f_include $BSDCFG_SHARE/networking/routing.subr
 
-APP_DIR="120.networking"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="120.networking"
-f_include $BSDCFG_LIBE/$APP_DIR/include/common.subr
-f_include $BSDCFG_LIBE/$APP_DIR/include/ipaddr.subr
-f_include $BSDCFG_LIBE/$APP_DIR/include/media.subr
-f_include $BSDCFG_LIBE/$APP_DIR/include/netmask.subr
-f_include $BSDCFG_LIBE/$APP_DIR/include/resolv.subr
-f_include $BSDCFG_LIBE/$APP_DIR/include/routing.subr
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ############################################################ GLOBALS

usr.sbin/bsdconfig/networking/share/hostname.subr

@@ -28,14 +28,14 @@ if [ ! "$_NETWORKING_HOSTNAME_SUBR" ]; then _NETWORKING_HOSTNAME_SUBR=1
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/sysrc.subr
+f_include $BSDCFG_SHARE/sysrc.subr
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
+f_include $BSDCFG_SHARE/networking/common.subr
+f_include $BSDCFG_SHARE/networking/resolv.subr
 
-APP_DIR="120.networking"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="120.networking"
-f_include $BSDCFG_LIBE/$APP_DIR/include/common.subr
-f_include $BSDCFG_LIBE/$APP_DIR/include/resolv.subr
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ############################################################ FUNCTIONS

usr.sbin/bsdconfig/networking/share/ipaddr.subr

@@ -28,14 +28,14 @@ if [ ! "$_NETWORKING_IPADDR_SUBR" ]; then _NETWORKING_IPADDR_SUBR=1
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/sysrc.subr
+f_include $BSDCFG_SHARE/sysrc.subr
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_LIBE/include/strings.subr
+f_include $BSDCFG_SHARE/strings.subr
+f_include $BSDCFG_SHARE/networking/common.subr
 
-APP_DIR="120.networking"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="120.networking"
-f_include $BSDCFG_LIBE/$APP_DIR/include/common.subr
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ############################################################ FUNCTIONS

usr.sbin/bsdconfig/networking/share/media.subr

@@ -28,14 +28,14 @@ if [ ! "$_NETWORKING_MEDIA_SUBR" ]; then _NETWORKING_MEDIA_SUBR=1
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_LIBE/include/strings.subr
+f_include $BSDCFG_SHARE/strings.subr
-f_include $BSDCFG_LIBE/include/sysrc.subr
+f_include $BSDCFG_SHARE/sysrc.subr
+f_include $BSDCFG_SHARE/networking/common.subr
 
-APP_DIR="120.networking"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="120.networking"
-f_include $BSDCFG_LIBE/$APP_DIR/include/common.subr
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ############################################################ FUNCTIONS

usr.sbin/bsdconfig/networking/share/netmask.subr

@@ -28,13 +28,13 @@ if [ ! "$_NETWORKING_NETMASK_SUBR" ]; then _NETWORKING_NETMASK_SUBR=1
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_LIBE/include/strings.subr
+f_include $BSDCFG_SHARE/strings.subr
+f_include $BSDCFG_SHARE/networking/common.subr
 
-APP_DIR="120.networking"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="120.networking"
-f_include $BSDCFG_LIBE/$APP_DIR/include/common.subr
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ############################################################ FUNCTIONS

usr.sbin/bsdconfig/networking/share/resolv.subr

@@ -28,14 +28,14 @@ if [ ! "$_NETWORKING_RESOLV_SUBR" ]; then _NETWORKING_RESOLV_SUBR=1
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_LIBE/include/strings.subr
+f_include $BSDCFG_SHARE/strings.subr
+f_include $BSDCFG_SHARE/networking/common.subr
+f_include $BSDCFG_SHARE/networking/ipaddr.subr
 
-APP_DIR="120.networking"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="120.networking"
-f_include $BSDCFG_LIBE/$APP_DIR/include/common.subr
-f_include $BSDCFG_LIBE/$APP_DIR/include/ipaddr.subr
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ############################################################ CONFIGURATION

usr.sbin/bsdconfig/networking/share/routing.subr

@@ -28,14 +28,14 @@ if [ ! "$_NETWORKING_ROUTING_SUBR" ]; then _NETWORKING_ROUTING_SUBR=1
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/sysrc.subr
+f_include $BSDCFG_SHARE/sysrc.subr
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
+f_include $BSDCFG_SHARE/networking/common.subr
+f_include $BSDCFG_SHARE/networking/ipaddr.subr
 
-APP_DIR="120.networking"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="120.networking"
-f_include $BSDCFG_LIBE/$APP_DIR/include/common.subr
-f_include $BSDCFG_LIBE/$APP_DIR/include/ipaddr.subr
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ############################################################ FUNCTIONS

usr.sbin/bsdconfig/password/Makefile

@@ -2,7 +2,7 @@
 
 NO_OBJ=
 
-SUBDIR= include
+SUBDIR= include share
 
 FILESDIR=	${LIBEXECDIR}/bsdconfig/040.password
 FILES=		INDEX USAGE

usr.sbin/bsdconfig/password/include/Makefile

@@ -3,7 +3,7 @@
 NO_OBJ=
 
 FILESDIR=	${LIBEXECDIR}/bsdconfig/040.password/include
-FILES=		messages.subr password.subr
+FILES=		messages.subr
 
 beforeinstall:
 	mkdir -p ${DESTDIR}${FILESDIR}

usr.sbin/bsdconfig/password/password

@@ -28,13 +28,13 @@
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_LIBE/include/mustberoot.subr
+f_include $BSDCFG_SHARE/mustberoot.subr
+f_include $BSDCFG_SHARE/password/password.subr
 
-APP_DIR="040.password"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="040.password"
-f_include $BSDCFG_LIBE/$APP_DIR/include/password.subr
 
 ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
 [ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"

usr.sbin/bsdconfig/password/share/Makefile

@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+NO_OBJ=
+
+FILESDIR=	${SHAREDIR}/bsdconfig/password
+FILES=		password.subr
+
+beforeinstall:
+	mkdir -p ${DESTDIR}${FILESDIR}
+
+.include <bsd.prog.mk>

usr.sbin/bsdconfig/password/share/password.subr

@@ -28,11 +28,11 @@ if [ ! "$_PASSWORD_PASSWORD_SUBR" ]; then _PASSWORD_PASSWORD_SUBR=1
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
 
-APP_DIR="040.password"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="040.password"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ############################################################ FUNCTIONS

usr.sbin/bsdconfig/security/kern_securelevel

@@ -28,13 +28,13 @@
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_LIBE/include/mustberoot.subr
+f_include $BSDCFG_SHARE/mustberoot.subr
-f_include $BSDCFG_LIBE/include/sysrc.subr
+f_include $BSDCFG_SHARE/sysrc.subr
 
-APP_DIR="130.security"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="130.security"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )

usr.sbin/bsdconfig/security/security

@@ -28,13 +28,13 @@
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_LIBE/include/mustberoot.subr
+f_include $BSDCFG_SHARE/mustberoot.subr
-f_include $BSDCFG_LIBE/include/sysrc.subr
+f_include $BSDCFG_SHARE/sysrc.subr
 
-APP_DIR="130.security"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="130.security"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )

usr.sbin/bsdconfig/share/Makefile

@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+NO_OBJ=
+
+FILESDIR=	${SHAREDIR}/bsdconfig
+FILES=		common.subr dialog.subr mustberoot.subr strings.subr sysrc.subr
+
+beforeinstall:
+	mkdir -p ${DESTDIR}${FILESDIR}
+
+.include <bsd.prog.mk>

usr.sbin/bsdconfig/share/dialog.subr

@@ -28,9 +28,11 @@ if [ ! "$_DIALOG_SUBR" ]; then _DIALOG_SUBR=1
 #
 ############################################################ INCLUDES
 
+BSDCFG_SHARE="/usr/share/bsdconfig"
+. $BSDCFG_SHARE/common.subr || exit 1
+f_include $BSDCFG_SHARE/strings.subr
+
 BSDCFG_LIBE="/usr/libexec/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/strings.subr
 f_include_lang $BSDCFG_LIBE/include/messages.subr
 
 ############################################################ CONFIGURATION

usr.sbin/bsdconfig/share/mustberoot.subr

@@ -28,9 +28,11 @@ if [ ! "$_MUSTBEROOT_SUBR" ]; then _MUSTBEROOT_SUBR=1
 #
 ############################################################ INCLUDES
 
+BSDCFG_SHARE="/usr/share/bsdconfig"
+. $BSDCFG_SHARE/common.subr || exit 1
+f_include $BSDCFG_SHARE/dialog.subr
+
 BSDCFG_LIBE="/usr/libexec/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
 f_include_lang $BSDCFG_LIBE/include/messages.subr
 
 ############################################################ CONFIGURATION

usr.sbin/bsdconfig/share/sysrc.subr

@@ -28,8 +28,10 @@ if [ ! "$_SYSRC_SUBR" ]; then _SYSRC_SUBR=1
 #
 ############################################################ INCLUDES
 
+BSDCFG_SHARE="/usr/share/bsdconfig"
+. $BSDCFG_SHARE/common.subr || exit 1
+
 BSDCFG_LIBE="/usr/libexec/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
 f_include_lang $BSDCFG_LIBE/include/messages.subr
 
 ############################################################ CONFIGURATION

usr.sbin/bsdconfig/startup/Makefile

@@ -2,7 +2,7 @@
 
 NO_OBJ=
 
-SUBDIR= include
+SUBDIR= include share
 
 FILESDIR=	${LIBEXECDIR}/bsdconfig/140.startup
 FILES=		INDEX USAGE

usr.sbin/bsdconfig/startup/include/Makefile

@@ -3,7 +3,7 @@
 NO_OBJ=
 
 FILESDIR=	${LIBEXECDIR}/bsdconfig/140.startup/include
-FILES=		messages.subr rcconf.subr rcedit.subr rcvar.subr
+FILES=		messages.subr
 
 beforeinstall:
 	mkdir -p ${DESTDIR}${FILESDIR}

usr.sbin/bsdconfig/startup/misc

@@ -28,13 +28,13 @@
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_LIBE/include/mustberoot.subr
+f_include $BSDCFG_SHARE/mustberoot.subr
-f_include $BSDCFG_LIBE/include/sysrc.subr
+f_include $BSDCFG_SHARE/sysrc.subr
 
-APP_DIR="140.startup"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="140.startup"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )

usr.sbin/bsdconfig/startup/rcadd

@@ -28,13 +28,13 @@
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_LIBE/include/mustberoot.subr
+f_include $BSDCFG_SHARE/mustberoot.subr
+f_include $BSDCFG_SHARE/startup/rcconf.subr
 
-APP_DIR="140.startup"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="140.startup"
-f_include $BSDCFG_LIBE/$APP_DIR/include/rcconf.subr
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )

usr.sbin/bsdconfig/startup/rcconf

@@ -28,14 +28,14 @@
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_LIBE/include/mustberoot.subr
+f_include $BSDCFG_SHARE/mustberoot.subr
-f_include $BSDCFG_LIBE/include/sysrc.subr
+f_include $BSDCFG_SHARE/sysrc.subr
+f_include $BSDCFG_SHARE/startup/rcconf.subr
 
-APP_DIR="140.startup"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="140.startup"
-f_include $BSDCFG_LIBE/$APP_DIR/include/rcconf.subr
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )

usr.sbin/bsdconfig/startup/rcdelete

@@ -28,14 +28,14 @@
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_LIBE/include/mustberoot.subr
+f_include $BSDCFG_SHARE/mustberoot.subr
-f_include $BSDCFG_LIBE/include/sysrc.subr
+f_include $BSDCFG_SHARE/sysrc.subr
+f_include $BSDCFG_SHARE/startup/rcconf.subr
 
-APP_DIR="140.startup"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="140.startup"
-f_include $BSDCFG_LIBE/$APP_DIR/include/rcconf.subr
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )

usr.sbin/bsdconfig/startup/rcedit

@@ -28,13 +28,13 @@
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_LIBE/include/mustberoot.subr
+f_include $BSDCFG_SHARE/mustberoot.subr
+f_include $BSDCFG_SHARE/startup/rcedit.subr
 
-APP_DIR="140.startup"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="140.startup"
-f_include $BSDCFG_LIBE/$APP_DIR/include/rcedit.subr
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )

usr.sbin/bsdconfig/startup/rcvar

@@ -28,14 +28,14 @@
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_LIBE/include/mustberoot.subr
+f_include $BSDCFG_SHARE/mustberoot.subr
-f_include $BSDCFG_LIBE/include/sysrc.subr
+f_include $BSDCFG_SHARE/sysrc.subr
+f_include $BSDCFG_SHARE/startup/rcvar.subr
 
-APP_DIR="140.startup"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="140.startup"
-f_include $BSDCFG_LIBE/$APP_DIR/include/rcvar.subr
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )

usr.sbin/bsdconfig/startup/share/Makefile

@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+NO_OBJ=
+
+FILESDIR=	${SHAREDIR}/bsdconfig/startup
+FILES=		rcconf.subr rcedit.subr rcvar.subr
+
+beforeinstall:
+	mkdir -p ${DESTDIR}${FILESDIR}
+
+.include <bsd.prog.mk>

usr.sbin/bsdconfig/startup/share/rcconf.subr

@@ -28,11 +28,11 @@ if [ ! "$_STARTUP_RCCONF_SUBR" ]; then _STARTUP_RCCONF_SUBR=1
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/sysrc.subr
+f_include $BSDCFG_SHARE/sysrc.subr
 
-APP_DIR="140.startup"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="140.startup"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ############################################################ GLOBALS

usr.sbin/bsdconfig/startup/share/rcedit.subr

@@ -28,12 +28,12 @@ if [ ! "$_STARTUP_RCEDIT_SUBR" ]; then _STARTUP_RCEDIT_SUBR=1
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_LIBE/include/sysrc.subr
+f_include $BSDCFG_SHARE/sysrc.subr
 
-APP_DIR="140.startup"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="140.startup"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ############################################################ FUNCTIONS

usr.sbin/bsdconfig/startup/share/rcvar.subr

@@ -28,9 +28,9 @@ if [ ! "$_STARTUP_RCVAR_SUBR" ]; then _STARTUP_RCVAR_SUBR=1
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/sysrc.subr
+f_include $BSDCFG_SHARE/sysrc.subr
 
 ############################################################ CONFIGURATION
 

usr.sbin/bsdconfig/startup/startup

@@ -28,12 +28,12 @@
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_LIBE/include/mustberoot.subr
+f_include $BSDCFG_SHARE/mustberoot.subr
 
-APP_DIR="140.startup"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="140.startup"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )

usr.sbin/bsdconfig/timezone/Makefile

@@ -2,7 +2,7 @@
 
 NO_OBJ=
 
-SUBDIR= include
+SUBDIR= include share
 
 FILESDIR=	${LIBEXECDIR}/bsdconfig/090.timezone
 FILES=		INDEX USAGE

usr.sbin/bsdconfig/timezone/include/Makefile

@@ -3,8 +3,7 @@
 NO_OBJ=
 
 FILESDIR=	${LIBEXECDIR}/bsdconfig/090.timezone/include
-FILES=		continents.subr countries.subr iso3166.subr menus.subr \
+FILES=		messages.subr
-		messages.subr zones.subr
 
 beforeinstall:
 	mkdir -p ${DESTDIR}${FILESDIR}

usr.sbin/bsdconfig/timezone/share/Makefile

@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+NO_OBJ=
+
+FILESDIR=	${SHAREDIR}/bsdconfig/timezone
+FILES=		continents.subr countries.subr iso3166.subr menus.subr \
+		zones.subr
+
+beforeinstall:
+	mkdir -p ${DESTDIR}${FILESDIR}
+
+.include <bsd.prog.mk>

usr.sbin/bsdconfig/timezone/share/continents.subr

@@ -28,10 +28,10 @@ if [ ! "$_TIMEZONE_CONTINENTS_SUBR" ]; then _TIMEZONE_CONTINENTS_SUBR=1
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
 
-APP_DIR="090.timezone"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="090.timezone"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ############################################################ CONFIGURATION

usr.sbin/bsdconfig/timezone/share/iso3166.subr

@@ -28,10 +28,10 @@ if [ ! "$_TIMEZONE_ISO3166_SUBR" ]; then _TIMEZONE_ISO3166_SUBR=1
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
 
-APP_DIR="090.timezone"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="090.timezone"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ############################################################ CONFIGURATION

usr.sbin/bsdconfig/timezone/share/menus.subr

@@ -28,9 +28,9 @@ if [ ! "$_TIMEZONE_MENUS_SUBR" ]; then _TIMEZONE_MENUS_SUBR=1
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
 
 ############################################################ GLOBALS
 

usr.sbin/bsdconfig/timezone/share/zones.subr

@@ -28,12 +28,12 @@ if [ ! "$_TIMEZONE_ZONES_SUBR" ]; then _TIMEZONE_ZONES_SUBR=1
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
+f_include $BSDCFG_SHARE/timezone/continents.subr
 
-APP_DIR="090.timezone"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="090.timezone"
-f_include $BSDCFG_LIBE/$APP_DIR/include/continents.subr
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ############################################################ CONFIGURATION

usr.sbin/bsdconfig/timezone/timezone

@@ -28,18 +28,18 @@
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_LIBE/include/mustberoot.subr
+f_include $BSDCFG_SHARE/mustberoot.subr
-f_include $BSDCFG_LIBE/include/strings.subr
+f_include $BSDCFG_SHARE/strings.subr
+f_include $BSDCFG_SHARE/timezone/continents.subr
+f_include $BSDCFG_SHARE/timezone/countries.subr
+f_include $BSDCFG_SHARE/timezone/iso3166.subr
+f_include $BSDCFG_SHARE/timezone/menus.subr
+f_include $BSDCFG_SHARE/timezone/zones.subr
 
-APP_DIR="090.timezone"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="090.timezone"
-f_include $BSDCFG_LIBE/$APP_DIR/include/continents.subr
-f_include $BSDCFG_LIBE/$APP_DIR/include/countries.subr
-f_include $BSDCFG_LIBE/$APP_DIR/include/iso3166.subr
-f_include $BSDCFG_LIBE/$APP_DIR/include/menus.subr
-f_include $BSDCFG_LIBE/$APP_DIR/include/zones.subr
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )

usr.sbin/bsdconfig/ttys/ttys

@@ -28,12 +28,12 @@
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_LIBE/include/mustberoot.subr
+f_include $BSDCFG_SHARE/mustberoot.subr
 
-APP_DIR="150.ttys"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="150.ttys"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )

usr.sbin/bsdconfig/usermgmt/Makefile

@@ -2,7 +2,7 @@
 
 NO_OBJ=
 
-SUBDIR= include
+SUBDIR= include share
 
 FILESDIR=	${LIBEXECDIR}/bsdconfig/070.usermgmt
 FILES=		INDEX USAGE

usr.sbin/bsdconfig/usermgmt/groupadd

@@ -29,11 +29,11 @@
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
 
-APP_DIR="070.usermgmt"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="070.usermgmt"
 
 ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
 [ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"

usr.sbin/bsdconfig/usermgmt/groupdel

@@ -29,13 +29,13 @@
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_LIBE/include/mustberoot.subr
+f_include $BSDCFG_SHARE/mustberoot.subr
+f_include $BSDCFG_SHARE/usermgmt/group_input.subr
 
-APP_DIR="070.usermgmt"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="070.usermgmt"
-f_include $BSDCFG_LIBE/$APP_DIR/include/group_input.subr
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )

usr.sbin/bsdconfig/usermgmt/groupedit

@@ -29,13 +29,13 @@
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_LIBE/include/mustberoot.subr
+f_include $BSDCFG_SHARE/mustberoot.subr
+f_include $BSDCFG_SHARE/usermgmt/group_input.subr
 
-APP_DIR="070.usermgmt"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="070.usermgmt"
-f_include $BSDCFG_LIBE/$APP_DIR/include/group_input.subr
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )

usr.sbin/bsdconfig/usermgmt/groupinput

@@ -29,13 +29,13 @@
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_LIBE/include/mustberoot.subr
+f_include $BSDCFG_SHARE/mustberoot.subr
+f_include $BSDCFG_SHARE/usermgmt/group_input.subr
 
-APP_DIR="070.usermgmt"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="070.usermgmt"
-f_include $BSDCFG_LIBE/$APP_DIR/include/group_input.subr
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )

usr.sbin/bsdconfig/usermgmt/include/Makefile

@@ -3,7 +3,7 @@
 NO_OBJ=
 
 FILESDIR=	${LIBEXECDIR}/bsdconfig/070.usermgmt/include
-FILES=		group_input.subr messages.subr user_input.subr
+FILES=		messages.subr
 
 beforeinstall:
 	mkdir -p ${DESTDIR}${FILESDIR}

usr.sbin/bsdconfig/usermgmt/share/Makefile

@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+NO_OBJ=
+
+FILESDIR=	${SHAREDIR}/bsdconfig/usermgmt
+FILES=		group_input.subr user_input.subr
+
+beforeinstall:
+	mkdir -p ${DESTDIR}${FILESDIR}
+
+.include <bsd.prog.mk>

usr.sbin/bsdconfig/usermgmt/share/group_input.subr

@@ -29,13 +29,13 @@ if [ ! "$_USERMGMT_GROUP_INPUT_SUBR" ]; then _USERMGMT_GROUP_INPUT_SUBR=1
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_LIBE/include/strings.subr
+f_include $BSDCFG_SHARE/strings.subr
-f_include_lang $BSDCFG_LIBE/include/messages.subr
 
-APP_DIR="070.usermgmt"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="070.usermgmt"
+f_include_lang $BSDCFG_LIBE/include/messages.subr
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ############################################################ FUNCTIONS

usr.sbin/bsdconfig/usermgmt/share/user_input.subr

@@ -29,13 +29,13 @@ if [ ! "$_USERMGMT_USER_INPUT_SUBR" ]; then _USERMGMT_USER_INPUT_SUBR=1
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_LIBE/include/strings.subr
+f_include $BSDCFG_SHARE/strings.subr
-f_include_lang $BSDCFG_LIBE/include/messages.subr
 
-APP_DIR="070.usermgmt"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="070.usermgmt"
+f_include_lang $BSDCFG_LIBE/include/messages.subr
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ############################################################ CONFIGURATION

usr.sbin/bsdconfig/usermgmt/useradd

@@ -29,11 +29,11 @@
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
 
-APP_DIR="070.usermgmt"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="070.usermgmt"
 
 ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
 [ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"

usr.sbin/bsdconfig/usermgmt/userdel

@@ -29,13 +29,13 @@
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_LIBE/include/mustberoot.subr
+f_include $BSDCFG_SHARE/mustberoot.subr
+f_include $BSDCFG_SHARE/usermgmt/user_input.subr
 
-APP_DIR="070.usermgmt"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="070.usermgmt"
-f_include $BSDCFG_LIBE/$APP_DIR/include/user_input.subr
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )

usr.sbin/bsdconfig/usermgmt/useredit

@@ -29,13 +29,13 @@
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_LIBE/include/mustberoot.subr
+f_include $BSDCFG_SHARE/mustberoot.subr
+f_include $BSDCFG_SHARE/usermgmt/user_input.subr
 
-APP_DIR="070.usermgmt"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="070.usermgmt"
-f_include $BSDCFG_LIBE/$APP_DIR/include/user_input.subr
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )

usr.sbin/bsdconfig/usermgmt/userinput

@@ -29,13 +29,13 @@
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_LIBE/include/mustberoot.subr
+f_include $BSDCFG_SHARE/mustberoot.subr
+f_include $BSDCFG_SHARE/usermgmt/user_input.subr
 
-APP_DIR="070.usermgmt"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="070.usermgmt"
-f_include $BSDCFG_LIBE/$APP_DIR/include/user_input.subr
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )

usr.sbin/bsdconfig/usermgmt/usermgmt

@@ -29,12 +29,12 @@
 #
 ############################################################ INCLUDES
 
-BSDCFG_LIBE="/usr/libexec/bsdconfig"
+BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_LIBE/include/common.subr || exit 1
+. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_LIBE/include/dialog.subr
+f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_LIBE/include/mustberoot.subr
+f_include $BSDCFG_SHARE/mustberoot.subr
 
-APP_DIR="070.usermgmt"
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="070.usermgmt"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 ipgm=$( f_index_menu_selection $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )