3 files changed, 81 insertions, 76 deletions

diff --git a/sysutils/bsdconfig/Makefile b/sysutils/bsdconfig/Makefile
index eab9ef26bb51..737fcbf2e6d3 100644
--- a/sysutils/bsdconfig/Makefile
+++ b/sysutils/bsdconfig/Makefile
@@ -1,15 +1,11 @@
-# New ports collection makefile for:	bsdconfig
-# Date created:				19 June 2012
-# Whom:					Devin Teske <dteske@FreeBSD.org>
-#
+# Created by: Devin Teske <dteske@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	bsdconfig
-PORTVERSION=	0.7.3
+PORTVERSION=	0.8.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://druidbsd.sourceforge.net/download/bsdconfig/
-DISTNAME=	${PORTNAME}.120626
+DISTNAME=	${PORTNAME}.130506
 EXTRACT_SUFX=	.txz
 
 PATCH_SITES=	${MASTER_SITES}
@@ -23,6 +19,7 @@ LICENSE=	BSD
 NO_WRKSUBDIR=	yes
 
 BSDCFG_LIBE=	libexec/${PORTNAME}
+BSDCFG_SHARE=	share/${PORTNAME}
 
 # Default man(1) section path-prefix
 MANDIR?=	${MANPREFIX}/man/man
@@ -33,117 +30,74 @@ PLIST_FILES=	\
 	sbin/${PORTNAME}                                                     \
 	share/examples/${PORTNAME}/bsdconfigrc                               \
 	${BSDCFG_LIBE}/020.docsinstall/INDEX                                 \
-	${BSDCFG_LIBE}/020.docsinstall/INDEX.EN_US.ISO8859-1                 \
 	${BSDCFG_LIBE}/020.docsinstall/USAGE                                 \
-	${BSDCFG_LIBE}/020.docsinstall/USAGE.EN_US.ISO8859-1                 \
 	${BSDCFG_LIBE}/020.docsinstall/docsinstall                           \
 	${BSDCFG_LIBE}/020.docsinstall/include/messages.subr                 \
-	${BSDCFG_LIBE}/020.docsinstall/include/messages.subr.EN_US.ISO8859-1 \
+	${BSDCFG_LIBE}/030.packages/INDEX                                    \
+	${BSDCFG_LIBE}/030.packages/USAGE                                    \
+	${BSDCFG_LIBE}/030.packages/include/messages.subr                    \
+	${BSDCFG_LIBE}/030.packages/packages                                 \
 	${BSDCFG_LIBE}/040.password/INDEX                                    \
-	${BSDCFG_LIBE}/040.password/INDEX.EN_US.ISO8859-1                    \
 	${BSDCFG_LIBE}/040.password/USAGE                                    \
-	${BSDCFG_LIBE}/040.password/USAGE.EN_US.ISO8859-1                    \
 	${BSDCFG_LIBE}/040.password/include/messages.subr                    \
-	${BSDCFG_LIBE}/040.password/include/messages.subr.EN_US.ISO8859-1    \
-	${BSDCFG_LIBE}/040.password/include/password.subr                    \
 	${BSDCFG_LIBE}/040.password/password                                 \
 	${BSDCFG_LIBE}/050.diskmgmt/INDEX                                    \
-	${BSDCFG_LIBE}/050.diskmgmt/INDEX.EN_US.ISO8859-1                    \
 	${BSDCFG_LIBE}/050.diskmgmt/USAGE                                    \
-	${BSDCFG_LIBE}/050.diskmgmt/USAGE.EN_US.ISO8859-1                    \
 	${BSDCFG_LIBE}/050.diskmgmt/diskmgmt                                 \
 	${BSDCFG_LIBE}/050.diskmgmt/include/messages.subr                    \
-	${BSDCFG_LIBE}/050.diskmgmt/include/messages.subr.EN_US.ISO8859-1    \
 	${BSDCFG_LIBE}/070.usermgmt/INDEX                                    \
-	${BSDCFG_LIBE}/070.usermgmt/INDEX.EN_US.ISO8859-1                    \
 	${BSDCFG_LIBE}/070.usermgmt/USAGE                                    \
-	${BSDCFG_LIBE}/070.usermgmt/USAGE.EN_US.ISO8859-1                    \
 	${BSDCFG_LIBE}/070.usermgmt/groupadd                                 \
 	${BSDCFG_LIBE}/070.usermgmt/groupdel                                 \
 	${BSDCFG_LIBE}/070.usermgmt/groupedit                                \
 	${BSDCFG_LIBE}/070.usermgmt/groupinput                               \
