diff options
author | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-11-01 16:22:07 +0000 |
---|---|---|
committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-11-01 16:22:07 +0000 |
commit | c28bdfd345f2be519d51638e36f2e7e6f8cb2bde (patch) | |
tree | 1e0b570d263cd0718ba4822db0cf0be611269b85 | |
parent | New version (diff) | |
download | historical-c28bdfd345f2be519d51638e36f2e7e6f8cb2bde.tar.gz historical-c28bdfd345f2be519d51638e36f2e7e6f8cb2bde.tar.bz2 historical-c28bdfd345f2be519d51638e36f2e7e6f8cb2bde.zip |
Bump to 6.2_beta3.
Package-Manager: portage-2.1.2_rc1-r1
44 files changed, 2334 insertions, 14 deletions
diff --git a/sys-freebsd/boot0/ChangeLog b/sys-freebsd/boot0/ChangeLog index 20bb0ad0471c..e508ae331bed 100644 --- a/sys-freebsd/boot0/ChangeLog +++ b/sys-freebsd/boot0/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-freebsd/boot0 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/ChangeLog,v 1.14 2006/10/19 04:23:06 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/ChangeLog,v 1.15 2006/11/01 16:06:31 flameeyes Exp $ + +*boot0-6.2_beta3 (01 Nov 2006) + + 01 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> + +boot0-6.2_beta3.ebuild: + Bump to 6.2_beta3. 19 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> ChangeLog: Remove 6.2_beta1 ebuild. diff --git a/sys-freebsd/boot0/boot0-6.2_beta3.ebuild b/sys-freebsd/boot0/boot0-6.2_beta3.ebuild new file mode 100644 index 000000000000..1626b9782566 --- /dev/null +++ b/sys-freebsd/boot0/boot0-6.2_beta3.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/boot0-6.2_beta3.ebuild,v 1.1 2006/11/01 16:06:31 flameeyes Exp $ + +inherit bsdmk freebsd + +DESCRIPTION="FreeBSD's bootloader" +SLOT="0" +KEYWORDS="~sparc-fbsd ~x86-fbsd" + +IUSE="" + +SRC_URI="mirror://gentoo/${SYS}.tar.bz2" + +RDEPEND="" +DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}* + =sys-freebsd/freebsd-lib-${RV}*" + +S="${WORKDIR}/sys/boot" + +PATCHES="${FILESDIR}/boot0-6.0-gentoo.patch + ${FILESDIR}/freebsd-sources-6.2-sparc64.patch" + +src_unpack() { + freebsd_src_unpack + + grep -Zlr -- -ffreestanding "${S}" | xargs -0 sed -i -e \ + "s:-ffreestanding:-ffreestanding $(test-flags -fno-stack-protector -fno-stack-protector-all):g" +} + +src_install() { + dodir /boot/defaults + + mkinstall FILESDIR=/boot || die "mkinstall failed" +} diff --git a/sys-freebsd/boot0/files/digest-boot0-6.2_beta3 b/sys-freebsd/boot0/files/digest-boot0-6.2_beta3 new file mode 100644 index 000000000000..c97be3678ae2 --- /dev/null +++ b/sys-freebsd/boot0/files/digest-boot0-6.2_beta3 @@ -0,0 +1,3 @@ +MD5 328ec3b03995fcab39126e3437cabb72 freebsd-sys-6.2_beta3.tar.bz2 18336143 +RMD160 c75040d96af463013459f3a3278d4cca1d78e828 freebsd-sys-6.2_beta3.tar.bz2 18336143 +SHA256 f52b0bf25d2ae5792503789a1bd47bc0db7924c13df55021c7740dcdd5a4225c freebsd-sys-6.2_beta3.tar.bz2 18336143 diff --git a/sys-freebsd/freebsd-bin/ChangeLog b/sys-freebsd/freebsd-bin/ChangeLog index d762b6e3f77c..b0c25e7d4c13 100644 --- a/sys-freebsd/freebsd-bin/ChangeLog +++ b/sys-freebsd/freebsd-bin/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-freebsd/freebsd-bin # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-bin/ChangeLog,v 1.18 2006/10/19 04:24:22 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-bin/ChangeLog,v 1.19 2006/11/01 16:07:13 flameeyes Exp $ + +*freebsd-bin-6.2_beta3 (01 Nov 2006) + + 01 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> + +freebsd-bin-6.2_beta3.ebuild: + Bump to 6.2_beta3. 19 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> ChangeLog: Remove 6.2_beta1 ebuild. diff --git a/sys-freebsd/freebsd-bin/files/digest-freebsd-bin-6.2_beta3 b/sys-freebsd/freebsd-bin/files/digest-freebsd-bin-6.2_beta3 new file mode 100644 index 000000000000..6bd6d6387eeb --- /dev/null +++ b/sys-freebsd/freebsd-bin/files/digest-freebsd-bin-6.2_beta3 @@ -0,0 +1,9 @@ +MD5 970652322ed9c43dbea19ef7b2a9ac46 freebsd-bin-6.2_beta3.tar.bz2 406777 +RMD160 00ab818df6f9ff1d2befb93ed81499188bd42475 freebsd-bin-6.2_beta3.tar.bz2 406777 +SHA256 2864fa9d634eb10cef60abb0672dc30f21a59e98a70f3a8275460b1efa39d2be freebsd-bin-6.2_beta3.tar.bz2 406777 +MD5 035e7b7d5f8dddcbe9e3c2d44428574b freebsd-lib-6.2_beta3.tar.bz2 2668544 +RMD160 9b21ec424b2b86c0dfa252322e9784ebddce3e53 freebsd-lib-6.2_beta3.tar.bz2 2668544 +SHA256 7aed09b38fedeb174bfd91caa8c2f38240c2f5a0c21d4c50e7eaef5a42daba09 freebsd-lib-6.2_beta3.tar.bz2 2668544 +MD5 eb865a625203b8e38934c840fffb04aa freebsd-sbin-6.2_beta3.tar.bz2 1163107 +RMD160 96d7e0a7ca0ce57084e6cc915316d6b2e4db256c freebsd-sbin-6.2_beta3.tar.bz2 1163107 +SHA256 b7fe3971602ecd88bcbdcddd73379e3a13bb94d9b820ab751593e662d12a56b4 freebsd-sbin-6.2_beta3.tar.bz2 1163107 diff --git a/sys-freebsd/freebsd-bin/freebsd-bin-6.2_beta3.ebuild b/sys-freebsd/freebsd-bin/freebsd-bin-6.2_beta3.ebuild new file mode 100644 index 000000000000..15fb4578611f --- /dev/null +++ b/sys-freebsd/freebsd-bin/freebsd-bin-6.2_beta3.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-bin/freebsd-bin-6.2_beta3.ebuild,v 1.1 2006/11/01 16:07:13 flameeyes Exp $ + +inherit bsdmk freebsd + +DESCRIPTION="FreeBSD /bin tools" +SLOT="0" +KEYWORDS="~sparc-fbsd ~x86-fbsd" + +IUSE="nls" + +SRC_URI="mirror://gentoo/${BIN}.tar.bz2 + mirror://gentoo/${SBIN}.tar.bz2 + mirror://gentoo/${LIB}.tar.bz2" + +RDEPEND="=sys-freebsd/freebsd-lib-${RV}* + sys-libs/ncurses + sys-apps/ed + !app-admin/realpath" +DEPEND="${RDEPEND} + =sys-freebsd/freebsd-mk-defs-${RV}* + >=sys-devel/flex-2.5.31-r2" + +S=${WORKDIR}/bin + +PATCHES="${FILESDIR}/${PN}-6.0-flex-2.5.31.patch + ${FILESDIR}/${PN}-6.2-mkdir-posix.patch" + +pkg_setup() { + use nls || mymakeopts="${mymakeopts} NO_NLS= " + + mymakeopts="${mymakeopts} NO_TCSH= NO_SENDMAIL= NO_OPENSSL= NO_CRYPT= NO_RCMDS= " +} + +# csh and tcsh are provided by tcsh package, rmail is sendmail stuff. +REMOVE_SUBDIRS="csh rmail ed" diff --git a/sys-freebsd/freebsd-contrib/ChangeLog b/sys-freebsd/freebsd-contrib/ChangeLog index 6688c5d34e9d..65929c7374fc 100644 --- a/sys-freebsd/freebsd-contrib/ChangeLog +++ b/sys-freebsd/freebsd-contrib/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-freebsd/freebsd-contrib # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/ChangeLog,v 1.14 2006/10/19 04:26:11 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/ChangeLog,v 1.15 2006/11/01 16:08:09 flameeyes Exp $ + +*freebsd-contrib-6.2_beta3 (01 Nov 2006) + + 01 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> + +freebsd-contrib-6.2_beta3.ebuild: + Bump to 6.2_beta3. 19 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> ChangeLog: Remove 6.2_beta1 ebuild. diff --git a/sys-freebsd/freebsd-contrib/files/digest-freebsd-contrib-6.2_beta3 b/sys-freebsd/freebsd-contrib/files/digest-freebsd-contrib-6.2_beta3 new file mode 100644 index 000000000000..3a297c7534c7 --- /dev/null +++ b/sys-freebsd/freebsd-contrib/files/digest-freebsd-contrib-6.2_beta3 @@ -0,0 +1,9 @@ +MD5 0d8585db6146130649e10b502957eee6 freebsd-contrib-6.2_beta3.tar.bz2 36555171 +RMD160 630c839a0025811a4c2da5de560150fe00d4ed28 freebsd-contrib-6.2_beta3.tar.bz2 36555171 +SHA256 51c0b85ff28b6b9d85092e51a0fe2a9ae9bb9714a50495713236e0c162e8ee0b freebsd-contrib-6.2_beta3.tar.bz2 36555171 +MD5 4873a3aede8a8c121cab7b37c28487b5 freebsd-gcc-3.4.2.tar.bz2 8447406 +RMD160 bb9d525baee03e8d0b3897baf0c3b7b36d7941f2 freebsd-gcc-3.4.2.tar.bz2 8447406 +SHA256 9946c986c73ddad8085a94771cac59755fd1c53e3d7cd2841817bdfd5cccd31f freebsd-gcc-3.4.2.tar.bz2 8447406 +MD5 c40f56e6128c1f1d9a56e6e9e4067f15 freebsd-gnu-6.2_beta3.tar.bz2 872912 +RMD160 2f6607a68a0abc52fdef86985f21cc442ffb9072 freebsd-gnu-6.2_beta3.tar.bz2 872912 +SHA256 ecde4d432f0c5d9846f248280695ed44aa7d0fe95674654ad152aca8ba9afecc freebsd-gnu-6.2_beta3.tar.bz2 872912 diff --git a/sys-freebsd/freebsd-contrib/freebsd-contrib-6.2_beta3.ebuild b/sys-freebsd/freebsd-contrib/freebsd-contrib-6.2_beta3.ebuild new file mode 100644 index 000000000000..8142923df507 --- /dev/null +++ b/sys-freebsd/freebsd-contrib/freebsd-contrib-6.2_beta3.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/freebsd-contrib-6.2_beta3.ebuild,v 1.1 2006/11/01 16:08:10 flameeyes Exp $ + +inherit bsdmk freebsd flag-o-matic + +GCC="freebsd-gcc-3.4.2" + +DESCRIPTION="Contributed sources for FreeBSD." +SLOT="0" +KEYWORDS="~sparc-fbsd ~x86-fbsd" +LICENSE="BSD GPL-2 as-is" + +IUSE="ssl kerberos" + +SRC_URI="mirror://gentoo/${GNU}.tar.bz2 + mirror://gentoo/${GCC}.tar.bz2 + mirror://gentoo/${P}.tar.bz2" + +RDEPEND="kerberos? ( virtual/krb5 ) + ssl? ( dev-libs/openssl )" +DEPEND="${RDEPEND} + =sys-freebsd/freebsd-sources-${RV}* + =sys-freebsd/freebsd-mk-defs-${RV}*" + +S="${WORKDIR}/gnu" + +pkg_setup() { + if use kerberos && ! use ssl; then + error "You can't install with kerberos support and no ssl support" + fi + + use ssl || mymakeopts="${mymakeopts} NO_OPENSSL= NO_CRYPT= " + use kerberos || mymakeopts="${mymakeopts} NO_KERBEROS= " +} + +REMOVE_SUBDIRS="lib/libg2c lib/libgcc lib/libgcc_r lib/libgcov lib/libiberty + lib/libobjc lib/libreadline lib/libregex lib/libstdc++ lib/libsupc++ usr.bin/bc + usr.bin/binutils usr.bin/cc usr.bin/cpio usr.bin/cvs usr.bin/dc usr.bin/dialog + usr.bin/diff usr.bin/diff3 usr.bin/gdb usr.bin/gperf usr.bin/grep usr.bin/groff + usr.bin/gzip usr.bin/man usr.bin/rcs usr.bin/sdiff usr.bin/send-pr + usr.bin/tar usr.bin/texinfo" + +PATCHES="${FILESDIR}/${PN}-5.3-lib_csu-makefile.patch + ${FILESDIR}/${PN}-6.2-sparc64.patch" + +src_install() { + freebsd_src_install + + # Move these to /bin for boot access + dodir /bin + mv "${D}/usr/bin/sort" "${D}/bin/" || die "mv failed" +} diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog index 91370700f7f6..526c753bcb53 100644 --- a/sys-freebsd/freebsd-lib/ChangeLog +++ b/sys-freebsd/freebsd-lib/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-freebsd/freebsd-lib # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.38 2006/10/26 18:21:14 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.39 2006/11/01 16:09:32 flameeyes Exp $ + +*freebsd-lib-6.2_beta3 (01 Nov 2006) + + 01 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> + +freebsd-lib-6.2_beta3.ebuild: + Bump to 6.2_beta3. 26 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> freebsd-lib-6.1.ebuild, freebsd-lib-6.2_beta2.ebuild: diff --git a/sys-freebsd/freebsd-lib/files/digest-freebsd-lib-6.2_beta3 b/sys-freebsd/freebsd-lib/files/digest-freebsd-lib-6.2_beta3 new file mode 100644 index 000000000000..c017a5bd53a2 --- /dev/null +++ b/sys-freebsd/freebsd-lib/files/digest-freebsd-lib-6.2_beta3 @@ -0,0 +1,24 @@ +MD5 0d8585db6146130649e10b502957eee6 freebsd-contrib-6.2_beta3.tar.bz2 36555171 +RMD160 630c839a0025811a4c2da5de560150fe00d4ed28 freebsd-contrib-6.2_beta3.tar.bz2 36555171 +SHA256 51c0b85ff28b6b9d85092e51a0fe2a9ae9bb9714a50495713236e0c162e8ee0b freebsd-contrib-6.2_beta3.tar.bz2 36555171 +MD5 c9d71fbf45d01f0ace8dbd6e977ba0ff freebsd-crypto-6.2_beta3.tar.bz2 4033439 +RMD160 1c7680fe08f6e026d3a5b4370552d04c8438f1cc freebsd-crypto-6.2_beta3.tar.bz2 4033439 +SHA256 0cff4034fd45611b9acfde941773f50588303ef5b1d848055ecb8eb8cba5e518 freebsd-crypto-6.2_beta3.tar.bz2 4033439 +MD5 81b97dc47668e566a803b9469b96d969 freebsd-etc-6.2_beta3.tar.bz2 188295 +RMD160 7b4e5f22cdb6b23b0379c285001379390f176136 freebsd-etc-6.2_beta3.tar.bz2 188295 +SHA256 8d79f1e1e9b8453c0431dd9112b51a09a2ed8db7c288e6eb76347b0030eacf89 freebsd-etc-6.2_beta3.tar.bz2 188295 +MD5 7d9b4fff0e69139ed253a1db9cb0fa63 freebsd-include-6.2_beta3.tar.bz2 131608 +RMD160 7bbc4c99f04752366a5d67a7ce8edc56c0807ec3 freebsd-include-6.2_beta3.tar.bz2 131608 +SHA256 5ce85fe6c6c2cc0e6bc4502d838f52820d06c1dc19c270583f2469edc466ca9a freebsd-include-6.2_beta3.tar.bz2 131608 +MD5 035e7b7d5f8dddcbe9e3c2d44428574b freebsd-lib-6.2_beta3.tar.bz2 2668544 +RMD160 9b21ec424b2b86c0dfa252322e9784ebddce3e53 freebsd-lib-6.2_beta3.tar.bz2 2668544 +SHA256 7aed09b38fedeb174bfd91caa8c2f38240c2f5a0c21d4c50e7eaef5a42daba09 freebsd-lib-6.2_beta3.tar.bz2 2668544 +MD5 359a25029a4dd656e43d83890740dd13 freebsd-libexec-6.2_beta3.tar.bz2 277158 +RMD160 91353b9c0bb7fc254b0a57d55f07b095a06909c9 freebsd-libexec-6.2_beta3.tar.bz2 277158 +SHA256 ce19db01248c1c805636e271056a4f99c8bbe1e2b76def47875dcf6e5bdafdf4 freebsd-libexec-6.2_beta3.tar.bz2 277158 +MD5 328ec3b03995fcab39126e3437cabb72 freebsd-sys-6.2_beta3.tar.bz2 18336143 +RMD160 c75040d96af463013459f3a3278d4cca1d78e828 freebsd-sys-6.2_beta3.tar.bz2 18336143 +SHA256 f52b0bf25d2ae5792503789a1bd47bc0db7924c13df55021c7740dcdd5a4225c freebsd-sys-6.2_beta3.tar.bz2 18336143 +MD5 5266789afea7e22eef8cbbbcf322c7ae freebsd-usbin-6.2_beta3.tar.bz2 2695369 +RMD160 09e6b00f27ee49418e807fd565966f534fb5f0a3 freebsd-usbin-6.2_beta3.tar.bz2 2695369 +SHA256 14fd08cee425c734abb24fa08e6ccf1c69de7b5e9b569cf77459c04fca096db4 freebsd-usbin-6.2_beta3.tar.bz2 2695369 diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-6.2_beta3.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-6.2_beta3.ebuild new file mode 100644 index 000000000000..4bc32ec754cd --- /dev/null +++ b/sys-freebsd/freebsd-lib/freebsd-lib-6.2_beta3.ebuild @@ -0,0 +1,255 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-6.2_beta3.ebuild,v 1.1 2006/11/01 16:09:32 flameeyes Exp $ + +inherit bsdmk freebsd flag-o-matic toolchain-funcs + +DESCRIPTION="FreeBSD's base system libraries" +SLOT="6.0" +KEYWORDS="~sparc-fbsd ~x86-fbsd" + +IUSE="atm bluetooth ssl ipv6 kerberos nis gpib build bootstrap" + +# Crypto is needed to have an internal OpenSSL header +# sys is needed for libalias, probably we can just extract that instead of +# extracting the whole tarball +SRC_URI="mirror://gentoo/${LIB}.tar.bz2 + mirror://gentoo/${CONTRIB}.tar.bz2 + mirror://gentoo/${CRYPTO}.tar.bz2 + mirror://gentoo/${LIBEXEC}.tar.bz2 + mirror://gentoo/${ETC}.tar.bz2 + mirror://gentoo/${INCLUDE}.tar.bz2 + nis? ( mirror://gentoo/${USBIN}.tar.bz2 ) + build? ( + mirror://gentoo/${SYS}.tar.bz2 )" + +if [[ ${CATEGORY/cross-} == ${CATEGORY} ]]; then + RDEPEND="ssl? ( dev-libs/openssl ) + kerberos? ( virtual/krb5 ) + !sys-freebsd/freebsd-headers" + DEPEND="${RDEPEND} + >=sys-devel/flex-2.5.31-r2 + =sys-freebsd/freebsd-sources-${RV}* + !bootstrap? ( app-arch/bzip2 )" + + PROVIDE="virtual/libc + virtual/os-headers" + +else + SRC_URI="${SRC_URI} + mirror://gentoo/${SYS}.tar.bz2" +fi + +DEPEND="${DEPEND} + =sys-freebsd/freebsd-mk-defs-${RV}*" + +S="${WORKDIR}/lib" + +export CTARGET=${CTARGET:-${CHOST}} +if [[ ${CTARGET} == ${CHOST} && ${CATEGORY/cross-} != ${CATEGORY} ]]; then + export CTARGET=${CATEGORY/cross-} +fi + +pkg_setup() { + [[ -c /dev/zero ]] || \ + die "You forgot to mount /dev; the compiled libc would break." + + if ! use ssl && use kerberos; then + eerror "If you want kerberos support you need to enable ssl support, too." + fi + + use atm || mymakeopts="${mymakeopts} NO_ATM= " + use bluetooth || mymakeopts="${mymakeopts} NO_BLUETOOTH= " + use ssl || mymakeopts="${mymakeopts} NO_OPENSSL= NO_CRYPT= " + use ipv6 || mymakeopts="${mymakeopts} NO_INET6= " + use kerberos || mymakeopts="${mymakeopts} NO_KERBEROS= " + use nis || mymakeopts="${mymakeopts} NO_NIS= " + use gpib || mymakeopts="${mymakeopts} NO_GPIB= " + + mymakeopts="${mymakeopts} NO_OPENSSH= NO_BIND= NO_SENDMAIL= " + + replace-flags "-O?" -"O1" + + if [[ ${CTARGET} != ${CHOST} ]]; then + mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})" + mymakeopts="${mymakeopts} MACHINE_ARCH=$(tc-arch-kernel ${CTARGET})" + fi +} + +PATCHES="${FILESDIR}/${PN}-bsdxml.patch + ${FILESDIR}/${PN}-fixmp.patch + ${FILESDIR}/${PN}-6.0-pmc.patch + ${FILESDIR}/${PN}-6.0-gccfloat.patch + ${FILESDIR}/${PN}-6.0-flex-2.5.31.patch + ${FILESDIR}/${PN}-6.0-binutils-asm.patch + ${FILESDIR}/${PN}-6.0-ssp.patch + ${FILESDIR}/${PN}-6.1-csu.patch + ${FILESDIR}/${PN}-6.2-gcc41.patch + ${FILESDIR}/${PN}-6.2-sparc64.patch" + +# Here we disable and remove source which we don't need or want +# In order: +# - ncurses stuff +# - archiving libraries (have their own ebuild) +# - sendmail libraries (they are installed by sendmail) +# - SNMP library and dependency (have their own ebuilds) +# +# The rest are libraries we already have somewhere else because +# they are contribution. +# Note: libtelnet is an internal lib used by telnet and telnetd programs +# as it's not used in freebsd-lib package itself, it's pointless building +# it here. +REMOVE_SUBDIRS="libncurses libform libmenu libpanel \ + libz libbz2 libarchive \ + libsm libsmdb libsmutil \ + libbegemot libbsnmp \ + libsmb libpam libpcap bind libwrap libmagic \ + libcom_err libtelnet" + +src_unpack() { + freebsd_src_unpack + + sed -i -e 's:-o/dev/stdout:-t:' ${S}/libc/net/Makefile.inc + + use build && return 0 + + if [[ ${CTARGET} == ${CHOST} ]]; then + ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" + else + sed -i -e 's:/usr/include:/usr/'${CTARGET}'/usr/include:g' \ + "${S}/libc/"{yp,rpc}"/Makefile.inc" + fi + + [[ -n $(install --version 2> /dev/null | grep GNU) ]] && \ + sed -i -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile" + + # Let arch-specific includes to be found + local machine + machine=$(tc-arch-kernel ${CTARGET}) + ln -s "${WORKDIR}/sys/${machine}/include" "${WORKDIR}/include/machine" + + use bootstrap && dummy_mk libstand +} + +src_compile() { + cd "${WORKDIR}/include" + $(freebsd_get_bmake) CC=$(tc-getCC) || die "make include failed" + + use crosscompile_opts_headers-only && return 0 + + # Don't use ssp until properly fixed + append-flags $(test-flags -fno-stack-protector -fno-stack-protector-all) + + strip-flags + if [[ ${CTARGET} != ${CHOST} ]]; then + export YACC='yacc -by' + CHOST=${CTARGET} tc-export CC LD CXX + + local machine + machine=$(tc-arch-kernel ${CTARGET}) + + local csudir + if [[ -d "${S}/csu/${machine}-elf" ]]; then + csudir="${S}/csu/${machine}-elf" + else + csudir="${S}/csu/${machine}" + fi + cd "${csudir}" + $(freebsd_get_bmake) ${mymakeopts} || die "make csu failed" + + append-flags "-isystem /usr/${CTARGET}/usr/include" + append-flags "-B ${csudir}" + append-ldflags "-B ${csudir}" + cd "${S}/libc" + $(freebsd_get_bmake) ${mymakeopts} || die "make libc failed" + + append-flags "-isystem ${WORKDIR}/lib/msun/${machine/i386/i387}" + cd "${S}/msun" + $(freebsd_get_bmake) ${mymakeopts} || die "make libc failed" + else + # Forces to use the local copy of headers as they might be outdated in + # the system + append-flags "-isystem '${WORKDIR}/sys' -isystem '${WORKDIR}/include'" + + cd "${S}" + NOFLAGSTRIP=yes freebsd_src_compile + fi +} + +src_install() { + cd "${WORKDIR}/include" + + [[ ${CTARGET} == ${CHOST} ]] \ + && INCLUDEDIR="/usr/include" \ + || INCLUDEDIR="/usr/${CTARGET}/usr/include" + + einfo "Installing for ${CTARGET} in ${CHOST}.." + + dodir "${INCLUDEDIR}" + $(freebsd_get_bmake) installincludes \ + MACHINE=$(tc-arch-kernel) \ + DESTDIR="${D}" INCLUDEDIR="${INCLUDEDIR}" || die "Install failed" + + # Install math.h when crosscompiling, at this point + if [[ ${CHOST} != ${CTARGET} ]]; then + insinto "/usr/${CTARGET}/usr/include" + doins "${S}/msun/src/math.h" + fi + + use crosscompile_opts_headers-only && return 0 + + if [[ ${CTARGET} != ${CHOST} ]]; then + local csudir + if [[ -d "${S}/csu/$(tc-arch-kernel ${CTARGET})-elf" ]]; then + csudir="${S}/csu/$(tc-arch-kernel ${CTARGET})-elf" + else + csudir="${S}/csu/$(tc-arch-kernel ${CTARGET})" + fi + cd "${csudir}" + $(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install \ + FILESDIR="/usr/${CTARGET}/usr/lib" || die "Install csu failed" + + cd "${S}/libc" + $(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \ + SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install failed" + + cd "${S}/msun" + $(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \ + INCLUDEDIR="/usr/${CTARGET}/usr/include" \ + SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install failed" + + dosym "usr/include" "/usr/${CTARGET}/sys-include" + else + cd "${S}" + mkinstall || die "Install failed" + fi + + # Don't install the rest of the configuration files if crosscompiling + [[ ${CTARGET} != ${CHOST} ]] && return 0 + + # Compatibility symlinks to run FreeBSD 5.x binaries (ABI is mostly + # identical, remove when problems will actually happen) + dosym /lib/libc.so.6 /usr/lib/libc.so.5 + dosym /lib/libm.so.4 /usr/lib/libm.so.3 + + # install libstand files + dodir /usr/include/libstand + insinto /usr/include/libstand + doins "${S}"/libstand/*.h + + cd "${WORKDIR}/etc/" + insinto /etc + doins auth.conf nls.alias mac.conf netconfig + + # Install ttys file + doins "etc.$(tc-arch-kernel)"/* + + dodir /etc/sandbox.d + cat - > "${D}"/etc/sandbox.d/00freebsd <<EOF +# /dev/crypto is used mostly by OpenSSL on *BSD platforms +# leave it available as packages might use OpenSSL commands +# during compile or install phase. +SANDBOX_PREDICT="/dev/crypto" +EOF +} + diff --git a/sys-freebsd/freebsd-libexec/ChangeLog b/sys-freebsd/freebsd-libexec/ChangeLog index 10cec15d2529..8e5baea95a3b 100644 --- a/sys-freebsd/freebsd-libexec/ChangeLog +++ b/sys-freebsd/freebsd-libexec/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-freebsd/freebsd-libexec # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/ChangeLog,v 1.16 2006/10/19 04:30:02 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/ChangeLog,v 1.17 2006/11/01 16:11:04 flameeyes Exp $ + +*freebsd-libexec-6.2_beta3 (01 Nov 2006) + + 01 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> + +freebsd-libexec-6.2_beta3.ebuild: + Bump to 6.2_beta3. 19 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> ChangeLog: Remove 6.2_beta1 ebuild. diff --git a/sys-freebsd/freebsd-libexec/files/digest-freebsd-libexec-6.2_beta3 b/sys-freebsd/freebsd-libexec/files/digest-freebsd-libexec-6.2_beta3 new file mode 100644 index 000000000000..f3400539044c --- /dev/null +++ b/sys-freebsd/freebsd-libexec/files/digest-freebsd-libexec-6.2_beta3 @@ -0,0 +1,21 @@ +MD5 970652322ed9c43dbea19ef7b2a9ac46 freebsd-bin-6.2_beta3.tar.bz2 406777 +RMD160 00ab818df6f9ff1d2befb93ed81499188bd42475 freebsd-bin-6.2_beta3.tar.bz2 406777 +SHA256 2864fa9d634eb10cef60abb0672dc30f21a59e98a70f3a8275460b1efa39d2be freebsd-bin-6.2_beta3.tar.bz2 406777 +MD5 0d8585db6146130649e10b502957eee6 freebsd-contrib-6.2_beta3.tar.bz2 36555171 +RMD160 630c839a0025811a4c2da5de560150fe00d4ed28 freebsd-contrib-6.2_beta3.tar.bz2 36555171 +SHA256 51c0b85ff28b6b9d85092e51a0fe2a9ae9bb9714a50495713236e0c162e8ee0b freebsd-contrib-6.2_beta3.tar.bz2 36555171 +MD5 81b97dc47668e566a803b9469b96d969 freebsd-etc-6.2_beta3.tar.bz2 188295 +RMD160 7b4e5f22cdb6b23b0379c285001379390f176136 freebsd-etc-6.2_beta3.tar.bz2 188295 +SHA256 8d79f1e1e9b8453c0431dd9112b51a09a2ed8db7c288e6eb76347b0030eacf89 freebsd-etc-6.2_beta3.tar.bz2 188295 +MD5 035e7b7d5f8dddcbe9e3c2d44428574b freebsd-lib-6.2_beta3.tar.bz2 2668544 +RMD160 9b21ec424b2b86c0dfa252322e9784ebddce3e53 freebsd-lib-6.2_beta3.tar.bz2 2668544 +SHA256 7aed09b38fedeb174bfd91caa8c2f38240c2f5a0c21d4c50e7eaef5a42daba09 freebsd-lib-6.2_beta3.tar.bz2 2668544 +MD5 359a25029a4dd656e43d83890740dd13 freebsd-libexec-6.2_beta3.tar.bz2 277158 +RMD160 91353b9c0bb7fc254b0a57d55f07b095a06909c9 freebsd-libexec-6.2_beta3.tar.bz2 277158 +SHA256 ce19db01248c1c805636e271056a4f99c8bbe1e2b76def47875dcf6e5bdafdf4 freebsd-libexec-6.2_beta3.tar.bz2 277158 +MD5 4813858b8cce889a4df943aab5645f3d freebsd-ubin-6.2_beta3.tar.bz2 1774931 +RMD160 1985cb50d6502f519560296794c550072032ded6 freebsd-ubin-6.2_beta3.tar.bz2 1774931 +SHA256 779057f40046a46a7d12b519494a450960d12e15384d312e84ea472bf273b39c freebsd-ubin-6.2_beta3.tar.bz2 1774931 +MD5 5266789afea7e22eef8cbbbcf322c7ae freebsd-usbin-6.2_beta3.tar.bz2 2695369 +RMD160 09e6b00f27ee49418e807fd565966f534fb5f0a3 freebsd-usbin-6.2_beta3.tar.bz2 2695369 +SHA256 14fd08cee425c734abb24fa08e6ccf1c69de7b5e9b569cf77459c04fca096db4 freebsd-usbin-6.2_beta3.tar.bz2 2695369 diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-6.2_beta3.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-6.2_beta3.ebuild new file mode 100644 index 000000000000..521854595cdb --- /dev/null +++ b/sys-freebsd/freebsd-libexec/freebsd-libexec-6.2_beta3.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/freebsd-libexec-6.2_beta3.ebuild,v 1.1 2006/11/01 16:11:04 flameeyes Exp $ + +inherit bsdmk freebsd pam + +DESCRIPTION="FreeBSD libexec things" +SLOT="0" +KEYWORDS="~sparc-fbsd ~x86-fbsd" + +IUSE="pam ssl kerberos ipv6 nis" + +SRC_URI="mirror://gentoo/${LIBEXEC}.tar.bz2 + mirror://gentoo/${UBIN}.tar.bz2 + mirror://gentoo/${BIN}.tar.bz2 + mirror://gentoo/${CONTRIB}.tar.bz2 + mirror://gentoo/${LIB}.tar.bz2 + mirror://gentoo/${ETC}.tar.bz2 + mirror://gentoo/${USBIN}.tar.bz2" + +RDEPEND="=sys-freebsd/freebsd-lib-${RV}* + pam? ( virtual/pam )" +DEPEND="${RDEPEND} + =sys-freebsd/freebsd-mk-defs-${RV}* + =sys-freebsd/freebsd-sources-${RV}*" + +S="${WORKDIR}/libexec" + +pkg_setup() { + use pam || mymakeopts="${mymakeopts} NO_PAM= " + use ssl || mymakeopts="${mymakeopts} NO_OPENSSL= NO_CRYPT= " + use kerberos || mymakeopts="${mymakeopts} NO_KERBEROS= " + use ipv6 || mymakeopts="${mymakeopts} NO_INET6= " + use nis || mymakeopts="${mymakeopts} NO_NIS= " + + mymakeopts="${mymakeopts} NO_SENDMAIL= NO_PF= " +} + +src_compile() { + NOSSP_FLAGS="$(test-flags -fno-stack-protector -fno-stack-protector-all)" + export NOSSP_FLAGS + freebsd_src_compile +} + +PATCHES="${FILESDIR}/${PN}-setXid.patch + ${FILESDIR}/${PN}-5.3_rc1-ypxfr-makefile.patch + ${FILESDIR}/${PN}-nossp.patch + ${FILESDIR}/${PN}-6.1-libfallback.patch + ${FILESDIR}/${PN}-6.2-sparc64.patch" + +# Remove sendmail, tcp_wrapper and other useless stuff +REMOVE_SUBDIRS="smrsh mail.local tcpd telnetd rshd rlogind lukemftpd ftpd" + +src_install() { + freebsd_src_install + + insinto /etc + cd "${WORKDIR}/etc" + doins gettytab +} diff --git a/sys-freebsd/freebsd-mk-defs/ChangeLog b/sys-freebsd/freebsd-mk-defs/ChangeLog index abc78e046cac..cbf8378b2b88 100644 --- a/sys-freebsd/freebsd-mk-defs/ChangeLog +++ b/sys-freebsd/freebsd-mk-defs/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-freebsd/freebsd-mk-defs # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/ChangeLog,v 1.21 2006/10/22 22:20:38 drizzt Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/ChangeLog,v 1.22 2006/11/01 16:11:57 flameeyes Exp $ + +*freebsd-mk-defs-6.2_beta3 (01 Nov 2006) + + 01 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> + +files/freebsd-mk-defs-6.2-gentoo.patch, + +freebsd-mk-defs-6.2_beta3.ebuild: + Bump to 6.2_beta3. 22 Oct 2006; Timothy Redaelli <drizzt@gentoo.org> freebsd-mk-defs-6.2_beta2.ebuild: diff --git a/sys-freebsd/freebsd-mk-defs/files/digest-freebsd-mk-defs-6.2_beta3 b/sys-freebsd/freebsd-mk-defs/files/digest-freebsd-mk-defs-6.2_beta3 new file mode 100644 index 000000000000..478ab2b45ff2 --- /dev/null +++ b/sys-freebsd/freebsd-mk-defs/files/digest-freebsd-mk-defs-6.2_beta3 @@ -0,0 +1,3 @@ +MD5 fa6bb20557a10c91aa17754e16d50ed5 freebsd-share-6.2_beta3.tar.bz2 3762922 +RMD160 f0b994a3f1d37f0c278ac55ab961a4e06a877e4f freebsd-share-6.2_beta3.tar.bz2 3762922 +SHA256 f849f7a5d8be6c96b95fb197581f8271af8ab344a1036566e36c8de87d2e1a76 freebsd-share-6.2_beta3.tar.bz2 3762922 diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.2-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.2-gentoo.patch new file mode 100644 index 000000000000..aba8b4f76604 --- /dev/null +++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.2-gentoo.patch @@ -0,0 +1,314 @@ +Index: fbsd-6.2b3/share/mk/bsd.doc.mk +=================================================================== +--- fbsd-6.2b3.orig/share/mk/bsd.doc.mk ++++ fbsd-6.2b3/share/mk/bsd.doc.mk +@@ -137,10 +137,12 @@ CLEANFILES+= ${DOC}.ascii ${DOC}.ascii${ + realinstall: + .for _dev in ${PRINTERDEVICE:Mhtml} + cd ${SRCDIR}; \ ++ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME} + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME} + .endfor + .for _dev in ${PRINTERDEVICE:Nhtml} ++ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME} + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME} + .endfor +Index: fbsd-6.2b3/share/mk/bsd.files.mk +=================================================================== +--- fbsd-6.2b3.orig/share/mk/bsd.files.mk ++++ fbsd-6.2b3/share/mk/bsd.files.mk +@@ -39,6 +39,7 @@ ${group}NAME_${file:T}?= ${file:T} + .endif + installfiles: _${group}INS_${file:T} + _${group}INS_${file:T}: ${file} ++ ${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC}}/${${group}NAME_${.ALLSRC:T}:H} + ${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \ + -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ + ${.ALLSRC} \ +@@ -51,10 +52,12 @@ _${group}FILES+= ${file} + installfiles: _${group}INS + _${group}INS: ${_${group}FILES} + .if defined(${group}NAME) ++ ${INSTALL} -d ${DESTDIR}${${group}DIR}/${${group}NAME} + ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \ + -m ${${group}MODE} ${.ALLSRC} \ + ${DESTDIR}${${group}DIR}/${${group}NAME} + .else ++ ${INSTALL} -d ${DESTDIR}${${group}DIR} + ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \ + -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR} + .endif +Index: fbsd-6.2b3/share/mk/bsd.incs.mk +=================================================================== +--- fbsd-6.2b3.orig/share/mk/bsd.incs.mk ++++ fbsd-6.2b3/share/mk/bsd.incs.mk +@@ -39,6 +39,10 @@ ${group}NAME_${header:T}?= ${header:T} + .endif + installincludes: _${group}INS_${header:T} + _${group}INS_${header:T}: ${header} ++ ++ ${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \ ++ -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ ++ ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}} + ${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \ + -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ + ${.ALLSRC} \ +@@ -51,9 +55,11 @@ _${group}INCS+= ${header} + installincludes: _${group}INS + _${group}INS: ${_${group}INCS} + .if defined(${group}NAME) ++ ${INSTALL} -d ${DESTDIR}${${group}DIR} + ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ + ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME} + .else ++ ${INSTALL} -d ${DESTDIR}${${group}DIR} + ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ + ${.ALLSRC} ${DESTDIR}${${group}DIR} + .endif +Index: fbsd-6.2b3/share/mk/bsd.info.mk +=================================================================== +--- fbsd-6.2b3.orig/share/mk/bsd.info.mk ++++ fbsd-6.2b3/share/mk/bsd.info.mk +@@ -85,6 +85,7 @@ INFO2HTML?= info2html + TEX?= tex + DVIPS?= dvips + DVIPS2ASCII?= dvips2ascii ++INSTALL?= install + + .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html + +@@ -146,12 +147,14 @@ ${x:S/$/${ICOMPRESS_EXT}/}: ${x} + INSTALLINFODIRS+= ${x:S/$/-install/} + ${x:S/$/-install/}: + .if !empty(.MAKEFLAGS:M-j) ++ ${INSTALL} -d ${DESTDIR}${INFODIR}/${INFODIRFILE} + lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \ + ${INSTALLINFO} ${INSTALLINFOFLAGS} \ + --defsection=${INFOSECTION} \ + --defentry=${INFOENTRY_${x}} \ + ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE} + .else ++ ${INSTALL} -d ${DESTDIR}${INFODIR}/${INFODIRFILE} + ${INSTALLINFO} ${INSTALLINFOFLAGS} \ + --defsection=${INFOSECTION} \ + --defentry=${INFOENTRY_${x}} \ +Index: fbsd-6.2b3/share/mk/bsd.lib.mk +=================================================================== +--- fbsd-6.2b3.orig/share/mk/bsd.lib.mk ++++ fbsd-6.2b3/share/mk/bsd.lib.mk +@@ -32,10 +32,6 @@ CFLAGS+= ${CRUNCH_CFLAGS} + CFLAGS+= ${DEBUG_FLAGS} + .endif + +-.if !defined(DEBUG_FLAGS) +-STRIP?= -s +-.endif +- + .include <bsd.libnames.mk> + + # prefer .s to a .c, add .po, remove stuff not used in the BSD libraries +@@ -208,14 +204,17 @@ realinstall: _libinstall + .ORDER: beforeinstall _libinstall + _libinstall: + .if defined(LIB) && !empty(LIB) && !defined(NO_INSTALLLIB) ++ ${INSTALL} -d ${DESTDIR}${LIBDIR} + ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR} + .endif + .if !defined(NO_PROFILE) && defined(LIB) && !empty(LIB) ++ ${INSTALL} -d ${DESTDIR}${LIBDIR} + ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR} + .endif + .if defined(SHLIB_NAME) ++ ${INSTALL} -d ${DESTDIR}${SHLIBDIR} + ${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \ + ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR} +Index: fbsd-6.2b3/share/mk/bsd.man.mk +=================================================================== +--- fbsd-6.2b3.orig/share/mk/bsd.man.mk ++++ fbsd-6.2b3/share/mk/bsd.man.mk +@@ -165,9 +165,11 @@ _maninstall: ${MAN} + .if defined(NO_MANCOMPRESS) + .if defined(MANFILTER) + .for page in ${MAN} ++ ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page} + ${MINSTALL} ${page:T:S/$/${FILTEXTENSION}/g} \ + ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page} + .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) ++ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page} + ${MINSTALL} ${page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \ + ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page} + .endif +@@ -181,11 +183,14 @@ _maninstall: ${MAN} + esac; \ + page=$$1; shift; sect=$$1; shift; \ + d=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}; \ ++ ${ECHO} ${INSTALL} -d $${d}; \ ++ ${INSTALL} -d $${d}; \ + ${ECHO} ${MINSTALL} $${page} $${d}; \ + ${MINSTALL} $${page} $${d}; \ + done + .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) + .for page in ${MAN} ++ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T} + ${MINSTALL} ${page:T:S/$/${CATEXT}/} \ + ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T} + .endfor +@@ -193,9 +198,11 @@ _maninstall: ${MAN} + .endif + .else + .for page in ${MAN} ++ ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR} + ${MINSTALL} ${page:T:S/$/${MCOMPRESS_EXT}/g} \ + ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR} + .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) ++ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT}/} + ${MINSTALL} ${page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \ + ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT}/} + .endif +Index: fbsd-6.2b3/share/mk/bsd.prog.mk +=================================================================== +--- fbsd-6.2b3.orig/share/mk/bsd.prog.mk ++++ fbsd-6.2b3/share/mk/bsd.prog.mk +@@ -18,10 +18,6 @@ CFLAGS+=${DEBUG_FLAGS} + CFLAGS+=${CRUNCH_CFLAGS} + .endif + +-.if !defined(DEBUG_FLAGS) +-STRIP?= -s +-.endif +- + .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO") + LDFLAGS+= -static + .endif +@@ -133,9 +129,11 @@ realinstall: _proginstall + _proginstall: + .if defined(PROG) + .if defined(PROGNAME) ++ ${INSTALL} -d ${DESTDIR}${BINDIR} + ${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME} + .else ++ ${INSTALL} -d ${DESTDIR}${BINDIR} + ${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR} + .endif +@@ -163,6 +161,7 @@ SCRIPTSGRP_${script:T}?= ${SCRIPTSGRP} + SCRIPTSMODE_${script:T}?= ${SCRIPTSMODE} + _scriptsinstall: _SCRIPTSINS_${script:T} + _SCRIPTSINS_${script:T}: ${script} ++ ${INSTALL} -d ${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}} + ${INSTALL} -o ${SCRIPTSOWN_${.ALLSRC:T}} \ + -g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \ + ${.ALLSRC} \ +Index: fbsd-6.2b3/share/mk/sys.mk +=================================================================== +--- fbsd-6.2b3.orig/share/mk/sys.mk ++++ fbsd-6.2b3/share/mk/sys.mk +@@ -19,7 +19,7 @@ unix ?= We run FreeBSD, not UNIX. + .SUFFIXES: .out .a .ln .o .c .cc .cpp .cxx .C .m .F .f .e .r .y .l .S .asm .s .cl .p .h .sh + .endif + +-X11BASE ?= /usr/X11R6 ++X11BASE ?= /usr + + AR ?= ar + .if defined(%POSIX) +@@ -34,13 +34,13 @@ AFLAGS ?= + + .if defined(%POSIX) + CC ?= c89 +-CFLAGS ?= -O ++CFLAGS ?= + .else +-CC ?= cc +-CFLAGS ?= -O2 -fno-strict-aliasing -pipe ++CC ?= gcc ++CFLAGS ?= -pipe + .endif + +-CXX ?= c++ ++CXX ?= g++ + CXXFLAGS ?= ${CFLAGS:N-std=*:N-Wnested-externs:N-W*-prototypes} + + CPP ?= cpp +@@ -252,12 +252,6 @@ YFLAGS ?= -d + ${CC} ${CFLAGS} ${LDFLAGS} ${.PREFIX}.tmp.c ${LDLIBS} -ll -o ${.TARGET} + rm -f ${.PREFIX}.tmp.c + +-# FreeBSD build pollution. Hide it in the non-POSIX part of the ifdef. +-__MAKE_CONF?=/etc/make.conf +-.if exists(${__MAKE_CONF}) +-.include "${__MAKE_CONF}" +-.endif +- + # Default executable format + # XXX hint for bsd.port.mk + OBJFORMAT?= elf +Index: fbsd-6.2b3/share/mk/bsd.libnames.mk +=================================================================== +--- fbsd-6.2b3.orig/share/mk/bsd.libnames.mk ++++ fbsd-6.2b3/share/mk/bsd.libnames.mk +@@ -41,7 +41,7 @@ LIBDISK?= ${DESTDIR}${LIBDIR}/libdisk.a + LIBDNS?= ${DESTDIR}${LIBDIR}/libdns.a + LIBEDIT?= ${DESTDIR}${LIBDIR}/libedit.a + LIBFETCH?= ${DESTDIR}${LIBDIR}/libfetch.a +-LIBFL?= "don't use LIBFL, use LIBL" ++LIBFL?= ${DESTDIR}${LIBDOR}/libfl.a + LIBFORM?= ${DESTDIR}${LIBDIR}/libform.a + LIBFTPIO?= ${DESTDIR}${LIBDIR}/libftpio.a + LIBG2C?= ${DESTDIR}${LIBDIR}/libg2c.a +@@ -66,7 +66,7 @@ LIBKEYCAP?= ${DESTDIR}${LIBDIR}/libkeyca + LIBKICONV?= ${DESTDIR}${LIBDIR}/libkiconv.a + LIBKRB5?= ${DESTDIR}${LIBDIR}/libkrb5.a + LIBKVM?= ${DESTDIR}${LIBDIR}/libkvm.a +-LIBL?= ${DESTDIR}${LIBDIR}/libl.a ++LIBL?= ${DESTDIR}${LIBDOR}/libfl.a + LIBLN?= "don't use LIBLN, use LIBL" + .if !defined(NO_BIND) + LIBLWRES?= ${DESTDIR}${LIBDIR}/liblwres.a +Index: fbsd-6.2b3/share/mk/bsd.own.mk +=================================================================== +--- fbsd-6.2b3.orig/share/mk/bsd.own.mk ++++ fbsd-6.2b3/share/mk/bsd.own.mk +@@ -157,10 +157,8 @@ NLSMODE?= ${NOBINMODE} + + INCLUDEDIR?= /usr/include + +-# Common variables +-.if !defined(DEBUG_FLAGS) +-STRIP?= -s +-.endif ++# Don't strip things with install command, leave that to portage ++STRIP= + + COMPRESS_CMD?= gzip -cn + COMPRESS_EXT?= .gz +Index: fbsd-6.2b3/share/mk/bsd.sys.mk +=================================================================== +--- fbsd-6.2b3.orig/share/mk/bsd.sys.mk ++++ fbsd-6.2b3/share/mk/bsd.sys.mk +@@ -27,9 +27,6 @@ CFLAGS += -std=${CSTD} + . if defined(WARNS) + . if ${WARNS} >= 1 + CWARNFLAGS += -Wsystem-headers +-. if !defined(NO_WERROR) +-CWARNFLAGS += -Werror +-. endif + . endif + . if ${WARNS} >= 2 + CWARNFLAGS += -Wall -Wno-format-y2k +@@ -60,9 +57,6 @@ WFORMAT = 1 + . if ${WFORMAT} > 0 + #CWARNFLAGS += -Wformat-nonliteral -Wformat-security -Wno-format-extra-args + CWARNFLAGS += -Wformat=2 -Wno-format-extra-args +-. if !defined(NO_WERROR) +-CWARNFLAGS += -Werror +-. endif + . endif + . endif + .endif diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-6.2_beta3.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-6.2_beta3.ebuild new file mode 100644 index 000000000000..ebe060668ae3 --- /dev/null +++ b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-6.2_beta3.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-6.2_beta3.ebuild,v 1.1 2006/11/01 16:11:57 flameeyes Exp $ + +inherit bsdmk freebsd + +DESCRIPTION="Makefiles definitions used for building and installing libraries and system files" +SLOT="0" +KEYWORDS="~amd64 ~sparc-fbsd ~x86 ~x86-fbsd" + +IUSE="" + +SRC_URI="mirror://gentoo/${SHARE}.tar.bz2" + +RDEPEND="" +DEPEND="" + +RESTRICT="nostrip" + +S="${WORKDIR}/share/mk" + +src_unpack() { + unpack ${A} + cd ${WORKDIR}/share + epatch "${FILESDIR}/${PN}-6.2-gentoo.patch" + + [[ ${CHOST} != *-*bsd* || ${CHOST} == *-gnu ]] && \ + epatch "${FILESDIR}/${PN}-6.0-gnu.patch" +} + +src_compile() { + einfo "Nothing to compile" +} + +src_install() { + if [[ ${CHOST} != *-freebsd* ]]; then + insinto /usr/share/mk/freebsd + else + insinto /usr/share/mk + fi + doins *.mk +} diff --git a/sys-freebsd/freebsd-pam-modules/ChangeLog b/sys-freebsd/freebsd-pam-modules/ChangeLog index 29f709b0a071..999328f67de4 100644 --- a/sys-freebsd/freebsd-pam-modules/ChangeLog +++ b/sys-freebsd/freebsd-pam-modules/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-freebsd/freebsd-pam-modules # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pam-modules/ChangeLog,v 1.13 2006/10/19 04:32:38 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pam-modules/ChangeLog,v 1.14 2006/11/01 16:12:36 flameeyes Exp $ + +*freebsd-pam-modules-6.2_beta3 (01 Nov 2006) + + 01 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> + +freebsd-pam-modules-6.2_beta3.ebuild: + Bump to 6.2_beta3. 19 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> ChangeLog: Remove 6.2_beta1 ebuild. diff --git a/sys-freebsd/freebsd-pam-modules/files/digest-freebsd-pam-modules-6.2_beta3 b/sys-freebsd/freebsd-pam-modules/files/digest-freebsd-pam-modules-6.2_beta3 new file mode 100644 index 000000000000..0e7342e473af --- /dev/null +++ b/sys-freebsd/freebsd-pam-modules/files/digest-freebsd-pam-modules-6.2_beta3 @@ -0,0 +1,3 @@ +MD5 035e7b7d5f8dddcbe9e3c2d44428574b freebsd-lib-6.2_beta3.tar.bz2 2668544 +RMD160 9b21ec424b2b86c0dfa252322e9784ebddce3e53 freebsd-lib-6.2_beta3.tar.bz2 2668544 +SHA256 7aed09b38fedeb174bfd91caa8c2f38240c2f5a0c21d4c50e7eaef5a42daba09 freebsd-lib-6.2_beta3.tar.bz2 2668544 diff --git a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-6.2_beta3.ebuild b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-6.2_beta3.ebuild new file mode 100644 index 000000000000..043c564d4c3e --- /dev/null +++ b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-6.2_beta3.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-6.2_beta3.ebuild,v 1.1 2006/11/01 16:12:36 flameeyes Exp $ + +inherit bsdmk freebsd multilib pam + +DESCRIPTION="FreeBSD's PAM authentication modules" +SLOT="0" +KEYWORDS="~sparc-fbsd ~x86-fbsd" + +IUSE="kerberos nis" + +SRC_URI="mirror://gentoo/${LIB}.tar.bz2" + +RDEPEND=">=sys-auth/openpam-20050201-r1 + kerberos? ( dev-libs/openssl + virtual/krb5 )" +DEPEND="${RDEPEND} + =sys-freebsd/freebsd-mk-defs-${RV}* + =sys-freebsd/freebsd-sources-${RV}*" + +S=${WORKDIR}/lib/libpam/modules + +pkg_setup() { + # Avoid installing pam_ssh as that has its own ebuild. + mymakeopts="${mymakeopts} NO_OPENSSH= " + use kerberos || mymakeopts="${mymakeopts} NO_KERBEROS= " + use nis || mymakeopts="${mymakeopts} NO_NIS= " +} + +src_unpack() { + unpack ${A} + + cd ${WORKDIR}/lib + + for module in pam_deny pam_passwdqc pam_permit; do + sed -i -e "s:${module}::" ${S}/modules.inc + done + + # Avoid using static versions; use gentoo /lib/security dir + epatch ${FILESDIR}/${PN}-6.0-gentoo.patch +} + +src_install() { + mkinstall "LIBDIR=/$(get_libdir)/security" || die "install failed" + + dodoc "${FILESDIR}/5.4/README.pamd" + dopamd "${FILESDIR}/5.4/pam.d/"* +} diff --git a/sys-freebsd/freebsd-pf/ChangeLog b/sys-freebsd/freebsd-pf/ChangeLog index cebf19b20aa7..0c359bcc0afb 100644 --- a/sys-freebsd/freebsd-pf/ChangeLog +++ b/sys-freebsd/freebsd-pf/ChangeLog @@ -1,6 +1,12 @@ # 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.14 2006/10/19 04:34:13 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pf/ChangeLog,v 1.15 2006/11/01 16:13:35 flameeyes Exp $ + +*freebsd-pf-6.2_beta3 (01 Nov 2006) + + 01 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> + +freebsd-pf-6.2_beta3.ebuild: + Bump to 6.2_beta3. 19 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> ChangeLog: Remove 6.2_beta1 ebuild. diff --git a/sys-freebsd/freebsd-pf/files/digest-freebsd-pf-6.2_beta3 b/sys-freebsd/freebsd-pf/files/digest-freebsd-pf-6.2_beta3 new file mode 100644 index 000000000000..d7097ed2c10c --- /dev/null +++ b/sys-freebsd/freebsd-pf/files/digest-freebsd-pf-6.2_beta3 @@ -0,0 +1,12 @@ +MD5 0d8585db6146130649e10b502957eee6 freebsd-contrib-6.2_beta3.tar.bz2 36555171 +RMD160 630c839a0025811a4c2da5de560150fe00d4ed28 freebsd-contrib-6.2_beta3.tar.bz2 36555171 +SHA256 51c0b85ff28b6b9d85092e51a0fe2a9ae9bb9714a50495713236e0c162e8ee0b freebsd-contrib-6.2_beta3.tar.bz2 36555171 +MD5 81b97dc47668e566a803b9469b96d969 freebsd-etc-6.2_beta3.tar.bz2 188295 +RMD160 7b4e5f22cdb6b23b0379c285001379390f176136 freebsd-etc-6.2_beta3.tar.bz2 188295 +SHA256 8d79f1e1e9b8453c0431dd9112b51a09a2ed8db7c288e6eb76347b0030eacf89 freebsd-etc-6.2_beta3.tar.bz2 188295 +MD5 eb865a625203b8e38934c840fffb04aa freebsd-sbin-6.2_beta3.tar.bz2 1163107 +RMD160 96d7e0a7ca0ce57084e6cc915316d6b2e4db256c freebsd-sbin-6.2_beta3.tar.bz2 1163107 +SHA256 b7fe3971602ecd88bcbdcddd73379e3a13bb94d9b820ab751593e662d12a56b4 freebsd-sbin-6.2_beta3.tar.bz2 1163107 +MD5 5266789afea7e22eef8cbbbcf322c7ae freebsd-usbin-6.2_beta3.tar.bz2 2695369 +RMD160 09e6b00f27ee49418e807fd565966f534fb5f0a3 freebsd-usbin-6.2_beta3.tar.bz2 2695369 +SHA256 14fd08cee425c734abb24fa08e6ccf1c69de7b5e9b569cf77459c04fca096db4 freebsd-usbin-6.2_beta3.tar.bz2 2695369 diff --git a/sys-freebsd/freebsd-pf/freebsd-pf-6.2_beta3.ebuild b/sys-freebsd/freebsd-pf/freebsd-pf-6.2_beta3.ebuild new file mode 100644 index 000000000000..7ec2a94eeccf --- /dev/null +++ b/sys-freebsd/freebsd-pf/freebsd-pf-6.2_beta3.ebuild @@ -0,0 +1,58 @@ +# 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.2_beta3.ebuild,v 1.1 2006/11/01 16:13:35 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/${ETC}.tar.bz2" + +RDEPEND="net-libs/libpcap" +DEPEND="${RDEPEND} + sys-freebsd/freebsd-mk-defs + =sys-freebsd/freebsd-sources-${RV}*" + +S="${WORKDIR}" + +SUBDIRS="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 +} diff --git a/sys-freebsd/freebsd-rescue/ChangeLog b/sys-freebsd/freebsd-rescue/ChangeLog index 3671360f98d0..40cd23549673 100644 --- a/sys-freebsd/freebsd-rescue/ChangeLog +++ b/sys-freebsd/freebsd-rescue/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-freebsd/freebsd-rescue # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-rescue/ChangeLog,v 1.11 2006/10/19 04:36:25 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-rescue/ChangeLog,v 1.12 2006/11/01 16:14:58 flameeyes Exp $ + +*freebsd-rescue-6.2_beta3 (01 Nov 2006) + + 01 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> + +freebsd-rescue-6.2_beta3.ebuild: + Bump to 6.2_beta3. 19 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> ChangeLog: Remove 6.2_beta1 ebuild. diff --git a/sys-freebsd/freebsd-rescue/files/digest-freebsd-rescue-6.2_beta3 b/sys-freebsd/freebsd-rescue/files/digest-freebsd-rescue-6.2_beta3 new file mode 100644 index 000000000000..748ef87845ca --- /dev/null +++ b/sys-freebsd/freebsd-rescue/files/digest-freebsd-rescue-6.2_beta3 @@ -0,0 +1,30 @@ +MD5 970652322ed9c43dbea19ef7b2a9ac46 freebsd-bin-6.2_beta3.tar.bz2 406777 +RMD160 00ab818df6f9ff1d2befb93ed81499188bd42475 freebsd-bin-6.2_beta3.tar.bz2 406777 +SHA256 2864fa9d634eb10cef60abb0672dc30f21a59e98a70f3a8275460b1efa39d2be freebsd-bin-6.2_beta3.tar.bz2 406777 +MD5 0d8585db6146130649e10b502957eee6 freebsd-contrib-6.2_beta3.tar.bz2 36555171 +RMD160 630c839a0025811a4c2da5de560150fe00d4ed28 freebsd-contrib-6.2_beta3.tar.bz2 36555171 +SHA256 51c0b85ff28b6b9d85092e51a0fe2a9ae9bb9714a50495713236e0c162e8ee0b freebsd-contrib-6.2_beta3.tar.bz2 36555171 +MD5 c40f56e6128c1f1d9a56e6e9e4067f15 freebsd-gnu-6.2_beta3.tar.bz2 872912 +RMD160 2f6607a68a0abc52fdef86985f21cc442ffb9072 freebsd-gnu-6.2_beta3.tar.bz2 872912 +SHA256 ecde4d432f0c5d9846f248280695ed44aa7d0fe95674654ad152aca8ba9afecc freebsd-gnu-6.2_beta3.tar.bz2 872912 +MD5 035e7b7d5f8dddcbe9e3c2d44428574b freebsd-lib-6.2_beta3.tar.bz2 2668544 +RMD160 9b21ec424b2b86c0dfa252322e9784ebddce3e53 freebsd-lib-6.2_beta3.tar.bz2 2668544 +SHA256 7aed09b38fedeb174bfd91caa8c2f38240c2f5a0c21d4c50e7eaef5a42daba09 freebsd-lib-6.2_beta3.tar.bz2 2668544 +MD5 359a25029a4dd656e43d83890740dd13 freebsd-libexec-6.2_beta3.tar.bz2 277158 +RMD160 91353b9c0bb7fc254b0a57d55f07b095a06909c9 freebsd-libexec-6.2_beta3.tar.bz2 277158 +SHA256 ce19db01248c1c805636e271056a4f99c8bbe1e2b76def47875dcf6e5bdafdf4 freebsd-libexec-6.2_beta3.tar.bz2 277158 +MD5 37ba917556ef61bb6ae8da710dd1916f freebsd-rescue-6.2_beta3.tar.bz2 4943 +RMD160 52d223fbc87e53955f2932971ba83d51e3780ae5 freebsd-rescue-6.2_beta3.tar.bz2 4943 +SHA256 ce9ac82a97629d6440731b5ce386e55ae16031be65e4ce16c2650db224ac053a freebsd-rescue-6.2_beta3.tar.bz2 4943 +MD5 eb865a625203b8e38934c840fffb04aa freebsd-sbin-6.2_beta3.tar.bz2 1163107 +RMD160 96d7e0a7ca0ce57084e6cc915316d6b2e4db256c freebsd-sbin-6.2_beta3.tar.bz2 1163107 +SHA256 b7fe3971602ecd88bcbdcddd73379e3a13bb94d9b820ab751593e662d12a56b4 freebsd-sbin-6.2_beta3.tar.bz2 1163107 +MD5 328ec3b03995fcab39126e3437cabb72 freebsd-sys-6.2_beta3.tar.bz2 18336143 +RMD160 c75040d96af463013459f3a3278d4cca1d78e828 freebsd-sys-6.2_beta3.tar.bz2 18336143 +SHA256 f52b0bf25d2ae5792503789a1bd47bc0db7924c13df55021c7740dcdd5a4225c freebsd-sys-6.2_beta3.tar.bz2 18336143 +MD5 4813858b8cce889a4df943aab5645f3d freebsd-ubin-6.2_beta3.tar.bz2 1774931 +RMD160 1985cb50d6502f519560296794c550072032ded6 freebsd-ubin-6.2_beta3.tar.bz2 1774931 +SHA256 779057f40046a46a7d12b519494a450960d12e15384d312e84ea472bf273b39c freebsd-ubin-6.2_beta3.tar.bz2 1774931 +MD5 5266789afea7e22eef8cbbbcf322c7ae freebsd-usbin-6.2_beta3.tar.bz2 2695369 +RMD160 09e6b00f27ee49418e807fd565966f534fb5f0a3 freebsd-usbin-6.2_beta3.tar.bz2 2695369 +SHA256 14fd08cee425c734abb24fa08e6ccf1c69de7b5e9b569cf77459c04fca096db4 freebsd-usbin-6.2_beta3.tar.bz2 2695369 diff --git a/sys-freebsd/freebsd-rescue/freebsd-rescue-6.2_beta3.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-6.2_beta3.ebuild new file mode 100644 index 000000000000..dde3bfd61d48 --- /dev/null +++ b/sys-freebsd/freebsd-rescue/freebsd-rescue-6.2_beta3.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-rescue/freebsd-rescue-6.2_beta3.ebuild,v 1.1 2006/11/01 16:14:58 flameeyes Exp $ + +inherit bsdmk freebsd + +DESCRIPTION="FreeBSD's rescue binaries" +SLOT="0" +KEYWORDS="~x86-fbsd" + +IUSE="atm nis" + +SRC_URI="mirror://gentoo/${UBIN}.tar.bz2 + mirror://gentoo/${CONTRIB}.tar.bz2 + mirror://gentoo/${LIB}.tar.bz2 + mirror://gentoo/${BIN}.tar.bz2 + mirror://gentoo/${SBIN}.tar.bz2 + mirror://gentoo/${USBIN}.tar.bz2 + mirror://gentoo/${GNU}.tar.bz2 + mirror://gentoo/${SYS}.tar.bz2 + mirror://gentoo/${LIBEXEC}.tar.bz2 + mirror://gentoo/${RESCUE}.tar.bz2" + +RDEPEND="" +DEPEND="sys-devel/flex + =sys-freebsd/freebsd-sources-${RV}* + =sys-freebsd/freebsd-mk-defs-${RV}*" + +S="${WORKDIR}/rescue" + +pkg_setup() { + use atm || mymakeopts="${mymakeopts} NO_ATM= " + use nis || mymakeopts="${mymakeopts} NO_NIS= " + + for flag in atm nis; do + if use ${flag} && ! built_with_use sys-libs/freebsd-lib ${flag}; then + die "You can't add ${flag} support here without adding it to sys-libs/freebsd-lib" + fi + done + +# append-flags -fno-stack-protector -fno-stack-protector-all +} + +src_unpack() { + freebsd_src_unpack + + # As they are patches from ${WORKDIR} apply them by hand + cd ${WORKDIR} + epatch ${FILESDIR}/${PN}-5.4-gentoo.patch + epatch ${FILESDIR}/${PN}-5.4-sbin-gentoo.patch +} diff --git a/sys-freebsd/freebsd-sbin/ChangeLog b/sys-freebsd/freebsd-sbin/ChangeLog index e655e9614758..d8ec6e1e3c3a 100644 --- a/sys-freebsd/freebsd-sbin/ChangeLog +++ b/sys-freebsd/freebsd-sbin/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-freebsd/freebsd-sbin # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/ChangeLog,v 1.25 2006/10/24 18:29:24 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/ChangeLog,v 1.26 2006/11/01 16:16:35 flameeyes Exp $ + +*freebsd-sbin-6.2_beta3 (01 Nov 2006) + + 01 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> + +freebsd-sbin-6.2_beta3.ebuild: + Bump to 6.2_beta3. 24 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> freebsd-sbin-6.1.ebuild, freebsd-sbin-6.2_beta2.ebuild: diff --git a/sys-freebsd/freebsd-sbin/files/digest-freebsd-sbin-6.2_beta3 b/sys-freebsd/freebsd-sbin/files/digest-freebsd-sbin-6.2_beta3 new file mode 100644 index 000000000000..2b673638054f --- /dev/null +++ b/sys-freebsd/freebsd-sbin/files/digest-freebsd-sbin-6.2_beta3 @@ -0,0 +1,21 @@ +MD5 0d8585db6146130649e10b502957eee6 freebsd-contrib-6.2_beta3.tar.bz2 36555171 +RMD160 630c839a0025811a4c2da5de560150fe00d4ed28 freebsd-contrib-6.2_beta3.tar.bz2 36555171 +SHA256 51c0b85ff28b6b9d85092e51a0fe2a9ae9bb9714a50495713236e0c162e8ee0b freebsd-contrib-6.2_beta3.tar.bz2 36555171 +MD5 81b97dc47668e566a803b9469b96d969 freebsd-etc-6.2_beta3.tar.bz2 188295 +RMD160 7b4e5f22cdb6b23b0379c285001379390f176136 freebsd-etc-6.2_beta3.tar.bz2 188295 +SHA256 8d79f1e1e9b8453c0431dd9112b51a09a2ed8db7c288e6eb76347b0030eacf89 freebsd-etc-6.2_beta3.tar.bz2 188295 +MD5 035e7b7d5f8dddcbe9e3c2d44428574b freebsd-lib-6.2_beta3.tar.bz2 2668544 +RMD160 9b21ec424b2b86c0dfa252322e9784ebddce3e53 freebsd-lib-6.2_beta3.tar.bz2 2668544 +SHA256 7aed09b38fedeb174bfd91caa8c2f38240c2f5a0c21d4c50e7eaef5a42daba09 freebsd-lib-6.2_beta3.tar.bz2 2668544 +MD5 359a25029a4dd656e43d83890740dd13 freebsd-libexec-6.2_beta3.tar.bz2 277158 +RMD160 91353b9c0bb7fc254b0a57d55f07b095a06909c9 freebsd-libexec-6.2_beta3.tar.bz2 277158 +SHA256 ce19db01248c1c805636e271056a4f99c8bbe1e2b76def47875dcf6e5bdafdf4 freebsd-libexec-6.2_beta3.tar.bz2 277158 +MD5 eb865a625203b8e38934c840fffb04aa freebsd-sbin-6.2_beta3.tar.bz2 1163107 +RMD160 96d7e0a7ca0ce57084e6cc915316d6b2e4db256c freebsd-sbin-6.2_beta3.tar.bz2 1163107 +SHA256 b7fe3971602ecd88bcbdcddd73379e3a13bb94d9b820ab751593e662d12a56b4 freebsd-sbin-6.2_beta3.tar.bz2 1163107 +MD5 328ec3b03995fcab39126e3437cabb72 freebsd-sys-6.2_beta3.tar.bz2 18336143 +RMD160 c75040d96af463013459f3a3278d4cca1d78e828 freebsd-sys-6.2_beta3.tar.bz2 18336143 +SHA256 f52b0bf25d2ae5792503789a1bd47bc0db7924c13df55021c7740dcdd5a4225c freebsd-sys-6.2_beta3.tar.bz2 18336143 +MD5 5266789afea7e22eef8cbbbcf322c7ae freebsd-usbin-6.2_beta3.tar.bz2 2695369 +RMD160 09e6b00f27ee49418e807fd565966f534fb5f0a3 freebsd-usbin-6.2_beta3.tar.bz2 2695369 +SHA256 14fd08cee425c734abb24fa08e6ccf1c69de7b5e9b569cf77459c04fca096db4 freebsd-usbin-6.2_beta3.tar.bz2 2695369 diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-6.2_beta3.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-6.2_beta3.ebuild new file mode 100644 index 000000000000..acd5e1ae267e --- /dev/null +++ b/sys-freebsd/freebsd-sbin/freebsd-sbin-6.2_beta3.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/freebsd-sbin-6.2_beta3.ebuild,v 1.1 2006/11/01 16:16:35 flameeyes Exp $ + +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}* + =sys-freebsd/freebsd-libexec-${RV}* + ssl? ( dev-libs/openssl ) + 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 ipv6 vinum suid ssl build" + +pkg_setup() { + use atm || mymakeopts="${mymakeopts} NO_ATM= " + use ipfilter || mymakeopts="${mymakeopts} NO_IPFILTER= " + use ipv6 || mymakeopts="${mymakeopts} NO_INET6= " + use vinum || mymakeopts="${mymakeopts} NO_VINUM= " + use suid || mymakeopts="${mymakeopts} NO_SUID= " + + # O3 breaks this, apparently + replace-flags -O3 -O2 +} + +REMOVE_SUBDIRS="dhclient pfctl pflogd rcorder" + +PATCHES="${FILESDIR}/${PN}-setXid.patch + ${FILESDIR}/${PN}-zlib.patch + ${FILESDIR}/${PN}-6.1-pr102701.patch" + +src_unpack() { + freebsd_src_unpack + use build || ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" +} + +src_install() { + freebsd_src_install + keepdir /var/log + + # Allow users to use ping and other commands + dodir /bin + mv "${D}/sbin/ping" "${D}/bin/" || die "mv failed" + + newinitd "${FILESDIR}/devd.initd" devd + newinitd "${FILESDIR}/ipfw.initd" ipfw + newinitd "${FILESDIR}/sysctl.initd" sysctl + + # Gentoo devd.conf + # devd_queue is a filter so that only the last event is applied to an + # init script + insinto /etc + newins "${FILESDIR}/devd.conf" devd.conf + exeinto /etc + newexe "${FILESDIR}/devd_queue" devd_queue + + # 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 + + # 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-share/ChangeLog b/sys-freebsd/freebsd-share/ChangeLog index e7a4c138a4ce..f764f3923d8c 100644 --- a/sys-freebsd/freebsd-share/ChangeLog +++ b/sys-freebsd/freebsd-share/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-freebsd/freebsd-share # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/ChangeLog,v 1.18 2006/10/19 04:41:04 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/ChangeLog,v 1.19 2006/11/01 16:17:56 flameeyes Exp $ + +*freebsd-share-6.2_beta3 (01 Nov 2006) + + 01 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> + +freebsd-share-6.2_beta3.ebuild: + Bump to 6.2_beta3. 19 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> ChangeLog: Remove 6.2_beta1 ebuild. diff --git a/sys-freebsd/freebsd-share/files/digest-freebsd-share-6.2_beta3 b/sys-freebsd/freebsd-share/files/digest-freebsd-share-6.2_beta3 new file mode 100644 index 000000000000..37188311f9fa --- /dev/null +++ b/sys-freebsd/freebsd-share/files/digest-freebsd-share-6.2_beta3 @@ -0,0 +1,27 @@ +MD5 970652322ed9c43dbea19ef7b2a9ac46 freebsd-bin-6.2_beta3.tar.bz2 406777 +RMD160 00ab818df6f9ff1d2befb93ed81499188bd42475 freebsd-bin-6.2_beta3.tar.bz2 406777 +SHA256 2864fa9d634eb10cef60abb0672dc30f21a59e98a70f3a8275460b1efa39d2be freebsd-bin-6.2_beta3.tar.bz2 406777 +MD5 0d8585db6146130649e10b502957eee6 freebsd-contrib-6.2_beta3.tar.bz2 36555171 +RMD160 630c839a0025811a4c2da5de560150fe00d4ed28 freebsd-contrib-6.2_beta3.tar.bz2 36555171 +SHA256 51c0b85ff28b6b9d85092e51a0fe2a9ae9bb9714a50495713236e0c162e8ee0b freebsd-contrib-6.2_beta3.tar.bz2 36555171 +MD5 81b97dc47668e566a803b9469b96d969 freebsd-etc-6.2_beta3.tar.bz2 188295 +RMD160 7b4e5f22cdb6b23b0379c285001379390f176136 freebsd-etc-6.2_beta3.tar.bz2 188295 +SHA256 8d79f1e1e9b8453c0431dd9112b51a09a2ed8db7c288e6eb76347b0030eacf89 freebsd-etc-6.2_beta3.tar.bz2 188295 +MD5 c40f56e6128c1f1d9a56e6e9e4067f15 freebsd-gnu-6.2_beta3.tar.bz2 872912 +RMD160 2f6607a68a0abc52fdef86985f21cc442ffb9072 freebsd-gnu-6.2_beta3.tar.bz2 872912 +SHA256 ecde4d432f0c5d9846f248280695ed44aa7d0fe95674654ad152aca8ba9afecc freebsd-gnu-6.2_beta3.tar.bz2 872912 +MD5 035e7b7d5f8dddcbe9e3c2d44428574b freebsd-lib-6.2_beta3.tar.bz2 2668544 +RMD160 9b21ec424b2b86c0dfa252322e9784ebddce3e53 freebsd-lib-6.2_beta3.tar.bz2 2668544 +SHA256 7aed09b38fedeb174bfd91caa8c2f38240c2f5a0c21d4c50e7eaef5a42daba09 freebsd-lib-6.2_beta3.tar.bz2 2668544 +MD5 eb865a625203b8e38934c840fffb04aa freebsd-sbin-6.2_beta3.tar.bz2 1163107 +RMD160 96d7e0a7ca0ce57084e6cc915316d6b2e4db256c freebsd-sbin-6.2_beta3.tar.bz2 1163107 +SHA256 b7fe3971602ecd88bcbdcddd73379e3a13bb94d9b820ab751593e662d12a56b4 freebsd-sbin-6.2_beta3.tar.bz2 1163107 +MD5 fa6bb20557a10c91aa17754e16d50ed5 freebsd-share-6.2_beta3.tar.bz2 3762922 +RMD160 f0b994a3f1d37f0c278ac55ab961a4e06a877e4f freebsd-share-6.2_beta3.tar.bz2 3762922 +SHA256 f849f7a5d8be6c96b95fb197581f8271af8ab344a1036566e36c8de87d2e1a76 freebsd-share-6.2_beta3.tar.bz2 3762922 +MD5 4813858b8cce889a4df943aab5645f3d freebsd-ubin-6.2_beta3.tar.bz2 1774931 +RMD160 1985cb50d6502f519560296794c550072032ded6 freebsd-ubin-6.2_beta3.tar.bz2 1774931 +SHA256 779057f40046a46a7d12b519494a450960d12e15384d312e84ea472bf273b39c freebsd-ubin-6.2_beta3.tar.bz2 1774931 +MD5 5266789afea7e22eef8cbbbcf322c7ae freebsd-usbin-6.2_beta3.tar.bz2 2695369 +RMD160 09e6b00f27ee49418e807fd565966f534fb5f0a3 freebsd-usbin-6.2_beta3.tar.bz2 2695369 +SHA256 14fd08cee425c734abb24fa08e6ccf1c69de7b5e9b569cf77459c04fca096db4 freebsd-usbin-6.2_beta3.tar.bz2 2695369 diff --git a/sys-freebsd/freebsd-share/freebsd-share-6.2_beta3.ebuild b/sys-freebsd/freebsd-share/freebsd-share-6.2_beta3.ebuild new file mode 100644 index 000000000000..d36b7a17e5af --- /dev/null +++ b/sys-freebsd/freebsd-share/freebsd-share-6.2_beta3.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/freebsd-share-6.2_beta3.ebuild,v 1.1 2006/11/01 16:17:56 flameeyes Exp $ + +inherit bsdmk freebsd + +DESCRIPTION="FreeBSD shared tools/files" +SLOT="0" +KEYWORDS="~sparc-fbsd ~x86-fbsd" + +IUSE="doc isdn" + +SRC_URI="mirror://gentoo/${SHARE}.tar.bz2 + mirror://gentoo/${CONTRIB}.tar.bz2 + mirror://gentoo/${GNU}.tar.bz2 + mirror://gentoo/${UBIN}.tar.bz2 + mirror://gentoo/${USBIN}.tar.bz2 + mirror://gentoo/${SBIN}.tar.bz2 + mirror://gentoo/${BIN}.tar.bz2 + mirror://gentoo/${LIB}.tar.bz2 + mirror://gentoo/${ETC}.tar.bz2" + +DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*" +RDEPEND="" + +RESTRICT="nostrip" + +S="${WORKDIR}/share" + +pkg_setup() { + use isdn || mymakeopts="${mymakeopts} NO_I4B= " + use doc || mymakeopts="${mymakeopts} NO_SHAREDOCS= " + + mymakeopts="${mymakeopts} NO_SENDMAIL= " +} + +REMOVE_SUBDIRS="mk termcap zoneinfo tabset" + +PATCHES="${FILESDIR}/${PN}-5.3-doc-locations.patch + ${FILESDIR}/${PN}-5.4-gentoo-skel.patch" + +src_unpack() { + freebsd_src_unpack + + # Remove make.conf manpage as it describes bsdmk's make.conf. + sed -i -e 's:make.conf.5::' "${S}/man/man5/Makefile" + # Don't install the arch-specific directories in subdirectories + sed -i -e '/MANSUBDIR/d' "${S}"/man/man4/man4.{alpha,i386,sparc64}/Makefile + + # Remove them so that they can't be included by error + rm -rf "${S}"/mk/*.mk + + # Change the order, colldef has to go after mklocale or it creates symlinks + # with the names of directories + sed -i -e 's:colldef::' -e 's:mklocale:mklocale colldef:' "${S}/Makefile" +} + +src_compile() { + export ESED="/usr/bin/sed" + + # This is a groff problem and not a -shared problem. + export GROFF_TMAC_PATH="/usr/share/tmac/:/usr/share/groff/1.19.1/tmac/" + mkmake || die "emake failed" +} + +src_install() { + mkmake DESTDIR="${D}" DOCDIR=/usr/share/doc/${PF} install || die "Install failed" +} diff --git a/sys-freebsd/freebsd-sources/ChangeLog b/sys-freebsd/freebsd-sources/ChangeLog index 10ea331ac683..fce84e3430c8 100644 --- a/sys-freebsd/freebsd-sources/ChangeLog +++ b/sys-freebsd/freebsd-sources/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-freebsd/freebsd-sources # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.29 2006/10/23 22:05:40 the_paya Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.30 2006/11/01 16:19:11 flameeyes Exp $ + +*freebsd-sources-6.2_beta3 (01 Nov 2006) + + 01 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> + +files/freebsd-sources-6.2-gcc41.patch, +freebsd-sources-6.2_beta3.ebuild: + Bump to 6.2_beta3. 23 Oct 2006; Javier Villavicencio <the_paya@gentoo.org> freebsd-sources-6.2_beta2.ebuild: diff --git a/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.2_beta3 b/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.2_beta3 new file mode 100644 index 000000000000..c97be3678ae2 --- /dev/null +++ b/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.2_beta3 @@ -0,0 +1,3 @@ +MD5 328ec3b03995fcab39126e3437cabb72 freebsd-sys-6.2_beta3.tar.bz2 18336143 +RMD160 c75040d96af463013459f3a3278d4cca1d78e828 freebsd-sys-6.2_beta3.tar.bz2 18336143 +SHA256 f52b0bf25d2ae5792503789a1bd47bc0db7924c13df55021c7740dcdd5a4225c freebsd-sys-6.2_beta3.tar.bz2 18336143 diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-gcc41.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-gcc41.patch new file mode 100644 index 000000000000..b6dd2cb72448 --- /dev/null +++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-gcc41.patch @@ -0,0 +1,526 @@ +Index: sys/conf/kern.pre.mk +=================================================================== +--- sys/conf/kern.pre.mk.orig ++++ sys/conf/kern.pre.mk +@@ -46,7 +46,7 @@ NOSTDINC= -X + NOSTDINC= -nostdinc + .endif + +-INCLUDES= ${NOSTDINC} -I- ${INCLMAGIC} -I. -I$S ++INCLUDES= ${NOSTDINC} ${INCLMAGIC} -I. -I$S + + # This hack lets us use the OpenBSD altq code without spamming a new + # include path into contrib'ed source files. +Index: sys/conf/kmod.mk +=================================================================== +--- sys/conf/kmod.mk.orig ++++ sys/conf/kmod.mk +@@ -87,7 +87,7 @@ NOSTDINC= -X + .else + NOSTDINC= -nostdinc + .endif +-CFLAGS:= ${CFLAGS:N-I*} ${NOSTDINC} -I- ${INCLMAGIC} ${CFLAGS:M-I*} ++CFLAGS:= ${CFLAGS:N-I*} ${NOSTDINC} ${INCLMAGIC} ${CFLAGS:M-I*} + .if defined(KERNBUILDDIR) + CFLAGS+= -DHAVE_KERNEL_OPTION_HEADERS -include ${KERNBUILDDIR}/opt_global.h + .endif +Index: sys/ddb/db_command.c +=================================================================== +--- sys/ddb/db_command.c.orig ++++ sys/ddb/db_command.c +@@ -75,7 +75,7 @@ static db_cmdfcn_t db_stack_trace_all; + static db_cmdfcn_t db_watchdog; + + /* XXX this is actually forward-static. */ +-extern struct command db_show_cmds[]; ++static struct command db_show_cmds[]; + + /* + * if 'ed' style: 'dot' is set at start of last item printed, +Index: sys/dev/cp/if_cp.c +=================================================================== +--- sys/dev/cp/if_cp.c.orig ++++ sys/dev/cp/if_cp.c +@@ -338,7 +338,7 @@ static void cp_intr (void *arg) + #endif + } + +-extern struct cdevsw cp_cdevsw; ++static struct cdevsw cp_cdevsw; + + static void + cp_bus_dmamap_addr (void *arg, bus_dma_segment_t *segs, int nseg, int error) +Index: sys/dev/ctau/if_ct.c +=================================================================== +--- sys/dev/ctau/if_ct.c.orig ++++ sys/dev/ctau/if_ct.c +@@ -486,7 +486,7 @@ static int ct_probe (device_t dev) + return 0; + } + +-extern struct cdevsw ct_cdevsw; ++static struct cdevsw ct_cdevsw; + + static void + ct_bus_dmamap_addr (void *arg, bus_dma_segment_t *segs, int nseg, int error) +Index: sys/dev/cx/if_cx.c +=================================================================== +--- sys/dev/cx/if_cx.c.orig ++++ sys/dev/cx/if_cx.c +@@ -229,7 +229,7 @@ static cx_board_t *adapter [NCX]; + static drv_t *channel [NCX*NCHAN]; + static struct callout led_timo [NCX]; + static struct callout timeout_handle; +-extern struct cdevsw cx_cdevsw; ++static struct cdevsw cx_cdevsw; + + static int MY_SOFT_INTR; + +Index: sys/dev/fb/vga.c +=================================================================== +--- sys/dev/fb/vga.c.orig ++++ sys/dev/fb/vga.c +@@ -206,7 +206,7 @@ typedef struct adp_state adp_state_t; + * with a physical address in the following table, as verify_adapter() + * will perform address conversion at run-time. + */ +-static video_adapter_t adapter_init_value[] = { ++video_adapter_t adapter_init_value[] = { + /* DCC_MONO */ + { 0, KD_MONO, "mda", 0, 0, 0, IO_MDA, IO_MDASIZE, MONO_CRTC, + MDA_BUF_BASE, MDA_BUF_SIZE, MDA_BUF_BASE, MDA_BUF_SIZE, MDA_BUF_SIZE, +@@ -748,10 +748,7 @@ static u_char + } + + #ifndef VGA_NO_BIOS +-static void +-fill_adapter_param(int code, video_adapter_t *adp) +-{ +- static struct { ++ struct { + int primary; + int secondary; + } dcc[] = { +@@ -768,7 +765,9 @@ fill_adapter_param(int code, video_adapt + { DCC_EGAMONO, DCC_CGA40 }, + { DCC_EGAMONO, DCC_CGA80 }, + }; +- ++static void ++fill_adapter_param(int code, video_adapter_t *adp) ++{ + if ((code < 0) || (code >= sizeof(dcc)/sizeof(dcc[0]))) { + adp[V_ADP_PRIMARY] = adapter_init_value[DCC_MONO]; + adp[V_ADP_SECONDARY] = adapter_init_value[DCC_CGA80]; +Index: sys/dev/iicbus/iicbus.c +=================================================================== +--- sys/dev/iicbus/iicbus.c.orig ++++ sys/dev/iicbus/iicbus.c +@@ -45,7 +45,7 @@ __FBSDID("$FreeBSD: src/sys/dev/iicbus/i + + #define DEVTOIICBUS(dev) ((struct iicbus_device*)device_get_ivars(dev)) + +-static devclass_t iicbus_devclass; ++static devclass_t iicbus_dev_class; + + /* See comments below for why auto-scanning is a bad idea. */ + #define SCAN_IICBUS 0 +@@ -187,8 +187,8 @@ iicbus_null_repeated_start(device_t dev, + return (IIC_ENOTSUPP); + } + +-DRIVER_MODULE(iicbus, pcf, iicbus_driver, iicbus_devclass, 0, 0); +-DRIVER_MODULE(iicbus, envctrl, iicbus_driver, iicbus_devclass, 0, 0); +-DRIVER_MODULE(iicbus, iicbb, iicbus_driver, iicbus_devclass, 0, 0); +-DRIVER_MODULE(iicbus, bti2c, iicbus_driver, iicbus_devclass, 0, 0); ++DRIVER_MODULE(iicbus, pcf, iicbus_driver, iicbus_dev_class, 0, 0); ++DRIVER_MODULE(iicbus, envctrl, iicbus_driver, iicbus_dev_class, 0, 0); ++DRIVER_MODULE(iicbus, iicbb, iicbus_driver, iicbus_dev_class, 0, 0); ++DRIVER_MODULE(iicbus, bti2c, iicbus_driver, iicbus_dev_class, 0, 0); + MODULE_VERSION(iicbus, IICBUS_MODVER); +Index: sys/dev/ppbus/ppb_msq.c +=================================================================== +--- sys/dev/ppbus/ppb_msq.c.orig ++++ sys/dev/ppbus/ppb_msq.c +@@ -153,31 +153,32 @@ ppb_MS_exec(device_t bus, device_t dev, + * Execute a microseq loop + * + */ ++struct ppb_microseq loop_microseq_1[] = { ++ MS_CALL(0), /* execute prolog */ ++ ++ MS_SET(MS_UNKNOWN), /* set size of transfer */ ++ /* loop: */ ++ MS_CALL(0), /* execute body */ ++ MS_DBRA(-1 /* loop: */), ++ ++ MS_CALL(0), /* execute epilog */ ++ MS_RET(0) ++}; ++ + int + ppb_MS_loop(device_t bus, device_t dev, struct ppb_microseq *prolog, + struct ppb_microseq *body, struct ppb_microseq *epilog, + int iter, int *ret) + { +- struct ppb_microseq loop_microseq[] = { +- MS_CALL(0), /* execute prolog */ +- +- MS_SET(MS_UNKNOWN), /* set size of transfer */ +- /* loop: */ +- MS_CALL(0), /* execute body */ +- MS_DBRA(-1 /* loop: */), +- +- MS_CALL(0), /* execute epilog */ +- MS_RET(0) +- }; + + /* initialize the structure */ +- loop_microseq[0].arg[0].p = (void *)prolog; +- loop_microseq[1].arg[0].i = iter; +- loop_microseq[2].arg[0].p = (void *)body; +- loop_microseq[4].arg[0].p = (void *)epilog; ++ loop_microseq_1[0].arg[0].p = (void *)prolog; ++ loop_microseq_1[1].arg[0].i = iter; ++ loop_microseq_1[2].arg[0].p = (void *)body; ++ loop_microseq_1[4].arg[0].p = (void *)epilog; + + /* execute the loop */ +- return (ppb_MS_microseq(bus, dev, loop_microseq, ret)); ++ return (ppb_MS_microseq(bus, dev, loop_microseq_1, ret)); + } + + /* +Index: sys/fs/fdescfs/fdesc_vnops.c +=================================================================== +--- sys/fs/fdescfs/fdesc_vnops.c.orig ++++ sys/fs/fdescfs/fdesc_vnops.c +@@ -74,7 +74,7 @@ static vop_readdir_t fdesc_readdir; + static vop_reclaim_t fdesc_reclaim; + static vop_setattr_t fdesc_setattr; + +-extern struct vop_vector fdesc_vnodeops; ++static struct vop_vector fdesc_vnodeops; + + /* + * Initialise cache headers +Index: sys/fs/ntfs/ntfs_vfsops.c +=================================================================== +--- sys/fs/ntfs/ntfs_vfsops.c.orig ++++ sys/fs/ntfs/ntfs_vfsops.c +@@ -60,7 +60,7 @@ + #include <fs/ntfs/ntfs_ihash.h> + #include <fs/ntfs/ntfsmount.h> + +-static MALLOC_DEFINE(M_NTFSMNT, "NTFS mount", "NTFS mount structure"); ++static MALLOC_DEFINE(M_NTFS_MNT, "NTFS mount", "NTFS mount structure"); + MALLOC_DEFINE(M_NTFSNTNODE,"NTFS ntnode", "NTFS ntnode information"); + MALLOC_DEFINE(M_NTFSFNODE,"NTFS fnode", "NTFS fnode information"); + MALLOC_DEFINE(M_NTFSDIR,"NTFS dir", "NTFS dir buffer"); +@@ -279,7 +279,7 @@ ntfs_mountfs(devvp, mp, td) + error = bread(devvp, BBLOCK, BBSIZE, NOCRED, &bp); + if (error) + goto out; +- ntmp = malloc( sizeof *ntmp, M_NTFSMNT, M_WAITOK | M_ZERO); ++ ntmp = malloc( sizeof *ntmp, M_NTFS_MNT, M_WAITOK | M_ZERO); + bcopy( bp->b_data, &ntmp->ntm_bootfile, sizeof(struct bootfile) ); + /* + * We must not cache the boot block if its size is not exactly +@@ -404,7 +404,7 @@ ntfs_mountfs(devvp, mp, td) + /* Alloc memory for attribute definitions */ + MALLOC(ntmp->ntm_ad, struct ntvattrdef *, + num * sizeof(struct ntvattrdef), +- M_NTFSMNT, M_WAITOK); ++ M_NTFS_MNT, M_WAITOK); + + ntmp->ntm_adnum = num; + +@@ -512,8 +512,8 @@ ntfs_unmount( + MNT_ILOCK(mp); + mp->mnt_flag &= ~MNT_LOCAL; + MNT_IUNLOCK(mp); +- FREE(ntmp->ntm_ad, M_NTFSMNT); +- FREE(ntmp, M_NTFSMNT); ++ FREE(ntmp->ntm_ad, M_NTFS_MNT); ++ FREE(ntmp, M_NTFS_MNT); + return (error); + } + +Index: sys/fs/unionfs/union_vfsops.c +=================================================================== +--- sys/fs/unionfs/union_vfsops.c.orig ++++ sys/fs/unionfs/union_vfsops.c +@@ -473,7 +473,7 @@ union_statfs(mp, sbp, td) + return (0); + } + +-static struct vfsops union_vfsops = { ++static struct vfsops union_vfs_ops = { + .vfs_init = union_init, + .vfs_mount = union_mount, + .vfs_root = union_root, +@@ -481,4 +481,4 @@ static struct vfsops union_vfsops = { + .vfs_unmount = union_unmount, + }; + +-VFS_SET(union_vfsops, unionfs, VFCF_LOOPBACK); ++VFS_SET(union_vfs_ops, unionfs, VFCF_LOOPBACK); +Index: sys/i386/i386/vm86.c +=================================================================== +--- sys/i386/i386/vm86.c.orig ++++ sys/i386/i386/vm86.c +@@ -505,7 +505,7 @@ full: + panic("vm86_addpage: not enough room"); + } + +-static void ++void + vm86_initflags(struct vm86frame *vmf) + { + int eflags = vmf->vmf_eflags; +Index: sys/i386/include/segments.h +=================================================================== +--- sys/i386/include/segments.h.orig ++++ sys/i386/include/segments.h +@@ -244,7 +244,7 @@ extern union descriptor gdt[]; + extern struct soft_segment_descriptor gdt_segs[]; + extern struct gate_descriptor *idt; + extern union descriptor ldt[NLDT]; +-extern struct region_descriptor r_gdt, r_idt; ++//extern struct region_descriptor r_gdt, r_idt; + + void lgdt(struct region_descriptor *rdp); + void sdtossd(struct segment_descriptor *sdp, +Index: sys/kern/kern_tc.c +=================================================================== +--- sys/kern/kern_tc.c.orig ++++ sys/kern/kern_tc.c +@@ -61,7 +61,7 @@ struct timehands { + struct timehands *th_next; + }; + +-extern struct timehands th0; ++static struct timehands th0; + static struct timehands th9 = { NULL, 0, 0, 0, {0, 0}, {0, 0}, {0, 0}, 0, &th0}; + static struct timehands th8 = { NULL, 0, 0, 0, {0, 0}, {0, 0}, {0, 0}, 0, &th9}; + static struct timehands th7 = { NULL, 0, 0, 0, {0, 0}, {0, 0}, {0, 0}, 0, &th8}; +Index: sys/net/rtsock.c +=================================================================== +--- sys/net/rtsock.c.orig ++++ sys/net/rtsock.c +@@ -1243,7 +1243,7 @@ SYSCTL_NODE(_net, PF_ROUTE, routetable, + * Definitions of protocols supported in the ROUTE domain. + */ + +-extern struct domain routedomain; /* or at least forward */ ++static struct domain routedomain; /* or at least forward */ + + static struct protosw routesw[] = { + { +Index: sys/net/zlib.c +=================================================================== +--- sys/net/zlib.c.orig ++++ sys/net/zlib.c +@@ -94,7 +94,7 @@ typedef unsigned short ush; + typedef ush FAR ushf; + typedef unsigned long ulg; + +-extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */ ++static const char *z_errmsg[10]; /* indexed by 2-zlib_error */ + /* (size given to avoid silly warnings with Visual C++) */ + + #define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)] +Index: sys/netinet6/in6_proto.c +=================================================================== +--- sys/netinet6/in6_proto.c.orig ++++ sys/netinet6/in6_proto.c +@@ -145,7 +145,7 @@ + */ + + extern struct domain inet6domain; +-static struct pr_usrreqs nousrreqs; ++static struct pr_usrreqs nousr_reqs; + + #define PR_LISTEN 0 + #define PR_ABRTACPTDIS 0 +@@ -158,7 +158,7 @@ struct ip6protosw inet6sw[] = { + .pr_init = ip6_init, + .pr_slowtimo = frag6_slowtimo, + .pr_drain = frag6_drain, +- .pr_usrreqs = &nousrreqs, ++ .pr_usrreqs = &nousr_reqs, + }, + { + .pr_type = SOCK_DGRAM, +@@ -216,7 +216,7 @@ struct ip6protosw inet6sw[] = { + .pr_protocol = IPPROTO_DSTOPTS, + .pr_flags = PR_ATOMIC|PR_ADDR, + .pr_input = dest6_input, +- .pr_usrreqs = &nousrreqs ++ .pr_usrreqs = &nousr_reqs + }, + { + .pr_type = SOCK_RAW, +@@ -224,7 +224,7 @@ struct ip6protosw inet6sw[] = { + .pr_protocol = IPPROTO_ROUTING, + .pr_flags = PR_ATOMIC|PR_ADDR, + .pr_input = route6_input, +- .pr_usrreqs = &nousrreqs ++ .pr_usrreqs = &nousr_reqs + }, + { + .pr_type = SOCK_RAW, +@@ -232,7 +232,7 @@ struct ip6protosw inet6sw[] = { + .pr_protocol = IPPROTO_FRAGMENT, + .pr_flags = PR_ATOMIC|PR_ADDR, + .pr_input = frag6_input, +- .pr_usrreqs = &nousrreqs ++ .pr_usrreqs = &nousr_reqs + }, + #ifdef IPSEC + { +@@ -241,7 +241,7 @@ struct ip6protosw inet6sw[] = { + .pr_protocol = IPPROTO_AH, + .pr_flags = PR_ATOMIC|PR_ADDR, + .pr_input = ah6_input, +- .pr_usrreqs = &nousrreqs, ++ .pr_usrreqs = &nousr_reqs, + }, + #ifdef IPSEC_ESP + { +@@ -251,7 +251,7 @@ struct ip6protosw inet6sw[] = { + .pr_flags = PR_ATOMIC|PR_ADDR, + .pr_input = esp6_input, + .pr_ctlinput = esp6_ctlinput, +- .pr_usrreqs = &nousrreqs, ++ .pr_usrreqs = &nousr_reqs, + }, + #endif + { +@@ -260,7 +260,7 @@ struct ip6protosw inet6sw[] = { + .pr_protocol = IPPROTO_IPCOMP, + .pr_flags = PR_ATOMIC|PR_ADDR, + .pr_input = ipcomp6_input, +- .pr_usrreqs = &nousrreqs, ++ .pr_usrreqs = &nousr_reqs, + }, + #endif /* IPSEC */ + #ifdef INET +Index: sys/netinet6/ip6_mroute.c +=================================================================== +--- sys/netinet6/ip6_mroute.c.orig ++++ sys/netinet6/ip6_mroute.c +@@ -188,7 +188,7 @@ static struct ifnet *multicast_register_ + static mifi_t nummifs = 0; + static mifi_t reg_mif_num = (mifi_t)-1; + +-static struct pim6stat pim6stat; ++static struct pim6stat pim6_stat; + static int pim6; + + /* +@@ -1622,7 +1622,7 @@ register_send(ip6, mif, m) + log(LOG_DEBUG, "** IPv6 register_send **\n src %s dst %s\n", + ip6_sprintf(&ip6->ip6_src), ip6_sprintf(&ip6->ip6_dst)); + #endif +- ++pim6stat.pim6s_snd_registers; ++ ++pim6_stat.pim6s_snd_registers; + + /* Make a copy of the packet to send to the user level process */ + MGETHDR(mm, M_DONTWAIT, MT_HEADER); +@@ -1690,7 +1690,7 @@ pim6_input(mp, offp, proto) + int minlen; + int off = *offp; + +- ++pim6stat.pim6s_rcv_total; ++ ++pim6_stat.pim6s_rcv_total; + + ip6 = mtod(m, struct ip6_hdr *); + pimlen = m->m_pkthdr.len - *offp; +@@ -1699,7 +1699,7 @@ pim6_input(mp, offp, proto) + * Validate lengths + */ + if (pimlen < PIM_MINLEN) { +- ++pim6stat.pim6s_rcv_tooshort; ++ ++pim6_stat.pim6s_rcv_tooshort; + #ifdef MRT6DEBUG + if (mrt6debug & DEBUG_PIM) + log(LOG_DEBUG,"pim6_input: PIM packet too short\n"); +@@ -1732,7 +1732,7 @@ pim6_input(mp, offp, proto) + #else + IP6_EXTHDR_GET(pim, struct pim *, m, off, minlen); + if (pim == NULL) { +- pim6stat.pim6s_rcv_tooshort++; ++ pim6_stat.pim6s_rcv_tooshort++; + return (IPPROTO_DONE); + } + #endif +@@ -1752,7 +1752,7 @@ pim6_input(mp, offp, proto) + cksumlen = pimlen; + + if (in6_cksum(m, IPPROTO_PIM, off, cksumlen)) { +- ++pim6stat.pim6s_rcv_badsum; ++ ++pim6_stat.pim6s_rcv_badsum; + #ifdef MRT6DEBUG + if (mrt6debug & DEBUG_PIM) + log(LOG_DEBUG, +@@ -1766,7 +1766,7 @@ pim6_input(mp, offp, proto) + + /* PIM version check */ + if (pim->pim_ver != PIM_VERSION) { +- ++pim6stat.pim6s_rcv_badversion; ++ ++pim6_stat.pim6s_rcv_badversion; + #ifdef MRT6DEBUG + log(LOG_ERR, + "pim6_input: incorrect version %d, expecting %d\n", +@@ -1789,7 +1789,7 @@ pim6_input(mp, offp, proto) + u_int32_t *reghdr; + int rc; + +- ++pim6stat.pim6s_rcv_registers; ++ ++pim6_stat.pim6s_rcv_registers; + + if ((reg_mif_num >= nummifs) || (reg_mif_num == (mifi_t) -1)) { + #ifdef MRT6DEBUG +@@ -1811,8 +1811,8 @@ pim6_input(mp, offp, proto) + * Validate length + */ + if (pimlen < PIM6_REG_MINLEN) { +- ++pim6stat.pim6s_rcv_tooshort; +- ++pim6stat.pim6s_rcv_badregisters; ++ ++pim6_stat.pim6s_rcv_tooshort; ++ ++pim6_stat.pim6s_rcv_badregisters; + #ifdef MRT6DEBUG + log(LOG_ERR, + "pim6_input: register packet size too " +@@ -1836,7 +1836,7 @@ pim6_input(mp, offp, proto) + + /* verify the version number of the inner packet */ + if ((eip6->ip6_vfc & IPV6_VERSION_MASK) != IPV6_VERSION) { +- ++pim6stat.pim6s_rcv_badregisters; ++ ++pim6_stat.pim6s_rcv_badregisters; + #ifdef MRT6DEBUG + log(LOG_DEBUG, "pim6_input: invalid IP version (%d) " + "of the inner packet\n", +@@ -1848,7 +1848,7 @@ pim6_input(mp, offp, proto) + + /* verify the inner packet is destined to a mcast group */ + if (!IN6_IS_ADDR_MULTICAST(&eip6->ip6_dst)) { +- ++pim6stat.pim6s_rcv_badregisters; ++ ++pim6_stat.pim6s_rcv_badregisters; + #ifdef MRT6DEBUG + if (mrt6debug & DEBUG_PIM) + log(LOG_DEBUG, +Index: sys/sys/proc.h +=================================================================== +--- sys/sys/proc.h.orig ++++ sys/sys/proc.h +@@ -840,7 +840,7 @@ extern int lastpid; + extern int nprocs, maxproc; /* Current and max number of procs. */ + extern int maxprocperuid; /* Max procs per uid. */ + extern u_long ps_arg_cache_limit; +-extern int sched_quantum; /* Scheduling quantum in ticks. */ ++//extern int sched_quantum; /* Scheduling quantum in ticks. */ + + LIST_HEAD(proclist, proc); + TAILQ_HEAD(procqueue, proc); diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-6.2_beta3.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-6.2_beta3.ebuild new file mode 100644 index 000000000000..2a01027b0444 --- /dev/null +++ b/sys-freebsd/freebsd-sources/freebsd-sources-6.2_beta3.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-6.2_beta3.ebuild,v 1.1 2006/11/01 16:19:11 flameeyes Exp $ + +inherit bsdmk freebsd flag-o-matic + +DESCRIPTION="FreeBSD kernel sources" +SLOT="${PVR}" +KEYWORDS="~sparc-fbsd ~x86-fbsd" + +IUSE="symlink" + +SRC_URI="mirror://gentoo/${SYS}.tar.bz2" + +RDEPEND=">=sys-freebsd/freebsd-mk-defs-6.0-r1" +DEPEND="" + +RESTRICT="strip binchecks" + +S="${WORKDIR}/sys" + +MY_PVR="${PVR}" + +[[ ${MY_PVR} == "${RV}" ]] && MY_PVR="${MY_PVR}-r0" + +src_unpack() { + unpack ${A} + cd "${S}" + + # This replaces the gentoover patch, it doesn't need reapply every time. + sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \ + -e 's:^BRANCH=.*:BRANCH="Gentoo":' \ + -e 's:^VERSION=.*:VERSION="${TYPE} ${BRANCH} ${REVISION}":' \ + "${S}/conf/newvers.sh" + + epatch "${FILESDIR}/${PN}-gentoo.patch" + epatch "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch" + epatch "${FILESDIR}/${PN}-6.0-asm.patch" + epatch "${FILESDIR}/${PN}-6.0-werror.patch" + epatch "${FILESDIR}/${PN}-6.2-gcc41.patch" + epatch "${FILESDIR}/${PN}-6.2-sparc64.patch" + epatch "${FILESDIR}/${PN}-6.1-ntfs.patch" + + # Disable SSP for the kernel + grep -Zlr -- -ffreestanding "${S}" | xargs -0 sed -i -e \ + "s:-ffreestanding:-ffreestanding $(test-flags -fno-stack-protector -fno-stack-protector-all):g" +} + +src_compile() { + einfo "Nothing to compile.." +} + +src_install() { + insinto "/usr/src/sys-${MY_PVR}" + doins -r "${S}/"* +} + +pkg_postinst() { + if [[ ! -L "${ROOT}/usr/src/sys" ]]; then + einfo "/usr/src/sys symlink doesn't exist; creating symlink to sys-${MY_PVR}..." + ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \ + eerror "Couldn't create ${ROOT}/usr/src/sys symlink." + # just in case... + [[ -L ""${ROOT}/usr/src/sys-${RV}"" ]] && rm "${ROOT}/usr/src/sys-${RV}" + ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \ + eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink." + elif use symlink; then + einfo "Updating /usr/src/sys symlink to sys-${MY_PVR}..." + rm "${ROOT}/usr/src/sys" "${ROOT}/usr/src/sys-${RV}" || \ + eerror "Couldn't remove previous symlinks, please fix manually." + ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \ + eerror "Couldn't create ${ROOT}/usr/src/sys symlink." + ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \ + eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink." + fi + + if use sparc-fbsd ; then + ewarn "WARNING: kldload currently causes kernel panics" + ewarn "on sparc64. This is probably a gcc-4.1 issue, but" + ewarn "we need gcc-4.1 to compile the kernel correctly :/" + ewarn "Please compile all modules you need into the kernel" + fi +} diff --git a/sys-freebsd/freebsd-ubin/ChangeLog b/sys-freebsd/freebsd-ubin/ChangeLog index 531f6b6be2f9..342cbd2031ce 100644 --- a/sys-freebsd/freebsd-ubin/ChangeLog +++ b/sys-freebsd/freebsd-ubin/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-freebsd/freebsd-ubin # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.33 2006/10/27 17:18:42 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.34 2006/11/01 16:20:47 flameeyes Exp $ + +*freebsd-ubin-6.2_beta3 (01 Nov 2006) + + 01 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> + +freebsd-ubin-6.2_beta3.ebuild: + Bump to 6.2_beta3. *freebsd-ubin-6.2_beta2-r1 (27 Oct 2006) *freebsd-ubin-6.1-r1 (27 Oct 2006) diff --git a/sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.2_beta3 b/sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.2_beta3 new file mode 100644 index 000000000000..7b586995dd98 --- /dev/null +++ b/sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.2_beta3 @@ -0,0 +1,21 @@ +MD5 970652322ed9c43dbea19ef7b2a9ac46 freebsd-bin-6.2_beta3.tar.bz2 406777 +RMD160 00ab818df6f9ff1d2befb93ed81499188bd42475 freebsd-bin-6.2_beta3.tar.bz2 406777 +SHA256 2864fa9d634eb10cef60abb0672dc30f21a59e98a70f3a8275460b1efa39d2be freebsd-bin-6.2_beta3.tar.bz2 406777 +MD5 0d8585db6146130649e10b502957eee6 freebsd-contrib-6.2_beta3.tar.bz2 36555171 +RMD160 630c839a0025811a4c2da5de560150fe00d4ed28 freebsd-contrib-6.2_beta3.tar.bz2 36555171 +SHA256 51c0b85ff28b6b9d85092e51a0fe2a9ae9bb9714a50495713236e0c162e8ee0b freebsd-contrib-6.2_beta3.tar.bz2 36555171 +MD5 81b97dc47668e566a803b9469b96d969 freebsd-etc-6.2_beta3.tar.bz2 188295 +RMD160 7b4e5f22cdb6b23b0379c285001379390f176136 freebsd-etc-6.2_beta3.tar.bz2 188295 +SHA256 8d79f1e1e9b8453c0431dd9112b51a09a2ed8db7c288e6eb76347b0030eacf89 freebsd-etc-6.2_beta3.tar.bz2 188295 +MD5 7d9b4fff0e69139ed253a1db9cb0fa63 freebsd-include-6.2_beta3.tar.bz2 131608 +RMD160 7bbc4c99f04752366a5d67a7ce8edc56c0807ec3 freebsd-include-6.2_beta3.tar.bz2 131608 +SHA256 5ce85fe6c6c2cc0e6bc4502d838f52820d06c1dc19c270583f2469edc466ca9a freebsd-include-6.2_beta3.tar.bz2 131608 +MD5 035e7b7d5f8dddcbe9e3c2d44428574b freebsd-lib-6.2_beta3.tar.bz2 2668544 +RMD160 9b21ec424b2b86c0dfa252322e9784ebddce3e53 freebsd-lib-6.2_beta3.tar.bz2 2668544 +SHA256 7aed09b38fedeb174bfd91caa8c2f38240c2f5a0c21d4c50e7eaef5a42daba09 freebsd-lib-6.2_beta3.tar.bz2 2668544 +MD5 328ec3b03995fcab39126e3437cabb72 freebsd-sys-6.2_beta3.tar.bz2 18336143 +RMD160 c75040d96af463013459f3a3278d4cca1d78e828 freebsd-sys-6.2_beta3.tar.bz2 18336143 +SHA256 f52b0bf25d2ae5792503789a1bd47bc0db7924c13df55021c7740dcdd5a4225c freebsd-sys-6.2_beta3.tar.bz2 18336143 +MD5 4813858b8cce889a4df943aab5645f3d freebsd-ubin-6.2_beta3.tar.bz2 1774931 +RMD160 1985cb50d6502f519560296794c550072032ded6 freebsd-ubin-6.2_beta3.tar.bz2 1774931 +SHA256 779057f40046a46a7d12b519494a450960d12e15384d312e84ea472bf273b39c freebsd-ubin-6.2_beta3.tar.bz2 1774931 diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-6.2_beta3.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-6.2_beta3.ebuild new file mode 100644 index 000000000000..3ef1506d5c16 --- /dev/null +++ b/sys-freebsd/freebsd-ubin/freebsd-ubin-6.2_beta3.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/freebsd-ubin-6.2_beta3.ebuild,v 1.1 2006/11/01 16:20:47 flameeyes Exp $ + +inherit bsdmk freebsd flag-o-matic pam + +DESCRIPTION="FreeBSD's base system source for /usr/bin" +SLOT="0" +KEYWORDS="~sparc-fbsd ~x86-fbsd" + +IUSE="atm bluetooth ssl usb nls ipv6 kerberos nis build" + +SRC_URI="mirror://gentoo/${UBIN}.tar.bz2 + mirror://gentoo/${CONTRIB}.tar.bz2 + mirror://gentoo/${LIB}.tar.bz2 + mirror://gentoo/${ETC}.tar.bz2 + mirror://gentoo/${BIN}.tar.bz2 + mirror://gentoo/${INCLUDE}.tar.bz2 + build? ( mirror://gentoo/${SYS}.tar.bz2 )" + +RDEPEND="sys-freebsd/freebsd-lib + ssl? ( dev-libs/openssl ) + kerberos? ( virtual/krb5 ) + sys-libs/zlib + virtual/pam + !dev-util/csup" + +DEPEND="${RDEPEND} + sys-devel/flex + !build? ( =sys-freebsd/freebsd-sources-${RV}* ) + =sys-freebsd/freebsd-mk-defs-${RV}*" + +RDEPEND="${RDEPEND} + sys-process/cronbase" + +S="${WORKDIR}/usr.bin" + +pkg_setup() { + use nls || mymakeopts="${mymakeopts} NO_NLS= " + use atm || mymakeopts="${mymakeopts} NO_ATM= " + use bluetooth || mymakeopts="${mymakeopts} NO_BLUETOOTH= " + use ssl || mymakeopts="${mymakeopts} NO_OPENSSL= NO_CRYPT= " + use usb || mymakeopts="${mymakeopts} NO_USB= " + use ipv6 || mymakeopts="${mymakeopts} NO_INET6= " + use kerberos || mymakeopts="${mymakeopts} NO_KERBEROS= " + use nis || mymakeopts="${mymakeopts} NO_NIS= " + + mymakeopts="${mymakeopts} NO_SENDMAIL= " +} + +# List of patches to apply +PATCHES="${FILESDIR}/${PN}-6.0-bsdcmp.patch + ${FILESDIR}/${PN}-6.0-fixmakefiles.patch + ${FILESDIR}/${PN}-setXid.patch + ${FILESDIR}/${PN}-lint-stdarg.patch + ${FILESDIR}/${PN}-6.0-kdump-ioctl.patch + ${FILESDIR}/${PN}-6.1-gcc41.patch + ${FILESDIR}/${PN}-6.2-rpcgen-gcc4.1.patch + ${FILESDIR}/${PN}-6.2-sparc64.patch" + +# Here we remove some sources we don't need because they are already +# provided by portage's packages or similar. In order: +# - Archiving tools, provided by their own ebuilds +# - ncurses stuff +# - less stuff +# - bind utils +# - rsh stuff +# and the rest are misc utils we already provide somewhere else. +REMOVE_SUBDIRS="bzip2 bzip2recover tar + tput tset + less lessecho lesskey + dig nslookup nsupdate host + rsh rlogin rusers rwho ruptime + compile_et lex vi smbutil file vacation nc ftp telnet + c99 c89 + whois" + +src_unpack() { + freebsd_src_unpack + + use build || ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" + + # Rename manpage for renamed cmp + mv ${S}/cmp/cmp.1 ${S}/cmp/bsdcmp.1 + # Fix whereis(1) manpath search. + sed -i -e 's:"manpath -q":"manpath":' "${S}/whereis/pathnames.h" +} + +src_install() { + freebsd_src_install + + dodir /bin + for bin in awk sed mkfifo uname true false touch tty; do + mv "${D}/usr/bin/${bin}" "${D}/bin/" || die "mv ${bin} failed" + dosym /bin/${bin} /usr/bin/${bin} || die "dosym ${bin} failed" + done + + for pamdfile in login passwd su; do + newpamd "${FILESDIR}/${pamdfile}.pamd" ${pamdfile} + done + + cd "${WORKDIR}/etc" + insinto /etc + doins remote phones opieaccess fbtab + + exeinto /etc/cron.daily + newexe "${FILESDIR}/locate-updatedb-cron" locate.updatedb +} + +pkg_postinst() { + # We need to ensure that login.conf.db is up-to-date. + if [[ -e ${ROOT}etc/login.conf ]] ; then + einfo "Updating ${ROOT}etc/login.conf.db" + ${ROOT}usr/bin/cap_mkdb -f ${ROOT}etc/login.conf ${ROOT}etc/login.conf + einfo "Remember to run cap_mkdb /etc/login.conf after making changes to it" + fi +} diff --git a/sys-freebsd/freebsd-usbin/ChangeLog b/sys-freebsd/freebsd-usbin/ChangeLog index c044b62503d9..59d72e4ea807 100644 --- a/sys-freebsd/freebsd-usbin/ChangeLog +++ b/sys-freebsd/freebsd-usbin/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-freebsd/freebsd-usbin # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.28 2006/10/26 11:45:45 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.29 2006/11/01 16:22:07 flameeyes Exp $ + +*freebsd-usbin-6.2_beta3 (01 Nov 2006) + + 01 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> + +freebsd-usbin-6.2_beta3.ebuild: + Bump to 6.2_beta3. 26 Oct 2006; Roy Marples <uberlord@gentoo.org> freebsd-usbin-6.2_beta2.ebuild: diff --git a/sys-freebsd/freebsd-usbin/files/digest-freebsd-usbin-6.2_beta3 b/sys-freebsd/freebsd-usbin/files/digest-freebsd-usbin-6.2_beta3 new file mode 100644 index 000000000000..565f25f23937 --- /dev/null +++ b/sys-freebsd/freebsd-usbin/files/digest-freebsd-usbin-6.2_beta3 @@ -0,0 +1,27 @@ +MD5 0d8585db6146130649e10b502957eee6 freebsd-contrib-6.2_beta3.tar.bz2 36555171 +RMD160 630c839a0025811a4c2da5de560150fe00d4ed28 freebsd-contrib-6.2_beta3.tar.bz2 36555171 +SHA256 51c0b85ff28b6b9d85092e51a0fe2a9ae9bb9714a50495713236e0c162e8ee0b freebsd-contrib-6.2_beta3.tar.bz2 36555171 +MD5 81b97dc47668e566a803b9469b96d969 freebsd-etc-6.2_beta3.tar.bz2 188295 +RMD160 7b4e5f22cdb6b23b0379c285001379390f176136 freebsd-etc-6.2_beta3.tar.bz2 188295 +SHA256 8d79f1e1e9b8453c0431dd9112b51a09a2ed8db7c288e6eb76347b0030eacf89 freebsd-etc-6.2_beta3.tar.bz2 188295 +MD5 7d9b4fff0e69139ed253a1db9cb0fa63 freebsd-include-6.2_beta3.tar.bz2 131608 +RMD160 7bbc4c99f04752366a5d67a7ce8edc56c0807ec3 freebsd-include-6.2_beta3.tar.bz2 131608 +SHA256 5ce85fe6c6c2cc0e6bc4502d838f52820d06c1dc19c270583f2469edc466ca9a freebsd-include-6.2_beta3.tar.bz2 131608 +MD5 035e7b7d5f8dddcbe9e3c2d44428574b freebsd-lib-6.2_beta3.tar.bz2 2668544 +RMD160 9b21ec424b2b86c0dfa252322e9784ebddce3e53 freebsd-lib-6.2_beta3.tar.bz2 2668544 +SHA256 7aed09b38fedeb174bfd91caa8c2f38240c2f5a0c21d4c50e7eaef5a42daba09 freebsd-lib-6.2_beta3.tar.bz2 2668544 +MD5 359a25029a4dd656e43d83890740dd13 freebsd-libexec-6.2_beta3.tar.bz2 277158 +RMD160 91353b9c0bb7fc254b0a57d55f07b095a06909c9 freebsd-libexec-6.2_beta3.tar.bz2 277158 +SHA256 ce19db01248c1c805636e271056a4f99c8bbe1e2b76def47875dcf6e5bdafdf4 freebsd-libexec-6.2_beta3.tar.bz2 277158 +MD5 eb865a625203b8e38934c840fffb04aa freebsd-sbin-6.2_beta3.tar.bz2 1163107 +RMD160 96d7e0a7ca0ce57084e6cc915316d6b2e4db256c freebsd-sbin-6.2_beta3.tar.bz2 1163107 +SHA256 b7fe3971602ecd88bcbdcddd73379e3a13bb94d9b820ab751593e662d12a56b4 freebsd-sbin-6.2_beta3.tar.bz2 1163107 +MD5 328ec3b03995fcab39126e3437cabb72 freebsd-sys-6.2_beta3.tar.bz2 18336143 +RMD160 c75040d96af463013459f3a3278d4cca1d78e828 freebsd-sys-6.2_beta3.tar.bz2 18336143 +SHA256 f52b0bf25d2ae5792503789a1bd47bc0db7924c13df55021c7740dcdd5a4225c freebsd-sys-6.2_beta3.tar.bz2 18336143 +MD5 4813858b8cce889a4df943aab5645f3d freebsd-ubin-6.2_beta3.tar.bz2 1774931 +RMD160 1985cb50d6502f519560296794c550072032ded6 freebsd-ubin-6.2_beta3.tar.bz2 1774931 +SHA256 779057f40046a46a7d12b519494a450960d12e15384d312e84ea472bf273b39c freebsd-ubin-6.2_beta3.tar.bz2 1774931 +MD5 5266789afea7e22eef8cbbbcf322c7ae freebsd-usbin-6.2_beta3.tar.bz2 2695369 +RMD160 09e6b00f27ee49418e807fd565966f534fb5f0a3 freebsd-usbin-6.2_beta3.tar.bz2 2695369 +SHA256 14fd08cee425c734abb24fa08e6ccf1c69de7b5e9b569cf77459c04fca096db4 freebsd-usbin-6.2_beta3.tar.bz2 2695369 diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-6.2_beta3.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-6.2_beta3.ebuild new file mode 100644 index 000000000000..2b44cda10f88 --- /dev/null +++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-6.2_beta3.ebuild @@ -0,0 +1,175 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-6.2_beta3.ebuild,v 1.1 2006/11/01 16:22:07 flameeyes Exp $ + +inherit bsdmk freebsd flag-o-matic eutils + +DESCRIPTION="FreeBSD /usr/sbin tools" +SLOT="0" +KEYWORDS="~sparc-fbsd ~x86-fbsd" + +IUSE="atm bluetooth tcpd ssl usb ipv6 acpi ipfilter isdn pam ssl radius + minimal ipsec nis pam suid nat radius build" + +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 + 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}* + ssl? ( dev-libs/openssl ) + tcpd? ( sys-apps/tcp-wrappers ) + 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 atm || mymakeopts="${mymakeopts} NO_ATM= " + use bluetooth || mymakeopts="${mymakeopts} NO_BLUETOOTH= " + use ipv6 || mymakeopts="${mymakeopts} NO_INET6= " + use ipfilter || mymakeopts="${mymakeopts} NO_IPFILTER= " + use ssl || mymakeopts="${mymakeopts} NO_OPENSSL= NO_CRYPT= " + use usb || mymakeopts="${mymakeopts} NO_USB= " + use acpi || mymakeopts="${mymakeopts} NO_ACPI= " + use isdn || mymakeopts="${mymakeopts} NO_I4B= " + use pam || mymakeopts="${mymakeopts} NO_PAM= " + use radius || mymakeopts="${mymakeopts} NO_RADIUS= " + use suid || mymakeopts="${mymakeopts} NO_SUID= " + use ipsec || mymakeopts="${mymakeopts} NO_IPSEC= " + use nis || mymakeopts="${mymakeopts} NO_NIS= " + use nat || mymakeopts="${mymakeopts} NO_NAT= " + use pam || mymakeopts="${mymakeopts} NO_PAM= " + use suid || mymakeopts="${mymakeopts} NO_SUID= PPP_NOSUID= " + use radius || mymakeopts="${mymakeopts} NO_RADIUS= " + use tcpd || mymakeopts="${mymakeopts} NO_WRAP= " + + mymakeopts="${mymakeopts} NO_MAILWRAPPER= NO_BIND= NO_SENDMAIL= NO_PF= NO_AUTHPF= NO_LPR=" + + # kldxref does not build with -O2 + replace-flags "-O?" "-O1" +} + +PATCHES="${FILESDIR}/${PN}-6.0-fixmakefiles.patch + ${FILESDIR}/${PN}-6.1-nowrap.patch + ${FILESDIR}/${PN}-6.1-gcc41.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 mount_smbfs + tcpdump ndp traceroute pkg_install inetd + wpa/wpa_supplicant wpa/hostapd wpa/hostapd_cli wpa/wpa_cli + zic amd" + +src_unpack() { + freebsd_src_unpack + + if ! use build; then + ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" + ln -s "/usr/include" "${WORKDIR}/include" + 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" + + for util in nfs nfsmount rpcbind syslogd moused powerd syscons; 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 +} + |