From d6e08d8a8ebf17bb396642ea342b6d04869418ae Mon Sep 17 00:00:00 2001
From: Naohiro Aota <naota@gentoo.org>
Date: Mon, 29 Aug 2011 12:04:41 +0000
Subject: Remove deprecated start-stop-daemon argument --oknodo, bug #377765

(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)
---
 sys-freebsd/freebsd-usbin/ChangeLog                |  12 +-
 sys-freebsd/freebsd-usbin/files/nfs.initd          |   6 +-
 .../freebsd-usbin/freebsd-usbin-7.2-r1.ebuild      | 171 +++++++++++++++++++++
 sys-freebsd/freebsd-usbin/freebsd-usbin-7.2.ebuild | 171 ---------------------
 .../freebsd-usbin/freebsd-usbin-8.0-r1.ebuild      | 168 ++++++++++++++++++++
 sys-freebsd/freebsd-usbin/freebsd-usbin-8.0.ebuild | 168 --------------------
 .../freebsd-usbin/freebsd-usbin-8.2-r1.ebuild      | 169 ++++++++++++++++++++
 sys-freebsd/freebsd-usbin/freebsd-usbin-8.2.ebuild | 169 --------------------
 8 files changed, 522 insertions(+), 512 deletions(-)
 create mode 100644 sys-freebsd/freebsd-usbin/freebsd-usbin-7.2-r1.ebuild
 delete mode 100644 sys-freebsd/freebsd-usbin/freebsd-usbin-7.2.ebuild
 create mode 100644 sys-freebsd/freebsd-usbin/freebsd-usbin-8.0-r1.ebuild
 delete mode 100644 sys-freebsd/freebsd-usbin/freebsd-usbin-8.0.ebuild
 create mode 100644 sys-freebsd/freebsd-usbin/freebsd-usbin-8.2-r1.ebuild
 delete mode 100644 sys-freebsd/freebsd-usbin/freebsd-usbin-8.2.ebuild

(limited to 'sys-freebsd')

diff --git a/sys-freebsd/freebsd-usbin/ChangeLog b/sys-freebsd/freebsd-usbin/ChangeLog
index 40cc481e8386..6c39e1c7c8d6 100644
--- a/sys-freebsd/freebsd-usbin/ChangeLog
+++ b/sys-freebsd/freebsd-usbin/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-freebsd/freebsd-usbin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.66 2011/07/06 06:09:51 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.67 2011/08/29 12:04:41 naota Exp $
+
+*freebsd-usbin-8.2-r1 (29 Aug 2011)
+*freebsd-usbin-8.0-r1 (29 Aug 2011)
+*freebsd-usbin-7.2-r1 (29 Aug 2011)
+
+  29 Aug 2011; Naohiro Aota <naota@gentoo.org> -freebsd-usbin-7.2.ebuild,
+  +freebsd-usbin-7.2-r1.ebuild, -freebsd-usbin-8.0.ebuild,
+  +freebsd-usbin-8.0-r1.ebuild, -freebsd-usbin-8.2.ebuild,
+  +freebsd-usbin-8.2-r1.ebuild, files/nfs.initd:
+  Remove deprecated start-stop-daemon argument --oknodo, bug #377765
 
 *freebsd-usbin-8.2 (06 Jul 2011)
 