-	${BSDCFG_LIBE}/070.usermgmt/include/group_input.subr                 \
 	${BSDCFG_LIBE}/070.usermgmt/include/messages.subr                    \
-	${BSDCFG_LIBE}/070.usermgmt/include/messages.subr.EN_US.ISO8859-1    \
-	${BSDCFG_LIBE}/070.usermgmt/include/user_input.subr                  \
+	${BSDCFG_LIBE}/070.usermgmt/include/usermgmt.hlp                     \
 	${BSDCFG_LIBE}/070.usermgmt/useradd                                  \
 	${BSDCFG_LIBE}/070.usermgmt/userdel                                  \
 	${BSDCFG_LIBE}/070.usermgmt/useredit                                 \
 	${BSDCFG_LIBE}/070.usermgmt/userinput                                \
 	${BSDCFG_LIBE}/070.usermgmt/usermgmt                                 \
 	${BSDCFG_LIBE}/080.console/INDEX                                     \
-	${BSDCFG_LIBE}/080.console/INDEX.EN_US.ISO8859-1                     \
 	${BSDCFG_LIBE}/080.console/USAGE                                     \
-	${BSDCFG_LIBE}/080.console/USAGE.EN_US.ISO8859-1                     \
 	${BSDCFG_LIBE}/080.console/console                                   \
 	${BSDCFG_LIBE}/080.console/font                                      \
 	${BSDCFG_LIBE}/080.console/include/messages.subr                     \
-	${BSDCFG_LIBE}/080.console/include/messages.subr.EN_US.ISO8859-1     \
 	${BSDCFG_LIBE}/080.console/keymap                                    \
 	${BSDCFG_LIBE}/080.console/repeat                                    \
 	${BSDCFG_LIBE}/080.console/saver                                     \
 	${BSDCFG_LIBE}/080.console/screenmap                                 \
 	${BSDCFG_LIBE}/080.console/ttys                                      \
 	${BSDCFG_LIBE}/090.timezone/INDEX                                    \
-	${BSDCFG_LIBE}/090.timezone/INDEX.EN_US.ISO8859-1                    \
 	${BSDCFG_LIBE}/090.timezone/USAGE                                    \
-	${BSDCFG_LIBE}/090.timezone/USAGE.EN_US.ISO8859-1                    \
-	${BSDCFG_LIBE}/090.timezone/include/continents.subr                  \
-	${BSDCFG_LIBE}/090.timezone/include/countries.subr                   \
-	${BSDCFG_LIBE}/090.timezone/include/iso3166.subr                     \
-	${BSDCFG_LIBE}/090.timezone/include/menus.subr                       \
 	${BSDCFG_LIBE}/090.timezone/include/messages.subr                    \
-	${BSDCFG_LIBE}/090.timezone/include/messages.subr.EN_US.ISO8859-1    \
-	${BSDCFG_LIBE}/090.timezone/include/zones.subr                       \
 	${BSDCFG_LIBE}/090.timezone/timezone                                 \
 	${BSDCFG_LIBE}/110.mouse/INDEX                                       \
-	${BSDCFG_LIBE}/110.mouse/INDEX.EN_US.ISO8859-1                       \
 	${BSDCFG_LIBE}/110.mouse/USAGE                                       \
-	${BSDCFG_LIBE}/110.mouse/USAGE.EN_US.ISO8859-1                       \
 	${BSDCFG_LIBE}/110.mouse/disable                                     \
 	${BSDCFG_LIBE}/110.mouse/enable                                      \
 	${BSDCFG_LIBE}/110.mouse/flags                                       \
 	${BSDCFG_LIBE}/110.mouse/include/messages.subr                       \
-	${BSDCFG_LIBE}/110.mouse/include/messages.subr.EN_US.ISO8859-1       \
 	${BSDCFG_LIBE}/110.mouse/mouse                                       \
 	${BSDCFG_LIBE}/110.mouse/port                                        \
 	${BSDCFG_LIBE}/110.mouse/type                                        \
 	${BSDCFG_LIBE}/120.networking/INDEX                                  \
-	${BSDCFG_LIBE}/120.networking/INDEX.EN_US.ISO8859-1                  \
 	${BSDCFG_LIBE}/120.networking/USAGE                                  \
