summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2015-05-24 11:24:02 +0000
committerMichał Górny <mgorny@gentoo.org>2015-05-24 11:24:02 +0000
commit772cfafa4f72e27da64525fd452eef84e02e14ac (patch)
tree45b28768405e332f84c7c9b1ccf61498bd5fa06e /sys-freebsd
parentNeeds glib and gsettings (#520214 by Robert G. Siebeck) (diff)
downloadgentoo-2-772cfafa4f72e27da64525fd452eef84e02e14ac.tar.gz
gentoo-2-772cfafa4f72e27da64525fd452eef84e02e14ac.tar.bz2
gentoo-2-772cfafa4f72e27da64525fd452eef84e02e14ac.zip
Remove 9.2. Part of https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/126 by nigoro.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'sys-freebsd')
-rw-r--r--sys-freebsd/boot0/ChangeLog7
-rw-r--r--sys-freebsd/boot0/boot0-9.2.ebuild73
-rw-r--r--sys-freebsd/boot0/boot0-9.2_rc1.ebuild72
-rw-r--r--sys-freebsd/boot0/boot0-9.2_rc2.ebuild72
-rw-r--r--sys-freebsd/boot0/boot0-9.2_rc3.ebuild72
-rw-r--r--sys-freebsd/freebsd-bin/ChangeLog8
-rw-r--r--sys-freebsd/freebsd-bin/freebsd-bin-9.2.ebuild37
-rw-r--r--sys-freebsd/freebsd-bin/freebsd-bin-9.2_rc1.ebuild37
-rw-r--r--sys-freebsd/freebsd-bin/freebsd-bin-9.2_rc2.ebuild37
-rw-r--r--sys-freebsd/freebsd-bin/freebsd-bin-9.2_rc3.ebuild37
-rw-r--r--sys-freebsd/freebsd-cddl/ChangeLog9
-rw-r--r--sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.2-underlink.patch26
-rw-r--r--sys-freebsd/freebsd-cddl/freebsd-cddl-9.2.ebuild63
-rw-r--r--sys-freebsd/freebsd-cddl/freebsd-cddl-9.2_rc1.ebuild63
-rw-r--r--sys-freebsd/freebsd-cddl/freebsd-cddl-9.2_rc2.ebuild63
-rw-r--r--sys-freebsd/freebsd-cddl/freebsd-cddl-9.2_rc3.ebuild63
-rw-r--r--sys-freebsd/freebsd-contrib/ChangeLog10
-rw-r--r--sys-freebsd/freebsd-contrib/freebsd-contrib-9.2.ebuild46
-rw-r--r--sys-freebsd/freebsd-contrib/freebsd-contrib-9.2_rc1.ebuild46
-rw-r--r--sys-freebsd/freebsd-contrib/freebsd-contrib-9.2_rc2.ebuild46
-rw-r--r--sys-freebsd/freebsd-contrib/freebsd-contrib-9.2_rc3.ebuild46
-rw-r--r--sys-freebsd/freebsd-lib/ChangeLog9
-rw-r--r--sys-freebsd/freebsd-lib/files/freebsd-lib-9.2-liblink.patch67
-rw-r--r--sys-freebsd/freebsd-lib/freebsd-lib-9.2.ebuild602
-rw-r--r--sys-freebsd/freebsd-lib/freebsd-lib-9.2_rc1.ebuild601
-rw-r--r--sys-freebsd/freebsd-lib/freebsd-lib-9.2_rc2.ebuild601
-rw-r--r--sys-freebsd/freebsd-lib/freebsd-lib-9.2_rc3.ebuild601
-rw-r--r--sys-freebsd/freebsd-libexec/ChangeLog8
-rw-r--r--sys-freebsd/freebsd-libexec/freebsd-libexec-9.2.ebuild85
-rw-r--r--sys-freebsd/freebsd-libexec/freebsd-libexec-9.2_rc1.ebuild83
-rw-r--r--sys-freebsd/freebsd-libexec/freebsd-libexec-9.2_rc2.ebuild83
-rw-r--r--sys-freebsd/freebsd-libexec/freebsd-libexec-9.2_rc3.ebuild85
-rw-r--r--sys-freebsd/freebsd-mk-defs/ChangeLog9
-rw-r--r--sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.2-gentoo.patch352
-rw-r--r--sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.2-gnu.patch126
-rw-r--r--sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.2.ebuild41
-rw-r--r--sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.2_rc1.ebuild40
-rw-r--r--sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.2_rc2.ebuild40
-rw-r--r--sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.2_rc3.ebuild40
-rw-r--r--sys-freebsd/freebsd-pam-modules/ChangeLog8
-rw-r--r--sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.2.ebuild47
-rw-r--r--sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.2_rc1.ebuild47
-rw-r--r--sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.2_rc2.ebuild47
-rw-r--r--sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.2_rc3.ebuild47
-rw-r--r--sys-freebsd/freebsd-pf/ChangeLog8
-rw-r--r--sys-freebsd/freebsd-pf/freebsd-pf-9.2.ebuild69
-rw-r--r--sys-freebsd/freebsd-pf/freebsd-pf-9.2_rc1.ebuild69
-rw-r--r--sys-freebsd/freebsd-pf/freebsd-pf-9.2_rc2.ebuild69
-rw-r--r--sys-freebsd/freebsd-pf/freebsd-pf-9.2_rc3.ebuild69
-rw-r--r--sys-freebsd/freebsd-rescue/ChangeLog8
-rw-r--r--sys-freebsd/freebsd-rescue/freebsd-rescue-9.2.ebuild76
-rw-r--r--sys-freebsd/freebsd-rescue/freebsd-rescue-9.2_rc1.ebuild76
-rw-r--r--sys-freebsd/freebsd-rescue/freebsd-rescue-9.2_rc2.ebuild76
-rw-r--r--sys-freebsd/freebsd-rescue/freebsd-rescue-9.2_rc3.ebuild76
-rw-r--r--sys-freebsd/freebsd-sbin/ChangeLog8
-rw-r--r--sys-freebsd/freebsd-sbin/freebsd-sbin-9.2.ebuild97
-rw-r--r--sys-freebsd/freebsd-sbin/freebsd-sbin-9.2_rc1.ebuild94
-rw-r--r--sys-freebsd/freebsd-sbin/freebsd-sbin-9.2_rc2.ebuild94
-rw-r--r--sys-freebsd/freebsd-sbin/freebsd-sbin-9.2_rc3.ebuild94
-rw-r--r--sys-freebsd/freebsd-share/ChangeLog8
-rw-r--r--sys-freebsd/freebsd-share/freebsd-share-9.2.ebuild91
-rw-r--r--sys-freebsd/freebsd-share/freebsd-share-9.2_rc1.ebuild91
-rw-r--r--sys-freebsd/freebsd-share/freebsd-share-9.2_rc2.ebuild91
-rw-r--r--sys-freebsd/freebsd-share/freebsd-share-9.2_rc3.ebuild91
-rw-r--r--sys-freebsd/freebsd-sources/ChangeLog9
-rw-r--r--sys-freebsd/freebsd-sources/files/freebsd-sources-9.2-gentoo.patch21
-rw-r--r--sys-freebsd/freebsd-sources/freebsd-sources-9.2.ebuild112
-rw-r--r--sys-freebsd/freebsd-sources/freebsd-sources-9.2_rc1.ebuild112
-rw-r--r--sys-freebsd/freebsd-sources/freebsd-sources-9.2_rc2.ebuild112
-rw-r--r--sys-freebsd/freebsd-sources/freebsd-sources-9.2_rc3.ebuild112
-rw-r--r--sys-freebsd/freebsd-sources/metadata.xml1
-rw-r--r--sys-freebsd/freebsd-ubin/ChangeLog8
-rw-r--r--sys-freebsd/freebsd-ubin/freebsd-ubin-9.2.ebuild183
-rw-r--r--sys-freebsd/freebsd-ubin/freebsd-ubin-9.2_rc1.ebuild177
-rw-r--r--sys-freebsd/freebsd-ubin/freebsd-ubin-9.2_rc2.ebuild177
-rw-r--r--sys-freebsd/freebsd-ubin/freebsd-ubin-9.2_rc3.ebuild177
-rw-r--r--sys-freebsd/freebsd-usbin/ChangeLog8
-rw-r--r--sys-freebsd/freebsd-usbin/freebsd-usbin-9.2.ebuild180
-rw-r--r--sys-freebsd/freebsd-usbin/freebsd-usbin-9.2_rc1.ebuild180
-rw-r--r--sys-freebsd/freebsd-usbin/freebsd-usbin-9.2_rc2.ebuild180
-rw-r--r--sys-freebsd/freebsd-usbin/freebsd-usbin-9.2_rc3.ebuild180
81 files changed, 109 insertions, 7777 deletions
diff --git a/sys-freebsd/boot0/ChangeLog b/sys-freebsd/boot0/ChangeLog
index a147de0320a7..beba624611e4 100644
--- a/sys-freebsd/boot0/ChangeLog
+++ b/sys-freebsd/boot0/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-freebsd/boot0
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/ChangeLog,v 1.52 2015/03/15 18:18:23 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/ChangeLog,v 1.53 2015/05/24 11:24:01 mgorny Exp $
+
+ 24 May 2015; Michał Górny <mgorny@gentoo.org> -boot0-9.2.ebuild,
+ -boot0-9.2_rc1.ebuild, -boot0-9.2_rc2.ebuild, -boot0-9.2_rc3.ebuild:
+ Remove 9.2. Part of https://github.com/gentoo/gentoo-portage-rsync-
+ mirror/pull/126 by nigoro.
15 Mar 2015; Michał Górny <mgorny@gentoo.org> boot0-10.1.ebuild:
Fix build with clang, bug #542676. https://github.com/gentoo/gentoo-portage-
diff --git a/sys-freebsd/boot0/boot0-9.2.ebuild b/sys-freebsd/boot0/boot0-9.2.ebuild
deleted file mode 100644
index 8b6d023058e4..000000000000
--- a/sys-freebsd/boot0/boot0-9.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/boot0-9.2.ebuild,v 1.2 2015/02/18 17:09:17 mgorny Exp $
-
-EAPI=2
-
-inherit bsdmk freebsd flag-o-matic toolchain-funcs
-
-DESCRIPTION="FreeBSD's bootloader"
-SLOT="0"
-
-IUSE="bzip2 ieee1394 tftp zfs"
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
- SRC_URI="mirror://gentoo/${SYS}.tar.bz2
- mirror://gentoo/${LIB}.tar.bz2
- mirror://gentoo/${CONTRIB}.tar.bz2"
-fi
-
-RDEPEND=""
-DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
- =sys-freebsd/freebsd-lib-${RV}*"
-
-S="${WORKDIR}/sys/boot"
-
-PATCHES=( "${FILESDIR}/${PN}-9.2-gcc46.patch"
- "${FILESDIR}/${PN}-add-nossp-cflags.patch" )
-
-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 "-fno-strict-aliasing"
-
- cd "${WORKDIR}/lib/libstand" || die
- freebsd_src_compile
-
- cd "${S}"
- CFLAGS="${CFLAGS} -I${WORKDIR}/lib/libstand"
- LDFLAGS="${LDFLAGS} -L${WORKDIR}/lib/libstand"
- export LIBSTAND="${WORKDIR}/lib/libstand/libstand.a"
- NOFLAGSTRIP="yes" freebsd_src_compile
-}
-
-src_install() {
- dodir /boot/defaults
- mkinstall FILESDIR=/boot || die "mkinstall failed"
-
- cd "${WORKDIR}/sys/$(tc-arch-kernel)/conf" || die
- insinto /boot
- newins GENERIC.hints device.hints
-
- echo 'CONFIG_PROTECT="/boot/device.hints"' > "${T}"/50boot0
- doenvd "${T}"/50boot0
-}
diff --git a/sys-freebsd/boot0/boot0-9.2_rc1.ebuild b/sys-freebsd/boot0/boot0-9.2_rc1.ebuild
deleted file mode 100644
index dd3e11ae9004..000000000000
--- a/sys-freebsd/boot0/boot0-9.2_rc1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/boot0-9.2_rc1.ebuild,v 1.2 2013/08/16 13:24:27 aballier Exp $
-
-EAPI=2
-
-inherit bsdmk freebsd flag-o-matic toolchain-funcs
-
-DESCRIPTION="FreeBSD's bootloader"
-SLOT="0"
-
-IUSE="bzip2 ieee1394 tftp zfs"
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
- SRC_URI="mirror://gentoo/${SYS}.tar.bz2
- mirror://gentoo/${LIB}.tar.bz2
- mirror://gentoo/${CONTRIB}.tar.bz2"
-fi
-
-RDEPEND=""
-DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
- =sys-freebsd/freebsd-lib-${RV}*"
-
-S="${WORKDIR}/sys/boot"
-
-PATCHES=( "${FILESDIR}/${PN}-9.2-gcc46.patch" )
-
-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 "-fno-strict-aliasing"
-
- cd "${WORKDIR}/lib/libstand" || die
- freebsd_src_compile
-
- cd "${S}"
- CFLAGS="${CFLAGS} -I${WORKDIR}/lib/libstand"
- LDFLAGS="${LDFLAGS} -L${WORKDIR}/lib/libstand"
- export LIBSTAND="${WORKDIR}/lib/libstand/libstand.a"
- NOFLAGSTRIP="yes" freebsd_src_compile
-}
-
-src_install() {
- dodir /boot/defaults
- mkinstall FILESDIR=/boot || die "mkinstall failed"
-
- cd "${WORKDIR}/sys/$(tc-arch-kernel)/conf" || die
- insinto /boot
- newins GENERIC.hints device.hints
-
- echo 'CONFIG_PROTECT="/boot/device.hints"' > "${T}"/50boot0
- doenvd "${T}"/50boot0
-}
diff --git a/sys-freebsd/boot0/boot0-9.2_rc2.ebuild b/sys-freebsd/boot0/boot0-9.2_rc2.ebuild
deleted file mode 100644
index 86cfae4b81e1..000000000000
--- a/sys-freebsd/boot0/boot0-9.2_rc2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/boot0-9.2_rc2.ebuild,v 1.1 2013/08/22 15:42:53 aballier Exp $
-
-EAPI=2
-
-inherit bsdmk freebsd flag-o-matic toolchain-funcs
-
-DESCRIPTION="FreeBSD's bootloader"
-SLOT="0"
-
-IUSE="bzip2 ieee1394 tftp zfs"
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
- SRC_URI="mirror://gentoo/${SYS}.tar.bz2
- mirror://gentoo/${LIB}.tar.bz2
- mirror://gentoo/${CONTRIB}.tar.bz2"
-fi
-
-RDEPEND=""
-DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
- =sys-freebsd/freebsd-lib-${RV}*"
-
-S="${WORKDIR}/sys/boot"
-
-PATCHES=( "${FILESDIR}/${PN}-9.2-gcc46.patch" )
-
-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 "-fno-strict-aliasing"
-
- cd "${WORKDIR}/lib/libstand" || die
- freebsd_src_compile
-
- cd "${S}"
- CFLAGS="${CFLAGS} -I${WORKDIR}/lib/libstand"
- LDFLAGS="${LDFLAGS} -L${WORKDIR}/lib/libstand"
- export LIBSTAND="${WORKDIR}/lib/libstand/libstand.a"
- NOFLAGSTRIP="yes" freebsd_src_compile
-}
-
-src_install() {
- dodir /boot/defaults
- mkinstall FILESDIR=/boot || die "mkinstall failed"
-
- cd "${WORKDIR}/sys/$(tc-arch-kernel)/conf" || die
- insinto /boot
- newins GENERIC.hints device.hints
-
- echo 'CONFIG_PROTECT="/boot/device.hints"' > "${T}"/50boot0
- doenvd "${T}"/50boot0
-}
diff --git a/sys-freebsd/boot0/boot0-9.2_rc3.ebuild b/sys-freebsd/boot0/boot0-9.2_rc3.ebuild
deleted file mode 100644
index 4acddb216c5d..000000000000
--- a/sys-freebsd/boot0/boot0-9.2_rc3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/boot0-9.2_rc3.ebuild,v 1.1 2013/08/26 20:41:11 aballier Exp $
-
-EAPI=2
-
-inherit bsdmk freebsd flag-o-matic toolchain-funcs
-
-DESCRIPTION="FreeBSD's bootloader"
-SLOT="0"
-
-IUSE="bzip2 ieee1394 tftp zfs"
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
- SRC_URI="mirror://gentoo/${SYS}.tar.bz2
- mirror://gentoo/${LIB}.tar.bz2
- mirror://gentoo/${CONTRIB}.tar.bz2"
-fi
-
-RDEPEND=""
-DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
- =sys-freebsd/freebsd-lib-${RV}*"
-
-S="${WORKDIR}/sys/boot"
-
-PATCHES=( "${FILESDIR}/${PN}-9.2-gcc46.patch" )
-
-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 "-fno-strict-aliasing"
-
- cd "${WORKDIR}/lib/libstand" || die
- freebsd_src_compile
-
- cd "${S}"
- CFLAGS="${CFLAGS} -I${WORKDIR}/lib/libstand"
- LDFLAGS="${LDFLAGS} -L${WORKDIR}/lib/libstand"
- export LIBSTAND="${WORKDIR}/lib/libstand/libstand.a"
- NOFLAGSTRIP="yes" freebsd_src_compile
-}
-
-src_install() {
- dodir /boot/defaults
- mkinstall FILESDIR=/boot || die "mkinstall failed"
-
- cd "${WORKDIR}/sys/$(tc-arch-kernel)/conf" || die
- insinto /boot
- newins GENERIC.hints device.hints
-
- echo 'CONFIG_PROTECT="/boot/device.hints"' > "${T}"/50boot0
- doenvd "${T}"/50boot0
-}
diff --git a/sys-freebsd/freebsd-bin/ChangeLog b/sys-freebsd/freebsd-bin/ChangeLog
index 95ddf5fc1c74..b837b83c2611 100644
--- a/sys-freebsd/freebsd-bin/ChangeLog
+++ b/sys-freebsd/freebsd-bin/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sys-freebsd/freebsd-bin
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-bin/ChangeLog,v 1.56 2015/03/08 14:01:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-bin/ChangeLog,v 1.57 2015/05/24 11:24:01 mgorny Exp $
+
+ 24 May 2015; Michał Górny <mgorny@gentoo.org> -freebsd-bin-9.2.ebuild,
+ -freebsd-bin-9.2_rc1.ebuild, -freebsd-bin-9.2_rc2.ebuild,
+ -freebsd-bin-9.2_rc3.ebuild:
+ Remove 9.2. Part of https://github.com/gentoo/gentoo-portage-rsync-
+ mirror/pull/126 by nigoro.
*freebsd-bin-10.1 (08 Mar 2015)
diff --git a/sys-freebsd/freebsd-bin/freebsd-bin-9.2.ebuild b/sys-freebsd/freebsd-bin/freebsd-bin-9.2.ebuild
deleted file mode 100644
index 38268c9e4473..000000000000
--- a/sys-freebsd/freebsd-bin/freebsd-bin-9.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-bin/freebsd-bin-9.2.ebuild,v 1.1 2013/11/09 09:16:03 aballier Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD /bin tools"
-SLOT="0"
-
-IUSE=""
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
- SRC_URI="mirror://gentoo/${BIN}.tar.bz2
- mirror://gentoo/${UBIN}.tar.bz2
- mirror://gentoo/${SBIN}.tar.bz2
- mirror://gentoo/${LIB}.tar.bz2"
-fi
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
- >=dev-libs/libedit-20120311.3.0-r1
- 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
-
-# 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-bin/freebsd-bin-9.2_rc1.ebuild b/sys-freebsd/freebsd-bin/freebsd-bin-9.2_rc1.ebuild
deleted file mode 100644
index 950f8dd40270..000000000000
--- a/sys-freebsd/freebsd-bin/freebsd-bin-9.2_rc1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-bin/freebsd-bin-9.2_rc1.ebuild,v 1.1 2013/08/09 21:21:48 aballier Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD /bin tools"
-SLOT="0"
-
-IUSE=""
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
- SRC_URI="mirror://gentoo/${BIN}.tar.bz2
- mirror://gentoo/${UBIN}.tar.bz2
- mirror://gentoo/${SBIN}.tar.bz2
- mirror://gentoo/${LIB}.tar.bz2"
-fi
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
- >=dev-libs/libedit-20120311.3.0-r1
- 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
-
-# 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-bin/freebsd-bin-9.2_rc2.ebuild b/sys-freebsd/freebsd-bin/freebsd-bin-9.2_rc2.ebuild
deleted file mode 100644
index 4ab0e85ff675..000000000000
--- a/sys-freebsd/freebsd-bin/freebsd-bin-9.2_rc2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-bin/freebsd-bin-9.2_rc2.ebuild,v 1.1 2013/08/22 15:43:16 aballier Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD /bin tools"
-SLOT="0"
-
-IUSE=""
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
- SRC_URI="mirror://gentoo/${BIN}.tar.bz2
- mirror://gentoo/${UBIN}.tar.bz2
- mirror://gentoo/${SBIN}.tar.bz2
- mirror://gentoo/${LIB}.tar.bz2"
-fi
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
- >=dev-libs/libedit-20120311.3.0-r1
- 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
-
-# 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-bin/freebsd-bin-9.2_rc3.ebuild b/sys-freebsd/freebsd-bin/freebsd-bin-9.2_rc3.ebuild
deleted file mode 100644
index 60a35043da19..000000000000
--- a/sys-freebsd/freebsd-bin/freebsd-bin-9.2_rc3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-bin/freebsd-bin-9.2_rc3.ebuild,v 1.1 2013/08/26 20:41:32 aballier Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD /bin tools"
-SLOT="0"
-
-IUSE=""
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
- SRC_URI="mirror://gentoo/${BIN}.tar.bz2
- mirror://gentoo/${UBIN}.tar.bz2
- mirror://gentoo/${SBIN}.tar.bz2
- mirror://gentoo/${LIB}.tar.bz2"
-fi
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
- >=dev-libs/libedit-20120311.3.0-r1
- 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
-
-# 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 8c6dcc8a67e0..c598e70974de 100644
--- a/sys-freebsd/freebsd-cddl/ChangeLog
+++ b/sys-freebsd/freebsd-cddl/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for sys-freebsd/freebsd-cddl
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/ChangeLog,v 1.41 2015/03/08 14:01:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/ChangeLog,v 1.42 2015/05/24 11:24:01 mgorny Exp $
+
+ 24 May 2015; Michał Górny <mgorny@gentoo.org>
+ -files/freebsd-cddl-9.2-underlink.patch, -freebsd-cddl-9.2.ebuild,
+ -freebsd-cddl-9.2_rc1.ebuild, -freebsd-cddl-9.2_rc2.ebuild,
+ -freebsd-cddl-9.2_rc3.ebuild:
+ Remove 9.2. Part of https://github.com/gentoo/gentoo-portage-rsync-
+ mirror/pull/126 by nigoro.
*freebsd-cddl-10.1 (08 Mar 2015)
diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.2-underlink.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.2-underlink.patch
deleted file mode 100644
index be1ff9fa4519..000000000000
--- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.2-underlink.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -uNr cddl.old/lib/libzfs/Makefile cddl/lib/libzfs/Makefile
---- cddl.old/lib/libzfs/Makefile 2013-08-09 17:37:00.000000000 -0400
-+++ cddl/lib/libzfs/Makefile 2013-08-09 17:44:08.000000000 -0400
-@@ -8,7 +8,9 @@
- LIB= zfs
- DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} ${LIBNVPAIR} \
- ${LIBZFS_CORE}
--LDADD= -lmd -lpthread -lumem -lutil -lm -lnvpair -lzfs_core
-+LDADD= -lmd -lpthread -lumem -lutil -lm -lnvpair -lzfs_core -lgeom -luutil -lavl
-+
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
-
- SRCS= deviceid.c \
- fsshare.c \
-diff -uNr cddl.old/lib/libzpool/Makefile cddl/lib/libzpool/Makefile
---- cddl.old/lib/libzpool/Makefile 2013-08-09 17:46:23.000000000 -0400
-+++ cddl/lib/libzpool/Makefile 2013-08-09 17:50:39.000000000 -0400
-@@ -61,7 +61,7 @@
- LDFLAGS+= -L${.CURDIR}/../../lib/libumem
-
- DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBZ}
--LDADD= -lmd -lpthread -lz
-+LDADD= -lmd -lpthread -lz -lumem -lavl
-
- # atomic.S doesn't like profiling.
- NO_PROFILE=
diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-9.2.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-9.2.ebuild
deleted file mode 100644
index 6c696d7f418f..000000000000
--- a/sys-freebsd/freebsd-cddl/freebsd-cddl-9.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/freebsd-cddl-9.2.ebuild,v 1.1 2013/11/09 09:16:14 aballier Exp $
-
-EAPI=4
-
-inherit bsdmk freebsd toolchain-funcs multilib
-
-DESCRIPTION="FreeBSD CDDL (opensolaris/zfs) extra software"
-SLOT="0"
-
-IUSE="build"
-LICENSE="CDDL GPL-2"
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-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/${SYS}.tar.bz2
- build? ( mirror://gentoo/${INCLUDE}.tar.bz2 )"
-fi
-
-# sys is required.
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
- =sys-freebsd/freebsd-libexec-${RV}*
- build? ( sys-apps/baselayout )"
-
-DEPEND="${RDEPEND}
- =sys-freebsd/freebsd-mk-defs-${RV}*
- !build? ( =sys-freebsd/freebsd-sources-${RV}* )"
-
-S="${WORKDIR}/cddl"
-
-PATCHES=(
- "${FILESDIR}/${PN}-9.2-libpaths.patch"
- "${FILESDIR}/${PN}-9.2-underlink.patch"
- )
-
-src_unpack() {
- freebsd_src_unpack
- # Link in include headers.
- ln -s "/usr/include" "${WORKDIR}/include" || die "Symlinking /usr/include.."
-}
-
-src_install() {
- # Install libraries proper place
- local mylibdir=$(get_libdir)
- mkinstall SHLIBDIR="/usr/${mylibdir}" LIBDIR="/usr/${mylibdir}" || die
-
- gen_usr_ldscript -a avl nvpair umem uutil zfs zpool zfs_core
-
- # Install zfs volinit script.
- newinitd "${FILESDIR}"/zvol.initd-9.0 zvol
-
- # Install zfs script
- newinitd "${FILESDIR}"/zfs.initd zfs
-
- keepdir /etc/zfs
-}
diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-9.2_rc1.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-9.2_rc1.ebuild
deleted file mode 100644
index 4f43bfcef7f3..000000000000
--- a/sys-freebsd/freebsd-cddl/freebsd-cddl-9.2_rc1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/freebsd-cddl-9.2_rc1.ebuild,v 1.3 2013/08/11 20:33:13 aballier Exp $
-
-EAPI=4
-
-inherit bsdmk freebsd toolchain-funcs multilib
-
-DESCRIPTION="FreeBSD CDDL (opensolaris/zfs) extra software"
-SLOT="0"
-
-IUSE="build"
-LICENSE="CDDL GPL-2"
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-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/${SYS}.tar.bz2
- build? ( mirror://gentoo/${INCLUDE}.tar.bz2 )"
-fi
-
-# sys is required.
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
- =sys-freebsd/freebsd-libexec-${RV}*
- build? ( sys-apps/baselayout )"
-
-DEPEND="${RDEPEND}
- =sys-freebsd/freebsd-mk-defs-${RV}*
- !build? ( =sys-freebsd/freebsd-sources-${RV}* )"
-
-S="${WORKDIR}/cddl"
-
-PATCHES=(
- "${FILESDIR}/${PN}-9.2-libpaths.patch"
- "${FILESDIR}/${PN}-9.2-underlink.patch"
- )
-
-src_unpack() {
- freebsd_src_unpack
- # Link in include headers.
- ln -s "/usr/include" "${WORKDIR}/include" || die "Symlinking /usr/include.."
-}
-
-src_install() {
- # Install libraries proper place
- local mylibdir=$(get_libdir)
- mkinstall SHLIBDIR="/usr/${mylibdir}" LIBDIR="/usr/${mylibdir}" || die
-
- gen_usr_ldscript -a avl nvpair umem uutil zfs zpool zfs_core
-
- # Install zfs volinit script.
- newinitd "${FILESDIR}"/zvol.initd-9.0 zvol
-
- # Install zfs script
- newinitd "${FILESDIR}"/zfs.initd zfs
-
- keepdir /etc/zfs
-}
diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-9.2_rc2.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-9.2_rc2.ebuild
deleted file mode 100644
index e9f0db40dff4..000000000000
--- a/sys-freebsd/freebsd-cddl/freebsd-cddl-9.2_rc2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/freebsd-cddl-9.2_rc2.ebuild,v 1.1 2013/08/22 15:43:37 aballier Exp $
-
-EAPI=4
-
-inherit bsdmk freebsd toolchain-funcs multilib
-
-DESCRIPTION="FreeBSD CDDL (opensolaris/zfs) extra software"
-SLOT="0"
-
-IUSE="build"
-LICENSE="CDDL GPL-2"
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-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/${SYS}.tar.bz2
- build? ( mirror://gentoo/${INCLUDE}.tar.bz2 )"
-fi
-
-# sys is required.
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
- =sys-freebsd/freebsd-libexec-${RV}*
- build? ( sys-apps/baselayout )"
-
-DEPEND="${RDEPEND}
- =sys-freebsd/freebsd-mk-defs-${RV}*
- !build? ( =sys-freebsd/freebsd-sources-${RV}* )"
-
-S="${WORKDIR}/cddl"
-
-PATCHES=(
- "${FILESDIR}/${PN}-9.2-libpaths.patch"
- "${FILESDIR}/${PN}-9.2-underlink.patch"
- )
-
-src_unpack() {
- freebsd_src_unpack
- # Link in include headers.
- ln -s "/usr/include" "${WORKDIR}/include" || die "Symlinking /usr/include.."
-}
-
-src_install() {
- # Install libraries proper place
- local mylibdir=$(get_libdir)
- mkinstall SHLIBDIR="/usr/${mylibdir}" LIBDIR="/usr/${mylibdir}" || die
-
- gen_usr_ldscript -a avl nvpair umem uutil zfs zpool zfs_core
-
- # Install zfs volinit script.
- newinitd "${FILESDIR}"/zvol.initd-9.0 zvol
-
- # Install zfs script
- newinitd "${FILESDIR}"/zfs.initd zfs
-
- keepdir /etc/zfs
-}
diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-9.2_rc3.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-9.2_rc3.ebuild
deleted file mode 100644
index 4904e0357ab7..000000000000
--- a/sys-freebsd/freebsd-cddl/freebsd-cddl-9.2_rc3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/freebsd-cddl-9.2_rc3.ebuild,v 1.1 2013/08/26 20:41:53 aballier Exp $
-
-EAPI=4
-
-inherit bsdmk freebsd toolchain-funcs multilib
-
-DESCRIPTION="FreeBSD CDDL (opensolaris/zfs) extra software"
-SLOT="0"
-
-IUSE="build"
-LICENSE="CDDL GPL-2"
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-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/${SYS}.tar.bz2
- build? ( mirror://gentoo/${INCLUDE}.tar.bz2 )"
-fi
-
-# sys is required.
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
- =sys-freebsd/freebsd-libexec-${RV}*
- build? ( sys-apps/baselayout )"
-
-DEPEND="${RDEPEND}
- =sys-freebsd/freebsd-mk-defs-${RV}*
- !build? ( =sys-freebsd/freebsd-sources-${RV}* )"
-
-S="${WORKDIR}/cddl"
-
-PATCHES=(
- "${FILESDIR}/${PN}-9.2-libpaths.patch"
- "${FILESDIR}/${PN}-9.2-underlink.patch"
- )
-
-src_unpack() {
- freebsd_src_unpack
- # Link in include headers.
- ln -s "/usr/include" "${WORKDIR}/include" || die "Symlinking /usr/include.."
-}
-
-src_install() {
- # Install libraries proper place
- local mylibdir=$(get_libdir)
- mkinstall SHLIBDIR="/usr/${mylibdir}" LIBDIR="/usr/${mylibdir}" || die
-
- gen_usr_ldscript -a avl nvpair umem uutil zfs zpool zfs_core
-
- # Install zfs volinit script.
- newinitd "${FILESDIR}"/zvol.initd-9.0 zvol
-
- # Install zfs script
- newinitd "${FILESDIR}"/zfs.initd zfs
-
- keepdir /etc/zfs
-}
diff --git a/sys-freebsd/freebsd-contrib/ChangeLog b/sys-freebsd/freebsd-contrib/ChangeLog
index 56a8ddd4552e..2052cc7d989e 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/ChangeLog,v 1.50 2014/08/10 20:19:23 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/ChangeLog,v 1.51 2015/05/24 11:24:01 mgorny Exp $
+
+ 24 May 2015; Michał Górny <mgorny@gentoo.org> -freebsd-contrib-9.2.ebuild,
+ -freebsd-contrib-9.2_rc1.ebuild, -freebsd-contrib-9.2_rc2.ebuild,
+ -freebsd-contrib-9.2_rc3.ebuild:
+ Remove 9.2. Part of https://github.com/gentoo/gentoo-portage-rsync-
+ mirror/pull/126 by nigoro.
10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org>
freebsd-contrib-8.2.ebuild, freebsd-contrib-9.1.ebuild,
diff --git a/sys-freebsd/freebsd-contrib/freebsd-contrib-9.2.ebuild b/sys-freebsd/freebsd-contrib/freebsd-contrib-9.2.ebuild
deleted file mode 100644
index adcf79888d52..000000000000
--- a/sys-freebsd/freebsd-contrib/freebsd-contrib-9.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/freebsd-contrib-9.2.ebuild,v 1.2 2014/08/10 20:19:23 slyfox Exp $
-
-inherit bsdmk freebsd flag-o-matic multilib
-
-DESCRIPTION="Contributed sources for FreeBSD"
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
- SRC_URI="mirror://gentoo/${GNU}.tar.bz2
- mirror://gentoo/${P}.tar.bz2"
-fi
-LICENSE="BSD GPL-2+ libodialog"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="=sys-freebsd/freebsd-sources-${RV}*
- =sys-freebsd/freebsd-mk-defs-${RV}*"
-
-S="${WORKDIR}/gnu"
-
-src_compile() {
- cd "${S}/lib/libodialog"
- 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/libodialog"
- mkinstall LIBDIR="/usr/$(get_libdir)" || die "libodialog install failed"
-
- cd "${S}/usr.bin/sort"
- mkinstall BINDIR="/bin/" || die "sort install failed"
-
- cd "${S}/usr.bin/patch"
- mkinstall BINDIR="/usr/bin/" || die "patch install failed"
-}
diff --git a/sys-freebsd/freebsd-contrib/freebsd-contrib-9.2_rc1.ebuild b/sys-freebsd/freebsd-contrib/freebsd-contrib-9.2_rc1.ebuild
deleted file mode 100644
index 2598a25ab86c..000000000000
--- a/sys-freebsd/freebsd-contrib/freebsd-contrib-9.2_rc1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/freebsd-contrib-9.2_rc1.ebuild,v 1.3 2014/08/10 20:19:23 slyfox Exp $
-
-inherit bsdmk freebsd flag-o-matic multilib
-
-DESCRIPTION="Contributed sources for FreeBSD"
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
- SRC_URI="mirror://gentoo/${GNU}.tar.bz2
- mirror://gentoo/${P}.tar.bz2"
-fi
-LICENSE="BSD GPL-2+ libodialog"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="=sys-freebsd/freebsd-sources-${RV}*
- =sys-freebsd/freebsd-mk-defs-${RV}*"
-
-S="${WORKDIR}/gnu"
-
-src_compile() {
- cd "${S}/lib/libodialog"
- 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/libodialog"
- mkinstall LIBDIR="/usr/$(get_libdir)" || die "libodialog install failed"
-
- cd "${S}/usr.bin/sort"
- mkinstall BINDIR="/bin/" || die "sort install failed"
-
- cd "${S}/usr.bin/patch"
- mkinstall BINDIR="/usr/bin/" || die "patch install failed"
-}
diff --git a/sys-freebsd/freebsd-contrib/freebsd-contrib-9.2_rc2.ebuild b/sys-freebsd/freebsd-contrib/freebsd-contrib-9.2_rc2.ebuild
deleted file mode 100644
index 8e9779d0b687..000000000000
--- a/sys-freebsd/freebsd-contrib/freebsd-contrib-9.2_rc2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/freebsd-contrib-9.2_rc2.ebuild,v 1.2 2014/08/10 20:19:23 slyfox Exp $
-
-inherit bsdmk freebsd flag-o-matic multilib
-
-DESCRIPTION="Contributed sources for FreeBSD"
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
- SRC_URI="mirror://gentoo/${GNU}.tar.bz2
- mirror://gentoo/${P}.tar.bz2"
-fi
-LICENSE="BSD GPL-2+ libodialog"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="=sys-freebsd/freebsd-sources-${RV}*
- =sys-freebsd/freebsd-mk-defs-${RV}*"
-
-S="${WORKDIR}/gnu"
-
-src_compile() {
- cd "${S}/lib/libodialog"
- 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/libodialog"
- mkinstall LIBDIR="/usr/$(get_libdir)" || die "libodialog install failed"
-
- cd "${S}/usr.bin/sort"
- mkinstall BINDIR="/bin/" || die "sort install failed"
-
- cd "${S}/usr.bin/patch"
- mkinstall BINDIR="/usr/bin/" || die "patch install failed"
-}
diff --git a/sys-freebsd/freebsd-contrib/freebsd-contrib-9.2_rc3.ebuild b/sys-freebsd/freebsd-contrib/freebsd-contrib-9.2_rc3.ebuild
deleted file mode 100644
index fc3cdb169ecb..000000000000
--- a/sys-freebsd/freebsd-contrib/freebsd-contrib-9.2_rc3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/freebsd-contrib-9.2_rc3.ebuild,v 1.2 2014/08/10 20:19:23 slyfox Exp $
-
-inherit bsdmk freebsd flag-o-matic multilib
-
-DESCRIPTION="Contributed sources for FreeBSD"
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
- SRC_URI="mirror://gentoo/${GNU}.tar.bz2
- mirror://gentoo/${P}.tar.bz2"
-fi
-LICENSE="BSD GPL-2+ libodialog"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="=sys-freebsd/freebsd-sources-${RV}*
- =sys-freebsd/freebsd-mk-defs-${RV}*"
-
-S="${WORKDIR}/gnu"
-
-src_compile() {
- cd "${S}/lib/libodialog"
- 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/libodialog"
- mkinstall LIBDIR="/usr/$(get_libdir)" || die "libodialog install failed"
-
- cd "${S}/usr.bin/sort"
- mkinstall BINDIR="/bin/" || die "sort install failed"
-
- cd "${S}/usr.bin/patch"
- mkinstall BINDIR="/usr/bin/" || die "patch install failed"
-}
diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index 09b0a03cbfd9..96bb705c80bf 100644
--- a/sys-freebsd/freebsd-lib/ChangeLog
+++ b/sys-freebsd/freebsd-lib/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for sys-freebsd/freebsd-lib
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.208 2015/03/08 14:01:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.209 2015/05/24 11:24:01 mgorny Exp $
+
+ 24 May 2015; Michał Górny <mgorny@gentoo.org>
+ -files/freebsd-lib-9.2-liblink.patch, -freebsd-lib-9.2.ebuild,
+ -freebsd-lib-9.2_rc1.ebuild, -freebsd-lib-9.2_rc2.ebuild,
+ -freebsd-lib-9.2_rc3.ebuild:
+ Remove 9.2. Part of https://github.com/gentoo/gentoo-portage-rsync-
+ mirror/pull/126 by nigoro.
*freebsd-lib-10.1 (08 Mar 2015)
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.2-liblink.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.2-liblink.patch
deleted file mode 100644
index 3759c91f0a89..000000000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.2-liblink.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff --git a/lib/libdwarf/Makefile b/lib/libdwarf/Makefile
-index 87ce8d4..77d0535 100644
---- a/lib/libdwarf/Makefile
-+++ b/lib/libdwarf/Makefile
-@@ -21,6 +21,7 @@ SRCS= \
- INCS= dwarf.h libdwarf.h
-
- CFLAGS+= -I${.CURDIR}
-+CFLAGS+= -I${.CURDIR}/../libelf
-
- SHLIB_MAJOR= 3
-
-diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile
-index e20e00a..77d46d7 100644
---- a/lib/libproc/Makefile
-+++ b/lib/libproc/Makefile
-@@ -12,9 +12,13 @@ SRCS= proc_bkpt.c \
- INCS= libproc.h
-
- CFLAGS+= -I${.CURDIR}
-+CFLAGS+= -I${.CURDIR}/../libelf
-
- SHLIB_MAJOR= 2
-
- WITHOUT_MAN=
-
-+LDADD+= -lelf
-+LDFLAGS+= -L${.OBJDIR}/../libelf
-+
- .include <bsd.lib.mk>
-diff --git a/lib/librtld_db/Makefile b/lib/librtld_db/Makefile
-index 783fb8b..62e7c60 100644
---- a/lib/librtld_db/Makefile
-+++ b/lib/librtld_db/Makefile
-@@ -10,5 +10,8 @@ SRCS= rtld_db.c
- INCS= rtld_db.h
-
- CFLAGS+= -I${.CURDIR}
-+CFLAGS+= -I${.CURDIR}/../libelf
-+LDADD+= -lutil -lproc
-+LDFLAGS+= -L${.OBJDIR}/../libutil -L${.OBJDIR}/../libproc
-
- .include <bsd.lib.mk>
-diff -uNr lib.old/libprocstat/Makefile lib/libprocstat/Makefile
---- a/lib/libprocstat/Makefile 2013-08-11 16:00:47.000000000 -0400
-+++ b/lib/libprocstat/Makefile 2013-08-11 16:18:19.000000000 -0400
-@@ -17,6 +17,8 @@
- SYMBOL_MAPS= ${.CURDIR}/Symbol.map
-
- INCS= libprocstat.h
-+CFLAGS+= -I${.CURDIR}/../libelf
-+LDFLAGS+= -L${.OBJDIR}/../libelf
- CFLAGS+= -I. -I${.CURDIR} -D_KVM_VNODE
- SHLIB_MAJOR= 1
-
-diff --git a/lib/libcam/Makefile b/lib/libcam/Makefile
-index fcb16de..6d0312b 100644
---- a/lib/libcam/Makefile
-+++ b/lib/libcam/Makefile
-@@ -8,6 +8,7 @@ INCS= camlib.h
-
- DPADD= ${LIBSBUF}
- LDADD= -lsbuf
-+LDFLAGS+= -L${.OBJDIR}/../libsbuf
-
- MAN= cam.3 cam_cdbparse.3
-
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.2.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.2.ebuild
deleted file mode 100644
index 9887e4c2fc44..000000000000
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.2.ebuild
+++ /dev/null
@@ -1,602 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.2.ebuild,v 1.3 2015/02/18 17:09:17 mgorny Exp $
-
-EAPI=5
-
-inherit bsdmk freebsd flag-o-matic multilib toolchain-funcs eutils multibuild multilib-build
-
-DESCRIPTION="FreeBSD's base system libraries"
-SLOT="0"
-
-# 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
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
- 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
- mirror://gentoo/${SECURE}.tar.bz2
- build? ( mirror://gentoo/${SYS}.tar.bz2 )
- zfs? ( mirror://gentoo/${CDDL}.tar.bz2 )"
-fi
-
-if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then
- RDEPEND="ssl? ( dev-libs/openssl )
- hesiod? ( net-dns/hesiod )
- kerberos? ( app-crypt/heimdal )
- usb? ( !dev-libs/libusb )
- zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )
- >=dev-libs/expat-2.0.1
- !sys-libs/libutempter
- !dev-libs/libelf
- !sys-freebsd/freebsd-headers"
- DEPEND="${RDEPEND}
- >=sys-devel/flex-2.5.31-r2
- =sys-freebsd/freebsd-sources-${RV}*"
-else
- SRC_URI="${SRC_URI}
- mirror://gentoo/${SYS}.tar.bz2"
-fi
-
-DEPEND="${DEPEND}
- userland_GNU? ( sys-apps/mtree )
- =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 crosscompile_opts_headers-only zfs
- userland_GNU userland_BSD"
-
-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= WITHOUT_GSSAPI= "
- use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
- use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
- use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
- use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-
- mymakeopts="${mymakeopts} WITHOUT_BIND= WITHOUT_BIND_LIBS= WITHOUT_SENDMAIL= WITHOUT_CLANG= WITHOUT_LIBCPLUSPLUS= "
-
- if [ "${CTARGET}" != "${CHOST}" ]; then
- mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})"
- mymakeopts="${mymakeopts} MACHINE_ARCH=$(tc-arch-kernel ${CTARGET})"
- fi
-}
-
-PATCHES=(
- "${FILESDIR}/${PN}-6.0-pmc.patch"
- "${FILESDIR}/${PN}-6.1-csu.patch"
- "${FILESDIR}/${PN}-9.2-liblink.patch"
- "${FILESDIR}/${PN}-bsdxml2expat.patch"
- "${FILESDIR}/${PN}-9.0-netware.patch"
- "${FILESDIR}/${PN}-9.0-bluetooth.patch"
- "${FILESDIR}/${PN}-9.1-.eh_frame_hdr-fix.patch"
- "${FILESDIR}/${PN}-add-nossp-cflags.patch"
- )
-
-# Here we disable and remove source which we don't need or want
-# In order:
-# - ncurses stuff
-# - libexpat creates a bsdxml library which is the same as expat
-# - archiving libraries (have their own ebuild)
-# - sendmail libraries (they are installed by sendmail)
-# - SNMP library and dependency (have their own ebuilds)
-# - libstand: static library, 32bits on amd64 used for boot0, we build it from
-# boot0 instead.
-#
-# The rest are libraries we already have somewhere else because
-# they are contribution.
-REMOVE_SUBDIRS="ncurses \
- libexpat \
- libz libbz2 libarchive liblzma \
- libsm libsmdb libsmutil \
- libbegemot libbsnmp \
- libpam libpcap bind libwrap libmagic \
- libcom_err
- libedit
- libstand
- libgssapi"
-
-# Are we building a cross-compiler?
-is_crosscompile() {
- [ "${CATEGORY#*cross-}" != "${CATEGORY}" ]
-}
-
-src_prepare() {
- sed -i.bak -e 's:-o/dev/stdout:-t:' "${S}/libc/net/Makefile.inc"
-
- # 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"
- epatch "${FILESDIR}/${PN}-8.0-gcc45.patch"
- epatch "${FILESDIR}/${PN}-9.0-opieincludes.patch"
- epatch "${FILESDIR}/${PN}-9.1-rmgssapi.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 libprocstat libulog; do sed -i.bak -e 's:LDADD=:LDADD+=:g' "${dir}/Makefile" || \
- die "Problem fixing \"${dir}/Makefile"
- done
- # Call LD with LDFLAGS, rename them to RAW_LDFLAGS
- sed -e 's/LDFLAGS/RAW_LDFLAGS/g' \
- -i "${S}/csu/i386-elf/Makefile" \
- -i "${S}/csu/ia64/Makefile" || die
- 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
- epatch "${FILESDIR}"/freebsd-sources-9.0-sysctluint.patch
- return 0
- fi
-
- if ! is_crosscompile ; then
- ln -s "/usr/src/sys" "${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
-
- # Try to fix sed calls for GNU sed. Do it only with GNU userland and force
- # BSD's sed on BSD.
- cd "${S}"
- if use userland_GNU; then
- find . -name Makefile -exec sed -ibak 's/sed -i /sed -i/' {} \;
- fi
-}
-
-bootstrap_lib() {
- for i ; do
- cd "${WORKDIR}/${i}" || die "missing ${i}"
- freebsd_src_compile
- append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/${i}"
- done
-}
-
-get_csudir() {
- if [ -d "${WORKDIR}/lib/csu/$1-elf" ]; then
- echo "lib/csu/$1-elf"
- else
- echo "lib/csu/$1"
- fi
-}
-
-bootstrap_csu() {
- local csudir="$(get_csudir $(tc-arch-kernel ${CTARGET}))"
- export RAW_LDFLAGS=$(raw-ldflags)
- bootstrap_lib "${csudir}"
-
- CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
- append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
-
- bootstrap_lib "gnu/lib/csu"
-
- cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu"
- for i in *.So ; do
- ln -s $i ${i%.So}S.o
- done
- CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu"
- append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu"
-}
-
-# Compile libssp_nonshared.a and add it's path to LDFLAGS.
-bootstrap_libssp_nonshared() {
- bootstrap_lib "gnu/lib/libssp/libssp_nonshared"
- export LDADD="-lssp_nonshared"
-}
-
-bootstrap_libgcc() {
- bootstrap_lib "lib/libcompiler_rt"
- cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libcompiler_rt" || die
- ln -s libcompiler_rt.a libgcc.a || die
-
- bootstrap_lib "lib/libc" "gnu/lib/libgcc"
-}
-
-bootstrap_libthr() {
- bootstrap_lib "lib/libthr"
- cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libthr" || die
- ln -s libthr.so libpthread.so
-}
-
-# What to build for a cross-compiler.
-# We also need the csu but this has to be handled separately.
-CROSS_SUBDIRS="lib/libc lib/msun gnu/lib/libssp/libssp_nonshared lib/libthr lib/libutil lib/librt"
-
-# What to build for non-default ABIs.
-NON_NATIVE_SUBDIRS="${CROSS_SUBDIRS} gnu/lib/csu lib/libcompiler_rt gnu/lib/libgcc lib/libmd lib/libcrypt lib/libsbuf lib/libcam lib/libelf"
-
-# Subdirs for a native build:
-NATIVE_SUBDIRS="lib gnu/lib/libssp/libssp_nonshared gnu/lib/libregex gnu/lib/csu gnu/lib/libgcc"
-
-# Is my $ABI native ?
-is_native_abi() {
- is_crosscompile && return 1
- multilib_is_native_abi
-}
-
-# Do we need to bootstrap the csu and libssp_nonshared?
-need_bootstrap() {
- is_crosscompile || use build || { ! is_native_abi && ! has_version '>=sys-freebsd/freebsd-lib-9.1-r8[multilib]' && ! has_version ">=sys-freebsd/freebsd-lib-9.1-r11[${MULTILIB_USEDEP}]" ; } || has_version "<${CATEGORY}/${P}"
-}
-
-# Get the subdirs we are building.
-get_subdirs() {
- local ret=""
- if is_native_abi ; then
- # If we are building for the native ABI, build everything
- ret="${NATIVE_SUBDIRS}"
- elif is_crosscompile ; then
- # With a cross-compiler we only build the very core parts.
- ret="${CROSS_SUBDIRS}"
- if [ "${EBUILD_PHASE}" = "install" ]; then
- # Add the csu dir first when installing. We treat it separately for
- # compiling.
- ret="$(get_csudir $(tc-arch-kernel ${CTARGET})) ${ret}"
- fi
- else
- # For the non-native ABIs we only build the csu parts and very core
- # libraries for now.
- ret="${NON_NATIVE_SUBDIRS} $(get_csudir $(tc-arch-kernel ${CHOST}))"
- fi
- echo "${ret}"
-}
-
-# Bootstrap the core libraries and setup the flags so that the other parts can
-# build against it.
-do_bootstrap() {
- einfo "Bootstrapping on ${CHOST} for ${CTARGET}"
- if ! is_crosscompile ; then
- # Pre-install headers, but not when building a cross-compiler since we
- # assume they have been installed in the previous pass.
- einfo "Pre-installing includes in include_proper_${ABI}"
- mkdir "${WORKDIR}/include_proper_${ABI}" || die
- CTARGET="${CHOST}" install_includes "/include_proper_${ABI}"
- CFLAGS="${CFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}"
- fi
- bootstrap_csu
- bootstrap_libssp_nonshared
- is_crosscompile && bootstrap_lib "lib/libc"
- is_crosscompile || is_native_abi || bootstrap_libgcc
- is_native_abi || bootstrap_libthr
-}
-
-# Compile it. Assume we have the toolchain setup correctly.
-do_compile() {
- # Bootstrap if needed, otherwise assume the system headers are in
- # /usr/include.
- if need_bootstrap ; then
- do_bootstrap
- else
- CFLAGS="${CFLAGS} -isystem /usr/include"
- fi
-
- export RAW_LDFLAGS=$(raw-ldflags)
-
- # Everything is now setup, build it!
- for i in $(get_subdirs) ; do
- einfo "Building in ${i}... with CC=${CC} and CFLAGS=${CFLAGS}"
- cd "${WORKDIR}/${i}/" || die "missing ${i}."
- freebsd_src_compile || die "make ${i} failed"
- done
-}
-
-src_compile() {
- # Does not work with GNU sed
- # Force BSD's sed on BSD.
- if use userland_BSD ; then
- export ESED=/usr/bin/sed
- unalias sed
- fi
-
- use usb && export NON_NATIVE_SUBDIRS="${NON_NATIVE_SUBDIRS} lib/libusb lib/libusbhid"
-
- 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)
-
- # Bug #324445
- append-flags $(test-flags -fno-strict-overflow)
-
- # strip flags and do not do it later, we only add safe, and in fact
- # needed flags after all
- strip-flags
- export NOFLAGSTRIP=yes
- if is_crosscompile ; then
- export YACC='yacc -by'
- CHOST=${CTARGET} tc-export CC LD CXX RANLIB
- mymakeopts="${mymakeopts} NLS="
- CFLAGS="${CFLAGS} -isystem /usr/${CTARGET}/usr/include"
- append-ldflags "-L${WORKDIR}/${CHOST}/${WORKDIR}/lib/libc"
- fi
-
- if is_crosscompile ; then
- do_compile
- else
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
- multibuild_foreach_variant freebsd_multilib_multibuild_wrapper do_compile
- fi
-}
-
-gen_libc_ldscript() {
- # Parameters:
- # $1 = target libdir
- # $2 = source libc dir
- # $3 = source libssp_nonshared dir
-
- # Clear the symlink.
- rm -f "${D}/$2/libc.so" || die
-
- # Move the library if needed
- if [ "$1" != "$2" ] ; then
- mv "${D}/$2/libc.so.7" "${D}/$1/" || die
- fi
-
- # 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} )"
-
- cat > "${D}/$2/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 ( /$1/libc.so.7 /$3/libssp_nonshared.a )
-END_LDSCRIPT
-}
-
-header_list=""
-
-move_header() {
- local dirname=$(dirname ${1})
- local filename=$(basename ${1})
-
- if [ ! -d "${dirname}/${ABI}" ] ; then
- mkdir "${dirname}/${ABI}" || die
- fi
-
- mv "${1}" "${dirname}/${ABI}/" || die
-
- export header_list="${header_list} ${1}"
-}
-
-make_header_template() {
- cat <<-END_HEADER
-/*
- * Wrapped header for multilib support.
- * See the real headers included below.
- */
-
-#if defined(__x86_64__)
- @ABI_amd64_fbsd@
-#elif defined(__i386__)
- @ABI_x86_fbsd@
-#else
- @ABI_${DEFAULT_ABI}@
-#endif
-END_HEADER
-}
-
-wrap_header() {
- local dirname=$(dirname ${1})
- local filename=$(basename ${1})
-
- if [ -n "${dirname#.}" ] ; then
- dirname="${dirname}/${2}"
- else
- dirname="${2}"
- fi
-
- if [ -f "${dirname}/${filename}" ] ; then
- sed -e "s:@ABI_${2}@:#include <${dirname}/${filename}>:" ${1}
- else
- cat ${1}
- fi
-}
-
-wrap_header_end() {
- sed -e "s:@ABI_.*@:#error \"Sorry, no support for your ABI.\":" ${1}
-}
-
-do_install() {
- if is_crosscompile ; then
- INCLUDEDIR="/usr/${CTARGET}/usr/include"
- else
- INCLUDEDIR="/usr/include"
- fi
-
- dodir ${INCLUDEDIR}
- CTARGET="${CHOST}" \
- install_includes ${INCLUDEDIR}
-
- is_crosscompile && use crosscompile_opts_headers-only && return 0
-
- for i in $(get_subdirs) ; do
- einfo "Installing in ${i}..."
- cd "${WORKDIR}/${i}/" || die "missing ${i}."
- freebsd_src_install || die "Install ${i} failed"
- done
-
- if ! is_crosscompile ; then
- if ! multilib_is_native_abi ; then
- gen_libc_ldscript "usr/$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)"
- else
- dodir "$(get_libdir)"
- gen_libc_ldscript "$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)"
- fi
- else
- CHOST=${CTARGET} gen_libc_ldscript "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib"
- # We're done for the cross libc here.
- return 0
- fi
-
- # Install a libusb.pc for better compat with Linux's libusb
- if use usb ; then
- dodir /usr/$(get_libdir)/pkgconfig
- sed -e "s:@LIBDIR@:/usr/$(get_libdir):" "${FILESDIR}/libusb.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/libusb.pc" || die
- sed -e "s:@LIBDIR@:/usr/$(get_libdir):" "${FILESDIR}/libusb-1.0.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/libusb-1.0.pc" || die
- fi
-
- # Generate ldscripts for core libraries that will go in /
- multilib_is_native_abi && \
- gen_usr_ldscript -a alias cam geom ipsec jail kiconv \
- kvm m md procstat sbuf thr ufs util elf
-
- if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]] ; then
- cd "${D}/usr/include"
- for i in machine/*.h fenv.h ; do
- move_header ${i}
- done
- if multilib_is_native_abi ; then
- # Supposedly the last one!
- local uniq_headers="$(echo ${header_list} | tr ' ' '\n' | sort | uniq | tr '\n' ' ')"
- for j in ${uniq_headers} ; do
- make_header_template > ${j}
- for i in $(get_all_abis) ; do
- wrap_header ${j} ${i} > ${j}.new
- cp ${j}.new ${j}
- rm -f ${j}.new
- done
- wrap_header_end ${j} > ${j}.new
- cp ${j}.new ${j}
- rm -f ${j}.new
- done
- fi
- fi
-}
-
-src_install() {
- if is_crosscompile ; then
- einfo "Installing for ${CTARGET} in ${CHOST}.."
- # From this point we need to force: get stripped with the correct tools,
- # get tc-arch-kernel to return the right value, etc.
- export CHOST=${CTARGET}
-
- mymakeopts="${mymakeopts} NO_MAN= \
- INCLUDEDIR=/usr/${CTARGET}/usr/include \
- SHLIBDIR=/usr/${CTARGET}/usr/lib \
- LIBDIR=/usr/${CTARGET}/usr/lib"
-
- dosym "usr/include" "/usr/${CTARGET}/sys-include"
- do_install
-
- return 0
- else
- export STRIP_MASK="*/usr/lib*/*crt*.o"
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
- multibuild_foreach_variant freebsd_multilib_multibuild_wrapper do_install
- fi
-
- cd "${WORKDIR}/etc/"
- insinto /etc
- doins nls.alias mac.conf netconfig
-
- # Install ttys file
- local MACHINE="$(tc-arch-kernel)"
- doins "etc.${MACHINE}"/*
-}
-
-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
-
- # Must exist before we use it.
- [[ -d "${DESTDIR}${INCLUDEDIR}" ]] || die "dodir or mkdir ${INCLUDEDIR} before using install_includes."
- cd "${WORKDIR}/include"
-
- local MACHINE="$(tc-arch-kernel)"
-
- einfo "Installing includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
- $(freebsd_get_bmake) installincludes \
- MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
- DESTDIR="${DESTDIR}" \
- INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
- BINGRP="${BINGRP}" || die "install_includes() failed"
- einfo "includes installed ok."
- EXTRA_INCLUDES="lib/librtld_db lib/libutil lib/msun gnu/lib/libregex"
- for i in $EXTRA_INCLUDES; do
- einfo "Installing $i includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
- cd "${WORKDIR}/$i" || die
- $(freebsd_get_bmake) installincludes DESTDIR="${DESTDIR}" \
- MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
- INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
- BINGRP="${BINGRP}" || die "problem installing $i includes."
- einfo "$i includes installed ok."
- done
-}
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.2_rc1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.2_rc1.ebuild
deleted file mode 100644
index fc42e3fbbe47..000000000000
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.2_rc1.ebuild
+++ /dev/null
@@ -1,601 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.2_rc1.ebuild,v 1.8 2014/03/24 17:49:33 ssuominen Exp $
-
-EAPI=5
-
-inherit bsdmk freebsd flag-o-matic multilib toolchain-funcs eutils multibuild multilib-build
-
-DESCRIPTION="FreeBSD's base system libraries"
-SLOT="0"
-
-# 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
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
- 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
- mirror://gentoo/${SECURE}.tar.bz2
- build? ( mirror://gentoo/${SYS}.tar.bz2 )
- zfs? ( mirror://gentoo/${CDDL}.tar.bz2 )"
-fi
-
-if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then
- RDEPEND="ssl? ( dev-libs/openssl )
- hesiod? ( net-dns/hesiod )
- kerberos? ( app-crypt/heimdal )
- usb? ( !dev-libs/libusb )
- zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )
- >=dev-libs/expat-2.0.1
- !sys-libs/libutempter
- !dev-libs/libelf
- !sys-freebsd/freebsd-headers"
- DEPEND="${RDEPEND}
- >=sys-devel/flex-2.5.31-r2
- =sys-freebsd/freebsd-sources-${RV}*"
-else
- SRC_URI="${SRC_URI}
- mirror://gentoo/${SYS}.tar.bz2"
-fi
-
-DEPEND="${DEPEND}
- userland_GNU? ( sys-apps/mtree )
- =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 crosscompile_opts_headers-only zfs
- userland_GNU userland_BSD"
-
-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= WITHOUT_GSSAPI= "
- use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
- use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
- use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
- use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-
- mymakeopts="${mymakeopts} WITHOUT_BIND= WITHOUT_BIND_LIBS= WITHOUT_SENDMAIL= WITHOUT_CLANG= WITHOUT_LIBCPLUSPLUS= "
-
- if [ "${CTARGET}" != "${CHOST}" ]; then
- mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})"
- mymakeopts="${mymakeopts} MACHINE_ARCH=$(tc-arch-kernel ${CTARGET})"
- fi
-}
-
-PATCHES=(
- "${FILESDIR}/${PN}-6.0-pmc.patch"
- "${FILESDIR}/${PN}-6.1-csu.patch"
- "${FILESDIR}/${PN}-9.2-liblink.patch"
- "${FILESDIR}/${PN}-bsdxml2expat.patch"
- "${FILESDIR}/${PN}-9.0-netware.patch"
- "${FILESDIR}/${PN}-9.0-bluetooth.patch"
- "${FILESDIR}/${PN}-9.1-.eh_frame_hdr-fix.patch"
- )
-
-# Here we disable and remove source which we don't need or want
-# In order:
-# - ncurses stuff
-# - libexpat creates a bsdxml library which is the same as expat
-# - archiving libraries (have their own ebuild)
-# - sendmail libraries (they are installed by sendmail)
-# - SNMP library and dependency (have their own ebuilds)
-# - libstand: static library, 32bits on amd64 used for boot0, we build it from
-# boot0 instead.
-#
-# The rest are libraries we already have somewhere else because
-# they are contribution.
-REMOVE_SUBDIRS="ncurses \
- libexpat \
- libz libbz2 libarchive liblzma \
- libsm libsmdb libsmutil \
- libbegemot libbsnmp \
- libpam libpcap bind libwrap libmagic \
- libcom_err
- libedit
- libstand
- libgssapi"
-
-# Are we building a cross-compiler?
-is_crosscompile() {
- [ "${CATEGORY#*cross-}" != "${CATEGORY}" ]
-}
-
-src_prepare() {
- sed -i.bak -e 's:-o/dev/stdout:-t:' "${S}/libc/net/Makefile.inc"
-
- # 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"
- epatch "${FILESDIR}/${PN}-8.0-gcc45.patch"
- epatch "${FILESDIR}/${PN}-9.0-opieincludes.patch"
- epatch "${FILESDIR}/${PN}-9.1-rmgssapi.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 libprocstat libulog; do sed -i.bak -e 's:LDADD=:LDADD+=:g' "${dir}/Makefile" || \
- die "Problem fixing \"${dir}/Makefile"
- done
- # Call LD with LDFLAGS, rename them to RAW_LDFLAGS
- sed -e 's/LDFLAGS/RAW_LDFLAGS/g' \
- -i "${S}/csu/i386-elf/Makefile" \
- -i "${S}/csu/ia64/Makefile" || die
- 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
- epatch "${FILESDIR}"/freebsd-sources-9.0-sysctluint.patch
- return 0
- fi
-
- if ! is_crosscompile ; then
- ln -s "/usr/src/sys" "${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
-
- # Try to fix sed calls for GNU sed. Do it only with GNU userland and force
- # BSD's sed on BSD.
- cd "${S}"
- if use userland_GNU; then
- find . -name Makefile -exec sed -ibak 's/sed -i /sed -i/' {} \;
- fi
-}
-
-bootstrap_lib() {
- for i ; do
- cd "${WORKDIR}/${i}" || die "missing ${i}"
- freebsd_src_compile
- append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/${i}"
- done
-}
-
-get_csudir() {
- if [ -d "${WORKDIR}/lib/csu/$1-elf" ]; then
- echo "lib/csu/$1-elf"
- else
- echo "lib/csu/$1"
- fi
-}
-
-bootstrap_csu() {
- local csudir="$(get_csudir $(tc-arch-kernel ${CTARGET}))"
- export RAW_LDFLAGS=$(raw-ldflags)
- bootstrap_lib "${csudir}"
-
- CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
- append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
-
- bootstrap_lib "gnu/lib/csu"
-
- cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu"
- for i in *.So ; do
- ln -s $i ${i%.So}S.o
- done
- CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu"
- append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu"
-}
-
-# Compile libssp_nonshared.a and add it's path to LDFLAGS.
-bootstrap_libssp_nonshared() {
- bootstrap_lib "gnu/lib/libssp/libssp_nonshared"
- export LDADD="-lssp_nonshared"
-}
-
-bootstrap_libgcc() {
- bootstrap_lib "lib/libcompiler_rt"
- cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libcompiler_rt" || die
- ln -s libcompiler_rt.a libgcc.a || die
-
- bootstrap_lib "lib/libc" "gnu/lib/libgcc"
-}
-
-bootstrap_libthr() {
- bootstrap_lib "lib/libthr"
- cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libthr" || die
- ln -s libthr.so libpthread.so
-}
-
-# What to build for a cross-compiler.
-# We also need the csu but this has to be handled separately.
-CROSS_SUBDIRS="lib/libc lib/msun gnu/lib/libssp/libssp_nonshared lib/libthr lib/libutil lib/librt"
-
-# What to build for non-default ABIs.
-NON_NATIVE_SUBDIRS="${CROSS_SUBDIRS} gnu/lib/csu lib/libcompiler_rt gnu/lib/libgcc lib/libmd lib/libcrypt lib/libsbuf lib/libcam lib/libelf"
-
-# Subdirs for a native build:
-NATIVE_SUBDIRS="lib gnu/lib/libssp/libssp_nonshared gnu/lib/libregex gnu/lib/csu gnu/lib/libgcc"
-
-# Is my $ABI native ?
-is_native_abi() {
- is_crosscompile && return 1
- multilib_is_native_abi
-}
-
-# Do we need to bootstrap the csu and libssp_nonshared?
-need_bootstrap() {
- is_crosscompile || use build || { ! is_native_abi && ! has_version '>=sys-freebsd/freebsd-lib-9.1-r8[multilib]' && ! has_version ">=sys-freebsd/freebsd-lib-9.1-r11[${MULTILIB_USEDEP}]" ; } || has_version "<${CATEGORY}/${P}"
-}
-
-# Get the subdirs we are building.
-get_subdirs() {
- local ret=""
- if is_native_abi ; then
- # If we are building for the native ABI, build everything
- ret="${NATIVE_SUBDIRS}"
- elif is_crosscompile ; then
- # With a cross-compiler we only build the very core parts.
- ret="${CROSS_SUBDIRS}"
- if [ "${EBUILD_PHASE}" = "install" ]; then
- # Add the csu dir first when installing. We treat it separately for
- # compiling.
- ret="$(get_csudir $(tc-arch-kernel ${CTARGET})) ${ret}"
- fi
- else
- # For the non-native ABIs we only build the csu parts and very core
- # libraries for now.
- ret="${NON_NATIVE_SUBDIRS} $(get_csudir $(tc-arch-kernel ${CHOST}))"
- fi
- echo "${ret}"
-}
-
-# Bootstrap the core libraries and setup the flags so that the other parts can
-# build against it.
-do_bootstrap() {
- einfo "Bootstrapping on ${CHOST} for ${CTARGET}"
- if ! is_crosscompile ; then
- # Pre-install headers, but not when building a cross-compiler since we
- # assume they have been installed in the previous pass.
- einfo "Pre-installing includes in include_proper_${ABI}"
- mkdir "${WORKDIR}/include_proper_${ABI}" || die
- CTARGET="${CHOST}" install_includes "/include_proper_${ABI}"
- CFLAGS="${CFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}"
- fi
- bootstrap_csu
- bootstrap_libssp_nonshared
- is_crosscompile && bootstrap_lib "lib/libc"
- is_crosscompile || is_native_abi || bootstrap_libgcc
- is_native_abi || bootstrap_libthr
-}
-
-# Compile it. Assume we have the toolchain setup correctly.
-do_compile() {
- # Bootstrap if needed, otherwise assume the system headers are in
- # /usr/include.
- if need_bootstrap ; then
- do_bootstrap
- else
- CFLAGS="${CFLAGS} -isystem /usr/include"
- fi
-
- export RAW_LDFLAGS=$(raw-ldflags)
-
- # Everything is now setup, build it!
- for i in $(get_subdirs) ; do
- einfo "Building in ${i}... with CC=${CC} and CFLAGS=${CFLAGS}"
- cd "${WORKDIR}/${i}/" || die "missing ${i}."
- freebsd_src_compile || die "make ${i} failed"
- done
-}
-
-src_compile() {
- # Does not work with GNU sed
- # Force BSD's sed on BSD.
- if use userland_BSD ; then
- export ESED=/usr/bin/sed
- unalias sed
- fi
-
- use usb && export NON_NATIVE_SUBDIRS="${NON_NATIVE_SUBDIRS} lib/libusb lib/libusbhid"
-
- 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)
-
- # Bug #324445
- append-flags $(test-flags -fno-strict-overflow)
-
- # strip flags and do not do it later, we only add safe, and in fact
- # needed flags after all
- strip-flags
- export NOFLAGSTRIP=yes
- if is_crosscompile ; then
- export YACC='yacc -by'
- CHOST=${CTARGET} tc-export CC LD CXX RANLIB
- mymakeopts="${mymakeopts} NLS="
- CFLAGS="${CFLAGS} -isystem /usr/${CTARGET}/usr/include"
- append-ldflags "-L${WORKDIR}/${CHOST}/${WORKDIR}/lib/libc"
- fi
-
- if is_crosscompile ; then
- do_compile
- else
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
- multibuild_foreach_variant freebsd_multilib_multibuild_wrapper do_compile
- fi
-}
-
-gen_libc_ldscript() {
- # Parameters:
- # $1 = target libdir
- # $2 = source libc dir
- # $3 = source libssp_nonshared dir
-
- # Clear the symlink.
- rm -f "${D}/$2/libc.so" || die
-
- # Move the library if needed
- if [ "$1" != "$2" ] ; then
- mv "${D}/$2/libc.so.7" "${D}/$1/" || die
- fi
-
- # 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} )"
-
- cat > "${D}/$2/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 ( /$1/libc.so.7 /$3/libssp_nonshared.a )
-END_LDSCRIPT
-}
-
-header_list=""
-
-move_header() {
- local dirname=$(dirname ${1})
- local filename=$(basename ${1})
-
- if [ ! -d "${dirname}/${ABI}" ] ; then
- mkdir "${dirname}/${ABI}" || die
- fi
-
- mv "${1}" "${dirname}/${ABI}/" || die
-
- export header_list="${header_list} ${1}"
-}
-
-make_header_template() {
- cat <<-END_HEADER
-/*
- * Wrapped header for multilib support.
- * See the real headers included below.
- */
-
-#if defined(__x86_64__)
- @ABI_amd64_fbsd@
-#elif defined(__i386__)
- @ABI_x86_fbsd@
-#else
- @ABI_${DEFAULT_ABI}@
-#endif
-END_HEADER
-}
-
-wrap_header() {
- local dirname=$(dirname ${1})
- local filename=$(basename ${1})
-
- if [ -n "${dirname#.}" ] ; then
- dirname="${dirname}/${2}"
- else
- dirname="${2}"
- fi
-
- if [ -f "${dirname}/${filename}" ] ; then
- sed -e "s:@ABI_${2}@:#include <${dirname}/${filename}>:" ${1}
- else
- cat ${1}
- fi
-}
-
-wrap_header_end() {
- sed -e "s:@ABI_.*@:#error \"Sorry, no support for your ABI.\":" ${1}
-}
-
-do_install() {
- if is_crosscompile ; then
- INCLUDEDIR="/usr/${CTARGET}/usr/include"
- else
- INCLUDEDIR="/usr/include"
- fi
-
- dodir ${INCLUDEDIR}
- CTARGET="${CHOST}" \
- install_includes ${INCLUDEDIR}
-
- is_crosscompile && use crosscompile_opts_headers-only && return 0
-
- for i in $(get_subdirs) ; do
- einfo "Installing in ${i}..."
- cd "${WORKDIR}/${i}/" || die "missing ${i}."
- freebsd_src_install || die "Install ${i} failed"
- done
-
- if ! is_crosscompile ; then
- if ! multilib_is_native_abi ; then
- gen_libc_ldscript "usr/$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)"
- else
- dodir "$(get_libdir)"
- gen_libc_ldscript "$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)"
- fi
- else
- CHOST=${CTARGET} gen_libc_ldscript "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib"
- # We're done for the cross libc here.
- return 0
- fi
-
- # Install a libusb.pc for better compat with Linux's libusb
- if use usb ; then
- dodir /usr/$(get_libdir)/pkgconfig
- sed -e "s:@LIBDIR@:/usr/$(get_libdir):" "${FILESDIR}/libusb.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/libusb.pc" || die
- sed -e "s:@LIBDIR@:/usr/$(get_libdir):" "${FILESDIR}/libusb-1.0.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/libusb-1.0.pc" || die
- fi
-
- # Generate ldscripts for core libraries that will go in /
- multilib_is_native_abi && \
- gen_usr_ldscript -a alias cam geom ipsec jail kiconv \
- kvm m md procstat sbuf thr ufs util elf
-
- if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]] ; then
- cd "${D}/usr/include"
- for i in machine/*.h fenv.h ; do
- move_header ${i}
- done
- if multilib_is_native_abi ; then
- # Supposedly the last one!
- local uniq_headers="$(echo ${header_list} | tr ' ' '\n' | sort | uniq | tr '\n' ' ')"
- for j in ${uniq_headers} ; do
- make_header_template > ${j}
- for i in $(get_all_abis) ; do
- wrap_header ${j} ${i} > ${j}.new
- cp ${j}.new ${j}
- rm -f ${j}.new
- done
- wrap_header_end ${j} > ${j}.new
- cp ${j}.new ${j}
- rm -f ${j}.new
- done
- fi
- fi
-}
-
-src_install() {
- if is_crosscompile ; then
- einfo "Installing for ${CTARGET} in ${CHOST}.."
- # From this point we need to force: get stripped with the correct tools,
- # get tc-arch-kernel to return the right value, etc.
- export CHOST=${CTARGET}
-
- mymakeopts="${mymakeopts} NO_MAN= \
- INCLUDEDIR=/usr/${CTARGET}/usr/include \
- SHLIBDIR=/usr/${CTARGET}/usr/lib \
- LIBDIR=/usr/${CTARGET}/usr/lib"
-
- dosym "usr/include" "/usr/${CTARGET}/sys-include"
- do_install
-
- return 0
- else
- export STRIP_MASK="*/usr/lib*/*crt*.o"
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
- multibuild_foreach_variant freebsd_multilib_multibuild_wrapper do_install
- fi
-
- cd "${WORKDIR}/etc/"
- insinto /etc
- doins nls.alias mac.conf netconfig
-
- # Install ttys file
- local MACHINE="$(tc-arch-kernel)"
- doins "etc.${MACHINE}"/*
-}
-
-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
-
- # Must exist before we use it.
- [[ -d "${DESTDIR}${INCLUDEDIR}" ]] || die "dodir or mkdir ${INCLUDEDIR} before using install_includes."
- cd "${WORKDIR}/include"
-
- local MACHINE="$(tc-arch-kernel)"
-
- einfo "Installing includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
- $(freebsd_get_bmake) installincludes \
- MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
- DESTDIR="${DESTDIR}" \
- INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
- BINGRP="${BINGRP}" || die "install_includes() failed"
- einfo "includes installed ok."
- EXTRA_INCLUDES="lib/librtld_db lib/libutil lib/msun gnu/lib/libregex"
- for i in $EXTRA_INCLUDES; do
- einfo "Installing $i includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
- cd "${WORKDIR}/$i" || die
- $(freebsd_get_bmake) installincludes DESTDIR="${DESTDIR}" \
- MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
- INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
- BINGRP="${BINGRP}" || die "problem installing $i includes."
- einfo "$i includes installed ok."
- done
-}
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.2_rc2.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.2_rc2.ebuild
deleted file mode 100644
index a56f00f75313..000000000000
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.2_rc2.ebuild
+++ /dev/null
@@ -1,601 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.2_rc2.ebuild,v 1.2 2014/03/24 17:49:33 ssuominen Exp $
-
-EAPI=5
-
-inherit bsdmk freebsd flag-o-matic multilib toolchain-funcs eutils multibuild multilib-build
-
-DESCRIPTION="FreeBSD's base system libraries"
-SLOT="0"
-
-# 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
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
- 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
- mirror://gentoo/${SECURE}.tar.bz2
- build? ( mirror://gentoo/${SYS}.tar.bz2 )
- zfs? ( mirror://gentoo/${CDDL}.tar.bz2 )"
-fi
-
-if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then
- RDEPEND="ssl? ( dev-libs/openssl )
- hesiod? ( net-dns/hesiod )
- kerberos? ( app-crypt/heimdal )
- usb? ( !dev-libs/libusb )
- zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )
- >=dev-libs/expat-2.0.1
- !sys-libs/libutempter
- !dev-libs/libelf
- !sys-freebsd/freebsd-headers"
- DEPEND="${RDEPEND}
- >=sys-devel/flex-2.5.31-r2
- =sys-freebsd/freebsd-sources-${RV}*"
-else
- SRC_URI="${SRC_URI}
- mirror://gentoo/${SYS}.tar.bz2"
-fi
-
-DEPEND="${DEPEND}
- userland_GNU? ( sys-apps/mtree )
- =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 crosscompile_opts_headers-only zfs
- userland_GNU userland_BSD"
-
-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= WITHOUT_GSSAPI= "
- use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
- use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
- use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
- use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-
- mymakeopts="${mymakeopts} WITHOUT_BIND= WITHOUT_BIND_LIBS= WITHOUT_SENDMAIL= WITHOUT_CLANG= WITHOUT_LIBCPLUSPLUS= "
-
- if [ "${CTARGET}" != "${CHOST}" ]; then
- mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})"
- mymakeopts="${mymakeopts} MACHINE_ARCH=$(tc-arch-kernel ${CTARGET})"
- fi
-}
-
-PATCHES=(
- "${FILESDIR}/${PN}-6.0-pmc.patch"
- "${FILESDIR}/${PN}-6.1-csu.patch"
- "${FILESDIR}/${PN}-9.2-liblink.patch"
- "${FILESDIR}/${PN}-bsdxml2expat.patch"
- "${FILESDIR}/${PN}-9.0-netware.patch"
- "${FILESDIR}/${PN}-9.0-bluetooth.patch"
- "${FILESDIR}/${PN}-9.1-.eh_frame_hdr-fix.patch"
- )
-
-# Here we disable and remove source which we don't need or want
-# In order:
-# - ncurses stuff
-# - libexpat creates a bsdxml library which is the same as expat
-# - archiving libraries (have their own ebuild)
-# - sendmail libraries (they are installed by sendmail)
-# - SNMP library and dependency (have their own ebuilds)
-# - libstand: static library, 32bits on amd64 used for boot0, we build it from
-# boot0 instead.
-#
-# The rest are libraries we already have somewhere else because
-# they are contribution.
-REMOVE_SUBDIRS="ncurses \
- libexpat \
- libz libbz2 libarchive liblzma \
- libsm libsmdb libsmutil \
- libbegemot libbsnmp \
- libpam libpcap bind libwrap libmagic \
- libcom_err
- libedit
- libstand
- libgssapi"
-
-# Are we building a cross-compiler?
-is_crosscompile() {
- [ "${CATEGORY#*cross-}" != "${CATEGORY}" ]
-}
-
-src_prepare() {
- sed -i.bak -e 's:-o/dev/stdout:-t:' "${S}/libc/net/Makefile.inc"
-
- # 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"
- epatch "${FILESDIR}/${PN}-8.0-gcc45.patch"
- epatch "${FILESDIR}/${PN}-9.0-opieincludes.patch"
- epatch "${FILESDIR}/${PN}-9.1-rmgssapi.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 libprocstat libulog; do sed -i.bak -e 's:LDADD=:LDADD+=:g' "${dir}/Makefile" || \
- die "Problem fixing \"${dir}/Makefile"
- done
- # Call LD with LDFLAGS, rename them to RAW_LDFLAGS
- sed -e 's/LDFLAGS/RAW_LDFLAGS/g' \
- -i "${S}/csu/i386-elf/Makefile" \
- -i "${S}/csu/ia64/Makefile" || die
- 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
- epatch "${FILESDIR}"/freebsd-sources-9.0-sysctluint.patch
- return 0
- fi
-
- if ! is_crosscompile ; then
- ln -s "/usr/src/sys" "${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
-
- # Try to fix sed calls for GNU sed. Do it only with GNU userland and force
- # BSD's sed on BSD.
- cd "${S}"
- if use userland_GNU; then
- find . -name Makefile -exec sed -ibak 's/sed -i /sed -i/' {} \;
- fi
-}
-
-bootstrap_lib() {
- for i ; do
- cd "${WORKDIR}/${i}" || die "missing ${i}"
- freebsd_src_compile
- append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/${i}"
- done
-}
-
-get_csudir() {
- if [ -d "${WORKDIR}/lib/csu/$1-elf" ]; then
- echo "lib/csu/$1-elf"
- else
- echo "lib/csu/$1"
- fi
-}
-
-bootstrap_csu() {
- local csudir="$(get_csudir $(tc-arch-kernel ${CTARGET}))"
- export RAW_LDFLAGS=$(raw-ldflags)
- bootstrap_lib "${csudir}"
-
- CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
- append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
-
- bootstrap_lib "gnu/lib/csu"
-
- cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu"
- for i in *.So ; do
- ln -s $i ${i%.So}S.o
- done
- CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu"
- append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu"
-}
-
-# Compile libssp_nonshared.a and add it's path to LDFLAGS.
-bootstrap_libssp_nonshared() {
- bootstrap_lib "gnu/lib/libssp/libssp_nonshared"
- export LDADD="-lssp_nonshared"
-}
-
-bootstrap_libgcc() {
- bootstrap_lib "lib/libcompiler_rt"
- cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libcompiler_rt" || die
- ln -s libcompiler_rt.a libgcc.a || die
-
- bootstrap_lib "lib/libc" "gnu/lib/libgcc"
-}
-
-bootstrap_libthr() {
- bootstrap_lib "lib/libthr"
- cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libthr" || die
- ln -s libthr.so libpthread.so
-}
-
-# What to build for a cross-compiler.
-# We also need the csu but this has to be handled separately.
-CROSS_SUBDIRS="lib/libc lib/msun gnu/lib/libssp/libssp_nonshared lib/libthr lib/libutil lib/librt"
-
-# What to build for non-default ABIs.
-NON_NATIVE_SUBDIRS="${CROSS_SUBDIRS} gnu/lib/csu lib/libcompiler_rt gnu/lib/libgcc lib/libmd lib/libcrypt lib/libsbuf lib/libcam lib/libelf"
-
-# Subdirs for a native build:
-NATIVE_SUBDIRS="lib gnu/lib/libssp/libssp_nonshared gnu/lib/libregex gnu/lib/csu gnu/lib/libgcc"
-
-# Is my $ABI native ?
-is_native_abi() {
- is_crosscompile && return 1
- multilib_is_native_abi
-}
-
-# Do we need to bootstrap the csu and libssp_nonshared?
-need_bootstrap() {
- is_crosscompile || use build || { ! is_native_abi && ! has_version '>=sys-freebsd/freebsd-lib-9.1-r8[multilib]' && ! has_version ">=sys-freebsd/freebsd-lib-9.1-r11[${MULTILIB_USEDEP}]" ; } || has_version "<${CATEGORY}/${P}"
-}
-
-# Get the subdirs we are building.
-get_subdirs() {
- local ret=""
- if is_native_abi ; then
- # If we are building for the native ABI, build everything
- ret="${NATIVE_SUBDIRS}"
- elif is_crosscompile ; then
- # With a cross-compiler we only build the very core parts.
- ret="${CROSS_SUBDIRS}"
- if [ "${EBUILD_PHASE}" = "install" ]; then
- # Add the csu dir first when installing. We treat it separately for
- # compiling.
- ret="$(get_csudir $(tc-arch-kernel ${CTARGET})) ${ret}"
- fi
- else
- # For the non-native ABIs we only build the csu parts and very core
- # libraries for now.
- ret="${NON_NATIVE_SUBDIRS} $(get_csudir $(tc-arch-kernel ${CHOST}))"
- fi
- echo "${ret}"
-}
-
-# Bootstrap the core libraries and setup the flags so that the other parts can
-# build against it.
-do_bootstrap() {
- einfo "Bootstrapping on ${CHOST} for ${CTARGET}"
- if ! is_crosscompile ; then
- # Pre-install headers, but not when building a cross-compiler since we
- # assume they have been installed in the previous pass.
- einfo "Pre-installing includes in include_proper_${ABI}"
- mkdir "${WORKDIR}/include_proper_${ABI}" || die
- CTARGET="${CHOST}" install_includes "/include_proper_${ABI}"
- CFLAGS="${CFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}"
- fi
- bootstrap_csu
- bootstrap_libssp_nonshared
- is_crosscompile && bootstrap_lib "lib/libc"
- is_crosscompile || is_native_abi || bootstrap_libgcc
- is_native_abi || bootstrap_libthr
-}
-
-# Compile it. Assume we have the toolchain setup correctly.
-do_compile() {
- # Bootstrap if needed, otherwise assume the system headers are in
- # /usr/include.
- if need_bootstrap ; then
- do_bootstrap
- else
- CFLAGS="${CFLAGS} -isystem /usr/include"
- fi
-
- export RAW_LDFLAGS=$(raw-ldflags)
-
- # Everything is now setup, build it!
- for i in $(get_subdirs) ; do
- einfo "Building in ${i}... with CC=${CC} and CFLAGS=${CFLAGS}"
- cd "${WORKDIR}/${i}/" || die "missing ${i}."
- freebsd_src_compile || die "make ${i} failed"
- done
-}
-
-src_compile() {
- # Does not work with GNU sed
- # Force BSD's sed on BSD.
- if use userland_BSD ; then
- export ESED=/usr/bin/sed
- unalias sed
- fi
-
- use usb && export NON_NATIVE_SUBDIRS="${NON_NATIVE_SUBDIRS} lib/libusb lib/libusbhid"
-
- 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)
-
- # Bug #324445
- append-flags $(test-flags -fno-strict-overflow)
-
- # strip flags and do not do it later, we only add safe, and in fact
- # needed flags after all
- strip-flags
- export NOFLAGSTRIP=yes
- if is_crosscompile ; then
- export YACC='yacc -by'
- CHOST=${CTARGET} tc-export CC LD CXX RANLIB
- mymakeopts="${mymakeopts} NLS="
- CFLAGS="${CFLAGS} -isystem /usr/${CTARGET}/usr/include"
- append-ldflags "-L${WORKDIR}/${CHOST}/${WORKDIR}/lib/libc"
- fi
-
- if is_crosscompile ; then
- do_compile
- else
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
- multibuild_foreach_variant freebsd_multilib_multibuild_wrapper do_compile
- fi
-}
-
-gen_libc_ldscript() {
- # Parameters:
- # $1 = target libdir
- # $2 = source libc dir
- # $3 = source libssp_nonshared dir
-
- # Clear the symlink.
- rm -f "${D}/$2/libc.so" || die
-
- # Move the library if needed
- if [ "$1" != "$2" ] ; then
- mv "${D}/$2/libc.so.7" "${D}/$1/" || die
- fi
-
- # 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} )"
-
- cat > "${D}/$2/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 ( /$1/libc.so.7 /$3/libssp_nonshared.a )
-END_LDSCRIPT
-}
-
-header_list=""
-
-move_header() {
- local dirname=$(dirname ${1})
- local filename=$(basename ${1})
-
- if [ ! -d "${dirname}/${ABI}" ] ; then
- mkdir "${dirname}/${ABI}" || die
- fi
-
- mv "${1}" "${dirname}/${ABI}/" || die
-
- export header_list="${header_list} ${1}"
-}
-
-make_header_template() {
- cat <<-END_HEADER
-/*
- * Wrapped header for multilib support.
- * See the real headers included below.
- */
-
-#if defined(__x86_64__)
- @ABI_amd64_fbsd@
-#elif defined(__i386__)
- @ABI_x86_fbsd@
-#else
- @ABI_${DEFAULT_ABI}@
-#endif
-END_HEADER
-}
-
-wrap_header() {
- local dirname=$(dirname ${1})
- local filename=$(basename ${1})
-
- if [ -n "${dirname#.}" ] ; then
- dirname="${dirname}/${2}"
- else
- dirname="${2}"
- fi
-
- if [ -f "${dirname}/${filename}" ] ; then
- sed -e "s:@ABI_${2}@:#include <${dirname}/${filename}>:" ${1}
- else
- cat ${1}
- fi
-}
-
-wrap_header_end() {
- sed -e "s:@ABI_.*@:#error \"Sorry, no support for your ABI.\":" ${1}
-}
-
-do_install() {
- if is_crosscompile ; then
- INCLUDEDIR="/usr/${CTARGET}/usr/include"
- else
- INCLUDEDIR="/usr/include"
- fi
-
- dodir ${INCLUDEDIR}
- CTARGET="${CHOST}" \
- install_includes ${INCLUDEDIR}
-
- is_crosscompile && use crosscompile_opts_headers-only && return 0
-
- for i in $(get_subdirs) ; do
- einfo "Installing in ${i}..."
- cd "${WORKDIR}/${i}/" || die "missing ${i}."
- freebsd_src_install || die "Install ${i} failed"
- done
-
- if ! is_crosscompile ; then
- if ! multilib_is_native_abi ; then
- gen_libc_ldscript "usr/$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)"
- else
- dodir "$(get_libdir)"
- gen_libc_ldscript "$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)"
- fi
- else
- CHOST=${CTARGET} gen_libc_ldscript "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib"
- # We're done for the cross libc here.
- return 0
- fi
-
- # Install a libusb.pc for better compat with Linux's libusb
- if use usb ; then
- dodir /usr/$(get_libdir)/pkgconfig
- sed -e "s:@LIBDIR@:/usr/$(get_libdir):" "${FILESDIR}/libusb.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/libusb.pc" || die
- sed -e "s:@LIBDIR@:/usr/$(get_libdir):" "${FILESDIR}/libusb-1.0.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/libusb-1.0.pc" || die
- fi
-
- # Generate ldscripts for core libraries that will go in /
- multilib_is_native_abi && \
- gen_usr_ldscript -a alias cam geom ipsec jail kiconv \
- kvm m md procstat sbuf thr ufs util elf
-
- if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]] ; then
- cd "${D}/usr/include"
- for i in machine/*.h fenv.h ; do
- move_header ${i}
- done
- if multilib_is_native_abi ; then
- # Supposedly the last one!
- local uniq_headers="$(echo ${header_list} | tr ' ' '\n' | sort | uniq | tr '\n' ' ')"
- for j in ${uniq_headers} ; do
- make_header_template > ${j}
- for i in $(get_all_abis) ; do
- wrap_header ${j} ${i} > ${j}.new
- cp ${j}.new ${j}
- rm -f ${j}.new
- done
- wrap_header_end ${j} > ${j}.new
- cp ${j}.new ${j}
- rm -f ${j}.new
- done
- fi
- fi
-}
-
-src_install() {
- if is_crosscompile ; then
- einfo "Installing for ${CTARGET} in ${CHOST}.."
- # From this point we need to force: get stripped with the correct tools,
- # get tc-arch-kernel to return the right value, etc.
- export CHOST=${CTARGET}
-
- mymakeopts="${mymakeopts} NO_MAN= \
- INCLUDEDIR=/usr/${CTARGET}/usr/include \
- SHLIBDIR=/usr/${CTARGET}/usr/lib \
- LIBDIR=/usr/${CTARGET}/usr/lib"
-
- dosym "usr/include" "/usr/${CTARGET}/sys-include"
- do_install
-
- return 0
- else
- export STRIP_MASK="*/usr/lib*/*crt*.o"
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
- multibuild_foreach_variant freebsd_multilib_multibuild_wrapper do_install
- fi
-
- cd "${WORKDIR}/etc/"
- insinto /etc
- doins nls.alias mac.conf netconfig
-
- # Install ttys file
- local MACHINE="$(tc-arch-kernel)"
- doins "etc.${MACHINE}"/*
-}
-
-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
-
- # Must exist before we use it.
- [[ -d "${DESTDIR}${INCLUDEDIR}" ]] || die "dodir or mkdir ${INCLUDEDIR} before using install_includes."
- cd "${WORKDIR}/include"
-
- local MACHINE="$(tc-arch-kernel)"
-
- einfo "Installing includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
- $(freebsd_get_bmake) installincludes \
- MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
- DESTDIR="${DESTDIR}" \
- INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
- BINGRP="${BINGRP}" || die "install_includes() failed"
- einfo "includes installed ok."
- EXTRA_INCLUDES="lib/librtld_db lib/libutil lib/msun gnu/lib/libregex"
- for i in $EXTRA_INCLUDES; do
- einfo "Installing $i includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
- cd "${WORKDIR}/$i" || die
- $(freebsd_get_bmake) installincludes DESTDIR="${DESTDIR}" \
- MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
- INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
- BINGRP="${BINGRP}" || die "problem installing $i includes."
- einfo "$i includes installed ok."
- done
-}
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.2_rc3.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.2_rc3.ebuild
deleted file mode 100644
index f688cf1feb51..000000000000
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.2_rc3.ebuild
+++ /dev/null
@@ -1,601 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.2_rc3.ebuild,v 1.2 2014/03/24 17:49:33 ssuominen Exp $
-
-EAPI=5
-
-inherit bsdmk freebsd flag-o-matic multilib toolchain-funcs eutils multibuild multilib-build
-
-DESCRIPTION="FreeBSD's base system libraries"
-SLOT="0"
-
-# 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
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
- 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
- mirror://gentoo/${SECURE}.tar.bz2
- build? ( mirror://gentoo/${SYS}.tar.bz2 )
- zfs? ( mirror://gentoo/${CDDL}.tar.bz2 )"
-fi
-
-if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then
- RDEPEND="ssl? ( dev-libs/openssl )
- hesiod? ( net-dns/hesiod )
- kerberos? ( app-crypt/heimdal )
- usb? ( !dev-libs/libusb )
- zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )
- >=dev-libs/expat-2.0.1
- !sys-libs/libutempter
- !dev-libs/libelf
- !sys-freebsd/freebsd-headers"
- DEPEND="${RDEPEND}
- >=sys-devel/flex-2.5.31-r2
- =sys-freebsd/freebsd-sources-${RV}*"
-else
- SRC_URI="${SRC_URI}
- mirror://gentoo/${SYS}.tar.bz2"
-fi
-
-DEPEND="${DEPEND}
- userland_GNU? ( sys-apps/mtree )
- =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 crosscompile_opts_headers-only zfs
- userland_GNU userland_BSD"
-
-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= WITHOUT_GSSAPI= "
- use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
- use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
- use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
- use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-
- mymakeopts="${mymakeopts} WITHOUT_BIND= WITHOUT_BIND_LIBS= WITHOUT_SENDMAIL= WITHOUT_CLANG= WITHOUT_LIBCPLUSPLUS= "
-
- if [ "${CTARGET}" != "${CHOST}" ]; then
- mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})"
- mymakeopts="${mymakeopts} MACHINE_ARCH=$(tc-arch-kernel ${CTARGET})"
- fi
-}
-
-PATCHES=(
- "${FILESDIR}/${PN}-6.0-pmc.patch"
- "${FILESDIR}/${PN}-6.1-csu.patch"
- "${FILESDIR}/${PN}-9.2-liblink.patch"
- "${FILESDIR}/${PN}-bsdxml2expat.patch"
- "${FILESDIR}/${PN}-9.0-netware.patch"
- "${FILESDIR}/${PN}-9.0-bluetooth.patch"
- "${FILESDIR}/${PN}-9.1-.eh_frame_hdr-fix.patch"
- )
-
-# Here we disable and remove source which we don't need or want
-# In order:
-# - ncurses stuff
-# - libexpat creates a bsdxml library which is the same as expat
-# - archiving libraries (have their own ebuild)
-# - sendmail libraries (they are installed by sendmail)
-# - SNMP library and dependency (have their own ebuilds)
-# - libstand: static library, 32bits on amd64 used for boot0, we build it from
-# boot0 instead.
-#
-# The rest are libraries we already have somewhere else because
-# they are contribution.
-REMOVE_SUBDIRS="ncurses \
- libexpat \
- libz libbz2 libarchive liblzma \
- libsm libsmdb libsmutil \
- libbegemot libbsnmp \
- libpam libpcap bind libwrap libmagic \
- libcom_err
- libedit
- libstand
- libgssapi"
-
-# Are we building a cross-compiler?
-is_crosscompile() {
- [ "${CATEGORY#*cross-}" != "${CATEGORY}" ]
-}
-
-src_prepare() {
- sed -i.bak -e 's:-o/dev/stdout:-t:' "${S}/libc/net/Makefile.inc"
-
- # 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"
- epatch "${FILESDIR}/${PN}-8.0-gcc45.patch"
- epatch "${FILESDIR}/${PN}-9.0-opieincludes.patch"
- epatch "${FILESDIR}/${PN}-9.1-rmgssapi.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 libprocstat libulog; do sed -i.bak -e 's:LDADD=:LDADD+=:g' "${dir}/Makefile" || \
- die "Problem fixing \"${dir}/Makefile"
- done
- # Call LD with LDFLAGS, rename them to RAW_LDFLAGS
- sed -e 's/LDFLAGS/RAW_LDFLAGS/g' \
- -i "${S}/csu/i386-elf/Makefile" \
- -i "${S}/csu/ia64/Makefile" || die
- 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
- epatch "${FILESDIR}"/freebsd-sources-9.0-sysctluint.patch
- return 0
- fi
-
- if ! is_crosscompile ; then
- ln -s "/usr/src/sys" "${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
-
- # Try to fix sed calls for GNU sed. Do it only with GNU userland and force
- # BSD's sed on BSD.
- cd "${S}"
- if use userland_GNU; then
- find . -name Makefile -exec sed -ibak 's/sed -i /sed -i/' {} \;
- fi
-}
-
-bootstrap_lib() {
- for i ; do
- cd "${WORKDIR}/${i}" || die "missing ${i}"
- freebsd_src_compile
- append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/${i}"
- done
-}
-
-get_csudir() {
- if [ -d "${WORKDIR}/lib/csu/$1-elf" ]; then
- echo "lib/csu/$1-elf"
- else
- echo "lib/csu/$1"
- fi
-}
-
-bootstrap_csu() {
- local csudir="$(get_csudir $(tc-arch-kernel ${CTARGET}))"
- export RAW_LDFLAGS=$(raw-ldflags)
- bootstrap_lib "${csudir}"
-
- CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
- append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
-
- bootstrap_lib "gnu/lib/csu"
-
- cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu"
- for i in *.So ; do
- ln -s $i ${i%.So}S.o
- done
- CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu"
- append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu"
-}
-
-# Compile libssp_nonshared.a and add it's path to LDFLAGS.
-bootstrap_libssp_nonshared() {
- bootstrap_lib "gnu/lib/libssp/libssp_nonshared"
- export LDADD="-lssp_nonshared"
-}
-
-bootstrap_libgcc() {
- bootstrap_lib "lib/libcompiler_rt"
- cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libcompiler_rt" || die
- ln -s libcompiler_rt.a libgcc.a || die
-
- bootstrap_lib "lib/libc" "gnu/lib/libgcc"
-}
-
-bootstrap_libthr() {
- bootstrap_lib "lib/libthr"
- cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libthr" || die
- ln -s libthr.so libpthread.so
-}
-
-# What to build for a cross-compiler.
-# We also need the csu but this has to be handled separately.
-CROSS_SUBDIRS="lib/libc lib/msun gnu/lib/libssp/libssp_nonshared lib/libthr lib/libutil lib/librt"
-
-# What to build for non-default ABIs.
-NON_NATIVE_SUBDIRS="${CROSS_SUBDIRS} gnu/lib/csu lib/libcompiler_rt gnu/lib/libgcc lib/libmd lib/libcrypt lib/libsbuf lib/libcam lib/libelf"
-
-# Subdirs for a native build:
-NATIVE_SUBDIRS="lib gnu/lib/libssp/libssp_nonshared gnu/lib/libregex gnu/lib/csu gnu/lib/libgcc"
-
-# Is my $ABI native ?
-is_native_abi() {
- is_crosscompile && return 1
- multilib_is_native_abi
-}
-
-# Do we need to bootstrap the csu and libssp_nonshared?
-need_bootstrap() {
- is_crosscompile || use build || { ! is_native_abi && ! has_version '>=sys-freebsd/freebsd-lib-9.1-r8[multilib]' && ! has_version ">=sys-freebsd/freebsd-lib-9.1-r11[${MULTILIB_USEDEP}]" ; } || has_version "<${CATEGORY}/${P}"
-}
-
-# Get the subdirs we are building.
-get_subdirs() {
- local ret=""
- if is_native_abi ; then
- # If we are building for the native ABI, build everything
- ret="${NATIVE_SUBDIRS}"
- elif is_crosscompile ; then
- # With a cross-compiler we only build the very core parts.
- ret="${CROSS_SUBDIRS}"
- if [ "${EBUILD_PHASE}" = "install" ]; then
- # Add the csu dir first when installing. We treat it separately for
- # compiling.
- ret="$(get_csudir $(tc-arch-kernel ${CTARGET})) ${ret}"
- fi
- else
- # For the non-native ABIs we only build the csu parts and very core
- # libraries for now.
- ret="${NON_NATIVE_SUBDIRS} $(get_csudir $(tc-arch-kernel ${CHOST}))"
- fi
- echo "${ret}"
-}
-
-# Bootstrap the core libraries and setup the flags so that the other parts can
-# build against it.
-do_bootstrap() {
- einfo "Bootstrapping on ${CHOST} for ${CTARGET}"
- if ! is_crosscompile ; then
- # Pre-install headers, but not when building a cross-compiler since we
- # assume they have been installed in the previous pass.
- einfo "Pre-installing includes in include_proper_${ABI}"
- mkdir "${WORKDIR}/include_proper_${ABI}" || die
- CTARGET="${CHOST}" install_includes "/include_proper_${ABI}"
- CFLAGS="${CFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}"
- fi
- bootstrap_csu
- bootstrap_libssp_nonshared
- is_crosscompile && bootstrap_lib "lib/libc"
- is_crosscompile || is_native_abi || bootstrap_libgcc
- is_native_abi || bootstrap_libthr
-}
-
-# Compile it. Assume we have the toolchain setup correctly.
-do_compile() {
- # Bootstrap if needed, otherwise assume the system headers are in
- # /usr/include.
- if need_bootstrap ; then
- do_bootstrap
- else
- CFLAGS="${CFLAGS} -isystem /usr/include"
- fi
-
- export RAW_LDFLAGS=$(raw-ldflags)
-
- # Everything is now setup, build it!
- for i in $(get_subdirs) ; do
- einfo "Building in ${i}... with CC=${CC} and CFLAGS=${CFLAGS}"
- cd "${WORKDIR}/${i}/" || die "missing ${i}."
- freebsd_src_compile || die "make ${i} failed"
- done
-}
-
-src_compile() {
- # Does not work with GNU sed
- # Force BSD's sed on BSD.
- if use userland_BSD ; then
- export ESED=/usr/bin/sed
- unalias sed
- fi
-
- use usb && export NON_NATIVE_SUBDIRS="${NON_NATIVE_SUBDIRS} lib/libusb lib/libusbhid"
-
- 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)
-
- # Bug #324445
- append-flags $(test-flags -fno-strict-overflow)
-
- # strip flags and do not do it later, we only add safe, and in fact
- # needed flags after all
- strip-flags
- export NOFLAGSTRIP=yes
- if is_crosscompile ; then
- export YACC='yacc -by'
- CHOST=${CTARGET} tc-export CC LD CXX RANLIB
- mymakeopts="${mymakeopts} NLS="
- CFLAGS="${CFLAGS} -isystem /usr/${CTARGET}/usr/include"
- append-ldflags "-L${WORKDIR}/${CHOST}/${WORKDIR}/lib/libc"
- fi
-
- if is_crosscompile ; then
- do_compile
- else
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
- multibuild_foreach_variant freebsd_multilib_multibuild_wrapper do_compile
- fi
-}
-
-gen_libc_ldscript() {
- # Parameters:
- # $1 = target libdir
- # $2 = source libc dir
- # $3 = source libssp_nonshared dir
-
- # Clear the symlink.
- rm -f "${D}/$2/libc.so" || die
-
- # Move the library if needed
- if [ "$1" != "$2" ] ; then
- mv "${D}/$2/libc.so.7" "${D}/$1/" || die
- fi
-
- # 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} )"
-
- cat > "${D}/$2/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 ( /$1/libc.so.7 /$3/libssp_nonshared.a )
-END_LDSCRIPT
-}
-
-header_list=""
-
-move_header() {
- local dirname=$(dirname ${1})
- local filename=$(basename ${1})
-
- if [ ! -d "${dirname}/${ABI}" ] ; then
- mkdir "${dirname}/${ABI}" || die
- fi
-
- mv "${1}" "${dirname}/${ABI}/" || die
-
- export header_list="${header_list} ${1}"
-}
-
-make_header_template() {
- cat <<-END_HEADER
-/*
- * Wrapped header for multilib support.
- * See the real headers included below.
- */
-
-#if defined(__x86_64__)
- @ABI_amd64_fbsd@
-#elif defined(__i386__)
- @ABI_x86_fbsd@
-#else
- @ABI_${DEFAULT_ABI}@
-#endif
-END_HEADER
-}
-
-wrap_header() {
- local dirname=$(dirname ${1})
- local filename=$(basename ${1})
-
- if [ -n "${dirname#.}" ] ; then
- dirname="${dirname}/${2}"
- else
- dirname="${2}"
- fi
-
- if [ -f "${dirname}/${filename}" ] ; then
- sed -e "s:@ABI_${2}@:#include <${dirname}/${filename}>:" ${1}
- else
- cat ${1}
- fi
-}
-
-wrap_header_end() {
- sed -e "s:@ABI_.*@:#error \"Sorry, no support for your ABI.\":" ${1}
-}
-
-do_install() {
- if is_crosscompile ; then
- INCLUDEDIR="/usr/${CTARGET}/usr/include"
- else
- INCLUDEDIR="/usr/include"
- fi
-
- dodir ${INCLUDEDIR}
- CTARGET="${CHOST}" \
- install_includes ${INCLUDEDIR}
-
- is_crosscompile && use crosscompile_opts_headers-only && return 0
-
- for i in $(get_subdirs) ; do
- einfo "Installing in ${i}..."
- cd "${WORKDIR}/${i}/" || die "missing ${i}."
- freebsd_src_install || die "Install ${i} failed"
- done
-
- if ! is_crosscompile ; then
- if ! multilib_is_native_abi ; then
- gen_libc_ldscript "usr/$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)"
- else
- dodir "$(get_libdir)"
- gen_libc_ldscript "$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)"
- fi
- else
- CHOST=${CTARGET} gen_libc_ldscript "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib"
- # We're done for the cross libc here.
- return 0
- fi
-
- # Install a libusb.pc for better compat with Linux's libusb
- if use usb ; then
- dodir /usr/$(get_libdir)/pkgconfig
- sed -e "s:@LIBDIR@:/usr/$(get_libdir):" "${FILESDIR}/libusb.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/libusb.pc" || die
- sed -e "s:@LIBDIR@:/usr/$(get_libdir):" "${FILESDIR}/libusb-1.0.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/libusb-1.0.pc" || die
- fi
-
- # Generate ldscripts for core libraries that will go in /
- multilib_is_native_abi && \
- gen_usr_ldscript -a alias cam geom ipsec jail kiconv \
- kvm m md procstat sbuf thr ufs util elf
-
- if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]] ; then
- cd "${D}/usr/include"
- for i in machine/*.h fenv.h ; do
- move_header ${i}
- done
- if multilib_is_native_abi ; then
- # Supposedly the last one!
- local uniq_headers="$(echo ${header_list} | tr ' ' '\n' | sort | uniq | tr '\n' ' ')"
- for j in ${uniq_headers} ; do
- make_header_template > ${j}
- for i in $(get_all_abis) ; do
- wrap_header ${j} ${i} > ${j}.new
- cp ${j}.new ${j}
- rm -f ${j}.new
- done
- wrap_header_end ${j} > ${j}.new
- cp ${j}.new ${j}
- rm -f ${j}.new
- done
- fi
- fi
-}
-
-src_install() {
- if is_crosscompile ; then
- einfo "Installing for ${CTARGET} in ${CHOST}.."
- # From this point we need to force: get stripped with the correct tools,
- # get tc-arch-kernel to return the right value, etc.
- export CHOST=${CTARGET}
-
- mymakeopts="${mymakeopts} NO_MAN= \
- INCLUDEDIR=/usr/${CTARGET}/usr/include \
- SHLIBDIR=/usr/${CTARGET}/usr/lib \
- LIBDIR=/usr/${CTARGET}/usr/lib"
-
- dosym "usr/include" "/usr/${CTARGET}/sys-include"
- do_install
-
- return 0
- else
- export STRIP_MASK="*/usr/lib*/*crt*.o"
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
- multibuild_foreach_variant freebsd_multilib_multibuild_wrapper do_install
- fi
-
- cd "${WORKDIR}/etc/"
- insinto /etc
- doins nls.alias mac.conf netconfig
-
- # Install ttys file
- local MACHINE="$(tc-arch-kernel)"
- doins "etc.${MACHINE}"/*
-}
-
-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
-
- # Must exist before we use it.
- [[ -d "${DESTDIR}${INCLUDEDIR}" ]] || die "dodir or mkdir ${INCLUDEDIR} before using install_includes."
- cd "${WORKDIR}/include"
-
- local MACHINE="$(tc-arch-kernel)"
-
- einfo "Installing includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
- $(freebsd_get_bmake) installincludes \
- MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
- DESTDIR="${DESTDIR}" \
- INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
- BINGRP="${BINGRP}" || die "install_includes() failed"
- einfo "includes installed ok."
- EXTRA_INCLUDES="lib/librtld_db lib/libutil lib/msun gnu/lib/libregex"
- for i in $EXTRA_INCLUDES; do
- einfo "Installing $i includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
- cd "${WORKDIR}/$i" || die
- $(freebsd_get_bmake) installincludes DESTDIR="${DESTDIR}" \
- MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
- INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
- BINGRP="${BINGRP}" || die "problem installing $i includes."
- einfo "$i includes installed ok."
- done
-}
diff --git a/sys-freebsd/freebsd-libexec/ChangeLog b/sys-freebsd/freebsd-libexec/ChangeLog
index 51ca54632ee4..f22b5833974f 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-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/ChangeLog,v 1.63 2015/03/08 14:01:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/ChangeLog,v 1.64 2015/05/24 11:24:02 mgorny Exp $
+
+ 24 May 2015; Michał Górny <mgorny@gentoo.org> -freebsd-libexec-9.2.ebuild,
+ -freebsd-libexec-9.2_rc1.ebuild, -freebsd-libexec-9.2_rc2.ebuild,
+ -freebsd-libexec-9.2_rc3.ebuild:
+ Remove 9.2. Part of https://github.com/gentoo/gentoo-portage-rsync-
+ mirror/pull/126 by nigoro.
*freebsd-libexec-10.1 (08 Mar 2015)
diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-9.2.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-9.2.ebuild
deleted file mode 100644
index f94c4b379688..000000000000
--- a/sys-freebsd/freebsd-libexec/freebsd-libexec-9.2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/freebsd-libexec-9.2.ebuild,v 1.1 2013/11/09 09:16:35 aballier Exp $
-
-EAPI=5
-
-inherit bsdmk freebsd pam multilib multibuild multilib-build
-
-DESCRIPTION="FreeBSD libexec things"
-SLOT="0"
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~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"
-fi
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
- >=sys-freebsd/freebsd-lib-9.1-r11[${MULTILIB_USEDEP}]
- 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"
-
-PATCHES=( "${FILESDIR}/${PN}-9.2-no_ld32.patch" )
-
-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"
-}
-
-setup_multilib_vars() {
- if ! multilib_is_native_abi ; then
- cd "${WORKDIR}/libexec/rtld-elf" || die
- export mymakeopts="${mymakeopts} PROG=ld-elf32.so.1"
- else
- cd "${S}"
- fi
- "$@"
-}
-
-src_compile() {
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
- multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile
-}
-
-src_install() {
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
- multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars 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-libexec/freebsd-libexec-9.2_rc1.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-9.2_rc1.ebuild
deleted file mode 100644
index fbce1bb1cafb..000000000000
--- a/sys-freebsd/freebsd-libexec/freebsd-libexec-9.2_rc1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/freebsd-libexec-9.2_rc1.ebuild,v 1.1 2013/08/09 21:20:12 aballier Exp $
-
-EAPI=5
-
-inherit bsdmk freebsd pam multilib multibuild multilib-build
-
-DESCRIPTION="FreeBSD libexec things"
-SLOT="0"
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~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"
-fi
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
- >=sys-freebsd/freebsd-lib-9.1-r11[${MULTILIB_USEDEP}]
- 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"
-}
-
-setup_multilib_vars() {
- if ! multilib_is_native_abi ; then
- cd "${WORKDIR}/libexec/rtld-elf" || die
- export mymakeopts="${mymakeopts} PROG=ld-elf32.so.1"
- else
- cd "${S}"
- fi
- "$@"
-}
-
-src_compile() {
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
- multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile
-}
-
-src_install() {
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
- multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars 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-libexec/freebsd-libexec-9.2_rc2.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-9.2_rc2.ebuild
deleted file mode 100644
index a94aa7037c27..000000000000
--- a/sys-freebsd/freebsd-libexec/freebsd-libexec-9.2_rc2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/freebsd-libexec-9.2_rc2.ebuild,v 1.1 2013/08/22 15:44:20 aballier Exp $
-
-EAPI=5
-
-inherit bsdmk freebsd pam multilib multibuild multilib-build
-
-DESCRIPTION="FreeBSD libexec things"
-SLOT="0"
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~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"
-fi
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
- >=sys-freebsd/freebsd-lib-9.1-r11[${MULTILIB_USEDEP}]
- 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"
-}
-
-setup_multilib_vars() {
- if ! multilib_is_native_abi ; then
- cd "${WORKDIR}/libexec/rtld-elf" || die
- export mymakeopts="${mymakeopts} PROG=ld-elf32.so.1"
- else
- cd "${S}"
- fi
- "$@"
-}
-
-src_compile() {
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
- multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile
-}
-
-src_install() {
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
- multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars 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-libexec/freebsd-libexec-9.2_rc3.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-9.2_rc3.ebuild
deleted file mode 100644
index 285fb69bdb55..000000000000
--- a/sys-freebsd/freebsd-libexec/freebsd-libexec-9.2_rc3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/freebsd-libexec-9.2_rc3.ebuild,v 1.2 2013/08/26 21:17:04 aballier Exp $
-
-EAPI=5
-
-inherit bsdmk freebsd pam multilib multibuild multilib-build
-
-DESCRIPTION="FreeBSD libexec things"
-SLOT="0"
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~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"
-fi
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
- >=sys-freebsd/freebsd-lib-9.1-r11[${MULTILIB_USEDEP}]
- 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"
-
-PATCHES=( "${FILESDIR}/${PN}-9.2-no_ld32.patch" )
-
-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"
-}
-
-setup_multilib_vars() {
- if ! multilib_is_native_abi ; then
- cd "${WORKDIR}/libexec/rtld-elf" || die
- export mymakeopts="${mymakeopts} PROG=ld-elf32.so.1"
- else
- cd "${S}"
- fi
- "$@"
-}
-
-src_compile() {
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
- multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile
-}
-
-src_install() {
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
- multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars 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 b38866ee20d6..d52102764712 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-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/ChangeLog,v 1.61 2015/04/10 13:30:26 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/ChangeLog,v 1.62 2015/05/24 11:24:02 mgorny Exp $
+
+ 24 May 2015; Michał Górny <mgorny@gentoo.org>
+ -files/freebsd-mk-defs-9.2-gentoo.patch, -files/freebsd-mk-defs-9.2-gnu.patch,
+ -freebsd-mk-defs-9.2.ebuild, -freebsd-mk-defs-9.2_rc1.ebuild,
+ -freebsd-mk-defs-9.2_rc2.ebuild, -freebsd-mk-defs-9.2_rc3.ebuild:
+ Remove 9.2. Part of https://github.com/gentoo/gentoo-portage-rsync-
+ mirror/pull/126 by nigoro.
10 Apr 2015; Michał Górny <mgorny@gentoo.org>
+files/freebsd-mk-defs-10.1-gnu.patch, -files/freebsd-mk-defs-10.0-gnu.patch,
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.2-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.2-gentoo.patch
deleted file mode 100644
index ce66bc8a1d2f..000000000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.2-gentoo.patch
+++ /dev/null
@@ -1,352 +0,0 @@
-tested revision 251934.
-
-diff --git a/share/mk/bsd.compiler.mk b/share/mk/bsd.compiler.mk
-index d9f0ccf..9cf6b4f 100644
---- a/share/mk/bsd.compiler.mk
-+++ b/share/mk/bsd.compiler.mk
-@@ -1,7 +1,7 @@
- # $FreeBSD$
-
- .if !defined(COMPILER_TYPE)
--. if ${CC:T:Mgcc*}
-+. if ${CC:T:M*gcc*}
- COMPILER_TYPE:= gcc
- . elif ${CC:T:Mclang}
- COMPILER_TYPE:= clang
-diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk
-index 49b2d9b..c2a8c5c 100644
---- a/share/mk/bsd.doc.mk
-+++ b/share/mk/bsd.doc.mk
-@@ -135,10 +135,12 @@ CLEANFILES+= ${DOC}.ascii ${DOC}.ascii${DCOMPRESS_EXT} \
- 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
-diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk
-index 240f958..67f0cf9 100644
---- a/share/mk/bsd.files.mk
-+++ b/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:T}}
- ${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
-diff --git a/share/mk/bsd.incs.mk b/share/mk/bsd.incs.mk
-index 74c378b..7d2c7a0 100644
---- a/share/mk/bsd.incs.mk
-+++ b/share/mk/bsd.incs.mk
-@@ -41,6 +41,9 @@ ${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}} \
-+ ${DESTDIR}${${group}DIR_${.ALLSRC:T}}
- ${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \
- -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
- ${.ALLSRC} \
-@@ -53,9 +56,13 @@ _${group}INCS+= ${header}
- installincludes: _${group}INS
- _${group}INS: ${_${group}INCS}
- .if defined(${group}NAME)
-+ ${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \
-+ ${DESTDIR}${${group}DIR}
- ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
- ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME}
- .else
-+ ${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \
-+ ${DESTDIR}${${group}DIR}
- ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
- ${.ALLSRC} ${DESTDIR}${${group}DIR}
- .endif
-diff --git a/share/mk/bsd.info.mk b/share/mk/bsd.info.mk
-index c54b435..d283240 100644
---- a/share/mk/bsd.info.mk
-+++ b/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,15 +145,17 @@ ${x:S/$/${ICOMPRESS_EXT}/}: ${x}
- INSTALLINFODIRS+= ${x:S/$/-install/}
- ${x:S/$/-install/}:
- .if !empty(.MAKEFLAGS:M-j)
-+ ${INSTALL} -d ${DESTDIR}${INFODIR}
- lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \
- ${INSTALLINFO} ${INSTALLINFOFLAGS} \
-- --defsection=${INFOSECTION} \
-- --defentry=${INFOENTRY_${x}} \
-+ --section=${INFOSECTION} \
-+ --entry=${INFOENTRY_${x}} \
- ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
- .else
-+ ${INSTALL} -d ${DESTDIR}${INFODIR}
- ${INSTALLINFO} ${INSTALLINFOFLAGS} \
-- --defsection=${INFOSECTION} \
-- --defentry=${INFOENTRY_${x}} \
-+ --section=${INFOSECTION} \
-+ --entry=${INFOENTRY_${x}} \
- ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
- .endif
- .endfor
-diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
-index 05a949f..215d198 100644
---- a/share/mk/bsd.lib.mk
-+++ b/share/mk/bsd.lib.mk
-@@ -39,8 +39,6 @@ CFLAGS+= ${DEBUG_FLAGS}
- .if ${MK_CTF} != "no" && ${DEBUG_FLAGS:M-g} != ""
- CTFFLAGS+= -g
- .endif
--.else
--STRIP?= -s
- .endif
-
- .include <bsd.libnames.mk>
-@@ -256,14 +254,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}
-@@ -306,10 +307,12 @@ _libinstall:
- .endif # SHLIB_LINK
- .endif # SHIB_NAME
- .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no"
-+ ${INSTALL} -d ${DESTDIR}${LIBDIR}
- ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${LIBDIR}
- .endif
- .if defined(WANT_LINT) && !defined(NO_LINT) && defined(LIB) && !empty(LIB)
-+ ${INSTALL} -d ${DESTDIR}${LINTLIBDIR}
- ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- ${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR}
- .endif
-diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk
-index a3dbf3b..2cf726c 100644
---- a/share/mk/bsd.libnames.mk
-+++ b/share/mk/bsd.libnames.mk
-@@ -50,7 +50,7 @@ LIBDWARF?= ${DESTDIR}${LIBDIR}/libdwarf.a
- LIBEDIT?= ${DESTDIR}${LIBDIR}/libedit.a
- LIBELF?= ${DESTDIR}${LIBDIR}/libelf.a
- LIBFETCH?= ${DESTDIR}${LIBDIR}/libfetch.a
--LIBFL?= "don't use LIBFL, use LIBL"
-+LIBFL?= ${DESTDIR}${LIBDIR}/libfl.a
- LIBFORM?= ${DESTDIR}${LIBDIR}/libform.a
- LIBFTPIO?= ${DESTDIR}${LIBDIR}/libftpio.a
- LIBG2C?= ${DESTDIR}${LIBDIR}/libg2c.a
-@@ -81,7 +81,7 @@ LIBKEYCAP?= ${DESTDIR}${LIBDIR}/libkeycap.a
- LIBKICONV?= ${DESTDIR}${LIBDIR}/libkiconv.a
- LIBKRB5?= ${DESTDIR}${LIBDIR}/libkrb5.a
- LIBKVM?= ${DESTDIR}${LIBDIR}/libkvm.a
--LIBL?= ${DESTDIR}${LIBDIR}/libl.a
-+LIBL?= ${DESTDIR}${LIBDIR}/libfl.a
- LIBLN?= "don't use LIBLN, use LIBL"
- .if ${MK_BIND} != "no"
- LIBLWRES?= ${DESTDIR}${LIBDIR}/liblwres.a
-diff --git a/share/mk/bsd.links.mk b/share/mk/bsd.links.mk
-index 1e4d57e..fcb81fe 100644
---- a/share/mk/bsd.links.mk
-+++ b/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; \
- ${INSTALL_LINK} $$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; \
- ${INSTALL_SYMLINK} $$l $$t; \
- done; true
- .endif
-diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk
-index 6445ba3..fabffa2 100644
---- a/share/mk/bsd.man.mk
-+++ b/share/mk/bsd.man.mk
-@@ -165,9 +165,11 @@ _maninstall: ${MAN}
- .if defined(NO_MANCOMPRESS)
- .if defined(MANFILTER)
- .for __page in ${MAN}
-+ ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page}
- ${MINSTALL} ${__page:T:S/$/${FILTEXTENSION}/g} \
- ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/${__page}
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
-+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page}
- ${MINSTALL} ${__page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \
- ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page}
- .endif
-@@ -181,11 +183,14 @@ _maninstall: ${MAN}
- esac; \
- page=$$1; shift; sect=$$1; shift; \
- d=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}; \
-+ ${ECHO} ${INSTALL} -d $${d}; \
-+ ${INSTALL} -d $${d}; \
- ${ECHO} ${MINSTALL} $${page} $${d}; \
- ${MINSTALL} $${page} $${d}; \
- done
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
- .for __page in ${MAN}
-+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T}
- ${MINSTALL} ${__page:T:S/$/${CATEXT}/} \
- ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T}
- .endfor
-@@ -193,9 +198,11 @@ _maninstall: ${MAN}
- .endif
- .else
- .for __page in ${MAN}
-+ ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}
- ${MINSTALL} ${__page:T:S/$/${MCOMPRESS_EXT}/g} \
- ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
-+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT}
- ${MINSTALL} ${__page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \
- ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T:S/$/${MCOMPRESS_EXT}/}
- .endif
-diff --git a/share/mk/bsd.nls.mk b/share/mk/bsd.nls.mk
-index 48093eb..69f56bc 100644
---- a/share/mk/bsd.nls.mk
-+++ b/share/mk/bsd.nls.mk
-@@ -62,7 +62,8 @@ NLSDIR?= ${SHAREDIR}/nls
- # installation rules
- #
- .for file in ${NLS}
--NLSNAME_${file:T}= ${file:T:R}/${NLSNAME}.cat
-+NLSDIR_${file:T}= ${SHAREDIR}/nls/${file:T:R}/
-+NLSNAME_${file:T}= ${NLSNAME}.cat
- .if defined(NLSLINKS_${file:R}) && !empty(NLSLINKS_${file:R})
- NLSLINKS+= ${file:R}
- .endif
-diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
-index b871f91..bbcd667 100644
---- a/share/mk/bsd.own.mk
-+++ b/share/mk/bsd.own.mk
-@@ -191,9 +191,6 @@ INSTALL_LINK?= ${INSTALL} ${HRDLINK}
- INSTALL_SYMLINK?= ${INSTALL} ${SYMLINK}
-
- # Common variables
--.if !defined(DEBUG_FLAGS)
--STRIP?= -s
--.endif
-
- COMPRESS_CMD?= gzip -cn
- COMPRESS_EXT?= .gz
-diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
-index 0cf2f6d..50d5e54 100644
---- a/share/mk/bsd.prog.mk
-+++ b/share/mk/bsd.prog.mk
-@@ -28,10 +28,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,6 +148,7 @@ realinstall: _proginstall
- .ORDER: beforeinstall _proginstall
- _proginstall:
- .if defined(PROG)
-+ ${INSTALL} -d ${DESTDIR}${BINDIR}
- ${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME}
- .endif
-@@ -178,6 +175,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} \
-diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
-index 21c3352..5bfaa8e 100644
---- a/share/mk/bsd.sys.mk
-+++ b/share/mk/bsd.sys.mk
-@@ -30,10 +30,6 @@ CFLAGS+= -std=${CSTD}
- .if defined(WARNS)
- .if ${WARNS} >= 1
- CWARNFLAGS+= -Wsystem-headers
--.if !defined(NO_WERROR) && (${COMPILER_TYPE} != "clang" \
-- || !defined(NO_WERROR.clang))
--CWARNFLAGS+= -Werror
--.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang)
- .endif # WARNS >= 1
- .if ${WARNS} >= 2
- CWARNFLAGS+= -Wall -Wno-format-y2k
-@@ -95,10 +91,6 @@ CWARNFLAGS+= -Wformat=2 -Wno-format-extra-args
- CWARNFLAGS+= -Wno-format-nonliteral
- .endif # WARNS <= 3
- .endif # CLANG
--.if !defined(NO_WERROR) && (${COMPILER_TYPE} != "clang" \
-- || !defined(NO_WERROR.clang))
--CWARNFLAGS+= -Werror
--.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang)
- .endif # WFORMAT > 0
- .endif # WFORMAT
- .if defined(NO_WFORMAT) || (${COMPILER_TYPE} == "clang" && defined(NO_WFORMAT.clang))
-diff --git a/share/mk/sys.mk b/share/mk/sys.mk
-index e8ec4c1..e98501e 100644
---- a/share/mk/sys.mk
-+++ b/share/mk/sys.mk
-@@ -305,12 +305,6 @@ YFLAGS ?= -d
- rm -f ${.PREFIX}.tmp.c
- ${CTFCONVERT_CMD}
-
--# 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-9.2-gnu.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.2-gnu.patch
deleted file mode 100644
index d83b79e85cbd..000000000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.2-gnu.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-Index: work/share/mk/bsd.lib.mk
-===================================================================
---- work.orig/share/mk/bsd.lib.mk
-+++ work/share/mk/bsd.lib.mk
-@@ -33,20 +33,6 @@ CFLAGS+= -DNDEBUG
- NO_WERROR=
- .endif
-
--.if defined(DEBUG_FLAGS)
--CFLAGS+= ${DEBUG_FLAGS}
--
--.if ${MK_CTF} != "no" && ${DEBUG_FLAGS:M-g} != ""
--CTFFLAGS+= -g
--.endif
--.endif
--
--.if ${MK_DEBUG_FILES} != "no" && empty(DEBUG_FLAGS:M-g) && \
-- empty(DEBUG_FLAGS:M-gdwarf*)
--CFLAGS+= -g
--CTFFLAGS+= -g
--.endif
--
- .include <bsd.libnames.mk>
-
- # prefer .s to a .c, add .po, remove stuff not used in the BSD libraries
-@@ -153,11 +139,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
-
-@@ -170,11 +152,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
-
-@@ -201,15 +179,9 @@ ${SHLIB_NAME_FULL}: ${SOBJS}
- .if defined(SHLIB_LINK)
- @${INSTALL_SYMLINK} ${SHLIB_NAME} ${SHLIB_LINK}
- .endif
--.if !defined(NM)
-- @${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
-- -o ${.TARGET} -Wl,-soname,${SONAME} \
-- `lorder ${SOBJS} | tsort -q` ${LDADD}
--.else
- @${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
- -o ${.TARGET} -Wl,-soname,${SONAME} \
-- `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD}
--.endif
-+ `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD}
- .if ${MK_CTF} != "no"
- ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}
- .endif
-@@ -267,13 +239,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}}
-Index: work/share/mk/bsd.prog.mk
-===================================================================
---- work.orig/share/mk/bsd.prog.mk
-+++ work/share/mk/bsd.prog.mk
-@@ -36,12 +36,6 @@ MK_DEBUG_FILES= no
-
- .if defined(CRUNCH_CFLAGS)
- CFLAGS+=${CRUNCH_CFLAGS}
--.else
--.if ${MK_DEBUG_FILES} != "no" && empty(DEBUG_FLAGS:M-g) && \
-- empty(DEBUG_FLAGS:M-gdwarf-*)
--CFLAGS+= -g
--CTFFLAGS+= -g
--.endif
- .endif
-
- .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO")
-@@ -176,13 +170,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}}
-Index: work/share/mk/bsd.obj.mk
-===================================================================
---- work.orig/share/mk/bsd.obj.mk
-+++ work/share/mk/bsd.obj.mk
-@@ -44,8 +44,6 @@ __<bsd.obj.mk>__:
-
- .if defined(MAKEOBJDIRPREFIX)
- CANONICALOBJDIR:=${MAKEOBJDIRPREFIX}${.CURDIR}
--.elif defined(MAKEOBJDIR) && ${MAKEOBJDIR:M/*} != ""
--CANONICALOBJDIR:=${MAKEOBJDIR}
- .else
- CANONICALOBJDIR:=/usr/obj${.CURDIR}
- .endif
diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.2.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.2.ebuild
deleted file mode 100644
index 837a5439d335..000000000000
--- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 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-9.2.ebuild,v 1.2 2015/02/18 17:09:17 mgorny Exp $
-
-EAPI=3
-
-inherit bsdmk freebsd
-
-DESCRIPTION="Makefiles definitions used for building and installing libraries and system files"
-SLOT="0"
-
-IUSE="userland_GNU"
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
- SRC_URI="mirror://gentoo/${SHARE}.tar.bz2"
-fi
-
-RDEPEND=""
-DEPEND=""
-
-RESTRICT="strip"
-
-S="${WORKDIR}/share/mk"
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-9.2-gentoo.patch"
- epatch "${FILESDIR}/${PN}-add-nossp-cflags.patch"
- use userland_GNU && epatch "${FILESDIR}/${PN}-9.2-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-mk-defs/freebsd-mk-defs-9.2_rc1.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.2_rc1.ebuild
deleted file mode 100644
index a06800ca54ad..000000000000
--- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.2_rc1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2013 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-9.2_rc1.ebuild,v 1.1 2013/08/09 20:05:06 aballier Exp $
-
-EAPI=3
-
-inherit bsdmk freebsd
-
-DESCRIPTION="Makefiles definitions used for building and installing libraries and system files"
-SLOT="0"
-
-IUSE="userland_GNU"
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
- SRC_URI="mirror://gentoo/${SHARE}.tar.bz2"
-fi
-
-RDEPEND=""
-DEPEND=""
-
-RESTRICT="strip"
-
-S="${WORKDIR}/share/mk"
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-9.2-gentoo.patch"
- use userland_GNU && epatch "${FILESDIR}/${PN}-9.2-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-mk-defs/freebsd-mk-defs-9.2_rc2.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.2_rc2.ebuild
deleted file mode 100644
index 71d76e9cb1c8..000000000000
--- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.2_rc2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2013 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-9.2_rc2.ebuild,v 1.1 2013/08/22 15:45:05 aballier Exp $
-
-EAPI=3
-
-inherit bsdmk freebsd
-
-DESCRIPTION="Makefiles definitions used for building and installing libraries and system files"
-SLOT="0"
-
-IUSE="userland_GNU"
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
- SRC_URI="mirror://gentoo/${SHARE}.tar.bz2"
-fi
-
-RDEPEND=""
-DEPEND=""
-
-RESTRICT="strip"
-
-S="${WORKDIR}/share/mk"
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-9.2-gentoo.patch"
- use userland_GNU && epatch "${FILESDIR}/${PN}-9.2-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-mk-defs/freebsd-mk-defs-9.2_rc3.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.2_rc3.ebuild
deleted file mode 100644
index a4b584f6d5b3..000000000000
--- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.2_rc3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2013 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-9.2_rc3.ebuild,v 1.1 2013/08/26 20:43:23 aballier Exp $
-
-EAPI=3
-
-inherit bsdmk freebsd
-
-DESCRIPTION="Makefiles definitions used for building and installing libraries and system files"
-SLOT="0"
-
-IUSE="userland_GNU"
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
- SRC_URI="mirror://gentoo/${SHARE}.tar.bz2"
-fi
-
-RDEPEND=""
-DEPEND=""
-
-RESTRICT="strip"
-
-S="${WORKDIR}/share/mk"
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-9.2-gentoo.patch"
- use userland_GNU && epatch "${FILESDIR}/${PN}-9.2-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 11377daeffff..d3537529733a 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-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pam-modules/ChangeLog,v 1.47 2015/03/08 14:01:57 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pam-modules/ChangeLog,v 1.48 2015/05/24 11:24:02 mgorny Exp $
+
+ 24 May 2015; Michał Górny <mgorny@gentoo.org> -freebsd-pam-modules-9.2.ebuild,
+ -freebsd-pam-modules-9.2_rc1.ebuild, -freebsd-pam-modules-9.2_rc2.ebuild,
+ -freebsd-pam-modules-9.2_rc3.ebuild:
+ Remove 9.2. Part of https://github.com/gentoo/gentoo-portage-rsync-
+ mirror/pull/126 by nigoro.
*freebsd-pam-modules-10.1 (08 Mar 2015)
diff --git a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.2.ebuild b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.2.ebuild
deleted file mode 100644
index 891b46525a5c..000000000000
--- a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2013 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-9.2.ebuild,v 1.1 2013/11/09 09:17:13 aballier Exp $
-
-inherit bsdmk freebsd multilib pam
-
-DESCRIPTION="FreeBSD's PAM authentication modules"
-SLOT="0"
-
-IUSE="kerberos nis"
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
- SRC_URI="mirror://gentoo/${LIB}.tar.bz2"
-fi
-
-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
-
-PATCHES=( "${FILESDIR}"/${PN}-9.0-gentoo.patch )
-
-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() {
- freebsd_src_unpack
-
- for module in pam_deny pam_passwdqc pam_permit pam_krb5; do
- sed -i -e "s:${module}::" "${S}"/modules.inc
- done
-}
-
-src_install() {
- mkinstall "LIBDIR=/$(get_libdir)/security" || die "install failed"
-
- dodoc "${FILESDIR}/README.pamd"
-}
diff --git a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.2_rc1.ebuild b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.2_rc1.ebuild
deleted file mode 100644
index d87a86e1bf9e..000000000000
--- a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.2_rc1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2013 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-9.2_rc1.ebuild,v 1.1 2013/08/10 02:28:47 aballier Exp $
-
-inherit bsdmk freebsd multilib pam
-
-DESCRIPTION="FreeBSD's PAM authentication modules"
-SLOT="0"
-
-IUSE="kerberos nis"
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
- SRC_URI="mirror://gentoo/${LIB}.tar.bz2"
-fi
-
-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
-
-PATCHES=( "${FILESDIR}"/${PN}-9.0-gentoo.patch )
-
-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() {
- freebsd_src_unpack
-
- for module in pam_deny pam_passwdqc pam_permit pam_krb5; do
- sed -i -e "s:${module}::" "${S}"/modules.inc
- done
-}
-
-src_install() {
- mkinstall "LIBDIR=/$(get_libdir)/security" || die "install failed"
-
- dodoc "${FILESDIR}/README.pamd"
-}
diff --git a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.2_rc2.ebuild b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.2_rc2.ebuild
deleted file mode 100644
index fde2b32ae5b6..000000000000
--- a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.2_rc2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2013 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-9.2_rc2.ebuild,v 1.1 2013/08/22 15:45:27 aballier Exp $
-
-inherit bsdmk freebsd multilib pam
-
-DESCRIPTION="FreeBSD's PAM authentication modules"
-SLOT="0"
-
-IUSE="kerberos nis"
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
- SRC_URI="mirror://gentoo/${LIB}.tar.bz2"
-fi
-
-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
-
-PATCHES=( "${FILESDIR}"/${PN}-9.0-gentoo.patch )
-
-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() {
- freebsd_src_unpack
-
- for module in pam_deny pam_passwdqc pam_permit pam_krb5; do
- sed -i -e "s:${module}::" "${S}"/modules.inc
- done
-}
-
-src_install() {
- mkinstall "LIBDIR=/$(get_libdir)/security" || die "install failed"
-
- dodoc "${FILESDIR}/README.pamd"
-}
diff --git a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.2_rc3.ebuild b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.2_rc3.ebuild
deleted file mode 100644
index 0f4a71bafb18..000000000000
--- a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.2_rc3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2013 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-9.2_rc3.ebuild,v 1.1 2013/08/26 20:43:44 aballier Exp $
-
-inherit bsdmk freebsd multilib pam
-
-DESCRIPTION="FreeBSD's PAM authentication modules"
-SLOT="0"
-
-IUSE="kerberos nis"
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
- SRC_URI="mirror://gentoo/${LIB}.tar.bz2"
-fi
-
-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
-
-PATCHES=( "${FILESDIR}"/${PN}-9.0-gentoo.patch )
-
-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() {
- freebsd_src_unpack
-
- for module in pam_deny pam_passwdqc pam_permit pam_krb5; do
- sed -i -e "s:${module}::" "${S}"/modules.inc
- done
-}
-
-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 29dde5825201..09e7d418a579 100644
--- a/sys-freebsd/freebsd-pf/ChangeLog
+++ b/sys-freebsd/freebsd-pf/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sys-freebsd/freebsd-pf
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pf/ChangeLog,v 1.50 2015/03/08 14:01:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pf/ChangeLog,v 1.51 2015/05/24 11:24:02 mgorny Exp $
+
+ 24 May 2015; Michał Górny <mgorny@gentoo.org> -freebsd-pf-9.2.ebuild,
+ -freebsd-pf-9.2_rc1.ebuild, -freebsd-pf-9.2_rc2.ebuild,
+ -freebsd-pf-9.2_rc3.ebuild:
+ Remove 9.2. Part of https://github.com/gentoo/gentoo-portage-rsync-
+ mirror/pull/126 by nigoro.
*freebsd-pf-10.1 (08 Mar 2015)
diff --git a/sys-freebsd/freebsd-pf/freebsd-pf-9.2.ebuild b/sys-freebsd/freebsd-pf/freebsd-pf-9.2.ebuild
deleted file mode 100644
index 715fb41f1ae4..000000000000
--- a/sys-freebsd/freebsd-pf/freebsd-pf-9.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pf/freebsd-pf-9.2.ebuild,v 1.1 2013/11/09 09:17:24 aballier Exp $
-
-inherit bsdmk freebsd user
-
-DESCRIPTION="FreeBSD's base system libraries"
-SLOT="0"
-
-IUSE=""
-
-# Crypto is needed to have an internal OpenSSL header
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~x86-fbsd"
- SRC_URI="mirror://gentoo/${USBIN}.tar.bz2
- mirror://gentoo/${SBIN}.tar.bz2
- mirror://gentoo/${CONTRIB}.tar.bz2
- mirror://gentoo/${ETC}.tar.bz2"
-fi
-
-RDEPEND="net-libs/libpcap"
-DEPEND="${RDEPEND}
- dev-libs/libevent
- =sys-freebsd/freebsd-mk-defs-${RV}*
- =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}-9.0-pcap_pollution.patch"
- # Use system's libevent
- epatch "${FILESDIR}/${PN}-9.0-libevent.patch"
- epatch "${FILESDIR}/${PN}-9.0-pflogd.patch"
- epatch "${FILESDIR}/${PN}-9.0-bpf.patch"
- epatch "${FILESDIR}/${PN}-9.0-getline.patch"
- # Link in kernel sources
- ln -s "/usr/src/sys" "${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
- # pf.initd provided by openrc, but no pf.confd
- newconfd "${FILESDIR}/pf.confd" pf
-}
diff --git a/sys-freebsd/freebsd-pf/freebsd-pf-9.2_rc1.ebuild b/sys-freebsd/freebsd-pf/freebsd-pf-9.2_rc1.ebuild
deleted file mode 100644
index 209d2a8ae71e..000000000000
--- a/sys-freebsd/freebsd-pf/freebsd-pf-9.2_rc1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pf/freebsd-pf-9.2_rc1.ebuild,v 1.2 2013/08/11 19:53:39 aballier Exp $
-
-inherit bsdmk freebsd user
-
-DESCRIPTION="FreeBSD's base system libraries"
-SLOT="0"
-
-IUSE=""
-
-# Crypto is needed to have an internal OpenSSL header
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~x86-fbsd"
- SRC_URI="mirror://gentoo/${USBIN}.tar.bz2
- mirror://gentoo/${SBIN}.tar.bz2
- mirror://gentoo/${CONTRIB}.tar.bz2
- mirror://gentoo/${ETC}.tar.bz2"
-fi
-
-RDEPEND="net-libs/libpcap"
-DEPEND="${RDEPEND}
- dev-libs/libevent
- =sys-freebsd/freebsd-mk-defs-${RV}*
- =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}-9.0-pcap_pollution.patch"
- # Use system's libevent
- epatch "${FILESDIR}/${PN}-9.0-libevent.patch"
- epatch "${FILESDIR}/${PN}-9.0-pflogd.patch"
- epatch "${FILESDIR}/${PN}-9.0-bpf.patch"
- epatch "${FILESDIR}/${PN}-9.0-getline.patch"
- # Link in kernel sources
- ln -s "/usr/src/sys" "${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
- # pf.initd provided by openrc, but no pf.confd
- newconfd "${FILESDIR}/pf.confd" pf
-}
diff --git a/sys-freebsd/freebsd-pf/freebsd-pf-9.2_rc2.ebuild b/sys-freebsd/freebsd-pf/freebsd-pf-9.2_rc2.ebuild
deleted file mode 100644
index ec1acb10b72d..000000000000
--- a/sys-freebsd/freebsd-pf/freebsd-pf-9.2_rc2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pf/freebsd-pf-9.2_rc2.ebuild,v 1.1 2013/08/22 15:45:48 aballier Exp $
-
-inherit bsdmk freebsd user
-
-DESCRIPTION="FreeBSD's base system libraries"
-SLOT="0"
-
-IUSE=""
-
-# Crypto is needed to have an internal OpenSSL header
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~x86-fbsd"
- SRC_URI="mirror://gentoo/${USBIN}.tar.bz2
- mirror://gentoo/${SBIN}.tar.bz2
- mirror://gentoo/${CONTRIB}.tar.bz2
- mirror://gentoo/${ETC}.tar.bz2"
-fi
-
-RDEPEND="net-libs/libpcap"
-DEPEND="${RDEPEND}
- dev-libs/libevent
- =sys-freebsd/freebsd-mk-defs-${RV}*
- =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}-9.0-pcap_pollution.patch"
- # Use system's libevent
- epatch "${FILESDIR}/${PN}-9.0-libevent.patch"
- epatch "${FILESDIR}/${PN}-9.0-pflogd.patch"
- epatch "${FILESDIR}/${PN}-9.0-bpf.patch"
- epatch "${FILESDIR}/${PN}-9.0-getline.patch"
- # Link in kernel sources
- ln -s "/usr/src/sys" "${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
- # pf.initd provided by openrc, but no pf.confd
- newconfd "${FILESDIR}/pf.confd" pf
-}
diff --git a/sys-freebsd/freebsd-pf/freebsd-pf-9.2_rc3.ebuild b/sys-freebsd/freebsd-pf/freebsd-pf-9.2_rc3.ebuild
deleted file mode 100644
index 94e41b4cfdea..000000000000
--- a/sys-freebsd/freebsd-pf/freebsd-pf-9.2_rc3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pf/freebsd-pf-9.2_rc3.ebuild,v 1.1 2013/08/26 20:44:05 aballier Exp $
-
-inherit bsdmk freebsd user
-
-DESCRIPTION="FreeBSD's base system libraries"
-SLOT="0"
-
-IUSE=""
-
-# Crypto is needed to have an internal OpenSSL header
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~x86-fbsd"
- SRC_URI="mirror://gentoo/${USBIN}.tar.bz2
- mirror://gentoo/${SBIN}.tar.bz2
- mirror://gentoo/${CONTRIB}.tar.bz2
- mirror://gentoo/${ETC}.tar.bz2"
-fi
-
-RDEPEND="net-libs/libpcap"
-DEPEND="${RDEPEND}
- dev-libs/libevent
- =sys-freebsd/freebsd-mk-defs-${RV}*
- =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}-9.0-pcap_pollution.patch"
- # Use system's libevent
- epatch "${FILESDIR}/${PN}-9.0-libevent.patch"
- epatch "${FILESDIR}/${PN}-9.0-pflogd.patch"
- epatch "${FILESDIR}/${PN}-9.0-bpf.patch"
- epatch "${FILESDIR}/${PN}-9.0-getline.patch"
- # Link in kernel sources
- ln -s "/usr/src/sys" "${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
- # 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 24f6774aa999..e63b644fd6ea 100644
--- a/sys-freebsd/freebsd-rescue/ChangeLog
+++ b/sys-freebsd/freebsd-rescue/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sys-freebsd/freebsd-rescue
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-rescue/ChangeLog,v 1.42 2015/03/08 14:01:57 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-rescue/ChangeLog,v 1.43 2015/05/24 11:24:02 mgorny Exp $
+
+ 24 May 2015; Michał Górny <mgorny@gentoo.org> -freebsd-rescue-9.2.ebuild,
+ -freebsd-rescue-9.2_rc1.ebuild, -freebsd-rescue-9.2_rc2.ebuild,
+ -freebsd-rescue-9.2_rc3.ebuild:
+ Remove 9.2. Part of https://github.com/gentoo/gentoo-portage-rsync-
+ mirror/pull/126 by nigoro.
*freebsd-rescue-10.1 (08 Mar 2015)
diff --git a/sys-freebsd/freebsd-rescue/freebsd-rescue-9.2.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-9.2.ebuild
deleted file mode 100644
index db374024e209..000000000000
--- a/sys-freebsd/freebsd-rescue/freebsd-rescue-9.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-rescue/freebsd-rescue-9.2.ebuild,v 1.1 2013/11/09 09:17:35 aballier Exp $
-
-EAPI=5
-
-inherit bsdmk freebsd toolchain-funcs
-
-DESCRIPTION="FreeBSD's rescue binaries"
-SLOT="0"
-LICENSE="BSD zfs? ( CDDL )"
-
-IUSE="atm netware nis zfs"
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~x86-fbsd"
- 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 )"
-fi
-
-RDEPEND=""
-DEPEND="sys-devel/flex
- app-arch/xz-utils[static-libs]
- sys-libs/ncurses[static-libs]
- dev-libs/expat[static-libs]
- app-arch/bzip2[static-libs]
- dev-libs/libedit[static-libs]
- dev-libs/libxml2:2[static-libs]
- dev-libs/openssl[static-libs]
- sys-libs/zlib[static-libs]
- sys-libs/readline[static-libs]
- =sys-freebsd/freebsd-lib-${RV}*[atm?,netware?]
- =sys-freebsd/freebsd-sources-${RV}*
- =sys-freebsd/freebsd-mk-defs-${RV}*
- zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )"
-
-S="${WORKDIR}/rescue"
-
-pkg_setup() {
- use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
- use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= "
- use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
- use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
- mymakeopts="${mymakeopts} NO_PIC= "
-}
-
-src_prepare() {
- # As they are patches from ${WORKDIR} apply them by hand
- cd "${WORKDIR}"
- epatch "${FILESDIR}/${PN}"-7.1-zlib.patch
- epatch "${FILESDIR}/freebsd-sbin-bsdxml2expat.patch"
-}
-
-src_compile() {
- tc-export CC
- # crunchgen is now checks env MAKE.
- # Use to force BSD's make
- export MAKE=/usr/bin/make
-
- cd "${WORKDIR}/lib/libarchive"
- echo "#include <expat.h>" > bsdxml.h
- freebsd_src_compile
- export CC="${CC} -L${WORKDIR}/lib/libarchive"
-
- cd "${S}"
- freebsd_src_compile
-}
diff --git a/sys-freebsd/freebsd-rescue/freebsd-rescue-9.2_rc1.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-9.2_rc1.ebuild
deleted file mode 100644
index e54a741356f4..000000000000
--- a/sys-freebsd/freebsd-rescue/freebsd-rescue-9.2_rc1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-rescue/freebsd-rescue-9.2_rc1.ebuild,v 1.1 2013/08/11 19:45:47 aballier Exp $
-
-EAPI=5
-
-inherit bsdmk freebsd toolchain-funcs
-
-DESCRIPTION="FreeBSD's rescue binaries"
-SLOT="0"
-LICENSE="BSD zfs? ( CDDL )"
-
-IUSE="atm netware nis zfs"
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~x86-fbsd"
- 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 )"
-fi
-
-RDEPEND=""
-DEPEND="sys-devel/flex
- app-arch/xz-utils[static-libs]
- sys-libs/ncurses[static-libs]
- dev-libs/expat[static-libs]
- app-arch/bzip2[static-libs]
- dev-libs/libedit[static-libs]
- dev-libs/libxml2:2[static-libs]
- dev-libs/openssl[static-libs]
- sys-libs/zlib[static-libs]
- sys-libs/readline[static-libs]
- =sys-freebsd/freebsd-lib-${RV}*[atm?,netware?]
- =sys-freebsd/freebsd-sources-${RV}*
- =sys-freebsd/freebsd-mk-defs-${RV}*
- zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )"
-
-S="${WORKDIR}/rescue"
-
-pkg_setup() {
- use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
- use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= "
- use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
- use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
- mymakeopts="${mymakeopts} NO_PIC= "
-}
-
-src_prepare() {
- # As they are patches from ${WORKDIR} apply them by hand
- cd "${WORKDIR}"
- epatch "${FILESDIR}/${PN}"-7.1-zlib.patch
- epatch "${FILESDIR}/freebsd-sbin-bsdxml2expat.patch"
-}
-
-src_compile() {
- tc-export CC
- # crunchgen is now checks env MAKE.
- # Use to force BSD's make
- export MAKE=/usr/bin/make
-
- cd "${WORKDIR}/lib/libarchive"
- echo "#include <expat.h>" > bsdxml.h
- freebsd_src_compile
- export CC="${CC} -L${WORKDIR}/lib/libarchive"
-
- cd "${S}"
- freebsd_src_compile
-}
diff --git a/sys-freebsd/freebsd-rescue/freebsd-rescue-9.2_rc2.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-9.2_rc2.ebuild
deleted file mode 100644
index 2ea211b521bf..000000000000
--- a/sys-freebsd/freebsd-rescue/freebsd-rescue-9.2_rc2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-rescue/freebsd-rescue-9.2_rc2.ebuild,v 1.1 2013/08/22 15:46:10 aballier Exp $
-
-EAPI=5
-
-inherit bsdmk freebsd toolchain-funcs
-
-DESCRIPTION="FreeBSD's rescue binaries"
-SLOT="0"
-LICENSE="BSD zfs? ( CDDL )"
-
-IUSE="atm netware nis zfs"
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~x86-fbsd"
- 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 )"
-fi
-
-RDEPEND=""
-DEPEND="sys-devel/flex
- app-arch/xz-utils[static-libs]
- sys-libs/ncurses[static-libs]
- dev-libs/expat[static-libs]
- app-arch/bzip2[static-libs]
- dev-libs/libedit[static-libs]
- dev-libs/libxml2:2[static-libs]
- dev-libs/openssl[static-libs]
- sys-libs/zlib[static-libs]
- sys-libs/readline[static-libs]
- =sys-freebsd/freebsd-lib-${RV}*[atm?,netware?]
- =sys-freebsd/freebsd-sources-${RV}*
- =sys-freebsd/freebsd-mk-defs-${RV}*
- zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )"
-
-S="${WORKDIR}/rescue"
-
-pkg_setup() {
- use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
- use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= "
- use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
- use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
- mymakeopts="${mymakeopts} NO_PIC= "
-}
-
-src_prepare() {
- # As they are patches from ${WORKDIR} apply them by hand
- cd "${WORKDIR}"
- epatch "${FILESDIR}/${PN}"-7.1-zlib.patch
- epatch "${FILESDIR}/freebsd-sbin-bsdxml2expat.patch"
-}
-
-src_compile() {
- tc-export CC
- # crunchgen is now checks env MAKE.
- # Use to force BSD's make
- export MAKE=/usr/bin/make
-
- cd "${WORKDIR}/lib/libarchive"
- echo "#include <expat.h>" > bsdxml.h
- freebsd_src_compile
- export CC="${CC} -L${WORKDIR}/lib/libarchive"
-
- cd "${S}"
- freebsd_src_compile
-}
diff --git a/sys-freebsd/freebsd-rescue/freebsd-rescue-9.2_rc3.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-9.2_rc3.ebuild
deleted file mode 100644
index f09e5467d3c3..000000000000
--- a/sys-freebsd/freebsd-rescue/freebsd-rescue-9.2_rc3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-rescue/freebsd-rescue-9.2_rc3.ebuild,v 1.1 2013/08/26 20:44:28 aballier Exp $
-
-EAPI=5
-
-inherit bsdmk freebsd toolchain-funcs
-
-DESCRIPTION="FreeBSD's rescue binaries"
-SLOT="0"
-LICENSE="BSD zfs? ( CDDL )"
-
-IUSE="atm netware nis zfs"
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~x86-fbsd"
- 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 )"
-fi
-
-RDEPEND=""
-DEPEND="sys-devel/flex
- app-arch/xz-utils[static-libs]
- sys-libs/ncurses[static-libs]
- dev-libs/expat[static-libs]
- app-arch/bzip2[static-libs]
- dev-libs/libedit[static-libs]
- dev-libs/libxml2:2[static-libs]
- dev-libs/openssl[static-libs]
- sys-libs/zlib[static-libs]
- sys-libs/readline[static-libs]
- =sys-freebsd/freebsd-lib-${RV}*[atm?,netware?]
- =sys-freebsd/freebsd-sources-${RV}*
- =sys-freebsd/freebsd-mk-defs-${RV}*
- zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )"
-
-S="${WORKDIR}/rescue"
-
-pkg_setup() {
- use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
- use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= "
- use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
- use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
- mymakeopts="${mymakeopts} NO_PIC= "
-}
-
-src_prepare() {
- # As they are patches from ${WORKDIR} apply them by hand
- cd "${WORKDIR}"
- epatch "${FILESDIR}/${PN}"-7.1-zlib.patch
- epatch "${FILESDIR}/freebsd-sbin-bsdxml2expat.patch"
-}
-
-src_compile() {
- tc-export CC
- # crunchgen is now checks env MAKE.
- # Use to force BSD's make
- export MAKE=/usr/bin/make
-
- cd "${WORKDIR}/lib/libarchive"
- echo "#include <expat.h>" > bsdxml.h
- freebsd_src_compile
- export CC="${CC} -L${WORKDIR}/lib/libarchive"
-
- cd "${S}"
- freebsd_src_compile
-}
diff --git a/sys-freebsd/freebsd-sbin/ChangeLog b/sys-freebsd/freebsd-sbin/ChangeLog
index 4f051899361f..ab234318024f 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-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/ChangeLog,v 1.83 2015/03/08 14:01:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/ChangeLog,v 1.84 2015/05/24 11:24:02 mgorny Exp $
+
+ 24 May 2015; Michał Górny <mgorny@gentoo.org> -freebsd-sbin-9.2.ebuild,
+ -freebsd-sbin-9.2_rc1.ebuild, -freebsd-sbin-9.2_rc2.ebuild,
+ -freebsd-sbin-9.2_rc3.ebuild:
+ Remove 9.2. Part of https://github.com/gentoo/gentoo-portage-rsync-
+ mirror/pull/126 by nigoro.
*freebsd-sbin-10.1 (08 Mar 2015)
diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-9.2.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-9.2.ebuild
deleted file mode 100644
index 5ce42b74786d..000000000000
--- a/sys-freebsd/freebsd-sbin/freebsd-sbin-9.2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/freebsd-sbin-9.2.ebuild,v 1.2 2014/07/24 01:58:41 naota Exp $
-
-EAPI=2
-
-inherit bsdmk freebsd multilib
-
-DESCRIPTION="FreeBSD sbin utils"
-SLOT="0"
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
- 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 )"
-fi
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[ipv6?,atm?,netware?]
- =sys-freebsd/freebsd-libexec-${RV}*
- >=dev-libs/expat-2.0.1
- ssl? ( dev-libs/openssl )
- >=dev-libs/libedit-20120311.3.0-r1
- sys-libs/readline
- || (
- sys-process/cronie
- sys-process/vixie-cron
- )
- atm? ( net-analyzer/bsnmp )"
-DEPEND="${RDEPEND}
- !build? ( =sys-freebsd/freebsd-sources-${RV}* )
- =sys-freebsd/freebsd-mk-defs-${RV}*"
-
-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 resolvconf"
-
-PATCHES=( "${FILESDIR}/${PN}-setXid.patch"
- "${FILESDIR}/${PN}-7.1-zlib.patch"
- "${FILESDIR}/${PN}-6.2-ldconfig.patch"
- "${FILESDIR}/${PN}-6.1-pr102701.patch"
- "${FILESDIR}/${PN}-bsdxml2expat.patch" )
-
-src_prepare() {
- use build || ln -s "/usr/src/sys" "${WORKDIR}/sys"
-}
-
-src_install() {
- mymakeopts="${mymakeopts} GEOM_CLASS_DIR=/$(get_libdir)/geom "
- 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-sbin/freebsd-sbin-9.2_rc1.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-9.2_rc1.ebuild
deleted file mode 100644
index dce89036f10c..000000000000
--- a/sys-freebsd/freebsd-sbin/freebsd-sbin-9.2_rc1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/freebsd-sbin-9.2_rc1.ebuild,v 1.2 2013/08/11 19:54:30 aballier Exp $
-
-EAPI=2
-
-inherit bsdmk freebsd multilib
-
-DESCRIPTION="FreeBSD sbin utils"
-SLOT="0"
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
- 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 )"
-fi
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[ipv6?,atm?,netware?]
- =sys-freebsd/freebsd-libexec-${RV}*
- >=dev-libs/expat-2.0.1
- ssl? ( dev-libs/openssl )
- >=dev-libs/libedit-20120311.3.0-r1
- 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}*"
-
-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 resolvconf"
-
-PATCHES=( "${FILESDIR}/${PN}-setXid.patch"
- "${FILESDIR}/${PN}-7.1-zlib.patch"
- "${FILESDIR}/${PN}-6.2-ldconfig.patch"
- "${FILESDIR}/${PN}-6.1-pr102701.patch"
- "${FILESDIR}/${PN}-bsdxml2expat.patch" )
-
-src_prepare() {
- use build || ln -s "/usr/src/sys" "${WORKDIR}/sys"
-}
-
-src_install() {
- mymakeopts="${mymakeopts} GEOM_CLASS_DIR=/$(get_libdir)/geom "
- 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-sbin/freebsd-sbin-9.2_rc2.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-9.2_rc2.ebuild
deleted file mode 100644
index a4c04f43004a..000000000000
--- a/sys-freebsd/freebsd-sbin/freebsd-sbin-9.2_rc2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/freebsd-sbin-9.2_rc2.ebuild,v 1.1 2013/08/22 15:46:31 aballier Exp $
-
-EAPI=2
-
-inherit bsdmk freebsd multilib
-
-DESCRIPTION="FreeBSD sbin utils"
-SLOT="0"
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
- 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 )"
-fi
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[ipv6?,atm?,netware?]
- =sys-freebsd/freebsd-libexec-${RV}*
- >=dev-libs/expat-2.0.1
- ssl? ( dev-libs/openssl )
- >=dev-libs/libedit-20120311.3.0-r1
- 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}*"
-
-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 resolvconf"
-
-PATCHES=( "${FILESDIR}/${PN}-setXid.patch"
- "${FILESDIR}/${PN}-7.1-zlib.patch"
- "${FILESDIR}/${PN}-6.2-ldconfig.patch"
- "${FILESDIR}/${PN}-6.1-pr102701.patch"
- "${FILESDIR}/${PN}-bsdxml2expat.patch" )
-
-src_prepare() {
- use build || ln -s "/usr/src/sys" "${WORKDIR}/sys"
-}
-
-src_install() {
- mymakeopts="${mymakeopts} GEOM_CLASS_DIR=/$(get_libdir)/geom "
- 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-sbin/freebsd-sbin-9.2_rc3.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-9.2_rc3.ebuild
deleted file mode 100644
index cd8f3494708b..000000000000
--- a/sys-freebsd/freebsd-sbin/freebsd-sbin-9.2_rc3.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/freebsd-sbin-9.2_rc3.ebuild,v 1.1 2013/08/26 20:44:50 aballier Exp $
-
-EAPI=2
-
-inherit bsdmk freebsd multilib
-
-DESCRIPTION="FreeBSD sbin utils"
-SLOT="0"
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
- 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 )"
-fi
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[ipv6?,atm?,netware?]
- =sys-freebsd/freebsd-libexec-${RV}*
- >=dev-libs/expat-2.0.1
- ssl? ( dev-libs/openssl )
- >=dev-libs/libedit-20120311.3.0-r1
- 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}*"
-
-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 resolvconf"
-
-PATCHES=( "${FILESDIR}/${PN}-setXid.patch"
- "${FILESDIR}/${PN}-7.1-zlib.patch"
- "${FILESDIR}/${PN}-6.2-ldconfig.patch"
- "${FILESDIR}/${PN}-6.1-pr102701.patch"
- "${FILESDIR}/${PN}-bsdxml2expat.patch" )
-
-src_prepare() {
- use build || ln -s "/usr/src/sys" "${WORKDIR}/sys"
-}
-
-src_install() {
- mymakeopts="${mymakeopts} GEOM_CLASS_DIR=/$(get_libdir)/geom "
- 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 c943e6e2ff44..a269306d6f55 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-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/ChangeLog,v 1.59 2015/03/08 14:01:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/ChangeLog,v 1.60 2015/05/24 11:24:02 mgorny Exp $
+
+ 24 May 2015; Michał Górny <mgorny@gentoo.org> -freebsd-share-9.2.ebuild,
+ -freebsd-share-9.2_rc1.ebuild, -freebsd-share-9.2_rc2.ebuild,
+ -freebsd-share-9.2_rc3.ebuild:
+ Remove 9.2. Part of https://github.com/gentoo/gentoo-portage-rsync-
+ mirror/pull/126 by nigoro.
*freebsd-share-10.1 (08 Mar 2015)
diff --git a/sys-freebsd/freebsd-share/freebsd-share-9.2.ebuild b/sys-freebsd/freebsd-share/freebsd-share-9.2.ebuild
deleted file mode 100644
index c74f4bc54e9e..000000000000
--- a/sys-freebsd/freebsd-share/freebsd-share-9.2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/freebsd-share-9.2.ebuild,v 1.1 2013/11/09 09:17:59 aballier Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD shared tools/files"
-SLOT="0"
-
-IUSE="doc zfs"
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
- 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
- zfs? ( mirror://gentoo/${CDDL}.tar.bz2 )"
-fi
-
-DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
- =sys-freebsd/freebsd-sources-${RV}*"
-RDEPEND="sys-apps/miscfiles"
-
-RESTRICT="strip"
-
-S="${WORKDIR}/share"
-
-pkg_setup() {
- use doc || mymakeopts="${mymakeopts} NO_SHAREDOCS= "
- use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-
- 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}-9.2-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 rc.conf manpage as it describes bsd's rc.conf.
- sed -i -e 's:\brc.conf.5::' "${S}/man/man5/Makefile"
- sed -i -e 's:\brc.conf.local.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" "${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/"
- freebsd_src_compile || die "emake failed"
-}
-
-src_install() {
- mkmake -j1 DESTDIR="${D}" DOCDIR=/usr/share/doc/${PF} install || die "Install failed"
-}
diff --git a/sys-freebsd/freebsd-share/freebsd-share-9.2_rc1.ebuild b/sys-freebsd/freebsd-share/freebsd-share-9.2_rc1.ebuild
deleted file mode 100644
index 3f2eb5d9ee8e..000000000000
--- a/sys-freebsd/freebsd-share/freebsd-share-9.2_rc1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/freebsd-share-9.2_rc1.ebuild,v 1.2 2013/08/11 19:55:37 aballier Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD shared tools/files"
-SLOT="0"
-
-IUSE="doc zfs"
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
- 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
- zfs? ( mirror://gentoo/${CDDL}.tar.bz2 )"
-fi
-
-DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
- =sys-freebsd/freebsd-sources-${RV}*"
-RDEPEND="sys-apps/miscfiles"
-
-RESTRICT="strip"
-
-S="${WORKDIR}/share"
-
-pkg_setup() {
- use doc || mymakeopts="${mymakeopts} NO_SHAREDOCS= "
- use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-
- 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}-9.2-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 rc.conf manpage as it describes bsd's rc.conf.
- sed -i -e 's:\brc.conf.5::' "${S}/man/man5/Makefile"
- sed -i -e 's:\brc.conf.local.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" "${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/"
- freebsd_src_compile || die "emake failed"
-}
-
-src_install() {
- mkmake -j1 DESTDIR="${D}" DOCDIR=/usr/share/doc/${PF} install || die "Install failed"
-}
diff --git a/sys-freebsd/freebsd-share/freebsd-share-9.2_rc2.ebuild b/sys-freebsd/freebsd-share/freebsd-share-9.2_rc2.ebuild
deleted file mode 100644
index 46230ae71d80..000000000000
--- a/sys-freebsd/freebsd-share/freebsd-share-9.2_rc2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/freebsd-share-9.2_rc2.ebuild,v 1.1 2013/08/22 15:46:53 aballier Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD shared tools/files"
-SLOT="0"
-
-IUSE="doc zfs"
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
- 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
- zfs? ( mirror://gentoo/${CDDL}.tar.bz2 )"
-fi
-
-DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
- =sys-freebsd/freebsd-sources-${RV}*"
-RDEPEND="sys-apps/miscfiles"
-
-RESTRICT="strip"
-
-S="${WORKDIR}/share"
-
-pkg_setup() {
- use doc || mymakeopts="${mymakeopts} NO_SHAREDOCS= "
- use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-
- 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}-9.2-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 rc.conf manpage as it describes bsd's rc.conf.
- sed -i -e 's:\brc.conf.5::' "${S}/man/man5/Makefile"
- sed -i -e 's:\brc.conf.local.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" "${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/"
- freebsd_src_compile || die "emake failed"
-}
-
-src_install() {
- mkmake -j1 DESTDIR="${D}" DOCDIR=/usr/share/doc/${PF} install || die "Install failed"
-}
diff --git a/sys-freebsd/freebsd-share/freebsd-share-9.2_rc3.ebuild b/sys-freebsd/freebsd-share/freebsd-share-9.2_rc3.ebuild
deleted file mode 100644
index 5c4eb7da5b77..000000000000
--- a/sys-freebsd/freebsd-share/freebsd-share-9.2_rc3.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/freebsd-share-9.2_rc3.ebuild,v 1.1 2013/08/26 20:45:11 aballier Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD shared tools/files"
-SLOT="0"
-
-IUSE="doc zfs"
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
- 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
- zfs? ( mirror://gentoo/${CDDL}.tar.bz2 )"
-fi
-
-DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
- =sys-freebsd/freebsd-sources-${RV}*"
-RDEPEND="sys-apps/miscfiles"
-
-RESTRICT="strip"
-
-S="${WORKDIR}/share"
-
-pkg_setup() {
- use doc || mymakeopts="${mymakeopts} NO_SHAREDOCS= "
- use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-
- 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}-9.2-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 rc.conf manpage as it describes bsd's rc.conf.
- sed -i -e 's:\brc.conf.5::' "${S}/man/man5/Makefile"
- sed -i -e 's:\brc.conf.local.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" "${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/"
- freebsd_src_compile || 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 b948ea8743b8..06737ffbfa68 100644
--- a/sys-freebsd/freebsd-sources/ChangeLog
+++ b/sys-freebsd/freebsd-sources/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for sys-freebsd/freebsd-sources
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.111 2015/05/24 08:45:46 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.112 2015/05/24 11:24:01 mgorny Exp $
+
+ 24 May 2015; Michał Górny <mgorny@gentoo.org>
+ -files/freebsd-sources-9.2-gentoo.patch, -freebsd-sources-9.2.ebuild,
+ -freebsd-sources-9.2_rc1.ebuild, -freebsd-sources-9.2_rc2.ebuild,
+ -freebsd-sources-9.2_rc3.ebuild, metadata.xml:
+ Remove 9.2. Part of https://github.com/gentoo/gentoo-portage-rsync-
+ mirror/pull/126 by nigoro.
*freebsd-sources-10.1-r3 (24 May 2015)
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.2-gentoo.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.2-gentoo.patch
deleted file mode 100644
index 0aa1d6e9769b..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.2-gentoo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Nur sys.orig/conf/kern.mk sys/conf/kern.mk
---- sys.orig/conf/kern.mk 2012-12-31 17:51:27.000000000 +0900
-+++ sys/conf/kern.mk 2012-12-31 17:55:03.000000000 +0900
-@@ -5,7 +5,7 @@
- #
- 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 \
- -Wmissing-include-dirs -fdiagnostics-show-option \
- ${CWARNEXTRA}
- #
-@@ -52,7 +52,7 @@
- #
- .if ${MACHINE_CPUARCH} == "i386"
- .if ${COMPILER_TYPE} != "clang"
--CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2
-+CFLAGS+= -mpreferred-stack-boundary=2
- .else
- CFLAGS+= -mno-aes -mno-avx
- .endif
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-9.2.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-9.2.ebuild
deleted file mode 100644
index 16408d284140..000000000000
--- a/sys-freebsd/freebsd-sources/freebsd-sources-9.2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-9.2.ebuild,v 1.1 2013/11/09 09:18:11 aballier Exp $
-
-EAPI=5
-
-inherit bsdmk freebsd flag-o-matic toolchain-funcs
-
-DESCRIPTION="FreeBSD kernel sources"
-SLOT="0"
-
-IUSE="+build-generic dtrace profile"
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
- SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
-fi
-
-RDEPEND="dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
- =sys-freebsd/freebsd-mk-defs-${RV}*
- !sys-freebsd/virtio-kmod"
-DEPEND="build-generic? (
- dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
- >=sys-freebsd/freebsd-usbin-9.1
- =sys-freebsd/freebsd-mk-defs-${RV}*
- )"
-
-RESTRICT="strip binchecks"
-
-S="${WORKDIR}/sys"
-
-KERN_BUILD=GENERIC
-
-PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
- "${FILESDIR}/${PN}-9.2-gentoo.patch"
- "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
- "${FILESDIR}/${PN}-6.1-ntfs.patch"
- "${FILESDIR}/${PN}-7.1-types.h-fix.patch"
- "${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
- "${FILESDIR}/${PN}-7.1-includes.patch"
- "${FILESDIR}/${PN}-9.0-sysctluint.patch"
- "${FILESDIR}/${PN}-9.2-gentoo-gcc.patch"
- "${FILESDIR}/${PN}-7.0-tmpfs_whiteout_stub.patch" )
-
-src_prepare() {
- # 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 9.0-RELEASE it's 900001.
- sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=900001:g" \
- -i "${S}/conf/kern.pre.mk" \
- -i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version"
-
- # Remove -Werror
- sed -e "s:-Werror:-Wno-error:g" \
- -i "${S}/conf/kern.pre.mk" \
- -i "${S}/conf/kmod.mk" || die
-
- # Only used with USE=build-generic, let the kernel build with its own flags, its safer.
- unset LDFLAGS CFLAGS CXXFLAGS ASFLAGS KERNEL
-}
-
-src_configure() {
- if use build-generic ; then
- tc-export CC
- cd "${S}/$(tc-arch-kernel)/conf" || die
- config ${KERN_BUILD} || die
- fi
-}
-
-src_compile() {
- if use build-generic ; then
- local myconf
- use dtrace || myconf="-DNO_CTF "
-
- cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die
- freebsd_src_compile depend ${myconf}
- freebsd_src_compile ${myconf}
- else
- einfo "Nothing to compile.."
- fi
-}
-
-src_install() {
- if use build-generic ; then
- cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die
- freebsd_src_install
- rm -rf "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}"
- cd "${S}"
- fi
-
- insinto "/usr/src/sys"
- doins -r "${S}/"*
-}
-
-pkg_preinst() {
- if [[ -L "${ROOT}/usr/src/sys" ]]; then
- einfo "/usr/src/sys is a symlink, removing it..."
- rm -f "${ROOT}/usr/src/sys"
- 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-sources/freebsd-sources-9.2_rc1.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-9.2_rc1.ebuild
deleted file mode 100644
index 4e8579908ce9..000000000000
--- a/sys-freebsd/freebsd-sources/freebsd-sources-9.2_rc1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-9.2_rc1.ebuild,v 1.7 2013/08/14 17:33:34 aballier Exp $
-
-EAPI=5
-
-inherit bsdmk freebsd flag-o-matic toolchain-funcs
-
-DESCRIPTION="FreeBSD kernel sources"
-SLOT="0"
-
-IUSE="+build-generic dtrace profile"
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
- SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
-fi
-
-RDEPEND="dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
- =sys-freebsd/freebsd-mk-defs-${RV}*
- !sys-freebsd/virtio-kmod"
-DEPEND="build-generic? (
- dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
- >=sys-freebsd/freebsd-usbin-9.1
- =sys-freebsd/freebsd-mk-defs-${RV}*
- )"
-
-RESTRICT="strip binchecks"
-
-S="${WORKDIR}/sys"
-
-KERN_BUILD=GENERIC
-
-PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
- "${FILESDIR}/${PN}-9.2-gentoo.patch"
- "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
- "${FILESDIR}/${PN}-6.1-ntfs.patch"
- "${FILESDIR}/${PN}-7.1-types.h-fix.patch"
- "${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
- "${FILESDIR}/${PN}-7.1-includes.patch"
- "${FILESDIR}/${PN}-9.0-sysctluint.patch"
- "${FILESDIR}/${PN}-9.2-gentoo-gcc.patch"
- "${FILESDIR}/${PN}-7.0-tmpfs_whiteout_stub.patch" )
-
-src_prepare() {
- # 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 9.0-RELEASE it's 900001.
- sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=900001:g" \
- -i "${S}/conf/kern.pre.mk" \
- -i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version"
-
- # Remove -Werror
- sed -e "s:-Werror:-Wno-error:g" \
- -i "${S}/conf/kern.pre.mk" \
- -i "${S}/conf/kmod.mk" || die
-
- # Only used with USE=build-generic, let the kernel build with its own flags, its safer.
- unset LDFLAGS CFLAGS CXXFLAGS ASFLAGS KERNEL
-}
-
-src_configure() {
- if use build-generic ; then
- tc-export CC
- cd "${S}/$(tc-arch-kernel)/conf" || die
- config ${KERN_BUILD} || die
- fi
-}
-
-src_compile() {
- if use build-generic ; then
- local myconf
- use dtrace || myconf="-DNO_CTF "
-
- cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die
- freebsd_src_compile depend ${myconf}
- freebsd_src_compile ${myconf}
- else
- einfo "Nothing to compile.."
- fi
-}
-
-src_install() {
- if use build-generic ; then
- cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die
- freebsd_src_install
- rm -rf "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}"
- cd "${S}"
- fi
-
- insinto "/usr/src/sys"
- doins -r "${S}/"*
-}
-
-pkg_preinst() {
- if [[ -L "${ROOT}/usr/src/sys" ]]; then
- einfo "/usr/src/sys is a symlink, removing it..."
- rm -f "${ROOT}/usr/src/sys"
- 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-sources/freebsd-sources-9.2_rc2.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-9.2_rc2.ebuild
deleted file mode 100644
index a190b3f8c567..000000000000
--- a/sys-freebsd/freebsd-sources/freebsd-sources-9.2_rc2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-9.2_rc2.ebuild,v 1.1 2013/08/22 15:47:15 aballier Exp $
-
-EAPI=5
-
-inherit bsdmk freebsd flag-o-matic toolchain-funcs
-
-DESCRIPTION="FreeBSD kernel sources"
-SLOT="0"
-
-IUSE="+build-generic dtrace profile"
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
- SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
-fi
-
-RDEPEND="dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
- =sys-freebsd/freebsd-mk-defs-${RV}*
- !sys-freebsd/virtio-kmod"
-DEPEND="build-generic? (
- dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
- >=sys-freebsd/freebsd-usbin-9.1
- =sys-freebsd/freebsd-mk-defs-${RV}*
- )"
-
-RESTRICT="strip binchecks"
-
-S="${WORKDIR}/sys"
-
-KERN_BUILD=GENERIC
-
-PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
- "${FILESDIR}/${PN}-9.2-gentoo.patch"
- "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
- "${FILESDIR}/${PN}-6.1-ntfs.patch"
- "${FILESDIR}/${PN}-7.1-types.h-fix.patch"
- "${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
- "${FILESDIR}/${PN}-7.1-includes.patch"
- "${FILESDIR}/${PN}-9.0-sysctluint.patch"
- "${FILESDIR}/${PN}-9.2-gentoo-gcc.patch"
- "${FILESDIR}/${PN}-7.0-tmpfs_whiteout_stub.patch" )
-
-src_prepare() {
- # 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 9.0-RELEASE it's 900001.
- sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=900001:g" \
- -i "${S}/conf/kern.pre.mk" \
- -i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version"
-
- # Remove -Werror
- sed -e "s:-Werror:-Wno-error:g" \
- -i "${S}/conf/kern.pre.mk" \
- -i "${S}/conf/kmod.mk" || die
-
- # Only used with USE=build-generic, let the kernel build with its own flags, its safer.
- unset LDFLAGS CFLAGS CXXFLAGS ASFLAGS KERNEL
-}
-
-src_configure() {
- if use build-generic ; then
- tc-export CC
- cd "${S}/$(tc-arch-kernel)/conf" || die
- config ${KERN_BUILD} || die
- fi
-}
-
-src_compile() {
- if use build-generic ; then
- local myconf
- use dtrace || myconf="-DNO_CTF "
-
- cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die
- freebsd_src_compile depend ${myconf}
- freebsd_src_compile ${myconf}
- else
- einfo "Nothing to compile.."
- fi
-}
-
-src_install() {
- if use build-generic ; then
- cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die
- freebsd_src_install
- rm -rf "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}"
- cd "${S}"
- fi
-
- insinto "/usr/src/sys"
- doins -r "${S}/"*
-}
-
-pkg_preinst() {
- if [[ -L "${ROOT}/usr/src/sys" ]]; then
- einfo "/usr/src/sys is a symlink, removing it..."
- rm -f "${ROOT}/usr/src/sys"
- 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-sources/freebsd-sources-9.2_rc3.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-9.2_rc3.ebuild
deleted file mode 100644
index eb9dc9477e60..000000000000
--- a/sys-freebsd/freebsd-sources/freebsd-sources-9.2_rc3.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-9.2_rc3.ebuild,v 1.1 2013/08/26 20:45:33 aballier Exp $
-
-EAPI=5
-
-inherit bsdmk freebsd flag-o-matic toolchain-funcs
-
-DESCRIPTION="FreeBSD kernel sources"
-SLOT="0"
-
-IUSE="+build-generic dtrace profile"
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
- SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
-fi
-
-RDEPEND="dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
- =sys-freebsd/freebsd-mk-defs-${RV}*
- !sys-freebsd/virtio-kmod"
-DEPEND="build-generic? (
- dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
- >=sys-freebsd/freebsd-usbin-9.1
- =sys-freebsd/freebsd-mk-defs-${RV}*
- )"
-
-RESTRICT="strip binchecks"
-
-S="${WORKDIR}/sys"
-
-KERN_BUILD=GENERIC
-
-PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
- "${FILESDIR}/${PN}-9.2-gentoo.patch"
- "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
- "${FILESDIR}/${PN}-6.1-ntfs.patch"
- "${FILESDIR}/${PN}-7.1-types.h-fix.patch"
- "${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
- "${FILESDIR}/${PN}-7.1-includes.patch"
- "${FILESDIR}/${PN}-9.0-sysctluint.patch"
- "${FILESDIR}/${PN}-9.2-gentoo-gcc.patch"
- "${FILESDIR}/${PN}-7.0-tmpfs_whiteout_stub.patch" )
-
-src_prepare() {
- # 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 9.0-RELEASE it's 900001.
- sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=900001:g" \
- -i "${S}/conf/kern.pre.mk" \
- -i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version"
-
- # Remove -Werror
- sed -e "s:-Werror:-Wno-error:g" \
- -i "${S}/conf/kern.pre.mk" \
- -i "${S}/conf/kmod.mk" || die
-
- # Only used with USE=build-generic, let the kernel build with its own flags, its safer.
- unset LDFLAGS CFLAGS CXXFLAGS ASFLAGS KERNEL
-}
-
-src_configure() {
- if use build-generic ; then
- tc-export CC
- cd "${S}/$(tc-arch-kernel)/conf" || die
- config ${KERN_BUILD} || die
- fi
-}
-
-src_compile() {
- if use build-generic ; then
- local myconf
- use dtrace || myconf="-DNO_CTF "
-
- cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die
- freebsd_src_compile depend ${myconf}
- freebsd_src_compile ${myconf}
- else
- einfo "Nothing to compile.."
- fi
-}
-
-src_install() {
- if use build-generic ; then
- cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die
- freebsd_src_install
- rm -rf "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}"
- cd "${S}"
- fi
-
- insinto "/usr/src/sys"
- doins -r "${S}/"*
-}
-
-pkg_preinst() {
- if [[ -L "${ROOT}/usr/src/sys" ]]; then
- einfo "/usr/src/sys is a symlink, removing it..."
- rm -f "${ROOT}/usr/src/sys"
- 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-sources/metadata.xml b/sys-freebsd/freebsd-sources/metadata.xml
index efd5554a07c5..dfe9547a448b 100644
--- a/sys-freebsd/freebsd-sources/metadata.xml
+++ b/sys-freebsd/freebsd-sources/metadata.xml
@@ -3,7 +3,6 @@
<pkgmetadata>
<herd>bsd</herd>
<use>
- <flag name='build-generic'>Build and install a generic kernel (recommended).</flag>
<flag name='build-kernel'>Build and install a kernel (recommended).</flag>
<flag name='dtrace'>Enable DTrace support.</flag>
<flag name='zfs'>Enable ZFS support.</flag>
diff --git a/sys-freebsd/freebsd-ubin/ChangeLog b/sys-freebsd/freebsd-ubin/ChangeLog
index ed76e26a11b2..012b47ae2303 100644
--- a/sys-freebsd/freebsd-ubin/ChangeLog
+++ b/sys-freebsd/freebsd-ubin/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sys-freebsd/freebsd-ubin
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.101 2015/03/08 14:01:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.102 2015/05/24 11:24:02 mgorny Exp $
+
+ 24 May 2015; Michał Górny <mgorny@gentoo.org> -freebsd-ubin-9.2.ebuild,
+ -freebsd-ubin-9.2_rc1.ebuild, -freebsd-ubin-9.2_rc2.ebuild,
+ -freebsd-ubin-9.2_rc3.ebuild:
+ Remove 9.2. Part of https://github.com/gentoo/gentoo-portage-rsync-
+ mirror/pull/126 by nigoro.
*freebsd-ubin-10.1 (08 Mar 2015)
diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-9.2.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-9.2.ebuild
deleted file mode 100644
index 2547b386a6c2..000000000000
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-9.2.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/freebsd-ubin-9.2.ebuild,v 1.2 2014/01/05 00:56:44 naota Exp $
-
-EAPI=5
-
-inherit bsdmk freebsd flag-o-matic pam multilib multibuild multilib-build
-
-DESCRIPTION="FreeBSD's base system source for /usr/bin"
-SLOT="0"
-IUSE="ar atm audit bluetooth ipv6 kerberos netware nis ssl usb build zfs"
-LICENSE="BSD zfs? ( CDDL )"
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
- 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 )"
-fi
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,${MULTILIB_USEDEP}]
- ssl? ( dev-libs/openssl )
- kerberos? ( virtual/krb5 )
- ar? ( >=app-arch/libarchive-3 )
- virtual/pam
- sys-libs/zlib
- >=sys-libs/ncurses-5.9
- !sys-process/fuser-bsd
- !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}-9.0-fixmakefiles.patch"
- "${FILESDIR}/${PN}-setXid.patch"
- "${FILESDIR}/${PN}-lint-stdarg.patch"
- "${FILESDIR}/${PN}-9.1-kdump-ioctl.patch"
- "${FILESDIR}/${PN}-8.0-xinstall.patch"
- "${FILESDIR}/${PN}-9.1-bsdar.patch"
- "${FILESDIR}/${PN}-9.1-minigzip.patch"
- "${FILESDIR}/${PN}-9.1-grep.patch"
- "${FILESDIR}/${PN}-9.1-ar-libarchive3.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
-# - dc stuff
-# and the rest are misc utils we already provide somewhere else.
-REMOVE_SUBDIRS="bzip2 bzip2recover tar cpio
- gzip gprof
- lzmainfo xz xzdec
- unzip
- tput tset tabs
- 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
- bc dc
- whois tftp man"
-
-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= "
- mymakeopts="${mymakeopts} WITHOUT_CLANG= "
-}
-
-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" "${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
-}
-
-setup_multilib_vars() {
- if ! multilib_is_native_abi ; then
- cd "${WORKDIR}/usr.bin/ldd" || die
- export mymakeopts="${mymakeopts} PROG=ldd32 WITHOUT_MAN="
- else
- cd "${S}"
- fi
- "$@"
-}
-
-src_compile() {
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
- multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile
-}
-
-src_install() {
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
- multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_install
-
- # baselayout requires these in /bin
- dodir /bin
- for bin in sed printf ; 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
-
- # tip requires /var/spool/lock/, bug #200700
- keepdir /var/spool/lock
-
- # create locate database #472468
- local f=/var/db/locate.database
- mkdir "${ED}${f%/*}" || die
- touch "${ED}${f}" || die
- fowners nobody:nobody ${f}
-}
-
-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/freebsd-ubin-9.2_rc1.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-9.2_rc1.ebuild
deleted file mode 100644
index 09b859e4014c..000000000000
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-9.2_rc1.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/freebsd-ubin-9.2_rc1.ebuild,v 1.2 2013/08/11 19:56:18 aballier Exp $
-
-EAPI=5
-
-inherit bsdmk freebsd flag-o-matic pam multilib multibuild multilib-build
-
-DESCRIPTION="FreeBSD's base system source for /usr/bin"
-SLOT="0"
-IUSE="ar atm audit bluetooth ipv6 kerberos netware nis ssl usb build zfs"
-LICENSE="BSD zfs? ( CDDL )"
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
- 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 )"
-fi
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,${MULTILIB_USEDEP}]
- ssl? ( dev-libs/openssl )
- kerberos? ( virtual/krb5 )
- ar? ( >=app-arch/libarchive-3 )
- virtual/pam
- sys-libs/zlib
- >=sys-libs/ncurses-5.9
- !sys-process/fuser-bsd
- !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}-9.0-fixmakefiles.patch"
- "${FILESDIR}/${PN}-setXid.patch"
- "${FILESDIR}/${PN}-lint-stdarg.patch"
- "${FILESDIR}/${PN}-9.1-kdump-ioctl.patch"
- "${FILESDIR}/${PN}-8.0-xinstall.patch"
- "${FILESDIR}/${PN}-9.1-bsdar.patch"
- "${FILESDIR}/${PN}-9.1-minigzip.patch"
- "${FILESDIR}/${PN}-9.1-grep.patch"
- "${FILESDIR}/${PN}-9.1-ar-libarchive3.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
-# - dc stuff
-# and the rest are misc utils we already provide somewhere else.
-REMOVE_SUBDIRS="bzip2 bzip2recover tar cpio
- gzip gprof
- lzmainfo xz xzdec
- unzip
- tput tset tabs
- 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
- bc dc
- whois tftp man"
-
-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= "
- mymakeopts="${mymakeopts} WITHOUT_CLANG= "
-}
-
-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" "${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
-}
-
-setup_multilib_vars() {
- if ! multilib_is_native_abi ; then
- cd "${WORKDIR}/usr.bin/ldd" || die
- export mymakeopts="${mymakeopts} PROG=ldd32 WITHOUT_MAN="
- else
- cd "${S}"
- fi
- "$@"
-}
-
-src_compile() {
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
- multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile
-}
-
-src_install() {
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
- multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_install
-
- # baselayout requires these in /bin
- dodir /bin
- for bin in sed printf fuser; 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
-
- # tip requires /var/spool/lock/, bug #200700
- keepdir /var/spool/lock
-}
-
-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/freebsd-ubin-9.2_rc2.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-9.2_rc2.ebuild
deleted file mode 100644
index bc2aefe9ce7e..000000000000
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-9.2_rc2.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/freebsd-ubin-9.2_rc2.ebuild,v 1.1 2013/08/22 15:47:37 aballier Exp $
-
-EAPI=5
-
-inherit bsdmk freebsd flag-o-matic pam multilib multibuild multilib-build
-
-DESCRIPTION="FreeBSD's base system source for /usr/bin"
-SLOT="0"
-IUSE="ar atm audit bluetooth ipv6 kerberos netware nis ssl usb build zfs"
-LICENSE="BSD zfs? ( CDDL )"
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
- 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 )"
-fi
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,${MULTILIB_USEDEP}]
- ssl? ( dev-libs/openssl )
- kerberos? ( virtual/krb5 )
- ar? ( >=app-arch/libarchive-3 )
- virtual/pam
- sys-libs/zlib
- >=sys-libs/ncurses-5.9
- !sys-process/fuser-bsd
- !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}-9.0-fixmakefiles.patch"
- "${FILESDIR}/${PN}-setXid.patch"
- "${FILESDIR}/${PN}-lint-stdarg.patch"
- "${FILESDIR}/${PN}-9.1-kdump-ioctl.patch"
- "${FILESDIR}/${PN}-8.0-xinstall.patch"
- "${FILESDIR}/${PN}-9.1-bsdar.patch"
- "${FILESDIR}/${PN}-9.1-minigzip.patch"
- "${FILESDIR}/${PN}-9.1-grep.patch"
- "${FILESDIR}/${PN}-9.1-ar-libarchive3.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
-# - dc stuff
-# and the rest are misc utils we already provide somewhere else.
-REMOVE_SUBDIRS="bzip2 bzip2recover tar cpio
- gzip gprof
- lzmainfo xz xzdec
- unzip
- tput tset tabs
- 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
- bc dc
- whois tftp man"
-
-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= "
- mymakeopts="${mymakeopts} WITHOUT_CLANG= "
-}
-
-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" "${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
-}
-
-setup_multilib_vars() {
- if ! multilib_is_native_abi ; then
- cd "${WORKDIR}/usr.bin/ldd" || die
- export mymakeopts="${mymakeopts} PROG=ldd32 WITHOUT_MAN="
- else
- cd "${S}"
- fi
- "$@"
-}
-
-src_compile() {
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
- multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile
-}
-
-src_install() {
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
- multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_install
-
- # baselayout requires these in /bin
- dodir /bin
- for bin in sed printf fuser; 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
-
- # tip requires /var/spool/lock/, bug #200700
- keepdir /var/spool/lock
-}
-
-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/freebsd-ubin-9.2_rc3.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-9.2_rc3.ebuild
deleted file mode 100644
index 8206dea8e68e..000000000000
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-9.2_rc3.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/freebsd-ubin-9.2_rc3.ebuild,v 1.2 2013/08/28 15:33:17 aballier Exp $
-
-EAPI=5
-
-inherit bsdmk freebsd flag-o-matic pam multilib multibuild multilib-build
-
-DESCRIPTION="FreeBSD's base system source for /usr/bin"
-SLOT="0"
-IUSE="ar atm audit bluetooth ipv6 kerberos netware nis ssl usb build zfs"
-LICENSE="BSD zfs? ( CDDL )"
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
- 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 )"
-fi
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,${MULTILIB_USEDEP}]
- ssl? ( dev-libs/openssl )
- kerberos? ( virtual/krb5 )
- ar? ( >=app-arch/libarchive-3 )
- virtual/pam
- sys-libs/zlib
- >=sys-libs/ncurses-5.9
- !sys-process/fuser-bsd
- !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}-9.0-fixmakefiles.patch"
- "${FILESDIR}/${PN}-setXid.patch"
- "${FILESDIR}/${PN}-lint-stdarg.patch"
- "${FILESDIR}/${PN}-9.1-kdump-ioctl.patch"
- "${FILESDIR}/${PN}-8.0-xinstall.patch"
- "${FILESDIR}/${PN}-9.1-bsdar.patch"
- "${FILESDIR}/${PN}-9.1-minigzip.patch"
- "${FILESDIR}/${PN}-9.1-grep.patch"
- "${FILESDIR}/${PN}-9.1-ar-libarchive3.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
-# - dc stuff
-# and the rest are misc utils we already provide somewhere else.
-REMOVE_SUBDIRS="bzip2 bzip2recover tar cpio
- gzip gprof
- lzmainfo xz xzdec
- unzip
- tput tset tabs
- 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
- bc dc
- whois tftp man"
-
-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= "
- mymakeopts="${mymakeopts} WITHOUT_CLANG= "
-}
-
-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" "${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
-}
-
-setup_multilib_vars() {
- if ! multilib_is_native_abi ; then
- cd "${WORKDIR}/usr.bin/ldd" || die
- export mymakeopts="${mymakeopts} PROG=ldd32 WITHOUT_MAN="
- else
- cd "${S}"
- fi
- "$@"
-}
-
-src_compile() {
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
- multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile
-}
-
-src_install() {
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
- multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_install
-
- # baselayout requires these in /bin
- dodir /bin
- for bin in sed printf ; 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
-
- # tip requires /var/spool/lock/, bug #200700
- keepdir /var/spool/lock
-}
-
-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-usbin/ChangeLog b/sys-freebsd/freebsd-usbin/ChangeLog
index 8aedf705e0a4..10a2cf419635 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-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.99 2015/03/08 14:01:57 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.100 2015/05/24 11:24:02 mgorny Exp $
+
+ 24 May 2015; Michał Górny <mgorny@gentoo.org> -freebsd-usbin-9.2.ebuild,
+ -freebsd-usbin-9.2_rc1.ebuild, -freebsd-usbin-9.2_rc2.ebuild,
+ -freebsd-usbin-9.2_rc3.ebuild:
+ Remove 9.2. Part of https://github.com/gentoo/gentoo-portage-rsync-
+ mirror/pull/126 by nigoro.
*freebsd-usbin-10.1 (08 Mar 2015)
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-9.2.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-9.2.ebuild
deleted file mode 100644
index d22d7f2c1a6e..000000000000
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-9.2.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-9.2.ebuild,v 1.1 2013/11/09 09:18:35 aballier Exp $
-
-EAPI=2
-
-inherit bsdmk freebsd flag-o-matic eutils
-
-DESCRIPTION="FreeBSD /usr/sbin tools"
-SLOT="0"
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~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 )"
-fi
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,netware?]
- =sys-freebsd/freebsd-libexec-${RV}*
- =sys-freebsd/freebsd-contrib-${RV}*
- acpi? ( sys-power/iasl )
- build? ( sys-apps/baselayout )
- ssl? ( dev-libs/openssl )
- >=app-arch/libarchive-3
- sys-apps/tcp-wrappers
- dev-util/dialog
- >=dev-libs/libedit-20120311.3.0-r1
- net-libs/libpcap
- kerberos? ( app-crypt/heimdal )"
-DEPEND="${RDEPEND}
- =sys-freebsd/freebsd-mk-defs-${RV}*
- =sys-freebsd/freebsd-ubin-${RV}*
- !build? ( =sys-freebsd/freebsd-sources-${RV}* )
- sys-apps/texinfo
- sys-devel/flex"
-
-S="${WORKDIR}/usr.sbin"
-
-IUSE="acpi atm audit bluetooth floppy ipv6 kerberos minimal netware nis pam ssl 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 netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
- use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
- use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= "
- use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
- use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
- use floppy || mymakeopts="${mymakeopts} WITHOUT_FLOPPY= "
- use kerberos || mymakeopts="${mymakeopts} WITHOUT_GSSAPI= "
-
- mymakeopts="${mymakeopts} WITHOUT_BIND_NAMED= WITHOUT_BIND_DNSSEC= WITHOUT_PF= WITHOUT_LPR= WITHOUT_SENDMAIL= WITHOUT_AUTHPF= WITHOUT_MAILWRAPPER= "
-
- append-flags $(test-flags -fno-strict-aliasing)
-}
-
-PATCHES=(
- "${FILESDIR}/${PN}-adduser.patch"
- "${FILESDIR}/${PN}-9.0-newsyslog.patch"
- "${FILESDIR}/${PN}-9.1-bsdxml2expat.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 pkg_install freebsd-update service sysrc"
-
-src_prepare() {
- if ! use build; then
- ln -s "/usr/src/sys" "${WORKDIR}/sys"
- ln -s "/usr/include" "${WORKDIR}/include"
- else
- dummy_mk mount_smbfs
- fi
- # Don't install mtree format manpage
- # it's installed by libarchive.
- sed -e "s: mtree.5::g" -i "${S}"/mtree/Makefile
-}
-
-src_compile() {
- # Preparing to build nmtree
- cd "${WORKDIR}/lib/libnetbsd"
- freebsd_src_compile
-
- cd "${S}"
- freebsd_src_compile
-}
-
-src_install() {
- # By creating these directories we avoid having to do a
- # more complex hack
- dodir /usr/share/doc
- dodir /sbin
- dodir /usr/libexec
- dodir /usr/bin
-
- # FILESDIR is used by some makefiles which will install files
- # in the wrong place, just put it in the doc directory.
- mkinstall DOCDIR=/usr/share/doc/${PF} || die "Install failed"
-
- # Most of these now come from openrc.
- for util in nfs rpc.statd rpc.lockd; do
- newinitd "${FILESDIR}/"${util}.initd ${util} || die
- if [[ -e "${FILESDIR}"/${util}.confd ]]; then \
- newconfd "${FILESDIR}"/${util}.confd ${util} || die
- fi
- done
-
- for class in daily monthly weekly; do
- cat - > "${T}/periodic.${class}" <<EOS
-#!/bin/sh
-/usr/sbin/periodic ${class}
-EOS
- exeinto /etc/cron.${class}
- newexe "${T}/periodic.${class}" periodic
- done
-
- # Install the pw.conf file to let pw use Gentoo's skel location
- insinto /etc
- doins "${FILESDIR}/pw.conf" || die
-
- cd "${WORKDIR}/etc"
- doins apmd.conf syslog.conf newsyslog.conf nscd.conf || die
-
- insinto /etc/ppp
- doins ppp/ppp.conf || die
-
- if use bluetooth; then
- insinto /etc/bluetooth
- doins bluetooth/* || die
- rm -f "${D}"/etc/bluetooth/Makefile
- fi
-
- # Install the periodic stuff (needs probably to be ported in a more
- # gentooish way)
- cd "${WORKDIR}/etc/periodic"
-
- doperiodic daily daily/*.accounting
- doperiodic monthly monthly/*.accounting
-}
-
-pkg_postinst() {
- # We need to run pwd_mkdb if key files are not present
- # If they are, then there is no need to run pwd_mkdb
- if [[ ! -e "${ROOT}etc/passwd" || ! -e "${ROOT}etc/pwd.db" || ! -e "${ROOT}etc/spwd.db" ]] ; then
- if [[ -e "${ROOT}etc/master.passwd" ]] ; then
- einfo "Generating passwd files from ${ROOT}etc/master.passwd"
- "${ROOT}"usr/sbin/pwd_mkdb -p -d "${ROOT}etc" "${ROOT}etc/master.passwd"
- else
- eerror "${ROOT}etc/master.passwd does not exist!"
- eerror "You will no be able to log into your system!"
- fi
- fi
-
- for logfile in messages security auth.log maillog lpd-errs xferlog cron \
- debug.log slip.log ppp.log; do
- [[ -f "${ROOT}/var/log/${logfile}" ]] || touch "${ROOT}/var/log/${logfile}"
- done
-}
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-9.2_rc1.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-9.2_rc1.ebuild
deleted file mode 100644
index 73c66ad7eb2e..000000000000
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-9.2_rc1.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-9.2_rc1.ebuild,v 1.3 2013/08/11 20:37:26 aballier Exp $
-
-EAPI=2
-
-inherit bsdmk freebsd flag-o-matic eutils
-
-DESCRIPTION="FreeBSD /usr/sbin tools"
-SLOT="0"
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~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 )"
-fi
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,netware?]
- =sys-freebsd/freebsd-libexec-${RV}*
- =sys-freebsd/freebsd-contrib-${RV}*
- acpi? ( sys-power/iasl )
- build? ( sys-apps/baselayout )
- ssl? ( dev-libs/openssl )
- >=app-arch/libarchive-3
- sys-apps/tcp-wrappers
- dev-util/dialog
- >=dev-libs/libedit-20120311.3.0-r1
- net-libs/libpcap
- kerberos? ( app-crypt/heimdal )"
-DEPEND="${RDEPEND}
- =sys-freebsd/freebsd-mk-defs-${RV}*
- =sys-freebsd/freebsd-ubin-${RV}*
- !build? ( =sys-freebsd/freebsd-sources-${RV}* )
- sys-apps/texinfo
- sys-devel/flex"
-
-S="${WORKDIR}/usr.sbin"
-
-IUSE="acpi atm audit bluetooth floppy ipv6 kerberos minimal netware nis pam ssl 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 netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
- use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
- use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= "
- use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
- use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
- use floppy || mymakeopts="${mymakeopts} WITHOUT_FLOPPY= "
- use kerberos || mymakeopts="${mymakeopts} WITHOUT_GSSAPI= "
-
- mymakeopts="${mymakeopts} WITHOUT_BIND_NAMED= WITHOUT_BIND_DNSSEC= WITHOUT_PF= WITHOUT_LPR= WITHOUT_SENDMAIL= WITHOUT_AUTHPF= WITHOUT_MAILWRAPPER= "
-
- append-flags $(test-flags -fno-strict-aliasing)
-}
-
-PATCHES=(
- "${FILESDIR}/${PN}-adduser.patch"
- "${FILESDIR}/${PN}-9.0-newsyslog.patch"
- "${FILESDIR}/${PN}-9.1-bsdxml2expat.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 pkg_install freebsd-update service sysrc"
-
-src_prepare() {
- if ! use build; then
- ln -s "/usr/src/sys" "${WORKDIR}/sys"
- ln -s "/usr/include" "${WORKDIR}/include"
- else
- dummy_mk mount_smbfs
- fi
- # Don't install mtree format manpage
- # it's installed by libarchive.
- sed -e "s: mtree.5::g" -i "${S}"/mtree/Makefile
-}
-
-src_compile() {
- # Preparing to build nmtree
- cd "${WORKDIR}/lib/libnetbsd"
- freebsd_src_compile
-
- cd "${S}"
- freebsd_src_compile
-}
-
-src_install() {
- # By creating these directories we avoid having to do a
- # more complex hack
- dodir /usr/share/doc
- dodir /sbin
- dodir /usr/libexec
- dodir /usr/bin
-
- # FILESDIR is used by some makefiles which will install files
- # in the wrong place, just put it in the doc directory.
- mkinstall DOCDIR=/usr/share/doc/${PF} || die "Install failed"
-
- # Most of these now come from openrc.
- for util in nfs rpc.statd rpc.lockd; do
- newinitd "${FILESDIR}/"${util}.initd ${util} || die
- if [[ -e "${FILESDIR}"/${util}.confd ]]; then \
- newconfd "${FILESDIR}"/${util}.confd ${util} || die
- fi
- done
-
- for class in daily monthly weekly; do
- cat - > "${T}/periodic.${class}" <<EOS
-#!/bin/sh
-/usr/sbin/periodic ${class}
-EOS
- exeinto /etc/cron.${class}
- newexe "${T}/periodic.${class}" periodic
- done
-
- # Install the pw.conf file to let pw use Gentoo's skel location
- insinto /etc
- doins "${FILESDIR}/pw.conf" || die
-
- cd "${WORKDIR}/etc"
- doins apmd.conf syslog.conf newsyslog.conf nscd.conf || die
-
- insinto /etc/ppp
- doins ppp/ppp.conf || die
-
- if use bluetooth; then
- insinto /etc/bluetooth
- doins bluetooth/* || die
- rm -f "${D}"/etc/bluetooth/Makefile
- fi
-
- # Install the periodic stuff (needs probably to be ported in a more
- # gentooish way)
- cd "${WORKDIR}/etc/periodic"
-
- doperiodic daily daily/*.accounting
- doperiodic monthly monthly/*.accounting
-}
-
-pkg_postinst() {
- # We need to run pwd_mkdb if key files are not present
- # If they are, then there is no need to run pwd_mkdb
- if [[ ! -e "${ROOT}etc/passwd" || ! -e "${ROOT}etc/pwd.db" || ! -e "${ROOT}etc/spwd.db" ]] ; then
- if [[ -e "${ROOT}etc/master.passwd" ]] ; then
- einfo "Generating passwd files from ${ROOT}etc/master.passwd"
- "${ROOT}"usr/sbin/pwd_mkdb -p -d "${ROOT}etc" "${ROOT}etc/master.passwd"
- else
- eerror "${ROOT}etc/master.passwd does not exist!"
- eerror "You will no be able to log into your system!"
- fi
- fi
-
- for logfile in messages security auth.log maillog lpd-errs xferlog cron \
- debug.log slip.log ppp.log; do
- [[ -f "${ROOT}/var/log/${logfile}" ]] || touch "${ROOT}/var/log/${logfile}"
- done
-}
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-9.2_rc2.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-9.2_rc2.ebuild
deleted file mode 100644
index f00892ce4ce4..000000000000
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-9.2_rc2.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-9.2_rc2.ebuild,v 1.1 2013/08/22 15:47:59 aballier Exp $
-
-EAPI=2
-
-inherit bsdmk freebsd flag-o-matic eutils
-
-DESCRIPTION="FreeBSD /usr/sbin tools"
-SLOT="0"
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~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 )"
-fi
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,netware?]
- =sys-freebsd/freebsd-libexec-${RV}*
- =sys-freebsd/freebsd-contrib-${RV}*
- acpi? ( sys-power/iasl )
- build? ( sys-apps/baselayout )
- ssl? ( dev-libs/openssl )
- >=app-arch/libarchive-3
- sys-apps/tcp-wrappers
- dev-util/dialog
- >=dev-libs/libedit-20120311.3.0-r1
- net-libs/libpcap
- kerberos? ( app-crypt/heimdal )"
-DEPEND="${RDEPEND}
- =sys-freebsd/freebsd-mk-defs-${RV}*
- =sys-freebsd/freebsd-ubin-${RV}*
- !build? ( =sys-freebsd/freebsd-sources-${RV}* )
- sys-apps/texinfo
- sys-devel/flex"
-
-S="${WORKDIR}/usr.sbin"
-
-IUSE="acpi atm audit bluetooth floppy ipv6 kerberos minimal netware nis pam ssl 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 netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
- use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
- use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= "
- use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
- use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
- use floppy || mymakeopts="${mymakeopts} WITHOUT_FLOPPY= "
- use kerberos || mymakeopts="${mymakeopts} WITHOUT_GSSAPI= "
-
- mymakeopts="${mymakeopts} WITHOUT_BIND_NAMED= WITHOUT_BIND_DNSSEC= WITHOUT_PF= WITHOUT_LPR= WITHOUT_SENDMAIL= WITHOUT_AUTHPF= WITHOUT_MAILWRAPPER= "
-
- append-flags $(test-flags -fno-strict-aliasing)
-}
-
-PATCHES=(
- "${FILESDIR}/${PN}-adduser.patch"
- "${FILESDIR}/${PN}-9.0-newsyslog.patch"
- "${FILESDIR}/${PN}-9.1-bsdxml2expat.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 pkg_install freebsd-update service sysrc"
-
-src_prepare() {
- if ! use build; then
- ln -s "/usr/src/sys" "${WORKDIR}/sys"
- ln -s "/usr/include" "${WORKDIR}/include"
- else
- dummy_mk mount_smbfs
- fi
- # Don't install mtree format manpage
- # it's installed by libarchive.
- sed -e "s: mtree.5::g" -i "${S}"/mtree/Makefile
-}
-
-src_compile() {
- # Preparing to build nmtree
- cd "${WORKDIR}/lib/libnetbsd"
- freebsd_src_compile
-
- cd "${S}"
- freebsd_src_compile
-}
-
-src_install() {
- # By creating these directories we avoid having to do a
- # more complex hack
- dodir /usr/share/doc
- dodir /sbin
- dodir /usr/libexec
- dodir /usr/bin
-
- # FILESDIR is used by some makefiles which will install files
- # in the wrong place, just put it in the doc directory.
- mkinstall DOCDIR=/usr/share/doc/${PF} || die "Install failed"
-
- # Most of these now come from openrc.
- for util in nfs rpc.statd rpc.lockd; do
- newinitd "${FILESDIR}/"${util}.initd ${util} || die
- if [[ -e "${FILESDIR}"/${util}.confd ]]; then \
- newconfd "${FILESDIR}"/${util}.confd ${util} || die
- fi
- done
-
- for class in daily monthly weekly; do
- cat - > "${T}/periodic.${class}" <<EOS
-#!/bin/sh
-/usr/sbin/periodic ${class}
-EOS
- exeinto /etc/cron.${class}
- newexe "${T}/periodic.${class}" periodic
- done
-
- # Install the pw.conf file to let pw use Gentoo's skel location
- insinto /etc
- doins "${FILESDIR}/pw.conf" || die
-
- cd "${WORKDIR}/etc"
- doins apmd.conf syslog.conf newsyslog.conf nscd.conf || die
-
- insinto /etc/ppp
- doins ppp/ppp.conf || die
-
- if use bluetooth; then
- insinto /etc/bluetooth
- doins bluetooth/* || die
- rm -f "${D}"/etc/bluetooth/Makefile
- fi
-
- # Install the periodic stuff (needs probably to be ported in a more
- # gentooish way)
- cd "${WORKDIR}/etc/periodic"
-
- doperiodic daily daily/*.accounting
- doperiodic monthly monthly/*.accounting
-}
-
-pkg_postinst() {
- # We need to run pwd_mkdb if key files are not present
- # If they are, then there is no need to run pwd_mkdb
- if [[ ! -e "${ROOT}etc/passwd" || ! -e "${ROOT}etc/pwd.db" || ! -e "${ROOT}etc/spwd.db" ]] ; then
- if [[ -e "${ROOT}etc/master.passwd" ]] ; then
- einfo "Generating passwd files from ${ROOT}etc/master.passwd"
- "${ROOT}"usr/sbin/pwd_mkdb -p -d "${ROOT}etc" "${ROOT}etc/master.passwd"
- else
- eerror "${ROOT}etc/master.passwd does not exist!"
- eerror "You will no be able to log into your system!"
- fi
- fi
-
- for logfile in messages security auth.log maillog lpd-errs xferlog cron \
- debug.log slip.log ppp.log; do
- [[ -f "${ROOT}/var/log/${logfile}" ]] || touch "${ROOT}/var/log/${logfile}"
- done
-}
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-9.2_rc3.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-9.2_rc3.ebuild
deleted file mode 100644
index f18a71655450..000000000000
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-9.2_rc3.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-9.2_rc3.ebuild,v 1.1 2013/08/26 20:46:17 aballier Exp $
-
-EAPI=2
-
-inherit bsdmk freebsd flag-o-matic eutils
-
-DESCRIPTION="FreeBSD /usr/sbin tools"
-SLOT="0"
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~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 )"
-fi
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,netware?]
- =sys-freebsd/freebsd-libexec-${RV}*
- =sys-freebsd/freebsd-contrib-${RV}*
- acpi? ( sys-power/iasl )
- build? ( sys-apps/baselayout )
- ssl? ( dev-libs/openssl )
- >=app-arch/libarchive-3
- sys-apps/tcp-wrappers
- dev-util/dialog
- >=dev-libs/libedit-20120311.3.0-r1
- net-libs/libpcap
- kerberos? ( app-crypt/heimdal )"
-DEPEND="${RDEPEND}
- =sys-freebsd/freebsd-mk-defs-${RV}*
- =sys-freebsd/freebsd-ubin-${RV}*
- !build? ( =sys-freebsd/freebsd-sources-${RV}* )
- sys-apps/texinfo
- sys-devel/flex"
-
-S="${WORKDIR}/usr.sbin"
-
-IUSE="acpi atm audit bluetooth floppy ipv6 kerberos minimal netware nis pam ssl 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 netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
- use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
- use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= "
- use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
- use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
- use floppy || mymakeopts="${mymakeopts} WITHOUT_FLOPPY= "
- use kerberos || mymakeopts="${mymakeopts} WITHOUT_GSSAPI= "
-
- mymakeopts="${mymakeopts} WITHOUT_BIND_NAMED= WITHOUT_BIND_DNSSEC= WITHOUT_PF= WITHOUT_LPR= WITHOUT_SENDMAIL= WITHOUT_AUTHPF= WITHOUT_MAILWRAPPER= "
-
- append-flags $(test-flags -fno-strict-aliasing)
-}
-
-PATCHES=(
- "${FILESDIR}/${PN}-adduser.patch"
- "${FILESDIR}/${PN}-9.0-newsyslog.patch"
- "${FILESDIR}/${PN}-9.1-bsdxml2expat.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 pkg_install freebsd-update service sysrc"
-
-src_prepare() {
- if ! use build; then
- ln -s "/usr/src/sys" "${WORKDIR}/sys"
- ln -s "/usr/include" "${WORKDIR}/include"
- else
- dummy_mk mount_smbfs
- fi
- # Don't install mtree format manpage
- # it's installed by libarchive.
- sed -e "s: mtree.5::g" -i "${S}"/mtree/Makefile
-}
-
-src_compile() {
- # Preparing to build nmtree
- cd "${WORKDIR}/lib/libnetbsd"
- freebsd_src_compile
-
- cd "${S}"
- freebsd_src_compile
-}
-
-src_install() {
- # By creating these directories we avoid having to do a
- # more complex hack
- dodir /usr/share/doc
- dodir /sbin
- dodir /usr/libexec
- dodir /usr/bin
-
- # FILESDIR is used by some makefiles which will install files
- # in the wrong place, just put it in the doc directory.
- mkinstall DOCDIR=/usr/share/doc/${PF} || die "Install failed"
-
- # Most of these now come from openrc.
- for util in nfs rpc.statd rpc.lockd; do
- newinitd "${FILESDIR}/"${util}.initd ${util} || die
- if [[ -e "${FILESDIR}"/${util}.confd ]]; then \
- newconfd "${FILESDIR}"/${util}.confd ${util} || die
- fi
- done
-
- for class in daily monthly weekly; do
- cat - > "${T}/periodic.${class}" <<EOS
-#!/bin/sh
-/usr/sbin/periodic ${class}
-EOS
- exeinto /etc/cron.${class}
- newexe "${T}/periodic.${class}" periodic
- done
-
- # Install the pw.conf file to let pw use Gentoo's skel location
- insinto /etc
- doins "${FILESDIR}/pw.conf" || die
-
- cd "${WORKDIR}/etc"
- doins apmd.conf syslog.conf newsyslog.conf nscd.conf || die
-
- insinto /etc/ppp
- doins ppp/ppp.conf || die
-
- 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
-}