Import of the 7.1 ebuilds from gentoo-bsd overlay.

(Portage version: 2.2_rc23/cvs/FreeBSD i386)

8 files changed, 298 insertions, 199 deletions

diff --git a/sys-freebsd/freebsd-usbin/ChangeLog b/sys-freebsd/freebsd-usbin/ChangeLog
index daf8c89f2b29..13cc7a4bc5ba 100644
--- a/sys-freebsd/freebsd-usbin/ChangeLog
+++ b/sys-freebsd/freebsd-usbin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-freebsd/freebsd-usbin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.49 2009/01/08 21:19:50 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.50 2009/01/22 21:06:27 the_paya Exp $
+
+*freebsd-usbin-7.1 (22 Jan 2009)
+
+  22 Jan 2009; Javier Villavicencio <the_paya@gentoo.org>
+  +files/freebsd-usbin-7.0-nowrap.patch, files/nfs.confd, files/nfs.initd,
+  +files/rpc.lockd.initd, +files/rpc.statd.initd, metadata.xml,
+  +freebsd-usbin-7.1.ebuild:
+  Import 7.1 ebuilds from gentoo-bsd overlay.
 
   08 Jan 2009; Alexis Ballier <aballier@gentoo.org>
   -freebsd-usbin-6.2.ebuild:
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-7.0-nowrap.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-7.0-nowrap.patch
new file mode 100644
index 000000000000..17442eef68c0
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-7.0-nowrap.patch
@@ -0,0 +1,45 @@
+diff -ur usr.sbin.orig/rpcbind/Makefile usr.sbin/rpcbind/Makefile
+--- usr.sbin.orig/rpcbind/Makefile	2007-04-21 12:02:30 +0000
++++ usr.sbin/rpcbind/Makefile	2007-04-21 12:05:32 +0000
+@@ -8,13 +8,20 @@
+ SRCS=	check_bound.c rpcb_stat.c rpcb_svc_4.c rpcbind.c pmap_svc.c \
+ 	rpcb_svc.c rpcb_svc_com.c security.c warmstart.c util.c
+ 
+-CFLAGS+= -DPORTMAP -DLIBWRAP
++CFLAGS+= -DPORTMAP
+ 
+ .if ${MK_INET6_SUPPORT} != "no"
+ CFLAGS+= -DINET6
+ .endif
+ 
+-DPADD=	${LIBWRAP} ${LIBUTIL}
+-LDADD=	-lwrap -lutil
++DPADD=	${LIBUTIL}
++LDADD=	-lutil
++
++.if !defined(NO_WRAP)
++CFLAGS+= -DTCP_WRAPPER
++DPADD+=         ${LIBWRAP}
++LDADD+=         -lwrap
++.endif
++
+ 
+ .include <bsd.prog.mk>
+diff -ur usr.sbin.orig/ypserv/Makefile usr.sbin/ypserv/Makefile
+--- usr.sbin.orig/ypserv/Makefile	2007-04-21 12:02:31 +0000
++++ usr.sbin/ypserv/Makefile	2007-04-21 12:06:53 +0000
+@@ -8,10 +8,13 @@
+ SRCS=	yp_svc.c yp_server.c yp_dblookup.c yp_dnslookup.c \
+ 	ypxfr_clnt.c yp.h yp_main.c yp_error.c yp_access.c yp_svc_udp.c
+ 
+-CFLAGS+= -DDB_CACHE -DTCP_WRAPPER -I.
++CFLAGS+= -DDB_CACHE -I.
+ 
++.if !defined(NO_WRAP)
++CFLAGS+= -DTCP_WRAPPER
+ DPADD=	${LIBWRAP}
+ LDADD=	-lwrap
++.endif
+ 
+ CLEANFILES= yp_svc.c ypxfr_clnt.c yp.h
+ 
diff --git a/sys-freebsd/freebsd-usbin/files/nfs.confd b/sys-freebsd/freebsd-usbin/files/nfs.confd
index 80ace9c40235..844252fdc54d 100644
--- a/sys-freebsd/freebsd-usbin/files/nfs.confd
+++ b/sys-freebsd/freebsd-usbin/files/nfs.confd
@@ -1,24 +1,10 @@
-# /etc/conf.d/nfs
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/nfs.confd,v 1.1 2006/04/01 16:43:51 flameeyes Exp $
-
 # Config file for /etc/init.d/nfs