-	${BSDCFG_LIBE}/120.networking/USAGE.EN_US.ISO8859-1                  \
 	${BSDCFG_LIBE}/120.networking/defaultrouter                          \
 	${BSDCFG_LIBE}/120.networking/devices                                \
 	${BSDCFG_LIBE}/120.networking/hostname                               \
-	${BSDCFG_LIBE}/120.networking/include/common.subr                    \
-	${BSDCFG_LIBE}/120.networking/include/device.subr                    \
-	${BSDCFG_LIBE}/120.networking/include/hostname.subr                  \
-	${BSDCFG_LIBE}/120.networking/include/ipaddr.subr                    \
-	${BSDCFG_LIBE}/120.networking/include/media.subr                     \
 	${BSDCFG_LIBE}/120.networking/include/messages.subr                  \
-	${BSDCFG_LIBE}/120.networking/include/messages.subr.EN_US.ISO8859-1  \
-	${BSDCFG_LIBE}/120.networking/include/netmask.subr                   \
-	${BSDCFG_LIBE}/120.networking/include/resolv.subr                    \
-	${BSDCFG_LIBE}/120.networking/include/routing.subr                   \
 	${BSDCFG_LIBE}/120.networking/nameservers                            \
 	${BSDCFG_LIBE}/120.networking/networking                             \
 	${BSDCFG_LIBE}/130.security/INDEX                                    \
-	${BSDCFG_LIBE}/130.security/INDEX.EN_US.ISO8859-1                    \
 	${BSDCFG_LIBE}/130.security/USAGE                                    \
-	${BSDCFG_LIBE}/130.security/USAGE.EN_US.ISO8859-1                    \
 	${BSDCFG_LIBE}/130.security/include/messages.subr                    \
-	${BSDCFG_LIBE}/130.security/include/messages.subr.EN_US.ISO8859-1    \
+	${BSDCFG_LIBE}/130.security/include/securelevel.hlp                  \
 	${BSDCFG_LIBE}/130.security/kern_securelevel                         \
 	${BSDCFG_LIBE}/130.security/security                                 \
 	${BSDCFG_LIBE}/140.startup/INDEX                                     \
-	${BSDCFG_LIBE}/140.startup/INDEX.EN_US.ISO8859-1                     \
 	${BSDCFG_LIBE}/140.startup/USAGE                                     \
-	${BSDCFG_LIBE}/140.startup/USAGE.EN_US.ISO8859-1                     \
 	${BSDCFG_LIBE}/140.startup/include/messages.subr                     \
-	${BSDCFG_LIBE}/140.startup/include/messages.subr.EN_US.ISO8859-1     \
-	${BSDCFG_LIBE}/140.startup/include/rcconf.subr                       \
-	${BSDCFG_LIBE}/140.startup/include/rcedit.subr                       \
-	${BSDCFG_LIBE}/140.startup/include/rcvar.subr                        \
 	${BSDCFG_LIBE}/140.startup/misc                                      \
 	${BSDCFG_LIBE}/140.startup/rcadd                                     \
 	${BSDCFG_LIBE}/140.startup/rcconf                                    \
@@ -152,31 +106,71 @@ PLIST_FILES=	\
 	${BSDCFG_LIBE}/140.startup/rcvar                                     \
 	${BSDCFG_LIBE}/140.startup/startup                                   \
 	${BSDCFG_LIBE}/150.ttys/INDEX                                        \
-	${BSDCFG_LIBE}/150.ttys/INDEX.EN_US.ISO8859-1                        \
 	${BSDCFG_LIBE}/150.ttys/USAGE                                        \
-	${BSDCFG_LIBE}/150.ttys/USAGE.EN_US.ISO8859-1                        \
 	${BSDCFG_LIBE}/150.ttys/include/messages.subr                        \
-	${BSDCFG_LIBE}/150.ttys/include/messages.subr.EN_US.ISO8859-1        \
 	${BSDCFG_LIBE}/150.ttys/ttys                                         \
 	${BSDCFG_LIBE}/USAGE                                                 \
-	${BSDCFG_LIBE}/USAGE.EN_US.ISO8859-1                                 \
 	${BSDCFG_LIBE}/dot/INDEX                                             \
-	${BSDCFG_LIBE}/dot/INDEX.EN_US.ISO8859-1                             \
 	${BSDCFG_LIBE}/dot/USAGE                                             \