diff --git a/sys-freebsd/freebsd-usbin/files/nfs.initd b/sys-freebsd/freebsd-usbin/files/nfs.initd
index 640095f140fc..e25ddea0d3bd 100755
--- a/sys-freebsd/freebsd-usbin/files/nfs.initd
+++ b/sys-freebsd/freebsd-usbin/files/nfs.initd
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 #---------------------------------------------------------------------------
@@ -35,12 +35,12 @@ start() {
 
 stop() {
 	ebegin "Stopping NFS mountd"
-	start-stop-daemon --stop --quiet --oknodo --exec $mountd \
+	start-stop-daemon --stop --quiet --exec $mountd \
 		--pidfile /var/run/mountd.pid
 	eend $? "Error stopping NFS mountd"
 
 	ebegin "Stopping NFS daemon"
-	start-stop-daemon --stop --quiet --oknodo \
+	start-stop-daemon --stop --signal USR1 --quiet \
 		--name nfsd --user root
 	eend $? "Error stopping NFS daemon"
 }
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-7.2-r1.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-7.2-r1.ebuild
new file mode 100644
index 000000000000..c3d7b6e6c88a
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-7.2-r1.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2011 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.2-r1.ebuild,v 1.1 2011/08/29 12:04:41 naota Exp $
+
+EAPI=2
+
+inherit bsdmk freebsd flag-o-matic eutils
+
+DESCRIPTION="FreeBSD /usr/sbin tools"
+SLOT="0"
+KEYWORDS="~sparc-fbsd ~x86-fbsd"
+
+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}*[usb?,bluetooth?,netware?]
+	=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}*
+	=sys-freebsd/freebsd-ubin-${RV}*
+	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
+	sys-apps/texinfo
+	sys-devel/flex"
+
+S="${WORKDIR}/usr.sbin"
+
+IUSE="acpi atm audit bluetooth ipv6 isdn minimal netware nis pam ssl tcpd usb build"
+
+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} WITHOUT_ACPI= "
+	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
+	use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= "
+	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
+	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
+	use isdn || mymakeopts="${mymakeopts} WITHOUT_I4B= "
+	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
+	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
+	use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= "
+	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
+	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
+	use tcpd || mymakeopts="${mymakeopts} NO_WRAP= "
+
+	mymakeopts="${mymakeopts} WITHOUT_BIND_NAMED= WITHOUT_BIND_DNSSEC= WITHOUT_PF= WITHOUT_LPR= WITHOUT_SENDMAIL= WITHOUT_AUTHPF= WITHOUT_MAILWRAPPER= "
+}
+
+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 inetd
+	wpa/wpa_supplicant wpa/hostapd wpa/hostapd_cli wpa/wpa_cli wpa/wpa_passphrase
+	zic amd
+	pkg_install freebsd-update"
+
+src_prepare() {
+	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} || die
+		if [[ -e "${FILESDIR}"/${util}.confd ]]; then \
+			newconfd "${FILESDIR}"/${util}.confd ${util} || die
+		fi
+	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" || die
+
+	cd "${WORKDIR}/etc"
+	doins apmd.conf syslog.conf newsyslog.conf nscd.conf || die
+	use usb && doins usbd.conf
+
+	insinto /etc/ppp
+	doins ppp/ppp.conf || die
+
+	if use isdn; then
+		insinto /etc/isdn
+		doins isdn/* || die
+		rm -f "${D}"/etc/isdn/Makefile
+	fi
+
+	if use bluetooth; then
+		insinto /etc/bluetooth
+		doins bluetooth/* || die
+		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/freebsd-usbin-7.2.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-7.2.ebuild
deleted file mode 100644
index d48818b69cfd..000000000000
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-7.2.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2011 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.2.ebuild,v 1.7 2011/04/07 07:52:12 ultrabug Exp $
-
-EAPI=2
-
-inherit bsdmk freebsd flag-o-matic eutils
-
-DESCRIPTION="FreeBSD /usr/sbin tools"
-SLOT="0"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-
-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}*[usb?,bluetooth?,netware?]
-	=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}*
-	=sys-freebsd/freebsd-ubin-${RV}*
-	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
-	sys-apps/texinfo
-	sys-devel/flex"
-
-S="${WORKDIR}/usr.sbin"
-
-IUSE="acpi atm audit bluetooth ipv6 isdn minimal netware nis pam ssl tcpd usb build"
-
-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} WITHOUT_ACPI= "
-	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
-	use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= "
-	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
-	use isdn || mymakeopts="${mymakeopts} WITHOUT_I4B= "
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
-	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
-	use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
-	use tcpd || mymakeopts="${mymakeopts} NO_WRAP= "
-
-	mymakeopts="${mymakeopts} WITHOUT_BIND_NAMED= WITHOUT_BIND_DNSSEC= WITHOUT_PF= WITHOUT_LPR= WITHOUT_SENDMAIL= WITHOUT_AUTHPF= WITHOUT_MAILWRAPPER= "
-}
-
-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 inetd
-	wpa/wpa_supplicant wpa/hostapd wpa/hostapd_cli wpa/wpa_cli wpa/wpa_passphrase
-	zic amd
-	pkg_install freebsd-update"
-
-src_prepare() {
-	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} || die
-		if [[ -e "${FILESDIR}"/${util}.confd ]]; then \
-			newconfd "${FILESDIR}"/${util}.confd ${util} || die
-		fi
-	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" || die
-
-	cd "${WORKDIR}/etc"
-	doins apmd.conf syslog.conf newsyslog.conf nscd.conf || die
-	use usb && doins usbd.conf
-
-	insinto /etc/ppp
-	doins ppp/ppp.conf || die
-
-	if use isdn; then
-		insinto /etc/isdn
-		doins isdn/* || die
-		rm -f "${D}"/etc/isdn/Makefile
-	fi
-
-	if use bluetooth; then
-		insinto /etc/bluetooth
-		doins bluetooth/* || die
-		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/freebsd-usbin-8.0-r1.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-8.0-r1.ebuild
new file mode 100644
index 000000000000..6ad097644292
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-8.0-r1.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-8.0-r1.ebuild,v 1.1 2011/08/29 12:04:41 naota Exp $
+
+EAPI=2
+
+inherit bsdmk freebsd flag-o-matic eutils
+
+DESCRIPTION="FreeBSD /usr/sbin tools"
+SLOT="0"
+KEYWORDS="~sparc-fbsd ~x86-fbsd"
+
+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}*[usb?,bluetooth?,netware?]
+	=sys-freebsd/freebsd-libexec-${RV}*
+	acpi? ( sys-power/iasl )
+	build? ( sys-apps/baselayout )
+	ssl? ( dev-libs/openssl )
+	tcpd? ( sys-apps/tcp-wrappers )
+	dev-libs/libelf
+	dev-libs/libedit
+	net-libs/libpcap"
+DEPEND="${RDEPEND}
+	=sys-freebsd/freebsd-mk-defs-${RV}*
+	=sys-freebsd/freebsd-ubin-${RV}*
+	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
+	sys-apps/texinfo
+	sys-devel/flex"
+
+S="${WORKDIR}/usr.sbin"
+
+IUSE="acpi atm audit bluetooth floppy ipv6 isdn minimal netware nis pam ssl tcpd usb build"
+
+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} WITHOUT_ACPI= "
+	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
+	use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= "
+	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
+	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
+	use isdn || mymakeopts="${mymakeopts} WITHOUT_I4B= "
+	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
+	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
+	use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= "
+	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
+	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
+	use floppy || mymakeopts="${mymakeopts} WITHOUT_FLOPPY= "
+	use tcpd || mymakeopts="${mymakeopts} NO_WRAP="
+
+	mymakeopts="${mymakeopts} WITHOUT_BIND_NAMED= WITHOUT_BIND_DNSSEC= WITHOUT_PF= WITHOUT_LPR= WITHOUT_SENDMAIL= WITHOUT_AUTHPF= WITHOUT_MAILWRAPPER= "
+}
+
+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 inetd
+	wpa/wpa_supplicant wpa/hostapd wpa/hostapd_cli wpa/wpa_cli wpa/wpa_passphrase
+	zic amd
+	pkg_install freebsd-update"
+
+src_prepare() {
+	if ! use build; then
+		ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
+		ln -s "/usr/include" "${WORKDIR}/include"
+	else
+		dummy_mk mount_smbfs
+	fi
+	# Don't install mtree format manpage
+	# it's installed by libarchive.
+	sed -e "s: mtree.5::g" -i "${S}"/mtree/Makefile
+}
+
+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} || die
+		if [[ -e "${FILESDIR}"/${util}.confd ]]; then \
+			newconfd "${FILESDIR}"/${util}.confd ${util} || die
+		fi
+	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" || die
+
+	cd "${WORKDIR}/etc"
+	doins apmd.conf syslog.conf newsyslog.conf nscd.conf || die
+
+	insinto /etc/ppp
+	doins ppp/ppp.conf || die
+
+	if use isdn; then
+		insinto /etc/isdn
+		doins isdn/* || die
+		rm -f "${D}"/etc/isdn/Makefile
+	fi
+
+	if use bluetooth; then
+		insinto /etc/bluetooth
+		doins bluetooth/* || die
+		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/freebsd-usbin-8.0.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-8.0.ebuild
deleted file mode 100644
index 31629408fa44..000000000000
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-8.0.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-8.0.ebuild,v 1.4 2011/04/07 07:52:12 ultrabug Exp $
-
-EAPI=2
-
-inherit bsdmk freebsd flag-o-matic eutils
-
-DESCRIPTION="FreeBSD /usr/sbin tools"
-SLOT="0"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-
-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}*[usb?,bluetooth?,netware?]
-	=sys-freebsd/freebsd-libexec-${RV}*
-	acpi? ( sys-power/iasl )
-	build? ( sys-apps/baselayout )
-	ssl? ( dev-libs/openssl )
-	tcpd? ( sys-apps/tcp-wrappers )
-	dev-libs/libelf
-	dev-libs/libedit
-	net-libs/libpcap"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-ubin-${RV}*
-	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
-	sys-apps/texinfo
-	sys-devel/flex"
-
-S="${WORKDIR}/usr.sbin"
-
-IUSE="acpi atm audit bluetooth floppy ipv6 isdn minimal netware nis pam ssl tcpd usb build"
-
-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} WITHOUT_ACPI= "
-	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
-	use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= "
-	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
-	use isdn || mymakeopts="${mymakeopts} WITHOUT_I4B= "
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
-	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
-	use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
-	use floppy || mymakeopts="${mymakeopts} WITHOUT_FLOPPY= "
-	use tcpd || mymakeopts="${mymakeopts} NO_WRAP="
-
-	mymakeopts="${mymakeopts} WITHOUT_BIND_NAMED= WITHOUT_BIND_DNSSEC= WITHOUT_PF= WITHOUT_LPR= WITHOUT_SENDMAIL= WITHOUT_AUTHPF= WITHOUT_MAILWRAPPER= "
-}
-
-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 inetd
-	wpa/wpa_supplicant wpa/hostapd wpa/hostapd_cli wpa/wpa_cli wpa/wpa_passphrase
-	zic amd
-	pkg_install freebsd-update"
-
-src_prepare() {
-	if ! use build; then
-		ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
-		ln -s "/usr/include" "${WORKDIR}/include"
-	else
-		dummy_mk mount_smbfs
-	fi
-	# Don't install mtree format manpage
-	# it's installed by libarchive.
-	sed -e "s: mtree.5::g" -i "${S}"/mtree/Makefile
-}
-
-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} || die
-		if [[ -e "${FILESDIR}"/${util}.confd ]]; then \
-			newconfd "${FILESDIR}"/${util}.confd ${util} || die
-		fi
-	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" || die
-
-	cd "${WORKDIR}/etc"
-	doins apmd.conf syslog.conf newsyslog.conf nscd.conf || die
-
-	insinto /etc/ppp
-	doins ppp/ppp.conf || die
-
-	if use isdn; then
-		insinto /etc/isdn
-		doins isdn/* || die
-		rm -f "${D}"/etc/isdn/Makefile
-	fi
-
-	if use bluetooth; then
-		insinto /etc/bluetooth
-		doins bluetooth/* || die
-		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/freebsd-usbin-8.2-r1.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-8.2-r1.ebuild
new file mode 100644
index 000000000000..92c4b94979ea
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-8.2-r1.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-8.2-r1.ebuild,v 1.1 2011/08/29 12:04:41 naota Exp $
+
+EAPI=2
+
+inherit bsdmk freebsd flag-o-matic eutils
+
+DESCRIPTION="FreeBSD /usr/sbin tools"
+SLOT="0"
+KEYWORDS="~sparc-fbsd ~x86-fbsd"
+
+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}*[usb?,bluetooth?,netware?]
+	=sys-freebsd/freebsd-libexec-${RV}*
+	acpi? ( sys-power/iasl )
+	build? ( sys-apps/baselayout )
+	ssl? ( dev-libs/openssl )
+	tcpd? ( sys-apps/tcp-wrappers )
+	dev-libs/libelf
+	dev-libs/libedit
+	net-libs/libpcap"
+DEPEND="${RDEPEND}
+	=sys-freebsd/freebsd-mk-defs-${RV}*
+	=sys-freebsd/freebsd-ubin-${RV}*
+	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
+	sys-apps/texinfo
+	sys-devel/flex"
+
+S="${WORKDIR}/usr.sbin"
+
+IUSE="acpi atm audit bluetooth floppy ipv6 isdn minimal netware nis pam ssl tcpd usb build"
+
+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} WITHOUT_ACPI= "
+	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
+	use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= "
+	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
+	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
+	use isdn || mymakeopts="${mymakeopts} WITHOUT_I4B= "
+	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
+	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
+	use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= "
+	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
+	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
+	use floppy || mymakeopts="${mymakeopts} WITHOUT_FLOPPY= "
+	use tcpd || mymakeopts="${mymakeopts} NO_WRAP="
+
+	mymakeopts="${mymakeopts} WITHOUT_BIND_NAMED= WITHOUT_BIND_DNSSEC= WITHOUT_PF= WITHOUT_LPR= WITHOUT_SENDMAIL= WITHOUT_AUTHPF= WITHOUT_MAILWRAPPER= "
+}
+
+PATCHES=( "${FILESDIR}/${PN}-7.0-nowrap.patch"
+	"${FILESDIR}/${PN}-adduser.patch"
+	"${FILESDIR}/mountd.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 inetd
+	wpa/wpa_supplicant wpa/hostapd wpa/hostapd_cli wpa/wpa_cli wpa/wpa_passphrase
+	zic amd
+	pkg_install freebsd-update"
+
+src_prepare() {
+	if ! use build; then
+		ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
+		ln -s "/usr/include" "${WORKDIR}/include"
+	else
+		dummy_mk mount_smbfs
+	fi
+	# Don't install mtree format manpage
+	# it's installed by libarchive.
+	sed -e "s: mtree.5::g" -i "${S}"/mtree/Makefile
+}
+
+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} || die
+		if [[ -e "${FILESDIR}"/${util}.confd ]]; then \
+			newconfd "${FILESDIR}"/${util}.confd ${util} || die
+		fi
+	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" || die
+
+	cd "${WORKDIR}/etc"
+	doins apmd.conf syslog.conf newsyslog.conf nscd.conf || die
+
+	insinto /etc/ppp
+	doins ppp/ppp.conf || die
+
+	if use isdn; then
+		insinto /etc/isdn
+		doins isdn/* || die
+		rm -f "${D}"/etc/isdn/Makefile
+	fi
+
+	if use bluetooth; then
+		insinto /etc/bluetooth
+		doins bluetooth/* || die
+		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/freebsd-usbin-8.2.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-8.2.ebuild
deleted file mode 100644
index 3e122ac8a959..000000000000
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-8.2.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-8.2.ebuild,v 1.1 2011/07/06 06:09:51 aballier Exp $
-
-EAPI=2
-
-inherit bsdmk freebsd flag-o-matic eutils
-
-DESCRIPTION="FreeBSD /usr/sbin tools"
-SLOT="0"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-
-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}*[usb?,bluetooth?,netware?]
-	=sys-freebsd/freebsd-libexec-${RV}*
-	acpi? ( sys-power/iasl )
-	build? ( sys-apps/baselayout )
-	ssl? ( dev-libs/openssl )
-	tcpd? ( sys-apps/tcp-wrappers )
-	dev-libs/libelf
-	dev-libs/libedit
-	net-libs/libpcap"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-ubin-${RV}*
-	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
-	sys-apps/texinfo
-	sys-devel/flex"
-
-S="${WORKDIR}/usr.sbin"
-
-IUSE="acpi atm audit bluetooth floppy ipv6 isdn minimal netware nis pam ssl tcpd usb build"
-
-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} WITHOUT_ACPI= "
-	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
-	use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= "
-	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
-	use isdn || mymakeopts="${mymakeopts} WITHOUT_I4B= "
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
-	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
-	use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
-	use floppy || mymakeopts="${mymakeopts} WITHOUT_FLOPPY= "
-	use tcpd || mymakeopts="${mymakeopts} NO_WRAP="
-
-	mymakeopts="${mymakeopts} WITHOUT_BIND_NAMED= WITHOUT_BIND_DNSSEC= WITHOUT_PF= WITHOUT_LPR= WITHOUT_SENDMAIL= WITHOUT_AUTHPF= WITHOUT_MAILWRAPPER= "
-}
-
-PATCHES=( "${FILESDIR}/${PN}-7.0-nowrap.patch"
-	"${FILESDIR}/${PN}-adduser.patch"
-	"${FILESDIR}/mountd.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 inetd
-	wpa/wpa_supplicant wpa/hostapd wpa/hostapd_cli wpa/wpa_cli wpa/wpa_passphrase
-	zic amd
-	pkg_install freebsd-update"
-
-src_prepare() {
-	if ! use build; then
-		ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
-		ln -s "/usr/include" "${WORKDIR}/include"
-	else
-		dummy_mk mount_smbfs
-	fi
-	# Don't install mtree format manpage
-	# it's installed by libarchive.
-	sed -e "s: mtree.5::g" -i "${S}"/mtree/Makefile
-}
-
-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} || die
-		if [[ -e "${FILESDIR}"/${util}.confd ]]; then \
-			newconfd "${FILESDIR}"/${util}.confd ${util} || die
-		fi
-	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" || die
-
-	cd "${WORKDIR}/etc"
-	doins apmd.conf syslog.conf newsyslog.conf nscd.conf || die
-
-	insinto /etc/ppp
-	doins ppp/ppp.conf || die
-
-	if use isdn; then
-		insinto /etc/isdn
-		doins isdn/* || die
-		rm -f "${D}"/etc/isdn/Makefile
-	fi
-
-	if use bluetooth; then
-		insinto /etc/bluetooth
-		doins bluetooth/* || die
-		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
-}
-- 
cgit v1.2.3-65-gdbad