-
-# If you wish to set the port numbers for lockd,
-# please see /etc/sysctl.conf
-
-# Number of servers to be started up by default
-RPCNFSDCOUNT=8
-
-# Options to pass to rpc.mountd
-# ex. RPCMOUNTDOPTS="-p 32767
-RPCMOUNTDOPTS=""
-
-# Options to pass to rpc.statd
-# ex. RPCSTATDOPTS="-p 32765 -o 32766"
-RPCSTATDOPTS=""
-
-# Options to pass to rpc.idmapd
-RPCIDMAPDOPTS=""
-
-# Timeout (in seconds) for exportfs
-EXPORTFSTIMEOUT=30
+# Options for nfsd (see man nfsd)
+# Example: 8 nfsd servers started:
+#nfsdopts="-n 8"
+
+# Options for mountd (see man mountd)
+# Example: allow non-root users to mount shares:
+#mountdopts="-n"
+# Specify t he exports file, this is the default:
+#exportsfile="/etc/exports"
diff --git a/sys-freebsd/freebsd-usbin/files/nfs.initd b/sys-freebsd/freebsd-usbin/files/nfs.initd
index d99017f9d0ad..640095f140fc 100755
--- a/sys-freebsd/freebsd-usbin/files/nfs.initd
+++ b/sys-freebsd/freebsd-usbin/files/nfs.initd
@@ -1,209 +1,54 @@
 #!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/nfs.initd,v 1.2 2007/04/06 14:47:17 uberlord Exp $
 
 #---------------------------------------------------------------------------
-# This script starts/stops the following
-#	rpc.statd if necessary (also checked by init.d/nfsmount)
-#	rpc.rquotad if exists (from quota package)
-#	rpc.nfsd
-#	rpc.mountd
+# This script starts/stops nfsd and mountd
+# Daemons rpc.rquotad, rpc.rstatd, rpc.rusersd, rpc.rwalld and rpc.sprayd
+# should be started from inetd on FreeBSD.
 #---------------------------------------------------------------------------
 
-# NB: Config is in /etc/conf.d/nfs
-
 opts="reload"
 
-# This variable is used for controlling whether or not to run exportfs -ua;
-# see stop() for more information
-restarting=no
-
 # The binary locations
-exportfs=/usr/sbin/exportfs
-statd=/usr/sbin/rpc.statd
-idmapd=/usr/sbin/rpc.idmapd
-rquotad=/usr/sbin/rpc.rquotad
-nfsd=/usr/sbin/rpc.nfsd
-mountd=/usr/sbin/rpc.mountd
+nfsd=/usr/sbin/nfsd
+mountd=/usr/sbin/mountd
 
 depend() {
-	use ypbind net
+	use ypbind net rpc.lockd
 	need rpcbind
 	after quota
 }
 
