Use the current WITHOUT_ switches, update USE flags and use EAPI=2 to depend on the proper features from the freebsd-lib package.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

3 files changed, 122 insertions, 6 deletions

diff --git a/sys-freebsd/freebsd-sbin/ChangeLog b/sys-freebsd/freebsd-sbin/ChangeLog
index 15cfa219c0a9..d7a0cdc7bd14 100644
--- a/sys-freebsd/freebsd-sbin/ChangeLog
+++ b/sys-freebsd/freebsd-sbin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-freebsd/freebsd-sbin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/ChangeLog,v 1.49 2009/02/24 17:41:32 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/ChangeLog,v 1.50 2009/05/18 17:09:52 flameeyes Exp $
+
+*freebsd-sbin-7.1-r1 (18 May 2009)
+
+  18 May 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  +freebsd-sbin-7.1-r1.ebuild, metadata.xml:
+  Use the current WITHOUT_ switches, update USE flags and use EAPI=2 to
+  depend on the proper features from the freebsd-lib package.
 
   24 Feb 2009; Timothy Redaelli <drizzt@gentoo.org> files/devd.initd:
   Fix devd.initd
diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-7.1-r1.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-7.1-r1.ebuild
new file mode 100644
index 000000000000..b36bbef8a62e
--- /dev/null
+++ b/sys-freebsd/freebsd-sbin/freebsd-sbin-7.1-r1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/freebsd-sbin-7.1-r1.ebuild,v 1.1 2009/05/18 17:09:52 flameeyes Exp $
+
+EAPI=2
+
+inherit flag-o-matic bsdmk freebsd
+
+DESCRIPTION="FreeBSD sbin utils"
+KEYWORDS="~sparc-fbsd ~x86-fbsd"
+SLOT="0"
+
+SRC_URI="mirror://gentoo/${SBIN}.tar.bz2
+	mirror://gentoo/${CONTRIB}.tar.bz2
+	mirror://gentoo/${LIB}.tar.bz2
+	mirror://gentoo/${LIBEXEC}.tar.bz2
+	mirror://gentoo/${USBIN}.tar.bz2
+	mirror://gentoo/${ETC}.tar.bz2
+	build? ( mirror://gentoo/${SYS}.tar.bz2 )"
+
+RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[ipv6?,atm?,netware?]
+	=sys-freebsd/freebsd-libexec-${RV}*
+	ssl? ( dev-libs/openssl )
+	dev-libs/libedit
+	sys-libs/readline
+	sys-process/vixie-cron"
+DEPEND="${RDEPEND}
+	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
+	=sys-freebsd/freebsd-mk-defs-${RV}*"
+
+PROVIDE="virtual/dev-manager"
+
+S="${WORKDIR}/sbin"
+
+IUSE="atm ipfilter +pf ipv6 build ssl +cxx netware"
+
+pkg_setup() {
+	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
+	use cxx || mymakeopts="${mymakeopts} WITHOUT_CXX="
+	use ipfilter || mymakeopts="${mymakeopts} WITHOUT_IPFILTER= "
+	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT="
+	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
+	use pf || mymakeopts="${mymakeopts} WITHOUT_PF= "
+	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL="
+
+	# O3 breaks this, apparently
+	replace-flags -O3 -O2
+}
+
+REMOVE_SUBDIRS="dhclient pfctl pflogd rcorder"
+
+PATCHES="${FILESDIR}/${PN}-setXid.patch
+	${FILESDIR}/${PN}-7.1-zlib.patch
+	${FILESDIR}/${PN}-6.2-ldconfig.patch
+	${FILESDIR}/${PN}-6.1-pr102701.patch"
+
+src_prepare() {
+	use build || ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
+}
+
+src_install() {
+	freebsd_src_install
+	keepdir /var/log
+	# Needed by ldconfig:
+	keepdir /var/run
+
+	# Allow users to use ping and other commands
+	dodir /bin
+	mv "${D}/sbin/ping" "${D}/bin/" || die "mv failed"
+
+	# ext2fs can mount ext3, you just don't get the journalling
+	dosym mount_ext2fs sbin/mount_ext3
+
+	# Do we need pccard.conf if we have devd?
+	# Maybe ship our own sysctl.conf so things like radvd work out of the box.
+	cd "${WORKDIR}/etc/"
+	insinto /etc
+	doins defaults/pccard.conf minfree sysctl.conf
+
+	# initd script for idmapd
+	newinitd "${FILESDIR}/idmapd.initd" idmapd
+
+	# Install a crontab for adjkerntz
+	insinto /etc/cron.d
+	newins "${FILESDIR}/adjkerntz-crontab" adjkerntz
+
+	# Install the periodic stuff (needs probably to be ported in a more
+	# gentooish way)
+	cd "${WORKDIR}/etc/periodic"
+
+	doperiodic security \
+		security/*.ipfwlimit \
+		security/*.ip6fwlimit \
+		security/*.ip6fwdenied \
+		security/*.ipfwdenied
+
+	use ipfilter && doperiodic security \
+		security/*.ipf6denied \
+		security/*.ipfdenied
+}
diff --git a/sys-freebsd/freebsd-sbin/metadata.xml b/sys-freebsd/freebsd-sbin/metadata.xml
index bbebac7ab653..e05b621c037c 100644
--- a/sys-freebsd/freebsd-sbin/metadata.xml
+++ b/sys-freebsd/freebsd-sbin/metadata.xml
@@ -1,9 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>bsd</herd>
-<use>
-	<flag name='ipfilter'>Enable ipfilter firewall support</flag>
-	<flag name='vinum'>Enable vinum support (TODO improve description)</flag>
-</use>
+  <herd>bsd</herd>
+  <use>
+    <flag name='ipfilter'>
+      Build tools to administer the ipfilter firewall.
+    </flag>
+    <flag name='pf'>
+      Build tools to administer the PF firewall.
+    </flag>
+    <flag name='vinum'>Enable vinum support (TODO improve description)</flag>
+    <flag name='netware'>
+      Build libraries and tools to work with NetWare protocols (IPX
+      and NCP).
+    </flag>
+  </use>
 </pkgmetadata>