-	${BSDCFG_LIBE}/dot/USAGE.EN_US.ISO8859-1                             \
 	${BSDCFG_LIBE}/dot/dot                                               \
 	${BSDCFG_LIBE}/dot/include/messages.subr                             \
-	${BSDCFG_LIBE}/dot/include/messages.subr.EN_US.ISO8859-1             \
-	${BSDCFG_LIBE}/include/common.subr                                   \
-	${BSDCFG_LIBE}/include/dialog.subr                                   \
+	${BSDCFG_LIBE}/include/bsdconfig.hlp                                 \
+	${BSDCFG_LIBE}/include/media.hlp                                     \
 	${BSDCFG_LIBE}/include/messages.subr                                 \
-	${BSDCFG_LIBE}/include/messages.subr.EN_US.ISO8859-1                 \
-	${BSDCFG_LIBE}/include/mustberoot.subr                               \
-	${BSDCFG_LIBE}/include/strings.subr                                  \
-	${BSDCFG_LIBE}/include/sysrc.subr
+	${BSDCFG_LIBE}/include/network_device.hlp                            \
+	${BSDCFG_LIBE}/include/options.hlp                                   \
+	${BSDCFG_LIBE}/include/tcp.hlp                                       \
+	${BSDCFG_LIBE}/include/usage.hlp                                     \
+	${BSDCFG_SHARE}/common.subr                                          \
+	${BSDCFG_SHARE}/device.subr                                          \
+	${BSDCFG_SHARE}/dialog.subr                                          \
+	${BSDCFG_SHARE}/media/any.subr                                       \
+	${BSDCFG_SHARE}/media/cdrom.subr                                     \
+	${BSDCFG_SHARE}/media/common.subr                                    \
+	${BSDCFG_SHARE}/media/directory.subr                                 \
+	${BSDCFG_SHARE}/media/dos.subr                                       \
+	${BSDCFG_SHARE}/media/floppy.subr                                    \
+	${BSDCFG_SHARE}/media/ftp.subr                                       \
+	${BSDCFG_SHARE}/media/httpproxy.subr                                 \
+	${BSDCFG_SHARE}/media/network.subr                                   \
+	${BSDCFG_SHARE}/media/nfs.subr                                       \
+	${BSDCFG_SHARE}/media/options.subr                                   \
+	${BSDCFG_SHARE}/media/tcpip.subr                                     \
+	${BSDCFG_SHARE}/media/ufs.subr                                       \
+	${BSDCFG_SHARE}/media/usb.subr                                       \
+	${BSDCFG_SHARE}/mustberoot.subr                                      \
+	${BSDCFG_SHARE}/networking/common.subr                               \
+	${BSDCFG_SHARE}/networking/device.subr                               \
+	${BSDCFG_SHARE}/networking/hostname.subr                             \
+	${BSDCFG_SHARE}/networking/ipaddr.subr                               \
+	${BSDCFG_SHARE}/networking/media.subr                                \
+	${BSDCFG_SHARE}/networking/netmask.subr                              \
+	${BSDCFG_SHARE}/networking/resolv.subr                               \
+	${BSDCFG_SHARE}/networking/routing.subr                              \
+	${BSDCFG_SHARE}/packages/categories.subr                             \
+	${BSDCFG_SHARE}/packages/index.subr                                  \
+	${BSDCFG_SHARE}/packages/packages.subr                               \
+	${BSDCFG_SHARE}/password/password.subr                               \
+	${BSDCFG_SHARE}/script.subr                                          \
+	${BSDCFG_SHARE}/startup/rcconf.subr                                  \
+	${BSDCFG_SHARE}/startup/rcedit.subr                                  \
+	${BSDCFG_SHARE}/startup/rcvar.subr                                   \
+	${BSDCFG_SHARE}/strings.subr                                         \
+	${BSDCFG_SHARE}/struct.subr                                          \
+	${BSDCFG_SHARE}/sysrc.subr                                           \
+	${BSDCFG_SHARE}/timezone/continents.subr                             \
+	${BSDCFG_SHARE}/timezone/countries.subr                              \
+	${BSDCFG_SHARE}/timezone/iso3166.subr                                \
+	${BSDCFG_SHARE}/timezone/menus.subr                                  \
+	${BSDCFG_SHARE}/timezone/zones.subr                                  \
+	${BSDCFG_SHARE}/usermgmt/group_input.subr                            \
+	${BSDCFG_SHARE}/usermgmt/user_input.subr                             \
+	${BSDCFG_SHARE}/variable.subr
 
 PLIST_DIRS=	${BSDCFG_LIBE}/020.docsinstall/include \
 		${BSDCFG_LIBE}/020.docsinstall         \