-start_idmapd() {
-	[ ! -x "${idmapd}" ] && return 0
-
-	if grep -q rpc_pipefs /proc/filesystems ; then
-		if ! grep -q "rpc_pipefs /var/lib/nfs/rpc_pipefs" /proc/mounts ; then
-			[ ! -d /var/lib/nfs/rpc_pipefs ] && mkdir -p /var/lib/nfs/rpc_pipefs
-			ebegin "Mounting RPC pipefs"
-			mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs
-			eend $?
-		fi
-	fi
-
-	ebegin "Starting idmapd"
-	${idmapd} ${RPCIDMAPDOPTS}
-	eend $?
-}
-
-stop_idmapd() {
-	[ ! -x ${idmapd} ] && return 0
-
-	ebegin "Stopping idmapd"
-	start-stop-daemon --stop --quiet --exec ${idmapd}
-	ret=$?
-	eend ${ret}
-
-	if [ $restarting = "no" -a "${RC_CMD}" != "restart" ] ; then
-		if grep -q "rpc_pipefs /var/lib/nfs/rpc_pipefs" /proc/mounts ; then
-			ebegin "Unmounting RPC pipefs"
-			umount /var/lib/nfs/rpc_pipefs
-			eend $?
-		fi
-	fi
-
-	return ${ret}
-}
-
-start_statd() {
-	# Don't start rpc.statd if already started by init.d/nfsmount
-	killall -0 rpc.statd 2>/dev/null && return 0
-	ebegin "Starting NFS statd"
-	start-stop-daemon --start --quiet --exec \
-		$statd -- $RPCSTATDOPTS 1>&2
-	eend $? "Error starting NFS statd"
-}
-
-stop_statd() {
-	# Don't stop rpc.statd if it's in use by init.d/nfsmount.
-	mount -t nfs | grep -q . && return 0
-	# Make sure it's actually running
-	killall -0 rpc.statd 2>/dev/null || return 0
-	# Okay, all tests passed, stop rpc.statd
-	ebegin "Stopping NFS statd"
-	start-stop-daemon --stop --quiet --exec $statd 1>&2
-	eend $? "Error stopping NFS statd"
-}
-
-waitfor_exportfs() {
-	local pid=$1
-	( sleep ${EXPORTFSTIMEOUT:-30}; kill -9 $pid 2>/dev/null ) &
-	wait $1
-}
-
 start() {
-	# Make sure nfs support is loaded in the kernel #64709
-	if [ -e /proc/modules ] ; then
-		modprobe nfsd &> /dev/null
-	fi
-
-	# This is the new "kernel 2.6 way" to handle the exports file
-	if grep -q nfsd /proc/filesystems 2>/dev/null; then
-		if ! grep -q "nfsd /proc/fs/nfs" /proc/mounts 2>/dev/null; then
-			ebegin "Mounting nfsd filesystem in /proc"
-			mount -t nfsd nfsd /proc/fs/nfs
-			eend $? "Error mounting nfsd filesystem in /proc"
-		fi
-	fi
-	# now that nfsd is mounted inside /proc, we can safely start mountd later
-
-	start_idmapd
-	start_statd
-
-	# Exportfs likes to hang if networking isn't working.
-	# If that's the case, then try to kill it so the
-	# bootup process can continue.
-	if grep -q '^/' /etc/exports 2>/dev/null; then
-		ebegin "Exporting NFS directories"
-		$exportfs -r 1>&2 &
-		waitfor_exportfs $!
-		eend $? "Error exporting NFS directories"
-	fi
-
-	if [ -x "${rquotad}" ]; then
-		ebegin "Starting NFS rquotad"
-		start-stop-daemon --start --quiet --exec \
-			$rquotad -- $RPCRQUOTADOPTS 1>&2
-		eend $? "Error starting NFS rquotad"
-	fi
-
 	ebegin "Starting NFS daemon"
 	start-stop-daemon --start --quiet --exec \
-		$nfsd -- $RPCNFSDCOUNT 1>&2
+		$nfsd -- ${nfsdopts}
 	eend $? "Error starting NFS daemon"
 
 	# Start mountd
 	ebegin "Starting NFS mountd"
 	start-stop-daemon --start --quiet --exec \
-		$mountd -- $RPCMOUNTDOPTS 1>&2
+		$mountd -- ${mountdopts} ${exporstfile}
 	eend $? "Error starting NFS mountd"
 }
 
 stop() {
-	# Don't check NFSSERVER variable since it might have changed,
-	# instead use --oknodo to smooth things over
 	ebegin "Stopping NFS mountd"
-	start-stop-daemon --stop --quiet --oknodo \
-		--exec $mountd 1>&2
+	start-stop-daemon --stop --quiet --oknodo --exec $mountd \
+		--pidfile /var/run/mountd.pid
 	eend $? "Error stopping NFS mountd"
 
-	# nfsd sets its process name to [nfsd] so don't look for $nfsd
 	ebegin "Stopping NFS daemon"
 	start-stop-daemon --stop --quiet --oknodo \
-		--name nfsd --user root --signal 2 1>&2
+		--name nfsd --user root
 	eend $? "Error stopping NFS daemon"
-
-	if [ -x $rquotad ]; then
-		ebegin "Stopping NFS rquotad"
-		start-stop-daemon --stop --quiet --oknodo \
-			--exec $rquotad 1>&2
-		eend $? "Error stopping NFS rquotad"
-	fi
-
-	# When restarting the NFS server, running "exportfs -ua" probably
-	# isn't what the user wants.  Running it causes all entries listed
-	# in xtab to be removed from the kernel export tables, and the
-	# xtab file is cleared. This effectively shuts down all NFS
-	# activity, leaving all clients holding stale NFS filehandles,
-	# *even* when the NFS server has restarted.
-	#
-	# That's what you would want if you were shutting down the NFS
-	# server for good, or for a long period of time, but not when the
-	# NFS server will be running again in short order.  In this case,
-	# then "exportfs -r" will reread the xtab, and all the current
-	# clients will be able to resume NFS activity, *without* needing
-	# to umount/(re)mount the filesystem.
-	if [ "$restarting" = no -a "${RC_CMD}" != "restart" ]; then
-		ebegin "Unexporting NFS directories"
-		# Exportfs likes to hang if networking isn't working.
-		# If that's the case, then try to kill it so the
-		# shutdown process can continue.
-		$exportfs -ua 1>&2 &
-		waitfor_exportfs $!
-		eend $? "Error unexporting NFS directories"
-	fi
-
-	stop_statd
-	stop_idmapd
 }
 
 reload() {
-	# Exportfs likes to hang if networking isn't working.
-	# If that's the case, then try to kill it so the
-	# bootup process can continue.
+	# Hangup signal to mountd reloads /etc/exports.
 	ebegin "Reloading /etc/exports"
-	$exportfs -r 1>&2 &
-	waitfor_exportfs $!
-	eend $? "Error exporting NFS directories"
-}
-
-restart() {
-	# See long comment in stop() regarding "restarting" and exportfs -ua
-	restarting=yes
-	svc_stop
-	svc_start
+	start-stop-daemon --signal 1 --quiet --exec $mountd \
+		--pidfile /var/run/mountd.pid
+	eend $?
 }
