summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2010-03-11 11:02:32 +0000
committerAlexis Ballier <aballier@gentoo.org>2010-03-11 11:02:32 +0000
commitd80a4b11c2a971811f03ca09429397f5bd3c7b79 (patch)
tree230926b959175ecffecf3e8fb98326c193f5006c /sys-freebsd
parentVersion bump. Use pregenerated docs and install to correct path wrt #294276. (diff)
downloadhistorical-d80a4b11c2a971811f03ca09429397f5bd3c7b79.tar.gz
historical-d80a4b11c2a971811f03ca09429397f5bd3c7b79.tar.bz2
historical-d80a4b11c2a971811f03ca09429397f5bd3c7b79.zip
remove old
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'sys-freebsd')
-rw-r--r--sys-freebsd/freebsd-cddl/ChangeLog8
-rw-r--r--sys-freebsd/freebsd-cddl/freebsd-cddl-7.1-r1.ebuild57
-rw-r--r--sys-freebsd/freebsd-contrib/ChangeLog8
-rw-r--r--sys-freebsd/freebsd-contrib/freebsd-contrib-6.2.ebuild56
-rw-r--r--sys-freebsd/freebsd-contrib/freebsd-contrib-7.1.ebuild56
-rw-r--r--sys-freebsd/freebsd-rescue/ChangeLog9
-rw-r--r--sys-freebsd/freebsd-rescue/files/freebsd-rescue-5.4-sbin-gentoo.patch21
-rw-r--r--sys-freebsd/freebsd-rescue/freebsd-rescue-6.2.ebuild51
-rw-r--r--sys-freebsd/freebsd-rescue/freebsd-rescue-7.1.ebuild51
-rw-r--r--sys-freebsd/freebsd-share/ChangeLog7
-rw-r--r--sys-freebsd/freebsd-share/freebsd-share-6.2.ebuild77
-rw-r--r--sys-freebsd/freebsd-share/freebsd-share-7.1.ebuild82
-rw-r--r--sys-freebsd/freebsd-share/freebsd-share-7.2.ebuild82
-rw-r--r--sys-freebsd/freebsd-ubin/ChangeLog10
-rw-r--r--sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.1-gcc41.patch35
-rw-r--r--sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.2-make-sinclude.patch60
-rw-r--r--sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.2-rpcgen-gcc4.1.patch131
-rw-r--r--sys-freebsd/freebsd-ubin/freebsd-ubin-6.2-r2.ebuild122
-rw-r--r--sys-freebsd/freebsd-ubin/freebsd-ubin-7.1-r1.ebuild137
-rw-r--r--sys-freebsd/freebsd-usbin/ChangeLog12
-rw-r--r--sys-freebsd/freebsd-usbin/files/freebsd-usbin-6.0-fixmakefiles.patch24
-rw-r--r--sys-freebsd/freebsd-usbin/files/freebsd-usbin-6.1-gcc41.patch18
-rw-r--r--sys-freebsd/freebsd-usbin/files/freebsd-usbin-6.1-nowrap.patch48
-rw-r--r--sys-freebsd/freebsd-usbin/files/freebsd-usbin-6.2_rc2-libedit-netbsd.patch13
-rw-r--r--sys-freebsd/freebsd-usbin/freebsd-usbin-6.2-r1.ebuild176
-rw-r--r--sys-freebsd/freebsd-usbin/freebsd-usbin-7.1-r2.ebuild171
-rw-r--r--sys-freebsd/freebsd-usbin/metadata.xml4
27 files changed, 43 insertions, 1483 deletions
diff --git a/sys-freebsd/freebsd-cddl/ChangeLog b/sys-freebsd/freebsd-cddl/ChangeLog
index 57daff0f88c0..8203d6b5a808 100644
--- a/sys-freebsd/freebsd-cddl/ChangeLog
+++ b/sys-freebsd/freebsd-cddl/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-freebsd/freebsd-cddl
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/ChangeLog,v 1.7 2009/05/22 14:40:03 aballier Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/ChangeLog,v 1.8 2010/03/11 10:58:55 aballier Exp $
+
+ 11 Mar 2010; Alexis Ballier <aballier@gentoo.org>
+ -freebsd-cddl-7.1-r1.ebuild:
+ remove old
22 May 2009; Alexis Ballier <aballier@gentoo.org> freebsd-cddl-7.2.ebuild:
make PATCHES a bash array
diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-7.1-r1.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-7.1-r1.ebuild
deleted file mode 100644
index ad7c176339c5..000000000000
--- a/sys-freebsd/freebsd-cddl/freebsd-cddl-7.1-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/freebsd-cddl-7.1-r1.ebuild,v 1.1 2009/02/05 07:38:57 the_paya Exp $
-
-inherit bsdmk freebsd flag-o-matic eutils
-
-DESCRIPTION="FreeBSD CDDL (opensolaris/zfs) extra software"
-SLOT="0"
-KEYWORDS="~x86-fbsd"
-
-IUSE="build"
-LICENSE="CDDL"
-
-SRC_URI="mirror://gentoo/${P}.tar.bz2
- mirror://gentoo/${CONTRIB}.tar.bz2
- mirror://gentoo/${UBIN}.tar.bz2
- mirror://gentoo/${LIB}.tar.bz2
- mirror://gentoo/${SBIN}.tar.bz2
- mirror://gentoo/${SYS}.tar.bz2
- build? ( mirror://gentoo/${SYS}.tar.bz2
- mirror://gentoo/${INCLUDE}.tar.bz2 )"
-
-# sys is required.
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
- =sys-freebsd/freebsd-libexec-${RV}*
- build? ( sys-apps/baselayout )
- dev-libs/libedit
- dev-libs/libelf"
-
-DEPEND="${RDEPEND}
- =sys-freebsd/freebsd-mk-defs-${RV}*
- !build? ( =sys-freebsd/freebsd-sources-${RV}* )"
-
-S="${WORKDIR}/cddl"
-
-PATCHES="${FILESDIR}/${PN}-7.1-libpaths.patch"
-
-pkg_setup() {
- mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= "
-}
-
-src_unpack() {
- freebsd_src_unpack
- # Link in include headers.
- ln -s "/usr/include" "${WORKDIR}/include" || die "Symlinking /usr/include.."
- # This patch is against sys.
- cd "${WORKDIR}"
- epatch "${FILESDIR}/${PN}-7.1-xdr_header.patch"
-}
-
-src_compile() {
- freebsd_src_compile
-}
-
-#src_install() {
-#}
diff --git a/sys-freebsd/freebsd-contrib/ChangeLog b/sys-freebsd/freebsd-contrib/ChangeLog
index a3d6802e2a5e..23b621e9ffbd 100644
--- a/sys-freebsd/freebsd-contrib/ChangeLog
+++ b/sys-freebsd/freebsd-contrib/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-freebsd/freebsd-contrib
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/ChangeLog,v 1.25 2009/05/22 11:14:47 aballier Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/ChangeLog,v 1.26 2010/03/11 10:57:55 aballier Exp $
+
+ 11 Mar 2010; Alexis Ballier <aballier@gentoo.org>
+ -freebsd-contrib-6.2.ebuild, -freebsd-contrib-7.1.ebuild:
+ remove old
*freebsd-contrib-7.2 (22 May 2009)
diff --git a/sys-freebsd/freebsd-contrib/freebsd-contrib-6.2.ebuild b/sys-freebsd/freebsd-contrib/freebsd-contrib-6.2.ebuild
deleted file mode 100644
index 0dd4ffa85d54..000000000000
--- a/sys-freebsd/freebsd-contrib/freebsd-contrib-6.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/freebsd-contrib-6.2.ebuild,v 1.1 2007/01/15 21:34:58 drizzt Exp $
-
-inherit bsdmk freebsd flag-o-matic
-
-DESCRIPTION="Contributed sources for FreeBSD."
-SLOT="0"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-LICENSE="BSD GPL-2 as-is"
-
-IUSE=""
-
-SRC_URI="mirror://gentoo/${GNU}.tar.bz2
- mirror://gentoo/${P}.tar.bz2"
-
-RDEPEND=""
-DEPEND="=sys-freebsd/freebsd-sources-${RV}*
- =sys-freebsd/freebsd-mk-defs-${RV}*"
-
-S="${WORKDIR}/gnu"
-
-src_unpack() {
- echo ">>> Unpacking needed parts of ${GNU}.tar.bz2 to ${WORKDIR}"
- tar -jxpf "${DISTDIR}/${GNU}.tar.bz2" gnu/lib/libdialog gnu/usr.bin/sort gnu/usr.bin/patch
- echo ">>> Unpacking needed parts of ${CONTRIB}.tar.bz2 to ${WORKDIR}"
- tar -jxpf "${DISTDIR}/${CONTRIB}.tar.bz2" contrib/gnu-sort
-
- freebsd_do_patches
- freebsd_rename_libraries
-}
-
-src_compile() {
- cd "${S}/lib/libdialog"
- freebsd_src_compile
-
- cd "${S}/usr.bin/sort"
- freebsd_src_compile
-
- cd "${S}/usr.bin/patch"
- freebsd_src_compile
-}
-
-src_install() {
- use profile || mymakeopts="${mymakeopts} NO_PROFILE= "
- mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= "
-
- cd "${S}/lib/libdialog"
- mkinstall || die "libdialog install failed"
-
- cd "${S}/usr.bin/sort"
- mkinstall DESTDIR="${D}/bin/" || die "libdialog install failed"
-
- cd "${S}/usr.bin/patch"
- mkinstall DESTDIR="${D}/usr/bin/" || die "libdialog install failed"
-}
diff --git a/sys-freebsd/freebsd-contrib/freebsd-contrib-7.1.ebuild b/sys-freebsd/freebsd-contrib/freebsd-contrib-7.1.ebuild
deleted file mode 100644
index 83f399c0a15d..000000000000
--- a/sys-freebsd/freebsd-contrib/freebsd-contrib-7.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/freebsd-contrib-7.1.ebuild,v 1.1 2009/01/22 21:01:17 the_paya Exp $
-
-inherit bsdmk freebsd flag-o-matic
-
-DESCRIPTION="Contributed sources for FreeBSD."
-SLOT="0"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-LICENSE="BSD GPL-2 as-is"
-
-IUSE=""
-
-SRC_URI="mirror://gentoo/${GNU}.tar.bz2
- mirror://gentoo/${P}.tar.bz2"
-
-RDEPEND=""
-DEPEND="=sys-freebsd/freebsd-sources-${RV}*
- =sys-freebsd/freebsd-mk-defs-${RV}*"
-
-S="${WORKDIR}/gnu"
-
-src_unpack() {
- echo ">>> Unpacking needed parts of ${GNU}.tar.bz2 to ${WORKDIR}"
- tar -jxpf "${DISTDIR}/${GNU}.tar.bz2" gnu/lib/libdialog gnu/usr.bin/sort gnu/usr.bin/patch
- echo ">>> Unpacking needed parts of ${CONTRIB}.tar.bz2 to ${WORKDIR}"
- tar -jxpf "${DISTDIR}/${CONTRIB}.tar.bz2" contrib/gnu-sort
-
- freebsd_do_patches
- freebsd_rename_libraries
-}
-
-src_compile() {
- cd "${S}/lib/libdialog"
- freebsd_src_compile
-
- cd "${S}/usr.bin/sort"
- freebsd_src_compile
-
- cd "${S}/usr.bin/patch"
- freebsd_src_compile
-}
-
-src_install() {
- use profile || mymakeopts="${mymakeopts} NO_PROFILE= "
- mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= "
-
- cd "${S}/lib/libdialog"
- mkinstall || die "libdialog install failed"
-
- cd "${S}/usr.bin/sort"
- mkinstall DESTDIR="${D}/bin/" || die "libdialog install failed"
-
- cd "${S}/usr.bin/patch"
- mkinstall DESTDIR="${D}/usr/bin/" || die "libdialog install failed"
-}
diff --git a/sys-freebsd/freebsd-rescue/ChangeLog b/sys-freebsd/freebsd-rescue/ChangeLog
index 874d9b25f623..c7d01d559b84 100644
--- a/sys-freebsd/freebsd-rescue/ChangeLog
+++ b/sys-freebsd/freebsd-rescue/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-freebsd/freebsd-rescue
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-rescue/ChangeLog,v 1.19 2009/05/22 13:40:51 aballier Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-rescue/ChangeLog,v 1.20 2010/03/11 11:02:31 aballier Exp $
+
+ 11 Mar 2010; Alexis Ballier <aballier@gentoo.org>
+ -files/freebsd-rescue-5.4-sbin-gentoo.patch, -freebsd-rescue-6.2.ebuild,
+ -freebsd-rescue-7.1.ebuild:
+ remove old
*freebsd-rescue-7.2 (22 May 2009)
diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-5.4-sbin-gentoo.patch b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-5.4-sbin-gentoo.patch
deleted file mode 100644
index d566be15fe28..000000000000
--- a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-5.4-sbin-gentoo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur sbin/savecore/savecore.c sbin-gentoo/savecore/savecore.c
---- sbin/savecore/savecore.c 2005-02-26 02:21:50.000000000 +0100
-+++ sbin-gentoo/savecore/savecore.c 2005-08-13 17:09:53.000000000 +0200
-@@ -95,7 +95,7 @@
- static int checkfor, compress, clear, force, keep, verbose; /* flags */
- static int nfound, nsaved, nerr; /* statistics */
-
--extern FILE *zopen(const char *, const char *);
-+extern FILE *gzopen(const char *, const char *);
-
- static void
- printheader(FILE *f, const struct kerneldumpheader *h, const char *device,
-@@ -387,7 +387,7 @@
- oumask = umask(S_IRWXG|S_IRWXO); /* Restrict access to the core file.*/
- if (compress) {
- sprintf(buf, "vmcore.%d.gz", bounds);
-- fp = zopen(buf, "w");
-+ fp = gzopen(buf, "w");
- } else {
- sprintf(buf, "vmcore.%d", bounds);
- fp = fopen(buf, "w");
diff --git a/sys-freebsd/freebsd-rescue/freebsd-rescue-6.2.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-6.2.ebuild
deleted file mode 100644
index 5da4418d31d2..000000000000
--- a/sys-freebsd/freebsd-rescue/freebsd-rescue-6.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-rescue/freebsd-rescue-6.2.ebuild,v 1.1 2007/01/15 21:38:18 drizzt Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD's rescue binaries"
-SLOT="0"
-KEYWORDS="~x86-fbsd"
-
-IUSE="atm nis"
-
-SRC_URI="mirror://gentoo/${UBIN}.tar.bz2
- mirror://gentoo/${CONTRIB}.tar.bz2
- mirror://gentoo/${LIB}.tar.bz2
- mirror://gentoo/${BIN}.tar.bz2
- mirror://gentoo/${SBIN}.tar.bz2
- mirror://gentoo/${USBIN}.tar.bz2
- mirror://gentoo/${GNU}.tar.bz2
- mirror://gentoo/${SYS}.tar.bz2
- mirror://gentoo/${LIBEXEC}.tar.bz2
- mirror://gentoo/${RESCUE}.tar.bz2"
-
-RDEPEND=""
-DEPEND="sys-devel/flex
- =sys-freebsd/freebsd-sources-${RV}*
- =sys-freebsd/freebsd-mk-defs-${RV}*"
-
-S="${WORKDIR}/rescue"
-
-pkg_setup() {
- use atm || mymakeopts="${mymakeopts} NO_ATM= "
- use nis || mymakeopts="${mymakeopts} NO_NIS= "
-
- for flag in atm nis; do
- if use ${flag} && ! built_with_use sys-libs/freebsd-lib ${flag}; then
- die "You can't add ${flag} support here without adding it to sys-libs/freebsd-lib"
- fi
- done
-
-# append-flags -fno-stack-protector -fno-stack-protector-all
-}
-
-src_unpack() {
- freebsd_src_unpack
-
- # As they are patches from ${WORKDIR} apply them by hand
- cd ${WORKDIR}
- epatch ${FILESDIR}/${PN}-5.4-gentoo.patch
- epatch ${FILESDIR}/${PN}-5.4-sbin-gentoo.patch
-}
diff --git a/sys-freebsd/freebsd-rescue/freebsd-rescue-7.1.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-7.1.ebuild
deleted file mode 100644
index 8469259628e4..000000000000
--- a/sys-freebsd/freebsd-rescue/freebsd-rescue-7.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-rescue/freebsd-rescue-7.1.ebuild,v 1.1 2009/01/22 21:04:01 the_paya Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD's rescue binaries"
-SLOT="0"
-KEYWORDS="~x86-fbsd"
-
-IUSE="atm nis"
-
-SRC_URI="mirror://gentoo/${UBIN}.tar.bz2
- mirror://gentoo/${CONTRIB}.tar.bz2
- mirror://gentoo/${LIB}.tar.bz2
- mirror://gentoo/${BIN}.tar.bz2
- mirror://gentoo/${SBIN}.tar.bz2
- mirror://gentoo/${USBIN}.tar.bz2
- mirror://gentoo/${GNU}.tar.bz2
- mirror://gentoo/${SYS}.tar.bz2
- mirror://gentoo/${LIBEXEC}.tar.bz2
- mirror://gentoo/${RESCUE}.tar.bz2"
-
-RDEPEND=""
-DEPEND="sys-devel/flex
- =sys-freebsd/freebsd-sources-${RV}*
- =sys-freebsd/freebsd-mk-defs-${RV}*"
-
-S="${WORKDIR}/rescue"
-
-pkg_setup() {
- use atm || mymakeopts="${mymakeopts} NO_ATM= "
- use nis || mymakeopts="${mymakeopts} NO_NIS= "
-
- for flag in atm nis; do
- if use ${flag} && ! built_with_use sys-libs/freebsd-lib ${flag}; then
- die "You can't add ${flag} support here without adding it to sys-libs/freebsd-lib"
- fi
- done
-
-# append-flags -fno-stack-protector -fno-stack-protector-all
-}
-
-src_unpack() {
- freebsd_src_unpack
-
- # As they are patches from ${WORKDIR} apply them by hand
- cd "${WORKDIR}"
- epatch "${FILESDIR}/${PN}"-5.4-gentoo.patch
- epatch "${FILESDIR}/${PN}"-7.1-zlib.patch
-}
diff --git a/sys-freebsd/freebsd-share/ChangeLog b/sys-freebsd/freebsd-share/ChangeLog
index 045a5119ca41..dd497a78a62d 100644
--- a/sys-freebsd/freebsd-share/ChangeLog
+++ b/sys-freebsd/freebsd-share/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-freebsd/freebsd-share
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/ChangeLog,v 1.34 2010/01/07 13:06:40 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/ChangeLog,v 1.35 2010/03/11 11:00:43 aballier Exp $
+
+ 11 Mar 2010; Alexis Ballier <aballier@gentoo.org>
+ -freebsd-share-6.2.ebuild, -freebsd-share-7.1.ebuild,
+ -freebsd-share-7.2.ebuild:
+ remove old
*freebsd-share-7.2-r1 (07 Jan 2010)
diff --git a/sys-freebsd/freebsd-share/freebsd-share-6.2.ebuild b/sys-freebsd/freebsd-share/freebsd-share-6.2.ebuild
deleted file mode 100644
index 365312148803..000000000000
--- a/sys-freebsd/freebsd-share/freebsd-share-6.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/freebsd-share-6.2.ebuild,v 1.4 2009/01/08 21:07:29 aballier Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD shared tools/files"
-SLOT="0"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-
-IUSE="doc isdn"
-
-SRC_URI="mirror://gentoo/${SHARE}.tar.bz2
- mirror://gentoo/${CONTRIB}.tar.bz2
- mirror://gentoo/${GNU}.tar.bz2
- mirror://gentoo/${UBIN}.tar.bz2
- mirror://gentoo/${USBIN}.tar.bz2
- mirror://gentoo/${SBIN}.tar.bz2
- mirror://gentoo/${BIN}.tar.bz2
- mirror://gentoo/${LIB}.tar.bz2
- mirror://gentoo/${ETC}.tar.bz2"
-
-DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*"
-RDEPEND=""
-
-RESTRICT="strip"
-
-S="${WORKDIR}/share"
-
-pkg_setup() {
- use isdn || mymakeopts="${mymakeopts} NO_I4B= "
- use doc || mymakeopts="${mymakeopts} NO_SHAREDOCS= "
-
- mymakeopts="${mymakeopts} NO_SENDMAIL= NO_MANCOMPRESS= NO_INFOCOMPRESS= "
-}
-
-REMOVE_SUBDIRS="mk termcap zoneinfo tabset"
-
-PATCHES="${FILESDIR}/${PN}-5.3-doc-locations.patch
- ${FILESDIR}/${PN}-5.4-gentoo-skel.patch"
-
-src_unpack() {
- freebsd_src_unpack
-
- # Remove make.conf manpage as it describes bsdmk's make.conf.
- sed -i -e 's:make.conf.5::' "${S}/man/man5/Makefile"
- # Remove mailer.conf manpage
- sed -i -e 's:mailer.conf.5::' "${S}/man/man5/Makefile"
- # Remove pbm and moduli(ssh) manpages
- sed -i -e 's:pbm.5::' -e 's:moduli.5::' "${S}/man/man5/Makefile"
- # Remove builtins manpage
- sed -i -e '/builtins\.1/d' "${S}/man/man1/Makefile"
- # Remove rc manpages
- sed -i -e '/rc.8/d' "${S}/man/man8/Makefile"
-
- # Don't install the arch-specific directories in subdirectories
- sed -i -e '/MANSUBDIR/d' "${S}"/man/man4/man4.{alpha,i386,sparc64}/Makefile
-
- # Remove them so that they can't be included by error
- rm -rf "${S}"/mk/*.mk
-
- # Change the order, colldef has to go after mklocale or it creates symlinks
- # with the names of directories
- sed -i -e 's:colldef::' -e 's:mklocale:mklocale colldef:' "${S}/Makefile"
-}
-
-src_compile() {
- export ESED="/usr/bin/sed"
-
- # This is a groff problem and not a -shared problem.
- export GROFF_TMAC_PATH="/usr/share/tmac/:/usr/share/groff/1.19.1/tmac/"
- mkmake || die "emake failed"
-}
-
-src_install() {
- mkmake -j1 DESTDIR="${D}" DOCDIR=/usr/share/doc/${PF} install || die "Install failed"
-}
diff --git a/sys-freebsd/freebsd-share/freebsd-share-7.1.ebuild b/sys-freebsd/freebsd-share/freebsd-share-7.1.ebuild
deleted file mode 100644
index 47ced7c4743a..000000000000
--- a/sys-freebsd/freebsd-share/freebsd-share-7.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/freebsd-share-7.1.ebuild,v 1.1 2009/01/22 21:04:57 the_paya Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD shared tools/files"
-SLOT="0"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-
-IUSE="doc isdn"
-
-SRC_URI="mirror://gentoo/${SHARE}.tar.bz2
- mirror://gentoo/${CONTRIB}.tar.bz2
- mirror://gentoo/${GNU}.tar.bz2
- mirror://gentoo/${UBIN}.tar.bz2
- mirror://gentoo/${USBIN}.tar.bz2
- mirror://gentoo/${SBIN}.tar.bz2
- mirror://gentoo/${BIN}.tar.bz2
- mirror://gentoo/${LIB}.tar.bz2
- mirror://gentoo/${ETC}.tar.bz2"
-
-DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*"
-RDEPEND=""
-
-RESTRICT="strip"
-
-S="${WORKDIR}/share"
-
-pkg_setup() {
- use isdn || mymakeopts="${mymakeopts} NO_I4B= "
- use doc || mymakeopts="${mymakeopts} NO_SHAREDOCS= "
-
- mymakeopts="${mymakeopts} NO_SENDMAIL= NO_MANCOMPRESS= NO_INFOCOMPRESS= "
-}
-
-REMOVE_SUBDIRS="mk termcap zoneinfo tabset"
-
-PATCHES="${FILESDIR}/${PN}-5.3-doc-locations.patch
- ${FILESDIR}/${PN}-5.4-gentoo-skel.patch"
-
-src_unpack() {
- freebsd_src_unpack
-
- # Remove make.conf manpage as it describes bsdmk's make.conf.
- sed -i -e 's:make.conf.5::' "${S}/man/man5/Makefile"
- # Remove mailer.conf manpage
- sed -i -e 's:mailer.conf.5::' "${S}/man/man5/Makefile"
- # Remove pbm and moduli(ssh) manpages
- sed -i -e 's:pbm.5::' -e 's:moduli.5::' "${S}/man/man5/Makefile"
- # Remove builtins manpage
- sed -i -e '/builtins\.1/d' "${S}/man/man1/Makefile"
- # Remove rc manpages
- sed -i -e '/rc.8/d' "${S}/man/man8/Makefile"
-
- # Don't install the arch-specific directories in subdirectories
- sed -i -e '/MANSUBDIR/d' "${S}"/man/man4/man4.{i386,sparc64}/Makefile
-
- # Remove them so that they can't be included by error
- rm -rf "${S}"/mk/*.mk
-
- # Make proper symlinks by defining the full target.
- local sdir
- for sdir in colldef mklocale monetdef msgdef numericdef timedef
- do
- sed -e 's:\${enc2}$:\${enc2}/\${FILESNAME}:g' -i \
- "${S}/${sdir}/Makefile" || \
- die "Error fixing ${sdir}/Makefile"
- done
-}
-
-src_compile() {
- export ESED="/usr/bin/sed"
-
- # This is a groff problem and not a -shared problem.
- export GROFF_TMAC_PATH="/usr/share/tmac/:/usr/share/groff/1.19.1/tmac/"
- mkmake || die "emake failed"
-}
-
-src_install() {
- mkmake -j1 DESTDIR="${D}" DOCDIR=/usr/share/doc/${PF} install || die "Install failed"
-}
diff --git a/sys-freebsd/freebsd-share/freebsd-share-7.2.ebuild b/sys-freebsd/freebsd-share/freebsd-share-7.2.ebuild
deleted file mode 100644
index 520bf05b55f1..000000000000
--- a/sys-freebsd/freebsd-share/freebsd-share-7.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/freebsd-share-7.2.ebuild,v 1.2 2009/05/22 16:42:16 aballier Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD shared tools/files"
-SLOT="0"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-
-IUSE="doc isdn"
-
-SRC_URI="mirror://gentoo/${SHARE}.tar.bz2
- mirror://gentoo/${CONTRIB}.tar.bz2
- mirror://gentoo/${GNU}.tar.bz2
- mirror://gentoo/${UBIN}.tar.bz2
- mirror://gentoo/${USBIN}.tar.bz2
- mirror://gentoo/${SBIN}.tar.bz2
- mirror://gentoo/${BIN}.tar.bz2
- mirror://gentoo/${LIB}.tar.bz2
- mirror://gentoo/${ETC}.tar.bz2"
-
-DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*"
-RDEPEND=""
-
-RESTRICT="strip"
-
-S="${WORKDIR}/share"
-
-pkg_setup() {
- use isdn || mymakeopts="${mymakeopts} NO_I4B= "
- use doc || mymakeopts="${mymakeopts} NO_SHAREDOCS= "
-
- mymakeopts="${mymakeopts} NO_SENDMAIL= NO_MANCOMPRESS= NO_INFOCOMPRESS= "
-}
-
-REMOVE_SUBDIRS="mk termcap zoneinfo tabset"
-
-PATCHES=( "${FILESDIR}/${PN}-5.3-doc-locations.patch"
- "${FILESDIR}/${PN}-5.4-gentoo-skel.patch" )
-
-src_unpack() {
- freebsd_src_unpack
-
- # Remove make.conf manpage as it describes bsdmk's make.conf.
- sed -i -e 's:make.conf.5::' "${S}/man/man5/Makefile"
- # Remove mailer.conf manpage
- sed -i -e 's:mailer.conf.5::' "${S}/man/man5/Makefile"
- # Remove pbm and moduli(ssh) manpages
- sed -i -e 's:pbm.5::' -e 's:moduli.5::' "${S}/man/man5/Makefile"
- # Remove builtins manpage
- sed -i -e '/builtins\.1/d' "${S}/man/man1/Makefile"
- # Remove rc manpages
- sed -i -e '/rc.8/d' "${S}/man/man8/Makefile"
-
- # Don't install the arch-specific directories in subdirectories
- sed -i -e '/MANSUBDIR/d' "${S}"/man/man4/man4.{i386,sparc64}/Makefile
-
- # Remove them so that they can't be included by error
- rm -rf "${S}"/mk/*.mk
-
- # Make proper symlinks by defining the full target.
- local sdir
- for sdir in colldef mklocale monetdef msgdef numericdef timedef
- do
- sed -e 's:\${enc2}$:\${enc2}/\${FILESNAME}:g' -i \
- "${S}/${sdir}/Makefile" || \
- die "Error fixing ${sdir}/Makefile"
- done
-}
-
-src_compile() {
- export ESED="/usr/bin/sed"
-
- # This is a groff problem and not a -shared problem.
- export GROFF_TMAC_PATH="/usr/share/tmac/:/usr/share/groff/1.19.1/tmac/"
- mkmake || die "emake failed"
-}
-
-src_install() {
- mkmake -j1 DESTDIR="${D}" DOCDIR=/usr/share/doc/${PF} install || die "Install failed"
-}
diff --git a/sys-freebsd/freebsd-ubin/ChangeLog b/sys-freebsd/freebsd-ubin/ChangeLog
index e27db0d716ae..a87704743782 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.63 2009/10/08 08:00:32 aballier Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.64 2010/03/11 10:55:15 aballier Exp $
+
+ 11 Mar 2010; Alexis Ballier <aballier@gentoo.org>
+ -files/freebsd-ubin-6.1-gcc41.patch, -freebsd-ubin-6.2-r2.ebuild,
+ -files/freebsd-ubin-6.2-make-sinclude.patch,
+ -files/freebsd-ubin-6.2-rpcgen-gcc4.1.patch, -freebsd-ubin-7.1-r1.ebuild:
+ remove old
08 Oct 2009; Alexis Ballier <aballier@gentoo.org>
freebsd-ubin-7.1-r1.ebuild, freebsd-ubin-7.2.ebuild:
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.1-gcc41.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.1-gcc41.patch
deleted file mode 100644
index 00d7a9e96b22..000000000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.1-gcc41.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: fbsd-6.1/usr.bin/window/wwgets.c
-===================================================================
---- fbsd-6.1.orig/usr.bin/window/wwgets.c
-+++ fbsd-6.1/usr.bin/window/wwgets.c
-@@ -43,6 +43,8 @@ static char rcsid[] =
- #include "ww.h"
- #include "char.h"
-
-+static void rub();
-+
- wwgets(buf, n, w)
- char *buf;
- int n;
-@@ -51,7 +53,6 @@ register struct ww *w;
- register char *p = buf;
- register int c;
- char uc = w->ww_unctrl;
-- static void rub();
-
- w->ww_unctrl = 0;
- for (;;) {
-Index: fbsd-6.1/usr.bin/xlint/xlint/xlint.c
-===================================================================
---- fbsd-6.1.orig/usr.bin/xlint/xlint/xlint.c
-+++ fbsd-6.1/usr.bin/xlint/xlint/xlint.c
-@@ -402,7 +402,8 @@ main(int argc, char *argv[])
- break;
-
- case 'p':
-- appcstrg(&lcflags, "-Wtraditional -Wno-system-headers");
-+ appcstrg(&lcflags, "-Wtraditional");
-+ appcstrg(&lcflags, "-Wno-system-headers");
- appcstrg(&l1flags, "-p");
- appcstrg(&l2flags, "-p");
- if (*deflibs != NULL) {
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.2-make-sinclude.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.2-make-sinclude.patch
deleted file mode 100644
index 73256172fff0..000000000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.2-make-sinclude.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- usr.bin/make/parse.c.orig 2007-09-04 14:39:07 +0100
-+++ usr.bin/make/parse.c 2007-09-04 14:51:00 +0100
-@@ -1602,8 +1602,8 @@
- * ParseTraditionalInclude --
- * Push to another file.
- *
-- * The input is the line minus the "include". The file name is
-- * the string following the "include".
-+ * The input is the current line. The file name(s) are
-+ * following the "include".
- *
- * Results:
- * None
-@@ -1614,10 +1614,12 @@
- *---------------------------------------------------------------------
- */
- static void
--ParseTraditionalInclude(char *file)
-+ParseTraditionalInclude(char *line)
- {
- char *fullname; /* full pathname of file */
- char *cp; /* current position in file spec */
-+ int silent = (line[0] != 'i') ? 1 : 0;
-+ char *file = &line[silent + 7];
-
- /*
- * Skip over whitespace
-@@ -1665,7 +1667,9 @@
- }
-
- if (fullname == NULL) {
-- Parse_Error(PARSE_FATAL, "Could not find %s", file);
-+ if (!silent) {
-+ Parse_Error(PARSE_FATAL, "Could not find %s", file);
-+ }
- /* XXXHB free(file) */
- return;
- }
-@@ -2416,14 +2420,16 @@
- }
- }
- #ifdef SYSVINCLUDE
-- } else if (strncmp(line, "include", 7) == 0 &&
-- isspace((unsigned char)line[7]) &&
-- strchr(line, ':') == NULL) {
-+ } else if (((strncmp(line, "include", 7) == 0 &&
-+ isspace((unsigned char) line[7])) ||
-+ ((line[0] == 's' || line[0] == '-') &&
-+ strncmp(&line[1], "include", 7) == 0 &&
-+ isspace((unsigned char) line[8]))) &&
-+ strchr(line, ':') == NULL) {
- /*
- * It's an S3/S5-style "include".
- */
-- ParseTraditionalInclude(line + 7);
-- goto nextLine;
-+ ParseTraditionalInclude(line);
- #endif
- } else if (Parse_IsVar(line)) {
- ParseFinishLine();
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.2-rpcgen-gcc4.1.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.2-rpcgen-gcc4.1.patch
deleted file mode 100644
index fffd69ebbde4..000000000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.2-rpcgen-gcc4.1.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-Index: fbsd-6.2/usr.bin/rpcgen/rpc_hout.c
-===================================================================
---- fbsd-6.2.orig/usr.bin/rpcgen/rpc_hout.c
-+++ fbsd-6.2/usr.bin/rpcgen/rpc_hout.c
-@@ -50,7 +50,7 @@ void storexdrfuncdecl( char *, int );
- static void pconstdef( definition * );
- static void pstructdef( definition * );
- static void puniondef( definition * );
--static void pprogramdef( definition *, int );
-+static void pprogramdef( definition *, int, int );
- static void pstructdef( definition * );
- static void penumdef( definition * );
- static void ptypedef( definition * );
-@@ -64,7 +64,7 @@ void pdeclaration( char *, declaration *
- * Print the C-version of an xdr definition
- */
- void
--print_datadef(definition *def, int headeronly)
-+print_datadef(definition *def, int headeronly, int nomain)
- {
-
- if (def->def_kind == DEF_PROGRAM) /* handle data only */
-@@ -87,7 +87,7 @@ print_datadef(definition *def, int heade
- ptypedef(def);
- break;
- case DEF_PROGRAM:
-- pprogramdef(def, headeronly);
-+ pprogramdef(def, headeronly, nomain);
- break;
- case DEF_CONST:
- pconstdef(def);
-@@ -103,12 +103,12 @@ print_datadef(definition *def, int heade
-
-
- void
--print_funcdef(definition *def, int headeronly)
-+print_funcdef(definition *def, int headeronly, int nomain)
- {
- switch (def->def_kind) {
- case DEF_PROGRAM:
- f_print(fout, "\n");
-- pprogramdef(def, headeronly);
-+ pprogramdef(def, headeronly, nomain);
- break;
- default:
- break;
-@@ -313,7 +313,7 @@ pdispatch(char * name, char *vers, int m
- }
-
- static void
--pprogramdef(definition *def, int headeronly)
-+pprogramdef(definition *def, int headeronly, int nomain)
- {
- version_list *vers;
- proc_list *proc;
-@@ -341,7 +341,7 @@ pprogramdef(definition *def, int headero
-
- if(!Cflag){
- ext = "extern ";
-- if (headeronly) {
-+ if (headeronly && nomain) {
- f_print(fout, "%s", ext);
- pdispatch(def->def_name, vers->vers_num, 2);
- }
-@@ -372,7 +372,7 @@ pprogramdef(definition *def, int headero
- ext = "extern ";
- }
-
-- if (headeronly) {
-+ if (headeronly && nomain) {
- f_print(fout, "%s", ext);
- pdispatch(def->def_name, vers->vers_num,
- i);
-Index: fbsd-6.2/usr.bin/rpcgen/rpc_main.c
-===================================================================
---- fbsd-6.2.orig/usr.bin/rpcgen/rpc_main.c
-+++ fbsd-6.2/usr.bin/rpcgen/rpc_main.c
-@@ -61,7 +61,7 @@ extern int write_sample_clnt( definition
- extern void write_sample_clnt_main( void );
- extern void add_sample_msg( void );
- static void c_output( char *, char *, int, char * );
--static void h_output( char *, char *, int, char *, int );
-+static void h_output( char *, char *, int, char *, int, int );
- static void l_output( char *, char *, int, char * );
- static void t_output( char *, char *, int, char * );
- static void clnt_output( char *, char *, int, char * );
-@@ -173,7 +173,7 @@ main(argc, argv)
- c_output(cmd.infile, "-DRPC_XDR", DONT_EXTEND, cmd.outfile);
- } else if (cmd.hflag) {
- h_output(cmd.infile, "-DRPC_HDR", DONT_EXTEND, cmd.outfile,
-- cmd.hflag);
-+ cmd.hflag, cmd.nflag);
- } else if (cmd.lflag) {
- l_output(cmd.infile, "-DRPC_CLNT", DONT_EXTEND, cmd.outfile);
- } else if (cmd.sflag || cmd.mflag || (cmd.nflag)) {
-@@ -193,7 +193,7 @@ main(argc, argv)
- /* the rescans are required, since cpp may effect input */
- c_output(cmd.infile, "-DRPC_XDR", EXTEND, "_xdr.c");
- reinitialize();
-- h_output(cmd.infile, "-DRPC_HDR", EXTEND, ".h", cmd.hflag);
-+ h_output(cmd.infile, "-DRPC_HDR", EXTEND, ".h", cmd.hflag, cmd.nflag);
- reinitialize();
- l_output(cmd.infile, "-DRPC_CLNT", EXTEND, "_clnt.c");
- reinitialize();
-@@ -515,7 +515,7 @@ char *generate_guard(pathname)
-
-
- static void
--h_output(char *infile, char *define, int extend, char *outfile, int headeronly)
-+h_output(char *infile, char *define, int extend, char *outfile, int headeronly, int nomain)
- {
- definition *def;
- char *outfilename;
-@@ -555,7 +555,7 @@ h_output(char *infile, char *define, int
-
- /* print data definitions */
- while ( (def = get_definition()) ) {
-- print_datadef(def, headeronly);
-+ print_datadef(def, headeronly, nomain);
- }
-
- /*
-@@ -564,7 +564,7 @@ h_output(char *infile, char *define, int
- * arguments for functions
- */
- for (l = defined; l != NULL; l = l->next) {
-- print_funcdef(l->val, headeronly);
-+ print_funcdef(l->val, headeronly, nomain);
- }
- /* Now print all xdr func declarations */
- if (xdrfunc_head != NULL){
diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-6.2-r2.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-6.2-r2.ebuild
deleted file mode 100644
index 8f1780faaf09..000000000000
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-6.2-r2.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/freebsd-ubin-6.2-r2.ebuild,v 1.5 2008/06/10 19:03:27 aballier Exp $
-
-inherit bsdmk freebsd flag-o-matic pam
-
-DESCRIPTION="FreeBSD's base system source for /usr/bin"
-SLOT="0"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-
-IUSE="atm bluetooth ssl usb nls ipv6 kerberos nis build"
-
-SRC_URI="mirror://gentoo/${UBIN}.tar.bz2
- mirror://gentoo/${CONTRIB}.tar.bz2
- mirror://gentoo/${LIB}.tar.bz2
- mirror://gentoo/${ETC}.tar.bz2
- mirror://gentoo/${BIN}.tar.bz2
- mirror://gentoo/${INCLUDE}.tar.bz2
- build? ( mirror://gentoo/${SYS}.tar.bz2 )"
-
-RDEPEND=">=sys-freebsd/freebsd-lib-6.2_rc2
- ssl? ( dev-libs/openssl )
- kerberos? ( virtual/krb5 )
- virtual/pam
- sys-libs/zlib
- !dev-util/csup"
-
-DEPEND="${RDEPEND}
- sys-devel/flex
- !build? ( =sys-freebsd/freebsd-sources-${RV}* )
- =sys-freebsd/freebsd-mk-defs-${RV}*"
-
-RDEPEND="${RDEPEND}
- >=sys-auth/pambase-20080219.1
- sys-process/cronbase"
-
-S="${WORKDIR}/usr.bin"
-
-pkg_setup() {
- use nls || mymakeopts="${mymakeopts} NO_NLS= "
- use atm || mymakeopts="${mymakeopts} NO_ATM= "
- use bluetooth || mymakeopts="${mymakeopts} NO_BLUETOOTH= "
- use ssl || mymakeopts="${mymakeopts} NO_OPENSSL= NO_CRYPT= "
- use usb || mymakeopts="${mymakeopts} NO_USB= "
- use ipv6 || mymakeopts="${mymakeopts} NO_INET6= "
- use kerberos || mymakeopts="${mymakeopts} NO_KERBEROS= "
- use nis || mymakeopts="${mymakeopts} NO_NIS= "
-
- mymakeopts="${mymakeopts} NO_SENDMAIL= "
-}
-
-# List of patches to apply
-PATCHES="${FILESDIR}/${PN}-6.0-bsdcmp.patch
- ${FILESDIR}/${PN}-6.0-fixmakefiles.patch
- ${FILESDIR}/${PN}-setXid.patch
- ${FILESDIR}/${PN}-lint-stdarg.patch
- ${FILESDIR}/${PN}-6.0-kdump-ioctl.patch
- ${FILESDIR}/${PN}-6.1-gcc41.patch
- ${FILESDIR}/${PN}-6.2-make-sinclude.patch
- ${FILESDIR}/${PN}-6.2-rpcgen-gcc4.1.patch"
-
-# Here we remove some sources we don't need because they are already
-# provided by portage's packages or similar. In order:
-# - Archiving tools, provided by their own ebuilds
-# - ncurses stuff
-# - less stuff
-# - bind utils
-# - rsh stuff
-# and the rest are misc utils we already provide somewhere else.
-REMOVE_SUBDIRS="bzip2 bzip2recover tar
- tput tset
- less lessecho lesskey
- dig hesinfo nslookup nsupdate host
- rsh rlogin rusers rwho ruptime
- compile_et lex vi smbutil file vacation nc ftp telnet
- c99 c89
- whois tftp"
-
-src_unpack() {
- freebsd_src_unpack
-
- use build || ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
-
- # Rename manpage for renamed cmp
- mv "${S}"/cmp/cmp.1 "${S}"/cmp/bsdcmp.1
- # Fix whereis(1) manpath search.
- sed -i -e 's:"manpath -q":"manpath":' "${S}/whereis/pathnames.h"
-
- # Build a dynamic make
- sed -i -e '/^NO_SHARED/ s/^/#/' "${S}"/make/Makefile
-}
-
-src_install() {
- freebsd_src_install
-
- # baselayout requires these in /bin
- dodir /bin
- for bin in sed; do
- mv "${D}/usr/bin/${bin}" "${D}/bin/" || die "mv ${bin} failed"
- dosym /bin/${bin} /usr/bin/${bin} || die "dosym ${bin} failed"
- done
-
- for pamdfile in login passwd su; do
- newpamd "${FILESDIR}/${pamdfile}.1.pamd" ${pamdfile}
- done
-
- cd "${WORKDIR}/etc"
- insinto /etc
- doins remote phones opieaccess fbtab
-
- exeinto /etc/cron.daily
- newexe "${FILESDIR}/locate-updatedb-cron" locate.updatedb
-}
-
-pkg_postinst() {
- # We need to ensure that login.conf.db is up-to-date.
- if [[ -e "${ROOT}"etc/login.conf ]] ; then
- einfo "Updating ${ROOT}etc/login.conf.db"
- "${ROOT}"usr/bin/cap_mkdb -f "${ROOT}"etc/login.conf "${ROOT}"etc/login.conf
- elog "Remember to run cap_mkdb /etc/login.conf after making changes to it"
- fi
-}
diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-7.1-r1.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-7.1-r1.ebuild
deleted file mode 100644
index 598948c9fdbc..000000000000
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-7.1-r1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/freebsd-ubin-7.1-r1.ebuild,v 1.2 2009/10/08 08:00:32 aballier Exp $
-
-EAPI=2
-
-inherit bsdmk freebsd flag-o-matic pam
-
-DESCRIPTION="FreeBSD's base system source for /usr/bin"
-SLOT="0"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-
-SRC_URI="mirror://gentoo/${UBIN}.tar.bz2
- mirror://gentoo/${CONTRIB}.tar.bz2
- mirror://gentoo/${LIB}.tar.bz2
- mirror://gentoo/${ETC}.tar.bz2
- mirror://gentoo/${BIN}.tar.bz2
- mirror://gentoo/${INCLUDE}.tar.bz2
- build? ( mirror://gentoo/${SYS}.tar.bz2 )"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?]
- ssl? ( dev-libs/openssl )
- kerberos? ( virtual/krb5 )
- virtual/pam
- sys-libs/zlib
- !dev-util/csup"
-
-DEPEND="${RDEPEND}
- sys-devel/flex
- !build? ( =sys-freebsd/freebsd-sources-${RV}* )
- =sys-freebsd/freebsd-mk-defs-${RV}*"
-
-RDEPEND="${RDEPEND}
- >=sys-auth/pambase-20080219.1
- sys-process/cronbase"
-
-S="${WORKDIR}/usr.bin"
-
-IUSE="atm audit bluetooth ipv6 kerberos netware nis ssl usb build"
-
-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= "
-}
-
-# List of patches to apply
-PATCHES="${FILESDIR}/${PN}-6.0-bsdcmp.patch
- ${FILESDIR}/${PN}-6.0-fixmakefiles.patch
- ${FILESDIR}/${PN}-setXid.patch
- ${FILESDIR}/${PN}-lint-stdarg.patch
- ${FILESDIR}/${PN}-6.0-kdump-ioctl.patch"
-
-# Here we remove some sources we don't need because they are already
-# provided by portage's packages or similar. In order:
-# - Archiving tools, provided by their own ebuilds
-# - ncurses stuff
-# - less stuff
-# - bind utils
-# - rsh stuff
-# - binutils gprof
-# and the rest are misc utils we already provide somewhere else.
-REMOVE_SUBDIRS="bzip2 bzip2recover tar
- gzip gprof
- tput tset
- less lessecho lesskey
- dig hesinfo nslookup nsupdate host
- rsh rlogin rusers rwho ruptime
- compile_et lex vi smbutil file vacation nc ftp telnet
- c99 c89
- whois tftp"
-
-pkg_preinst() {
- # bison installs a /usr/bin/yacc symlink ...
- # we need to remove it to avoid triggering
- # collision-protect errors
- if [[ -L ${ROOT}/usr/bin/yacc ]] ; then
- rm -f "${ROOT}"/usr/bin/yacc
- fi
-}
-
-src_prepare() {
- use build || ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
-
- # Rename manpage for renamed cmp
- mv "${S}"/cmp/cmp.1 "${S}"/cmp/bsdcmp.1
- # 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
-}
-
-src_install() {
- freebsd_src_install
-
- # baselayout requires these in /bin
- dodir /bin
- for bin in sed; do
- mv "${D}/usr/bin/${bin}" "${D}/bin/" || die "mv ${bin} failed"
- dosym /bin/${bin} /usr/bin/${bin} || die "dosym ${bin} failed"
- done
-
- for pamdfile in login passwd su; do
- newpamd "${FILESDIR}/${pamdfile}.1.pamd" ${pamdfile}
- done
-
- cd "${WORKDIR}/etc"
- insinto /etc
- doins remote phones opieaccess fbtab
-
- exeinto /etc/cron.daily
- newexe "${FILESDIR}/locate-updatedb-cron" locate.updatedb
-}
-
-pkg_postinst() {
- # We need to ensure that login.conf.db is up-to-date.
- if [[ -e "${ROOT}"etc/login.conf ]] ; then
- einfo "Updating ${ROOT}etc/login.conf.db"
- "${ROOT}"usr/bin/cap_mkdb -f "${ROOT}"etc/login.conf "${ROOT}"etc/login.conf
- 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 c3fe56b60972..cd8dc9c703eb 100644
--- a/sys-freebsd/freebsd-usbin/ChangeLog
+++ b/sys-freebsd/freebsd-usbin/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for sys-freebsd/freebsd-usbin
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.60 2009/10/08 09:05:27 aballier Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.61 2010/03/11 10:50:28 aballier Exp $
+
+ 11 Mar 2010; Alexis Ballier <aballier@gentoo.org>
+ -files/freebsd-usbin-6.0-fixmakefiles.patch,
+ -files/freebsd-usbin-6.1-gcc41.patch,
+ -files/freebsd-usbin-6.1-nowrap.patch, -freebsd-usbin-6.2-r1.ebuild,
+ -files/freebsd-usbin-6.2_rc2-libedit-netbsd.patch,
+ -freebsd-usbin-7.1-r2.ebuild, metadata.xml:
+ remove old
08 Oct 2009; Alexis Ballier <aballier@gentoo.org>
freebsd-usbin-7.2.ebuild:
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-6.0-fixmakefiles.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-6.0-fixmakefiles.patch
deleted file mode 100644
index 1b1af6d5da7b..000000000000
--- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-6.0-fixmakefiles.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: usr.sbin/pcvt/Misc/Doc/Makefile
-===================================================================
---- usr.sbin/pcvt/Misc/Doc/Makefile.orig
-+++ usr.sbin/pcvt/Misc/Doc/Makefile
-@@ -4,6 +4,6 @@ NO_OBJ=
- FILES= Acknowledgements Bibliography CharGen \
- Charsets EscapeSequences Keyboard.HP Keyboard.VT \
- NotesAndHints
--FILESDIR= ${BINDIR}/Doc
-+FILESDIR= ${DOCDIR}/Doc
-
- .include <bsd.prog.mk>
-Index: usr.sbin/pcvt/Misc/Makefile
-===================================================================
---- usr.sbin/pcvt/Misc/Makefile.orig
-+++ usr.sbin/pcvt/Misc/Makefile
-@@ -2,6 +2,7 @@
-
- NO_OBJ=
- FILES= README.FIRST
-+FILESDIR= ${DOCDIR}/pcvt
- SUBDIR= Doc Etc
-
- .include "Makefile.inc"
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-6.1-gcc41.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-6.1-gcc41.patch
deleted file mode 100644
index fc48b1847023..000000000000
--- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-6.1-gcc41.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: fbsd-6.1/usr.sbin/IPXrouted/trace.c
-===================================================================
---- fbsd-6.1.orig/usr.sbin/IPXrouted/trace.c
-+++ fbsd-6.1/usr.sbin/IPXrouted/trace.c
-@@ -66,12 +66,12 @@ int tracing = 0;
-
- void dumpif(FILE *fd, struct interface *ifp);
- void dumptrace(FILE *fd, char *dir, struct ifdebug *ifd);
-+static int iftraceinit();
-
- void
- traceinit(ifp)
- register struct interface *ifp;
- {
-- static int iftraceinit();
-
- if (iftraceinit(ifp, &ifp->int_input) &&
- iftraceinit(ifp, &ifp->int_output))
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-6.1-nowrap.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-6.1-nowrap.patch
deleted file mode 100644
index 175b0c80c6c8..000000000000
--- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-6.1-nowrap.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -ur usr.sbin.orig/rpcbind/Makefile usr.sbin/rpcbind/Makefile
---- usr.sbin.orig/rpcbind/Makefile 2006-03-15 07:44:28 +0000
-+++ usr.sbin/rpcbind/Makefile 2006-04-19 17:37:18 +0000
-@@ -13,13 +13,19 @@
- rpcb_svc.c rpcb_svc_com.c security.c warmstart.c util.c \
- rpc_generic.c
-
--CFLAGS+= -I${LIBCRPCDIR} -I${LIBCINCLUDE} -DPORTMAP -DLIBWRAP
-+CFLAGS+= -I${LIBCRPCDIR} -I${LIBCINCLUDE} -DPORTMAP
-+
-+DPADD= ${LIBUTIL}
-+LDADD= -lutil
-+
-+.if !defined(NO_WRAP)
-+CFLAGS+= -DLIBWRAP
-+DPADD+= ${LIBWRAP}
-+LDADD+= -lwrap
-+.endif
-
- .if !defined(NO_INET6)
- CFLAGS+= -DINET6
- .endif
-
--DPADD= ${LIBWRAP} ${LIBUTIL}
--LDADD= -lwrap -lutil
--
- .include <bsd.prog.mk>
-diff -ur usr.sbin.orig/ypserv/Makefile usr.sbin/ypserv/Makefile
---- usr.sbin.orig/ypserv/Makefile 2004-10-18 21:42:15 +0000
-+++ usr.sbin/ypserv/Makefile 2006-04-19 17:31:23 +0000
-@@ -8,10 +8,13 @@
- SRCS= yp_svc.c yp_server.c yp_dblookup.c yp_dnslookup.c \
- ypxfr_clnt.c yp.h yp_main.c yp_error.c yp_access.c yp_svc_udp.c
-
--CFLAGS+= -DDB_CACHE -DTCP_WRAPPER -I.
-+CFLAGS+= -DDB_CACHE -I.
-
--DPADD= ${LIBWRAP}
--LDADD= -lwrap
-+.if !defined(NO_WRAP)
-+CFLAGS+= -DTCP_WRAPPER
-+DPADD+= ${LIBWRAP}
-+LDADD+= -lwrap
-+.endif
-
- CLEANFILES= yp_svc.c ypxfr_clnt.c yp.h
-
-Only in usr.sbin/ypserv: Makefile.orig
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-6.2_rc2-libedit-netbsd.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-6.2_rc2-libedit-netbsd.patch
deleted file mode 100644
index fe8a807ace31..000000000000
--- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-6.2_rc2-libedit-netbsd.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: fbsd-6.2rc2/usr.sbin/cdcontrol/cdcontrol.c
-===================================================================
---- fbsd-6.2rc2.orig/usr.sbin/cdcontrol/cdcontrol.c
-+++ fbsd-6.2rc2/usr.sbin/cdcontrol/cdcontrol.c
-@@ -1130,7 +1130,7 @@ input (int *cmd)
- el = el_init("cdcontrol", stdin, stdout,
- stderr);
- hist = history_init();
-- history(hist, &he, H_EVENT, 100);
-+ history(hist, &he, H_SETSIZE, 100);
- el_set(el, EL_HIST, history, hist);
- el_set(el, EL_EDITOR, "emacs");
- el_set(el, EL_PROMPT, cdcontrol_prompt);
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-6.2-r1.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-6.2-r1.ebuild
deleted file mode 100644
index c34ac1d6f9f6..000000000000
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-6.2-r1.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-6.2-r1.ebuild,v 1.5 2008/03/30 15:26:22 vapier Exp $
-
-inherit bsdmk freebsd flag-o-matic eutils
-
-DESCRIPTION="FreeBSD /usr/sbin tools"
-SLOT="0"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-
-IUSE="acpi atm bluetooth build ipsec ipv6 ipfilter isdn minimal nat nis
- pam radius ssl suid tcpd usb"
-
-SRC_URI="mirror://gentoo/${P}.tar.bz2
- mirror://gentoo/${CONTRIB}.tar.bz2
- mirror://gentoo/${UBIN}.tar.bz2
- mirror://gentoo/${LIB}.tar.bz2
- mirror://gentoo/${SBIN}.tar.bz2
- mirror://gentoo/${ETC}.tar.bz2
- nis? ( mirror://gentoo/${LIBEXEC}.tar.bz2 )
- build? ( mirror://gentoo/${SYS}.tar.bz2
- mirror://gentoo/${INCLUDE}.tar.bz2 )"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
- =sys-freebsd/freebsd-libexec-${RV}*
- acpi? ( sys-power/iasl )
- build? ( sys-apps/baselayout )
- ssl? ( dev-libs/openssl )
- tcpd? ( sys-apps/tcp-wrappers )
- dev-libs/libedit
- net-libs/libpcap"
-DEPEND="${RDEPEND}
- =sys-freebsd/freebsd-mk-defs-${RV}*
- !build? ( =sys-freebsd/freebsd-sources-${RV}* )
- sys-apps/texinfo
- sys-devel/flex"
-
-PROVIDE="virtual/logger"
-
-S="${WORKDIR}/usr.sbin"
-
-pkg_setup() {
- # Release crunch is something like minimal. It seems to remove everything
- # which is not needed to work.
- use minimal && mymakeopts="${mymakeopts} RELEASE_CRUNCH= "
-
- use acpi || mymakeopts="${mymakeopts} NO_ACPI= "
- use atm || mymakeopts="${mymakeopts} NO_ATM= "
- use bluetooth || mymakeopts="${mymakeopts} NO_BLUETOOTH= "
- use ipsec || mymakeopts="${mymakeopts} NO_IPSEC= "
- use ipfilter || mymakeopts="${mymakeopts} NO_IPFILTER= "
- use ipv6 || mymakeopts="${mymakeopts} NO_INET6= "
- use isdn || mymakeopts="${mymakeopts} NO_I4B= "
- use nat || mymakeopts="${mymakeopts} NO_NAT= "
- use nis || mymakeopts="${mymakeopts} NO_NIS= "
- use pam || mymakeopts="${mymakeopts} NO_PAM= "
- use radius || mymakeopts="${mymakeopts} NO_RADIUS= "
- use suid || mymakeopts="${mymakeopts} NO_SUID= PPP_NOSUID= "
- use tcpd || mymakeopts="${mymakeopts} NO_WRAP= "
- use ssl || mymakeopts="${mymakeopts} NO_OPENSSL= NO_CRYPT= "
- use suid || mymakeopts="${mymakeopts} NO_SUID= "
- use usb || mymakeopts="${mymakeopts} NO_USB= "
-
- mymakeopts="${mymakeopts} NO_MAILWRAPPER= NO_BIND= NO_SENDMAIL= NO_PF= NO_AUTHPF= NO_LPR="
-}
-
-PATCHES="${FILESDIR}/${PN}-6.0-fixmakefiles.patch
- ${FILESDIR}/${PN}-6.1-nowrap.patch
- ${FILESDIR}/${PN}-6.1-gcc41.patch
- ${FILESDIR}/${PN}-adduser.patch
- ${FILESDIR}/${PN}-6.2_rc2-libedit-netbsd.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 traceroute inetd
- wpa/wpa_supplicant wpa/hostapd wpa/hostapd_cli wpa/wpa_cli
- zic amd
- pkg_install freebsd-update"
-
-src_unpack() {
- freebsd_src_unpack
-
- if ! use build; then
- ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
- ln -s "/usr/include" "${WORKDIR}/include"
- else
- dummy_mk mount_smbfs
- fi
-}
-
-src_compile() {
- strip-flags
- append-flags -I "${WORKDIR}/sys"
-
- NOFLAGSTRIP="yes" freebsd_src_compile
-}
-
-src_install() {
- # By creating these directories we avoid having to do a
- # more complex hack
- dodir /usr/share/doc
- dodir /sbin
- dodir /usr/libexec
- dodir /usr/bin
-
- # FILESDIR is used by some makefiles which will install files
- # in the wrong place, just put it in the doc directory.
- mkinstall DOCDIR=/usr/share/doc/${PF} || die "Install failed"
-
- for util in nfs nfsmount rpcbind syslogd moused powerd syscons rarpd; do
- newinitd ${FILESDIR}/${util}.initd ${util}
- [[ -e ${FILESDIR}/${util}.confd ]] && \
- newconfd ${FILESDIR}/${util}.confd ${util}
- done
-
- for class in daily monthly weekly; do
- cat - > ${T}/periodic.${class} <<EOS
-#!/bin/sh
-/usr/sbin/periodic ${class}
-EOS
- exeinto /etc/cron.${class}
- newexe ${T}/periodic.${class} periodic
- done
-
- # Install the pw.conf file to let pw use Gentoo's skel location
- insinto /etc
- doins "${FILESDIR}/pw.conf"
-
- cd "${WORKDIR}/etc"
- doins amd.map apmd.conf syslog.conf newsyslog.conf usbd.conf
-
- insinto /etc/ppp
- doins ppp/ppp.conf
-
- if use isdn; then
- insinto /etc/isdn
- doins isdn/*
- rm -f ${D}/etc/isdn/Makefile
- fi
-
- if use bluetooth; then
- insinto /etc/bluetooth
- doins bluetooth/*
- rm -f ${D}/etc/bluetooth/Makefile
- fi
-
- # Install the periodic stuff (needs probably to be ported in a more
- # gentooish way)
- cd "${WORKDIR}/etc/periodic"
-
- doperiodic daily daily/*.accounting
- doperiodic monthly monthly/*.accounting
-}
-
-pkg_postinst() {
- # We need to run pwd_mkdb if key files are not present
- # If they are, then there is no need to run pwd_mkdb
- if [[ ! -e ${ROOT}etc/passwd || ! -e ${ROOT}etc/pwd.db || ! -e ${ROOT}etc/spwd.db ]] ; then
- if [[ -e ${ROOT}etc/master.passwd ]] ; then
- einfo "Generating passwd files from ${ROOT}etc/master.passwd"
- ${ROOT}usr/sbin/pwd_mkdb -p -d ${ROOT}etc ${ROOT}etc/master.passwd
- else
- eerror "${ROOT}etc/master.passwd does not exist!"
- eerror "You will no be able to log into your system!"
- fi
- fi
-
- for logfile in messages security auth.log maillog lpd-errs xferlog cron \
- debug.log slip.log ppp.log; do
- [[ -f ${ROOT}/var/log/${logfile} ]] || touch ${ROOT}/var/log/${logfile}
- done
-}
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-7.1-r2.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-7.1-r2.ebuild
deleted file mode 100644
index 5f102facbfe7..000000000000
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-7.1-r2.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-7.1-r2.ebuild,v 1.4 2009/10/08 07:54:30 aballier Exp $
-
-EAPI=2
-
-inherit bsdmk freebsd flag-o-matic eutils
-
-DESCRIPTION="FreeBSD /usr/sbin tools"
-SLOT="0"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-
-SRC_URI="mirror://gentoo/${P}.tar.bz2
- mirror://gentoo/${CONTRIB}.tar.bz2
- mirror://gentoo/${UBIN}.tar.bz2
- mirror://gentoo/${LIB}.tar.bz2
- mirror://gentoo/${SBIN}.tar.bz2
- mirror://gentoo/${ETC}.tar.bz2
- mirror://gentoo/${GNU}.tar.bz2
- nis? ( mirror://gentoo/${LIBEXEC}.tar.bz2 )
- build? ( mirror://gentoo/${SYS}.tar.bz2
- mirror://gentoo/${INCLUDE}.tar.bz2 )"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,netware?]
- =sys-freebsd/freebsd-libexec-${RV}*
- acpi? ( sys-power/iasl )
- build? ( sys-apps/baselayout )
- ssl? ( dev-libs/openssl )
- tcpd? ( sys-apps/tcp-wrappers )
- dev-libs/libedit
- net-libs/libpcap"
-DEPEND="${RDEPEND}
- =sys-freebsd/freebsd-mk-defs-${RV}*
- !build? ( =sys-freebsd/freebsd-sources-${RV}* )
- sys-apps/texinfo
- sys-devel/flex"
-
-PROVIDE="virtual/logger"
-
-S="${WORKDIR}/usr.sbin"
-
-IUSE="acpi atm audit bluetooth ipv6 isdn minimal netware nis pam ssl tcpd usb build"
-
-pkg_setup() {
- # Release crunch is something like minimal. It seems to remove everything
- # which is not needed to work.
- use minimal && mymakeopts="${mymakeopts} RELEASE_CRUNCH= "
-
- use acpi || mymakeopts="${mymakeopts} WITHOUT_ACPI= "
- use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
- use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= "
- use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
- use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
- use isdn || mymakeopts="${mymakeopts} WITHOUT_I4B= "
- use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
- use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
- use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= "
- use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
- use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
-
- mymakeopts="${mymakeopts} WITHOUT_BIND_NAMED= WITHOUT_BIND_DNSSEC= WITHOUT_PF= WITHOUT_LPR= WITHOUT_SENDMAIL= WITHOUT_AUTHPF= WITHOUT_MAILWRAPPER= "
-}
-
-PATCHES="${FILESDIR}/${PN}-7.0-nowrap.patch
- ${FILESDIR}/${PN}-adduser.patch"
-
-REMOVE_SUBDIRS="
- named named-checkzone named-checkconf rndc rndc-confgen
- dnssec-keygen dnssec-signzone
- tcpdchk tcpdmatch
- sendmail praliases editmap mailstats makemap
- sysinstall cron mailwrapper ntp bsnmpd
- tcpdump ndp inetd
- wpa/wpa_supplicant wpa/hostapd wpa/hostapd_cli wpa/wpa_cli wpa/wpa_passphrase
- zic amd
- pkg_install freebsd-update"
-
-src_prepare() {
- if ! use build; then
- ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
- ln -s "/usr/include" "${WORKDIR}/include"
- else
- dummy_mk mount_smbfs
- fi
-}
-
-src_compile() {
- strip-flags
- append-flags -I "${WORKDIR}/sys"
-
- NOFLAGSTRIP="yes" freebsd_src_compile
-}
-
-src_install() {
- # By creating these directories we avoid having to do a
- # more complex hack
- dodir /usr/share/doc
- dodir /sbin
- dodir /usr/libexec
- dodir /usr/bin
-
- # FILESDIR is used by some makefiles which will install files
- # in the wrong place, just put it in the doc directory.
- mkinstall DOCDIR=/usr/share/doc/${PF} || die "Install failed"
-
- # 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
- use usb && doins usbd.conf
-
- insinto /etc/ppp
- doins ppp/ppp.conf || die
-
- if use isdn; then
- insinto /etc/isdn
- doins isdn/* || die
- rm -f "${D}"/etc/isdn/Makefile
- fi
-
- if use bluetooth; then
- insinto /etc/bluetooth
- doins bluetooth/* || die
- rm -f "${D}"/etc/bluetooth/Makefile
- fi
-
- # Install the periodic stuff (needs probably to be ported in a more
- # gentooish way)
- cd "${WORKDIR}/etc/periodic"
-
- doperiodic daily daily/*.accounting
- doperiodic monthly monthly/*.accounting
-}
-
-pkg_postinst() {
- # We need to run pwd_mkdb if key files are not present
- # If they are, then there is no need to run pwd_mkdb
- if [[ ! -e "${ROOT}etc/passwd" || ! -e "${ROOT}etc/pwd.db" || ! -e "${ROOT}etc/spwd.db" ]] ; then
- if [[ -e "${ROOT}etc/master.passwd" ]] ; then
- einfo "Generating passwd files from ${ROOT}etc/master.passwd"
- "${ROOT}"usr/sbin/pwd_mkdb -p -d "${ROOT}etc" "${ROOT}etc/master.passwd"
- else
- eerror "${ROOT}etc/master.passwd does not exist!"
- eerror "You will no be able to log into your system!"
- fi
- fi
-
- for logfile in messages security auth.log maillog lpd-errs xferlog cron \
- debug.log slip.log ppp.log; do
- [[ -f "${ROOT}/var/log/${logfile}" ]] || touch "${ROOT}/var/log/${logfile}"
- done
-}
diff --git a/sys-freebsd/freebsd-usbin/metadata.xml b/sys-freebsd/freebsd-usbin/metadata.xml
index be3d48cc8f1d..83aa667145eb 100644
--- a/sys-freebsd/freebsd-usbin/metadata.xml
+++ b/sys-freebsd/freebsd-usbin/metadata.xml
@@ -3,11 +3,7 @@
<pkgmetadata>
<herd>bsd</herd>
<use>
- <flag name='ipfilter'>Enable building of ipfilter firewall support.</flag>
- <flag name='ipsec'>Enable IPSec support.</flag>
<flag name='isdn'>Enable ISDN support.</flag>
- <flag name='nat'>Enable Network Address Translation support daemon.</flag>
-
<flag name='audit'>
Build auditing tools.
</flag>