Update to 6.1_rc1, install pf.conf as documentation instead than in /etc to avoid confusion with an already in-place configuration file.

(Portage version: 2.1_pre10)

4 files changed, 89 insertions, 3 deletions

diff --git a/sys-freebsd/freebsd-pf/ChangeLog b/sys-freebsd/freebsd-pf/ChangeLog
index 1073392d3da4..ffe926b09c21 100644
--- a/sys-freebsd/freebsd-pf/ChangeLog
+++ b/sys-freebsd/freebsd-pf/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for sys-freebsd/freebsd-pf
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pf/ChangeLog,v 1.5 2006/04/20 07:04:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pf/ChangeLog,v 1.6 2006/05/01 01:37:19 flameeyes Exp $
+
+  01 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  freebsd-pf-6.0-r1.ebuild, +freebsd-pf-6.1_rc1.ebuild:
+  Update to 6.1_rc1, install pf.conf as documentation instead than in /etc to
+  avoid confusion with an already in-place configuration file.
+
+*freebsd-pf-6.1_rc1 (01 May 2006)
+
+  01 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +freebsd-pf-6.1_rc1.ebuild:
+  Update to 6.1_rc1, install pf.conf as documentation instead than in /etc to
+  avoid confusion with an already in-place configuration file.
 
   20 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
   freebsd-pf-6.0-r1.ebuild:
diff --git a/sys-freebsd/freebsd-pf/files/digest-freebsd-pf-6.1_rc1 b/sys-freebsd/freebsd-pf/files/digest-freebsd-pf-6.1_rc1
new file mode 100644
index 000000000000..7ae252c25993
--- /dev/null
+++ b/sys-freebsd/freebsd-pf/files/digest-freebsd-pf-6.1_rc1
@@ -0,0 +1,15 @@
+MD5 fdc3753ea193f97b6e38a6c166923f31 freebsd-contrib-6.1_rc1.tar.bz2 36018347
+RMD160 dc559ff4141e4da0a18056c0d18ce295ba7b7166 freebsd-contrib-6.1_rc1.tar.bz2 36018347
+SHA256 cad60b17700c9f72c4ac023ee085906a61f1df97b0b8c200831ca4599076a865 freebsd-contrib-6.1_rc1.tar.bz2 36018347
+MD5 6e99af8cce64280b02dafb31e8bf7703 freebsd-etc-6.1_rc1.tar.bz2 183866
+RMD160 5f973e0e0dc4418ef50289cd3a6e3f356f3e172a freebsd-etc-6.1_rc1.tar.bz2 183866
+SHA256 c3006c8c0c324be09de7ad0f4873a015257b0510e58d7149c64e84d09a1beb33 freebsd-etc-6.1_rc1.tar.bz2 183866
+MD5 7fc05b60f2d902eaf2355343c3817ba0 freebsd-libexec-6.1_rc1.tar.bz2 277623
+RMD160 7a5ae00e1460d2c683164604ac10d1020d27fbda freebsd-libexec-6.1_rc1.tar.bz2 277623
+SHA256 a661f039bbda5d5dbefba584fc53a7166315c2456432a9bef2be6e3624658d5b freebsd-libexec-6.1_rc1.tar.bz2 277623
+MD5 f601c9da85490b59ee024e5f40ffe840 freebsd-sbin-6.1_rc1.tar.bz2 1156116
+RMD160 f1931df3003d17320be5f898f318af646aae704c freebsd-sbin-6.1_rc1.tar.bz2 1156116
+SHA256 863a8abd229afc049b532137714a681729fec0ff23f1536affcaa71eb14eaf9b freebsd-sbin-6.1_rc1.tar.bz2 1156116
+MD5 d79f570cec1b96e1f58d41fb04e66e6f freebsd-usbin-6.1_rc1.tar.bz2 2663185
+RMD160 9745c19a2de23cfbc8c7325679259dff5cbb71d4 freebsd-usbin-6.1_rc1.tar.bz2 2663185
+SHA256 0db8c33c2edfabec21a31e0a70ee81551e0aeb12856aa9d4a88f5f2e052c11f5 freebsd-usbin-6.1_rc1.tar.bz2 2663185
diff --git a/sys-freebsd/freebsd-pf/freebsd-pf-6.0-r1.ebuild b/sys-freebsd/freebsd-pf/freebsd-pf-6.0-r1.ebuild
index 045e724fa4d2..b07a5d2fe51b 100644
--- a/sys-freebsd/freebsd-pf/freebsd-pf-6.0-r1.ebuild
+++ b/sys-freebsd/freebsd-pf/freebsd-pf-6.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pf/freebsd-pf-6.0-r1.ebuild,v 1.2 2006/04/20 07:04:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pf/freebsd-pf-6.0-r1.ebuild,v 1.3 2006/05/01 01:37:19 flameeyes Exp $
 
 inherit bsdmk freebsd
 
@@ -19,7 +19,7 @@ SRC_URI="mirror://gentoo/${USBIN}.tar.bz2
 
 RDEPEND="net-libs/libpcap"
 DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
+	sys-freebsd/freebsd-mk-defs
 	=sys-freebsd/freebsd-sources-${RV}*"
 
 S="${WORKDIR}"
diff --git a/sys-freebsd/freebsd-pf/freebsd-pf-6.1_rc1.ebuild b/sys-freebsd/freebsd-pf/freebsd-pf-6.1_rc1.ebuild
new file mode 100644
index 000000000000..f67529290735
--- /dev/null
+++ b/sys-freebsd/freebsd-pf/freebsd-pf-6.1_rc1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pf/freebsd-pf-6.1_rc1.ebuild,v 1.1 2006/05/01 01:37:19 flameeyes Exp $
+
+inherit bsdmk freebsd
+
+DESCRIPTION="FreeBSD's base system libraries"
+SLOT="0"
+KEYWORDS="~x86-fbsd"
+
+IUSE=""
+
+# Crypto is needed to have an internal OpenSSL header
+SRC_URI="mirror://gentoo/${USBIN}.tar.bz2
+		mirror://gentoo/${SBIN}.tar.bz2
+		mirror://gentoo/${CONTRIB}.tar.bz2
+		mirror://gentoo/${LIBEXEC}.tar.bz2
+		mirror://gentoo/${ETC}.tar.bz2"
+
+RDEPEND="net-libs/libpcap"
+DEPEND="${RDEPEND}
+	sys-freebsd/freebsd-mk-defs
+	=sys-freebsd/freebsd-sources-${RV}*"
+
+S="${WORKDIR}"
+
+SUBDIRS="libexec/ftp-proxy usr.sbin/authpf sbin/pfctl sbin/pflogd"
+
+PATCHES="${FILESDIR}/${PN}-6.0-pcap.patch"
+
+src_unpack() {
+	freebsd_src_unpack
+
+	ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
+}
+
+src_compile() {
+	for dir in ${SUBDIRS}; do
+		einfo "Starting make in ${dir}"
+		cd "${S}/${dir}"
+		mkmake || die "Make ${dir} failed"
+	done
+}
+
+src_install() {
+	for dir in ${SUBDIRS}; do
+		einfo "Starting install in ${dir}"
+		cd "${S}/${dir}"
+		mkinstall || die "Install ${dir} failed"
+	done
+
+	cd ${WORKDIR}/etc
+	insinto /etc
+	doins pf.os
+	newdoc pf.conf pf.conf.example
+
+	newinitd "${FILESDIR}/pf.initd" pf
+	newconfd "${FILESDIR}/pf.confd" pf
+}