diff --git a/sys-freebsd/freebsd-usbin/files/rpc.lockd.initd b/sys-freebsd/freebsd-usbin/files/rpc.lockd.initd
new file mode 100755
index 000000000000..0c74b9fed612
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/rpc.lockd.initd
@@ -0,0 +1,20 @@
+#!/sbin/runscript
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+        need net rpcbind rpc.statd
+}
+
+start() {
+        ebegin "Starting NFS lockd"
+        start-stop-daemon --start --quiet --exec \
+                /usr/sbin/rpc.lockd -- $rpclockdopts
+        eend $? "Error starting NFS lockd"
+}
+
+stop() {
+        ebegin "Stopping NFS lockd"
+        start-stop-daemon --stop --quiet --exec /usr/sbin/rpc.lockd
+        eend $? "Error stopping NFS lockd"
+}
diff --git a/sys-freebsd/freebsd-usbin/files/rpc.statd.initd b/sys-freebsd/freebsd-usbin/files/rpc.statd.initd
new file mode 100755
index 000000000000..5c3cf30d304f
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/rpc.statd.initd
@@ -0,0 +1,20 @@
+#!/sbin/runscript
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+        need net rpcbind
+}
+
+start() {
+        ebegin "Starting NFS statd"
+        start-stop-daemon --start --quiet --exec \
+                /usr/sbin/rpc.statd -- $rpcstatdopts
+        eend $? "Error starting NFS statd"
+}
+
+stop() {
+        ebegin "Stopping NFS statd"
+        start-stop-daemon --stop --quiet --exec /usr/sbin/rpc.statd
+        eend $? "Error stopping NFS statd"
+}
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-7.1.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-7.1.ebuild
new file mode 100644
index 000000000000..8b072e9dac44
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-7.1.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-7.1.ebuild,v 1.1 2009/01/22 21:06:27 the_paya Exp $
+
+inherit bsdmk freebsd flag-o-matic eutils
+
+DESCRIPTION="FreeBSD /usr/sbin tools"
+SLOT="0"
+KEYWORDS="~sparc-fbsd ~x86-fbsd"
+
+IUSE="acpi atm bluetooth build ipsec ipv6 ipfilter isdn minimal nat nis
+	pam radius ssl suid tcpd usb"
+
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+		mirror://gentoo/${CONTRIB}.tar.bz2
+		mirror://gentoo/${UBIN}.tar.bz2
+		mirror://gentoo/${LIB}.tar.bz2
+		mirror://gentoo/${SBIN}.tar.bz2
+		mirror://gentoo/${ETC}.tar.bz2
+		mirror://gentoo/${GNU}.tar.bz2
+		nis? ( mirror://gentoo/${LIBEXEC}.tar.bz2 )
+		build? ( mirror://gentoo/${SYS}.tar.bz2
+			mirror://gentoo/${INCLUDE}.tar.bz2 )"
+
+RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
+	=sys-freebsd/freebsd-libexec-${RV}*
+	acpi? ( sys-power/iasl )
+	build? ( sys-apps/baselayout )
+	ssl? ( dev-libs/openssl )
+	tcpd? ( sys-apps/tcp-wrappers )
+	dev-libs/libedit
+	net-libs/libpcap"
+DEPEND="${RDEPEND}
+	=sys-freebsd/freebsd-mk-defs-${RV}*
+	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
+	sys-apps/texinfo
+	sys-devel/flex"
+
+PROVIDE="virtual/logger"
+
+S="${WORKDIR}/usr.sbin"
+
+pkg_setup() {
+	# Release crunch is something like minimal. It seems to remove everything
+	# which is not needed to work.
+	use minimal && mymakeopts="${mymakeopts} RELEASE_CRUNCH= "
+
+	use acpi || mymakeopts="${mymakeopts} NO_ACPI= "
+	use atm || mymakeopts="${mymakeopts} NO_ATM= "
+	use bluetooth || mymakeopts="${mymakeopts} NO_BLUETOOTH= "
+	use ipsec || mymakeopts="${mymakeopts} NO_IPSEC= "
+	use ipfilter || mymakeopts="${mymakeopts} NO_IPFILTER= "
+	use ipv6 || mymakeopts="${mymakeopts} NO_INET6= "
+	use isdn || mymakeopts="${mymakeopts} NO_I4B= "
+	use nat || mymakeopts="${mymakeopts} NO_NAT= "
+	use nis || mymakeopts="${mymakeopts} NO_NIS= "
+	use pam || mymakeopts="${mymakeopts} NO_PAM= "
+	use radius || mymakeopts="${mymakeopts} NO_RADIUS= "
+	use suid || mymakeopts="${mymakeopts} NO_SUID= PPP_NOSUID= "
+	use tcpd || mymakeopts="${mymakeopts} NO_WRAP= "
+	use ssl || mymakeopts="${mymakeopts} NO_OPENSSL= NO_CRYPT= "
+	use suid || mymakeopts="${mymakeopts} NO_SUID= "
+	use usb || mymakeopts="${mymakeopts} NO_USB= "
+
+	mymakeopts="${mymakeopts} NO_MAILWRAPPER= NO_BIND= NO_SENDMAIL= NO_PF= NO_AUTHPF= NO_LPR="
+}
+
+PATCHES="${FILESDIR}/${PN}-7.0-nowrap.patch
+	${FILESDIR}/${PN}-adduser.patch"
+
+REMOVE_SUBDIRS="
+	named named-checkzone named-checkconf rndc rndc-confgen
+	dnssec-keygen dnssec-signzone
+	tcpdchk tcpdmatch
+	sendmail praliases editmap mailstats makemap
+	sysinstall cron mailwrapper ntp bsnmpd
+	tcpdump ndp traceroute inetd
+	wpa/wpa_supplicant wpa/hostapd wpa/hostapd_cli wpa/wpa_cli wpa/wpa_passphrase
+	zic amd
+	pkg_install freebsd-update"
+
+src_unpack() {
+	freebsd_src_unpack
+
+	if ! use build; then
+		ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
+		ln -s "/usr/include" "${WORKDIR}/include"
+	else
+		dummy_mk mount_smbfs
+	fi
+}
+
+src_compile() {
+	strip-flags
+	append-flags -I "${WORKDIR}/sys"
+
+	NOFLAGSTRIP="yes" freebsd_src_compile
+}
+
+src_install() {
+	# By creating these directories we avoid having to do a
+	# more complex hack
+	dodir /usr/share/doc
+	dodir /sbin
+	dodir /usr/libexec
+	dodir /usr/bin
+
+	# FILESDIR is used by some makefiles which will install files
+	# in the wrong place, just put it in the doc directory.
+	mkinstall DOCDIR=/usr/share/doc/${PF} || die "Install failed"
+
+	# Most of these now come from openrc.
+	for util in nfs rpc.statd rpc.lockd; do
+		newinitd "${FILESDIR}/"${util}.initd ${util}
+		[[ -e "${FILESDIR}"/${util}.confd ]] && \
+			newconfd "${FILESDIR}"/${util}.confd ${util}
+	done
+
+	for class in daily monthly weekly; do
+		cat - > "${T}/periodic.${class}" <<EOS
+#!/bin/sh
+/usr/sbin/periodic ${class}
+EOS
+		exeinto /etc/cron.${class}
+		newexe "${T}/periodic.${class}" periodic
+	done
+
+	# Install the pw.conf file to let pw use Gentoo's skel location
+	insinto /etc
+	doins "${FILESDIR}/pw.conf"
+
+	cd "${WORKDIR}/etc"
+	doins amd.map apmd.conf syslog.conf newsyslog.conf usbd.conf
+
+	insinto /etc/ppp
+	doins ppp/ppp.conf
+
+	if use isdn; then
+		insinto /etc/isdn
+		doins isdn/*
+		rm -f "${D}"/etc/isdn/Makefile
+	fi
+
+	if use bluetooth; then
+		insinto /etc/bluetooth
+		doins bluetooth/*
+		rm -f "${D}"/etc/bluetooth/Makefile
+	fi
+
+	# Install the periodic stuff (needs probably to be ported in a more
+	# gentooish way)
+	cd "${WORKDIR}/etc/periodic"
+
+	doperiodic daily daily/*.accounting
+	doperiodic monthly monthly/*.accounting
+}
+
+pkg_postinst() {
+	# We need to run pwd_mkdb if key files are not present
+	# If they are, then there is no need to run pwd_mkdb
+	if [[ ! -e "${ROOT}etc/passwd" || ! -e "${ROOT}etc/pwd.db" || ! -e "${ROOT}etc/spwd.db" ]] ; then
+		if [[ -e "${ROOT}etc/master.passwd" ]] ; then
+			einfo "Generating passwd files from ${ROOT}etc/master.passwd"
+			"${ROOT}"usr/sbin/pwd_mkdb -p -d "${ROOT}etc" "${ROOT}etc/master.passwd"
+		else
+			eerror "${ROOT}etc/master.passwd does not exist!"
+			eerror "You will no be able to log into your system!"
+		fi
+	fi
+
+	for logfile in messages security auth.log maillog lpd-errs xferlog cron \
+		debug.log slip.log ppp.log; do
+		[[ -f "${ROOT}/var/log/${logfile}" ]] || touch "${ROOT}/var/log/${logfile}"
+	done
+}
diff --git a/sys-freebsd/freebsd-usbin/metadata.xml b/sys-freebsd/freebsd-usbin/metadata.xml
index b1aa32e9ab0e..e187f396600c 100644
--- a/sys-freebsd/freebsd-usbin/metadata.xml
+++ b/sys-freebsd/freebsd-usbin/metadata.xml
@@ -3,9 +3,9 @@
 <pkgmetadata>
 <herd>bsd</herd>
 <use>
-	<flag name='ipfilter'>Enable ipfilter firewall support</flag>
-	<flag name='ipsec'>Enable IPSec support</flag>
-	<flag name='isdn'>Enable ISDN support</flag>
-	<flag name='nat'>Enable Network Address Translation support</flag>
+    <flag name='ipfilter'>Enable building of ipfilter firewall support.</flag>
+    <flag name='ipsec'>Enable IPSec support.</flag>
+    <flag name='isdn'>Enable ISDN support.</flag>
+    <flag name='nat'>Enable Network Address Translation support daemon.</flag>
 </use>
 </pkgmetadata>