Stage sysutils/bsdconfig

PR:		193212
Reported by:	Chris Hutchinson
Patch by:	Daniel Austin
Major tweaks:	marino

2 files changed, 196 insertions, 202 deletions

diff --git a/sysutils/bsdconfig/Makefile b/sysutils/bsdconfig/Makefile
index accf310f4e76..0f19efd928f6 100644
--- a/sysutils/bsdconfig/Makefile
+++ b/sysutils/bsdconfig/Makefile
@@ -3,10 +3,10 @@
 
 PORTNAME=	bsdconfig
 PORTVERSION=	0.9.0
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://druidbsd.sourceforge.net/download/bsdconfig/
 DISTNAME=	${PORTNAME}.130705
-EXTRACT_SUFX=	.txz
 
 PATCH_SITES=	${MASTER_SITES}
 PATCHFILES=	${DISTNAME}-${PORTVERSION}.diff.gz
@@ -14,205 +14,30 @@ PATCHFILES=	${DISTNAME}-${PORTVERSION}.diff.gz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utility to configure various aspects of FreeBSD
 
-LICENSE=	BSD
+LICENSE=	BSD2CLAUSE
 
+USES=		tar:txz
 NO_WRKSUBDIR=	yes
+PORTEXAMPLES=	browse_packages.sh bsdconfigrc
 
-BSDCFG_LIBE=	libexec/${PORTNAME}
-BSDCFG_SHARE=	share/${PORTNAME}
+BSDCFG_LIBE=	libexec/bsdconfig
+BSDCFG_SHARE=	share/bsdconfig
 
-# Default man(1) section path-prefix
-MANDIR?=	${MANPREFIX}/man/man
-MAN8=		${PORTNAME}.8
-MANCOMPRESSED=	yes
+MAKE_ARGS+=	LIBEXECDIR="${PREFIX}/libexec" \
+		MANDIR="${PREFIX}/man/man" \
+		SBINDIR="${PREFIX}/sbin" \
+		SHAREDIR="${PREFIX}/share"
 
