diff options
46 files changed, 2336 insertions, 15 deletions
diff --git a/sys-freebsd/boot0/ChangeLog b/sys-freebsd/boot0/ChangeLog index 0a77687fce2a..6ae5cae4f032 100644 --- a/sys-freebsd/boot0/ChangeLog +++ b/sys-freebsd/boot0/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-freebsd/boot0 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/ChangeLog,v 1.24 2010/03/11 11:14:52 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/ChangeLog,v 1.25 2010/03/19 11:51:04 aballier Exp $ + +*boot0-8.0 (19 Mar 2010) + + 19 Mar 2010; Alexis Ballier <aballier@gentoo.org> +boot0-8.0.ebuild, + metadata.xml: + bump to 8.0 from the bsd overlay 11 Mar 2010; Alexis Ballier <aballier@gentoo.org> -files/boot0-6.0-gentoo.patch, -boot0-6.2.ebuild, -boot0-7.1.ebuild: diff --git a/sys-freebsd/boot0/boot0-8.0.ebuild b/sys-freebsd/boot0/boot0-8.0.ebuild new file mode 100644 index 000000000000..baed3c7ab292 --- /dev/null +++ b/sys-freebsd/boot0/boot0-8.0.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/boot0-8.0.ebuild,v 1.1 2010/03/19 11:51:04 aballier Exp $ + +EAPI=2 + +inherit bsdmk freebsd flag-o-matic + +DESCRIPTION="FreeBSD's bootloader" +SLOT="0" +KEYWORDS="~sparc-fbsd ~x86-fbsd" + +IUSE="bzip2 ieee1394 tftp zfs" + +SRC_URI="mirror://gentoo/${SYS}.tar.bz2" + +RDEPEND="" +DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}* + =sys-freebsd/freebsd-lib-${RV}*" + +S="${WORKDIR}/sys/boot" + +boot0_use_enable() { + use ${1} && mymakeopts="${mymakeopts} LOADER_${2}_SUPPORT=\"yes\"" +} + +pkg_setup() { + boot0_use_enable ieee1394 FIREWIRE + boot0_use_enable zfs ZFS + boot0_use_enable tftp TFTP + boot0_use_enable bzip2 BZIP2 +} + +src_prepare() { + sed -e '/-fomit-frame-pointer/d' -e '/-mno-align-long-strings/d' \ + -i "${S}"/i386/boot2/Makefile \ + -i "${S}"/i386/gptboot/Makefile \ + -i "${S}"/i386/gptzfsboot/Makefile \ + -i "${S}"/i386/zfsboot/Makefile || die +} + +src_compile() { + strip-flags + append-flags "-I/usr/include/libstand/" + append-flags "-fno-strict-aliasing" + NOFLAGSTRIP="yes" freebsd_src_compile +} + +src_install() { + dodir /boot/defaults + mkinstall FILESDIR=/boot || die "mkinstall failed" +} diff --git a/sys-freebsd/boot0/metadata.xml b/sys-freebsd/boot0/metadata.xml index ecedda4aa2cc..42e7fdce24f9 100644 --- a/sys-freebsd/boot0/metadata.xml +++ b/sys-freebsd/boot0/metadata.xml @@ -2,4 +2,8 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <herd>bsd</herd> + <use> + <flag name='tftp'>Enable PXE/TFTP boot support.</flag> + <flag name='zfs'>Enable booting on ZFS filesystems.</flag> + </use> </pkgmetadata> diff --git a/sys-freebsd/freebsd-bin/ChangeLog b/sys-freebsd/freebsd-bin/ChangeLog index 76b52d215ac2..834ceb0663bd 100644 --- a/sys-freebsd/freebsd-bin/ChangeLog +++ b/sys-freebsd/freebsd-bin/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-freebsd/freebsd-bin # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-bin/ChangeLog,v 1.35 2010/03/11 11:13:04 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-bin/ChangeLog,v 1.36 2010/03/19 11:50:56 aballier Exp $ + +*freebsd-bin-8.0 (19 Mar 2010) + + 19 Mar 2010; Alexis Ballier <aballier@gentoo.org> +freebsd-bin-8.0.ebuild: + bump to 8.0 from the bsd overlay 11 Mar 2010; Alexis Ballier <aballier@gentoo.org> -freebsd-bin-6.2.ebuild, -files/freebsd-bin-6.2-mkdir-posix.patch, diff --git a/sys-freebsd/freebsd-bin/freebsd-bin-8.0.ebuild b/sys-freebsd/freebsd-bin/freebsd-bin-8.0.ebuild new file mode 100644 index 000000000000..356602aed88b --- /dev/null +++ b/sys-freebsd/freebsd-bin/freebsd-bin-8.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-bin/freebsd-bin-8.0.ebuild,v 1.1 2010/03/19 11:50:56 aballier Exp $ + +inherit bsdmk freebsd + +DESCRIPTION="FreeBSD /bin tools" +SLOT="0" +KEYWORDS="~sparc-fbsd ~x86-fbsd" + +IUSE="" + +SRC_URI="mirror://gentoo/${BIN}.tar.bz2 + mirror://gentoo/${SBIN}.tar.bz2 + mirror://gentoo/${LIB}.tar.bz2" + +RDEPEND="=sys-freebsd/freebsd-lib-${RV}* + dev-libs/libedit + sys-libs/ncurses + sys-apps/ed + !app-misc/realpath + !<sys-freebsd/freebsd-ubin-8" +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" ) + +# csh and tcsh are provided by tcsh package, rmail is sendmail stuff. +REMOVE_SUBDIRS="csh rmail ed" + +pkg_setup() { + mymakeopts="${mymakeopts} WITHOUT_TCSH= WITHOUT_SENDMAIL= WITHOUT_RCMDS= " +} diff --git a/sys-freebsd/freebsd-cddl/ChangeLog b/sys-freebsd/freebsd-cddl/ChangeLog index 8203d6b5a808..a032eea9a669 100644 --- a/sys-freebsd/freebsd-cddl/ChangeLog +++ b/sys-freebsd/freebsd-cddl/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-freebsd/freebsd-cddl # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/ChangeLog,v 1.8 2010/03/11 10:58:55 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/ChangeLog,v 1.9 2010/03/19 11:50:41 aballier Exp $ + +*freebsd-cddl-8.0 (19 Mar 2010) + + 19 Mar 2010; Alexis Ballier <aballier@gentoo.org> + +freebsd-cddl-8.0.ebuild, +files/freebsd-cddl-8.0-libpaths.patch: + bump to 8.0 from the bsd overlay 11 Mar 2010; Alexis Ballier <aballier@gentoo.org> -freebsd-cddl-7.1-r1.ebuild: diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.0-libpaths.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.0-libpaths.patch new file mode 100644 index 000000000000..ad5c83eca3de --- /dev/null +++ b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.0-libpaths.patch @@ -0,0 +1,114 @@ +diff -ru cddl.orig/lib/libctf/Makefile cddl/lib/libctf/Makefile +--- cddl.orig/lib/libctf/Makefile 2009-01-24 03:36:33 -0200 ++++ cddl/lib/libctf/Makefile 2009-01-24 03:55:10 -0200 +@@ -4,6 +4,7 @@ + + LIB= ctf + SHLIB_MAJOR= 2 ++LDADD+=-lz + + SRCS= ctf_create.c \ + ctf_decl.c \ +diff -ru cddl.orig/lib/libdtrace/Makefile cddl/lib/libdtrace/Makefile +--- cddl.orig/lib/libdtrace/Makefile 2009-01-24 00:18:47 -0200 ++++ cddl/lib/libdtrace/Makefile 2009-01-24 03:31:06 -0200 +@@ -74,7 +74,7 @@ + .endif + + LFLAGS+=-l +- ++LDADD+=-lz -lproc + YFLAGS+=-d + + CLEANFILES= dt_errtags.c dt_names.c +diff -ru cddl.orig/lib/libzfs/Makefile cddl/lib/libzfs/Makefile +--- cddl.orig/lib/libzfs/Makefile 2008-06-22 10:26:18 -0300 ++++ cddl/lib/libzfs/Makefile 2008-06-22 10:26:26 -0300 +@@ -7,7 +7,8 @@ + + LIB= zfs + DPADD= ${LIBUTIL} +-LDADD= -lutil ++LDADD= -lutil -lgeom -lm -luutil -lumem ++LDFLAGS+= -L${.CURDIR}/../libuutil -L${.CURDIR}/../libumem + + SRCS= deviceid.c \ + mnttab.c \ +diff -ru cddl.orig/lib/libzpool/Makefile cddl/lib/libzpool/Makefile +--- cddl.orig/lib/libzpool/Makefile 2008-06-22 10:35:15 -0300 ++++ cddl/lib/libzpool/Makefile 2008-06-22 10:37:06 -0300 +@@ -42,7 +42,8 @@ + CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair + + DPADD= ${LIBPTHREAD} ${LIBZ} +-LDADD= -lpthread -lz ++LDADD= -lpthread -lz -lavl -lumem ++LDFLAGS+= -L${.CURDIR}/../libavl -L${.CURDIR}/../libumem + + # atomic.S doesn't like profiling. + NO_PROFILE= +diff -ru cddl.orig/sbin/zfs/Makefile cddl/sbin/zfs/Makefile +--- cddl.orig/sbin/zfs/Makefile 2008-06-22 10:02:30 -0300 ++++ cddl/sbin/zfs/Makefile 2008-06-22 10:14:23 -0300 +@@ -23,5 +23,7 @@ + ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL} + LDADD= -lzfs -lgeom -lbsdxml -lsbuf \ + -lm -lnvpair -luutil -lutil ++LDFLAGS+=-L${.CURDIR}/../../lib/libzfs -L${.CURDIR}/../../lib/libnvpair \ ++ -L${.CURDIR}/../../lib/libuutil -L/lib -L/usr/lib + + .include <bsd.prog.mk> +diff -ru cddl.orig/sbin/zpool/Makefile cddl/sbin/zpool/Makefile +--- cddl.orig/sbin/zpool/Makefile 2008-06-22 10:02:30 -0300 ++++ cddl/sbin/zpool/Makefile 2008-06-22 10:14:47 -0300 +@@ -23,5 +23,7 @@ + ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL} + LDADD= -lavl -lzfs -lgeom -lbsdxml -lsbuf \ + -lm -lnvpair -luutil -lutil ++LDFLAGS+=-L${.CURDIR}/../../lib/libzfs -L${.CURDIR}/../../lib/libavl -L/lib -L/usr/lib \ ++ -L${.CURDIR}/../../lib/libnvpair -L${.CURDIR}/../../lib/libuutil + + .include <bsd.prog.mk> +diff -ru cddl.orig/usr.bin/ztest/Makefile cddl/usr.bin/ztest/Makefile +--- cddl.orig/usr.bin/ztest/Makefile 2008-06-22 10:02:30 -0300 ++++ cddl/usr.bin/ztest/Makefile 2008-06-22 10:12:40 -0300 +@@ -18,5 +18,7 @@ + DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \ + ${LIBPTHREAD} ${LIBZ} ${LIBAVL} + LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl ++LDFLAGS+=-L${.CURDIR}/../../lib/libnvpair -L${.CURDIR}/../../lib/libumem \ ++ -L${.CURDIR}/../../lib/libzpool -L${.CURDIR}/../../lib/libavl -L/lib -L/usr/lib + + .include <bsd.prog.mk> +diff -ru cddl.orig/usr.bin/Makefile.inc cddl/usr.bin/Makefile.inc +--- cddl.orig/usr.bin/Makefile.inc 2009-01-10 07:21:10 +0000 ++++ cddl/usr.bin/Makefile.inc 2009-01-10 07:18:55 +0000 +@@ -1,5 +1,6 @@ + # $FreeBSD: src/cddl/usr.bin/Makefile.inc,v 1.1.6.1 2008/11/25 02:59:29 kensmith Exp $ + + BINDIR?= /usr/bin ++LDFLAGS+= -L${.CURDIR}/../../lib/libctf + + .include "../Makefile.inc" +--- cddl.orig/usr.sbin/zdb/Makefile 2010-03-11 13:19:48 +0100 ++++ cddl/usr.sbin/zdb/Makefile 2010-03-11 13:20:08 +0100 +@@ -22,6 +22,8 @@ + DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \ + ${LIBUUTIL} ${LIBZ} ${LIBZFS} ${LIBZPOOL} + LDADD= -lavl -lgeom -lm -lnvpair -lpthread -lumem -luutil -lz -lzfs -lzpool ++LDFLAGS+=-L${.CURDIR}/../../lib/libnvpair -L${.CURDIR}/../../lib/libumem \ ++ -L${.CURDIR}/../../lib/libzpool -L${.CURDIR}/../../lib/libavl -L${.CURDIR}/../../lib/libuutil -L${.CURDIR}/../../lib/libzfs + + CSTD= c99 + +--- cddl.orig/usr.bin/zinject/Makefile 2010-03-11 13:30:32 +0100 ++++ cddl/usr.bin/zinject/Makefile 2010-03-11 13:33:27 +0100 +@@ -21,5 +21,8 @@ + DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \ + ${LIBZFS} ${LIBZPOOL} ${LIBUUTIL} + LDADD= -lavl -lgeom -lm -lnvpair -lumem -luutil -lzfs -lzpool ++LDFLAGS+= -L${.CURDIR}/../../lib/libavl -L${.CURDIR}/../../lib/libnvpair \ ++ -L${.CURDIR}/../../lib/libumem -L${.CURDIR}/../../lib/libuutil \ ++ -L${.CURDIR}/../../lib/libzfs -L${.CURDIR}/../../lib/libzpool + + .include <bsd.prog.mk> diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-8.0.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-8.0.ebuild new file mode 100644 index 000000000000..5ba1ed32ce44 --- /dev/null +++ b/sys-freebsd/freebsd-cddl/freebsd-cddl-8.0.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/freebsd-cddl-8.0.ebuild,v 1.1 2010/03/19 11:50:41 aballier Exp $ + +inherit bsdmk freebsd flag-o-matic eutils + +DESCRIPTION="FreeBSD CDDL (opensolaris/zfs) extra software" +SLOT="0" +KEYWORDS="~x86-fbsd" + +IUSE="build" +LICENSE="CDDL" + +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/${SYS}.tar.bz2 + build? ( mirror://gentoo/${SYS}.tar.bz2 + mirror://gentoo/${INCLUDE}.tar.bz2 )" + +# sys is required. + +RDEPEND="=sys-freebsd/freebsd-lib-${RV}* + =sys-freebsd/freebsd-libexec-${RV}* + build? ( sys-apps/baselayout ) + dev-libs/libedit + dev-libs/libelf" + +DEPEND="${RDEPEND} + =sys-freebsd/freebsd-mk-defs-${RV}* + !build? ( =sys-freebsd/freebsd-sources-${RV}* )" + +S="${WORKDIR}/cddl" + +PATCHES=( "${FILESDIR}/${PN}-8.0-libpaths.patch" ) + +src_unpack() { + freebsd_src_unpack + # Link in include headers. + ln -s "/usr/include" "${WORKDIR}/include" || die "Symlinking /usr/include.." +} diff --git a/sys-freebsd/freebsd-contrib/ChangeLog b/sys-freebsd/freebsd-contrib/ChangeLog index 23b621e9ffbd..9854382832b3 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-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/ChangeLog,v 1.26 2010/03/11 10:57:55 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/ChangeLog,v 1.27 2010/03/19 11:50:58 aballier Exp $ + +*freebsd-contrib-8.0 (19 Mar 2010) + + 19 Mar 2010; Alexis Ballier <aballier@gentoo.org> + +freebsd-contrib-8.0.ebuild: + bump to 8.0 from the bsd overlay 11 Mar 2010; Alexis Ballier <aballier@gentoo.org> -freebsd-contrib-6.2.ebuild, -freebsd-contrib-7.1.ebuild: diff --git a/sys-freebsd/freebsd-contrib/freebsd-contrib-8.0.ebuild b/sys-freebsd/freebsd-contrib/freebsd-contrib-8.0.ebuild new file mode 100644 index 000000000000..ba68a9bbf27d --- /dev/null +++ b/sys-freebsd/freebsd-contrib/freebsd-contrib-8.0.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/freebsd-contrib-8.0.ebuild,v 1.1 2010/03/19 11:50:58 aballier Exp $ + +inherit bsdmk freebsd flag-o-matic + +DESCRIPTION="Contributed sources for FreeBSD." +SLOT="0" +KEYWORDS="~sparc-fbsd ~x86-fbsd" +LICENSE="BSD GPL-2 as-is" + +IUSE="" + +SRC_URI="mirror://gentoo/${GNU}.tar.bz2 + mirror://gentoo/${P}.tar.bz2" + +RDEPEND="" +DEPEND="=sys-freebsd/freebsd-sources-${RV}* + =sys-freebsd/freebsd-mk-defs-${RV}*" + +S="${WORKDIR}/gnu" + +src_unpack() { + echo ">>> Unpacking needed parts of ${GNU}.tar.bz2 to ${WORKDIR}" + tar -jxpf "${DISTDIR}/${GNU}.tar.bz2" gnu/lib/libdialog gnu/usr.bin/sort gnu/usr.bin/patch + echo ">>> Unpacking needed parts of ${CONTRIB}.tar.bz2 to ${WORKDIR}" + tar -jxpf "${DISTDIR}/${CONTRIB}.tar.bz2" contrib/gnu-sort + + freebsd_do_patches + freebsd_rename_libraries +} + +src_compile() { + cd "${S}/lib/libdialog" + freebsd_src_compile + + cd "${S}/usr.bin/sort" + freebsd_src_compile + + cd "${S}/usr.bin/patch" + freebsd_src_compile +} + +src_install() { + use profile || mymakeopts="${mymakeopts} NO_PROFILE= " + mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= " + + cd "${S}/lib/libdialog" + mkinstall || die "libdialog install failed" + + cd "${S}/usr.bin/sort" + mkinstall BINDIR="/bin/" || die "libdialog install failed" + + cd "${S}/usr.bin/patch" + mkinstall BINDIR="/usr/bin/" || die "libdialog install failed" +} diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog index 6ace6b0c1fd8..c54e3cc153dd 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-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.83 2010/03/12 15:38:49 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.84 2010/03/19 11:50:39 aballier Exp $ + +*freebsd-lib-8.0 (19 Mar 2010) + + 19 Mar 2010; Alexis Ballier <aballier@gentoo.org> +freebsd-lib-8.0.ebuild, + +files/freebsd-lib-8.0-log2.patch, metadata.xml: + bump to 8.0 from the bsd overlay 12 Mar 2010; Alexis Ballier <aballier@gentoo.org> freebsd-lib-7.2-r1.ebuild: diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-log2.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-log2.patch new file mode 100644 index 000000000000..a9fd18998287 --- /dev/null +++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-log2.patch @@ -0,0 +1,21 @@ +log2 and log2f are required by C99 and are not implemented. +Workaround the deficiency. + +--- lib/msun/src/math.h.old 2010-03-14 17:02:25.000000000 +0100 ++++ lib/msun/src/math.h 2010-03-14 17:07:03.000000000 +0100 +@@ -203,6 +203,7 @@ + double frexp(double, int *); /* fundamentally !__pure2 */ + double ldexp(double, int); + double log(double); ++#define log2(x) log(x)/log(2.0) + double log10(double); + double modf(double, double *); /* fundamentally !__pure2 */ + +@@ -319,6 +320,7 @@ + float log10f(float); + float log1pf(float); + float logf(float); ++#define log2f(x) logf(x)/logf(2.0) + float modff(float, float *); /* fundamentally !__pure2 */ + + float powf(float, float); diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-8.0.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-8.0.ebuild new file mode 100644 index 000000000000..91e7d4b8d439 --- /dev/null +++ b/sys-freebsd/freebsd-lib/freebsd-lib-8.0.ebuild @@ -0,0 +1,413 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-8.0.ebuild,v 1.1 2010/03/19 11:50:39 aballier Exp $ + +EAPI=2 + +inherit bsdmk freebsd flag-o-matic multilib toolchain-funcs + +DESCRIPTION="FreeBSD's base system libraries" +SLOT="0" +KEYWORDS="~sparc-fbsd ~x86-fbsd" + +# 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 + mirror://gentoo/${USBIN}.tar.bz2 + mirror://gentoo/${GNU}.tar.bz2 + build? ( + mirror://gentoo/${SYS}.tar.bz2 )" + +if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then + RDEPEND="ssl? ( dev-libs/openssl ) + hesiod? ( net-dns/hesiod ) + kerberos? ( virtual/krb5 ) + usb? ( !dev-libs/libusb ) + !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}" -a "${CATEGORY#*cross-}" != "${CATEGORY}" ]; then + export CTARGET=${CATEGORY/cross-} +fi + +IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware + build bootstrap crosscompile_opts_headers-only" + +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} WITHOUT_ATM= " + use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= " + use hesiod || mymakeopts="${mymakeopts} WITHOUT_HESIOD= " + use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6_SUPPORT= " + use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= " + use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= " + use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= " + use usb || mymakeopts="${mymakeopts} WITHOUT_USB= " + + mymakeopts="${mymakeopts} WITHOUT_BIND= WITHOUT_BIND_LIBS= WITHOUT_SENDMAIL=" + + 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}-6.0-pmc.patch" + "${FILESDIR}/${PN}-6.0-gccfloat.patch" + "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch" + "${FILESDIR}/${PN}-6.1-csu.patch" + "${FILESDIR}/${PN}-6.2-bluetooth.patch" + "${FILESDIR}/${PN}-new_as.patch" + "${FILESDIR}/${PN}-8.0-log2.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="ncurses + libz libbz2 libarchive \ + libsm libsmdb libsmutil \ + libbegemot libbsnmp \ + libpam libpcap bind libwrap libmagic \ + libcom_err libtelnet + libedit libelf" + +src_prepare() { + sed -i.bak -e 's:-o/dev/stdout:-t:' "${S}/libc/net/Makefile.inc" + sed -i.bak -e 's:histedit.h::' "${WORKDIR}/include/Makefile" + + # Upstream Display Managers default to using VT7 + # We should make FreeBSD allow this by default + local x= + for x in "${WORKDIR}"/etc/etc.*/ttys ; do + sed -i.bak \ + -e '/ttyv5[[:space:]]/ a\ +# Display Managers default to VT7.\ +# If you use the xdm init script, keep ttyv6 commented out\ +# unless you force a different VT for the DM being used.' \ + -e '/^ttyv[678][[:space:]]/ s/^/# /' "${x}" \ + || die "Failed to sed ${x}" + rm "${x}".bak + done + + # This one is here because it also + # patches "${WORKDIR}/include" + cd "${WORKDIR}" + epatch "${FILESDIR}/${PN}-includes.patch" + + # Don't install the hesiod man page or header + rm "${WORKDIR}"/include/hesiod.h || die + sed -i.bak -e 's:hesiod.h::' "${WORKDIR}"/include/Makefile || die + sed -i.bak -e 's:hesiod.c::' -e 's:hesiod.3::' \ + "${WORKDIR}"/lib/libc/net/Makefile.inc || die + + # Fix the Makefiles of these few libraries that will overwrite our LDADD. + cd "${S}" + for dir in libradius libtacplus libcam libdevstat libfetch libgeom libmemstat libopie \ + libsmb; do sed -i.bak -e 's:LDADD=:LDADD+=:g' "${dir}/Makefile" || \ + die "Problem fixing \"${dir}/Makefile" + done + if use build; then + cd "${WORKDIR}" + # This patch has to be applied on ${WORKDIR}/sys, so we do it here since it + # shouldn't be a symlink to /usr/src/sys (which should be already patched) + epatch "${FILESDIR}"/${PN}-7.1-types.h-fix.patch + # Preinstall includes so we don't use the system's ones. + mkdir "${WORKDIR}/include_proper" || die "Couldn't create ${WORKDIR}/include_proper" + install_includes "/include_proper" + return 0 + fi + + if [ "${CTARGET}" = "${CHOST}" ]; then + ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" || die "Couldn't make sys symlink!" + else + sed -i.bak -e "s:/usr/include:/usr/${CTARGET}/usr/include:g" \ + "${S}/libc/rpc/Makefile.inc" \ + "${S}/libc/yp/Makefile.inc" + fi + + if install --version 2> /dev/null | grep -q GNU; then + sed -i.bak -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile" + fi + + # Preinstall includes so we don't use the system's ones. + mkdir "${WORKDIR}/include_proper" || die "Couldn't create ${WORKDIR}/include_proper" + install_includes "/include_proper" + + # Let arch-specific includes to be found + local machine + machine=$(tc-arch-kernel ${CTARGET}) + ln -s "${WORKDIR}/sys/${machine}/include" "${WORKDIR}/include/machine" || \ + die "Couldn't make ${machine}/include symlink." + + cd "${S}" + 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 + + # Bug #270098 + append-flags $(test-flags -fno-strict-aliasing) + + strip-flags + if [ "${CTARGET}" != "${CHOST}" ]; then + export YACC='yacc -by' + CHOST=${CTARGET} tc-export CC LD CXX RANLIB + mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= NLS=" + + 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 "-isystem ${WORKDIR}/lib/libutil" + append-flags "-isystem ${WORKDIR}/lib/msun/${machine/i386/i387}" + append-flags "-B ${csudir}" + append-ldflags "-B ${csudir}" + + # First compile libssp_nonshared.a and add it's path to LDFLAGS. + cd "${WORKDIR}/gnu/lib/libssp/" || die "missing libssp." + $(freebsd_get_bmake) ${mymakeopts} || die "make libssp failed" + append-ldflags "-L${WORKDIR}/gnu/lib/libssp/libssp_nonshared/" + + cd "${S}/libc" + $(freebsd_get_bmake) ${mymakeopts} || die "make libc failed" + cd "${S}/msun" + LDADD="-lssp_nonshared" $(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}/include_proper'" + + # First compile libssp_nonshared.a and add it's path to LDFLAGS. + einfo "Compiling libssp in \"${WORKDIR}/gnu/lib/libssp/\"." + cd "${WORKDIR}/gnu/lib/libssp/" || die "missing libssp." + NOFLAGSTRIP=yes freebsd_src_compile + # Hack libssp_nonshared.a into libc & others since we don't have + # the linker script in place yet. + append-ldflags "-L${WORKDIR}/gnu/lib/libssp/libssp_nonshared/" + einfo "Compiling libc." + cd "${S}" + NOFLAGSTRIP=yes LDADD="-lssp_nonshared" freebsd_src_compile + fi +} + +src_install() { + [ "${CTARGET}" = "${CHOST}" ] \ + && INCLUDEDIR="/usr/include" \ + || INCLUDEDIR="/usr/${CTARGET}/usr/include" + dodir ${INCLUDEDIR} + einfo "Installing for ${CTARGET} in ${CHOST}.." + install_includes ${INCLUDEDIR} + + # 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 + local mylibdir=$(get_libdir) + + 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" LIBDIR="/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 libc 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 msun failed" + + cd "${WORKDIR}/gnu/lib/libssp/" + $(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 ssp failed" + + dosym "usr/include" "/usr/${CTARGET}/sys-include" + else + # Set SHLIBDIR and LIBDIR for multilib + cd "${WORKDIR}/gnu/lib/libssp" + SHLIBDIR="/${mylibdir}" LIBDIR="/usr/${mylibdir}" mkinstall || die "Install ssp failed." + cd "${S}" + SHLIBDIR="/${mylibdir}" LIBDIR="/usr/${mylibdir}" mkinstall || die "Install failed" + fi + + # Don't install the rest of the configuration files if crosscompiling + if [ "${CTARGET}" != "${CHOST}" ] ; then + # This is to get it stripped with the correct tools, otherwise it gets + # stripped with the host strip. + export CHOST=${CTARGET} + return 0 + fi + + # Add symlinks (-> libthr) for legacy threading libraries, since these are + # not built by us (they are disabled in FreeBSD-7 anyway). + dosym libthr.a /usr/${mylibdir}/libpthread.a + dosym libthr.so /usr/${mylibdir}/libpthread.so + dosym libthr.a /usr/${mylibdir}/libc_r.a + dosym libthr.so /usr/${mylibdir}/libc_r.so + + # 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 + if [[ $(tc-arch-kernel) == "x86_64" ]]; then + local MACHINE="amd64" + else + local MACHINE="$(tc-arch-kernel)" + fi + doins "etc.${MACHINE}"/* + + # Generate ldscripts, otherwise bad thigs are supposed to happen + gen_usr_ldscript libalias_cuseeme.so libalias_dummy.so libalias_ftp.so \ + libalias_irc.so libalias_nbt.so libalias_pptp.so libalias_skinny.so \ + libalias_smedia.so libssp.so + # These show on QA warnings too, however they're pretty much bsd only, + # aka, no autotools for them. + # libbsdxml.so libcam.so libcrypt.so libdevstat.so libgeom.so \ + # libipsec.so libipx.so libkiconv.so libkvm.so libmd.so libsbuf.so libufs.so \ + # libutil.so + + # Generate libc.so ldscript for inclusion of libssp_nonshared.a when linking + # this is done to avoid having to touch gcc spec file as it is currently + # done on FreeBSD upstream, mostly because their binutils aren't able to + # cope with linker scripts yet. + # Taken from toolchain-funcs.eclass: + local output_format + output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p') + [[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )" + # Clear the symlink. + rm -f "${D}/usr/${mylibdir}/libc.so" + cat > "${D}/usr/${mylibdir}/libc.so" <<-END_LDSCRIPT +/* GNU ld script + SSP (-fstack-protector) requires __stack_chk_fail_local to be local. + GCC invokes this symbol in a non-PIC way, which results in TEXTRELs if + this symbol was provided by a shared libc. So we link in + libssp_nonshared.a from here. + */ +${output_format} +GROUP ( /${mylibdir}/libc.so.7 /usr/${mylibdir}/libssp_nonshared.a ) +END_LDSCRIPT + + 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 +} + +install_includes() +{ + local INCLUDEDIR="$1" + + # The idea is to be called from either install or unpack. + # During unpack it's required to install them as portage's user. + if [[ "${EBUILD_PHASE}" == "install" ]]; then + local DESTDIR="${D}" + BINOWN="root" + BINGRP="wheel" + else + local DESTDIR="${WORKDIR}" + [[ -z "${USER}" ]] && USER="portage" + BINOWN="${USER}" + [[ -z "${GROUPS}" ]] && GROUPS="portage" + BINGRP="${GROUPS}" + fi + + # This is for ssp/ssp.h. + einfo "Building ssp.h" + cd "${WORKDIR}/gnu/lib/libssp/" || die "missing libssp" + $(freebsd_get_bmake) ssp.h || die "problem building ssp.h" + + # Must exist before we use it. + [[ -d "${DESTDIR}${INCLUDEDIR}" ]] || die "dodir or mkdir ${INCLUDEDIR} before using install_includes." + cd "${WORKDIR}/include" + + if [[ $(tc-arch-kernel) == "x86_64" ]]; then + local MACHINE="amd64" + else + local MACHINE="$(tc-arch-kernel)" + fi + + einfo "Installing includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..." + $(freebsd_get_bmake) installincludes \ + MACHINE=${MACHINE} DESTDIR="${DESTDIR}" \ + INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \ + BINGRP="${BINGRP}" || die "install_includes() failed" + einfo "includes installed ok." + einfo "Installing ssp includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..." + cd "${WORKDIR}/gnu/lib/libssp" + $(freebsd_get_bmake) installincludes DESTDIR="${DESTDIR}" \ + MACHINE=${MACHINE} INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \ + BINGRP="${BINGRP}" || die "problem installing ssp includes." + einfo "ssp includes installed ok." +} diff --git a/sys-freebsd/freebsd-libexec/ChangeLog b/sys-freebsd/freebsd-libexec/ChangeLog index 634220fe76fa..8017d2162098 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-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/ChangeLog,v 1.38 2010/03/11 11:26:37 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/ChangeLog,v 1.39 2010/03/19 11:51:00 aballier Exp $ + +*freebsd-libexec-8.0 (19 Mar 2010) + + 19 Mar 2010; Alexis Ballier <aballier@gentoo.org> + +freebsd-libexec-8.0.ebuild: + bump to 8.0 from the bsd overlay 11 Mar 2010; Alexis Ballier <aballier@gentoo.org> -files/freebsd-libexec-6.1-libfallback.patch, diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-8.0.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-8.0.ebuild new file mode 100644 index 000000000000..208f49cfb9a4 --- /dev/null +++ b/sys-freebsd/freebsd-libexec/freebsd-libexec-8.0.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/freebsd-libexec-8.0.ebuild,v 1.1 2010/03/19 11:51:00 aballier Exp $ + +EAPI=2 + +inherit bsdmk freebsd pam + +DESCRIPTION="FreeBSD libexec things" +SLOT="0" +KEYWORDS="~sparc-fbsd ~x86-fbsd" + +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}*" +RDEPEND="${RDEPEND} + xinetd? ( sys-apps/xinetd )" + +S="${WORKDIR}/libexec" + +# Remove sendmail, tcp_wrapper and other useless stuff +REMOVE_SUBDIRS="smrsh mail.local tcpd telnetd rshd rlogind lukemftpd ftpd" + +IUSE="pam ssl kerberos ipv6 nis xinetd" + +pkg_setup() { + use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= " + use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= " + use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= " + use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= " + use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= " + + mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_PF= WITHOUT_RCMDS= " +} + +src_prepare() { + ln -s /usr/include "${WORKDIR}/include" +} + +src_install() { + freebsd_src_install + + insinto /etc + doins "${WORKDIR}/etc/gettytab" + newinitd "${FILESDIR}/bootpd.initd" bootpd + newconfd "${FILESDIR}/bootpd.confd" bootpd + + if use xinetd; then + for rpcd in rstatd rusersd walld rquotad sprayd; do + insinto /etc/xinetd.d + newins "${FILESDIR}/${rpcd}.xinetd" ${rpcd} + done + fi +} diff --git a/sys-freebsd/freebsd-mk-defs/ChangeLog b/sys-freebsd/freebsd-mk-defs/ChangeLog index 231c9ae2dfc6..1ceb146cf13f 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-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/ChangeLog,v 1.34 2010/03/11 11:22:52 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/ChangeLog,v 1.35 2010/03/19 11:50:53 aballier Exp $ + +*freebsd-mk-defs-8.0 (19 Mar 2010) + + 19 Mar 2010; Alexis Ballier <aballier@gentoo.org> + +freebsd-mk-defs-8.0.ebuild, +files/freebsd-mk-defs-8.0-gentoo.patch, + +files/freebsd-mk-defs-8.0-gnu.patch: + bump to 8.0 from the bsd overlay 11 Mar 2010; Alexis Ballier <aballier@gentoo.org> -files/freebsd-mk-defs-6.0-gnu.patch, -freebsd-mk-defs-6.2.ebuild, diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-8.0-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-8.0-gentoo.patch new file mode 100644 index 000000000000..f17f6c4aad3a --- /dev/null +++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-8.0-gentoo.patch @@ -0,0 +1,332 @@ +Index: share/mk/bsd.doc.mk +=================================================================== +--- share/mk/bsd.doc.mk.orig ++++ 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: share/mk/bsd.files.mk +=================================================================== +--- share/mk/bsd.files.mk.orig ++++ 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: share/mk/bsd.incs.mk +=================================================================== +--- share/mk/bsd.incs.mk.orig ++++ share/mk/bsd.incs.mk +@@ -41,6 +41,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} \ +@@ -53,9 +57,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: share/mk/bsd.info.mk +=================================================================== +--- share/mk/bsd.info.mk.orig ++++ share/mk/bsd.info.mk +@@ -83,6 +83,7 @@ INFO2HTML?= info2html + TEX?= tex + DVIPS?= dvips + DVIPS2ASCII?= dvips2ascii ++INSTALL?= install + + .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html + +@@ -144,12 +145,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: share/mk/bsd.lib.mk +=================================================================== +--- share/mk/bsd.lib.mk.orig ++++ share/mk/bsd.lib.mk +@@ -41,10 +41,6 @@ CTFFLAGS+= -g + .endif + .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 +@@ -276,14 +272,17 @@ realinstall: _libinstall + .ORDER: beforeinstall _libinstall + _libinstall: + .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no" ++ ${INSTALL} -d ${DESTDIR}${LIBDIR} + ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR} + .endif + .if ${MK_PROFILE} != "no" && 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: share/mk/bsd.libnames.mk +=================================================================== +--- share/mk/bsd.libnames.mk.orig ++++ share/mk/bsd.libnames.mk +@@ -46,7 +46,7 @@ LIBDWARF?= ${DESTDIR}${LIBDIR}/libdwarf. + LIBEDIT?= ${DESTDIR}${LIBDIR}/libedit.a + LIBELF?= ${DESTDIR}${LIBDIR}/libelf.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 +@@ -77,7 +77,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 ${MK_BIND} != "no" + LIBLWRES?= ${DESTDIR}${LIBDIR}/liblwres.a +Index: share/mk/bsd.man.mk +=================================================================== +--- share/mk/bsd.man.mk.orig ++++ 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}${MANDIR}${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: share/mk/bsd.prog.mk +=================================================================== +--- share/mk/bsd.prog.mk.orig ++++ share/mk/bsd.prog.mk +@@ -27,10 +27,6 @@ CTFFLAGS+= -g + CFLAGS+=${CRUNCH_CFLAGS} + .endif + +-.if !defined(DEBUG_FLAGS) +-STRIP?= -s +-.endif +- + .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO") + LDFLAGS+= -static + .endif +@@ -152,9 +148,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 +@@ -182,6 +180,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: share/mk/bsd.sys.mk +=================================================================== +--- share/mk/bsd.sys.mk.orig ++++ share/mk/bsd.sys.mk +@@ -28,9 +28,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 +@@ -64,9 +61,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 +Index: share/mk/bsd.links.mk +=================================================================== +--- share/mk/bsd.links.mk.orig ++++ share/mk/bsd.links.mk +@@ -15,6 +15,8 @@ _installlinks: + t=${DESTDIR}$$1; \ + shift; \ + ${ECHO} $$t -\> $$l; \ ++ d=`dirname $$t`; \ ++ test -d $$d || mkdir $$d; \ + ln -f $$l $$t; \ + done; true + .endif +@@ -26,6 +28,8 @@ _installlinks: + t=${DESTDIR}$$1; \ + shift; \ + ${ECHO} $$t -\> $$l; \ ++ d=`dirname $$t`; \ ++ test -d $$d || mkdir $$d; \ + ln -fs $$l $$t; \ + done; true + .endif +Index: share/mk/bsd.own.mk +=================================================================== +--- share/mk/bsd.own.mk.orig ++++ share/mk/bsd.own.mk +@@ -164,11 +164,6 @@ NLSMODE?= ${NOBINMODE} + + INCLUDEDIR?= /usr/include + +-# Common variables +-.if !defined(DEBUG_FLAGS) +-STRIP?= -s +-.endif +- + COMPRESS_CMD?= gzip -cn + COMPRESS_EXT?= .gz + +Index: share/mk/sys.mk +=================================================================== +--- share/mk/sys.mk.orig ++++ share/mk/sys.mk +@@ -34,11 +34,11 @@ AFLAGS ?= + CC ?= c89 + CFLAGS ?= -O + .else +-CC ?= cc ++CC ?= gcc + .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "mips" +-CFLAGS ?= -O -pipe ++CFLAGS ?= -pipe + .else +-CFLAGS ?= -O2 -pipe ++CFLAGS ?= -pipe + .endif + .if defined(NO_STRICT_ALIASING) + CFLAGS += -fno-strict-aliasing +@@ -64,7 +64,7 @@ CFLAGS += -g + .endif + .endif + +-CXX ?= c++ ++CXX ?= g++ + CXXFLAGS ?= ${CFLAGS:N-std=*:N-Wnested-externs:N-W*-prototypes:N-Wno-pointer-sign} + + CPP ?= cpp +@@ -333,12 +333,6 @@ YFLAGS ?= -d + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} + .endif + +-# 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 +- + .if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL) + SHELL= ${__MAKE_SHELL} + .SHELL: path=${__MAKE_SHELL} diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-8.0-gnu.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-8.0-gnu.patch new file mode 100644 index 000000000000..41c4de4f945d --- /dev/null +++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-8.0-gnu.patch @@ -0,0 +1,121 @@ +Index: mk/bsd.incs.mk +=================================================================== +--- mk/bsd.incs.mk.orig ++++ mk/bsd.incs.mk +@@ -45,7 +45,7 @@ _${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}} \ ++ ${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \ + -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ + ${.ALLSRC} \ + ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}} +@@ -58,11 +58,11 @@ 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} \ ++ ${INSTALL} -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} \ ++ ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ + ${.ALLSRC} ${DESTDIR}${${group}DIR} + .endif + .endif +Index: mk/bsd.lib.mk +=================================================================== +--- mk/bsd.lib.mk.orig ++++ mk/bsd.lib.mk +@@ -156,11 +156,7 @@ _LIBS= lib${LIB}.a + lib${LIB}.a: ${OBJS} ${STATICOBJS} + @${ECHO} building static ${LIB} library + @rm -f ${.TARGET} +-.if !defined(NM) +- @${AR} cq ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} +-.else +- @${AR} cq ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} +-.endif ++ @${AR} cq ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD} + ${RANLIB} ${.TARGET} + .endif + +@@ -173,11 +169,7 @@ POBJS+= ${OBJS:.o=.po} ${STATICOBJS:.o= + lib${LIB}_p.a: ${POBJS} + @${ECHO} building profiled ${LIB} library + @rm -f ${.TARGET} +-.if !defined(NM) +- @${AR} cq ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD} +-.else +- @${AR} cq ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD} +-.endif ++ @${AR} cq ${.TARGET} ${POBJS} ${ARADD} + ${RANLIB} ${.TARGET} + .endif + +@@ -195,15 +187,9 @@ ${SHLIB_NAME}: ${SOBJS} + .if defined(SHLIB_LINK) + @ln -fs ${.TARGET} ${SHLIB_LINK} + .endif +-.if !defined(NM) +- @${CC} ${LDFLAGS} ${SSP_CFLAGS} -shared -Wl,-x \ +- -o ${.TARGET} -Wl,-soname,${SONAME} \ +- `lorder ${SOBJS} | tsort -q` ${LDADD} +-.else + @${CC} ${LDFLAGS} ${SSP_CFLAGS} -shared -Wl,-x \ + -o ${.TARGET} -Wl,-soname,${SONAME} \ +- `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD} +-.endif ++ `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD} + .if defined(CTFMERGE) + ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS} + .endif +@@ -251,13 +237,6 @@ _EXTRADEPEND: + + .if !target(install) + +-.if defined(PRECIOUSLIB) +-.if !defined(NO_FSCHG) +-SHLINSTALLFLAGS+= -fschg +-.endif +-SHLINSTALLFLAGS+= -S +-.endif +- + _INSTALLFLAGS:= ${INSTALLFLAGS} + .for ie in ${INSTALLFLAGS_EDIT} + _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}} +@@ -273,12 +252,12 @@ realinstall: _libinstall + _libinstall: + .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no" + ${INSTALL} -d ${DESTDIR}${LIBDIR} +- ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ++ ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR} + .endif + .if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB) + ${INSTALL} -d ${DESTDIR}${LIBDIR} +- ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ++ ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR} + .endif + .if defined(SHLIB_NAME) +Index: mk/bsd.prog.mk +=================================================================== +--- mk/bsd.prog.mk.orig ++++ mk/bsd.prog.mk +@@ -130,13 +130,6 @@ _EXTRADEPEND: + + .if !target(install) + +-.if defined(PRECIOUSPROG) +-.if !defined(NO_FSCHG) +-INSTALLFLAGS+= -fschg +-.endif +-INSTALLFLAGS+= -S +-.endif +- + _INSTALLFLAGS:= ${INSTALLFLAGS} + .for ie in ${INSTALLFLAGS_EDIT} + _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}} diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-8.0.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-8.0.ebuild new file mode 100644 index 000000000000..7756143b2430 --- /dev/null +++ b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-8.0.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2010 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-8.0.ebuild,v 1.1 2010/03/19 11:50:53 aballier Exp $ + +inherit bsdmk freebsd + +DESCRIPTION="Makefiles definitions used for building and installing libraries and system files" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~sparc-fbsd ~x86-fbsd" + +IUSE="" + +SRC_URI="mirror://gentoo/${SHARE}.tar.bz2" + +RDEPEND="" +DEPEND="" + +RESTRICT="strip" + +S="${WORKDIR}/share/mk" + +src_unpack() { + unpack ${A} + + cd "${S}" + epatch "${FILESDIR}/${PN}-8.0-gentoo.patch" + + [[ ${CHOST} != *-*bsd* || ${CHOST} == *-gnu ]] && \ + epatch "${FILESDIR}/${PN}-8.0-gnu.patch" +} + +src_compile() { :; } + +src_install() { + if [[ ${CHOST} != *-freebsd* ]]; then + insinto /usr/share/mk/freebsd + else + insinto /usr/share/mk + fi + doins *.mk *.awk +} diff --git a/sys-freebsd/freebsd-pam-modules/ChangeLog b/sys-freebsd/freebsd-pam-modules/ChangeLog index b8367cd7a312..10dd20fd4f51 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-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pam-modules/ChangeLog,v 1.25 2010/03/11 11:31:46 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pam-modules/ChangeLog,v 1.26 2010/03/19 11:51:02 aballier Exp $ + +*freebsd-pam-modules-8.0 (19 Mar 2010) + + 19 Mar 2010; Alexis Ballier <aballier@gentoo.org> + +freebsd-pam-modules-8.0.ebuild: + bump to 8.0 from the bsd overlay 11 Mar 2010; Alexis Ballier <aballier@gentoo.org> -files/5.4/README.pamd, -files/5.4/convert.pl, -files/5.4/pam.d/other, -files/5.4/pam.d/system, diff --git a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-8.0.ebuild b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-8.0.ebuild new file mode 100644 index 000000000000..413817c0b57c --- /dev/null +++ b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-8.0.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2010 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-8.0.ebuild,v 1.1 2010/03/19 11:51:02 aballier Exp $ + +inherit bsdmk freebsd multilib pam + +DESCRIPTION="FreeBSD's PAM authentication modules" +SLOT="0" +KEYWORDS="~x86-fbsd ~sparc-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}/README.pamd" +} diff --git a/sys-freebsd/freebsd-pf/ChangeLog b/sys-freebsd/freebsd-pf/ChangeLog index 501f581d0693..60bd4a47258e 100644 --- a/sys-freebsd/freebsd-pf/ChangeLog +++ b/sys-freebsd/freebsd-pf/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-freebsd/freebsd-pf # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pf/ChangeLog,v 1.27 2010/03/11 11:10:12 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pf/ChangeLog,v 1.28 2010/03/19 11:50:44 aballier Exp $ + +*freebsd-pf-8.0 (19 Mar 2010) + + 19 Mar 2010; Alexis Ballier <aballier@gentoo.org> +freebsd-pf-8.0.ebuild: + bump to 8.0 from the bsd overlay 11 Mar 2010; Alexis Ballier <aballier@gentoo.org> -files/freebsd-pf-6.0-pcap.patch, -freebsd-pf-6.2.ebuild, diff --git a/sys-freebsd/freebsd-pf/freebsd-pf-8.0.ebuild b/sys-freebsd/freebsd-pf/freebsd-pf-8.0.ebuild new file mode 100644 index 000000000000..2e620f7785fe --- /dev/null +++ b/sys-freebsd/freebsd-pf/freebsd-pf-8.0.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pf/freebsd-pf-8.0.ebuild,v 1.1 2010/03/19 11:50:44 aballier 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} + dev-libs/libevent + sys-freebsd/freebsd-mk-defs + =sys-freebsd/freebsd-sources-${RV}*" + +S="${WORKDIR}" + +SUBDIRS="usr.sbin/authpf sbin/pfctl sbin/pflogd usr.sbin/ftp-proxy/ftp-proxy" + +pkg_setup() { + enewgroup authpf 63 + mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= " +} + +src_unpack() { + freebsd_src_unpack + # pcap-int.h redefines snprintf as pcap_snprintf + epatch "${FILESDIR}/${PN}-7.0-pcap_pollution.patch" + # Use system's libevent + epatch "${FILESDIR}/${PN}-7.0-libevent.patch" + # Link in kernel sources + 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 + # pf.initd provided by openrc, but no pf.confd + newconfd "${FILESDIR}/pf.confd" pf +} diff --git a/sys-freebsd/freebsd-rescue/ChangeLog b/sys-freebsd/freebsd-rescue/ChangeLog index 598c9d7ecf15..4c2ad1cca2c7 100644 --- a/sys-freebsd/freebsd-rescue/ChangeLog +++ b/sys-freebsd/freebsd-rescue/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-freebsd/freebsd-rescue # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-rescue/ChangeLog,v 1.21 2010/03/11 11:09:04 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-rescue/ChangeLog,v 1.22 2010/03/19 11:50:47 aballier Exp $ + +*freebsd-rescue-8.0 (19 Mar 2010) + + 19 Mar 2010; Alexis Ballier <aballier@gentoo.org> + +freebsd-rescue-8.0.ebuild, + +files/freebsd-rescue-8.0-pkgconfig_static_libarchive.patch, metadata.xml: + bump to 8.0 from the bsd overlay 11 Mar 2010; Alexis Ballier <aballier@gentoo.org> freebsd-rescue-7.2.ebuild: diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-8.0-pkgconfig_static_libarchive.patch b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-8.0-pkgconfig_static_libarchive.patch new file mode 100644 index 000000000000..7d12621cec80 --- /dev/null +++ b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-8.0-pkgconfig_static_libarchive.patch @@ -0,0 +1,11 @@ +--- rescue/rescue/Makefile.old 2010-03-12 12:14:17 +0100 ++++ rescue/rescue/Makefile 2010-03-12 12:14:47 +0100 +@@ -209,7 +209,7 @@ + CRUNCH_LIBS+= -lbz2 + + CRUNCH_PROGS_usr.bin+= tar +-CRUNCH_LIBS+= -larchive -lmd ++CRUNCH_LIBS+= `pkg-config --static --libs libarchive` -lmd + .if ${MK_OPENSSL} != "no" + CRUNCH_LIBS+= -lcrypto + .endif diff --git a/sys-freebsd/freebsd-rescue/freebsd-rescue-8.0.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-8.0.ebuild new file mode 100644 index 000000000000..2155745d4184 --- /dev/null +++ b/sys-freebsd/freebsd-rescue/freebsd-rescue-8.0.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-rescue/freebsd-rescue-8.0.ebuild,v 1.1 2010/03/19 11:50:47 aballier Exp $ + +EAPI=2 + +inherit bsdmk freebsd + +DESCRIPTION="FreeBSD's rescue binaries" +SLOT="0" +KEYWORDS="~x86-fbsd" +LICENSE="BSD zfs? ( CDDL )" + +IUSE="atm nis zfs" + +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 + zfs? ( mirror://gentoo/${CDDL}.tar.bz2 )" + +RDEPEND="" +DEPEND="sys-devel/flex + >=app-arch/libarchive-2.7.1[static-libs] + dev-util/pkgconfig + =sys-freebsd/freebsd-lib-${RV}*[atm?] + =sys-freebsd/freebsd-sources-${RV}* + =sys-freebsd/freebsd-mk-defs-${RV}*" + +S="${WORKDIR}/rescue" + +pkg_setup() { + use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= " + use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= " + use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= " +} + +src_prepare() { + # As they are patches from ${WORKDIR} apply them by hand + cd "${WORKDIR}" + epatch "${FILESDIR}/${PN}"-8.0-pkgconfig_static_libarchive.patch + epatch "${FILESDIR}/${PN}"-7.1-zlib.patch +} diff --git a/sys-freebsd/freebsd-rescue/metadata.xml b/sys-freebsd/freebsd-rescue/metadata.xml index ecedda4aa2cc..6a5b4ea9ea0b 100644 --- a/sys-freebsd/freebsd-rescue/metadata.xml +++ b/sys-freebsd/freebsd-rescue/metadata.xml @@ -2,4 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <herd>bsd</herd> + <use> + <flag name='zfs'>Enable ZFS support.</flag> + </use> </pkgmetadata> diff --git a/sys-freebsd/freebsd-sbin/ChangeLog b/sys-freebsd/freebsd-sbin/ChangeLog index 95ca56b5b9c4..8b271be8a6f5 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-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/ChangeLog,v 1.54 2010/03/11 11:20:03 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/ChangeLog,v 1.55 2010/03/19 11:50:49 aballier Exp $ + +*freebsd-sbin-8.0 (19 Mar 2010) + + 19 Mar 2010; Alexis Ballier <aballier@gentoo.org> + +freebsd-sbin-8.0.ebuild, metadata.xml: + bump to 8.0 from the bsd overlay 11 Mar 2010; Alexis Ballier <aballier@gentoo.org> -freebsd-sbin-6.2-r2.ebuild, -files/freebsd-sbin-6.2-ipfilter.patch, diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-8.0.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-8.0.ebuild new file mode 100644 index 000000000000..2529198156d0 --- /dev/null +++ b/sys-freebsd/freebsd-sbin/freebsd-sbin-8.0.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/freebsd-sbin-8.0.ebuild,v 1.1 2010/03/19 11:50:49 aballier Exp $ + +EAPI=2 + +inherit bsdmk freebsd + +DESCRIPTION="FreeBSD sbin utils" +KEYWORDS="~sparc-fbsd ~x86-fbsd" +SLOT="0" + +SRC_URI="mirror://gentoo/${SBIN}.tar.bz2 + mirror://gentoo/${CONTRIB}.tar.bz2 + mirror://gentoo/${LIB}.tar.bz2 + mirror://gentoo/${LIBEXEC}.tar.bz2 + mirror://gentoo/${USBIN}.tar.bz2 + mirror://gentoo/${ETC}.tar.bz2 + build? ( mirror://gentoo/${SYS}.tar.bz2 )" + +RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[ipv6?,atm?,netware?] + =sys-freebsd/freebsd-libexec-${RV}* + ssl? ( dev-libs/openssl ) + dev-libs/libedit + sys-libs/readline + sys-process/vixie-cron + atm? ( net-analyzer/bsnmp )" +DEPEND="${RDEPEND} + !build? ( =sys-freebsd/freebsd-sources-${RV}* ) + =sys-freebsd/freebsd-mk-defs-${RV}*" + +PROVIDE="virtual/dev-manager" + +S="${WORKDIR}/sbin" + +IUSE="atm ipfilter +pf ipv6 build ssl +cxx netware" + +pkg_setup() { + use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= " + use cxx || mymakeopts="${mymakeopts} WITHOUT_CXX=" + use ipfilter || mymakeopts="${mymakeopts} WITHOUT_IPFILTER= " + use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT=" + use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= " + use pf || mymakeopts="${mymakeopts} WITHOUT_PF= " + use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL=" +} + +REMOVE_SUBDIRS="dhclient pfctl pflogd rcorder" + +PATCHES=( "${FILESDIR}/${PN}-setXid.patch" + "${FILESDIR}/${PN}-7.1-zlib.patch" + "${FILESDIR}/${PN}-6.2-ldconfig.patch" + "${FILESDIR}/${PN}-6.1-pr102701.patch" ) + +src_prepare() { + use build || ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" +} + +src_install() { + freebsd_src_install + keepdir /var/log + # Needed by ldconfig: + keepdir /var/run + + # Maybe ship our own sysctl.conf so things like radvd work out of the box. + # New wireless config method requires regdomain.xml in /etc + cd "${WORKDIR}/etc/" + insinto /etc + doins minfree sysctl.conf regdomain.xml || die + + # initd script for idmapd + newinitd "${FILESDIR}/idmapd.initd" idmapd + + # Install a crontab for adjkerntz + insinto /etc/cron.d + newins "${FILESDIR}/adjkerntz-crontab" adjkerntz + + # Install the periodic stuff (needs probably to be ported in a more + # gentooish way) + cd "${WORKDIR}/etc/periodic" + + doperiodic security \ + security/*.ipfwlimit \ + security/*.ipfwdenied || die + + use ipfilter && { doperiodic security \ + security/*.ipfdenied || die ; } + + use pf && { doperiodic security \ + security/*.pfdenied || die ; } +} diff --git a/sys-freebsd/freebsd-share/ChangeLog b/sys-freebsd/freebsd-share/ChangeLog index dd497a78a62d..910b6b5f0291 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-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/ChangeLog,v 1.35 2010/03/11 11:00:43 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/ChangeLog,v 1.36 2010/03/19 11:51:03 aballier Exp $ + +*freebsd-share-8.0 (19 Mar 2010) + + 19 Mar 2010; Alexis Ballier <aballier@gentoo.org> + +freebsd-share-8.0.ebuild, +files/freebsd-share-8.0-gnu-miscfiles.patch: + bump to 8.0 from the bsd overlay 11 Mar 2010; Alexis Ballier <aballier@gentoo.org> -freebsd-share-6.2.ebuild, -freebsd-share-7.1.ebuild, diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-8.0-gnu-miscfiles.patch b/sys-freebsd/freebsd-share/files/freebsd-share-8.0-gnu-miscfiles.patch new file mode 100644 index 000000000000..19167a6e04c7 --- /dev/null +++ b/sys-freebsd/freebsd-share/files/freebsd-share-8.0-gnu-miscfiles.patch @@ -0,0 +1,26 @@ +--- share/misc/Makefile.old 2010-03-12 01:32:39 +0100 ++++ share/misc/Makefile 2010-03-12 01:33:25 +0100 +@@ -3,9 +3,9 @@ + + .PATH: ${.CURDIR}/../../sys/dev/usb + +-FILES= ascii birthtoken bsd-family-tree committers-doc.dot committers-ports.dot \ ++FILES= bsd-family-tree committers-doc.dot committers-ports.dot \ + committers-src.dot eqnchar flowers init.ee \ +- iso3166 iso639 latin1 man.template mdoc.template operator pci_vendors \ ++ iso3166 iso639 man.template mdoc.template pci_vendors \ + scsi_modes usb_hid_usages usbdevs + + NO_OBJ= +--- share/dict/Makefile.old 2010-03-12 01:33:53 +0100 ++++ share/dict/Makefile 2010-03-12 01:34:18 +0100 +@@ -4,8 +4,7 @@ + NO_OBJ= + + # XXX MISSING: connectives words +-FILES= README propernames web2 web2a freebsd ++FILES= README freebsd + FILESDIR= ${BINDIR}/dict +-SYMLINKS= web2 ${FILESDIR}/words + + .include <bsd.prog.mk> diff --git a/sys-freebsd/freebsd-share/freebsd-share-8.0.ebuild b/sys-freebsd/freebsd-share/freebsd-share-8.0.ebuild new file mode 100644 index 000000000000..228719b511d8 --- /dev/null +++ b/sys-freebsd/freebsd-share/freebsd-share-8.0.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/freebsd-share-8.0.ebuild,v 1.1 2010/03/19 11:51:03 aballier 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}* + =sys-freebsd/freebsd-sources-${RV}*" +RDEPEND="sys-apps/miscfiles" + +RESTRICT="strip" + +S="${WORKDIR}/share" + +pkg_setup() { + use isdn || mymakeopts="${mymakeopts} NO_I4B= " + use doc || mymakeopts="${mymakeopts} NO_SHAREDOCS= " + + mymakeopts="${mymakeopts} NO_SENDMAIL= NO_MANCOMPRESS= NO_INFOCOMPRESS= " +} + +REMOVE_SUBDIRS="mk termcap zoneinfo tabset" + +PATCHES=( "${FILESDIR}/${PN}-5.3-doc-locations.patch" + "${FILESDIR}/${PN}-5.4-gentoo-skel.patch" + "${FILESDIR}/${PN}-8.0-gnu-miscfiles.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" + # Remove mailer.conf manpage + sed -i -e 's:mailer.conf.5::' "${S}/man/man5/Makefile" + # Remove pbm and moduli(ssh) manpages + sed -i -e 's:pbm.5::' -e 's:moduli.5::' "${S}/man/man5/Makefile" + # Remove builtins manpage + sed -i -e '/builtins\.1/d' "${S}/man/man1/Makefile" + # Remove rc manpages + sed -i -e '/rc.8/d' "${S}/man/man8/Makefile" + + # Don't install the arch-specific directories in subdirectories + sed -i -e '/MANSUBDIR/d' "${S}"/man/man4/man4.{i386,sparc64}/Makefile + + # Remove them so that they can't be included by error + rm -rf "${S}"/mk/*.mk + + # Make proper symlinks by defining the full target. + local sdir + for sdir in colldef mklocale monetdef msgdef numericdef timedef + do + sed -e 's:\${enc2}$:\${enc2}/\${FILESNAME}:g' -i \ + "${S}/${sdir}/Makefile" || \ + die "Error fixing ${sdir}/Makefile" + done + ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" || die "failed to set sys symlink" +} + +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 -j1 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 a0282103e744..b9feb060af26 100644 --- a/sys-freebsd/freebsd-sources/ChangeLog +++ b/sys-freebsd/freebsd-sources/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for sys-freebsd/freebsd-sources # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.55 2010/03/11 11:47:47 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.56 2010/03/19 11:50:50 aballier Exp $ + +*freebsd-sources-8.0 (19 Mar 2010) + + 19 Mar 2010; Alexis Ballier <aballier@gentoo.org> + +freebsd-sources-8.0.ebuild, +files/freebsd-sources-8.0-gentoo.patch, + +files/freebsd-sources-8.0-sparc64.patch, + +files/freebsd-sources-8.0-subnet-route-pr40133.patch, + +files/freebsd-sources-8.0-werror.patch, + +files/freebsd-sources-8.0-zfs.patch: + bump to 8.0 from the bsd overlay 11 Mar 2010; Alexis Ballier <aballier@gentoo.org> -files/freebsd-sources-6.0-asm.patch, diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-gentoo.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-gentoo.patch new file mode 100644 index 000000000000..0f8d070e9a31 --- /dev/null +++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-gentoo.patch @@ -0,0 +1,33 @@ +--- sys/conf/kern.mk.old 2007-05-24 23:53:42.000000000 +0200 ++++ sys/conf/kern.mk 2008-03-14 14:37:47.216420518 +0100 +@@ -12,7 +12,7 @@ + .else + CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ + -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \ +- ${_wundef} ${_Wno_pointer_sign} -fformat-extensions ++ ${_wundef} ${_Wno_pointer_sign} + .if !defined(WITH_GCC3) + _Wno_pointer_sign=-Wno-pointer-sign + .endif +@@ -36,7 +36,7 @@ + # reserved for user applications. + # + .if ${MACHINE_ARCH} == "i386" && ${CC} != "icc" +-CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2 \ ++CFLAGS+= -mpreferred-stack-boundary=2 \ + -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 + INLINE_LIMIT?= 8000 + .endif +Only in ./sys/conf: kern.mk.rej +Only in ./sys/conf: kern.mk~ +--- sys/dev/aic7xxx/aicasm/Makefile.old 2010-03-10 14:01:50 +0100 ++++ sys/dev/aic7xxx/aicasm/Makefile 2010-03-10 14:01:56 +0100 +@@ -14,7 +14,7 @@ + SRCS= ${GENHDRS} ${CSRCS} ${YSRCS} ${LSRCS} + CLEANFILES+= ${GENHDRS} ${YSRCS:R:C/(.*)/\1.output/g} + DPADD= ${LIBL} +-LDADD= -ll ++LDADD= -lfl + WARNS?= 6 + + # Correct path for kernel builds diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-sparc64.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-sparc64.patch new file mode 100644 index 000000000000..1729beb4c6ed --- /dev/null +++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-sparc64.patch @@ -0,0 +1,11 @@ +--- sys/conf/ldscript.sparc64.old 2010-03-10 14:42:03 +0100 ++++ sys/conf/ldscript.sparc64 2010-03-10 14:42:30 +0100 +@@ -1,6 +1,6 @@ + /* $FreeBSD: src/sys/conf/ldscript.sparc64,v 1.4.32.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */ +-OUTPUT_FORMAT("elf64-sparc", "elf64-sparc", +- "elf64-sparc") ++OUTPUT_FORMAT("elf64-sparc-freebsd", "elf64-sparc-freebsd", ++ "elf64-sparc-freebsd") + OUTPUT_ARCH(sparc:v9) + ENTRY(_start) + SEARCH_DIR(/usr/lib); diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-subnet-route-pr40133.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-subnet-route-pr40133.patch new file mode 100644 index 000000000000..a7335f6d427f --- /dev/null +++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-subnet-route-pr40133.patch @@ -0,0 +1,21 @@ +Fixes changing the default subnet route after removing an ip address. + +See: http://www.netbsd.org/cgi-bin/query-pr-single.pl?number=40133 +and http://mail-index.netbsd.org/tech-net/2008/12/03/msg000896.html + +Thanks to Roy Marples. +--- sys/netinet/in.c.orig ++++ sys/netinet/in.c +@@ -858,6 +858,12 @@ + error = rtinit(&target->ia_ifa, (int)RTM_ADD, flags); + if (!error) + target->ia_flags |= IFA_ROUTE; ++ else if (error == EEXIST) { ++ /* ++ * the fact that the route already exists is not an error. ++ */ ++ error = 0; ++ } + return (error); + } + diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-werror.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-werror.patch new file mode 100644 index 000000000000..2d2e028d10c0 --- /dev/null +++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-werror.patch @@ -0,0 +1,22 @@ +--- sys/conf/kern.pre.mk.old 2010-03-10 14:20:43 +0100 ++++ sys/conf/kern.pre.mk 2010-03-10 14:20:56 +0100 +@@ -93,7 +93,7 @@ + CFLAGS+= -fno-common -finline-limit=${INLINE_LIMIT} + CFLAGS+= --param inline-unit-growth=100 + CFLAGS+= --param large-function-growth=1000 +-WERROR?= -Werror ++WERROR?= -Wno-error + .endif + + # XXX LOCORE means "don't declare C stuff" not "for locore.s". +--- sys/conf/kmod.mk.old 2010-03-10 14:21:06 +0100 ++++ sys/conf/kmod.mk 2010-03-10 14:21:16 +0100 +@@ -79,7 +79,7 @@ + . if !empty(CFLAGS:M-O[23s]) && empty(CFLAGS:M-fno-strict-aliasing) + CFLAGS+= -fno-strict-aliasing + . endif +-WERROR?= -Werror ++WERROR?= -Wno-error + .endif + CFLAGS+= ${WERROR} + CFLAGS+= -D_KERNEL -D__FreeBSD_cc_version=700004 diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-zfs.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-zfs.patch new file mode 100644 index 000000000000..f81b2b5bed07 --- /dev/null +++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-zfs.patch @@ -0,0 +1,23 @@ +Index: sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c +=================================================================== +--- sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c (revision 200583) ++++ sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c (working copy) +@@ -60,10 +60,14 @@ zfs_init_vattr(vattr_t *vap, uint64_t mask, uint64 + { + VATTR_NULL(vap); + vap->va_mask = (uint_t)mask; +- vap->va_type = IFTOVT(mode); +- vap->va_mode = mode & MODEMASK; +- vap->va_uid = (uid_t)(IS_EPHEMERAL(uid)) ? -1 : uid; +- vap->va_gid = (gid_t)(IS_EPHEMERAL(gid)) ? -1 : gid; ++ if (mask & AT_TYPE) ++ vap->va_type = IFTOVT(mode); ++ if (mask & AT_MODE) ++ vap->va_mode = mode & MODEMASK; ++ if (mask & AT_UID) ++ vap->va_uid = (uid_t)(IS_EPHEMERAL(uid)) ? -1 : uid; ++ if (mask & AT_GID) ++ vap->va_gid = (gid_t)(IS_EPHEMERAL(gid)) ? -1 : gid; + vap->va_rdev = zfs_cmpldev(rdev); + vap->va_nodeid = nodeid; + } diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-8.0.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-8.0.ebuild new file mode 100644 index 000000000000..4f5320c7991f --- /dev/null +++ b/sys-freebsd/freebsd-sources/freebsd-sources-8.0.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-8.0.ebuild,v 1.1 2010/03/19 11:50:50 aballier 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-8.0" +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" + + # __FreeBSD_cc_version comes from FreeBSD's gcc. + # on 8.0-RELEASE it's 800001. + sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=800001:g" \ + -i "${S}/conf/kern.pre.mk" \ + -i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version" + + epatch "${FILESDIR}/${PN}-8.0-gentoo.patch" + epatch "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch" + epatch "${FILESDIR}/${PN}-8.0-werror.patch" + epatch "${FILESDIR}/${PN}-8.0-sparc64.patch" + epatch "${FILESDIR}/${PN}-6.1-ntfs.patch" + epatch "${FILESDIR}/${PN}-7.2-debug-O2.patch" + epatch "${FILESDIR}/${PN}-7.1-types.h-fix.patch" + epatch "${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch" + epatch "${FILESDIR}/${PN}-7.1-includes.patch" + epatch "${FILESDIR}/${PN}-8.0-zfs.patch" + + # By adding -DGENTOO_LIVECD to CFLAGS activate this stub + # vop_whiteout to tmpfs, so it can be used as an overlay + # unionfs filesystem over the cd9660 readonly filesystem. + epatch "${FILESDIR}/${PN}-7.0-tmpfs_whiteout_stub.patch" + + # See http://sourceware.org/bugzilla/show_bug.cgi?id=5391 + # ld doesn't provide symbols constructed as the __start_set_(s) ones + # are on FreeBSD modules. + # This patch adds code to generate a list of these and adds them + # as undefined references to ld's commandline to get them. + # Without this kernel modules will not load. + epatch "${FILESDIR}/${PN}-7.1-binutils_link.patch" +} + +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 a87704743782..963910e3bed2 100644 --- a/sys-freebsd/freebsd-ubin/ChangeLog +++ b/sys-freebsd/freebsd-ubin/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-freebsd/freebsd-ubin # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.64 2010/03/11 10:55:15 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.65 2010/03/19 11:50:51 aballier Exp $ + +*freebsd-ubin-8.0 (19 Mar 2010) + + 19 Mar 2010; Alexis Ballier <aballier@gentoo.org> + +freebsd-ubin-8.0.ebuild, +files/freebsd-ubin-8.0-bsdar.patch, + metadata.xml: + bump to 8.0 from the bsd overlay 11 Mar 2010; Alexis Ballier <aballier@gentoo.org> -files/freebsd-ubin-6.1-gcc41.patch, -freebsd-ubin-6.2-r2.ebuild, diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.0-bsdar.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.0-bsdar.patch new file mode 100644 index 000000000000..c966b9b88ad7 --- /dev/null +++ b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.0-bsdar.patch @@ -0,0 +1,21 @@ +--- usr.bin/ar/Makefile.old 2010-03-12 14:50:30 +0100 ++++ usr.bin/ar/Makefile 2010-03-12 14:50:53 +0100 +@@ -1,6 +1,6 @@ + # $FreeBSD: src/usr.bin/ar/Makefile,v 1.22.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $ + +-PROG= ar ++PROG= freebsd-ar + SRCS= ar.c acplex.l acpyacc.y read.c util.c write.c y.tab.h + + WARNS?= 5 +@@ -10,8 +10,7 @@ + + CFLAGS+=-I. -I${.CURDIR} + +-NO_SHARED?= yes +-LINKS= ${BINDIR}/ar ${BINDIR}/ranlib +-MLINKS= ar.1 ranlib.1 ++LINKS= ${BINDIR}/freebsd-ar ${BINDIR}/freebsd-ranlib ++MLINKS= freebsd-ar.1 freebsd-ranlib.1 + + .include <bsd.prog.mk> diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-8.0.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-8.0.ebuild new file mode 100644 index 000000000000..2bd37dbe3d37 --- /dev/null +++ b/sys-freebsd/freebsd-ubin/freebsd-ubin-8.0.ebuild @@ -0,0 +1,145 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/freebsd-ubin-8.0.ebuild,v 1.1 2010/03/19 11:50:51 aballier Exp $ + +EAPI=2 + +inherit bsdmk freebsd flag-o-matic pam + +DESCRIPTION="FreeBSD's base system source for /usr/bin" +SLOT="0" +KEYWORDS="~sparc-fbsd ~x86-fbsd" +IUSE="ar atm audit bluetooth ipv6 kerberos netware nis ssl usb build zfs" +LICENSE="BSD zfs? ( CDDL )" + +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 + zfs? ( mirror://gentoo/${CDDL}.tar.bz2 ) + build? ( mirror://gentoo/${SYS}.tar.bz2 )" + +RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?] + ssl? ( dev-libs/openssl ) + kerberos? ( virtual/krb5 ) + ar? ( app-arch/libarchive ) + virtual/pam + sys-libs/zlib + !dev-util/csup" + +DEPEND="${RDEPEND} + sys-devel/flex + !build? ( =sys-freebsd/freebsd-sources-${RV}* ) + =sys-freebsd/freebsd-mk-defs-${RV}*" + +RDEPEND="${RDEPEND} + >=sys-auth/pambase-20080219.1 + sys-process/cronbase" + +S="${WORKDIR}/usr.bin" + +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}-8.0-bsdar.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 +# - binutils gprof +# and the rest are misc utils we already provide somewhere else. +REMOVE_SUBDIRS="bzip2 bzip2recover tar cpio + gzip gprof + tput tset + less lessecho lesskey + dig hesinfo nslookup nsupdate host + rsh rlogin rusers rwho ruptime + compile_et lex vi smbutil file vacation nc ftp telnet + c99 c89 + whois tftp" + +pkg_setup() { + use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= " + use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= " + use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= " + use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= " + use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= " + use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= " + use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= " + use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= " + use usb || mymakeopts="${mymakeopts} WITHOUT_USB= " + use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= " +} + +pkg_preinst() { + # bison installs a /usr/bin/yacc symlink ... + # we need to remove it to avoid triggering + # collision-protect errors + if [[ -L ${ROOT}/usr/bin/yacc ]] ; then + rm -f "${ROOT}"/usr/bin/yacc + fi +} + +src_prepare() { + use build || ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" + + # Rename manpage for renamed cmp + mv "${S}"/cmp/cmp.1 "${S}"/cmp/bsdcmp.1 || die + # Rename manpage for renamed ar + mv "${S}"/ar/ar.1 "${S}"/ar/freebsd-ar.1 || die + # Fix whereis(1) manpath search. + sed -i -e 's:"manpath -q":"manpath":' "${S}/whereis/pathnames.h" + + # Build a dynamic make + sed -i -e '/^NO_SHARED/ s/^/#/' "${S}"/make/Makefile || die + + # Disable it here otherwise our patch wont apply + use ar || dummy_mk ar +} + +src_install() { + freebsd_src_install + + # baselayout requires these in /bin + dodir /bin + for bin in sed; 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}.1.pamd" ${pamdfile} || die + done + + cd "${WORKDIR}/etc" + insinto /etc + doins remote phones opieaccess fbtab || die + + exeinto /etc/cron.daily + newexe "${FILESDIR}/locate-updatedb-cron" locate.updatedb || die +} + +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 + elog "Remember to run cap_mkdb /etc/login.conf after making changes to it" + fi +} + +pkg_postrm() { + # and if we uninstall yacc but keep bison, + # lets restore the /usr/bin/yacc symlink + if [[ ! -e ${ROOT}/usr/bin/yacc ]] && [[ -e ${ROOT}/usr/bin/yacc.bison ]] ; then + ln -s yacc.bison "${ROOT}"/usr/bin/yacc + fi +} diff --git a/sys-freebsd/freebsd-ubin/metadata.xml b/sys-freebsd/freebsd-ubin/metadata.xml index 4ddd22c414fb..825b3e07ae29 100644 --- a/sys-freebsd/freebsd-ubin/metadata.xml +++ b/sys-freebsd/freebsd-ubin/metadata.xml @@ -10,5 +10,12 @@ Build libraries and tools to work with NetWare protocols (IPX and NCP). </flag> + <flag name='ar'> + Build FreeBSD's ar and ranlib replacements based on libarchive. The + toolchain will still use binutils' version but you can play with it. + They have been renamed to freebsd-ar and freebsd-ranlib not to collide + with binutils. + </flag> + <flag name='zfs'>Enable ZFS support (for fstat actually).</flag> </use> </pkgmetadata> diff --git a/sys-freebsd/freebsd-usbin/ChangeLog b/sys-freebsd/freebsd-usbin/ChangeLog index cd8dc9c703eb..0ece00b3b53d 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-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.61 2010/03/11 10:50:28 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.62 2010/03/19 11:50:54 aballier Exp $ + +*freebsd-usbin-8.0 (19 Mar 2010) + + 19 Mar 2010; Alexis Ballier <aballier@gentoo.org> + +freebsd-usbin-8.0.ebuild, metadata.xml: + bump to 8.0 from the bsd overlay 11 Mar 2010; Alexis Ballier <aballier@gentoo.org> -files/freebsd-usbin-6.0-fixmakefiles.patch, diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-8.0.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-8.0.ebuild new file mode 100644 index 000000000000..63facb0f90b4 --- /dev/null +++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-8.0.ebuild @@ -0,0 +1,166 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-8.0.ebuild,v 1.1 2010/03/19 11:50:54 aballier Exp $ + +EAPI=2 + +inherit bsdmk freebsd flag-o-matic eutils + +DESCRIPTION="FreeBSD /usr/sbin tools" +SLOT="0" +KEYWORDS="~sparc-fbsd ~x86-fbsd" + +SRC_URI="mirror://gentoo/${P}.tar.bz2 + mirror://gentoo/${CONTRIB}.tar.bz2 + mirror://gentoo/${UBIN}.tar.bz2 + mirror://gentoo/${LIB}.tar.bz2 + mirror://gentoo/${SBIN}.tar.bz2 + mirror://gentoo/${ETC}.tar.bz2 + mirror://gentoo/${GNU}.tar.bz2 + nis? ( mirror://gentoo/${LIBEXEC}.tar.bz2 ) + build? ( mirror://gentoo/${SYS}.tar.bz2 + mirror://gentoo/${INCLUDE}.tar.bz2 )" + +RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,netware?] + =sys-freebsd/freebsd-libexec-${RV}* + acpi? ( sys-power/iasl ) + build? ( sys-apps/baselayout ) + ssl? ( dev-libs/openssl ) + tcpd? ( sys-apps/tcp-wrappers ) + dev-libs/libelf + dev-libs/libedit + net-libs/libpcap" +DEPEND="${RDEPEND} + =sys-freebsd/freebsd-mk-defs-${RV}* + =sys-freebsd/freebsd-ubin-${RV}* + !build? ( =sys-freebsd/freebsd-sources-${RV}* ) + sys-apps/texinfo + sys-devel/flex" + +PROVIDE="virtual/logger" + +S="${WORKDIR}/usr.sbin" + +IUSE="acpi atm audit bluetooth floppy ipv6 isdn minimal netware nis pam ssl tcpd usb build" + +pkg_setup() { + # Release crunch is something like minimal. It seems to remove everything + # which is not needed to work. + use minimal && mymakeopts="${mymakeopts} RELEASE_CRUNCH= " + + use acpi || mymakeopts="${mymakeopts} WITHOUT_ACPI= " + use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= " + use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= " + use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= " + use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= " + use isdn || mymakeopts="${mymakeopts} WITHOUT_I4B= " + use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= " + use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= " + use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= " + use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= " + use usb || mymakeopts="${mymakeopts} WITHOUT_USB= " + use floppy || mymakeopts="${mymakeopts} WITHOUT_FLOPPY= " + + mymakeopts="${mymakeopts} WITHOUT_BIND_NAMED= WITHOUT_BIND_DNSSEC= WITHOUT_PF= WITHOUT_LPR= WITHOUT_SENDMAIL= WITHOUT_AUTHPF= WITHOUT_MAILWRAPPER= " +} + +PATCHES=( "${FILESDIR}/${PN}-7.0-nowrap.patch" + "${FILESDIR}/${PN}-adduser.patch" ) + +REMOVE_SUBDIRS=" + named named-checkzone named-checkconf rndc rndc-confgen + dnssec-keygen dnssec-signzone + tcpdchk tcpdmatch + sendmail praliases editmap mailstats makemap + sysinstall cron mailwrapper ntp bsnmpd + tcpdump ndp inetd + wpa/wpa_supplicant wpa/hostapd wpa/hostapd_cli wpa/wpa_cli wpa/wpa_passphrase + zic amd + pkg_install freebsd-update" + +src_prepare() { + if ! use build; then + ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" + ln -s "/usr/include" "${WORKDIR}/include" + else + dummy_mk mount_smbfs + fi +} + +src_install() { + # By creating these directories we avoid having to do a + # more complex hack + dodir /usr/share/doc + dodir /sbin + dodir /usr/libexec + dodir /usr/bin + + # FILESDIR is used by some makefiles which will install files + # in the wrong place, just put it in the doc directory. + mkinstall DOCDIR=/usr/share/doc/${PF} || die "Install failed" + + # Most of these now come from openrc. + for util in nfs rpc.statd rpc.lockd; do + newinitd "${FILESDIR}/"${util}.initd ${util} || die + if [[ -e "${FILESDIR}"/${util}.confd ]]; then \ + newconfd "${FILESDIR}"/${util}.confd ${util} || die + fi + done + + for class in daily monthly weekly; do + cat - > "${T}/periodic.${class}" <<EOS +#!/bin/sh +/usr/sbin/periodic ${class} +EOS + exeinto /etc/cron.${class} + newexe "${T}/periodic.${class}" periodic + done + + # Install the pw.conf file to let pw use Gentoo's skel location + insinto /etc + doins "${FILESDIR}/pw.conf" || die + + cd "${WORKDIR}/etc" + doins apmd.conf syslog.conf newsyslog.conf nscd.conf || die + + insinto /etc/ppp + doins ppp/ppp.conf || die + + if use isdn; then + insinto /etc/isdn + doins isdn/* || die + rm -f "${D}"/etc/isdn/Makefile + fi + + if use bluetooth; then + insinto /etc/bluetooth + doins bluetooth/* || die + rm -f "${D}"/etc/bluetooth/Makefile + fi + + # Install the periodic stuff (needs probably to be ported in a more + # gentooish way) + cd "${WORKDIR}/etc/periodic" + + doperiodic daily daily/*.accounting + doperiodic monthly monthly/*.accounting +} + +pkg_postinst() { + # We need to run pwd_mkdb if key files are not present + # If they are, then there is no need to run pwd_mkdb + if [[ ! -e "${ROOT}etc/passwd" || ! -e "${ROOT}etc/pwd.db" || ! -e "${ROOT}etc/spwd.db" ]] ; then + if [[ -e "${ROOT}etc/master.passwd" ]] ; then + einfo "Generating passwd files from ${ROOT}etc/master.passwd" + "${ROOT}"usr/sbin/pwd_mkdb -p -d "${ROOT}etc" "${ROOT}etc/master.passwd" + else + eerror "${ROOT}etc/master.passwd does not exist!" + eerror "You will no be able to log into your system!" + fi + fi + + for logfile in messages security auth.log maillog lpd-errs xferlog cron \ + debug.log slip.log ppp.log; do + [[ -f "${ROOT}/var/log/${logfile}" ]] || touch "${ROOT}/var/log/${logfile}" + done +} diff --git a/sys-freebsd/freebsd-usbin/metadata.xml b/sys-freebsd/freebsd-usbin/metadata.xml index 83aa667145eb..a142253c1601 100644 --- a/sys-freebsd/freebsd-usbin/metadata.xml +++ b/sys-freebsd/freebsd-usbin/metadata.xml @@ -3,6 +3,7 @@ <pkgmetadata> <herd>bsd</herd> <use> + <flag name='floppy'>Enable floppy disk utilities (fdcontrol, fdformat, fdread, fdwrite).</flag> <flag name='isdn'>Enable ISDN support.</flag> <flag name='audit'> Build auditing tools. |