+		${BSDCFG_LIBE}/030.packages/include    \
+		${BSDCFG_LIBE}/030.packages            \
 		${BSDCFG_LIBE}/040.password/include    \
 		${BSDCFG_LIBE}/040.password            \
 		${BSDCFG_LIBE}/050.diskmgmt/include    \
@@ -201,6 +195,14 @@ PLIST_DIRS=	${BSDCFG_LIBE}/020.docsinstall/include \
 		${BSDCFG_LIBE}/dot                     \
 		${BSDCFG_LIBE}/include                 \
 		${BSDCFG_LIBE}                         \
+		${BSDCFG_SHARE}/media                  \
+		${BSDCFG_SHARE}/networking             \
+		${BSDCFG_SHARE}/packages               \
+		${BSDCFG_SHARE}/password               \
+		${BSDCFG_SHARE}/startup                \
+		${BSDCFG_SHARE}/timezone               \
+		${BSDCFG_SHARE}/usermgmt               \
+		${BSDCFG_SHARE}                        \
 		share/examples/bsdconfig
 
 .include <bsd.port.pre.mk>
@@ -212,6 +214,8 @@ IGNORE=		requires FreeBSD 9.0 or later
 post-patch:
 	@${GREP} -Ilrs '^BSDCFG_LIBE=' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \
 		-e 's|^\(BSDCFG_LIBE=\).*|\1"${PREFIX}/libexec/${PORTNAME}"|'
+	@${GREP} -Ilrs '^BSDCFG_SHARE=' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \
+		-e 's|^\(BSDCFG_SHARE=\).*|\1"${PREFIX}/share/${PORTNAME}"|'
 	@${REINPLACE_CMD} \
 		-e 's|^\(BSDCONFIG=\).*|\1${PREFIX}/sbin/${PORTNAME}|' \
 		${WRKSRC}/dot/dot
diff --git a/sysutils/bsdconfig/distinfo b/sysutils/bsdconfig/distinfo
index 6695ce7c8563..2222e1caaa4c 100644
--- a/sysutils/bsdconfig/distinfo
+++ b/sysutils/bsdconfig/distinfo
@@ -1,4 +1,4 @@
-SHA256 (bsdconfig.120626.txz) = b823e77a49c5586be251b1bc07ba8de542896e191ff47f2fc651f09a046eb861
-SIZE (bsdconfig.120626.txz) = 87724
-SHA256 (bsdconfig.120626-0.7.3.diff.gz) = 9291ef7094069d7c34ff7647fbd05004f17dec4405f9e6e5acff024a2840245f
-SIZE (bsdconfig.120626-0.7.3.diff.gz) = 451
+SHA256 (bsdconfig.130506.txz) = 2edaba1ed747fd3c95f3f205ec476a5fbb5abeb4aee6c638090cb43b04fad739
+SIZE (bsdconfig.130506.txz) = 135848
+SHA256 (bsdconfig.130506-0.8.0.diff.gz) = a33a64696fde09a9775ab101135e94d689655a8477622a4f3f4a41c00e9bd8bc
+SIZE (bsdconfig.130506-0.8.0.diff.gz) = 222
diff --git a/sysutils/bsdconfig/pkg-descr b/sysutils/bsdconfig/pkg-descr
index c7a9014f9259..1f4cd7e0da50 100644
--- a/sysutils/bsdconfig/pkg-descr
+++ b/sysutils/bsdconfig/pkg-descr
@@ -3,8 +3,9 @@ FreeBSD Operating System. Feature-highlights include (but are not limited to):
   - Modular, stable, efficient and i18n-compatible.
   - Easily maintained/extendable sh(1) source/syntax.
   - Works with both dialog(1) in base and Xdialog(1) from ports (x11/xdialog).
-  - rc.conf(5) configuration/management based on sysutils/sysrc
-  - Timezone configuration based on sysutils/tzdialog
-  - Networking management based on sysutils/host-setup
+  - Package management module loosely based on sysinstall but much improved.
+  - rc.conf(5) configuration/management based on sysutils/sysrc.
+  - Timezone configuration based on sysutils/tzdialog.
+  - Networking management based on sysutils/host-setup.
 
 WWW: http://druidbsd.sourceforge.net/