-PLIST_FILES=	\
-	sbin/${PORTNAME}                                                     \
-	share/examples/${PORTNAME}/browse_packages.sh                        \
-	share/examples/${PORTNAME}/bsdconfigrc                               \
-	${BSDCFG_LIBE}/020.docsinstall/INDEX                                 \
-	${BSDCFG_LIBE}/020.docsinstall/USAGE                                 \
-	${BSDCFG_LIBE}/020.docsinstall/docsinstall                           \
-	${BSDCFG_LIBE}/020.docsinstall/include/messages.subr                 \
-	${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/USAGE                                    \
-	${BSDCFG_LIBE}/040.password/include/messages.subr                    \
-	${BSDCFG_LIBE}/040.password/password                                 \
-	${BSDCFG_LIBE}/050.diskmgmt/INDEX                                    \
-	${BSDCFG_LIBE}/050.diskmgmt/USAGE                                    \
-	${BSDCFG_LIBE}/050.diskmgmt/diskmgmt                                 \
-	${BSDCFG_LIBE}/050.diskmgmt/include/messages.subr                    \
-	${BSDCFG_LIBE}/070.usermgmt/INDEX                                    \
-	${BSDCFG_LIBE}/070.usermgmt/USAGE                                    \
-	${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/messages.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/USAGE                                     \
-	${BSDCFG_LIBE}/080.console/console                                   \
-	${BSDCFG_LIBE}/080.console/font                                      \
-	${BSDCFG_LIBE}/080.console/include/messages.subr                     \
-	${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/USAGE                                    \
-	${BSDCFG_LIBE}/090.timezone/include/messages.subr                    \
-	${BSDCFG_LIBE}/090.timezone/timezone                                 \
-	${BSDCFG_LIBE}/110.mouse/INDEX                                       \
-	${BSDCFG_LIBE}/110.mouse/USAGE                                       \
-	${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/mouse                                       \
-	${BSDCFG_LIBE}/110.mouse/port                                        \
-	${BSDCFG_LIBE}/110.mouse/type                                        \
-	${BSDCFG_LIBE}/120.networking/INDEX                                  \
-	${BSDCFG_LIBE}/120.networking/USAGE                                  \
-	${BSDCFG_LIBE}/120.networking/defaultrouter                          \
-	${BSDCFG_LIBE}/120.networking/devices                                \
-	${BSDCFG_LIBE}/120.networking/hostname                               \
-	${BSDCFG_LIBE}/120.networking/include/messages.subr                  \
-	${BSDCFG_LIBE}/120.networking/nameservers                            \
-	${BSDCFG_LIBE}/120.networking/networking                             \
-	${BSDCFG_LIBE}/130.security/INDEX                                    \
-	${BSDCFG_LIBE}/130.security/USAGE                                    \
-	${BSDCFG_LIBE}/130.security/include/messages.subr                    \
-	${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/USAGE                                     \
-	${BSDCFG_LIBE}/140.startup/include/messages.subr                     \
-	${BSDCFG_LIBE}/140.startup/misc                                      \
-	${BSDCFG_LIBE}/140.startup/rcadd                                     \
-	${BSDCFG_LIBE}/140.startup/rcconf                                    \
-	${BSDCFG_LIBE}/140.startup/rcdelete                                  \
-	${BSDCFG_LIBE}/140.startup/rcedit                                    \
-	${BSDCFG_LIBE}/140.startup/rcvar                                     \
-	${BSDCFG_LIBE}/140.startup/startup                                   \
-	${BSDCFG_LIBE}/150.ttys/INDEX                                        \
-	${BSDCFG_LIBE}/150.ttys/USAGE                                        \
-	${BSDCFG_LIBE}/150.ttys/include/messages.subr                        \
-	${BSDCFG_LIBE}/150.ttys/ttys                                         \
-	${BSDCFG_LIBE}/USAGE                                                 \
-	${BSDCFG_LIBE}/dot/INDEX                                             \
-	${BSDCFG_LIBE}/dot/USAGE                                             \
-	${BSDCFG_LIBE}/dot/dot                                               \
-	${BSDCFG_LIBE}/dot/include/messages.subr                             \
-	${BSDCFG_LIBE}/include/bsdconfig.hlp                                 \
-	${BSDCFG_LIBE}/include/media.hlp                                     \
-	${BSDCFG_LIBE}/include/messages.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/http.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}/networking/services.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
+OPTIONS_DEFINE=	EXAMPLES
 
-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    \
-		${BSDCFG_LIBE}/050.diskmgmt            \
-		${BSDCFG_LIBE}/070.usermgmt/include    \
-		${BSDCFG_LIBE}/070.usermgmt            \
-		${BSDCFG_LIBE}/080.console/include     \
-		${BSDCFG_LIBE}/080.console             \
-		${BSDCFG_LIBE}/090.timezone/include    \
-		${BSDCFG_LIBE}/090.timezone            \
-		${BSDCFG_LIBE}/110.mouse/include       \
-		${BSDCFG_LIBE}/110.mouse               \
-		${BSDCFG_LIBE}/120.networking/include  \
-		${BSDCFG_LIBE}/120.networking          \
-		${BSDCFG_LIBE}/130.security/include    \
-		${BSDCFG_LIBE}/130.security            \
-		${BSDCFG_LIBE}/140.startup/include     \
-		${BSDCFG_LIBE}/140.startup             \
-		${BSDCFG_LIBE}/150.ttys/include        \
-		${BSDCFG_LIBE}/150.ttys                \
-		${BSDCFG_LIBE}/dot/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.options.mk>
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 900030
-IGNORE=		requires FreeBSD 9.0 or later
+.if ${OPSYS} == FreeBSD
+.  if ${OSVERSION} < 900030
+IGNORE=	requires FreeBSD 9.0 or later
+.  endif
+.else
+IGNORE= is a FreeBSD-specific port
 .endif
 
 post-patch:
@@ -226,12 +51,4 @@ post-patch:
 		-e 's|^\(BSDCONFIG=\).*|\1${PREFIX}/sbin/${PORTNAME}|' \
 		${WRKSRC}/dot/dot
 
-do-install:
-	@( cd ${WRKSRC} && make \
-		LIBEXECDIR="${PREFIX}/libexec" \
-		MANDIR="${MANDIR}"             \
-		SBINDIR="${PREFIX}/sbin"       \
-		SHAREDIR="${PREFIX}/share"     \
-		install                        )
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/bsdconfig/pkg-plist b/sysutils/bsdconfig/pkg-plist
new file mode 100644
index 000000000000..a2cd7658a5cf
--- /dev/null
+++ b/sysutils/bsdconfig/pkg-plist
@@ -0,0 +1,177 @@
+libexec/bsdconfig/020.docsinstall/INDEX
+libexec/bsdconfig/020.docsinstall/USAGE
+libexec/bsdconfig/020.docsinstall/docsinstall
+libexec/bsdconfig/020.docsinstall/include/messages.subr
+libexec/bsdconfig/030.packages/INDEX
+libexec/bsdconfig/030.packages/USAGE
+libexec/bsdconfig/030.packages/include/messages.subr
+libexec/bsdconfig/030.packages/packages
+libexec/bsdconfig/040.password/INDEX
+libexec/bsdconfig/040.password/USAGE
+libexec/bsdconfig/040.password/include/messages.subr
+libexec/bsdconfig/040.password/password
+libexec/bsdconfig/050.diskmgmt/INDEX
+libexec/bsdconfig/050.diskmgmt/USAGE
+libexec/bsdconfig/050.diskmgmt/diskmgmt
+libexec/bsdconfig/050.diskmgmt/include/messages.subr
+libexec/bsdconfig/070.usermgmt/INDEX
+libexec/bsdconfig/070.usermgmt/USAGE
+libexec/bsdconfig/070.usermgmt/groupadd
+libexec/bsdconfig/070.usermgmt/groupdel
+libexec/bsdconfig/070.usermgmt/groupedit
+libexec/bsdconfig/070.usermgmt/groupinput
+libexec/bsdconfig/070.usermgmt/include/messages.subr
+libexec/bsdconfig/070.usermgmt/include/usermgmt.hlp
+libexec/bsdconfig/070.usermgmt/useradd
+libexec/bsdconfig/070.usermgmt/userdel
+libexec/bsdconfig/070.usermgmt/useredit
+libexec/bsdconfig/070.usermgmt/userinput
+libexec/bsdconfig/070.usermgmt/usermgmt
+libexec/bsdconfig/080.console/INDEX
+libexec/bsdconfig/080.console/USAGE
+libexec/bsdconfig/080.console/console
+libexec/bsdconfig/080.console/font
+libexec/bsdconfig/080.console/include/messages.subr
+libexec/bsdconfig/080.console/keymap
+libexec/bsdconfig/080.console/repeat
+libexec/bsdconfig/080.console/saver
+libexec/bsdconfig/080.console/screenmap
+libexec/bsdconfig/080.console/ttys
+libexec/bsdconfig/090.timezone/INDEX
+libexec/bsdconfig/090.timezone/USAGE
+libexec/bsdconfig/090.timezone/include/messages.subr
+libexec/bsdconfig/090.timezone/timezone
+libexec/bsdconfig/110.mouse/INDEX
+libexec/bsdconfig/110.mouse/USAGE
+libexec/bsdconfig/110.mouse/disable
+libexec/bsdconfig/110.mouse/enable
+libexec/bsdconfig/110.mouse/flags
+libexec/bsdconfig/110.mouse/include/messages.subr
+libexec/bsdconfig/110.mouse/mouse
+libexec/bsdconfig/110.mouse/port
+libexec/bsdconfig/110.mouse/type
+libexec/bsdconfig/120.networking/INDEX
+libexec/bsdconfig/120.networking/USAGE
+libexec/bsdconfig/120.networking/defaultrouter
+libexec/bsdconfig/120.networking/devices
+libexec/bsdconfig/120.networking/hostname
+libexec/bsdconfig/120.networking/include/messages.subr
+libexec/bsdconfig/120.networking/nameservers
+libexec/bsdconfig/120.networking/networking
+libexec/bsdconfig/130.security/INDEX
+libexec/bsdconfig/130.security/USAGE
+libexec/bsdconfig/130.security/include/messages.subr
+libexec/bsdconfig/130.security/include/securelevel.hlp
+libexec/bsdconfig/130.security/kern_securelevel
+libexec/bsdconfig/130.security/security
+libexec/bsdconfig/140.startup/INDEX
+libexec/bsdconfig/140.startup/USAGE
+libexec/bsdconfig/140.startup/include/messages.subr
+libexec/bsdconfig/140.startup/misc
+libexec/bsdconfig/140.startup/rcadd
+libexec/bsdconfig/140.startup/rcconf
+libexec/bsdconfig/140.startup/rcdelete
+libexec/bsdconfig/140.startup/rcedit
+libexec/bsdconfig/140.startup/rcvar
+libexec/bsdconfig/140.startup/startup
+libexec/bsdconfig/150.ttys/INDEX
+libexec/bsdconfig/150.ttys/USAGE
+libexec/bsdconfig/150.ttys/include/messages.subr
+libexec/bsdconfig/150.ttys/ttys
+libexec/bsdconfig/USAGE
+libexec/bsdconfig/dot/INDEX
+libexec/bsdconfig/dot/USAGE
+libexec/bsdconfig/dot/dot
+libexec/bsdconfig/dot/include/messages.subr
+libexec/bsdconfig/include/bsdconfig.hlp
+libexec/bsdconfig/include/media.hlp
+libexec/bsdconfig/include/messages.subr
+libexec/bsdconfig/include/network_device.hlp
+libexec/bsdconfig/include/options.hlp
+libexec/bsdconfig/include/tcp.hlp
+libexec/bsdconfig/include/usage.hlp
+man/man8/bsdconfig.8.gz
+sbin/bsdconfig
+%%DATADIR%%/common.subr
+%%DATADIR%%/device.subr
+%%DATADIR%%/dialog.subr
+%%DATADIR%%/media/any.subr
+%%DATADIR%%/media/cdrom.subr
+%%DATADIR%%/media/common.subr
+%%DATADIR%%/media/directory.subr
+%%DATADIR%%/media/dos.subr
+%%DATADIR%%/media/floppy.subr
+%%DATADIR%%/media/ftp.subr
+%%DATADIR%%/media/http.subr
+%%DATADIR%%/media/httpproxy.subr
+%%DATADIR%%/media/network.subr
+%%DATADIR%%/media/nfs.subr
+%%DATADIR%%/media/options.subr
+%%DATADIR%%/media/tcpip.subr
+%%DATADIR%%/media/ufs.subr
+%%DATADIR%%/media/usb.subr
+%%DATADIR%%/mustberoot.subr
+%%DATADIR%%/networking/common.subr
+%%DATADIR%%/networking/device.subr
+%%DATADIR%%/networking/hostname.subr
+%%DATADIR%%/networking/ipaddr.subr
+%%DATADIR%%/networking/media.subr
+%%DATADIR%%/networking/netmask.subr
+%%DATADIR%%/networking/resolv.subr
+%%DATADIR%%/networking/routing.subr
+%%DATADIR%%/networking/services.subr
+%%DATADIR%%/packages/categories.subr
+%%DATADIR%%/packages/index.subr
+%%DATADIR%%/packages/packages.subr
+%%DATADIR%%/password/password.subr
+%%DATADIR%%/script.subr
+%%DATADIR%%/startup/rcconf.subr
+%%DATADIR%%/startup/rcedit.subr
+%%DATADIR%%/startup/rcvar.subr
+%%DATADIR%%/strings.subr
+%%DATADIR%%/struct.subr
+%%DATADIR%%/sysrc.subr
+%%DATADIR%%/timezone/continents.subr
+%%DATADIR%%/timezone/countries.subr
+%%DATADIR%%/timezone/iso3166.subr
+%%DATADIR%%/timezone/menus.subr
+%%DATADIR%%/timezone/zones.subr
+%%DATADIR%%/usermgmt/group_input.subr
+%%DATADIR%%/usermgmt/user_input.subr
+%%DATADIR%%/variable.subr
+@dirrm libexec/bsdconfig/020.docsinstall/include
+@dirrm libexec/bsdconfig/020.docsinstall
+@dirrm libexec/bsdconfig/030.packages/include
+@dirrm libexec/bsdconfig/030.packages
+@dirrm libexec/bsdconfig/040.password/include
+@dirrm libexec/bsdconfig/040.password
+@dirrm libexec/bsdconfig/050.diskmgmt/include
+@dirrm libexec/bsdconfig/050.diskmgmt
+@dirrm libexec/bsdconfig/070.usermgmt/include
+@dirrm libexec/bsdconfig/070.usermgmt
+@dirrm libexec/bsdconfig/080.console/include
+@dirrm libexec/bsdconfig/080.console
+@dirrm libexec/bsdconfig/090.timezone/include
+@dirrm libexec/bsdconfig/090.timezone
+@dirrm libexec/bsdconfig/110.mouse/include
+@dirrm libexec/bsdconfig/110.mouse
+@dirrm libexec/bsdconfig/120.networking/include
+@dirrm libexec/bsdconfig/120.networking
+@dirrm libexec/bsdconfig/130.security/include
+@dirrm libexec/bsdconfig/130.security
+@dirrm libexec/bsdconfig/140.startup/include
+@dirrm libexec/bsdconfig/140.startup
+@dirrm libexec/bsdconfig/150.ttys/include
+@dirrm libexec/bsdconfig/150.ttys
+@dirrm libexec/bsdconfig/dot/include
+@dirrm libexec/bsdconfig/dot
+@dirrm libexec/bsdconfig/include
+@dirrm libexec/bsdconfig
+@dirrm %%DATADIR%%/media
+@dirrm %%DATADIR%%/networking
+@dirrm %%DATADIR%%/packages
+@dirrm %%DATADIR%%/password
+@dirrm %%DATADIR%%/startup
+@dirrm %%DATADIR%%/timezone
+@dirrm %%DATADIR%%/usermgmt
+@dirrm %%DATADIR%%