From: Diego Elio Pettenò Date: Fri, 5 Jan 2007 21:32:55 +0000 (+0000) Subject: Remove 6.1 ebuild. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3b243e1ebc50f0f79b3069430bc9b9804502ff58;p=gentoo.git Remove 6.1 ebuild. Package-Manager: portage-2.1.2_rc4-r6 --- diff --git a/sys-freebsd/boot0/Manifest b/sys-freebsd/boot0/Manifest index 1fc281f8545f..d8cedbe2708f 100644 --- a/sys-freebsd/boot0/Manifest +++ b/sys-freebsd/boot0/Manifest @@ -9,34 +9,26 @@ AUX freebsd-sources-6.2-sparc64.patch 1239 RMD160 73b66e01b53d2233247e349b5c5a06 MD5 14b8784333437e0c8ee97de093ca19ce files/freebsd-sources-6.2-sparc64.patch 1239 RMD160 73b66e01b53d2233247e349b5c5a06af75d032cf files/freebsd-sources-6.2-sparc64.patch 1239 SHA256 fcc6db401bf004b4985f0237408aed7fd3efba48de0b73769fb9566f9fe5083a files/freebsd-sources-6.2-sparc64.patch 1239 -DIST freebsd-sys-6.1.tar.bz2 17361671 RMD160 eb19f6a345c665542df694a4f9170d227beaf3b6 SHA1 f9da69cabdaaad268c79670c06ba4fff3e3ef6a8 SHA256 d2ecd79b83ba06c12e358adfccc7e057e15fb7c5be76d92c537b99cbe1d84f0f DIST freebsd-sys-6.2_rc2.tar.bz2 18339807 RMD160 ab2e6110b767319a0135130f9ad16d074de61483 SHA1 f7881f43e815930fe3ef6c3517d4e2475f80479e SHA256 392d80c8dae6b7cddc4810f59869a87ec4d0d699c534d8a034b2b273640a7666 -EBUILD boot0-6.1.ebuild 809 RMD160 979839c5243c3c55bc73f1ab8ac363642df1aeae SHA1 ad9011cffb7751a91df3624cd43e8500ecf69db9 SHA256 56e1b923a444724ec96d9aac6554eaf028cbb0b6534770c44347cdab10cf53f3 -MD5 f4e7ff69ec11486dd6ec03d0affc5b45 boot0-6.1.ebuild 809 -RMD160 979839c5243c3c55bc73f1ab8ac363642df1aeae boot0-6.1.ebuild 809 -SHA256 56e1b923a444724ec96d9aac6554eaf028cbb0b6534770c44347cdab10cf53f3 boot0-6.1.ebuild 809 EBUILD boot0-6.2_rc2.ebuild 957 RMD160 b0be36dccceb45a2b74b930e739d57d0810b3335 SHA1 6faec7b828652c065fca1bc2333c4d4014649f3c SHA256 8027a3a3f00bb0f87a573085d53a00c7bb331ebad8caaa118fbb7f80938ddc4b MD5 4a9fbf7c4b6a5574ec899b63c930d0b4 boot0-6.2_rc2.ebuild 957 RMD160 b0be36dccceb45a2b74b930e739d57d0810b3335 boot0-6.2_rc2.ebuild 957 SHA256 8027a3a3f00bb0f87a573085d53a00c7bb331ebad8caaa118fbb7f80938ddc4b boot0-6.2_rc2.ebuild 957 -MISC ChangeLog 2884 RMD160 8cc4410c952c4b828a8d41b8aaa89dd4011de90e SHA1 5b1eecec06c5eb052111fec3444c9edf47120601 SHA256 f99ccbd26b9f8e10e486a76231edbc23ecdac6c5216982de6eb14a786c59abde -MD5 ffe184c0e85516f4c412faaef27868e4 ChangeLog 2884 -RMD160 8cc4410c952c4b828a8d41b8aaa89dd4011de90e ChangeLog 2884 -SHA256 f99ccbd26b9f8e10e486a76231edbc23ecdac6c5216982de6eb14a786c59abde ChangeLog 2884 +MISC ChangeLog 2978 RMD160 1df94c669a3bbfaa8302b984dc768c6c0b4b9982 SHA1 6b9098e32073451678d1da76fb2c15caddd90fb8 SHA256 a30ea6af815bab6ee78dc3d1d38d4c7e36ab225ba95e6a13993831a1ba715b22 +MD5 9cfd90de5f69c988f043da51d76a2ea0 ChangeLog 2978 +RMD160 1df94c669a3bbfaa8302b984dc768c6c0b4b9982 ChangeLog 2978 +SHA256 a30ea6af815bab6ee78dc3d1d38d4c7e36ab225ba95e6a13993831a1ba715b22 ChangeLog 2978 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata.xml 156 -MD5 bfcb2966c1ec6e468c2575c36179479c files/digest-boot0-6.1 256 -RMD160 e3e91956a4a0e172a5a548c6b069c24f9864b6d9 files/digest-boot0-6.1 256 -SHA256 a390411c7d0ce30970aac523a261176bf7fcb5235d6f782156ec5d52ddc382a1 files/digest-boot0-6.1 256 MD5 01d8ed45fdfb6302d9c0eed993e27af6 files/digest-boot0-6.2_rc2 268 RMD160 d5dd02eba1b950dbedb23d6427c0d85a4e049a48 files/digest-boot0-6.2_rc2 268 SHA256 8226d3e88265ffaf04923b5ca63c0d6d2976af1bb7ba329608a66a9ab48993a8 files/digest-boot0-6.2_rc2 268 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) +Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFlTEWAiZjviIA2XgRAiS9AKDw0B+erzYhllOtyB720U1IqIcOJgCeLrOD -GkmAynWs2mrko7iY3It2rm8= -=SFsI +iD8DBQFFnsJXAiZjviIA2XgRAkfdAJ99FIejIKlOiX5kBjFSBBNq2PjK+ACggu7I +vK/C/6e3XpvwseqLku5OFX8= +=S3kc -----END PGP SIGNATURE----- diff --git a/sys-freebsd/boot0/boot0-6.1.ebuild b/sys-freebsd/boot0/boot0-6.1.ebuild deleted file mode 100644 index 0e375235b607..000000000000 --- a/sys-freebsd/boot0/boot0-6.1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/boot0-6.1.ebuild,v 1.2 2006/07/18 19:53:48 the_paya Exp $ - -inherit bsdmk freebsd - -DESCRIPTION="FreeBSD's bootloader" -SLOT="0" -KEYWORDS="~x86-fbsd" - -IUSE="" - -SRC_URI="mirror://gentoo/${SYS}.tar.bz2" - -RDEPEND="" -DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}* - =sys-freebsd/freebsd-lib-${RV}*" - -S="${WORKDIR}/sys/boot" - -PATCHES="${FILESDIR}/boot0-6.0-gentoo.patch" - -src_unpack() { - freebsd_src_unpack - - grep -Zlr -- -ffreestanding "${S}" | xargs -0 sed -i -e \ - "s:-ffreestanding:-ffreestanding $(test-flags -fno-stack-protector -fno-stack-protector-all):g" -} - -src_install() { - dodir /boot/defaults - - mkinstall FILESDIR=/boot || die "mkinstall failed" -} diff --git a/sys-freebsd/boot0/files/digest-boot0-6.1 b/sys-freebsd/boot0/files/digest-boot0-6.1 deleted file mode 100644 index ed81a3f45c74..000000000000 --- a/sys-freebsd/boot0/files/digest-boot0-6.1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 8893a0a0ddfa8959f71e8ee561a11333 freebsd-sys-6.1.tar.bz2 17361671 -RMD160 eb19f6a345c665542df694a4f9170d227beaf3b6 freebsd-sys-6.1.tar.bz2 17361671 -SHA256 d2ecd79b83ba06c12e358adfccc7e057e15fb7c5be76d92c537b99cbe1d84f0f freebsd-sys-6.1.tar.bz2 17361671 diff --git a/sys-freebsd/freebsd-bin/Manifest b/sys-freebsd/freebsd-bin/Manifest index 7075892e0df3..2aad4213d3d2 100644 --- a/sys-freebsd/freebsd-bin/Manifest +++ b/sys-freebsd/freebsd-bin/Manifest @@ -9,38 +9,28 @@ AUX freebsd-bin-6.2-mkdir-posix.patch 3119 RMD160 cba1d464c174bf6f99b15f3c78b7b1 MD5 fb3911b41fbc161929b2f8d1f4856e1e files/freebsd-bin-6.2-mkdir-posix.patch 3119 RMD160 cba1d464c174bf6f99b15f3c78b7b16e7214d9d0 files/freebsd-bin-6.2-mkdir-posix.patch 3119 SHA256 21bab8cdf05e7eedd934ae598707788af7cd0c6dad6913062a37298a91afc133 files/freebsd-bin-6.2-mkdir-posix.patch 3119 -DIST freebsd-bin-6.1.tar.bz2 405680 RMD160 33f2e5b49fce90dcaab652621af3b33e8e80b643 SHA1 83b10732b88c42205b7a8c542f1f9a4a83d82df8 SHA256 86d7a000827432c594f9d37b98a1f936f6168030cf033c6e621a37c670ef5271 DIST freebsd-bin-6.2_rc2.tar.bz2 406726 RMD160 49f94f065296854cf9020426db2d35aa2e1273bb SHA1 2d6eac350f889c123736ddfa171194b163ae7a66 SHA256 8bb7d1028e14dc2b967546e5aa4c18bfe1175cd2d380d6c37452f3b1b7ac637f -DIST freebsd-lib-6.1.tar.bz2 2613584 RMD160 f71aad95ef2bac094bdab9e317a99fb866fba042 SHA1 c7fed3b4a996fdd25f97eef428dd40023dc53a7e SHA256 6ecb49695dc135e64cea949cb7e9b9998b15cb962797cdafc735a7e244744c37 DIST freebsd-lib-6.2_rc2.tar.bz2 2670872 RMD160 bd8b9837acfde404bed998ba3ef5450bb380b779 SHA1 b7df3ad81163558a02e9f4c960f33f8fa3c38106 SHA256 b805264da9f1826d2edb9f5b946ebaae5371fcce146623e4ed695a187c1a4993 -DIST freebsd-sbin-6.1.tar.bz2 1156163 RMD160 167a4545da086f52b9a8fd52e48f9ec6cfdd3150 SHA1 2d3d393b843e071c20fad104bc610948eac6454b SHA256 fb15602238f98f6dd2b9d56bc9ece09c922b0c49599aea87620ba70c853f95d6 DIST freebsd-sbin-6.2_rc2.tar.bz2 1161795 RMD160 85e47cda22e8e5d8eff1b08abeafdbd02d3989d7 SHA1 6d2dce4b00a68d95f66b6a53ca2c7395ffd3feb6 SHA256 dcc67eeba323e4c55fdc7ba6a4fa6af6d004157eb3de6f6923cf7fbb6d55393a -EBUILD freebsd-bin-6.1.ebuild 982 RMD160 9caf4d1d92fc4b643fa2cee7428a116e7182aeaf SHA1 335ce6553a2db379ea4924e8a70c13b4c24a1fcb SHA256 8f6545ee6a0d08e96a06947c2e15e691b06197a410d7020e33a8356460cdc7f5 -MD5 cbb053628444b05e36813b65a8f30112 freebsd-bin-6.1.ebuild 982 -RMD160 9caf4d1d92fc4b643fa2cee7428a116e7182aeaf freebsd-bin-6.1.ebuild 982 -SHA256 8f6545ee6a0d08e96a06947c2e15e691b06197a410d7020e33a8356460cdc7f5 freebsd-bin-6.1.ebuild 982 EBUILD freebsd-bin-6.2_rc2.ebuild 1014 RMD160 1ccfbe40de71de76e79e8be77e6e1cd289fc7e41 SHA1 beb8e493a80dc661b8dba0180db8ee92c1b72f89 SHA256 04a5251e4775a21298ec6e1b96748d75a378c42cc0e89906caf294ed53426a7e MD5 6f9bc3d9d5906997a45e8b9e46b3000b freebsd-bin-6.2_rc2.ebuild 1014 RMD160 1ccfbe40de71de76e79e8be77e6e1cd289fc7e41 freebsd-bin-6.2_rc2.ebuild 1014 SHA256 04a5251e4775a21298ec6e1b96748d75a378c42cc0e89906caf294ed53426a7e freebsd-bin-6.2_rc2.ebuild 1014 -MISC ChangeLog 4826 RMD160 d827180f7d1b26a1c87a499bf06e3518192571fe SHA1 aea702138f52b358d856954d0c6fffbbe8815dd9 SHA256 27b0a0266448de07cfca2093c55f8965b23de9bdc31e963fcf6c4f76356bfb1d -MD5 fcf48aea6a267278a040230a4043a2fd ChangeLog 4826 -RMD160 d827180f7d1b26a1c87a499bf06e3518192571fe ChangeLog 4826 -SHA256 27b0a0266448de07cfca2093c55f8965b23de9bdc31e963fcf6c4f76356bfb1d ChangeLog 4826 +MISC ChangeLog 4928 RMD160 685a0276f7e2e1cf7f4491f11a3497949b87af8b SHA1 f234333095aa30bf4331c5ea0177ae67e2fce409 SHA256 ed1638fcefaa02f95c2011830e3d20af44b90a55e3379d7edf7cbd18eaf8bfc7 +MD5 ecfcd2733dc0479d770a30338e24b37b ChangeLog 4928 +RMD160 685a0276f7e2e1cf7f4491f11a3497949b87af8b ChangeLog 4928 +SHA256 ed1638fcefaa02f95c2011830e3d20af44b90a55e3379d7edf7cbd18eaf8bfc7 ChangeLog 4928 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata.xml 156 -MD5 bc68e9479f640f6b73d0c888070056eb files/digest-freebsd-bin-6.1 759 -RMD160 1848f0d5407e5c3cbc0c9e5956d668e405ffa2a1 files/digest-freebsd-bin-6.1 759 -SHA256 1c6189bfea99cf4729de94cba7c6aa4c2c565faf648d8479eb73f0df740a18af files/digest-freebsd-bin-6.1 759 MD5 13bdb683aa711bfbd0c60bfa9462da15 files/digest-freebsd-bin-6.2_rc2 795 RMD160 274b99007f9b92a441e213b9821486a65c2a3d66 files/digest-freebsd-bin-6.2_rc2 795 SHA256 ea6161abfb5e938a59f4a37781da7fdc4ee58fcc3e4b6017d131549b49a0bcf8 files/digest-freebsd-bin-6.2_rc2 795 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) +Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFlTEvAiZjviIA2XgRAp4uAJ42oaUKmiraIDB01I9jDAra7ZnlCwCg3ftz -L6Kj+KJUDuLOwoZBkcQi0hE= -=C2eY +iD8DBQFFnsJuAiZjviIA2XgRApiDAJ9ymz/HnE2jacroqbJoQDICYNnsfwCgqtZs +PvhhCDMJ0553OwfUq+izTmc= +=tzhF -----END PGP SIGNATURE----- diff --git a/sys-freebsd/freebsd-bin/files/digest-freebsd-bin-6.1 b/sys-freebsd/freebsd-bin/files/digest-freebsd-bin-6.1 deleted file mode 100644 index 1aa16ea5aaa5..000000000000 --- a/sys-freebsd/freebsd-bin/files/digest-freebsd-bin-6.1 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 e8c5589329d476255f8a15f9f9bfebd1 freebsd-bin-6.1.tar.bz2 405680 -RMD160 33f2e5b49fce90dcaab652621af3b33e8e80b643 freebsd-bin-6.1.tar.bz2 405680 -SHA256 86d7a000827432c594f9d37b98a1f936f6168030cf033c6e621a37c670ef5271 freebsd-bin-6.1.tar.bz2 405680 -MD5 f33af43501169d9167c71c3a48a033c2 freebsd-lib-6.1.tar.bz2 2613584 -RMD160 f71aad95ef2bac094bdab9e317a99fb866fba042 freebsd-lib-6.1.tar.bz2 2613584 -SHA256 6ecb49695dc135e64cea949cb7e9b9998b15cb962797cdafc735a7e244744c37 freebsd-lib-6.1.tar.bz2 2613584 -MD5 33a8f60e595bc82c6abb7e47de1b9fa8 freebsd-sbin-6.1.tar.bz2 1156163 -RMD160 167a4545da086f52b9a8fd52e48f9ec6cfdd3150 freebsd-sbin-6.1.tar.bz2 1156163 -SHA256 fb15602238f98f6dd2b9d56bc9ece09c922b0c49599aea87620ba70c853f95d6 freebsd-sbin-6.1.tar.bz2 1156163 diff --git a/sys-freebsd/freebsd-bin/freebsd-bin-6.1.ebuild b/sys-freebsd/freebsd-bin/freebsd-bin-6.1.ebuild deleted file mode 100644 index 82fdf9d8c109..000000000000 --- a/sys-freebsd/freebsd-bin/freebsd-bin-6.1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-bin/freebsd-bin-6.1.ebuild,v 1.2 2006/05/29 23:43:07 flameeyes Exp $ - -inherit bsdmk freebsd - -DESCRIPTION="FreeBSD /bin tools" -SLOT="0" -KEYWORDS="~x86-fbsd" - -IUSE="rcp nls" - -SRC_URI="mirror://gentoo/${BIN}.tar.bz2 - mirror://gentoo/${SBIN}.tar.bz2 - mirror://gentoo/${LIB}.tar.bz2" - -RDEPEND="=sys-freebsd/freebsd-lib-${RV}* - sys-libs/ncurses - sys-apps/ed - !app-admin/realpath" -DEPEND="${RDEPEND} - =sys-freebsd/freebsd-mk-defs-${RV}* - >=sys-devel/flex-2.5.31-r2" - -S=${WORKDIR}/bin - -PATCHES="${FILESDIR}/${PN}-6.0-flex-2.5.31.patch" - -pkg_setup() { - use rcp || mymakeopts="${mymakeopts} NO_RCMDS= " - use nls || mymakeopts="${mymakeopts} NO_NLS= " - - mymakeopts="${mymakeopts} NO_TCSH= NO_SENDMAIL= NO_OPENSSL= NO_CRYPT= " -} - -# csh and tcsh are provided by tcsh package, rmail is sendmail stuff. -REMOVE_SUBDIRS="csh rmail ed" diff --git a/sys-freebsd/freebsd-contrib/Manifest b/sys-freebsd/freebsd-contrib/Manifest index 6fce124e83e5..151f68d2b997 100644 --- a/sys-freebsd/freebsd-contrib/Manifest +++ b/sys-freebsd/freebsd-contrib/Manifest @@ -1,36 +1,27 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -DIST freebsd-contrib-6.1.tar.bz2 36017365 RMD160 225f6ade032533d08b98b79cb29b75da2a3c74fa SHA1 adac960daad3f4169874fe0ba1050fe7e906aa23 SHA256 41283b7f78597cf81f98477aef04eb9cce2b130b1a2f8b5c7d647549c973c054 DIST freebsd-contrib-6.2_rc2.tar.bz2 36594463 RMD160 d957a4054073009fe20cc13353797c2dc1aa0eaa SHA1 b93129a87d91e9ef37748337667a68a7530a30c4 SHA256 aeddb53e9dea3da081419be386251c144c63496d769d07b61e9085a3e52c74e0 -DIST freebsd-gnu-6.1.tar.bz2 867244 RMD160 5eeff2beb898984c40ae1d7c8adfdf41f2c0b8f8 SHA1 93dbfd053132c54b927f6ca5605158b8ccd0f969 SHA256 7bf79a2535539add15da6480830f771e5aea6594c24ffed2d196c7f0c700fdc1 DIST freebsd-gnu-6.2_rc2.tar.bz2 874291 RMD160 9d182b42a407bd690340fe603e4950c6f28b0760 SHA1 b665b72c9763f962990f0b8981f4ec4bbf82393c SHA256 7dac776dfae37bb1d7ab228ac8267aac15dc6ac041961aba8f2d2997875e5481 -EBUILD freebsd-contrib-6.1-r1.ebuild 1149 RMD160 84b05e7775edf36c88cf4570aa280f4307522604 SHA1 9c9bd473bd71d6636a7a1ede24a9c0ceaff7f4cb SHA256 da565cd507776a0126b8300a4930fd8926d906b7e8d35916a2638c800c0152bb -MD5 139803cd13db6fa2219b47289fa96f52 freebsd-contrib-6.1-r1.ebuild 1149 -RMD160 84b05e7775edf36c88cf4570aa280f4307522604 freebsd-contrib-6.1-r1.ebuild 1149 -SHA256 da565cd507776a0126b8300a4930fd8926d906b7e8d35916a2638c800c0152bb freebsd-contrib-6.1-r1.ebuild 1149 EBUILD freebsd-contrib-6.2_rc2.ebuild 1496 RMD160 bf6070e2458fe1dc9565eb0c5d10b01a4446ee89 SHA1 ac51d6b52edc4f52287d4ec82f96a65aabd404b8 SHA256 1db20779de280811cd6df4b794f5a853a40c0178adacb799cd82b580c532fc1d MD5 8d04d765be481e83b389f4273c40c9d5 freebsd-contrib-6.2_rc2.ebuild 1496 RMD160 bf6070e2458fe1dc9565eb0c5d10b01a4446ee89 freebsd-contrib-6.2_rc2.ebuild 1496 SHA256 1db20779de280811cd6df4b794f5a853a40c0178adacb799cd82b580c532fc1d freebsd-contrib-6.2_rc2.ebuild 1496 -MISC ChangeLog 4756 RMD160 4b5c4c8ed1d3856d51b79c21e36cac2f614473b1 SHA1 5f138f96ade767e3f51614dc5bd6e8e76b61f75c SHA256 fe045b3ca2ee97bbaba77842eba3333c9797b6f51a8f4194f3cb4c848b61ffbf -MD5 4b5b85682e8af016933ad7a50e9dee16 ChangeLog 4756 -RMD160 4b5c4c8ed1d3856d51b79c21e36cac2f614473b1 ChangeLog 4756 -SHA256 fe045b3ca2ee97bbaba77842eba3333c9797b6f51a8f4194f3cb4c848b61ffbf ChangeLog 4756 +MISC ChangeLog 4865 RMD160 eaee195dfa5b461048baa82f85c2f989a6586677 SHA1 a966579d0d0b8c5308d255308a66fd022dbad1b8 SHA256 d0cea6ccf3e353acde66b87d9e18bbdbedf80132a3a45af6118b8344ea8ed5a4 +MD5 91fad5d47b6bcd31f6ece04fa9641a21 ChangeLog 4865 +RMD160 eaee195dfa5b461048baa82f85c2f989a6586677 ChangeLog 4865 +SHA256 d0cea6ccf3e353acde66b87d9e18bbdbedf80132a3a45af6118b8344ea8ed5a4 ChangeLog 4865 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata.xml 156 -MD5 4147a41ac35cb4532a431de068205b3f files/digest-freebsd-contrib-6.1-r1 518 -RMD160 5ef5037ed3a36371fabb57fcbf5381404f92bfcf files/digest-freebsd-contrib-6.1-r1 518 -SHA256 a47187b86f4ca2da6f9884dc8418bb2e501e32e0e9776812c0a9e6243c9ccbd7 files/digest-freebsd-contrib-6.1-r1 518 MD5 973995f7b2297c818bfe38aa6354ebce files/digest-freebsd-contrib-6.2_rc2 542 RMD160 14dddc857f6331ea931eaf970c8a29768d234f8f files/digest-freebsd-contrib-6.2_rc2 542 SHA256 bc00a64cd273a6ed4165a713a3dd28c0fc5c12c0357d7a4660c6ad8c3babe26e files/digest-freebsd-contrib-6.2_rc2 542 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) +Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFlTFVAiZjviIA2XgRAuieAJ4tZH3lPcmBrv05r4dVkUHKkal/TACg5noP -tIIL7h44HUrpchRjCB7gF6s= -=jclR +iD8DBQFFnsKKAiZjviIA2XgRAr2iAJ9UMyM7D6cdAf5uGUmc2AHhl7HFGQCgiaR9 +43IELPRUPAjy9s6LBOAoJ3E= +=G2BB -----END PGP SIGNATURE----- diff --git a/sys-freebsd/freebsd-contrib/files/digest-freebsd-contrib-6.1-r1 b/sys-freebsd/freebsd-contrib/files/digest-freebsd-contrib-6.1-r1 deleted file mode 100644 index 9659f078390f..000000000000 --- a/sys-freebsd/freebsd-contrib/files/digest-freebsd-contrib-6.1-r1 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 a04643beb2d94972200d6714688930cf freebsd-contrib-6.1.tar.bz2 36017365 -RMD160 225f6ade032533d08b98b79cb29b75da2a3c74fa freebsd-contrib-6.1.tar.bz2 36017365 -SHA256 41283b7f78597cf81f98477aef04eb9cce2b130b1a2f8b5c7d647549c973c054 freebsd-contrib-6.1.tar.bz2 36017365 -MD5 986fe1e300d5d0d89180eb9559f87334 freebsd-gnu-6.1.tar.bz2 867244 -RMD160 5eeff2beb898984c40ae1d7c8adfdf41f2c0b8f8 freebsd-gnu-6.1.tar.bz2 867244 -SHA256 7bf79a2535539add15da6480830f771e5aea6594c24ffed2d196c7f0c700fdc1 freebsd-gnu-6.1.tar.bz2 867244 diff --git a/sys-freebsd/freebsd-contrib/freebsd-contrib-6.1-r1.ebuild b/sys-freebsd/freebsd-contrib/freebsd-contrib-6.1-r1.ebuild deleted file mode 100644 index dd64fdc2d434..000000000000 --- a/sys-freebsd/freebsd-contrib/freebsd-contrib-6.1-r1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/freebsd-contrib-6.1-r1.ebuild,v 1.1 2006/11/22 00:21:44 flameeyes Exp $ - -inherit bsdmk freebsd flag-o-matic - -DESCRIPTION="Contributed sources for FreeBSD." -SLOT="0" -KEYWORDS="~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" - -REMOVE_SUBDIRS="lib/libg2c lib/libgcc lib/libgcc_r lib/libgcov lib/libiberty lib/csu - lib/libobjc lib/libreadline lib/libregex lib/libstdc++ lib/libsupc++ usr.bin/bc - usr.bin/binutils usr.bin/cc usr.bin/cpio usr.bin/cvs usr.bin/dc usr.bin/dialog - usr.bin/diff usr.bin/diff3 usr.bin/gdb usr.bin/gperf usr.bin/grep usr.bin/groff - usr.bin/gzip usr.bin/man usr.bin/rcs usr.bin/sdiff usr.bin/send-pr - usr.bin/tar usr.bin/texinfo" - -src_install() { - freebsd_src_install - - # Move these to /bin for boot access - dodir /bin - mv "${D}/usr/bin/sort" "${D}/bin/" || die "mv failed" -} diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest index 62ac9e9e575b..982c44f63711 100644 --- a/sys-freebsd/freebsd-lib/Manifest +++ b/sys-freebsd/freebsd-lib/Manifest @@ -41,48 +41,33 @@ AUX freebsd-sources-6.2-sparc64.patch 18794 RMD160 7e529e32924c872ea033f03c781a8 MD5 2d9b3844827a93ea31fe3189359d693f files/freebsd-sources-6.2-sparc64.patch 18794 RMD160 7e529e32924c872ea033f03c781a86031fe8d13b files/freebsd-sources-6.2-sparc64.patch 18794 SHA256 a1b5803f3366d3466ba3c07f510e0b8c72e17b515a1dc82f696e5a10bec7a60c files/freebsd-sources-6.2-sparc64.patch 18794 -DIST freebsd-contrib-6.1.tar.bz2 36017365 RMD160 225f6ade032533d08b98b79cb29b75da2a3c74fa SHA1 adac960daad3f4169874fe0ba1050fe7e906aa23 SHA256 41283b7f78597cf81f98477aef04eb9cce2b130b1a2f8b5c7d647549c973c054 DIST freebsd-contrib-6.2_rc2.tar.bz2 36594463 RMD160 d957a4054073009fe20cc13353797c2dc1aa0eaa SHA1 b93129a87d91e9ef37748337667a68a7530a30c4 SHA256 aeddb53e9dea3da081419be386251c144c63496d769d07b61e9085a3e52c74e0 -DIST freebsd-crypto-6.1.tar.bz2 3978359 RMD160 de2fa1e12cda42661565d5bf0f910b1a99d3c4df SHA1 a816fb8b613b92a80b9fab3d8d89b72eb9c550be SHA256 52be404c7f86ca29f957e1dc46c8a2c32a46ddb5c316d5123faf92a9c9fe37c5 DIST freebsd-crypto-6.2_rc2.tar.bz2 4005390 RMD160 443e09ccd6b26590f6ed160888e5da9f01929e85 SHA1 af52554fe4cefd3e9c3d399a750720a6866fa9f3 SHA256 6db02fa1a722d309c1a92f717f2419cdc068553134e192a646eb1e6abaef4bec -DIST freebsd-etc-6.1.tar.bz2 184045 RMD160 b9a8bea64694c040c02b74f7633dc3cd77afa400 SHA1 4a1fff7fa1c77485c5efccf5ab1155e497d1cd82 SHA256 62b06b61e526c4a939503202aaca31cbce7a3de9daec03e67dc57119527eeff7 DIST freebsd-etc-6.2_rc2.tar.bz2 189416 RMD160 e98c8821fc4fbcf2890fcc8155c8fa0f74fd417c SHA1 4fad080351793c84c491407e797e62559245fc40 SHA256 b4f673da45ca646fae9e457c4a8e3255dbe5365445537d4e6ba39ac9b54ee40e -DIST freebsd-include-6.1.tar.bz2 127179 RMD160 f873b13bb16408a390932d14974b39336bd90a7c SHA1 747d7498ce80846274e49ed4487440dcbefe96af SHA256 9cd9d47c5cc8ea4fc7afe185c9b391317fe013adb3f0a960e9fe498f166177b5 DIST freebsd-include-6.2_rc2.tar.bz2 131650 RMD160 811494045dd44c953efeb690258a52ec89a169fe SHA1 b47035a25632a890f83889789c0a076e5e8a6bc6 SHA256 ab4264cf293c5acffb9cfbabce3605841187c900b76eb1cd4a403053ee57220c -DIST freebsd-lib-6.1.tar.bz2 2613584 RMD160 f71aad95ef2bac094bdab9e317a99fb866fba042 SHA1 c7fed3b4a996fdd25f97eef428dd40023dc53a7e SHA256 6ecb49695dc135e64cea949cb7e9b9998b15cb962797cdafc735a7e244744c37 DIST freebsd-lib-6.2_rc2.tar.bz2 2670872 RMD160 bd8b9837acfde404bed998ba3ef5450bb380b779 SHA1 b7df3ad81163558a02e9f4c960f33f8fa3c38106 SHA256 b805264da9f1826d2edb9f5b946ebaae5371fcce146623e4ed695a187c1a4993 -DIST freebsd-libexec-6.1.tar.bz2 277860 RMD160 bef98efbc76812cf36b55067433039f3805cfbab SHA1 8204a510e44e21cbf53715f3d4a2518b8192400d SHA256 38eaddc9edc36597e42ca3c63ee8a2fd6f07f96c7294aea75a9988ac5b07b357 DIST freebsd-libexec-6.2_rc2.tar.bz2 277162 RMD160 e1868104643febadcd503d2da8b781ef7f24b22e SHA1 01b80b12889149052896be298548660f23b8a9f0 SHA256 28f1f8f60fac76043b46d701b60ea182d9f31af277ac82f4174c93f25f04a632 -DIST freebsd-sys-6.1.tar.bz2 17361671 RMD160 eb19f6a345c665542df694a4f9170d227beaf3b6 SHA1 f9da69cabdaaad268c79670c06ba4fff3e3ef6a8 SHA256 d2ecd79b83ba06c12e358adfccc7e057e15fb7c5be76d92c537b99cbe1d84f0f DIST freebsd-sys-6.2_rc2.tar.bz2 18339807 RMD160 ab2e6110b767319a0135130f9ad16d074de61483 SHA1 f7881f43e815930fe3ef6c3517d4e2475f80479e SHA256 392d80c8dae6b7cddc4810f59869a87ec4d0d699c534d8a034b2b273640a7666 -DIST freebsd-usbin-6.1.tar.bz2 2664570 RMD160 98a87538790a814d0afd35bb0f848bcff574c72d SHA1 c7e6856e7f6bd2d45790737f411348b301944b91 SHA256 70b4a494a72d130d641500bfa857bdf98c9a4a040da2699475902523ba5c374e DIST freebsd-usbin-6.2_rc2.tar.bz2 2696638 RMD160 c907088555c4bba3e4542f69649f6df9dba4fc8a SHA1 b5d65f1d02bcb4fc0aae3649a6b0699b11aee820 SHA256 952f3d8638035b31e65e4374139f49b993b55b88fbbe62ce0dead963ac552b25 -EBUILD freebsd-lib-6.1.ebuild 7061 RMD160 88accfd80d617bd76f3fe29047a4b0566266a5d5 SHA1 52f2bcfdad6415014202e9ca8737ef4128c6af0a SHA256 dea7dcb78467a3e960f3ac2a42d346e69aa7944d8472d6037255f5e182af31f1 -MD5 27abb0a51efadf54eb5484487f9a6597 freebsd-lib-6.1.ebuild 7061 -RMD160 88accfd80d617bd76f3fe29047a4b0566266a5d5 freebsd-lib-6.1.ebuild 7061 -SHA256 dea7dcb78467a3e960f3ac2a42d346e69aa7944d8472d6037255f5e182af31f1 freebsd-lib-6.1.ebuild 7061 EBUILD freebsd-lib-6.2_rc2.ebuild 7940 RMD160 373ee20f63fde3a2f1fb15bb94552fccdcb29f97 SHA1 b49582fab234c2fe485dae87d6feb3332fc8f212 SHA256 e363f9d6b15f51f404eb208ea73aba1adec643288a8ed9e271f41abaaa07b0d5 MD5 f489dfbfd81bec810a2160b9020bd8c1 freebsd-lib-6.2_rc2.ebuild 7940 RMD160 373ee20f63fde3a2f1fb15bb94552fccdcb29f97 freebsd-lib-6.2_rc2.ebuild 7940 SHA256 e363f9d6b15f51f404eb208ea73aba1adec643288a8ed9e271f41abaaa07b0d5 freebsd-lib-6.2_rc2.ebuild 7940 -MISC ChangeLog 13311 RMD160 c56e6a811fb541c41764f88c23260df127c3537e SHA1 2bddfe3155361543c84c17a45a9b7a530cd83f36 SHA256 4a97c23e25e38f4a5ddc41481928820169190a98f82874e134fc385166260815 -MD5 2bdd325231e66e7537c4dfe10167c753 ChangeLog 13311 -RMD160 c56e6a811fb541c41764f88c23260df127c3537e ChangeLog 13311 -SHA256 4a97c23e25e38f4a5ddc41481928820169190a98f82874e134fc385166260815 ChangeLog 13311 +MISC ChangeLog 13413 RMD160 0365d6efb75aab8010ac7c47261fd355b04f1d8d SHA1 d2eace4784b33462cf8acbbd1c0a8f7f59a22dac SHA256 b4f47deed34672964ccff796fcc6e3cc6ed42ec0a23c1f12ef1cca94197d9a81 +MD5 0efa47fbc4fa0d38f5916a81e90fdba9 ChangeLog 13413 +RMD160 0365d6efb75aab8010ac7c47261fd355b04f1d8d ChangeLog 13413 +SHA256 b4f47deed34672964ccff796fcc6e3cc6ed42ec0a23c1f12ef1cca94197d9a81 ChangeLog 13413 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata.xml 156 -MD5 7a392338e5c80064105ffb19a6575361 files/digest-freebsd-lib-6.1 2072 -RMD160 2f3e680d7a90f8387d086addff4fff68fd4c51de files/digest-freebsd-lib-6.1 2072 -SHA256 e4f88af696b9cdd96f0553e2928d59ce138c08f8d4925b32b6ea59c3030d7f21 files/digest-freebsd-lib-6.1 2072 MD5 1b9f4b4a6f0946d07614fbba228f29f2 files/digest-freebsd-lib-6.2_rc2 2168 RMD160 dc46012dff220f4cc569b2fc2e47eabd9b774bd5 files/digest-freebsd-lib-6.2_rc2 2168 SHA256 701b8e91666e40ba5663587ca3426c70b3bc9b7a312ca97fb2132a53aef25527 files/digest-freebsd-lib-6.2_rc2 2168 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFnQQzAiZjviIA2XgRAiXOAKCRg7wZZnK0Wrhn54dK8tBdwBP++QCfZENP -SxXRNuoh44caeFtBzyOEnx0= -=LIHl +iD8DBQFFnsKoAiZjviIA2XgRAicwAJ4h6xJu7GmCK8eoVMqqyfLFBSLS8QCgnSl9 +FKFVEH1SeC01XEEYTug8JKQ= +=e68a -----END PGP SIGNATURE----- diff --git a/sys-freebsd/freebsd-lib/files/digest-freebsd-lib-6.1 b/sys-freebsd/freebsd-lib/files/digest-freebsd-lib-6.1 deleted file mode 100644 index 05013f6c080f..000000000000 --- a/sys-freebsd/freebsd-lib/files/digest-freebsd-lib-6.1 +++ /dev/null @@ -1,24 +0,0 @@ -MD5 a04643beb2d94972200d6714688930cf freebsd-contrib-6.1.tar.bz2 36017365 -RMD160 225f6ade032533d08b98b79cb29b75da2a3c74fa freebsd-contrib-6.1.tar.bz2 36017365 -SHA256 41283b7f78597cf81f98477aef04eb9cce2b130b1a2f8b5c7d647549c973c054 freebsd-contrib-6.1.tar.bz2 36017365 -MD5 8244e2505e95db531ce027d8b252be31 freebsd-crypto-6.1.tar.bz2 3978359 -RMD160 de2fa1e12cda42661565d5bf0f910b1a99d3c4df freebsd-crypto-6.1.tar.bz2 3978359 -SHA256 52be404c7f86ca29f957e1dc46c8a2c32a46ddb5c316d5123faf92a9c9fe37c5 freebsd-crypto-6.1.tar.bz2 3978359 -MD5 ac8defbdaaab754fee70ac27c02f2c0e freebsd-etc-6.1.tar.bz2 184045 -RMD160 b9a8bea64694c040c02b74f7633dc3cd77afa400 freebsd-etc-6.1.tar.bz2 184045 -SHA256 62b06b61e526c4a939503202aaca31cbce7a3de9daec03e67dc57119527eeff7 freebsd-etc-6.1.tar.bz2 184045 -MD5 d832298dc9565d138f86fd53e1d9ad3f freebsd-include-6.1.tar.bz2 127179 -RMD160 f873b13bb16408a390932d14974b39336bd90a7c freebsd-include-6.1.tar.bz2 127179 -SHA256 9cd9d47c5cc8ea4fc7afe185c9b391317fe013adb3f0a960e9fe498f166177b5 freebsd-include-6.1.tar.bz2 127179 -MD5 f33af43501169d9167c71c3a48a033c2 freebsd-lib-6.1.tar.bz2 2613584 -RMD160 f71aad95ef2bac094bdab9e317a99fb866fba042 freebsd-lib-6.1.tar.bz2 2613584 -SHA256 6ecb49695dc135e64cea949cb7e9b9998b15cb962797cdafc735a7e244744c37 freebsd-lib-6.1.tar.bz2 2613584 -MD5 244baf5f7ef26dbf33428970913a40f3 freebsd-libexec-6.1.tar.bz2 277860 -RMD160 bef98efbc76812cf36b55067433039f3805cfbab freebsd-libexec-6.1.tar.bz2 277860 -SHA256 38eaddc9edc36597e42ca3c63ee8a2fd6f07f96c7294aea75a9988ac5b07b357 freebsd-libexec-6.1.tar.bz2 277860 -MD5 8893a0a0ddfa8959f71e8ee561a11333 freebsd-sys-6.1.tar.bz2 17361671 -RMD160 eb19f6a345c665542df694a4f9170d227beaf3b6 freebsd-sys-6.1.tar.bz2 17361671 -SHA256 d2ecd79b83ba06c12e358adfccc7e057e15fb7c5be76d92c537b99cbe1d84f0f freebsd-sys-6.1.tar.bz2 17361671 -MD5 ca61245fd3ec21d31ab9e41cd1ad35b7 freebsd-usbin-6.1.tar.bz2 2664570 -RMD160 98a87538790a814d0afd35bb0f848bcff574c72d freebsd-usbin-6.1.tar.bz2 2664570 -SHA256 70b4a494a72d130d641500bfa857bdf98c9a4a040da2699475902523ba5c374e freebsd-usbin-6.1.tar.bz2 2664570 diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-6.1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-6.1.ebuild deleted file mode 100644 index 7006bb707151..000000000000 --- a/sys-freebsd/freebsd-lib/freebsd-lib-6.1.ebuild +++ /dev/null @@ -1,237 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-6.1.ebuild,v 1.15 2006/11/22 12:52:55 flameeyes Exp $ - -inherit bsdmk freebsd flag-o-matic toolchain-funcs - -DESCRIPTION="FreeBSD's base system libraries" -SLOT="6.0" -KEYWORDS="~x86-fbsd" - -IUSE="atm bluetooth ssl ipv6 kerberos nis gpib build" - -# Crypto is needed to have an internal OpenSSL header -# sys is needed for libalias, probably we can just extract that instead of -# extracting the whole tarball -SRC_URI="mirror://gentoo/${LIB}.tar.bz2 - mirror://gentoo/${CONTRIB}.tar.bz2 - mirror://gentoo/${CRYPTO}.tar.bz2 - mirror://gentoo/${LIBEXEC}.tar.bz2 - mirror://gentoo/${ETC}.tar.bz2 - mirror://gentoo/${INCLUDE}.tar.bz2 - nis? ( mirror://gentoo/${USBIN}.tar.bz2 ) - build? ( - mirror://gentoo/${SYS}.tar.bz2 )" - -if [[ ${CATEGORY/cross-} == ${CATEGORY} ]]; then - RDEPEND="ssl? ( dev-libs/openssl ) - kerberos? ( virtual/krb5 ) - !sys-freebsd/freebsd-headers" - DEPEND="${RDEPEND} - >=sys-devel/flex-2.5.31-r2 - =sys-freebsd/freebsd-sources-${RV}* - app-arch/bzip2" - - PROVIDE="virtual/libc - virtual/os-headers" - -else - SRC_URI="${SRC_URI} - mirror://gentoo/${SYS}.tar.bz2" -fi - -DEPEND="${DEPEND} - =sys-freebsd/freebsd-mk-defs-${RV}*" - -S="${WORKDIR}/lib" - -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CTARGET} == ${CHOST} && ${CATEGORY/cross-} != ${CATEGORY} ]]; then - export CTARGET=${CATEGORY/cross-} -fi - -pkg_setup() { - [[ -c /dev/zero ]] || \ - die "You forgot to mount /dev; the compiled libc would break." - - if ! use ssl && use kerberos; then - eerror "If you want kerberos support you need to enable ssl support, too." - fi - - use atm || mymakeopts="${mymakeopts} NO_ATM= " - use bluetooth || mymakeopts="${mymakeopts} NO_BLUETOOTH= " - use ssl || mymakeopts="${mymakeopts} NO_OPENSSL= NO_CRYPT= " - use ipv6 || mymakeopts="${mymakeopts} NO_INET6= " - use kerberos || mymakeopts="${mymakeopts} NO_KERBEROS= " - use nis || mymakeopts="${mymakeopts} NO_NIS= " - use gpib || mymakeopts="${mymakeopts} NO_GPIB= " - - mymakeopts="${mymakeopts} NO_OPENSSH= NO_BIND= NO_SENDMAIL= " - - replace-flags "-O?" -"O1" - - if [[ ${CTARGET} != ${CHOST} ]]; then - mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})" - mymakeopts="${mymakeopts} MACHINE_ARCH=$(tc-arch-kernel ${CTARGET})" - fi -} - -PATCHES="${FILESDIR}/${PN}-bsdxml.patch - ${FILESDIR}/${PN}-6.0-pmc.patch - ${FILESDIR}/${PN}-6.0-gccfloat.patch - ${FILESDIR}/${PN}-6.0-flex-2.5.31.patch - ${FILESDIR}/${PN}-6.0-binutils-asm.patch - ${FILESDIR}/${PN}-6.0-ssp.patch - ${FILESDIR}/${P}-csu.patch" - -# Here we disable and remove source which we don't need or want -# In order: -# - ncurses stuff -# - archiving libraries (have their own ebuild) -# - sendmail libraries (they are installed by sendmail) -# - SNMP library and dependency (have their own ebuilds) -# -# The rest are libraries we already have somewhere else because -# they are contribution. -# Note: libtelnet is an internal lib used by telnet and telnetd programs -# as it's not used in freebsd-lib package itself, it's pointless building -# it here. -REMOVE_SUBDIRS="libncurses libform libmenu libpanel \ - libz libbz2 libarchive \ - libsm libsmdb libsmutil \ - libbegemot libbsnmp \ - libsmb libpam libpcap bind libwrap libmagic \ - libcom_err libtelnet" - -src_unpack() { - freebsd_src_unpack - - sed -i -e 's:-o/dev/stdout:-t:' "${S}"/libc/net/Makefile.inc - - use build && return 0 - - if [[ ${CTARGET} == ${CHOST} ]]; then - ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" - else - sed -i -e 's:/usr/include:/usr/'${CTARGET}'/usr/include:g' \ - "${S}/libc/"{yp,rpc}"/Makefile.inc" - fi - - [[ -n $(install --version 2> /dev/null | grep GNU) ]] && \ - sed -i -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile" -} - -src_compile() { - cd "${WORKDIR}/include" - $(freebsd_get_bmake) CC=$(tc-getCC) || die "make include failed" - - use crosscompile_opts_headers-only && return 0 - - # Don't use ssp until properly fixed - append-flags $(test-flags -fno-stack-protector -fno-stack-protector-all) - - strip-flags - if [[ ${CTARGET} != ${CHOST} ]]; then - export YACC='yacc -by' - CHOST=${CTARGET} tc-export CC LD CXX - - local machine - machine=$(tc-arch-kernel ${CTARGET}) - - local csudir - if [[ -d "${S}/csu/${machine}-elf" ]]; then - csudir="${S}/csu/${machine}-elf" - else - csudir="${S}/csu/${machine}" - fi - cd "${csudir}" - $(freebsd_get_bmake) ${mymakeopts} || die "make csu failed" - - append-flags "-isystem /usr/${CTARGET}/usr/include" - append-flags "-B ${csudir}" - append-ldflags "-B ${csudir}" - cd "${S}/libc" - $(freebsd_get_bmake) ${mymakeopts} || die "make libc failed" - - append-flags "-isystem ${WORKDIR}/lib/msun/${machine/i386/i387}" - cd "${S}/msun" - $(freebsd_get_bmake) ${mymakeopts} || die "make libc failed" - else - # Forces to use the local copy of headers as they might be outdated in - # the system - append-flags "-isystem '${WORKDIR}/sys' -isystem '${WORKDIR}/include'" - - cd "${S}" - NOFLAGSTRIP=yes freebsd_src_compile - fi -} - -src_install() { - cd "${WORKDIR}/include" - - [[ ${CTARGET} == ${CHOST} ]] \ - && INCLUDEDIR="/usr/include" \ - || INCLUDEDIR="/usr/${CTARGET}/usr/include" - - einfo "Installing for ${CTARGET} in ${CHOST}.." - - dodir "${INCLUDEDIR}" - $(freebsd_get_bmake) installincludes \ - MACHINE=$(tc-arch-kernel) \ - DESTDIR="${D}" INCLUDEDIR="${INCLUDEDIR}" || die "Install failed" - - # Install math.h when crosscompiling, at this point - if [[ ${CHOST} != ${CTARGET} ]]; then - insinto "/usr/${CTARGET}/usr/include" - doins "${S}/msun/src/math.h" - fi - - use crosscompile_opts_headers-only && return 0 - - if [[ ${CTARGET} != ${CHOST} ]]; then - local csudir - if [[ -d "${S}/csu/$(tc-arch-kernel ${CTARGET})-elf" ]]; then - csudir="${S}/csu/$(tc-arch-kernel ${CTARGET})-elf" - else - csudir="${S}/csu/$(tc-arch-kernel ${CTARGET})" - fi - cd "${csudir}" - $(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install \ - FILESDIR="/usr/${CTARGET}/usr/lib" || die "Install csu failed" - - cd "${S}/libc" - $(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \ - SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install failed" - - cd "${S}/msun" - $(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \ - INCLUDEDIR="/usr/${CTARGET}/usr/include" \ - SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install failed" - - dosym "usr/include" "/usr/${CTARGET}/sys-include" - else - cd "${S}" - mkinstall || die "Install failed" - fi - - # Don't install the rest of the configuration files if crosscompiling - [[ ${CTARGET} != ${CHOST} ]] && return 0 - - # Compatibility symlinks to run FreeBSD 5.x binaries (ABI is mostly - # identical, remove when problems will actually happen) - dosym /lib/libc.so.6 /usr/lib/libc.so.5 - dosym /lib/libm.so.4 /usr/lib/libm.so.3 - - # install libstand files - dodir /usr/include/libstand - insinto /usr/include/libstand - doins ${S}/libstand/*.h - - cd ${WORKDIR}/etc/ - insinto /etc - doins auth.conf nls.alias mac.conf netconfig - - # Install ttys file - doins "etc.$(tc-arch-kernel)"/* -} - diff --git a/sys-freebsd/freebsd-libexec/Manifest b/sys-freebsd/freebsd-libexec/Manifest index db5e25c0ef66..e0cdd85888c9 100644 --- a/sys-freebsd/freebsd-libexec/Manifest +++ b/sys-freebsd/freebsd-libexec/Manifest @@ -29,46 +29,32 @@ AUX ftpd.pamd 597 RMD160 acb189e5e3166d21a5c3ad8e71d652386853f882 SHA1 34deacd22 MD5 d91d1f0640a08e9bd0b02c0cd7d57116 files/ftpd.pamd 597 RMD160 acb189e5e3166d21a5c3ad8e71d652386853f882 files/ftpd.pamd 597 SHA256 dc779a1c0b0ad94660584e902d505ad0197b52a3944bc13666815d653790e090 files/ftpd.pamd 597 -DIST freebsd-bin-6.1.tar.bz2 405680 RMD160 33f2e5b49fce90dcaab652621af3b33e8e80b643 SHA1 83b10732b88c42205b7a8c542f1f9a4a83d82df8 SHA256 86d7a000827432c594f9d37b98a1f936f6168030cf033c6e621a37c670ef5271 DIST freebsd-bin-6.2_rc2.tar.bz2 406726 RMD160 49f94f065296854cf9020426db2d35aa2e1273bb SHA1 2d6eac350f889c123736ddfa171194b163ae7a66 SHA256 8bb7d1028e14dc2b967546e5aa4c18bfe1175cd2d380d6c37452f3b1b7ac637f -DIST freebsd-contrib-6.1.tar.bz2 36017365 RMD160 225f6ade032533d08b98b79cb29b75da2a3c74fa SHA1 adac960daad3f4169874fe0ba1050fe7e906aa23 SHA256 41283b7f78597cf81f98477aef04eb9cce2b130b1a2f8b5c7d647549c973c054 DIST freebsd-contrib-6.2_rc2.tar.bz2 36594463 RMD160 d957a4054073009fe20cc13353797c2dc1aa0eaa SHA1 b93129a87d91e9ef37748337667a68a7530a30c4 SHA256 aeddb53e9dea3da081419be386251c144c63496d769d07b61e9085a3e52c74e0 -DIST freebsd-etc-6.1.tar.bz2 184045 RMD160 b9a8bea64694c040c02b74f7633dc3cd77afa400 SHA1 4a1fff7fa1c77485c5efccf5ab1155e497d1cd82 SHA256 62b06b61e526c4a939503202aaca31cbce7a3de9daec03e67dc57119527eeff7 DIST freebsd-etc-6.2_rc2.tar.bz2 189416 RMD160 e98c8821fc4fbcf2890fcc8155c8fa0f74fd417c SHA1 4fad080351793c84c491407e797e62559245fc40 SHA256 b4f673da45ca646fae9e457c4a8e3255dbe5365445537d4e6ba39ac9b54ee40e -DIST freebsd-lib-6.1.tar.bz2 2613584 RMD160 f71aad95ef2bac094bdab9e317a99fb866fba042 SHA1 c7fed3b4a996fdd25f97eef428dd40023dc53a7e SHA256 6ecb49695dc135e64cea949cb7e9b9998b15cb962797cdafc735a7e244744c37 DIST freebsd-lib-6.2_rc2.tar.bz2 2670872 RMD160 bd8b9837acfde404bed998ba3ef5450bb380b779 SHA1 b7df3ad81163558a02e9f4c960f33f8fa3c38106 SHA256 b805264da9f1826d2edb9f5b946ebaae5371fcce146623e4ed695a187c1a4993 -DIST freebsd-libexec-6.1.tar.bz2 277860 RMD160 bef98efbc76812cf36b55067433039f3805cfbab SHA1 8204a510e44e21cbf53715f3d4a2518b8192400d SHA256 38eaddc9edc36597e42ca3c63ee8a2fd6f07f96c7294aea75a9988ac5b07b357 DIST freebsd-libexec-6.2_rc2.tar.bz2 277162 RMD160 e1868104643febadcd503d2da8b781ef7f24b22e SHA1 01b80b12889149052896be298548660f23b8a9f0 SHA256 28f1f8f60fac76043b46d701b60ea182d9f31af277ac82f4174c93f25f04a632 -DIST freebsd-ubin-6.1.tar.bz2 1763218 RMD160 5da58c546cebf30a6b661841dbcb5b53626a4a1e SHA1 7d1b0568d02f192dcd3bd7f972613376d3d0f16d SHA256 13429ed3cc8a14a4efda69b7d82004bf993b5a14591a6129a857d627221aeef6 DIST freebsd-ubin-6.2_rc2.tar.bz2 1773409 RMD160 be5fa09f2b84b77981ba6ae34d2c237b05164776 SHA1 6052972c318830a717cb3f6b72fe034c1a1fe147 SHA256 391d266053323b96a258a264abec848bd0799ded76dcad098b510bd5d9a75398 -DIST freebsd-usbin-6.1.tar.bz2 2664570 RMD160 98a87538790a814d0afd35bb0f848bcff574c72d SHA1 c7e6856e7f6bd2d45790737f411348b301944b91 SHA256 70b4a494a72d130d641500bfa857bdf98c9a4a040da2699475902523ba5c374e DIST freebsd-usbin-6.2_rc2.tar.bz2 2696638 RMD160 c907088555c4bba3e4542f69649f6df9dba4fc8a SHA1 b5d65f1d02bcb4fc0aae3649a6b0699b11aee820 SHA256 952f3d8638035b31e65e4374139f49b993b55b88fbbe62ce0dead963ac552b25 -EBUILD freebsd-libexec-6.1.ebuild 1651 RMD160 65b915be4aa6a8e7b54b48fdcf21f74bd3b3224a SHA1 7d4d022b49b64b8d45fffd12a43b89c6a26ba43f SHA256 3cfb41bd909563987a491661f64cb57d29b252d2ef2bd90357b8efbb644510de -MD5 e7efff442eb62dc08f6aca7907a10a1a freebsd-libexec-6.1.ebuild 1651 -RMD160 65b915be4aa6a8e7b54b48fdcf21f74bd3b3224a freebsd-libexec-6.1.ebuild 1651 -SHA256 3cfb41bd909563987a491661f64cb57d29b252d2ef2bd90357b8efbb644510de freebsd-libexec-6.1.ebuild 1651 EBUILD freebsd-libexec-6.2_rc2.ebuild 1806 RMD160 b42b26b9faeb37cb9fa5f5e9c7f4f6ec4a6ad53e SHA1 c27dc90c9ac6116dd662eae6e5428ab41e45a82e SHA256 d7feccf8232c2b891a5f603134cc66373aa6258467e2b851b7be994cce4d2731 MD5 77f88df02a4b04fb399205f97929b3f6 freebsd-libexec-6.2_rc2.ebuild 1806 RMD160 b42b26b9faeb37cb9fa5f5e9c7f4f6ec4a6ad53e freebsd-libexec-6.2_rc2.ebuild 1806 SHA256 d7feccf8232c2b891a5f603134cc66373aa6258467e2b851b7be994cce4d2731 freebsd-libexec-6.2_rc2.ebuild 1806 -MISC ChangeLog 5961 RMD160 7e79b9ad9155da0b97fab1ada39b6f4728fd256d SHA1 44b55a2db8ad2511705c444b821d0ac759200eb1 SHA256 5f6a6aafd83d9be6a76b0773aca82d291172f839fb950ae5aad7deb69405943d -MD5 c445fcce9c0124b504cc086ab9e0449c ChangeLog 5961 -RMD160 7e79b9ad9155da0b97fab1ada39b6f4728fd256d ChangeLog 5961 -SHA256 5f6a6aafd83d9be6a76b0773aca82d291172f839fb950ae5aad7deb69405943d ChangeLog 5961 +MISC ChangeLog 6067 RMD160 6b1f60c9d60580db06ecd7894c88fd9fcb800e02 SHA1 fd402a62669ffcd1af9bd1a9a8541042f050be43 SHA256 84a1a1d8576013d28773db042c928136c78facc50cc130c3d0e24dc8a2d7cfae +MD5 66da851af53efe39711e10fd1767c9d4 ChangeLog 6067 +RMD160 6b1f60c9d60580db06ecd7894c88fd9fcb800e02 ChangeLog 6067 +SHA256 84a1a1d8576013d28773db042c928136c78facc50cc130c3d0e24dc8a2d7cfae ChangeLog 6067 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata.xml 156 -MD5 c18f2b17cddcaae44af78c20991fab49 files/digest-freebsd-libexec-6.1 1798 -RMD160 976ccc2cfe0865448cc4d7794d3d444ce071e027 files/digest-freebsd-libexec-6.1 1798 -SHA256 111230186c56cf04c5d789b884d43a46234b408b65bddfc460ef9fb5e03d0b61 files/digest-freebsd-libexec-6.1 1798 MD5 3cbc3dbf0e61561c17fb40176249a573 files/digest-freebsd-libexec-6.2_rc2 1882 RMD160 26c10acf20575d3e82486583f612e74df5bc5f3d files/digest-freebsd-libexec-6.2_rc2 1882 SHA256 d44067f9d963bb8191b552ad4f9e9799be0307b6481e39054bacf3e9f691b63d files/digest-freebsd-libexec-6.2_rc2 1882 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) +Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFlTGdAiZjviIA2XgRAkn9AJ9uwmm8iVCslNA2druQgqEJBdDIhACghXLi -jFKYK452XfRmM/eHRPfGtDw= -=SdM7 +iD4DBQFFnsLGAiZjviIA2XgRAiVwAKCJxZGYUbRGJF0IkG3k4m89WOe2ugCYuMdx +dfKriSUPaOK0m8Jg5SKJjw== +=HyQj -----END PGP SIGNATURE----- diff --git a/sys-freebsd/freebsd-libexec/files/digest-freebsd-libexec-6.1 b/sys-freebsd/freebsd-libexec/files/digest-freebsd-libexec-6.1 deleted file mode 100644 index d7bfc5143462..000000000000 --- a/sys-freebsd/freebsd-libexec/files/digest-freebsd-libexec-6.1 +++ /dev/null @@ -1,21 +0,0 @@ -MD5 e8c5589329d476255f8a15f9f9bfebd1 freebsd-bin-6.1.tar.bz2 405680 -RMD160 33f2e5b49fce90dcaab652621af3b33e8e80b643 freebsd-bin-6.1.tar.bz2 405680 -SHA256 86d7a000827432c594f9d37b98a1f936f6168030cf033c6e621a37c670ef5271 freebsd-bin-6.1.tar.bz2 405680 -MD5 a04643beb2d94972200d6714688930cf freebsd-contrib-6.1.tar.bz2 36017365 -RMD160 225f6ade032533d08b98b79cb29b75da2a3c74fa freebsd-contrib-6.1.tar.bz2 36017365 -SHA256 41283b7f78597cf81f98477aef04eb9cce2b130b1a2f8b5c7d647549c973c054 freebsd-contrib-6.1.tar.bz2 36017365 -MD5 ac8defbdaaab754fee70ac27c02f2c0e freebsd-etc-6.1.tar.bz2 184045 -RMD160 b9a8bea64694c040c02b74f7633dc3cd77afa400 freebsd-etc-6.1.tar.bz2 184045 -SHA256 62b06b61e526c4a939503202aaca31cbce7a3de9daec03e67dc57119527eeff7 freebsd-etc-6.1.tar.bz2 184045 -MD5 f33af43501169d9167c71c3a48a033c2 freebsd-lib-6.1.tar.bz2 2613584 -RMD160 f71aad95ef2bac094bdab9e317a99fb866fba042 freebsd-lib-6.1.tar.bz2 2613584 -SHA256 6ecb49695dc135e64cea949cb7e9b9998b15cb962797cdafc735a7e244744c37 freebsd-lib-6.1.tar.bz2 2613584 -MD5 244baf5f7ef26dbf33428970913a40f3 freebsd-libexec-6.1.tar.bz2 277860 -RMD160 bef98efbc76812cf36b55067433039f3805cfbab freebsd-libexec-6.1.tar.bz2 277860 -SHA256 38eaddc9edc36597e42ca3c63ee8a2fd6f07f96c7294aea75a9988ac5b07b357 freebsd-libexec-6.1.tar.bz2 277860 -MD5 f9c5fe01da2eba4696619c63eb4cad8c freebsd-ubin-6.1.tar.bz2 1763218 -RMD160 5da58c546cebf30a6b661841dbcb5b53626a4a1e freebsd-ubin-6.1.tar.bz2 1763218 -SHA256 13429ed3cc8a14a4efda69b7d82004bf993b5a14591a6129a857d627221aeef6 freebsd-ubin-6.1.tar.bz2 1763218 -MD5 ca61245fd3ec21d31ab9e41cd1ad35b7 freebsd-usbin-6.1.tar.bz2 2664570 -RMD160 98a87538790a814d0afd35bb0f848bcff574c72d freebsd-usbin-6.1.tar.bz2 2664570 -SHA256 70b4a494a72d130d641500bfa857bdf98c9a4a040da2699475902523ba5c374e freebsd-usbin-6.1.tar.bz2 2664570 diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-6.1.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-6.1.ebuild deleted file mode 100644 index f4abbeafaad4..000000000000 --- a/sys-freebsd/freebsd-libexec/freebsd-libexec-6.1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/freebsd-libexec-6.1.ebuild,v 1.2 2006/07/18 19:14:32 the_paya Exp $ - -inherit bsdmk freebsd pam - -DESCRIPTION="FreeBSD libexec things" -SLOT="0" -KEYWORDS="~x86-fbsd" - -IUSE="pam ssl kerberos ipv6 nis" - -SRC_URI="mirror://gentoo/${LIBEXEC}.tar.bz2 - mirror://gentoo/${UBIN}.tar.bz2 - mirror://gentoo/${BIN}.tar.bz2 - mirror://gentoo/${CONTRIB}.tar.bz2 - mirror://gentoo/${LIB}.tar.bz2 - mirror://gentoo/${ETC}.tar.bz2 - mirror://gentoo/${USBIN}.tar.bz2" - -RDEPEND="=sys-freebsd/freebsd-lib-${RV}* - pam? ( virtual/pam )" -DEPEND="${RDEPEND} - =sys-freebsd/freebsd-mk-defs-${RV}* - =sys-freebsd/freebsd-sources-${RV}*" - -S="${WORKDIR}/libexec" - -pkg_setup() { - use pam || mymakeopts="${mymakeopts} NO_PAM= " - use ssl || mymakeopts="${mymakeopts} NO_OPENSSL= NO_CRYPT= " - use kerberos || mymakeopts="${mymakeopts} NO_KERBEROS= " - use ipv6 || mymakeopts="${mymakeopts} NO_INET6= " - use nis || mymakeopts="${mymakeopts} NO_NIS= " - - mymakeopts="${mymakeopts} NO_SENDMAIL= NO_PF= " -} - -src_compile() { - NOSSP_FLAGS="$(test-flags -fno-stack-protector -fno-stack-protector-all)" - export NOSSP_FLAGS - freebsd_src_compile -} - -PATCHES="${FILESDIR}/${PN}-setXid.patch - ${FILESDIR}/${PN}-5.3_rc1-ypxfr-makefile.patch - ${FILESDIR}/${PN}-nossp.patch - ${FILESDIR}/${PN}-${RV}-libfallback.patch" - -# Remove sendmail, tcp_wrapper and other useless stuff -REMOVE_SUBDIRS="smrsh mail.local tcpd telnetd rshd rlogind lukemftpd ftpd" - -src_install() { - freebsd_src_install - - insinto /etc - cd "${WORKDIR}/etc" - doins gettytab -} diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest index 6f80d8fea31a..834a0895d8f9 100644 --- a/sys-freebsd/freebsd-mk-defs/Manifest +++ b/sys-freebsd/freebsd-mk-defs/Manifest @@ -1,66 +1,34 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX freebsd-mk-defs-6.0-gentoo.patch 8177 RMD160 d92fa47019d14f1c2d3bbb4981c4871086bded32 SHA1 19580d265ce9a5d7f4cd342dac3c69f75800e4d6 SHA256 82db0cc47f8f3cb863b39592a2fb669786879d16db638e6d30e84b9be69ca5e1 -MD5 adfd04b6eba031ebd843605da95f57fb files/freebsd-mk-defs-6.0-gentoo.patch 8177 -RMD160 d92fa47019d14f1c2d3bbb4981c4871086bded32 files/freebsd-mk-defs-6.0-gentoo.patch 8177 -SHA256 82db0cc47f8f3cb863b39592a2fb669786879d16db638e6d30e84b9be69ca5e1 files/freebsd-mk-defs-6.0-gentoo.patch 8177 AUX freebsd-mk-defs-6.0-gnu.patch 3584 RMD160 c9705a8a3f1d0f5c1be71587c391efdda846e3a3 SHA1 677729af4401fdc36f8f4582b7b3a0039759c9f4 SHA256 9519ea8a3e7b1261abdf3694501d1634d74670c8ff4e8a328e1e10e089a64695 MD5 c97a6a9c5fff0c23f14d320e2fa68bae files/freebsd-mk-defs-6.0-gnu.patch 3584 RMD160 c9705a8a3f1d0f5c1be71587c391efdda846e3a3 files/freebsd-mk-defs-6.0-gnu.patch 3584 SHA256 9519ea8a3e7b1261abdf3694501d1634d74670c8ff4e8a328e1e10e089a64695 files/freebsd-mk-defs-6.0-gnu.patch 3584 -AUX freebsd-mk-defs-6.0-nowerror.patch 659 RMD160 fd514be7e9b998f57d84efc226e16ef146c35b6f SHA1 84469b86647a9f6d0eff0ffa4e835d338921dd1c SHA256 967eedd2540e3e384f44f330d514bf4c950628ef7b9cb0cbc43ba787cf3dd1b7 -MD5 f2bd3fffc2716aee32086f2b87276cf6 files/freebsd-mk-defs-6.0-nowerror.patch 659 -RMD160 fd514be7e9b998f57d84efc226e16ef146c35b6f files/freebsd-mk-defs-6.0-nowerror.patch 659 -SHA256 967eedd2540e3e384f44f330d514bf4c950628ef7b9cb0cbc43ba787cf3dd1b7 files/freebsd-mk-defs-6.0-nowerror.patch 659 -AUX freebsd-mk-defs-6.0-strip.patch 1235 RMD160 7aa18593c915a54aeec16b270e41fb3e3e645b33 SHA1 0269419911cf5e24400cc032791a8cf71e0649e0 SHA256 f7e976c5f699a8c968babbcee9b813ee62fb96ea220ddf52005468973d9bb063 -MD5 05422b14418bece763450063c220e305 files/freebsd-mk-defs-6.0-strip.patch 1235 -RMD160 7aa18593c915a54aeec16b270e41fb3e3e645b33 files/freebsd-mk-defs-6.0-strip.patch 1235 -SHA256 f7e976c5f699a8c968babbcee9b813ee62fb96ea220ddf52005468973d9bb063 files/freebsd-mk-defs-6.0-strip.patch 1235 -AUX freebsd-mk-defs-6.1-gentoo.patch 10693 RMD160 13e6591579cfe303dbf191b8daa80c15c48afe5a SHA1 bdba1c201f6ac3d1832e9b4c6cf2f07d8e98e481 SHA256 d6b506316738d04ba461e7b77bc9934597c80b9b694f037930658b54d00bd2d9 -MD5 6e35cb1e582a2dbe16bb01b0f43dd6e0 files/freebsd-mk-defs-6.1-gentoo.patch 10693 -RMD160 13e6591579cfe303dbf191b8daa80c15c48afe5a files/freebsd-mk-defs-6.1-gentoo.patch 10693 -SHA256 d6b506316738d04ba461e7b77bc9934597c80b9b694f037930658b54d00bd2d9 files/freebsd-mk-defs-6.1-gentoo.patch 10693 AUX freebsd-mk-defs-6.2-2-gentoo.patch 10377 RMD160 f36d72686e0c175193acff6f65abddea2d53a42c SHA1 4913957abd354db5ea7321f01e8c40e8e6f878f5 SHA256 6ce69b3c1735593d09ab51e9174f4e6bb6b185c68fa3fa30676d87174654d1c7 MD5 2237bfa360a6b394b6b7e392517ff0a6 files/freebsd-mk-defs-6.2-2-gentoo.patch 10377 RMD160 f36d72686e0c175193acff6f65abddea2d53a42c files/freebsd-mk-defs-6.2-2-gentoo.patch 10377 SHA256 6ce69b3c1735593d09ab51e9174f4e6bb6b185c68fa3fa30676d87174654d1c7 files/freebsd-mk-defs-6.2-2-gentoo.patch 10377 -AUX freebsd-mk-defs-6.2-gentoo.patch 11054 RMD160 3c2ac6c9278d68f746135f9aa880a069bf6f38b1 SHA1 13a8a6e81a0d93acb76ace2469fe2545cc15ddbf SHA256 7fcc34ca491e97f938c5e4d0d8c622502cab4213158680033a7908f1117d57f7 -MD5 9c8d445ffed785adc363b2f429cbc7dc files/freebsd-mk-defs-6.2-gentoo.patch 11054 -RMD160 3c2ac6c9278d68f746135f9aa880a069bf6f38b1 files/freebsd-mk-defs-6.2-gentoo.patch 11054 -SHA256 7fcc34ca491e97f938c5e4d0d8c622502cab4213158680033a7908f1117d57f7 files/freebsd-mk-defs-6.2-gentoo.patch 11054 -AUX freebsd-mk-defs-flex.patch 867 RMD160 a6515de4317f00ec47765987ae3f5bbdd02bc489 SHA1 9dde0c0b6b5efe99de35fe3759f3fde1308a4ed3 SHA256 3373ded64bf6447a06e1a4e33acd0c3d758fee20488173ab9d6e891ed2399498 -MD5 7c6bf2b68cd685a9f76af8c0ea652599 files/freebsd-mk-defs-flex.patch 867 -RMD160 a6515de4317f00ec47765987ae3f5bbdd02bc489 files/freebsd-mk-defs-flex.patch 867 -SHA256 3373ded64bf6447a06e1a4e33acd0c3d758fee20488173ab9d6e891ed2399498 files/freebsd-mk-defs-flex.patch 867 -DIST freebsd-share-6.1.tar.bz2 3745745 RMD160 02c0369d9384d83cc22f8e41d7c8f642b9b91b3a SHA1 1b21b5bb2338812cb8443bafeb6ed56e00a231c1 SHA256 e784b691a3df97ac8e2c0399ae48cf13b545cddfe513d3ec47c1656fe4e41f77 DIST freebsd-share-6.2_rc2.tar.bz2 3762566 RMD160 d7e8392c49cd1b5f0989a1b87144cc799ae418fa SHA1 0858ea37090fceffb8d9893b38174f803fa7f544 SHA256 bff220ae3d7ab346494e339270a1c7f173593541db05fd102a1c6e8ef52fdda3 -EBUILD freebsd-mk-defs-6.1-r1.ebuild 896 RMD160 46195e29a2c35335688a41299d7659196935dae1 SHA1 f234cc8eeca77f17f24f35e05b70e20467a4a6ce SHA256 52ed71e6f5877763811fe888936c5a675ded6b0e67777c9fbee25084944d5eb1 -MD5 ea616d97ef3404a83cc09a6cead32629 freebsd-mk-defs-6.1-r1.ebuild 896 -RMD160 46195e29a2c35335688a41299d7659196935dae1 freebsd-mk-defs-6.1-r1.ebuild 896 -SHA256 52ed71e6f5877763811fe888936c5a675ded6b0e67777c9fbee25084944d5eb1 freebsd-mk-defs-6.1-r1.ebuild 896 EBUILD freebsd-mk-defs-6.2_rc2.ebuild 891 RMD160 6a2feacbd1e5c42be625c57126b687b7706960fd SHA1 6cdc6665a7d4a54482bbd5d698fac50ce40632e2 SHA256 3302953fd7db09ccf132bd20bf57bf118675aaa577468b65527105584e09b5fa MD5 286f97fbd8e233c1bac035eab7701570 freebsd-mk-defs-6.2_rc2.ebuild 891 RMD160 6a2feacbd1e5c42be625c57126b687b7706960fd freebsd-mk-defs-6.2_rc2.ebuild 891 SHA256 3302953fd7db09ccf132bd20bf57bf118675aaa577468b65527105584e09b5fa freebsd-mk-defs-6.2_rc2.ebuild 891 -MISC ChangeLog 6775 RMD160 3d05e2de3dd8693c0061c8b1b9446f5ddf183b1a SHA1 b00c97b375503358bbe47a081f7cd41b9fbc414b SHA256 5623c7765b7ac2c722ff9d178dcdcb6f9842b1674bd3925b89a67a0f2a1eb616 -MD5 ed40d875b7c9bd49ea2856c98b342182 ChangeLog 6775 -RMD160 3d05e2de3dd8693c0061c8b1b9446f5ddf183b1a ChangeLog 6775 -SHA256 5623c7765b7ac2c722ff9d178dcdcb6f9842b1674bd3925b89a67a0f2a1eb616 ChangeLog 6775 +MISC ChangeLog 7135 RMD160 1ab6df3f0d2dbeb20ab3c36eb4a89a81268f3a3f SHA1 ab2c40929c409b1f70e68e0656a3eeb59df40904 SHA256 32f63e296d59414f115205eeb76c217d8582605c8d9d1c5037595d89d82df75f +MD5 56ae87f1c9dc4c9b77ca2db7f2c73c5e ChangeLog 7135 +RMD160 1ab6df3f0d2dbeb20ab3c36eb4a89a81268f3a3f ChangeLog 7135 +SHA256 32f63e296d59414f115205eeb76c217d8582605c8d9d1c5037595d89d82df75f ChangeLog 7135 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata.xml 156 -MD5 f1a72782a0d392837ecacfc1931ee36d files/digest-freebsd-mk-defs-6.1-r1 259 -RMD160 435f17331e2a54a6ee3811d7545237febace4c27 files/digest-freebsd-mk-defs-6.1-r1 259 -SHA256 1e8cf2e0f827c824b234f8af349dbc641d3ba4763cdac3fdf1cf37f49dc8e8d8 files/digest-freebsd-mk-defs-6.1-r1 259 MD5 2a059d352a3670cda7a617e864018334 files/digest-freebsd-mk-defs-6.2_rc2 271 RMD160 a23378364ed9ab420de38cdf597a67e261fac0a8 files/digest-freebsd-mk-defs-6.2_rc2 271 SHA256 45d46dc4b418caa18cb2c441fa46163fe64e086fdc40153db7b0c38c80844562 files/digest-freebsd-mk-defs-6.2_rc2 271 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFnrppAiZjviIA2XgRAg+vAJ9BeT9v8gVCT8o4WkSCw6FerQbOsACguBf2 -4j0k0RfctXkbeHFwAREDgZg= -=pU7A +iD8DBQFFnsLdAiZjviIA2XgRAmPiAJ44rjbOVR89kualKTu6Ys1GwMlLtwCgrQ1r +ldKA08DOVpqk9A210zPvNxs= +=VAaE -----END PGP SIGNATURE----- diff --git a/sys-freebsd/freebsd-mk-defs/files/digest-freebsd-mk-defs-6.1-r1 b/sys-freebsd/freebsd-mk-defs/files/digest-freebsd-mk-defs-6.1-r1 deleted file mode 100644 index 80d00a6b0cb0..000000000000 --- a/sys-freebsd/freebsd-mk-defs/files/digest-freebsd-mk-defs-6.1-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 87e50c5ad62ac4c2e062c5a05b6709f3 freebsd-share-6.1.tar.bz2 3745745 -RMD160 02c0369d9384d83cc22f8e41d7c8f642b9b91b3a freebsd-share-6.1.tar.bz2 3745745 -SHA256 e784b691a3df97ac8e2c0399ae48cf13b545cddfe513d3ec47c1656fe4e41f77 freebsd-share-6.1.tar.bz2 3745745 diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.0-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.0-gentoo.patch deleted file mode 100644 index c52f6aa488d4..000000000000 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.0-gentoo.patch +++ /dev/null @@ -1,222 +0,0 @@ -Index: fbsd-6.0/share/mk/bsd.doc.mk -=================================================================== ---- fbsd-6.0.orig/share/mk/bsd.doc.mk -+++ fbsd-6.0/share/mk/bsd.doc.mk -@@ -137,10 +137,12 @@ CLEANFILES+= ${DOC}.ascii ${DOC}.ascii${ - realinstall: - .for _dev in ${PRINTERDEVICE:Mhtml} - cd ${SRCDIR}; \ -+ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME} - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME} - .endfor - .for _dev in ${PRINTERDEVICE:Nhtml} -+ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME} - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME} - .endfor -Index: fbsd-6.0/share/mk/bsd.files.mk -=================================================================== ---- fbsd-6.0.orig/share/mk/bsd.files.mk -+++ fbsd-6.0/share/mk/bsd.files.mk -@@ -39,6 +39,7 @@ ${group}NAME_${file:T}?= ${file:T} - .endif - installfiles: _${group}INS_${file:T} - _${group}INS_${file:T}: ${file} -+ ${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC}}/${${group}NAME_${.ALLSRC:T}:H} - ${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \ - -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ - ${.ALLSRC} \ -@@ -51,10 +52,12 @@ _${group}FILES+= ${file} - installfiles: _${group}INS - _${group}INS: ${_${group}FILES} - .if defined(${group}NAME) -+ ${INSTALL} -d ${DESTDIR}${${group}DIR}/${${group}NAME} - ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \ - -m ${${group}MODE} ${.ALLSRC} \ - ${DESTDIR}${${group}DIR}/${${group}NAME} - .else -+ ${INSTALL} -d ${DESTDIR}${${group}DIR} - ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \ - -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR} - .endif -Index: fbsd-6.0/share/mk/bsd.incs.mk -=================================================================== ---- fbsd-6.0.orig/share/mk/bsd.incs.mk -+++ fbsd-6.0/share/mk/bsd.incs.mk -@@ -39,6 +39,10 @@ ${group}NAME_${header:T}?= ${header:T} - .endif - installincludes: _${group}INS_${header:T} - _${group}INS_${header:T}: ${header} -+ -+ ${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \ -+ -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ -+ ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}} - ${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \ - -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ - ${.ALLSRC} \ -@@ -51,9 +55,11 @@ _${group}INCS+= ${header} - installincludes: _${group}INS - _${group}INS: ${_${group}INCS} - .if defined(${group}NAME) -+ ${INSTALL} -d ${DESTDIR}${${group}DIR} - ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ - ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME} - .else -+ ${INSTALL} -d ${DESTDIR}${${group}DIR} - ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ - ${.ALLSRC} ${DESTDIR}${${group}DIR} - .endif -Index: fbsd-6.0/share/mk/bsd.info.mk -=================================================================== ---- fbsd-6.0.orig/share/mk/bsd.info.mk -+++ fbsd-6.0/share/mk/bsd.info.mk -@@ -85,6 +85,7 @@ INFO2HTML?= info2html - TEX?= tex - DVIPS?= dvips - DVIPS2ASCII?= dvips2ascii -+INSTALL?= install - - .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html - -@@ -145,6 +146,7 @@ ${x:S/$/${ICOMPRESS_EXT}/}: ${x} - .for x in ${INFO} - INSTALLINFODIRS+= ${x:S/$/-install/} - ${x:S/$/-install/}: -+ ${INSTALL} -d ${DESTDIR}${INFODIR} - ${INSTALLINFO} ${INSTALLINFOFLAGS} \ - --defsection=${INFOSECTION} \ - --defentry=${INFOENTRY_${x}} \ -Index: fbsd-6.0/share/mk/bsd.lib.mk -=================================================================== ---- fbsd-6.0.orig/share/mk/bsd.lib.mk -+++ fbsd-6.0/share/mk/bsd.lib.mk -@@ -208,14 +208,17 @@ realinstall: _libinstall - .ORDER: beforeinstall _libinstall - _libinstall: - .if defined(LIB) && !empty(LIB) && !defined(NO_INSTALLLIB) -+ ${INSTALL} -d ${DESTDIR}${LIBDIR} - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR} - .endif - .if !defined(NO_PROFILE) && defined(LIB) && !empty(LIB) -+ ${INSTALL} -d ${DESTDIR}${LIBDIR} - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR} - .endif - .if defined(SHLIB_NAME) -+ ${INSTALL} -d ${DESTDIR}${SHLIBDIR} - ${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \ - ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR} -Index: fbsd-6.0/share/mk/bsd.man.mk -=================================================================== ---- fbsd-6.0.orig/share/mk/bsd.man.mk -+++ fbsd-6.0/share/mk/bsd.man.mk -@@ -165,9 +165,11 @@ _maninstall: ${MAN} - .if defined(NO_MANCOMPRESS) - .if defined(MANFILTER) - .for page in ${MAN} -+ ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page} - ${MINSTALL} ${page:T:S/$/${FILTEXTENSION}/g} \ - ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page} - .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) -+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page} - ${MINSTALL} ${page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \ - ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page} - .endif -@@ -181,11 +183,14 @@ _maninstall: ${MAN} - esac; \ - page=$$1; shift; sect=$$1; shift; \ - d=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}; \ -+ ${ECHO} ${INSTALL} -d $${d}; \ -+ ${INSTALL} -d $${d}; \ - ${ECHO} ${MINSTALL} $${page} $${d}; \ - ${MINSTALL} $${page} $${d}; \ - done - .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) - .for page in ${MAN} -+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T} - ${MINSTALL} ${page:T:S/$/${CATEXT}/} \ - ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T} - .endfor -@@ -193,9 +198,11 @@ _maninstall: ${MAN} - .endif - .else - .for page in ${MAN} -+ ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR} - ${MINSTALL} ${page:T:S/$/${MCOMPRESS_EXT}/g} \ - ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR} - .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) -+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT}/} - ${MINSTALL} ${page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \ - ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT}/} - .endif -Index: fbsd-6.0/share/mk/bsd.prog.mk -=================================================================== ---- fbsd-6.0.orig/share/mk/bsd.prog.mk -+++ fbsd-6.0/share/mk/bsd.prog.mk -@@ -133,9 +133,11 @@ realinstall: _proginstall - _proginstall: - .if defined(PROG) - .if defined(PROGNAME) -+ ${INSTALL} -d ${DESTDIR}${BINDIR} - ${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME} - .else -+ ${INSTALL} -d ${DESTDIR}${BINDIR} - ${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR} - .endif -@@ -163,6 +165,7 @@ SCRIPTSGRP_${script:T}?= ${SCRIPTSGRP} - SCRIPTSMODE_${script:T}?= ${SCRIPTSMODE} - _scriptsinstall: _SCRIPTSINS_${script:T} - _SCRIPTSINS_${script:T}: ${script} -+ ${INSTALL} -d ${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}} - ${INSTALL} -o ${SCRIPTSOWN_${.ALLSRC:T}} \ - -g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \ - ${.ALLSRC} \ -Index: fbsd-6.0/share/mk/sys.mk -=================================================================== ---- fbsd-6.0.orig/share/mk/sys.mk -+++ fbsd-6.0/share/mk/sys.mk -@@ -19,7 +19,7 @@ unix ?= We run FreeBSD, not UNIX. - .SUFFIXES: .out .a .ln .o .c .cc .cpp .cxx .C .m .F .f .e .r .y .l .S .asm .s .cl .p .h .sh - .endif - --X11BASE ?= /usr/X11R6 -+X11BASE ?= /usr - - AR ?= ar - .if defined(%POSIX) -@@ -34,13 +34,13 @@ AFLAGS ?= - - .if defined(%POSIX) - CC ?= c89 --CFLAGS ?= -O -+CFLAGS ?= - .else --CC ?= cc --CFLAGS ?= -O2 -fno-strict-aliasing -pipe -+CC ?= gcc -+CFLAGS ?= -pipe - .endif - --CXX ?= c++ -+CXX ?= g++ - CXXFLAGS ?= ${CFLAGS:N-std=*:N-Wnested-externs:N-W*-prototypes} - - CPP ?= cpp -@@ -259,12 +259,6 @@ MACHINE_ARCH ?= i386 - ${CC} ${CFLAGS} ${LDFLAGS} ${.PREFIX}.tmp.c ${LDLIBS} -ll -o ${.TARGET} - rm -f ${.PREFIX}.tmp.c - --# FreeBSD build pollution. Hide it in the non-POSIX part of the ifdef. --__MAKE_CONF?=/etc/make.conf --.if exists(${__MAKE_CONF}) --.include "${__MAKE_CONF}" --.endif -- - # Default executable format - # XXX hint for bsd.port.mk - OBJFORMAT?= elf diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.0-nowerror.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.0-nowerror.patch deleted file mode 100644 index 28b496679034..000000000000 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.0-nowerror.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: fbsd-6/share/mk/bsd.sys.mk -=================================================================== ---- fbsd-6.orig/share/mk/bsd.sys.mk -+++ fbsd-6/share/mk/bsd.sys.mk -@@ -12,9 +12,6 @@ - . if defined(WARNS) - . if ${WARNS} >= 1 - CWARNFLAGS += -Wsystem-headers --. if !defined(NO_WERROR) --CWARNFLAGS += -Werror --. endif - . endif - . if ${WARNS} >= 2 - CWARNFLAGS += -Wall -Wno-format-y2k -@@ -45,9 +42,6 @@ WFORMAT = 1 - . if ${WFORMAT} > 0 - #CWARNFLAGS += -Wformat-nonliteral -Wformat-security -Wno-format-extra-args - CWARNFLAGS += -Wformat=2 -Wno-format-extra-args --. if !defined(NO_WERROR) --CWARNFLAGS += -Werror --. endif - . endif - . endif - .endif diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.0-strip.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.0-strip.patch deleted file mode 100644 index 2ed1b138730b..000000000000 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.0-strip.patch +++ /dev/null @@ -1,47 +0,0 @@ -Index: fbsd-6/share/mk/bsd.lib.mk -=================================================================== ---- fbsd-6.orig/share/mk/bsd.lib.mk -+++ fbsd-6/share/mk/bsd.lib.mk -@@ -32,10 +32,6 @@ CFLAGS+= ${CRUNCH_CFLAGS} - CFLAGS+= ${DEBUG_FLAGS} - .endif - --.if !defined(DEBUG_FLAGS) --STRIP?= -s --.endif -- - .include - - # prefer .s to a .c, add .po, remove stuff not used in the BSD libraries -Index: fbsd-6/share/mk/bsd.own.mk -=================================================================== ---- fbsd-6.orig/share/mk/bsd.own.mk -+++ fbsd-6/share/mk/bsd.own.mk -@@ -157,10 +157,8 @@ NLSMODE?= ${NOBINMODE} - - INCLUDEDIR?= /usr/include - --# Common variables --.if !defined(DEBUG_FLAGS) --STRIP?= -s --.endif -+# Don't strip things with install command, leave that to portage -+STRIP= - - COMPRESS_CMD?= gzip -cn - COMPRESS_EXT?= .gz -Index: fbsd-6/share/mk/bsd.prog.mk -=================================================================== ---- fbsd-6.orig/share/mk/bsd.prog.mk -+++ fbsd-6/share/mk/bsd.prog.mk -@@ -18,10 +18,6 @@ CFLAGS+=${DEBUG_FLAGS} - CFLAGS+=${CRUNCH_CFLAGS} - .endif - --.if !defined(DEBUG_FLAGS) --STRIP?= -s --.endif -- - .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO") - LDFLAGS+= -static - .endif diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.1-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.1-gentoo.patch deleted file mode 100644 index 689e0e8652ab..000000000000 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.1-gentoo.patch +++ /dev/null @@ -1,307 +0,0 @@ -Index: fbsd-6.1/share/mk/bsd.doc.mk -=================================================================== ---- fbsd-6.1.orig/share/mk/bsd.doc.mk -+++ fbsd-6.1/share/mk/bsd.doc.mk -@@ -137,10 +137,12 @@ CLEANFILES+= ${DOC}.ascii ${DOC}.ascii${ - realinstall: - .for _dev in ${PRINTERDEVICE:Mhtml} - cd ${SRCDIR}; \ -+ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME} - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME} - .endfor - .for _dev in ${PRINTERDEVICE:Nhtml} -+ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME} - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME} - .endfor -Index: fbsd-6.1/share/mk/bsd.files.mk -=================================================================== ---- fbsd-6.1.orig/share/mk/bsd.files.mk -+++ fbsd-6.1/share/mk/bsd.files.mk -@@ -39,6 +39,7 @@ ${group}NAME_${file:T}?= ${file:T} - .endif - installfiles: _${group}INS_${file:T} - _${group}INS_${file:T}: ${file} -+ ${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC}}/${${group}NAME_${.ALLSRC:T}:H} - ${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \ - -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ - ${.ALLSRC} \ -@@ -51,10 +52,12 @@ _${group}FILES+= ${file} - installfiles: _${group}INS - _${group}INS: ${_${group}FILES} - .if defined(${group}NAME) -+ ${INSTALL} -d ${DESTDIR}${${group}DIR}/${${group}NAME} - ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \ - -m ${${group}MODE} ${.ALLSRC} \ - ${DESTDIR}${${group}DIR}/${${group}NAME} - .else -+ ${INSTALL} -d ${DESTDIR}${${group}DIR} - ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \ - -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR} - .endif -Index: fbsd-6.1/share/mk/bsd.incs.mk -=================================================================== ---- fbsd-6.1.orig/share/mk/bsd.incs.mk -+++ fbsd-6.1/share/mk/bsd.incs.mk -@@ -39,6 +39,10 @@ ${group}NAME_${header:T}?= ${header:T} - .endif - installincludes: _${group}INS_${header:T} - _${group}INS_${header:T}: ${header} -+ -+ ${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \ -+ -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ -+ ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}} - ${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \ - -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ - ${.ALLSRC} \ -@@ -51,9 +55,11 @@ _${group}INCS+= ${header} - installincludes: _${group}INS - _${group}INS: ${_${group}INCS} - .if defined(${group}NAME) -+ ${INSTALL} -d ${DESTDIR}${${group}DIR} - ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ - ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME} - .else -+ ${INSTALL} -d ${DESTDIR}${${group}DIR} - ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ - ${.ALLSRC} ${DESTDIR}${${group}DIR} - .endif -Index: fbsd-6.1/share/mk/bsd.info.mk -=================================================================== ---- fbsd-6.1.orig/share/mk/bsd.info.mk -+++ fbsd-6.1/share/mk/bsd.info.mk -@@ -85,6 +85,7 @@ INFO2HTML?= info2html - TEX?= tex - DVIPS?= dvips - DVIPS2ASCII?= dvips2ascii -+INSTALL?= install - - .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html - -@@ -145,6 +146,7 @@ ${x:S/$/${ICOMPRESS_EXT}/}: ${x} - .for x in ${INFO} - INSTALLINFODIRS+= ${x:S/$/-install/} - ${x:S/$/-install/}: -+ ${INSTALL} -d ${DESTDIR}${INFODIR}/${INFODIRFILE} - lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \ - ${INSTALLINFO} ${INSTALLINFOFLAGS} \ - --defsection=${INFOSECTION} \ -Index: fbsd-6.1/share/mk/bsd.lib.mk -=================================================================== ---- fbsd-6.1.orig/share/mk/bsd.lib.mk -+++ fbsd-6.1/share/mk/bsd.lib.mk -@@ -32,10 +32,6 @@ CFLAGS+= ${CRUNCH_CFLAGS} - CFLAGS+= ${DEBUG_FLAGS} - .endif - --.if !defined(DEBUG_FLAGS) --STRIP?= -s --.endif -- - .include - - # prefer .s to a .c, add .po, remove stuff not used in the BSD libraries -@@ -208,14 +204,17 @@ realinstall: _libinstall - .ORDER: beforeinstall _libinstall - _libinstall: - .if defined(LIB) && !empty(LIB) && !defined(NO_INSTALLLIB) -+ ${INSTALL} -d ${DESTDIR}${LIBDIR} - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR} - .endif - .if !defined(NO_PROFILE) && defined(LIB) && !empty(LIB) -+ ${INSTALL} -d ${DESTDIR}${LIBDIR} - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR} - .endif - .if defined(SHLIB_NAME) -+ ${INSTALL} -d ${DESTDIR}${SHLIBDIR} - ${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \ - ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR} -Index: fbsd-6.1/share/mk/bsd.man.mk -=================================================================== ---- fbsd-6.1.orig/share/mk/bsd.man.mk -+++ fbsd-6.1/share/mk/bsd.man.mk -@@ -165,9 +165,11 @@ _maninstall: ${MAN} - .if defined(NO_MANCOMPRESS) - .if defined(MANFILTER) - .for page in ${MAN} -+ ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page} - ${MINSTALL} ${page:T:S/$/${FILTEXTENSION}/g} \ - ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page} - .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) -+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page} - ${MINSTALL} ${page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \ - ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page} - .endif -@@ -181,11 +183,14 @@ _maninstall: ${MAN} - esac; \ - page=$$1; shift; sect=$$1; shift; \ - d=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}; \ -+ ${ECHO} ${INSTALL} -d $${d}; \ -+ ${INSTALL} -d $${d}; \ - ${ECHO} ${MINSTALL} $${page} $${d}; \ - ${MINSTALL} $${page} $${d}; \ - done - .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) - .for page in ${MAN} -+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T} - ${MINSTALL} ${page:T:S/$/${CATEXT}/} \ - ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T} - .endfor -@@ -193,9 +198,11 @@ _maninstall: ${MAN} - .endif - .else - .for page in ${MAN} -+ ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR} - ${MINSTALL} ${page:T:S/$/${MCOMPRESS_EXT}/g} \ - ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR} - .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) -+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT}/} - ${MINSTALL} ${page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \ - ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT}/} - .endif -Index: fbsd-6.1/share/mk/bsd.prog.mk -=================================================================== ---- fbsd-6.1.orig/share/mk/bsd.prog.mk -+++ fbsd-6.1/share/mk/bsd.prog.mk -@@ -18,10 +18,6 @@ CFLAGS+=${DEBUG_FLAGS} - CFLAGS+=${CRUNCH_CFLAGS} - .endif - --.if !defined(DEBUG_FLAGS) --STRIP?= -s --.endif -- - .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO") - LDFLAGS+= -static - .endif -@@ -133,9 +129,11 @@ realinstall: _proginstall - _proginstall: - .if defined(PROG) - .if defined(PROGNAME) -+ ${INSTALL} -d ${DESTDIR}${BINDIR} - ${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME} - .else -+ ${INSTALL} -d ${DESTDIR}${BINDIR} - ${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR} - .endif -@@ -163,6 +161,7 @@ SCRIPTSGRP_${script:T}?= ${SCRIPTSGRP} - SCRIPTSMODE_${script:T}?= ${SCRIPTSMODE} - _scriptsinstall: _SCRIPTSINS_${script:T} - _SCRIPTSINS_${script:T}: ${script} -+ ${INSTALL} -d ${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}} - ${INSTALL} -o ${SCRIPTSOWN_${.ALLSRC:T}} \ - -g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \ - ${.ALLSRC} \ -Index: fbsd-6.1/share/mk/sys.mk -=================================================================== ---- fbsd-6.1.orig/share/mk/sys.mk -+++ fbsd-6.1/share/mk/sys.mk -@@ -19,7 +19,7 @@ unix ?= We run FreeBSD, not UNIX. - .SUFFIXES: .out .a .ln .o .c .cc .cpp .cxx .C .m .F .f .e .r .y .l .S .asm .s .cl .p .h .sh - .endif - --X11BASE ?= /usr/X11R6 -+X11BASE ?= /usr - - AR ?= ar - .if defined(%POSIX) -@@ -34,13 +34,13 @@ AFLAGS ?= - - .if defined(%POSIX) - CC ?= c89 --CFLAGS ?= -O -+CFLAGS ?= - .else --CC ?= cc --CFLAGS ?= -O2 -fno-strict-aliasing -pipe -+CC ?= gcc -+CFLAGS ?= -pipe - .endif - --CXX ?= c++ -+CXX ?= g++ - CXXFLAGS ?= ${CFLAGS:N-std=*:N-Wnested-externs:N-W*-prototypes} - - CPP ?= cpp -@@ -252,12 +252,6 @@ YFLAGS ?= -d - ${CC} ${CFLAGS} ${LDFLAGS} ${.PREFIX}.tmp.c ${LDLIBS} -ll -o ${.TARGET} - rm -f ${.PREFIX}.tmp.c - --# FreeBSD build pollution. Hide it in the non-POSIX part of the ifdef. --__MAKE_CONF?=/etc/make.conf --.if exists(${__MAKE_CONF}) --.include "${__MAKE_CONF}" --.endif -- - # Default executable format - # XXX hint for bsd.port.mk - OBJFORMAT?= elf -Index: fbsd-6.1/share/mk/bsd.libnames.mk -=================================================================== ---- fbsd-6.1.orig/share/mk/bsd.libnames.mk -+++ fbsd-6.1/share/mk/bsd.libnames.mk -@@ -40,7 +40,7 @@ LIBDISK?= ${DESTDIR}${LIBDIR}/libdisk.a - LIBDNS?= ${DESTDIR}${LIBDIR}/libdns.a - LIBEDIT?= ${DESTDIR}${LIBDIR}/libedit.a - LIBFETCH?= ${DESTDIR}${LIBDIR}/libfetch.a --LIBFL?= "don't use LIBFL, use LIBL" -+LIBFL?= ${DESTDIR}${LIBDOR}/libfl.a - LIBFORM?= ${DESTDIR}${LIBDIR}/libform.a - LIBFTPIO?= ${DESTDIR}${LIBDIR}/libftpio.a - LIBG2C?= ${DESTDIR}${LIBDIR}/libg2c.a -@@ -65,7 +65,7 @@ LIBKEYCAP?= ${DESTDIR}${LIBDIR}/libkeyca - LIBKICONV?= ${DESTDIR}${LIBDIR}/libkiconv.a - LIBKRB5?= ${DESTDIR}${LIBDIR}/libkrb5.a - LIBKVM?= ${DESTDIR}${LIBDIR}/libkvm.a --LIBL?= ${DESTDIR}${LIBDIR}/libl.a -+LIBL?= ${DESTDIR}${LIBDOR}/libfl.a - LIBLN?= "don't use LIBLN, use LIBL" - .if !defined(NO_BIND) - LIBLWRES?= ${DESTDIR}${LIBDIR}/liblwres.a -Index: fbsd-6.1/share/mk/bsd.own.mk -=================================================================== ---- fbsd-6.1.orig/share/mk/bsd.own.mk -+++ fbsd-6.1/share/mk/bsd.own.mk -@@ -157,10 +157,8 @@ NLSMODE?= ${NOBINMODE} - - INCLUDEDIR?= /usr/include - --# Common variables --.if !defined(DEBUG_FLAGS) --STRIP?= -s --.endif -+# Don't strip things with install command, leave that to portage -+STRIP= - - COMPRESS_CMD?= gzip -cn - COMPRESS_EXT?= .gz -Index: fbsd-6.1/share/mk/bsd.sys.mk -=================================================================== ---- fbsd-6.1.orig/share/mk/bsd.sys.mk -+++ fbsd-6.1/share/mk/bsd.sys.mk -@@ -12,9 +12,6 @@ - . if defined(WARNS) - . if ${WARNS} >= 1 - CWARNFLAGS += -Wsystem-headers --. if !defined(NO_WERROR) --CWARNFLAGS += -Werror --. endif - . endif - . if ${WARNS} >= 2 - CWARNFLAGS += -Wall -Wno-format-y2k -@@ -45,9 +42,6 @@ WFORMAT = 1 - . if ${WFORMAT} > 0 - #CWARNFLAGS += -Wformat-nonliteral -Wformat-security -Wno-format-extra-args - CWARNFLAGS += -Wformat=2 -Wno-format-extra-args --. if !defined(NO_WERROR) --CWARNFLAGS += -Werror --. endif - . endif - . endif - .endif diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.2-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.2-gentoo.patch deleted file mode 100644 index aba8b4f76604..000000000000 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.2-gentoo.patch +++ /dev/null @@ -1,314 +0,0 @@ -Index: fbsd-6.2b3/share/mk/bsd.doc.mk -=================================================================== ---- fbsd-6.2b3.orig/share/mk/bsd.doc.mk -+++ fbsd-6.2b3/share/mk/bsd.doc.mk -@@ -137,10 +137,12 @@ CLEANFILES+= ${DOC}.ascii ${DOC}.ascii${ - realinstall: - .for _dev in ${PRINTERDEVICE:Mhtml} - cd ${SRCDIR}; \ -+ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME} - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME} - .endfor - .for _dev in ${PRINTERDEVICE:Nhtml} -+ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME} - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME} - .endfor -Index: fbsd-6.2b3/share/mk/bsd.files.mk -=================================================================== ---- fbsd-6.2b3.orig/share/mk/bsd.files.mk -+++ fbsd-6.2b3/share/mk/bsd.files.mk -@@ -39,6 +39,7 @@ ${group}NAME_${file:T}?= ${file:T} - .endif - installfiles: _${group}INS_${file:T} - _${group}INS_${file:T}: ${file} -+ ${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC}}/${${group}NAME_${.ALLSRC:T}:H} - ${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \ - -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ - ${.ALLSRC} \ -@@ -51,10 +52,12 @@ _${group}FILES+= ${file} - installfiles: _${group}INS - _${group}INS: ${_${group}FILES} - .if defined(${group}NAME) -+ ${INSTALL} -d ${DESTDIR}${${group}DIR}/${${group}NAME} - ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \ - -m ${${group}MODE} ${.ALLSRC} \ - ${DESTDIR}${${group}DIR}/${${group}NAME} - .else -+ ${INSTALL} -d ${DESTDIR}${${group}DIR} - ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \ - -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR} - .endif -Index: fbsd-6.2b3/share/mk/bsd.incs.mk -=================================================================== ---- fbsd-6.2b3.orig/share/mk/bsd.incs.mk -+++ fbsd-6.2b3/share/mk/bsd.incs.mk -@@ -39,6 +39,10 @@ ${group}NAME_${header:T}?= ${header:T} - .endif - installincludes: _${group}INS_${header:T} - _${group}INS_${header:T}: ${header} -+ -+ ${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \ -+ -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ -+ ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}} - ${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \ - -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ - ${.ALLSRC} \ -@@ -51,9 +55,11 @@ _${group}INCS+= ${header} - installincludes: _${group}INS - _${group}INS: ${_${group}INCS} - .if defined(${group}NAME) -+ ${INSTALL} -d ${DESTDIR}${${group}DIR} - ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ - ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME} - .else -+ ${INSTALL} -d ${DESTDIR}${${group}DIR} - ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ - ${.ALLSRC} ${DESTDIR}${${group}DIR} - .endif -Index: fbsd-6.2b3/share/mk/bsd.info.mk -=================================================================== ---- fbsd-6.2b3.orig/share/mk/bsd.info.mk -+++ fbsd-6.2b3/share/mk/bsd.info.mk -@@ -85,6 +85,7 @@ INFO2HTML?= info2html - TEX?= tex - DVIPS?= dvips - DVIPS2ASCII?= dvips2ascii -+INSTALL?= install - - .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html - -@@ -146,12 +147,14 @@ ${x:S/$/${ICOMPRESS_EXT}/}: ${x} - INSTALLINFODIRS+= ${x:S/$/-install/} - ${x:S/$/-install/}: - .if !empty(.MAKEFLAGS:M-j) -+ ${INSTALL} -d ${DESTDIR}${INFODIR}/${INFODIRFILE} - lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \ - ${INSTALLINFO} ${INSTALLINFOFLAGS} \ - --defsection=${INFOSECTION} \ - --defentry=${INFOENTRY_${x}} \ - ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE} - .else -+ ${INSTALL} -d ${DESTDIR}${INFODIR}/${INFODIRFILE} - ${INSTALLINFO} ${INSTALLINFOFLAGS} \ - --defsection=${INFOSECTION} \ - --defentry=${INFOENTRY_${x}} \ -Index: fbsd-6.2b3/share/mk/bsd.lib.mk -=================================================================== ---- fbsd-6.2b3.orig/share/mk/bsd.lib.mk -+++ fbsd-6.2b3/share/mk/bsd.lib.mk -@@ -32,10 +32,6 @@ CFLAGS+= ${CRUNCH_CFLAGS} - CFLAGS+= ${DEBUG_FLAGS} - .endif - --.if !defined(DEBUG_FLAGS) --STRIP?= -s --.endif -- - .include - - # prefer .s to a .c, add .po, remove stuff not used in the BSD libraries -@@ -208,14 +204,17 @@ realinstall: _libinstall - .ORDER: beforeinstall _libinstall - _libinstall: - .if defined(LIB) && !empty(LIB) && !defined(NO_INSTALLLIB) -+ ${INSTALL} -d ${DESTDIR}${LIBDIR} - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR} - .endif - .if !defined(NO_PROFILE) && defined(LIB) && !empty(LIB) -+ ${INSTALL} -d ${DESTDIR}${LIBDIR} - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR} - .endif - .if defined(SHLIB_NAME) -+ ${INSTALL} -d ${DESTDIR}${SHLIBDIR} - ${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \ - ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR} -Index: fbsd-6.2b3/share/mk/bsd.man.mk -=================================================================== ---- fbsd-6.2b3.orig/share/mk/bsd.man.mk -+++ fbsd-6.2b3/share/mk/bsd.man.mk -@@ -165,9 +165,11 @@ _maninstall: ${MAN} - .if defined(NO_MANCOMPRESS) - .if defined(MANFILTER) - .for page in ${MAN} -+ ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page} - ${MINSTALL} ${page:T:S/$/${FILTEXTENSION}/g} \ - ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page} - .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) -+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page} - ${MINSTALL} ${page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \ - ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page} - .endif -@@ -181,11 +183,14 @@ _maninstall: ${MAN} - esac; \ - page=$$1; shift; sect=$$1; shift; \ - d=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}; \ -+ ${ECHO} ${INSTALL} -d $${d}; \ -+ ${INSTALL} -d $${d}; \ - ${ECHO} ${MINSTALL} $${page} $${d}; \ - ${MINSTALL} $${page} $${d}; \ - done - .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) - .for page in ${MAN} -+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T} - ${MINSTALL} ${page:T:S/$/${CATEXT}/} \ - ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T} - .endfor -@@ -193,9 +198,11 @@ _maninstall: ${MAN} - .endif - .else - .for page in ${MAN} -+ ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR} - ${MINSTALL} ${page:T:S/$/${MCOMPRESS_EXT}/g} \ - ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR} - .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) -+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT}/} - ${MINSTALL} ${page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \ - ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT}/} - .endif -Index: fbsd-6.2b3/share/mk/bsd.prog.mk -=================================================================== ---- fbsd-6.2b3.orig/share/mk/bsd.prog.mk -+++ fbsd-6.2b3/share/mk/bsd.prog.mk -@@ -18,10 +18,6 @@ CFLAGS+=${DEBUG_FLAGS} - CFLAGS+=${CRUNCH_CFLAGS} - .endif - --.if !defined(DEBUG_FLAGS) --STRIP?= -s --.endif -- - .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO") - LDFLAGS+= -static - .endif -@@ -133,9 +129,11 @@ realinstall: _proginstall - _proginstall: - .if defined(PROG) - .if defined(PROGNAME) -+ ${INSTALL} -d ${DESTDIR}${BINDIR} - ${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME} - .else -+ ${INSTALL} -d ${DESTDIR}${BINDIR} - ${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR} - .endif -@@ -163,6 +161,7 @@ SCRIPTSGRP_${script:T}?= ${SCRIPTSGRP} - SCRIPTSMODE_${script:T}?= ${SCRIPTSMODE} - _scriptsinstall: _SCRIPTSINS_${script:T} - _SCRIPTSINS_${script:T}: ${script} -+ ${INSTALL} -d ${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}} - ${INSTALL} -o ${SCRIPTSOWN_${.ALLSRC:T}} \ - -g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \ - ${.ALLSRC} \ -Index: fbsd-6.2b3/share/mk/sys.mk -=================================================================== ---- fbsd-6.2b3.orig/share/mk/sys.mk -+++ fbsd-6.2b3/share/mk/sys.mk -@@ -19,7 +19,7 @@ unix ?= We run FreeBSD, not UNIX. - .SUFFIXES: .out .a .ln .o .c .cc .cpp .cxx .C .m .F .f .e .r .y .l .S .asm .s .cl .p .h .sh - .endif - --X11BASE ?= /usr/X11R6 -+X11BASE ?= /usr - - AR ?= ar - .if defined(%POSIX) -@@ -34,13 +34,13 @@ AFLAGS ?= - - .if defined(%POSIX) - CC ?= c89 --CFLAGS ?= -O -+CFLAGS ?= - .else --CC ?= cc --CFLAGS ?= -O2 -fno-strict-aliasing -pipe -+CC ?= gcc -+CFLAGS ?= -pipe - .endif - --CXX ?= c++ -+CXX ?= g++ - CXXFLAGS ?= ${CFLAGS:N-std=*:N-Wnested-externs:N-W*-prototypes} - - CPP ?= cpp -@@ -252,12 +252,6 @@ YFLAGS ?= -d - ${CC} ${CFLAGS} ${LDFLAGS} ${.PREFIX}.tmp.c ${LDLIBS} -ll -o ${.TARGET} - rm -f ${.PREFIX}.tmp.c - --# FreeBSD build pollution. Hide it in the non-POSIX part of the ifdef. --__MAKE_CONF?=/etc/make.conf --.if exists(${__MAKE_CONF}) --.include "${__MAKE_CONF}" --.endif -- - # Default executable format - # XXX hint for bsd.port.mk - OBJFORMAT?= elf -Index: fbsd-6.2b3/share/mk/bsd.libnames.mk -=================================================================== ---- fbsd-6.2b3.orig/share/mk/bsd.libnames.mk -+++ fbsd-6.2b3/share/mk/bsd.libnames.mk -@@ -41,7 +41,7 @@ LIBDISK?= ${DESTDIR}${LIBDIR}/libdisk.a - LIBDNS?= ${DESTDIR}${LIBDIR}/libdns.a - LIBEDIT?= ${DESTDIR}${LIBDIR}/libedit.a - LIBFETCH?= ${DESTDIR}${LIBDIR}/libfetch.a --LIBFL?= "don't use LIBFL, use LIBL" -+LIBFL?= ${DESTDIR}${LIBDOR}/libfl.a - LIBFORM?= ${DESTDIR}${LIBDIR}/libform.a - LIBFTPIO?= ${DESTDIR}${LIBDIR}/libftpio.a - LIBG2C?= ${DESTDIR}${LIBDIR}/libg2c.a -@@ -66,7 +66,7 @@ LIBKEYCAP?= ${DESTDIR}${LIBDIR}/libkeyca - LIBKICONV?= ${DESTDIR}${LIBDIR}/libkiconv.a - LIBKRB5?= ${DESTDIR}${LIBDIR}/libkrb5.a - LIBKVM?= ${DESTDIR}${LIBDIR}/libkvm.a --LIBL?= ${DESTDIR}${LIBDIR}/libl.a -+LIBL?= ${DESTDIR}${LIBDOR}/libfl.a - LIBLN?= "don't use LIBLN, use LIBL" - .if !defined(NO_BIND) - LIBLWRES?= ${DESTDIR}${LIBDIR}/liblwres.a -Index: fbsd-6.2b3/share/mk/bsd.own.mk -=================================================================== ---- fbsd-6.2b3.orig/share/mk/bsd.own.mk -+++ fbsd-6.2b3/share/mk/bsd.own.mk -@@ -157,10 +157,8 @@ NLSMODE?= ${NOBINMODE} - - INCLUDEDIR?= /usr/include - --# Common variables --.if !defined(DEBUG_FLAGS) --STRIP?= -s --.endif -+# Don't strip things with install command, leave that to portage -+STRIP= - - COMPRESS_CMD?= gzip -cn - COMPRESS_EXT?= .gz -Index: fbsd-6.2b3/share/mk/bsd.sys.mk -=================================================================== ---- fbsd-6.2b3.orig/share/mk/bsd.sys.mk -+++ fbsd-6.2b3/share/mk/bsd.sys.mk -@@ -27,9 +27,6 @@ CFLAGS += -std=${CSTD} - . if defined(WARNS) - . if ${WARNS} >= 1 - CWARNFLAGS += -Wsystem-headers --. if !defined(NO_WERROR) --CWARNFLAGS += -Werror --. endif - . endif - . if ${WARNS} >= 2 - CWARNFLAGS += -Wall -Wno-format-y2k -@@ -60,9 +57,6 @@ WFORMAT = 1 - . if ${WFORMAT} > 0 - #CWARNFLAGS += -Wformat-nonliteral -Wformat-security -Wno-format-extra-args - CWARNFLAGS += -Wformat=2 -Wno-format-extra-args --. if !defined(NO_WERROR) --CWARNFLAGS += -Werror --. endif - . endif - . endif - .endif diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-flex.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-flex.patch deleted file mode 100644 index 2ca4d038bd3e..000000000000 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-flex.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ur -x '*~' share/mk/bsd.libnames.mk share-flex/mk/bsd.libnames.mk ---- share/mk/bsd.libnames.mk 2004-11-28 15:10:18.000000000 +0100 -+++ share-flex/mk/bsd.libnames.mk 2005-07-10 01:45:38.009094320 +0200 -@@ -39,7 +39,7 @@ - LIBDNS?= ${DESTDIR}${LIBDIR}/libdns.a - LIBEDIT?= ${DESTDIR}${LIBDIR}/libedit.a - LIBFETCH?= ${DESTDIR}${LIBDIR}/libfetch.a --LIBFL?= "don't use LIBFL, use LIBL" -+LIBFL?= ${DESTDIR}${LIBDOR}/libfl.a - LIBFORM?= ${DESTDIR}${LIBDIR}/libform.a - LIBFTPIO?= ${DESTDIR}${LIBDIR}/libftpio.a - LIBG2C?= ${DESTDIR}${LIBDIR}/libg2c.a -@@ -64,7 +64,7 @@ - LIBKICONV?= ${DESTDIR}${LIBDIR}/libkiconv.a - LIBKRB5?= ${DESTDIR}${LIBDIR}/libkrb5.a - LIBKVM?= ${DESTDIR}${LIBDIR}/libkvm.a --LIBL?= ${DESTDIR}${LIBDIR}/libl.a -+LIBL?= ${DESTDIR}${LIBDOR}/libfl.a - LIBLN?= "don't use LIBLN, use LIBL" - .if !defined(NO_BIND) - LIBLWRES?= ${DESTDIR}${LIBDIR}/liblwres.a diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-6.1-r1.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-6.1-r1.ebuild deleted file mode 100644 index 0b5089fc30b7..000000000000 --- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-6.1-r1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-6.1-r1.ebuild,v 1.1 2006/05/09 16:50:08 flameeyes Exp $ - -inherit bsdmk freebsd - -DESCRIPTION="Makefiles definitions used for building and installing libraries and system files" -SLOT="0" -KEYWORDS="~amd64 ~x86-fbsd" - -IUSE="" - -SRC_URI="mirror://gentoo/${SHARE}.tar.bz2" - -RDEPEND="" -DEPEND="" - -RESTRICT="nostrip" - -S="${WORKDIR}/share/mk" - -src_unpack() { - unpack ${A} - cd ${WORKDIR}/share - epatch "${FILESDIR}/${PN}-6.1-gentoo.patch" - - [[ ${CHOST} != *-*bsd* || ${CHOST} == *-gnu ]] && \ - epatch "${FILESDIR}/${PN}-6.0-gnu.patch" -} - -src_compile() { - einfo "Nothing to compile" -} - -src_install() { - if [[ ${CHOST} != *-freebsd* ]]; then - insinto /usr/share/mk/freebsd - else - insinto /usr/share/mk - fi - doins *.mk -} diff --git a/sys-freebsd/freebsd-pam-modules/Manifest b/sys-freebsd/freebsd-pam-modules/Manifest index 9dd931db3b53..d08147023a66 100644 --- a/sys-freebsd/freebsd-pam-modules/Manifest +++ b/sys-freebsd/freebsd-pam-modules/Manifest @@ -25,34 +25,26 @@ AUX freebsd-pam-modules-6.0-gentoo.patch 701 RMD160 f907769f6f0ded416fac03a1fb6b MD5 252ec73a62c30ee7a502aab5f4ed4c3b files/freebsd-pam-modules-6.0-gentoo.patch 701 RMD160 f907769f6f0ded416fac03a1fb6b5531ff682070 files/freebsd-pam-modules-6.0-gentoo.patch 701 SHA256 8346d95aa5b4f283fedf4387ebb85a61f5f10fac38dc45bdea8c2c345fdc633d files/freebsd-pam-modules-6.0-gentoo.patch 701 -DIST freebsd-lib-6.1.tar.bz2 2613584 RMD160 f71aad95ef2bac094bdab9e317a99fb866fba042 SHA1 c7fed3b4a996fdd25f97eef428dd40023dc53a7e SHA256 6ecb49695dc135e64cea949cb7e9b9998b15cb962797cdafc735a7e244744c37 DIST freebsd-lib-6.2_rc2.tar.bz2 2670872 RMD160 bd8b9837acfde404bed998ba3ef5450bb380b779 SHA1 b7df3ad81163558a02e9f4c960f33f8fa3c38106 SHA256 b805264da9f1826d2edb9f5b946ebaae5371fcce146623e4ed695a187c1a4993 -EBUILD freebsd-pam-modules-6.1.ebuild 1283 RMD160 ad12bdf87865995f33b468f9dc99abf4b100e6e0 SHA1 60886560ba6db6f76b571a07653a181e8ac253b6 SHA256 54f27223e5b30916b3243a626dc63a22764c24f15f31520548370aecdc6d9f3c -MD5 398d139a45d7547703d482cba8f14074 freebsd-pam-modules-6.1.ebuild 1283 -RMD160 ad12bdf87865995f33b468f9dc99abf4b100e6e0 freebsd-pam-modules-6.1.ebuild 1283 -SHA256 54f27223e5b30916b3243a626dc63a22764c24f15f31520548370aecdc6d9f3c freebsd-pam-modules-6.1.ebuild 1283 EBUILD freebsd-pam-modules-6.2_rc2.ebuild 1299 RMD160 87588f971b6b0d986e16e2aa679c6fc412cd31a0 SHA1 6b68b54eda3bc13462a83d2b13f5554c8070da27 SHA256 7d9264934ed56d1fb68b82ad59aa3eb75b852824ad9ee375a6f441758eab8443 MD5 4ec7967abcad75a8b8e076eccf45eeb2 freebsd-pam-modules-6.2_rc2.ebuild 1299 RMD160 87588f971b6b0d986e16e2aa679c6fc412cd31a0 freebsd-pam-modules-6.2_rc2.ebuild 1299 SHA256 7d9264934ed56d1fb68b82ad59aa3eb75b852824ad9ee375a6f441758eab8443 freebsd-pam-modules-6.2_rc2.ebuild 1299 -MISC ChangeLog 4493 RMD160 ac65bc0d49559a7bc5880d80a89b34bd9dbcff36 SHA1 47132b55fcd5dcb0e91cc36edb0cdeecc781072b SHA256 9792a40d96615753b9ac8794deb5fdba6949d80cdc3e95b2675f042fea956578 -MD5 e7a6baa3186f302a0cddcfa26e70592f ChangeLog 4493 -RMD160 ac65bc0d49559a7bc5880d80a89b34bd9dbcff36 ChangeLog 4493 -SHA256 9792a40d96615753b9ac8794deb5fdba6949d80cdc3e95b2675f042fea956578 ChangeLog 4493 +MISC ChangeLog 4603 RMD160 c83f282bc949a2cfcfe4f8cee9740a9d25897e32 SHA1 e0d2085f1f57032cc2944b71c9cc4d1c92ac2949 SHA256 602a3f4dd05d4c314f63533ccbe174764bdcb26d873e2e65261de022502a8b62 +MD5 bedabfce68d4f19df84aba8f746c6cbf ChangeLog 4603 +RMD160 c83f282bc949a2cfcfe4f8cee9740a9d25897e32 ChangeLog 4603 +SHA256 602a3f4dd05d4c314f63533ccbe174764bdcb26d873e2e65261de022502a8b62 ChangeLog 4603 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata.xml 156 -MD5 28f38d75ce4d75e9729c3a6b307a1ad5 files/digest-freebsd-pam-modules-6.1 253 -RMD160 5b8810953e6bf6bd851c5666f9aac0c6f1410326 files/digest-freebsd-pam-modules-6.1 253 -SHA256 8272117e05da623b3d53d7f2e637d1c3f649ff2516ceeb0966bc884df138c25f files/digest-freebsd-pam-modules-6.1 253 MD5 02a9baa1280c40675fc2fb4ba69be1be files/digest-freebsd-pam-modules-6.2_rc2 265 RMD160 cd4ec109114cdcb5cb890a618489415cb7175f1a files/digest-freebsd-pam-modules-6.2_rc2 265 SHA256 dedb65c51c17dbaee768d67c178f38352f64f9a3c56b8b40c3510305df2b5770 files/digest-freebsd-pam-modules-6.2_rc2 265 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) +Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFlTHPAiZjviIA2XgRAh9zAJ0S5sceH7xAY/sKsjL1Q0D5IuZQsgCfcN4P -T5r1YgI9Hzfot4T+zIsLslo= -=LpKO +iD8DBQFFnsL0AiZjviIA2XgRAudrAJ0bcEx1dCXvL+5DkghOC115prw+RACgqdmK +sg6i5xRBEXAzgs2b9zfesss= +=7qmb -----END PGP SIGNATURE----- diff --git a/sys-freebsd/freebsd-pam-modules/files/digest-freebsd-pam-modules-6.1 b/sys-freebsd/freebsd-pam-modules/files/digest-freebsd-pam-modules-6.1 deleted file mode 100644 index 26df127ad223..000000000000 --- a/sys-freebsd/freebsd-pam-modules/files/digest-freebsd-pam-modules-6.1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 f33af43501169d9167c71c3a48a033c2 freebsd-lib-6.1.tar.bz2 2613584 -RMD160 f71aad95ef2bac094bdab9e317a99fb866fba042 freebsd-lib-6.1.tar.bz2 2613584 -SHA256 6ecb49695dc135e64cea949cb7e9b9998b15cb962797cdafc735a7e244744c37 freebsd-lib-6.1.tar.bz2 2613584 diff --git a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-6.1.ebuild b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-6.1.ebuild deleted file mode 100644 index 21da961c45ca..000000000000 --- a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-6.1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-6.1.ebuild,v 1.1 2006/05/09 07:38:36 flameeyes Exp $ - -inherit bsdmk freebsd multilib pam - -DESCRIPTION="FreeBSD's PAM authentication modules" -SLOT="0" -KEYWORDS="~x86-fbsd" - -IUSE="kerberos nis" - -SRC_URI="mirror://gentoo/${LIB}.tar.bz2" - -RDEPEND=">=sys-auth/openpam-20050201-r1 - kerberos? ( dev-libs/openssl - virtual/krb5 )" -DEPEND="${RDEPEND} - =sys-freebsd/freebsd-mk-defs-${RV}* - =sys-freebsd/freebsd-sources-${RV}*" - -S=${WORKDIR}/lib/libpam/modules - -pkg_setup() { - # Avoid installing pam_ssh as that has its own ebuild. - mymakeopts="${mymakeopts} NO_OPENSSH= " - use kerberos || mymakeopts="${mymakeopts} NO_KERBEROS= " - use nis || mymakeopts="${mymakeopts} NO_NIS= " -} - -src_unpack() { - unpack ${A} - - cd ${WORKDIR}/lib - - for module in pam_deny pam_passwdqc pam_permit; do - sed -i -e "s:${module}::" ${S}/modules.inc - done - - # Avoid using static versions; use gentoo /lib/security dir - epatch ${FILESDIR}/${PN}-6.0-gentoo.patch -} - -src_install() { - mkinstall "LIBDIR=/$(get_libdir)/security" || die "install failed" - - dodoc "${FILESDIR}/5.4/README.pamd" - dopamd "${FILESDIR}/5.4/pam.d/"* -} diff --git a/sys-freebsd/freebsd-pf/Manifest b/sys-freebsd/freebsd-pf/Manifest index fff89204b6bd..c58ffb9b4edf 100644 --- a/sys-freebsd/freebsd-pf/Manifest +++ b/sys-freebsd/freebsd-pf/Manifest @@ -13,40 +13,29 @@ AUX pf.initd 921 RMD160 ea7ae600979120282cc653a056309a1826507d6f SHA1 a341b306cc MD5 63bc3f738d51075d091f6c6e5d7f5de6 files/pf.initd 921 RMD160 ea7ae600979120282cc653a056309a1826507d6f files/pf.initd 921 SHA256 03f35f86697fcdd6667ea4688304f7331b8c0aa56c755cad780563d65b8e6c25 files/pf.initd 921 -DIST freebsd-contrib-6.1.tar.bz2 36017365 RMD160 225f6ade032533d08b98b79cb29b75da2a3c74fa SHA1 adac960daad3f4169874fe0ba1050fe7e906aa23 SHA256 41283b7f78597cf81f98477aef04eb9cce2b130b1a2f8b5c7d647549c973c054 DIST freebsd-contrib-6.2_rc2.tar.bz2 36594463 RMD160 d957a4054073009fe20cc13353797c2dc1aa0eaa SHA1 b93129a87d91e9ef37748337667a68a7530a30c4 SHA256 aeddb53e9dea3da081419be386251c144c63496d769d07b61e9085a3e52c74e0 -DIST freebsd-etc-6.1.tar.bz2 184045 RMD160 b9a8bea64694c040c02b74f7633dc3cd77afa400 SHA1 4a1fff7fa1c77485c5efccf5ab1155e497d1cd82 SHA256 62b06b61e526c4a939503202aaca31cbce7a3de9daec03e67dc57119527eeff7 DIST freebsd-etc-6.2_rc2.tar.bz2 189416 RMD160 e98c8821fc4fbcf2890fcc8155c8fa0f74fd417c SHA1 4fad080351793c84c491407e797e62559245fc40 SHA256 b4f673da45ca646fae9e457c4a8e3255dbe5365445537d4e6ba39ac9b54ee40e -DIST freebsd-sbin-6.1.tar.bz2 1156163 RMD160 167a4545da086f52b9a8fd52e48f9ec6cfdd3150 SHA1 2d3d393b843e071c20fad104bc610948eac6454b SHA256 fb15602238f98f6dd2b9d56bc9ece09c922b0c49599aea87620ba70c853f95d6 DIST freebsd-sbin-6.2_rc2.tar.bz2 1161795 RMD160 85e47cda22e8e5d8eff1b08abeafdbd02d3989d7 SHA1 6d2dce4b00a68d95f66b6a53ca2c7395ffd3feb6 SHA256 dcc67eeba323e4c55fdc7ba6a4fa6af6d004157eb3de6f6923cf7fbb6d55393a -DIST freebsd-usbin-6.1.tar.bz2 2664570 RMD160 98a87538790a814d0afd35bb0f848bcff574c72d SHA1 c7e6856e7f6bd2d45790737f411348b301944b91 SHA256 70b4a494a72d130d641500bfa857bdf98c9a4a040da2699475902523ba5c374e DIST freebsd-usbin-6.2_rc2.tar.bz2 2696638 RMD160 c907088555c4bba3e4542f69649f6df9dba4fc8a SHA1 b5d65f1d02bcb4fc0aae3649a6b0699b11aee820 SHA256 952f3d8638035b31e65e4374139f49b993b55b88fbbe62ce0dead963ac552b25 -EBUILD freebsd-pf-6.1.ebuild 1292 RMD160 082c7c2d5b525edc7696df555c5edede2402376b SHA1 af705944c95992b9ddda91fc79be82b3f5db3efd SHA256 c2c0802811b397e0ab481f5be75938115672c53b81c530c393875c3fdc4dc7b3 -MD5 0deb3ec68595ed520f8dcc5b9f5d7760 freebsd-pf-6.1.ebuild 1292 -RMD160 082c7c2d5b525edc7696df555c5edede2402376b freebsd-pf-6.1.ebuild 1292 -SHA256 c2c0802811b397e0ab481f5be75938115672c53b81c530c393875c3fdc4dc7b3 freebsd-pf-6.1.ebuild 1292 EBUILD freebsd-pf-6.2_rc2.ebuild 1297 RMD160 950c8dc26c5552bce5ad2a01e262e7d09ee95d72 SHA1 2cce543b4ba687e1867de942862ee52e16999c09 SHA256 916090a79adc90f9d26adcc1f1aaf6a260d5fbdd4bcdff54de45b0f28be22514 MD5 493e9f367a33541015f639c9b78629f8 freebsd-pf-6.2_rc2.ebuild 1297 RMD160 950c8dc26c5552bce5ad2a01e262e7d09ee95d72 freebsd-pf-6.2_rc2.ebuild 1297 SHA256 916090a79adc90f9d26adcc1f1aaf6a260d5fbdd4bcdff54de45b0f28be22514 freebsd-pf-6.2_rc2.ebuild 1297 -MISC ChangeLog 3536 RMD160 11b2045b0332ef269d3f56ac06167e3f88c033bb SHA1 23d2621c5ae2ad37d2f96e399431867ceccbb72a SHA256 d619d4d72d4b2dbe9e26d1baa018bfd6c861e42dba0a8532fe38bc35d4f0e34a -MD5 a5594f12b26a2c1525ae4481aaefae0c ChangeLog 3536 -RMD160 11b2045b0332ef269d3f56ac06167e3f88c033bb ChangeLog 3536 -SHA256 d619d4d72d4b2dbe9e26d1baa018bfd6c861e42dba0a8532fe38bc35d4f0e34a ChangeLog 3536 +MISC ChangeLog 3635 RMD160 b2b4b7cfc9ebd115167e225b7eaf7756fb9bcfc6 SHA1 12ee579d9128a20c43f3b06b447db925758d0d99 SHA256 41f8068c03699e71e8a9e5a3d81b7ea962857aff7455e7b88c26d4de665fe778 +MD5 f321676d07ffe96d0fafa0bf6c966d47 ChangeLog 3635 +RMD160 b2b4b7cfc9ebd115167e225b7eaf7756fb9bcfc6 ChangeLog 3635 +SHA256 41f8068c03699e71e8a9e5a3d81b7ea962857aff7455e7b88c26d4de665fe778 ChangeLog 3635 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata.xml 156 -MD5 ea19d205dd21db1cdfb7563c059b342d files/digest-freebsd-pf-6.1 1033 -RMD160 6271ed55a587d102c42c8d7006a890b324743804 files/digest-freebsd-pf-6.1 1033 -SHA256 b10ebc0d579382d65e34c55c56bd892239b70852f5b61973c1be781ac7be4f8a files/digest-freebsd-pf-6.1 1033 MD5 063766ec71b76b981d274685996cd9eb files/digest-freebsd-pf-6.2_rc2 1081 RMD160 91171e3cf05f425a3a9004ad118163d52708a213 files/digest-freebsd-pf-6.2_rc2 1081 SHA256 ef24b8e596d2939669fbe946e8833a0f0100df18817f4c7da096fa3fd8d72beb files/digest-freebsd-pf-6.2_rc2 1081 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) +Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFlTHuAiZjviIA2XgRAuv7AJ44BoPvZ8VKaWQ4RK+kI4tOmRTZNQCeNXE7 -74UZ9RfeQriqz1E6CPwzBY8= -=9AdP +iD8DBQFFnsMPAiZjviIA2XgRAhkVAKCJWHPUxE37hdNIDX4AJDyp/sHFmgCggNDK +JsqbxTTZyXn3uZ02j/xQFFI= +=3FPA -----END PGP SIGNATURE----- diff --git a/sys-freebsd/freebsd-pf/files/digest-freebsd-pf-6.1 b/sys-freebsd/freebsd-pf/files/digest-freebsd-pf-6.1 deleted file mode 100644 index 035a0135558e..000000000000 --- a/sys-freebsd/freebsd-pf/files/digest-freebsd-pf-6.1 +++ /dev/null @@ -1,12 +0,0 @@ -MD5 a04643beb2d94972200d6714688930cf freebsd-contrib-6.1.tar.bz2 36017365 -RMD160 225f6ade032533d08b98b79cb29b75da2a3c74fa freebsd-contrib-6.1.tar.bz2 36017365 -SHA256 41283b7f78597cf81f98477aef04eb9cce2b130b1a2f8b5c7d647549c973c054 freebsd-contrib-6.1.tar.bz2 36017365 -MD5 ac8defbdaaab754fee70ac27c02f2c0e freebsd-etc-6.1.tar.bz2 184045 -RMD160 b9a8bea64694c040c02b74f7633dc3cd77afa400 freebsd-etc-6.1.tar.bz2 184045 -SHA256 62b06b61e526c4a939503202aaca31cbce7a3de9daec03e67dc57119527eeff7 freebsd-etc-6.1.tar.bz2 184045 -MD5 33a8f60e595bc82c6abb7e47de1b9fa8 freebsd-sbin-6.1.tar.bz2 1156163 -RMD160 167a4545da086f52b9a8fd52e48f9ec6cfdd3150 freebsd-sbin-6.1.tar.bz2 1156163 -SHA256 fb15602238f98f6dd2b9d56bc9ece09c922b0c49599aea87620ba70c853f95d6 freebsd-sbin-6.1.tar.bz2 1156163 -MD5 ca61245fd3ec21d31ab9e41cd1ad35b7 freebsd-usbin-6.1.tar.bz2 2664570 -RMD160 98a87538790a814d0afd35bb0f848bcff574c72d freebsd-usbin-6.1.tar.bz2 2664570 -SHA256 70b4a494a72d130d641500bfa857bdf98c9a4a040da2699475902523ba5c374e freebsd-usbin-6.1.tar.bz2 2664570 diff --git a/sys-freebsd/freebsd-pf/freebsd-pf-6.1.ebuild b/sys-freebsd/freebsd-pf/freebsd-pf-6.1.ebuild deleted file mode 100644 index f8451441c62d..000000000000 --- a/sys-freebsd/freebsd-pf/freebsd-pf-6.1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pf/freebsd-pf-6.1.ebuild,v 1.2 2006/07/18 19:30:49 the_paya Exp $ - -inherit bsdmk freebsd - -DESCRIPTION="FreeBSD's base system libraries" -SLOT="0" -KEYWORDS="~x86-fbsd" - -IUSE="" - -# Crypto is needed to have an internal OpenSSL header -SRC_URI="mirror://gentoo/${USBIN}.tar.bz2 - mirror://gentoo/${SBIN}.tar.bz2 - mirror://gentoo/${CONTRIB}.tar.bz2 - mirror://gentoo/${ETC}.tar.bz2" - -RDEPEND="net-libs/libpcap" -DEPEND="${RDEPEND} - sys-freebsd/freebsd-mk-defs - =sys-freebsd/freebsd-sources-${RV}*" - -S="${WORKDIR}" - -SUBDIRS="usr.sbin/authpf sbin/pfctl sbin/pflogd" - -PATCHES="${FILESDIR}/${PN}-6.0-pcap.patch" - -src_unpack() { - freebsd_src_unpack - - ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" -} - -src_compile() { - for dir in ${SUBDIRS}; do - einfo "Starting make in ${dir}" - cd "${S}/${dir}" - mkmake || die "Make ${dir} failed" - done -} - -src_install() { - for dir in ${SUBDIRS}; do - einfo "Starting install in ${dir}" - cd "${S}/${dir}" - mkinstall || die "Install ${dir} failed" - done - - cd ${WORKDIR}/etc - insinto /etc - doins pf.os - newdoc pf.conf pf.conf.example - - newinitd "${FILESDIR}/pf.initd" pf - newconfd "${FILESDIR}/pf.confd" pf -} diff --git a/sys-freebsd/freebsd-rescue/Manifest b/sys-freebsd/freebsd-rescue/Manifest index 08c513b72aaa..2793ec3ac59f 100644 --- a/sys-freebsd/freebsd-rescue/Manifest +++ b/sys-freebsd/freebsd-rescue/Manifest @@ -9,52 +9,35 @@ AUX freebsd-rescue-5.4-sbin-gentoo.patch 817 RMD160 00982cbcd0922847d8754388e5a5 MD5 1eb113940f2deb194fc0e8050a998b93 files/freebsd-rescue-5.4-sbin-gentoo.patch 817 RMD160 00982cbcd0922847d8754388e5a5e27df7cf7436 files/freebsd-rescue-5.4-sbin-gentoo.patch 817 SHA256 8e9c30fb3a3e1344fadc63039165080bfb50ef8ea989383b67b8a343f7436fed files/freebsd-rescue-5.4-sbin-gentoo.patch 817 -DIST freebsd-bin-6.1.tar.bz2 405680 RMD160 33f2e5b49fce90dcaab652621af3b33e8e80b643 SHA1 83b10732b88c42205b7a8c542f1f9a4a83d82df8 SHA256 86d7a000827432c594f9d37b98a1f936f6168030cf033c6e621a37c670ef5271 DIST freebsd-bin-6.2_rc2.tar.bz2 406726 RMD160 49f94f065296854cf9020426db2d35aa2e1273bb SHA1 2d6eac350f889c123736ddfa171194b163ae7a66 SHA256 8bb7d1028e14dc2b967546e5aa4c18bfe1175cd2d380d6c37452f3b1b7ac637f -DIST freebsd-contrib-6.1.tar.bz2 36017365 RMD160 225f6ade032533d08b98b79cb29b75da2a3c74fa SHA1 adac960daad3f4169874fe0ba1050fe7e906aa23 SHA256 41283b7f78597cf81f98477aef04eb9cce2b130b1a2f8b5c7d647549c973c054 DIST freebsd-contrib-6.2_rc2.tar.bz2 36594463 RMD160 d957a4054073009fe20cc13353797c2dc1aa0eaa SHA1 b93129a87d91e9ef37748337667a68a7530a30c4 SHA256 aeddb53e9dea3da081419be386251c144c63496d769d07b61e9085a3e52c74e0 -DIST freebsd-gnu-6.1.tar.bz2 867244 RMD160 5eeff2beb898984c40ae1d7c8adfdf41f2c0b8f8 SHA1 93dbfd053132c54b927f6ca5605158b8ccd0f969 SHA256 7bf79a2535539add15da6480830f771e5aea6594c24ffed2d196c7f0c700fdc1 DIST freebsd-gnu-6.2_rc2.tar.bz2 874291 RMD160 9d182b42a407bd690340fe603e4950c6f28b0760 SHA1 b665b72c9763f962990f0b8981f4ec4bbf82393c SHA256 7dac776dfae37bb1d7ab228ac8267aac15dc6ac041961aba8f2d2997875e5481 -DIST freebsd-lib-6.1.tar.bz2 2613584 RMD160 f71aad95ef2bac094bdab9e317a99fb866fba042 SHA1 c7fed3b4a996fdd25f97eef428dd40023dc53a7e SHA256 6ecb49695dc135e64cea949cb7e9b9998b15cb962797cdafc735a7e244744c37 DIST freebsd-lib-6.2_rc2.tar.bz2 2670872 RMD160 bd8b9837acfde404bed998ba3ef5450bb380b779 SHA1 b7df3ad81163558a02e9f4c960f33f8fa3c38106 SHA256 b805264da9f1826d2edb9f5b946ebaae5371fcce146623e4ed695a187c1a4993 -DIST freebsd-libexec-6.1.tar.bz2 277860 RMD160 bef98efbc76812cf36b55067433039f3805cfbab SHA1 8204a510e44e21cbf53715f3d4a2518b8192400d SHA256 38eaddc9edc36597e42ca3c63ee8a2fd6f07f96c7294aea75a9988ac5b07b357 DIST freebsd-libexec-6.2_rc2.tar.bz2 277162 RMD160 e1868104643febadcd503d2da8b781ef7f24b22e SHA1 01b80b12889149052896be298548660f23b8a9f0 SHA256 28f1f8f60fac76043b46d701b60ea182d9f31af277ac82f4174c93f25f04a632 -DIST freebsd-rescue-6.1.tar.bz2 4949 RMD160 334e1904b0240d80fcec7b3681eb8bb37f3a6f73 SHA1 91f0ac927b36ea0c8412a8fb8ce63cdf23d3b2cb SHA256 3801dfb9cf608b106ff0621a1b69df92290da9baa4af23c2e3b7d22193c211aa DIST freebsd-rescue-6.2_rc2.tar.bz2 4947 RMD160 a59872457cc7ec283c8fcafef4bc3119e11fd77b SHA1 02f94c7c886ee752deb84354f0b7e410d4511e38 SHA256 f58a047d34b061990a7366679977850a1f687de9100857ac1400d406bfae6534 -DIST freebsd-sbin-6.1.tar.bz2 1156163 RMD160 167a4545da086f52b9a8fd52e48f9ec6cfdd3150 SHA1 2d3d393b843e071c20fad104bc610948eac6454b SHA256 fb15602238f98f6dd2b9d56bc9ece09c922b0c49599aea87620ba70c853f95d6 DIST freebsd-sbin-6.2_rc2.tar.bz2 1161795 RMD160 85e47cda22e8e5d8eff1b08abeafdbd02d3989d7 SHA1 6d2dce4b00a68d95f66b6a53ca2c7395ffd3feb6 SHA256 dcc67eeba323e4c55fdc7ba6a4fa6af6d004157eb3de6f6923cf7fbb6d55393a -DIST freebsd-sys-6.1.tar.bz2 17361671 RMD160 eb19f6a345c665542df694a4f9170d227beaf3b6 SHA1 f9da69cabdaaad268c79670c06ba4fff3e3ef6a8 SHA256 d2ecd79b83ba06c12e358adfccc7e057e15fb7c5be76d92c537b99cbe1d84f0f DIST freebsd-sys-6.2_rc2.tar.bz2 18339807 RMD160 ab2e6110b767319a0135130f9ad16d074de61483 SHA1 f7881f43e815930fe3ef6c3517d4e2475f80479e SHA256 392d80c8dae6b7cddc4810f59869a87ec4d0d699c534d8a034b2b273640a7666 -DIST freebsd-ubin-6.1.tar.bz2 1763218 RMD160 5da58c546cebf30a6b661841dbcb5b53626a4a1e SHA1 7d1b0568d02f192dcd3bd7f972613376d3d0f16d SHA256 13429ed3cc8a14a4efda69b7d82004bf993b5a14591a6129a857d627221aeef6 DIST freebsd-ubin-6.2_rc2.tar.bz2 1773409 RMD160 be5fa09f2b84b77981ba6ae34d2c237b05164776 SHA1 6052972c318830a717cb3f6b72fe034c1a1fe147 SHA256 391d266053323b96a258a264abec848bd0799ded76dcad098b510bd5d9a75398 -DIST freebsd-usbin-6.1.tar.bz2 2664570 RMD160 98a87538790a814d0afd35bb0f848bcff574c72d SHA1 c7e6856e7f6bd2d45790737f411348b301944b91 SHA256 70b4a494a72d130d641500bfa857bdf98c9a4a040da2699475902523ba5c374e DIST freebsd-usbin-6.2_rc2.tar.bz2 2696638 RMD160 c907088555c4bba3e4542f69649f6df9dba4fc8a SHA1 b5d65f1d02bcb4fc0aae3649a6b0699b11aee820 SHA256 952f3d8638035b31e65e4374139f49b993b55b88fbbe62ce0dead963ac552b25 -EBUILD freebsd-rescue-6.1.ebuild 1407 RMD160 f26ea130a21c7a7112ff11b4dd1fc6f18b820385 SHA1 9ad3d239356dbcca800ade2eb0a4a270c677dfec SHA256 951ead3b6c9b746d7957c78bb3fd736883327379118c108dc1aba2c7c0184e86 -MD5 7bf030dc03f1414f61bf06253eb187a5 freebsd-rescue-6.1.ebuild 1407 -RMD160 f26ea130a21c7a7112ff11b4dd1fc6f18b820385 freebsd-rescue-6.1.ebuild 1407 -SHA256 951ead3b6c9b746d7957c78bb3fd736883327379118c108dc1aba2c7c0184e86 freebsd-rescue-6.1.ebuild 1407 EBUILD freebsd-rescue-6.2_rc2.ebuild 1411 RMD160 87004fff94f010851e23dc08f399d892aefd1b58 SHA1 cb27a19cfc828cb8524c6c24414199ee7f564682 SHA256 57ec084c69157289f9ee0a0e8660c7f474214fd0d20137d6528496e708e44d67 MD5 90770b3246b17dba57999e59754d1b7f freebsd-rescue-6.2_rc2.ebuild 1411 RMD160 87004fff94f010851e23dc08f399d892aefd1b58 freebsd-rescue-6.2_rc2.ebuild 1411 SHA256 57ec084c69157289f9ee0a0e8660c7f474214fd0d20137d6528496e708e44d67 freebsd-rescue-6.2_rc2.ebuild 1411 -MISC ChangeLog 3097 RMD160 0c348fd6f47354e71d5a780f3da48fd3ee0eb2b8 SHA1 570da7f6433326c8dc00d99bf4a67559d67de353 SHA256 5634d9f11f3568e01c3b01af6a870f492a52012067482a66a408ecca1a3402a7 -MD5 c8db994ddb85f6aca22cf92fd4f8f84c ChangeLog 3097 -RMD160 0c348fd6f47354e71d5a780f3da48fd3ee0eb2b8 ChangeLog 3097 -SHA256 5634d9f11f3568e01c3b01af6a870f492a52012067482a66a408ecca1a3402a7 ChangeLog 3097 +MISC ChangeLog 3202 RMD160 b4b9d53b45de258fe2a25f369a644eb45e537e72 SHA1 3f0c5fe121de339c6b70a6da5d98a3baff17896f SHA256 59625366ec9ff7657937796cba882ec80a501db8525f8af8ffa19ed44ff3d86a +MD5 be83dc4da04e664fac54605776d218b1 ChangeLog 3202 +RMD160 b4b9d53b45de258fe2a25f369a644eb45e537e72 ChangeLog 3202 +SHA256 59625366ec9ff7657937796cba882ec80a501db8525f8af8ffa19ed44ff3d86a ChangeLog 3202 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata.xml 156 -MD5 650c6e5c9b451aecd30682f8bc83479f files/digest-freebsd-rescue-6.1 2563 -RMD160 d02c93da4336f2e5d6285f32a096c3899e768e50 files/digest-freebsd-rescue-6.1 2563 -SHA256 5fee6bbca127d5b7174e412d0913433b83abc7316c408b013545019ba2fa7bbe files/digest-freebsd-rescue-6.1 2563 MD5 965b8ef47c64555cf1a8f7e328b7b659 files/digest-freebsd-rescue-6.2_rc2 2683 RMD160 527ea0a497e893f91078650c5da3ce5ba9ab00d8 files/digest-freebsd-rescue-6.2_rc2 2683 SHA256 0168fe3ef0315fc9b368ab635632d8f95bf19dcc14005cff91a784cb883034ac files/digest-freebsd-rescue-6.2_rc2 2683 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) +Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFlTISAiZjviIA2XgRAn7iAKCw7hX5CttoapJTzdr1/W7Kj8fXWQCeK21v -ANQb0nU0MbGG6WKZ1iw+MDU= -=iJoK +iD8DBQFFnsM7AiZjviIA2XgRAiG0AJ4neB3tCydPkxDA0GD6pkJtKjRHCQCginDN +GStb+zA+fR94f/47jLOhak4= +=fsgI -----END PGP SIGNATURE----- diff --git a/sys-freebsd/freebsd-rescue/files/digest-freebsd-rescue-6.1 b/sys-freebsd/freebsd-rescue/files/digest-freebsd-rescue-6.1 deleted file mode 100644 index b4a7e216e5c2..000000000000 --- a/sys-freebsd/freebsd-rescue/files/digest-freebsd-rescue-6.1 +++ /dev/null @@ -1,30 +0,0 @@ -MD5 e8c5589329d476255f8a15f9f9bfebd1 freebsd-bin-6.1.tar.bz2 405680 -RMD160 33f2e5b49fce90dcaab652621af3b33e8e80b643 freebsd-bin-6.1.tar.bz2 405680 -SHA256 86d7a000827432c594f9d37b98a1f936f6168030cf033c6e621a37c670ef5271 freebsd-bin-6.1.tar.bz2 405680 -MD5 a04643beb2d94972200d6714688930cf freebsd-contrib-6.1.tar.bz2 36017365 -RMD160 225f6ade032533d08b98b79cb29b75da2a3c74fa freebsd-contrib-6.1.tar.bz2 36017365 -SHA256 41283b7f78597cf81f98477aef04eb9cce2b130b1a2f8b5c7d647549c973c054 freebsd-contrib-6.1.tar.bz2 36017365 -MD5 986fe1e300d5d0d89180eb9559f87334 freebsd-gnu-6.1.tar.bz2 867244 -RMD160 5eeff2beb898984c40ae1d7c8adfdf41f2c0b8f8 freebsd-gnu-6.1.tar.bz2 867244 -SHA256 7bf79a2535539add15da6480830f771e5aea6594c24ffed2d196c7f0c700fdc1 freebsd-gnu-6.1.tar.bz2 867244 -MD5 f33af43501169d9167c71c3a48a033c2 freebsd-lib-6.1.tar.bz2 2613584 -RMD160 f71aad95ef2bac094bdab9e317a99fb866fba042 freebsd-lib-6.1.tar.bz2 2613584 -SHA256 6ecb49695dc135e64cea949cb7e9b9998b15cb962797cdafc735a7e244744c37 freebsd-lib-6.1.tar.bz2 2613584 -MD5 244baf5f7ef26dbf33428970913a40f3 freebsd-libexec-6.1.tar.bz2 277860 -RMD160 bef98efbc76812cf36b55067433039f3805cfbab freebsd-libexec-6.1.tar.bz2 277860 -SHA256 38eaddc9edc36597e42ca3c63ee8a2fd6f07f96c7294aea75a9988ac5b07b357 freebsd-libexec-6.1.tar.bz2 277860 -MD5 c749fb90404ad32d0ef21ef1845bb322 freebsd-rescue-6.1.tar.bz2 4949 -RMD160 334e1904b0240d80fcec7b3681eb8bb37f3a6f73 freebsd-rescue-6.1.tar.bz2 4949 -SHA256 3801dfb9cf608b106ff0621a1b69df92290da9baa4af23c2e3b7d22193c211aa freebsd-rescue-6.1.tar.bz2 4949 -MD5 33a8f60e595bc82c6abb7e47de1b9fa8 freebsd-sbin-6.1.tar.bz2 1156163 -RMD160 167a4545da086f52b9a8fd52e48f9ec6cfdd3150 freebsd-sbin-6.1.tar.bz2 1156163 -SHA256 fb15602238f98f6dd2b9d56bc9ece09c922b0c49599aea87620ba70c853f95d6 freebsd-sbin-6.1.tar.bz2 1156163 -MD5 8893a0a0ddfa8959f71e8ee561a11333 freebsd-sys-6.1.tar.bz2 17361671 -RMD160 eb19f6a345c665542df694a4f9170d227beaf3b6 freebsd-sys-6.1.tar.bz2 17361671 -SHA256 d2ecd79b83ba06c12e358adfccc7e057e15fb7c5be76d92c537b99cbe1d84f0f freebsd-sys-6.1.tar.bz2 17361671 -MD5 f9c5fe01da2eba4696619c63eb4cad8c freebsd-ubin-6.1.tar.bz2 1763218 -RMD160 5da58c546cebf30a6b661841dbcb5b53626a4a1e freebsd-ubin-6.1.tar.bz2 1763218 -SHA256 13429ed3cc8a14a4efda69b7d82004bf993b5a14591a6129a857d627221aeef6 freebsd-ubin-6.1.tar.bz2 1763218 -MD5 ca61245fd3ec21d31ab9e41cd1ad35b7 freebsd-usbin-6.1.tar.bz2 2664570 -RMD160 98a87538790a814d0afd35bb0f848bcff574c72d freebsd-usbin-6.1.tar.bz2 2664570 -SHA256 70b4a494a72d130d641500bfa857bdf98c9a4a040da2699475902523ba5c374e freebsd-usbin-6.1.tar.bz2 2664570 diff --git a/sys-freebsd/freebsd-rescue/freebsd-rescue-6.1.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-6.1.ebuild deleted file mode 100644 index ad0bd1dabbee..000000000000 --- a/sys-freebsd/freebsd-rescue/freebsd-rescue-6.1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-rescue/freebsd-rescue-6.1.ebuild,v 1.1 2006/05/09 07:40:27 flameeyes Exp $ - -inherit bsdmk freebsd - -DESCRIPTION="FreeBSD's rescue binaries" -SLOT="0" -KEYWORDS="~x86-fbsd" - -IUSE="atm nis" - -SRC_URI="mirror://gentoo/${UBIN}.tar.bz2 - mirror://gentoo/${CONTRIB}.tar.bz2 - mirror://gentoo/${LIB}.tar.bz2 - mirror://gentoo/${BIN}.tar.bz2 - mirror://gentoo/${SBIN}.tar.bz2 - mirror://gentoo/${USBIN}.tar.bz2 - mirror://gentoo/${GNU}.tar.bz2 - mirror://gentoo/${SYS}.tar.bz2 - mirror://gentoo/${LIBEXEC}.tar.bz2 - mirror://gentoo/${RESCUE}.tar.bz2" - -RDEPEND="" -DEPEND="sys-devel/flex - =sys-freebsd/freebsd-sources-${RV}* - =sys-freebsd/freebsd-mk-defs-${RV}*" - -S="${WORKDIR}/rescue" - -pkg_setup() { - use atm || mymakeopts="${mymakeopts} NO_ATM= " - use nis || mymakeopts="${mymakeopts} NO_NIS= " - - for flag in atm nis; do - if use ${flag} && ! built_with_use sys-libs/freebsd-lib ${flag}; then - die "You can't add ${flag} support here without adding it to sys-libs/freebsd-lib" - fi - done - -# append-flags -fno-stack-protector -fno-stack-protector-all -} - -src_unpack() { - freebsd_src_unpack - - # As they are patches from ${WORKDIR} apply them by hand - cd ${WORKDIR} - epatch ${FILESDIR}/${PN}-5.4-gentoo.patch - epatch ${FILESDIR}/${PN}-5.4-sbin-gentoo.patch -} diff --git a/sys-freebsd/freebsd-sbin/Manifest b/sys-freebsd/freebsd-sbin/Manifest index 078ed11f859c..58cd9df0e74c 100644 --- a/sys-freebsd/freebsd-sbin/Manifest +++ b/sys-freebsd/freebsd-sbin/Manifest @@ -37,46 +37,32 @@ AUX sysctl.initd 668 RMD160 41d062d1990f01eabf595a2b2c44ebfd15f528fd SHA1 362c93 MD5 40bab89ba3f12443629e7daa08f89729 files/sysctl.initd 668 RMD160 41d062d1990f01eabf595a2b2c44ebfd15f528fd files/sysctl.initd 668 SHA256 3c705768dba1a4f12aaf821139de4923d2117222ee96539a1957b50b9e8f49a9 files/sysctl.initd 668 -DIST freebsd-contrib-6.1.tar.bz2 36017365 RMD160 225f6ade032533d08b98b79cb29b75da2a3c74fa SHA1 adac960daad3f4169874fe0ba1050fe7e906aa23 SHA256 41283b7f78597cf81f98477aef04eb9cce2b130b1a2f8b5c7d647549c973c054 DIST freebsd-contrib-6.2_rc2.tar.bz2 36594463 RMD160 d957a4054073009fe20cc13353797c2dc1aa0eaa SHA1 b93129a87d91e9ef37748337667a68a7530a30c4 SHA256 aeddb53e9dea3da081419be386251c144c63496d769d07b61e9085a3e52c74e0 -DIST freebsd-etc-6.1.tar.bz2 184045 RMD160 b9a8bea64694c040c02b74f7633dc3cd77afa400 SHA1 4a1fff7fa1c77485c5efccf5ab1155e497d1cd82 SHA256 62b06b61e526c4a939503202aaca31cbce7a3de9daec03e67dc57119527eeff7 DIST freebsd-etc-6.2_rc2.tar.bz2 189416 RMD160 e98c8821fc4fbcf2890fcc8155c8fa0f74fd417c SHA1 4fad080351793c84c491407e797e62559245fc40 SHA256 b4f673da45ca646fae9e457c4a8e3255dbe5365445537d4e6ba39ac9b54ee40e -DIST freebsd-lib-6.1.tar.bz2 2613584 RMD160 f71aad95ef2bac094bdab9e317a99fb866fba042 SHA1 c7fed3b4a996fdd25f97eef428dd40023dc53a7e SHA256 6ecb49695dc135e64cea949cb7e9b9998b15cb962797cdafc735a7e244744c37 DIST freebsd-lib-6.2_rc2.tar.bz2 2670872 RMD160 bd8b9837acfde404bed998ba3ef5450bb380b779 SHA1 b7df3ad81163558a02e9f4c960f33f8fa3c38106 SHA256 b805264da9f1826d2edb9f5b946ebaae5371fcce146623e4ed695a187c1a4993 -DIST freebsd-libexec-6.1.tar.bz2 277860 RMD160 bef98efbc76812cf36b55067433039f3805cfbab SHA1 8204a510e44e21cbf53715f3d4a2518b8192400d SHA256 38eaddc9edc36597e42ca3c63ee8a2fd6f07f96c7294aea75a9988ac5b07b357 DIST freebsd-libexec-6.2_rc2.tar.bz2 277162 RMD160 e1868104643febadcd503d2da8b781ef7f24b22e SHA1 01b80b12889149052896be298548660f23b8a9f0 SHA256 28f1f8f60fac76043b46d701b60ea182d9f31af277ac82f4174c93f25f04a632 -DIST freebsd-sbin-6.1.tar.bz2 1156163 RMD160 167a4545da086f52b9a8fd52e48f9ec6cfdd3150 SHA1 2d3d393b843e071c20fad104bc610948eac6454b SHA256 fb15602238f98f6dd2b9d56bc9ece09c922b0c49599aea87620ba70c853f95d6 DIST freebsd-sbin-6.2_rc2.tar.bz2 1161795 RMD160 85e47cda22e8e5d8eff1b08abeafdbd02d3989d7 SHA1 6d2dce4b00a68d95f66b6a53ca2c7395ffd3feb6 SHA256 dcc67eeba323e4c55fdc7ba6a4fa6af6d004157eb3de6f6923cf7fbb6d55393a -DIST freebsd-sys-6.1.tar.bz2 17361671 RMD160 eb19f6a345c665542df694a4f9170d227beaf3b6 SHA1 f9da69cabdaaad268c79670c06ba4fff3e3ef6a8 SHA256 d2ecd79b83ba06c12e358adfccc7e057e15fb7c5be76d92c537b99cbe1d84f0f DIST freebsd-sys-6.2_rc2.tar.bz2 18339807 RMD160 ab2e6110b767319a0135130f9ad16d074de61483 SHA1 f7881f43e815930fe3ef6c3517d4e2475f80479e SHA256 392d80c8dae6b7cddc4810f59869a87ec4d0d699c534d8a034b2b273640a7666 -DIST freebsd-usbin-6.1.tar.bz2 2664570 RMD160 98a87538790a814d0afd35bb0f848bcff574c72d SHA1 c7e6856e7f6bd2d45790737f411348b301944b91 SHA256 70b4a494a72d130d641500bfa857bdf98c9a4a040da2699475902523ba5c374e DIST freebsd-usbin-6.2_rc2.tar.bz2 2696638 RMD160 c907088555c4bba3e4542f69649f6df9dba4fc8a SHA1 b5d65f1d02bcb4fc0aae3649a6b0699b11aee820 SHA256 952f3d8638035b31e65e4374139f49b993b55b88fbbe62ce0dead963ac552b25 -EBUILD freebsd-sbin-6.1.ebuild 2674 RMD160 a7b9fd376419f4e954a53a2f446bf65159b05b0e SHA1 ae76f3eada72bdea52091e028a3e5f4eba5f5c80 SHA256 89d35f3d2c684551015505246ddd683764dbe3bf64715a09d8ff32d21722ff3e -MD5 d23cbdedf334791670d94e16a66de75f freebsd-sbin-6.1.ebuild 2674 -RMD160 a7b9fd376419f4e954a53a2f446bf65159b05b0e freebsd-sbin-6.1.ebuild 2674 -SHA256 89d35f3d2c684551015505246ddd683764dbe3bf64715a09d8ff32d21722ff3e freebsd-sbin-6.1.ebuild 2674 EBUILD freebsd-sbin-6.2_rc2.ebuild 2721 RMD160 dbcc8396ba1671fed97402f0d7859841e62d827d SHA1 36f5d98a3984d3fb92b3c898d224b4926c0c2840 SHA256 9b6f4a6243742c3d0018cc22e57e272875366bb131f3c9ce3a359de255e9b51a MD5 71b73059f0f269dd72888a99f2e0d679 freebsd-sbin-6.2_rc2.ebuild 2721 RMD160 dbcc8396ba1671fed97402f0d7859841e62d827d freebsd-sbin-6.2_rc2.ebuild 2721 SHA256 9b6f4a6243742c3d0018cc22e57e272875366bb131f3c9ce3a359de255e9b51a freebsd-sbin-6.2_rc2.ebuild 2721 -MISC ChangeLog 7787 RMD160 ddf5d80c7caf6626858441d6aaee28a1d02d8646 SHA1 f21bb3fad9bc66e3d689ce513a40dc46eae9c414 SHA256 ec6607940323c46ccaf57a16893e30e03b68c90e22b78bd9d0053ed0c70cee83 -MD5 e8bb7709126380e4b36a9c0df43ce027 ChangeLog 7787 -RMD160 ddf5d80c7caf6626858441d6aaee28a1d02d8646 ChangeLog 7787 -SHA256 ec6607940323c46ccaf57a16893e30e03b68c90e22b78bd9d0053ed0c70cee83 ChangeLog 7787 +MISC ChangeLog 7890 RMD160 f882d6b8b52e7327552c12e6d2f9935bafadbc94 SHA1 6a154387bdc0b1b42cd1cab648a5faf79bbfa85d SHA256 eb0425a0b02e64f84476d52875e78f25f6d6b6dbd2d8a6d8bbaec1a3775f2d25 +MD5 3e27202081e9570cffa2aa7b958196fb ChangeLog 7890 +RMD160 f882d6b8b52e7327552c12e6d2f9935bafadbc94 ChangeLog 7890 +SHA256 eb0425a0b02e64f84476d52875e78f25f6d6b6dbd2d8a6d8bbaec1a3775f2d25 ChangeLog 7890 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata.xml 156 -MD5 4e75ac2f848ef64e1d2a396fb192d017 files/digest-freebsd-sbin-6.1 1804 -RMD160 3ccd7799376ac8413018b151134aa7cf1988cec6 files/digest-freebsd-sbin-6.1 1804 -SHA256 2d3fc4557f330600c1d772ea2f8d811c73c7000a42db804ff7dbd89be9238d9e files/digest-freebsd-sbin-6.1 1804 MD5 610c7a9870dbf301bffeddf26cba883a files/digest-freebsd-sbin-6.2_rc2 1888 RMD160 61e998a2fa9a8e57c914ab65ce4867be5a217cc8 files/digest-freebsd-sbin-6.2_rc2 1888 SHA256 59f5d0cb152bb00cf3c99ff96df04caa34a04970d022f4a5916b7b12ef40bc8d files/digest-freebsd-sbin-6.2_rc2 1888 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFnVA1AiZjviIA2XgRAiHLAJ9mu+ohAIak5z/7RjBfG16qxXScqACfaGld -h8xWqvUGZkfbBCSN8DgIO9w= -=zJ4C +iD8DBQFFnsNrAiZjviIA2XgRAqC1AJ4/ZwHiUEuaMBJJCcHLHg+ne9LgbwCgjxE2 +uDge/2eacWqmCI7vPsXY0Zw= +=9Jv7 -----END PGP SIGNATURE----- diff --git a/sys-freebsd/freebsd-sbin/files/digest-freebsd-sbin-6.1 b/sys-freebsd/freebsd-sbin/files/digest-freebsd-sbin-6.1 deleted file mode 100644 index d95b26b375db..000000000000 --- a/sys-freebsd/freebsd-sbin/files/digest-freebsd-sbin-6.1 +++ /dev/null @@ -1,21 +0,0 @@ -MD5 a04643beb2d94972200d6714688930cf freebsd-contrib-6.1.tar.bz2 36017365 -RMD160 225f6ade032533d08b98b79cb29b75da2a3c74fa freebsd-contrib-6.1.tar.bz2 36017365 -SHA256 41283b7f78597cf81f98477aef04eb9cce2b130b1a2f8b5c7d647549c973c054 freebsd-contrib-6.1.tar.bz2 36017365 -MD5 ac8defbdaaab754fee70ac27c02f2c0e freebsd-etc-6.1.tar.bz2 184045 -RMD160 b9a8bea64694c040c02b74f7633dc3cd77afa400 freebsd-etc-6.1.tar.bz2 184045 -SHA256 62b06b61e526c4a939503202aaca31cbce7a3de9daec03e67dc57119527eeff7 freebsd-etc-6.1.tar.bz2 184045 -MD5 f33af43501169d9167c71c3a48a033c2 freebsd-lib-6.1.tar.bz2 2613584 -RMD160 f71aad95ef2bac094bdab9e317a99fb866fba042 freebsd-lib-6.1.tar.bz2 2613584 -SHA256 6ecb49695dc135e64cea949cb7e9b9998b15cb962797cdafc735a7e244744c37 freebsd-lib-6.1.tar.bz2 2613584 -MD5 244baf5f7ef26dbf33428970913a40f3 freebsd-libexec-6.1.tar.bz2 277860 -RMD160 bef98efbc76812cf36b55067433039f3805cfbab freebsd-libexec-6.1.tar.bz2 277860 -SHA256 38eaddc9edc36597e42ca3c63ee8a2fd6f07f96c7294aea75a9988ac5b07b357 freebsd-libexec-6.1.tar.bz2 277860 -MD5 33a8f60e595bc82c6abb7e47de1b9fa8 freebsd-sbin-6.1.tar.bz2 1156163 -RMD160 167a4545da086f52b9a8fd52e48f9ec6cfdd3150 freebsd-sbin-6.1.tar.bz2 1156163 -SHA256 fb15602238f98f6dd2b9d56bc9ece09c922b0c49599aea87620ba70c853f95d6 freebsd-sbin-6.1.tar.bz2 1156163 -MD5 8893a0a0ddfa8959f71e8ee561a11333 freebsd-sys-6.1.tar.bz2 17361671 -RMD160 eb19f6a345c665542df694a4f9170d227beaf3b6 freebsd-sys-6.1.tar.bz2 17361671 -SHA256 d2ecd79b83ba06c12e358adfccc7e057e15fb7c5be76d92c537b99cbe1d84f0f freebsd-sys-6.1.tar.bz2 17361671 -MD5 ca61245fd3ec21d31ab9e41cd1ad35b7 freebsd-usbin-6.1.tar.bz2 2664570 -RMD160 98a87538790a814d0afd35bb0f848bcff574c72d freebsd-usbin-6.1.tar.bz2 2664570 -SHA256 70b4a494a72d130d641500bfa857bdf98c9a4a040da2699475902523ba5c374e freebsd-usbin-6.1.tar.bz2 2664570 diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-6.1.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-6.1.ebuild deleted file mode 100644 index daf60cce945f..000000000000 --- a/sys-freebsd/freebsd-sbin/freebsd-sbin-6.1.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/freebsd-sbin-6.1.ebuild,v 1.7 2006/10/24 18:29:24 flameeyes Exp $ - -inherit flag-o-matic bsdmk freebsd - -DESCRIPTION="FreeBSD sbin utils" -KEYWORDS="~x86-fbsd" -SLOT="0" - -SRC_URI="mirror://gentoo/${SBIN}.tar.bz2 - mirror://gentoo/${CONTRIB}.tar.bz2 - mirror://gentoo/${LIB}.tar.bz2 - mirror://gentoo/${LIBEXEC}.tar.bz2 - mirror://gentoo/${USBIN}.tar.bz2 - mirror://gentoo/${ETC}.tar.bz2 - build? ( mirror://gentoo/${SYS}.tar.bz2 )" - -RDEPEND="=sys-freebsd/freebsd-lib-${RV}* - =sys-freebsd/freebsd-libexec-${RV}* - ssl? ( dev-libs/openssl ) - sys-libs/readline - sys-process/vixie-cron" -DEPEND="${RDEPEND} - !build? ( =sys-freebsd/freebsd-sources-${RV}* ) - =sys-freebsd/freebsd-mk-defs-${RV}*" - -PROVIDE="virtual/dev-manager" - -S="${WORKDIR}/sbin" - -IUSE="atm ipfilter ipv6 vinum suid ssl build" - -pkg_setup() { - use atm || mymakeopts="${mymakeopts} NO_ATM= " - use ipfilter || mymakeopts="${mymakeopts} NO_IPFILTER= " - use ipv6 || mymakeopts="${mymakeopts} NO_INET6= " - use vinum || mymakeopts="${mymakeopts} NO_VINUM= " - use suid || mymakeopts="${mymakeopts} NO_SUID= " - - # O3 breaks this, apparently - replace-flags -O3 -O2 -} - -REMOVE_SUBDIRS="dhclient pfctl pflogd" - -PATCHES="${FILESDIR}/${PN}-setXid.patch - ${FILESDIR}/${PN}-zlib.patch - ${FILESDIR}/${P}-pr102701.patch" - -src_unpack() { - freebsd_src_unpack - use build || ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" -} - -src_install() { - freebsd_src_install - keepdir /var/log - - # Allow users to use ping and other commands - dodir /bin - mv "${D}/sbin/ping" "${D}/bin/" || die "mv failed" - - newinitd "${FILESDIR}/devd.initd" devd - newinitd "${FILESDIR}/ipfw.initd" ipfw - newinitd "${FILESDIR}/sysctl.initd" sysctl - - # Gentoo devd.conf - # devd_queue is a filter so that only the last event is applied to an - # init script - insinto /etc - newins "${FILESDIR}/devd.conf" devd.conf - exeinto /etc - newexe "${FILESDIR}/devd_queue" devd_queue - - # Do we need pccard.conf if we have devd? - # Maybe ship our own sysctl.conf so things like radvd work out of the box. - cd "${WORKDIR}/etc/" - insinto /etc - doins defaults/pccard.conf minfree sysctl.conf - - # Install a crontab for adjkerntz - insinto /etc/cron.d - newins "${FILESDIR}/adjkerntz-crontab" adjkerntz - - # Install the periodic stuff (needs probably to be ported in a more - # gentooish way) - cd "${WORKDIR}/etc/periodic" - - doperiodic security \ - security/*.ipfwlimit \ - security/*.ip6fwlimit \ - security/*.ip6fwdenied \ - security/*.ipfwdenied - - use ipfilter && doperiodic security \ - security/*.ipf6denied \ - security/*.ipfdenied -} diff --git a/sys-freebsd/freebsd-share/Manifest b/sys-freebsd/freebsd-share/Manifest index ef70edd4a7ab..2ec3acf81aae 100644 --- a/sys-freebsd/freebsd-share/Manifest +++ b/sys-freebsd/freebsd-share/Manifest @@ -9,58 +9,34 @@ AUX freebsd-share-5.4-gentoo-skel.patch 621 RMD160 52351bb7b714bb458304d8547c7b1 MD5 a6c7d6e68b3ee2cd119b5085c37a1e12 files/freebsd-share-5.4-gentoo-skel.patch 621 RMD160 52351bb7b714bb458304d8547c7b113fce622d2e files/freebsd-share-5.4-gentoo-skel.patch 621 SHA256 5480127971c2a5df5faf44355d5ed6a8586923577d37e6cff10805626726c767 files/freebsd-share-5.4-gentoo-skel.patch 621 -AUX freebsd-share-6.0-links.patch 539 RMD160 272e428e61ceb22e204bf82bce94bc808c67f4b3 SHA1 b6642a515e0613e3ccc2779f2b0ab63415869a50 SHA256 4858d5ba24d64ff41111142eeeecdb226703501b7a637b03baa3a7f5d0af9261 -MD5 5b3ed8d353ad16881f8786815724678a files/freebsd-share-6.0-links.patch 539 -RMD160 272e428e61ceb22e204bf82bce94bc808c67f4b3 files/freebsd-share-6.0-links.patch 539 -SHA256 4858d5ba24d64ff41111142eeeecdb226703501b7a637b03baa3a7f5d0af9261 files/freebsd-share-6.0-links.patch 539 -AUX freebsd-share-6.1-utf8.patch 2484 RMD160 bcad74fc43684d86fda70fabed9ef40a46a9f78f SHA1 85349ada744ddde639e633f663cee186649addcf SHA256 05e5270e0425bc3da691001c82518f893d9de844519e94c599f47a3542def7e0 -MD5 6d97bc273e825a24b4254115929c59d1 files/freebsd-share-6.1-utf8.patch 2484 -RMD160 bcad74fc43684d86fda70fabed9ef40a46a9f78f files/freebsd-share-6.1-utf8.patch 2484 -SHA256 05e5270e0425bc3da691001c82518f893d9de844519e94c599f47a3542def7e0 files/freebsd-share-6.1-utf8.patch 2484 -DIST freebsd-bin-6.1.tar.bz2 405680 RMD160 33f2e5b49fce90dcaab652621af3b33e8e80b643 SHA1 83b10732b88c42205b7a8c542f1f9a4a83d82df8 SHA256 86d7a000827432c594f9d37b98a1f936f6168030cf033c6e621a37c670ef5271 DIST freebsd-bin-6.2_rc2.tar.bz2 406726 RMD160 49f94f065296854cf9020426db2d35aa2e1273bb SHA1 2d6eac350f889c123736ddfa171194b163ae7a66 SHA256 8bb7d1028e14dc2b967546e5aa4c18bfe1175cd2d380d6c37452f3b1b7ac637f -DIST freebsd-contrib-6.1.tar.bz2 36017365 RMD160 225f6ade032533d08b98b79cb29b75da2a3c74fa SHA1 adac960daad3f4169874fe0ba1050fe7e906aa23 SHA256 41283b7f78597cf81f98477aef04eb9cce2b130b1a2f8b5c7d647549c973c054 DIST freebsd-contrib-6.2_rc2.tar.bz2 36594463 RMD160 d957a4054073009fe20cc13353797c2dc1aa0eaa SHA1 b93129a87d91e9ef37748337667a68a7530a30c4 SHA256 aeddb53e9dea3da081419be386251c144c63496d769d07b61e9085a3e52c74e0 -DIST freebsd-etc-6.1.tar.bz2 184045 RMD160 b9a8bea64694c040c02b74f7633dc3cd77afa400 SHA1 4a1fff7fa1c77485c5efccf5ab1155e497d1cd82 SHA256 62b06b61e526c4a939503202aaca31cbce7a3de9daec03e67dc57119527eeff7 DIST freebsd-etc-6.2_rc2.tar.bz2 189416 RMD160 e98c8821fc4fbcf2890fcc8155c8fa0f74fd417c SHA1 4fad080351793c84c491407e797e62559245fc40 SHA256 b4f673da45ca646fae9e457c4a8e3255dbe5365445537d4e6ba39ac9b54ee40e -DIST freebsd-gnu-6.1.tar.bz2 867244 RMD160 5eeff2beb898984c40ae1d7c8adfdf41f2c0b8f8 SHA1 93dbfd053132c54b927f6ca5605158b8ccd0f969 SHA256 7bf79a2535539add15da6480830f771e5aea6594c24ffed2d196c7f0c700fdc1 DIST freebsd-gnu-6.2_rc2.tar.bz2 874291 RMD160 9d182b42a407bd690340fe603e4950c6f28b0760 SHA1 b665b72c9763f962990f0b8981f4ec4bbf82393c SHA256 7dac776dfae37bb1d7ab228ac8267aac15dc6ac041961aba8f2d2997875e5481 -DIST freebsd-lib-6.1.tar.bz2 2613584 RMD160 f71aad95ef2bac094bdab9e317a99fb866fba042 SHA1 c7fed3b4a996fdd25f97eef428dd40023dc53a7e SHA256 6ecb49695dc135e64cea949cb7e9b9998b15cb962797cdafc735a7e244744c37 DIST freebsd-lib-6.2_rc2.tar.bz2 2670872 RMD160 bd8b9837acfde404bed998ba3ef5450bb380b779 SHA1 b7df3ad81163558a02e9f4c960f33f8fa3c38106 SHA256 b805264da9f1826d2edb9f5b946ebaae5371fcce146623e4ed695a187c1a4993 -DIST freebsd-sbin-6.1.tar.bz2 1156163 RMD160 167a4545da086f52b9a8fd52e48f9ec6cfdd3150 SHA1 2d3d393b843e071c20fad104bc610948eac6454b SHA256 fb15602238f98f6dd2b9d56bc9ece09c922b0c49599aea87620ba70c853f95d6 DIST freebsd-sbin-6.2_rc2.tar.bz2 1161795 RMD160 85e47cda22e8e5d8eff1b08abeafdbd02d3989d7 SHA1 6d2dce4b00a68d95f66b6a53ca2c7395ffd3feb6 SHA256 dcc67eeba323e4c55fdc7ba6a4fa6af6d004157eb3de6f6923cf7fbb6d55393a -DIST freebsd-share-6.1.tar.bz2 3745745 RMD160 02c0369d9384d83cc22f8e41d7c8f642b9b91b3a SHA1 1b21b5bb2338812cb8443bafeb6ed56e00a231c1 SHA256 e784b691a3df97ac8e2c0399ae48cf13b545cddfe513d3ec47c1656fe4e41f77 DIST freebsd-share-6.2_rc2.tar.bz2 3762566 RMD160 d7e8392c49cd1b5f0989a1b87144cc799ae418fa SHA1 0858ea37090fceffb8d9893b38174f803fa7f544 SHA256 bff220ae3d7ab346494e339270a1c7f173593541db05fd102a1c6e8ef52fdda3 -DIST freebsd-ubin-6.1.tar.bz2 1763218 RMD160 5da58c546cebf30a6b661841dbcb5b53626a4a1e SHA1 7d1b0568d02f192dcd3bd7f972613376d3d0f16d SHA256 13429ed3cc8a14a4efda69b7d82004bf993b5a14591a6129a857d627221aeef6 DIST freebsd-ubin-6.2_rc2.tar.bz2 1773409 RMD160 be5fa09f2b84b77981ba6ae34d2c237b05164776 SHA1 6052972c318830a717cb3f6b72fe034c1a1fe147 SHA256 391d266053323b96a258a264abec848bd0799ded76dcad098b510bd5d9a75398 -DIST freebsd-usbin-6.1.tar.bz2 2664570 RMD160 98a87538790a814d0afd35bb0f848bcff574c72d SHA1 c7e6856e7f6bd2d45790737f411348b301944b91 SHA256 70b4a494a72d130d641500bfa857bdf98c9a4a040da2699475902523ba5c374e DIST freebsd-usbin-6.2_rc2.tar.bz2 2696638 RMD160 c907088555c4bba3e4542f69649f6df9dba4fc8a SHA1 b5d65f1d02bcb4fc0aae3649a6b0699b11aee820 SHA256 952f3d8638035b31e65e4374139f49b993b55b88fbbe62ce0dead963ac552b25 -EBUILD freebsd-share-6.1-r1.ebuild 2032 RMD160 51cc785a48cf3657cb5dd173d5a0f72a501ea280 SHA1 4809824969456352058c0d7bf14f0876da8877fe SHA256 1d2f6d87cf00ec500fa9814b4ec9373945bfadd3220b0cfb25959434a4db1421 -MD5 788a8583f391c747db7d36d328c29baf freebsd-share-6.1-r1.ebuild 2032 -RMD160 51cc785a48cf3657cb5dd173d5a0f72a501ea280 freebsd-share-6.1-r1.ebuild 2032 -SHA256 1d2f6d87cf00ec500fa9814b4ec9373945bfadd3220b0cfb25959434a4db1421 freebsd-share-6.1-r1.ebuild 2032 EBUILD freebsd-share-6.2_rc2.ebuild 2033 RMD160 9b81df4236543df17740a0e8421d118c2c56e2dc SHA1 0754a56f54fc346489069cc6dce73bac15d514f1 SHA256 e5c95b735d1430e40bdbe00d38511d3ebf6c976a81c6a9a7e066beb2c133811e MD5 83017dcb90d4befa28d1dc40ea3ffd47 freebsd-share-6.2_rc2.ebuild 2033 RMD160 9b81df4236543df17740a0e8421d118c2c56e2dc freebsd-share-6.2_rc2.ebuild 2033 SHA256 e5c95b735d1430e40bdbe00d38511d3ebf6c976a81c6a9a7e066beb2c133811e freebsd-share-6.2_rc2.ebuild 2033 -MISC ChangeLog 5248 RMD160 18890f32ae267d615a48b4b97ad10ce0bd34271b SHA1 cf858cb4a2dc8e12042d738e28a39f04da011eff SHA256 6830c1c5b7b2f809321f4a50beddf67cc73fbace03474688a7639110f9166e75 -MD5 f8742e758e5148c87a4880c4f1c71139 ChangeLog 5248 -RMD160 18890f32ae267d615a48b4b97ad10ce0bd34271b ChangeLog 5248 -SHA256 6830c1c5b7b2f809321f4a50beddf67cc73fbace03474688a7639110f9166e75 ChangeLog 5248 +MISC ChangeLog 5432 RMD160 51a0ace7faae3661ef35f7dea48a1a8400ba3cd9 SHA1 40c3d131c2c25d076d3b511244c439904907640a SHA256 1166d931ab6f280e1392291e845a4455fe7ea7777a55000e3fbbd295e319665f +MD5 1fb8cc4c6737168e44a8a8b8960ef55d ChangeLog 5432 +RMD160 51a0ace7faae3661ef35f7dea48a1a8400ba3cd9 ChangeLog 5432 +SHA256 1166d931ab6f280e1392291e845a4455fe7ea7777a55000e3fbbd295e319665f ChangeLog 5432 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata.xml 156 -MD5 9dd683f10a3c5bfcf614a90900b43e57 files/digest-freebsd-share-6.1-r1 2301 -RMD160 1af09cac4e39812f0124e38b0c8142c9e9184127 files/digest-freebsd-share-6.1-r1 2301 -SHA256 3306e2a404841662bed25ff0b656ca44560a631103ca04ce3c351dce6900229a files/digest-freebsd-share-6.1-r1 2301 MD5 853fc730135ddd3ecf4c3def9de18b31 files/digest-freebsd-share-6.2_rc2 2409 RMD160 105c5656d951dc2a58c76499d42b54f522704eb1 files/digest-freebsd-share-6.2_rc2 2409 SHA256 7abc20ca7d35fef3a31c458a58eacb5661de939fe3db0ec2fca10f0e739ff637 files/digest-freebsd-share-6.2_rc2 2409 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) +Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFlTJWAiZjviIA2XgRAogTAKCS1ufT7yiXKsVgwWWEnH+DwYi7bwCeI4Yu -PTXYSSYjDB6cxJ5YefGpZHs= -=KprJ +iD8DBQFFnsOeAiZjviIA2XgRArogAJ482NIbGY+RF5CJ4bMqXNPAYcvUiQCg1bTs +GlRVNWYefnCbf+Uj3ba5V10= +=6I2Q -----END PGP SIGNATURE----- diff --git a/sys-freebsd/freebsd-share/files/digest-freebsd-share-6.1-r1 b/sys-freebsd/freebsd-share/files/digest-freebsd-share-6.1-r1 deleted file mode 100644 index 27102169636e..000000000000 --- a/sys-freebsd/freebsd-share/files/digest-freebsd-share-6.1-r1 +++ /dev/null @@ -1,27 +0,0 @@ -MD5 e8c5589329d476255f8a15f9f9bfebd1 freebsd-bin-6.1.tar.bz2 405680 -RMD160 33f2e5b49fce90dcaab652621af3b33e8e80b643 freebsd-bin-6.1.tar.bz2 405680 -SHA256 86d7a000827432c594f9d37b98a1f936f6168030cf033c6e621a37c670ef5271 freebsd-bin-6.1.tar.bz2 405680 -MD5 a04643beb2d94972200d6714688930cf freebsd-contrib-6.1.tar.bz2 36017365 -RMD160 225f6ade032533d08b98b79cb29b75da2a3c74fa freebsd-contrib-6.1.tar.bz2 36017365 -SHA256 41283b7f78597cf81f98477aef04eb9cce2b130b1a2f8b5c7d647549c973c054 freebsd-contrib-6.1.tar.bz2 36017365 -MD5 ac8defbdaaab754fee70ac27c02f2c0e freebsd-etc-6.1.tar.bz2 184045 -RMD160 b9a8bea64694c040c02b74f7633dc3cd77afa400 freebsd-etc-6.1.tar.bz2 184045 -SHA256 62b06b61e526c4a939503202aaca31cbce7a3de9daec03e67dc57119527eeff7 freebsd-etc-6.1.tar.bz2 184045 -MD5 986fe1e300d5d0d89180eb9559f87334 freebsd-gnu-6.1.tar.bz2 867244 -RMD160 5eeff2beb898984c40ae1d7c8adfdf41f2c0b8f8 freebsd-gnu-6.1.tar.bz2 867244 -SHA256 7bf79a2535539add15da6480830f771e5aea6594c24ffed2d196c7f0c700fdc1 freebsd-gnu-6.1.tar.bz2 867244 -MD5 f33af43501169d9167c71c3a48a033c2 freebsd-lib-6.1.tar.bz2 2613584 -RMD160 f71aad95ef2bac094bdab9e317a99fb866fba042 freebsd-lib-6.1.tar.bz2 2613584 -SHA256 6ecb49695dc135e64cea949cb7e9b9998b15cb962797cdafc735a7e244744c37 freebsd-lib-6.1.tar.bz2 2613584 -MD5 33a8f60e595bc82c6abb7e47de1b9fa8 freebsd-sbin-6.1.tar.bz2 1156163 -RMD160 167a4545da086f52b9a8fd52e48f9ec6cfdd3150 freebsd-sbin-6.1.tar.bz2 1156163 -SHA256 fb15602238f98f6dd2b9d56bc9ece09c922b0c49599aea87620ba70c853f95d6 freebsd-sbin-6.1.tar.bz2 1156163 -MD5 87e50c5ad62ac4c2e062c5a05b6709f3 freebsd-share-6.1.tar.bz2 3745745 -RMD160 02c0369d9384d83cc22f8e41d7c8f642b9b91b3a freebsd-share-6.1.tar.bz2 3745745 -SHA256 e784b691a3df97ac8e2c0399ae48cf13b545cddfe513d3ec47c1656fe4e41f77 freebsd-share-6.1.tar.bz2 3745745 -MD5 f9c5fe01da2eba4696619c63eb4cad8c freebsd-ubin-6.1.tar.bz2 1763218 -RMD160 5da58c546cebf30a6b661841dbcb5b53626a4a1e freebsd-ubin-6.1.tar.bz2 1763218 -SHA256 13429ed3cc8a14a4efda69b7d82004bf993b5a14591a6129a857d627221aeef6 freebsd-ubin-6.1.tar.bz2 1763218 -MD5 ca61245fd3ec21d31ab9e41cd1ad35b7 freebsd-usbin-6.1.tar.bz2 2664570 -RMD160 98a87538790a814d0afd35bb0f848bcff574c72d freebsd-usbin-6.1.tar.bz2 2664570 -SHA256 70b4a494a72d130d641500bfa857bdf98c9a4a040da2699475902523ba5c374e freebsd-usbin-6.1.tar.bz2 2664570 diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-6.0-links.patch b/sys-freebsd/freebsd-share/files/freebsd-share-6.0-links.patch deleted file mode 100644 index a79b44377dec..000000000000 --- a/sys-freebsd/freebsd-share/files/freebsd-share-6.0-links.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: fbsd-6/share/colldef/Makefile -=================================================================== ---- fbsd-6.orig/share/colldef/Makefile -+++ fbsd-6/share/colldef/Makefile -@@ -98,8 +98,8 @@ SYMLINKS= - .for enc1 in ${ENCODINGS} - .for enc2 in ${ENCODINGS} - .for lang_terr in ${${enc1}_${enc2}} --SYMLINKS+= ../${lang_terr:C/:.*$//}.${enc1}/${FILESNAME} \ -- ${LOCALEDIR}/${lang_terr:C/^.*://}.${enc2} -+#SYMLINKS+= ../${lang_terr:C/:.*$//}.${enc1}/${FILESNAME} \ -+# ${LOCALEDIR}/${lang_terr:C/^.*://}.${enc2} - .endfor - .endfor - .endfor diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-6.1-utf8.patch b/sys-freebsd/freebsd-share/files/freebsd-share-6.1-utf8.patch deleted file mode 100644 index e7423a24aca3..000000000000 --- a/sys-freebsd/freebsd-share/files/freebsd-share-6.1-utf8.patch +++ /dev/null @@ -1,81 +0,0 @@ ---- UTF-8.src.orig Sat Mar 27 03:14:14 2004 -+++ UTF-8.src Mon Jun 26 23:15:34 2006 -@@ -487,9 +487,9 @@ - * U+0300 - U+036F : Combining Diacritical Marks - */ - --GRAPH 0x0300 - 0x034f 0x0360 - 0x036f --PRINT 0x0300 - 0x034f 0x0360 - 0x036f --SWIDTH1 0x0300 - 0x034f 0x0360 - 0x036f -+GRAPH 0x0300 - 0x036f -+PRINT 0x0300 - 0x036f -+SWIDTH0 0x0300 - 0x036f - - MAPUPPER < 0x0345 0x0399 > - -@@ -593,7 +593,8 @@ - UPPER 0x04e2 0x04e4 0x04e6 0x04e8 0x04ea 0x04ec 0x04ee - UPPER 0x04f0 0x04f2 0x04f4 0x04f8 - PRINT 0x0400 - 0x0486 0x0488 - 0x04ce 0x04d0 - 0x04f5 0x04f8 0x04f9 --SWIDTH1 0x0400 - 0x0486 0x0488 - 0x04ce 0x04d0 - 0x04f5 0x04f8 0x04f9 -+SWIDTH1 0x0400 - 0x0482 0x048a - 0x04ce 0x04d0 - 0x04f5 0x04f8 0x04f9 -+SWIDTH0 0x0483 - 0x0486 0x0488 - 0x0489 - - MAPUPPER < 0x0430 - 0x044f : 0x0410 > - MAPUPPER < 0x0450 - 0x045f : 0x0400 > -@@ -1016,7 +1017,8 @@ - GRAPH 0x0e01 - 0x0e3a 0x0e3f - 0x0e5b - PUNCT 0x0e3f 0x0e4f 0x0e5a 0x0e5b - PRINT 0x0e01 - 0x0e3a 0x0e3f - 0x0e5b --SWIDTH1 0x0e01 - 0x0e3a 0x0e3f - 0x0e5b -+SWIDTH0 0x0e31 0x0e34 - 0x0e3a 0x0e47 - 0x0e4e -+SWIDTH1 0x0e01 - 0x0e30 0x0e32 - 0x0e33 0x0e3f - 0x0e46 0x0e4f - 0x0e5b - - - /* -@@ -1647,9 +1649,9 @@ - * U+20D0 - U+20FF : Combining Diacritical Marks for Symbols - */ - --GRAPH 0x20d0 - 0x20ea --PRINT 0x20d0 - 0x20ea --SWIDTH1 0x20d0 - 0x20ea -+GRAPH 0x20d0 - 0x20ff -+PRINT 0x20d0 - 0x20ff -+SWIDTH0 0x20d0 - 0x20ff - - - /* -@@ -1927,7 +1929,8 @@ - PUNCT 0x309b 0x309c - PRINT 0x3041 - 0x3096 0x3099 - 0x309f - PHONOGRAM 0x3041 - 0x3096 0x309f --SWIDTH2 0x3041 - 0x3096 0x3099 - 0x309f -+SWIDTH2 0x3041 - 0x3096 0x309b - 0x309f -+SWIDTH0 0x3099 - 0x309a - - - /* -@@ -2149,9 +2152,9 @@ - * U+FE20 - U+FE2F : Combining Half Marks - */ - --GRAPH 0xfe20 - 0xfe23 --PRINT 0xfe20 - 0xfe23 --SWIDTH1 0xfe20 - 0xfe23 -+GRAPH 0xfe20 - 0xfe2f -+PRINT 0xfe20 - 0xfe2f -+SWIDTH0 0xfe20 - 0xfe2f - - - /* -@@ -2272,7 +2275,8 @@ - PUNCT 0x1d100 - 0x1d126 0x1d12a - 0x1d164 0x1d16a - 0x1d16c - PUNCT 0x1d183 0x1d184 0x1d18c - 0x1d1a9 0x1d1ae - 0x1d1dd - PRINT 0x1d100 - 0x1d126 0x1d12a - 0x1d172 0x1d17b - 0x1d1dd --SWIDTH1 0x1d100 - 0x1d126 0x1d12a - 0x1d172 0x1d17b - 0x1d1dd -+SWIDTH1 0x1d100 - 0x1d126 0x1d12a - 0x1d164 0x1d16a - 0x1d172 0x1d183 0x1d184 0x1d18c - 0x1d1a9 0x1d1ae - 0x1d1dd -+SWIDTH0 0x1d165 - 0x1d169 0x1d17b - 0x1d182 0x1d185 - 0x1d18b 0x1d1aa - 0x1d1ad - - - /* diff --git a/sys-freebsd/freebsd-share/freebsd-share-6.1-r1.ebuild b/sys-freebsd/freebsd-share/freebsd-share-6.1-r1.ebuild deleted file mode 100644 index f9ccce6a09c7..000000000000 --- a/sys-freebsd/freebsd-share/freebsd-share-6.1-r1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/freebsd-share-6.1-r1.ebuild,v 1.1 2006/07/18 21:13:32 flameeyes Exp $ - -inherit bsdmk freebsd - -DESCRIPTION="FreeBSD shared tools/files" -SLOT="0" -KEYWORDS="~x86-fbsd" - -IUSE="doc isdn" - -SRC_URI="mirror://gentoo/${SHARE}.tar.bz2 - mirror://gentoo/${CONTRIB}.tar.bz2 - mirror://gentoo/${GNU}.tar.bz2 - mirror://gentoo/${UBIN}.tar.bz2 - mirror://gentoo/${USBIN}.tar.bz2 - mirror://gentoo/${SBIN}.tar.bz2 - mirror://gentoo/${BIN}.tar.bz2 - mirror://gentoo/${LIB}.tar.bz2 - mirror://gentoo/${ETC}.tar.bz2" - -DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*" -RDEPEND="" - -RESTRICT="nostrip" - -S="${WORKDIR}/share" - -pkg_setup() { - use isdn || mymakeopts="${mymakeopts} NO_I4B= " - use doc || mymakeopts="${mymakeopts} NO_SHAREDOCS= " - - mymakeopts="${mymakeopts} NO_SENDMAIL= " -} - -REMOVE_SUBDIRS="mk termcap zoneinfo tabset" - -PATCHES="${FILESDIR}/${PN}-5.3-doc-locations.patch - ${FILESDIR}/${PN}-5.4-gentoo-skel.patch" - -src_unpack() { - freebsd_src_unpack - - # Remove make.conf manpage as it describes bsdmk's make.conf. - sed -i -e 's:make.conf.5::' "${S}/man/man5/Makefile" - # Don't install the arch-specific directories in subdirectories - sed -i -e '/MANSUBDIR/d' "${S}"/man/man4/man4.{alpha,i386,sparc64}/Makefile - - cd "${S}/mklocale" - # See http://opal.com/freebsd/unicode.html - epatch "${FILESDIR}/${P}-utf8.patch" - - # Remove them so that they can't be included by error - rm -rf "${S}"/mk/*.mk - - # Change the order, colldef has to go after mklocale or it creates symlinks - # with the names of directories - sed -i -e 's:colldef::' -e 's:mklocale:mklocale colldef:' "${S}/Makefile" -} - -src_compile() { - export ESED="/usr/bin/sed" - - # This is a groff problem and not a -shared problem. - export GROFF_TMAC_PATH="/usr/share/tmac/:/usr/share/groff/1.19.1/tmac/" - mkmake || die "emake failed" -} - -src_install() { - mkmake DESTDIR="${D}" DOCDIR=/usr/share/doc/${PF} install || die "Install failed" -} diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest index acd30f148363..6b6410beeffb 100644 --- a/sys-freebsd/freebsd-sources/Manifest +++ b/sys-freebsd/freebsd-sources/Manifest @@ -1,10 +1,6 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX SA-06-16-smbfs.patch 874 RMD160 73c3680d7ed5c452c4160105baf1407e69b71eee SHA1 f6157a02e0cfdcdc2f3fceed56a15f451ba219ac SHA256 73dab3542ffb63818151b9d6fe21d6d0b0734da992c76d80525b711d02efaee6 -MD5 05e64e6f86c3e33185f6a1a0d2ccddf4 files/SA-06-16-smbfs.patch 874 -RMD160 73c3680d7ed5c452c4160105baf1407e69b71eee files/SA-06-16-smbfs.patch 874 -SHA256 73dab3542ffb63818151b9d6fe21d6d0b0734da992c76d80525b711d02efaee6 files/SA-06-16-smbfs.patch 874 AUX freebsd-sources-6.0-asm.patch 4172 RMD160 7872cbedbbe9fbead0d69f26674489b335317606 SHA1 350d5453ec523a6835ff7ad36bcff7f3bc7dce3f SHA256 2431b2dae991eef15c00c3e19ac01e23e374a1e8e6992053e64486032631b52e MD5 d7ba170be5603b2bc377cbd544c82a23 files/freebsd-sources-6.0-asm.patch 4172 RMD160 7872cbedbbe9fbead0d69f26674489b335317606 files/freebsd-sources-6.0-asm.patch 4172 @@ -17,18 +13,6 @@ AUX freebsd-sources-6.0-werror.patch 898 RMD160 41a6f582a70018f29c96c08a5853bcbf MD5 1c230261604f76eb3766df9769864942 files/freebsd-sources-6.0-werror.patch 898 RMD160 41a6f582a70018f29c96c08a5853bcbf167157d0 files/freebsd-sources-6.0-werror.patch 898 SHA256 7fbd139296e98697c94dcc6a4cd4d926b057779cb2415cb62bbb881b8acf26e5 files/freebsd-sources-6.0-werror.patch 898 -AUX freebsd-sources-6.1-devfs-deadlock.patch 4616 RMD160 85ce3ae845c435d5b50a4e820a9e3f9f364f7dde SHA1 99c7a0c61f9dbd31890865b6e86e01a71de67462 SHA256 196652d16339a1fe6c934c889c40eec78ed668c0fc2f253fed819587a7755825 -MD5 0e514494ce056f722aca5e98ff951916 files/freebsd-sources-6.1-devfs-deadlock.patch 4616 -RMD160 85ce3ae845c435d5b50a4e820a9e3f9f364f7dde files/freebsd-sources-6.1-devfs-deadlock.patch 4616 -SHA256 196652d16339a1fe6c934c889c40eec78ed668c0fc2f253fed819587a7755825 files/freebsd-sources-6.1-devfs-deadlock.patch 4616 -AUX freebsd-sources-6.1-gcc41.patch 16013 RMD160 c259aec856d5d4b68682138c7b1112e60b6814fa SHA1 5a0e61de9dde00279d36425cc451a2e0af1b38ae SHA256 d5b702657dae7e30774c4222094166334e5e466ccc5307a92992ed8df29e6b05 -MD5 8effd8101607ae4f84a9621e57f1ae2f files/freebsd-sources-6.1-gcc41.patch 16013 -RMD160 c259aec856d5d4b68682138c7b1112e60b6814fa files/freebsd-sources-6.1-gcc41.patch 16013 -SHA256 d5b702657dae7e30774c4222094166334e5e466ccc5307a92992ed8df29e6b05 files/freebsd-sources-6.1-gcc41.patch 16013 -AUX freebsd-sources-6.1-intrcnt.patch 800 RMD160 b6f36e51dc8267537af828c808b4502db452378e SHA1 a07cd296f1a545c5734750627206bc638b88b275 SHA256 24cd3cbd09852fe08d272eff1d8d335d4975489857669e74aae8c63a7019bd08 -MD5 b9280c2eeae04a5afa38fbf6505f6120 files/freebsd-sources-6.1-intrcnt.patch 800 -RMD160 b6f36e51dc8267537af828c808b4502db452378e files/freebsd-sources-6.1-intrcnt.patch 800 -SHA256 24cd3cbd09852fe08d272eff1d8d335d4975489857669e74aae8c63a7019bd08 files/freebsd-sources-6.1-intrcnt.patch 800 AUX freebsd-sources-6.1-ntfs.patch 1043 RMD160 0389ef971934db5b239d81ec016d94a21398c226 SHA1 03d8c702bbd6bd79f7b3cbe64f720487b87fa442 SHA256 2eb0e22bea267d7ac41c3dec81682d3cc1f1744316ea39342e2aaae1f2dca469 MD5 ea9ee941c9105bed2e9d226450087ee1 files/freebsd-sources-6.1-ntfs.patch 1043 RMD160 0389ef971934db5b239d81ec016d94a21398c226 files/freebsd-sources-6.1-ntfs.patch 1043 @@ -45,41 +29,26 @@ AUX freebsd-sources-gentoo.patch 1191 RMD160 1c8ce1849d767a995f075fe43b7313b341b MD5 91662a80d0cd0cd3dca34f3c1ca54830 files/freebsd-sources-gentoo.patch 1191 RMD160 1c8ce1849d767a995f075fe43b7313b341bd0805 files/freebsd-sources-gentoo.patch 1191 SHA256 e5e7186858259e7d6d21e925dde640a68b27255cf69ab089ee82675568e7d9a7 files/freebsd-sources-gentoo.patch 1191 -DIST freebsd-sys-6.1.tar.bz2 17361671 RMD160 eb19f6a345c665542df694a4f9170d227beaf3b6 SHA1 f9da69cabdaaad268c79670c06ba4fff3e3ef6a8 SHA256 d2ecd79b83ba06c12e358adfccc7e057e15fb7c5be76d92c537b99cbe1d84f0f DIST freebsd-sys-6.2_rc2.tar.bz2 18339807 RMD160 ab2e6110b767319a0135130f9ad16d074de61483 SHA1 f7881f43e815930fe3ef6c3517d4e2475f80479e SHA256 392d80c8dae6b7cddc4810f59869a87ec4d0d699c534d8a034b2b273640a7666 -EBUILD freebsd-sources-6.1-r3.ebuild 2419 RMD160 0b883b91a5c9e6c4cd5139fb16982e4b00696a5b SHA1 9bbf8a010ea090eebcf64e204defc628289f65bc SHA256 bb0fa9e58602f70288ceb22f27f603bfb997686f48ddbc03e821abfa07f36e57 -MD5 242afb82662fb880568a677072a59eb9 freebsd-sources-6.1-r3.ebuild 2419 -RMD160 0b883b91a5c9e6c4cd5139fb16982e4b00696a5b freebsd-sources-6.1-r3.ebuild 2419 -SHA256 bb0fa9e58602f70288ceb22f27f603bfb997686f48ddbc03e821abfa07f36e57 freebsd-sources-6.1-r3.ebuild 2419 -EBUILD freebsd-sources-6.1-r4.ebuild 2572 RMD160 d7ee3293d2bc651367b669154690ef59ae31e55e SHA1 15129e9f0a8ce018da10fb8e0b2a95a73c9143fc SHA256 926542fbef0bb45f7f5e24b8bcb8844f91e78ca4ad4af9b29fd3f0d013a60448 -MD5 8cf11566c5e1e2d0dc534d606ef1b74f freebsd-sources-6.1-r4.ebuild 2572 -RMD160 d7ee3293d2bc651367b669154690ef59ae31e55e freebsd-sources-6.1-r4.ebuild 2572 -SHA256 926542fbef0bb45f7f5e24b8bcb8844f91e78ca4ad4af9b29fd3f0d013a60448 freebsd-sources-6.1-r4.ebuild 2572 EBUILD freebsd-sources-6.2_rc2.ebuild 2704 RMD160 167582989f1d0dc6a2f0c20182b15d5c82894976 SHA1 9e0d7872671def56029e91484f47d8ce564efd20 SHA256 4f2f97bde2aa424321572a1327a76f891e2aef8de552ee568178f9bbe562a9d1 MD5 d82ed8fe4afba9c1c1cf79b5ae752e35 freebsd-sources-6.2_rc2.ebuild 2704 RMD160 167582989f1d0dc6a2f0c20182b15d5c82894976 freebsd-sources-6.2_rc2.ebuild 2704 SHA256 4f2f97bde2aa424321572a1327a76f891e2aef8de552ee568178f9bbe562a9d1 freebsd-sources-6.2_rc2.ebuild 2704 -MISC ChangeLog 9599 RMD160 cf4e72856825e54519fb34f55aec432dcfcb7015 SHA1 24f25997f0b8bda9a34bc2132fefbc6863c682be SHA256 95ee1419723087444819964a8be133f9185799c8a1fee1950f441d22ce01f250 -MD5 a88adca42493037dd5ee60788f7cd2cb ChangeLog 9599 -RMD160 cf4e72856825e54519fb34f55aec432dcfcb7015 ChangeLog 9599 -SHA256 95ee1419723087444819964a8be133f9185799c8a1fee1950f441d22ce01f250 ChangeLog 9599 +MISC ChangeLog 9906 RMD160 390e3004bf14377e59588e9ec017ca6be92b0f3a SHA1 58dbc15441e24d61d51ef39a82a8e84d2a2b6e2d SHA256 83bed4ade3449bb4bba2c42f331b3f7200d241982efb8f655479ef60ebd499cc +MD5 1f0fc43f3d53be2dd4d7619d09a5c47e ChangeLog 9906 +RMD160 390e3004bf14377e59588e9ec017ca6be92b0f3a ChangeLog 9906 +SHA256 83bed4ade3449bb4bba2c42f331b3f7200d241982efb8f655479ef60ebd499cc ChangeLog 9906 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata.xml 156 -MD5 bfcb2966c1ec6e468c2575c36179479c files/digest-freebsd-sources-6.1-r3 256 -RMD160 e3e91956a4a0e172a5a548c6b069c24f9864b6d9 files/digest-freebsd-sources-6.1-r3 256 -SHA256 a390411c7d0ce30970aac523a261176bf7fcb5235d6f782156ec5d52ddc382a1 files/digest-freebsd-sources-6.1-r3 256 -MD5 bfcb2966c1ec6e468c2575c36179479c files/digest-freebsd-sources-6.1-r4 256 -RMD160 e3e91956a4a0e172a5a548c6b069c24f9864b6d9 files/digest-freebsd-sources-6.1-r4 256 -SHA256 a390411c7d0ce30970aac523a261176bf7fcb5235d6f782156ec5d52ddc382a1 files/digest-freebsd-sources-6.1-r4 256 MD5 01d8ed45fdfb6302d9c0eed993e27af6 files/digest-freebsd-sources-6.2_rc2 268 RMD160 d5dd02eba1b950dbedb23d6427c0d85a4e049a48 files/digest-freebsd-sources-6.2_rc2 268 SHA256 8226d3e88265ffaf04923b5ca63c0d6d2976af1bb7ba329608a66a9ab48993a8 files/digest-freebsd-sources-6.2_rc2 268 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) +Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFlTJ2AiZjviIA2XgRAsYaAKDoX7kclclL89kE8UabVZxFVLHuSgCgy1qS -8qkilGI/CtajPUVFxSZaiDM= -=+kU5 +iD8DBQFFnsPAAiZjviIA2XgRAj8gAKDvQYh3636KN2pyKyogE+nMFWyjrACfYeHB +AD9c3YUgnYKvZ6MhOoL2VvA= +=h6zd -----END PGP SIGNATURE----- diff --git a/sys-freebsd/freebsd-sources/files/SA-06-16-smbfs.patch b/sys-freebsd/freebsd-sources/files/SA-06-16-smbfs.patch deleted file mode 100644 index 826af157b273..000000000000 --- a/sys-freebsd/freebsd-sources/files/SA-06-16-smbfs.patch +++ /dev/null @@ -1,27 +0,0 @@ -Index: sys/fs/smbfs/smbfs_vnops.c -=================================================================== -RCS file: /home/ncvs/src/sys/fs/smbfs/smbfs_vnops.c,v -retrieving revision 1.61 -diff -u -I__FBSDID -r1.61 smbfs_vnops.c ---- sys/fs/smbfs/smbfs_vnops.c 13 Apr 2005 10:59:08 -0000 1.61 -+++ sys/fs/smbfs/smbfs_vnops.c 27 May 2006 10:18:33 -0000 -@@ -1018,11 +1018,18 @@ - static int - smbfs_pathcheck(struct smbmount *smp, const char *name, int nmlen, int nameiop) - { -- static const char *badchars = "*/\\:<>;?"; -+ static const char *badchars = "*/:<>;?"; - static const char *badchars83 = " +|,[]="; - const char *cp; - int i, error; - -+ /* -+ * Backslash characters, being a path delimiter, are prohibited -+ * within a path component even for LOOKUP operations. -+ */ -+ if (index(name, '\\') != NULL) -+ return ENOENT; -+ - if (nameiop == LOOKUP) - return 0; - error = ENOENT; diff --git a/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.1-r3 b/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.1-r3 deleted file mode 100644 index ed81a3f45c74..000000000000 --- a/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.1-r3 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 8893a0a0ddfa8959f71e8ee561a11333 freebsd-sys-6.1.tar.bz2 17361671 -RMD160 eb19f6a345c665542df694a4f9170d227beaf3b6 freebsd-sys-6.1.tar.bz2 17361671 -SHA256 d2ecd79b83ba06c12e358adfccc7e057e15fb7c5be76d92c537b99cbe1d84f0f freebsd-sys-6.1.tar.bz2 17361671 diff --git a/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.1-r4 b/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.1-r4 deleted file mode 100644 index ed81a3f45c74..000000000000 --- a/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.1-r4 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 8893a0a0ddfa8959f71e8ee561a11333 freebsd-sys-6.1.tar.bz2 17361671 -RMD160 eb19f6a345c665542df694a4f9170d227beaf3b6 freebsd-sys-6.1.tar.bz2 17361671 -SHA256 d2ecd79b83ba06c12e358adfccc7e057e15fb7c5be76d92c537b99cbe1d84f0f freebsd-sys-6.1.tar.bz2 17361671 diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.1-devfs-deadlock.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.1-devfs-deadlock.patch deleted file mode 100644 index 016bdb9d1f19..000000000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.1-devfs-deadlock.patch +++ /dev/null @@ -1,165 +0,0 @@ -diff -Naur devfs/devfs.h devfsb/devfs.h ---- fs/devfs/devfs.h 2006-08-18 17:23:00 +0000 -+++ fs/devfsb/devfs.h 2006-09-03 19:34:57 +0000 -@@ -163,7 +163,7 @@ - void devfs_rules_apply(struct devfs_mount *dm, struct devfs_dirent *de); - void devfs_rules_cleanup (struct devfs_mount *dm); - int devfs_rules_ioctl(struct devfs_mount *dm, u_long cmd, caddr_t data, struct thread *td); --int devfs_allocv (struct devfs_dirent *de, struct mount *mp, struct vnode **vpp, struct thread *td); -+int devfs_allocv (struct devfs_dirent *de, struct mount *mp, struct vnode **vpp, int *dm_unlock, struct thread *td); - struct cdev **devfs_itod (int inode); - struct devfs_dirent **devfs_itode (struct devfs_mount *dm, int inode); - void devfs_delete(struct devfs_mount *dm, struct devfs_dirent *de); -diff -Naur devfs/devfs_vfsops.c devfsb/devfs_vfsops.c ---- fs/devfs/devfs_vfsops.c 2006-08-18 17:23:00 +0000 -+++ fs/devfsb/devfs_vfsops.c 2006-09-03 19:34:57 +0000 -@@ -139,9 +139,11 @@ - int error; - struct vnode *vp; - struct devfs_mount *dmp; -+ int dm_unlock; - - dmp = VFSTODEVFS(mp); -- error = devfs_allocv(dmp->dm_rootdir, mp, &vp, td); -+ dm_unlock = 0; -+ error = devfs_allocv(dmp->dm_rootdir, mp, &vp, &dm_unlock, td); - if (error) - return (error); - vp->v_vflag |= VV_ROOT; -diff -Naur devfs/devfs_vnops.c devfsb/devfs_vnops.c ---- fs/devfs/devfs_vnops.c 2006-08-18 17:23:00 +0000 -+++ fs/devfsb/devfs_vnops.c 2006-09-03 19:34:57 +0000 -@@ -124,16 +124,23 @@ - } - - int --devfs_allocv(struct devfs_dirent *de, struct mount *mp, struct vnode **vpp, struct thread *td) -+devfs_allocv(struct devfs_dirent *de, struct mount *mp, struct vnode **vpp, -+ int *dm_unlock, struct thread *td) - { - int error; - struct vnode *vp; - struct cdev *dev; -+ struct devfs_mount *dmp; - - KASSERT(td == curthread, ("devfs_allocv: td != curthread")); -+ dmp = VFSTODEVFS(mp); - loop: - vp = de->de_vnode; - if (vp != NULL) { -+ if (*dm_unlock) { -+ sx_xunlock(&dmp->dm_lock); -+ *dm_unlock = 0; -+ } - if (vget(vp, LK_EXCLUSIVE, td)) - goto loop; - *vpp = vp; -@@ -173,6 +180,10 @@ - } - vp->v_data = de; - de->de_vnode = vp; -+ if (*dm_unlock) { -+ sx_xunlock(&dmp->dm_lock); -+ *dm_unlock = 0; -+ } - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - #ifdef MAC - mac_associate_vnode_devfs(mp, de, vp); -@@ -453,7 +464,7 @@ - } - - static int --devfs_lookupx(struct vop_lookup_args *ap) -+devfs_lookupx(struct vop_lookup_args *ap, int *dm_unlock) - { - struct componentname *cnp; - struct vnode *dvp, **vpp; -@@ -504,7 +515,7 @@ - de = TAILQ_FIRST(&dd->de_dlist); /* "." */ - de = TAILQ_NEXT(de, de_list); /* ".." */ - de = de->de_dir; -- error = devfs_allocv(de, dvp->v_mount, vpp, td); -+ error = devfs_allocv(de, dvp->v_mount, vpp, dm_unlock, td); - vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY, td); - return (error); - } -@@ -561,7 +572,7 @@ - return (0); - } - } -- error = devfs_allocv(de, dvp->v_mount, vpp, td); -+ error = devfs_allocv(de, dvp->v_mount, vpp, dm_unlock, td); - return (error); - } - -@@ -570,11 +581,14 @@ - { - int j; - struct devfs_mount *dmp; -+ int dm_unlock; - - dmp = VFSTODEVFS(ap->a_dvp->v_mount); -+ dm_unlock = 1; - sx_xlock(&dmp->dm_lock); -- j = devfs_lookupx(ap); -- sx_xunlock(&dmp->dm_lock); -+ j = devfs_lookupx(ap, &dm_unlock); -+ if (dm_unlock == 1) -+ sx_xunlock(&dmp->dm_lock); - return (j); - } - -@@ -586,6 +600,7 @@ - struct thread *td; - struct devfs_dirent *dd, *de; - struct devfs_mount *dmp; -+ int dm_unlock; - int error; - - /* -@@ -597,6 +612,7 @@ - dvp = ap->a_dvp; - dmp = VFSTODEVFS(dvp->v_mount); - sx_xlock(&dmp->dm_lock); -+ dm_unlock = 1; - - cnp = ap->a_cnp; - vpp = ap->a_vpp; -@@ -617,9 +633,10 @@ - if (de == NULL) - goto notfound; - de->de_flags &= ~DE_WHITEOUT; -- error = devfs_allocv(de, dvp->v_mount, vpp, td); -+ error = devfs_allocv(de, dvp->v_mount, vpp, &dm_unlock, td); - notfound: -- sx_xunlock(&dmp->dm_lock); -+ if (dm_unlock == 1) -+ sx_xunlock(&dmp->dm_lock); - return (error); - } - -@@ -1101,6 +1118,7 @@ - struct devfs_dirent *de; - struct devfs_mount *dmp; - struct thread *td; -+ int dm_unlock; - - td = ap->a_cnp->cn_thread; - KASSERT(td == curthread, ("devfs_symlink: td != curthread")); -@@ -1119,12 +1137,14 @@ - de->de_symlink = malloc(i, M_DEVFS, M_WAITOK); - bcopy(ap->a_target, de->de_symlink, i); - sx_xlock(&dmp->dm_lock); -+ dm_unlock = 1; - #ifdef MAC - mac_create_devfs_symlink(ap->a_cnp->cn_cred, dmp->dm_mount, dd, de); - #endif - TAILQ_INSERT_TAIL(&dd->de_dlist, de, de_list); -- devfs_allocv(de, ap->a_dvp->v_mount, ap->a_vpp, td); -- sx_xunlock(&dmp->dm_lock); -+ devfs_allocv(de, ap->a_dvp->v_mount, ap->a_vpp, &dm_unlock, td); -+ if (dm_unlock == 1) -+ sx_xunlock(&dmp->dm_lock); - return (0); - } - diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.1-gcc41.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.1-gcc41.patch deleted file mode 100644 index 6e92a100f1de..000000000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.1-gcc41.patch +++ /dev/null @@ -1,506 +0,0 @@ -diff -ru sys.orig/conf/kern.pre.mk sys-gcc4.1/conf/kern.pre.mk ---- sys/conf/kern.pre.mk 2006-06-11 08:30:14 -0300 -+++ sys-gcc4.1/conf/kern.pre.mk 2006-06-10 21:53:27 -0300 -@@ -46,7 +46,7 @@ - NOSTDINC= -nostdinc - .endif - --INCLUDES= ${NOSTDINC} -I- ${INCLMAGIC} -I. -I$S -+INCLUDES= ${NOSTDINC} ${INCLMAGIC} -I. -I$S - - # This hack lets us use the OpenBSD altq code without spamming a new - # include path into contrib'ed source files. -diff -ru sys/conf/kmod.mk sys-gcc4.1/conf/kmod.mk ---- sys/conf/kmod.mk 2006-06-11 08:30:14 -0300 -+++ sys-gcc4.1/conf/kmod.mk 2006-06-09 13:22:22 -0300 -@@ -87,7 +87,7 @@ - .else - NOSTDINC= -nostdinc - .endif --CFLAGS:= ${CFLAGS:N-I*} ${NOSTDINC} -I- ${INCLMAGIC} ${CFLAGS:M-I*} -+CFLAGS:= ${CFLAGS:N-I*} ${NOSTDINC} ${INCLMAGIC} ${CFLAGS:M-I*} - .if defined(KERNBUILDDIR) - CFLAGS+= -DHAVE_KERNEL_OPTION_HEADERS -include ${KERNBUILDDIR}/opt_global.h - .endif -diff -ru sys/ddb/db_command.c sys-gcc4.1/ddb/db_command.c ---- sys/ddb/db_command.c 2005-10-25 17:10:56 -0300 -+++ sys-gcc4.1/ddb/db_command.c 2006-06-09 22:26:53 -0300 -@@ -75,7 +75,7 @@ - static db_cmdfcn_t db_watchdog; - - /* XXX this is actually forward-static. */ --extern struct command db_show_cmds[]; -+static struct command db_show_cmds[]; - - /* - * if 'ed' style: 'dot' is set at start of last item printed, -diff -ru sys/dev/cp/if_cp.c sys-gcc4.1/dev/cp/if_cp.c ---- sys/dev/cp/if_cp.c 2005-08-25 02:01:06 -0300 -+++ sys-gcc4.1/dev/cp/if_cp.c 2006-06-09 08:08:56 -0300 -@@ -338,7 +338,7 @@ - #endif - } - --extern struct cdevsw cp_cdevsw; -+static struct cdevsw cp_cdevsw; - - static void - cp_bus_dmamap_addr (void *arg, bus_dma_segment_t *segs, int nseg, int error) -diff -ru sys/dev/ctau/if_ct.c sys-gcc4.1/dev/ctau/if_ct.c ---- sys/dev/ctau/if_ct.c 2005-08-25 02:01:06 -0300 -+++ sys-gcc4.1/dev/ctau/if_ct.c 2006-06-09 08:10:31 -0300 -@@ -486,7 +486,7 @@ - return 0; - } - --extern struct cdevsw ct_cdevsw; -+static struct cdevsw ct_cdevsw; - - static void - ct_bus_dmamap_addr (void *arg, bus_dma_segment_t *segs, int nseg, int error) -diff -ru sys/dev/cx/if_cx.c sys-gcc4.1/dev/cx/if_cx.c ---- sys/dev/cx/if_cx.c 2006-03-10 16:37:31 -0300 -+++ sys-gcc4.1/dev/cx/if_cx.c 2006-06-09 08:12:01 -0300 -@@ -229,7 +229,7 @@ - static drv_t *channel [NCX*NCHAN]; - static struct callout led_timo [NCX]; - static struct callout timeout_handle; --extern struct cdevsw cx_cdevsw; -+static struct cdevsw cx_cdevsw; - - static int MY_SOFT_INTR; - -diff -ru sys/dev/fb/vga.c sys-gcc4.1/dev/fb/vga.c ---- sys/dev/fb/vga.c 2005-10-05 18:48:02 -0300 -+++ sys-gcc4.1/dev/fb/vga.c 2006-06-09 12:58:32 -0300 -@@ -206,7 +206,7 @@ - * with a physical address in the following table, as verify_adapter() - * will perform address conversion at run-time. - */ --static video_adapter_t adapter_init_value[] = { -+video_adapter_t adapter_init_value[] = { - /* DCC_MONO */ - { 0, KD_MONO, "mda", 0, 0, 0, IO_MDA, IO_MDASIZE, MONO_CRTC, - MDA_BUF_BASE, MDA_BUF_SIZE, MDA_BUF_BASE, MDA_BUF_SIZE, MDA_BUF_SIZE, -@@ -748,10 +748,7 @@ - } - - #ifndef VGA_NO_BIOS --static void --fill_adapter_param(int code, video_adapter_t *adp) --{ -- static struct { -+ struct { - int primary; - int secondary; - } dcc[] = { -@@ -768,7 +765,9 @@ - { DCC_EGAMONO, DCC_CGA40 }, - { DCC_EGAMONO, DCC_CGA80 }, - }; -- -+static void -+fill_adapter_param(int code, video_adapter_t *adp) -+{ - if ((code < 0) || (code >= sizeof(dcc)/sizeof(dcc[0]))) { - adp[V_ADP_PRIMARY] = adapter_init_value[DCC_MONO]; - adp[V_ADP_SECONDARY] = adapter_init_value[DCC_CGA80]; -diff -ru sys/dev/iicbus/iicbus.c sys-gcc4.1/dev/iicbus/iicbus.c ---- sys/dev/iicbus/iicbus.c 2004-05-27 10:29:09 -0300 -+++ sys-gcc4.1/dev/iicbus/iicbus.c 2006-06-09 08:31:40 -0300 -@@ -45,7 +45,7 @@ - - #define DEVTOIICBUS(dev) ((struct iicbus_device*)device_get_ivars(dev)) - --static devclass_t iicbus_devclass; -+static devclass_t iicbus_dev_class; - - /* See comments below for why auto-scanning is a bad idea. */ - #define SCAN_IICBUS 0 -@@ -187,8 +187,8 @@ - return (IIC_ENOTSUPP); - } - --DRIVER_MODULE(iicbus, pcf, iicbus_driver, iicbus_devclass, 0, 0); --DRIVER_MODULE(iicbus, envctrl, iicbus_driver, iicbus_devclass, 0, 0); --DRIVER_MODULE(iicbus, iicbb, iicbus_driver, iicbus_devclass, 0, 0); --DRIVER_MODULE(iicbus, bti2c, iicbus_driver, iicbus_devclass, 0, 0); -+DRIVER_MODULE(iicbus, pcf, iicbus_driver, iicbus_dev_class, 0, 0); -+DRIVER_MODULE(iicbus, envctrl, iicbus_driver, iicbus_dev_class, 0, 0); -+DRIVER_MODULE(iicbus, iicbb, iicbus_driver, iicbus_dev_class, 0, 0); -+DRIVER_MODULE(iicbus, bti2c, iicbus_driver, iicbus_dev_class, 0, 0); - MODULE_VERSION(iicbus, IICBUS_MODVER); -diff -ru sys/dev/ppbus/ppb_msq.c sys-gcc4.1/dev/ppbus/ppb_msq.c ---- sys/dev/ppbus/ppb_msq.c 2003-08-24 14:54:16 -0300 -+++ sys-gcc4.1/dev/ppbus/ppb_msq.c 2006-06-09 07:26:54 -0300 -@@ -153,31 +153,32 @@ - * Execute a microseq loop - * - */ -+struct ppb_microseq loop_microseq_1[] = { -+ MS_CALL(0), /* execute prolog */ -+ -+ MS_SET(MS_UNKNOWN), /* set size of transfer */ -+ /* loop: */ -+ MS_CALL(0), /* execute body */ -+ MS_DBRA(-1 /* loop: */), -+ -+ MS_CALL(0), /* execute epilog */ -+ MS_RET(0) -+}; -+ - int - ppb_MS_loop(device_t bus, device_t dev, struct ppb_microseq *prolog, - struct ppb_microseq *body, struct ppb_microseq *epilog, - int iter, int *ret) - { -- struct ppb_microseq loop_microseq[] = { -- MS_CALL(0), /* execute prolog */ -- -- MS_SET(MS_UNKNOWN), /* set size of transfer */ -- /* loop: */ -- MS_CALL(0), /* execute body */ -- MS_DBRA(-1 /* loop: */), -- -- MS_CALL(0), /* execute epilog */ -- MS_RET(0) -- }; - - /* initialize the structure */ -- loop_microseq[0].arg[0].p = (void *)prolog; -- loop_microseq[1].arg[0].i = iter; -- loop_microseq[2].arg[0].p = (void *)body; -- loop_microseq[4].arg[0].p = (void *)epilog; -+ loop_microseq_1[0].arg[0].p = (void *)prolog; -+ loop_microseq_1[1].arg[0].i = iter; -+ loop_microseq_1[2].arg[0].p = (void *)body; -+ loop_microseq_1[4].arg[0].p = (void *)epilog; - - /* execute the loop */ -- return (ppb_MS_microseq(bus, dev, loop_microseq, ret)); -+ return (ppb_MS_microseq(bus, dev, loop_microseq_1, ret)); - } - - /* -diff -ru sys/fs/fdescfs/fdesc_vnops.c sys-gcc4.1/fs/fdescfs/fdesc_vnops.c ---- sys/fs/fdescfs/fdesc_vnops.c 2006-03-22 14:39:27 -0300 -+++ sys-gcc4.1/fs/fdescfs/fdesc_vnops.c 2006-06-09 08:18:20 -0300 -@@ -74,7 +74,7 @@ - static vop_reclaim_t fdesc_reclaim; - static vop_setattr_t fdesc_setattr; - --extern struct vop_vector fdesc_vnodeops; -+static struct vop_vector fdesc_vnodeops; - - /* - * Initialise cache headers -diff -ru sys/fs/ntfs/ntfs_vfsops.c sys/fs/ntfs/ntfs_vfsops.c ---- sys/fs/ntfs/ntfs_vfsops.c 2006-02-19 21:53:13 -0300 -+++ sys-gcc4.1/fs/ntfs/ntfs_vfsops.c 2006-06-09 08:54:14 -0300 -@@ -60,7 +60,7 @@ - #include - #include - --static MALLOC_DEFINE(M_NTFSMNT, "NTFS mount", "NTFS mount structure"); -+static MALLOC_DEFINE(M_NTFS_MNT, "NTFS mount", "NTFS mount structure"); - MALLOC_DEFINE(M_NTFSNTNODE,"NTFS ntnode", "NTFS ntnode information"); - MALLOC_DEFINE(M_NTFSFNODE,"NTFS fnode", "NTFS fnode information"); - MALLOC_DEFINE(M_NTFSDIR,"NTFS dir", "NTFS dir buffer"); -@@ -286,7 +286,7 @@ - error = bread(devvp, BBLOCK, BBSIZE, NOCRED, &bp); - if (error) - goto out; -- ntmp = malloc( sizeof *ntmp, M_NTFSMNT, M_WAITOK | M_ZERO); -+ ntmp = malloc( sizeof *ntmp, M_NTFS_MNT, M_WAITOK | M_ZERO); - bcopy( bp->b_data, &ntmp->ntm_bootfile, sizeof(struct bootfile) ); - /* - * We must not cache the boot block if its size is not exactly -@@ -411,7 +411,7 @@ - /* Alloc memory for attribute definitions */ - MALLOC(ntmp->ntm_ad, struct ntvattrdef *, - num * sizeof(struct ntvattrdef), -- M_NTFSMNT, M_WAITOK); -+ M_NTFS_MNT, M_WAITOK); - - ntmp->ntm_adnum = num; - -@@ -515,8 +515,8 @@ - ntfs_82u_uninit(ntmp); - mp->mnt_data = (qaddr_t)0; - mp->mnt_flag &= ~MNT_LOCAL; -- FREE(ntmp->ntm_ad, M_NTFSMNT); -- FREE(ntmp, M_NTFSMNT); -+ FREE(ntmp->ntm_ad, M_NTFS_MNT); -+ FREE(ntmp, M_NTFS_MNT); - return (error); - } - -diff -ru sys/fs/unionfs/union_vfsops.c sys-gcc4.1/fs/unionfs/union_vfsops.c ---- sys/fs/unionfs/union_vfsops.c 2005-04-27 06:07:13 -0300 -+++ sys-gcc4.1/fs/unionfs/union_vfsops.c 2006-06-09 09:02:09 -0300 -@@ -466,7 +466,7 @@ - return (0); - } - --static struct vfsops union_vfsops = { -+static struct vfsops union_vfs_ops = { - .vfs_init = union_init, - .vfs_mount = union_mount, - .vfs_root = union_root, -@@ -474,4 +474,4 @@ - .vfs_unmount = union_unmount, - }; - --VFS_SET(union_vfsops, unionfs, VFCF_LOOPBACK); -+VFS_SET(union_vfs_ops, unionfs, VFCF_LOOPBACK); -diff -ru sys/i386/i386/vm86.c sys-gcc4.1/i386/i386/vm86.c ---- sys/i386/i386/vm86.c 2004-11-27 03:51:36 -0300 -+++ sys-gcc4.1/i386/i386/vm86.c 2006-06-10 21:48:24 -0300 -@@ -505,7 +505,7 @@ - panic("vm86_addpage: not enough room"); - } - --static void -+void - vm86_initflags(struct vm86frame *vmf) - { - int eflags = vmf->vmf_eflags; -diff -ru sys/i386/include/segments.h sys-gcc4.1/i386/include/segments.h ---- sys/i386/include/segments.h 2005-04-13 19:57:17 -0300 -+++ sys-gcc4.1/i386/include/segments.h 2006-06-09 07:29:09 -0300 -@@ -244,7 +244,7 @@ - extern struct soft_segment_descriptor gdt_segs[]; - extern struct gate_descriptor *idt; - extern union descriptor ldt[NLDT]; --extern struct region_descriptor r_gdt, r_idt; -+//extern struct region_descriptor r_gdt, r_idt; - - void lgdt(struct region_descriptor *rdp); - void sdtossd(struct segment_descriptor *sdp, -diff -ru sys/kern/kern_tc.c sys-gcc4.1/kern/kern_tc.c ---- sys/kern/kern_tc.c 2006-04-04 17:07:23 -0300 -+++ sys-gcc4.1/kern/kern_tc.c 2006-06-09 05:26:02 -0300 -@@ -61,7 +61,7 @@ struct timehands { - struct timehands *th_next; - }; - --extern struct timehands th0; -+static struct timehands th0; - static struct timehands th9 = { NULL, 0, 0, 0, {0, 0}, {0, 0}, {0, 0}, 0, &th0}; - static struct timehands th8 = { NULL, 0, 0, 0, {0, 0}, {0, 0}, {0, 0}, 0, &th9}; - static struct timehands th7 = { NULL, 0, 0, 0, {0, 0}, {0, 0}, {0, 0}, 0, &th8}; -diff -ru sys/net/rtsock.c sys-gcc4.1/net/rtsock.c ---- sys/net/rtsock.c 2006-04-04 17:07:23 -0300 -+++ sys-gcc4.1/net/rtsock.c 2006-06-09 05:26:02 -0300 -@@ -1243,7 +1243,7 @@ - * Definitions of protocols supported in the ROUTE domain. - */ - --extern struct domain routedomain; /* or at least forward */ -+static struct domain routedomain; /* or at least forward */ - - static struct protosw routesw[] = { - { -diff -ru sys/net/zlib.c sys-gcc4.1/net/zlib.c ---- sys/net/zlib.c 2005-01-06 22:45:35 -0300 -+++ sys-gcc4.1/net/zlib.c 2006-06-09 09:06:42 -0300 -@@ -94,7 +94,7 @@ - typedef ush FAR ushf; - typedef unsigned long ulg; - --extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */ -+static const char *z_errmsg[10]; /* indexed by 2-zlib_error */ - /* (size given to avoid silly warnings with Visual C++) */ - - #define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)] -diff -ru sys/netinet6/in6_proto.c sys-gcc4.1/netinet6/in6_proto.c ---- sys/netinet6/in6_proto.c 2005-11-16 07:31:23 -0300 -+++ sys-gcc4.1/netinet6/in6_proto.c 2006-06-09 06:52:31 -0300 -@@ -145,7 +145,7 @@ - */ - - extern struct domain inet6domain; --static struct pr_usrreqs nousrreqs; -+static struct pr_usrreqs nousr_reqs; - - #define PR_LISTEN 0 - #define PR_ABRTACPTDIS 0 -@@ -158,7 +158,7 @@ - .pr_init = ip6_init, - .pr_slowtimo = frag6_slowtimo, - .pr_drain = frag6_drain, -- .pr_usrreqs = &nousrreqs, -+ .pr_usrreqs = &nousr_reqs, - }, - { - .pr_type = SOCK_DGRAM, -@@ -216,7 +216,7 @@ - .pr_protocol = IPPROTO_DSTOPTS, - .pr_flags = PR_ATOMIC|PR_ADDR, - .pr_input = dest6_input, -- .pr_usrreqs = &nousrreqs -+ .pr_usrreqs = &nousr_reqs - }, - { - .pr_type = SOCK_RAW, -@@ -224,7 +224,7 @@ - .pr_protocol = IPPROTO_ROUTING, - .pr_flags = PR_ATOMIC|PR_ADDR, - .pr_input = route6_input, -- .pr_usrreqs = &nousrreqs -+ .pr_usrreqs = &nousr_reqs - }, - { - .pr_type = SOCK_RAW, -@@ -232,7 +232,7 @@ - .pr_protocol = IPPROTO_FRAGMENT, - .pr_flags = PR_ATOMIC|PR_ADDR, - .pr_input = frag6_input, -- .pr_usrreqs = &nousrreqs -+ .pr_usrreqs = &nousr_reqs - }, - #ifdef IPSEC - { -@@ -241,7 +241,7 @@ - .pr_protocol = IPPROTO_AH, - .pr_flags = PR_ATOMIC|PR_ADDR, - .pr_input = ah6_input, -- .pr_usrreqs = &nousrreqs, -+ .pr_usrreqs = &nousr_reqs, - }, - #ifdef IPSEC_ESP - { -@@ -251,7 +251,7 @@ - .pr_flags = PR_ATOMIC|PR_ADDR, - .pr_input = esp6_input, - .pr_ctlinput = esp6_ctlinput, -- .pr_usrreqs = &nousrreqs, -+ .pr_usrreqs = &nousr_reqs, - }, - #endif - { -@@ -260,7 +260,7 @@ - .pr_protocol = IPPROTO_IPCOMP, - .pr_flags = PR_ATOMIC|PR_ADDR, - .pr_input = ipcomp6_input, -- .pr_usrreqs = &nousrreqs, -+ .pr_usrreqs = &nousr_reqs, - }, - #endif /* IPSEC */ - #ifdef INET -diff -ru sys/netinet6/ip6_mroute.c sys-gcc4.1/netinet6/ip6_mroute.c ---- sys/netinet6/ip6_mroute.c 2006-04-20 13:05:17 -0300 -+++ sys-gcc4.1/netinet6/ip6_mroute.c 2006-06-09 06:53:47 -0300 -@@ -188,7 +188,7 @@ - static mifi_t nummifs = 0; - static mifi_t reg_mif_num = (mifi_t)-1; - --static struct pim6stat pim6stat; -+static struct pim6stat pim6_stat; - static int pim6; - - /* -@@ -1622,7 +1622,7 @@ - log(LOG_DEBUG, "** IPv6 register_send **\n src %s dst %s\n", - ip6_sprintf(&ip6->ip6_src), ip6_sprintf(&ip6->ip6_dst)); - #endif -- ++pim6stat.pim6s_snd_registers; -+ ++pim6_stat.pim6s_snd_registers; - - /* Make a copy of the packet to send to the user level process */ - MGETHDR(mm, M_DONTWAIT, MT_HEADER); -@@ -1690,7 +1690,7 @@ - int minlen; - int off = *offp; - -- ++pim6stat.pim6s_rcv_total; -+ ++pim6_stat.pim6s_rcv_total; - - ip6 = mtod(m, struct ip6_hdr *); - pimlen = m->m_pkthdr.len - *offp; -@@ -1699,7 +1699,7 @@ - * Validate lengths - */ - if (pimlen < PIM_MINLEN) { -- ++pim6stat.pim6s_rcv_tooshort; -+ ++pim6_stat.pim6s_rcv_tooshort; - #ifdef MRT6DEBUG - if (mrt6debug & DEBUG_PIM) - log(LOG_DEBUG,"pim6_input: PIM packet too short\n"); -@@ -1732,7 +1732,7 @@ - #else - IP6_EXTHDR_GET(pim, struct pim *, m, off, minlen); - if (pim == NULL) { -- pim6stat.pim6s_rcv_tooshort++; -+ pim6_stat.pim6s_rcv_tooshort++; - return (IPPROTO_DONE); - } - #endif -@@ -1752,7 +1752,7 @@ - cksumlen = pimlen; - - if (in6_cksum(m, IPPROTO_PIM, off, cksumlen)) { -- ++pim6stat.pim6s_rcv_badsum; -+ ++pim6_stat.pim6s_rcv_badsum; - #ifdef MRT6DEBUG - if (mrt6debug & DEBUG_PIM) - log(LOG_DEBUG, -@@ -1766,7 +1766,7 @@ - - /* PIM version check */ - if (pim->pim_ver != PIM_VERSION) { -- ++pim6stat.pim6s_rcv_badversion; -+ ++pim6_stat.pim6s_rcv_badversion; - #ifdef MRT6DEBUG - log(LOG_ERR, - "pim6_input: incorrect version %d, expecting %d\n", -@@ -1789,7 +1789,7 @@ - u_int32_t *reghdr; - int rc; - -- ++pim6stat.pim6s_rcv_registers; -+ ++pim6_stat.pim6s_rcv_registers; - - if ((reg_mif_num >= nummifs) || (reg_mif_num == (mifi_t) -1)) { - #ifdef MRT6DEBUG -@@ -1811,8 +1811,8 @@ - * Validate length - */ - if (pimlen < PIM6_REG_MINLEN) { -- ++pim6stat.pim6s_rcv_tooshort; -- ++pim6stat.pim6s_rcv_badregisters; -+ ++pim6_stat.pim6s_rcv_tooshort; -+ ++pim6_stat.pim6s_rcv_badregisters; - #ifdef MRT6DEBUG - log(LOG_ERR, - "pim6_input: register packet size too " -@@ -1836,7 +1836,7 @@ - - /* verify the version number of the inner packet */ - if ((eip6->ip6_vfc & IPV6_VERSION_MASK) != IPV6_VERSION) { -- ++pim6stat.pim6s_rcv_badregisters; -+ ++pim6_stat.pim6s_rcv_badregisters; - #ifdef MRT6DEBUG - log(LOG_DEBUG, "pim6_input: invalid IP version (%d) " - "of the inner packet\n", -@@ -1848,7 +1848,7 @@ - - /* verify the inner packet is destined to a mcast group */ - if (!IN6_IS_ADDR_MULTICAST(&eip6->ip6_dst)) { -- ++pim6stat.pim6s_rcv_badregisters; -+ ++pim6_stat.pim6s_rcv_badregisters; - #ifdef MRT6DEBUG - if (mrt6debug & DEBUG_PIM) - log(LOG_DEBUG, -diff -ru sys/sys/proc.h sys-gcc4.1/sys/proc.h ---- sys/sys/proc.h 2006-03-10 16:37:35 -0300 -+++ sys-gcc4.1/sys/proc.h 2006-06-09 05:15:08 -0300 -@@ -835,7 +835,7 @@ - extern int nprocs, maxproc; /* Current and max number of procs. */ - extern int maxprocperuid; /* Max procs per uid. */ - extern u_long ps_arg_cache_limit; --extern int sched_quantum; /* Scheduling quantum in ticks. */ -+//extern int sched_quantum; /* Scheduling quantum in ticks. */ - - LIST_HEAD(proclist, proc); - TAILQ_HEAD(procqueue, proc); diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.1-intrcnt.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.1-intrcnt.patch deleted file mode 100644 index c6f0588edc1d..000000000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.1-intrcnt.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- sys/i386/include/intr_machdep.h.orig 2006-07-08 12:27:19 -0300 -+++ sys/i386/include/intr_machdep.h 2006-07-08 12:26:49 -0300 -@@ -55,7 +55,7 @@ - * - 1 counter for each CPU for lapic timer. - * - 7 counters for each CPU for IPI counters for SMP. - */ --#ifdef SMP -+#ifndef SMP - #define INTRCNT_COUNT (1 + NUM_IO_INTS * 2 + 1) - #else - #define INTRCNT_COUNT (1 + NUM_IO_INTS * 2 + (1 + 7) * MAXCPU) ---- sys/amd64/include/intr_machdep.h.orig 2006-07-08 12:27:56 -0300 -+++ sys/amd64/include/intr_machdep.h 2006-07-08 12:27:34 -0300 -@@ -55,7 +55,7 @@ - * - 1 counter for each CPU for lapic timer. - * - 7 counters for each CPU for IPI counters for SMP. - */ --#ifdef SMP -+#ifndef SMP - #define INTRCNT_COUNT (1 + NUM_IO_INTS * 2 + 1) - #else - #define INTRCNT_COUNT (1 + NUM_IO_INTS * 2 + (1 + 7) * MAXCPU) diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r3.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r3.ebuild deleted file mode 100644 index 1e8af70b36cb..000000000000 --- a/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r3.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r3.ebuild,v 1.1 2006/07/08 17:15:02 the_paya Exp $ - -inherit bsdmk freebsd flag-o-matic - -DESCRIPTION="FreeBSD kernel sources" -SLOT="${PVR}" -KEYWORDS="~x86-fbsd" - -IUSE="symlink" - -SRC_URI="mirror://gentoo/${SYS}.tar.bz2" - -RDEPEND=">=sys-freebsd/freebsd-mk-defs-6.0-r1" -DEPEND="" - -RESTRICT="strip binchecks" - -S="${WORKDIR}/sys" - -MY_PVR="${PVR}" - -[[ ${MY_PVR} == "${RV}" ]] && MY_PVR="${MY_PVR}-r0" - -src_unpack() { - unpack ${A} - cd "${S}" - - # This replaces the gentoover patch, it doesn't need reapply every time. - sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \ - -e 's:^BRANCH=.*:BRANCH="Gentoo":' \ - -e 's:^VERSION=.*:VERSION="${TYPE} ${BRANCH} ${REVISION}":' \ - "${S}/conf/newvers.sh" - - epatch "${FILESDIR}/${PN}-gentoo.patch" - epatch "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch" - epatch "${FILESDIR}/${PN}-6.0-asm.patch" - epatch "${FILESDIR}/${PN}-6.0-werror.patch" - epatch "${FILESDIR}/${PN}-6.1-gcc41.patch" - epatch "${FILESDIR}/${PN}-6.1-intrcnt.patch" - - epatch "${FILESDIR}/SA-06-16-smbfs.patch" - - # Disable SSP for the kernel - grep -Zlr -- -ffreestanding "${S}" | xargs -0 sed -i -e \ - "s:-ffreestanding:-ffreestanding $(test-flags -fno-stack-protector -fno-stack-protector-all):g" -} - -src_compile() { - einfo "Nothing to compile.." -} - -src_install() { - insinto "/usr/src/sys-${MY_PVR}" - doins -r "${S}/"* -} - -pkg_postinst() { - if [[ ! -L "${ROOT}/usr/src/sys" ]]; then - einfo "/usr/src/sys symlink doesn't exist; creating symlink to sys-${MY_PVR}..." - ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \ - eerror "Couldn't create ${ROOT}/usr/src/sys symlink." - # just in case... - [[ -L ""${ROOT}/usr/src/sys-${RV}"" ]] && rm "${ROOT}/usr/src/sys-${RV}" - ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \ - eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink." - elif use symlink; then - einfo "Updating /usr/src/sys symlink to sys-${MY_PVR}..." - rm "${ROOT}/usr/src/sys" "${ROOT}/usr/src/sys-${RV}" || \ - eerror "Couldn't remove previous symlinks, please fix manually." - ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \ - eerror "Couldn't create ${ROOT}/usr/src/sys symlink." - ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \ - eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink." - fi -} diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r4.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r4.ebuild deleted file mode 100644 index 5588ed4dc8c7..000000000000 --- a/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r4.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r4.ebuild,v 1.2 2006/10/19 23:11:02 the_paya Exp $ - -inherit bsdmk freebsd flag-o-matic - -DESCRIPTION="FreeBSD kernel sources" -SLOT="${PVR}" -KEYWORDS="~x86-fbsd" - -IUSE="symlink" - -SRC_URI="mirror://gentoo/${SYS}.tar.bz2" - -RDEPEND=">=sys-freebsd/freebsd-mk-defs-6.0-r1" -DEPEND="" - -RESTRICT="strip binchecks" - -S="${WORKDIR}/sys" - -MY_PVR="${PVR}" - -[[ ${MY_PVR} == "${RV}" ]] && MY_PVR="${MY_PVR}-r0" - -src_unpack() { - unpack ${A} - cd "${S}" - - # This replaces the gentoover patch, it doesn't need reapply every time. - sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \ - -e 's:^BRANCH=.*:BRANCH="Gentoo":' \ - -e 's:^VERSION=.*:VERSION="${TYPE} ${BRANCH} ${REVISION}":' \ - "${S}/conf/newvers.sh" - - epatch "${FILESDIR}/${PN}-gentoo.patch" - epatch "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch" - epatch "${FILESDIR}/${PN}-6.0-asm.patch" - epatch "${FILESDIR}/${PN}-6.0-werror.patch" - epatch "${FILESDIR}/${PN}-6.1-gcc41.patch" - epatch "${FILESDIR}/${PN}-6.1-intrcnt.patch" - epatch "${FILESDIR}/${PN}-6.1-ntfs.patch" - - # This is to be able to use sandbox safely, see bug #146284 - epatch "${FILESDIR}/${P}-devfs-deadlock.patch" - - epatch "${FILESDIR}/SA-06-16-smbfs.patch" - - # Disable SSP for the kernel - grep -Zlr -- -ffreestanding "${S}" | xargs -0 sed -i -e \ - "s:-ffreestanding:-ffreestanding $(test-flags -fno-stack-protector -fno-stack-protector-all):g" -} - -src_compile() { - einfo "Nothing to compile.." -} - -src_install() { - insinto "/usr/src/sys-${MY_PVR}" - doins -r "${S}/"* -} - -pkg_postinst() { - if [[ ! -L "${ROOT}/usr/src/sys" ]]; then - einfo "/usr/src/sys symlink doesn't exist; creating symlink to sys-${MY_PVR}..." - ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \ - eerror "Couldn't create ${ROOT}/usr/src/sys symlink." - # just in case... - [[ -L ""${ROOT}/usr/src/sys-${RV}"" ]] && rm "${ROOT}/usr/src/sys-${RV}" - ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \ - eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink." - elif use symlink; then - einfo "Updating /usr/src/sys symlink to sys-${MY_PVR}..." - rm "${ROOT}/usr/src/sys" "${ROOT}/usr/src/sys-${RV}" || \ - eerror "Couldn't remove previous symlinks, please fix manually." - ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \ - eerror "Couldn't create ${ROOT}/usr/src/sys symlink." - ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \ - eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink." - fi -} diff --git a/sys-freebsd/freebsd-ubin/Manifest b/sys-freebsd/freebsd-ubin/Manifest index d64e576d4e19..adf1c5fc6ff2 100644 --- a/sys-freebsd/freebsd-ubin/Manifest +++ b/sys-freebsd/freebsd-ubin/Manifest @@ -1,10 +1,6 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX SA-06-02-ee.patch 2446 RMD160 9934e6ee6c0ebaa1998939163bf4f1e233d5eba0 SHA1 31d014af41aee818494acfc40fe5d392d772bd4b SHA256 1c27b3e1f5906da36a654409290e9ffb0493b70a1e83bed89704942f2a9c0d10 -MD5 9256a421446d791cc6fbc17d4d8a9780 files/SA-06-02-ee.patch 2446 -RMD160 9934e6ee6c0ebaa1998939163bf4f1e233d5eba0 files/SA-06-02-ee.patch 2446 -SHA256 1c27b3e1f5906da36a654409290e9ffb0493b70a1e83bed89704942f2a9c0d10 files/SA-06-02-ee.patch 2446 AUX freebsd-ubin-6.0-bsdcmp.patch 413 RMD160 e8f9d8f9c873077d7113af6a1efd642a3ee7d12f SHA1 7aaa405cb0291ee95e973c001eac79a8bdb60223 SHA256 a0a99a602538d95ddae2fc4b823150ea58862def87c8196806a379233e3ddb2c MD5 f9ae28120f1ddd8948695c613b5f399a files/freebsd-ubin-6.0-bsdcmp.patch 413 RMD160 e8f9d8f9c873077d7113af6a1efd642a3ee7d12f files/freebsd-ubin-6.0-bsdcmp.patch 413 @@ -21,10 +17,6 @@ AUX freebsd-ubin-6.1-gcc41.patch 1004 RMD160 1d3bfda88ff72196c2fb22c49c89821b9da MD5 bf060324f78d20a211acfddc0fcf0d73 files/freebsd-ubin-6.1-gcc41.patch 1004 RMD160 1d3bfda88ff72196c2fb22c49c89821b9da487fb files/freebsd-ubin-6.1-gcc41.patch 1004 SHA256 3bcdb76b2c5f4a370a24fdde0aa258a66d66a146f5124ff37b7e89b93b203422 files/freebsd-ubin-6.1-gcc41.patch 1004 -AUX freebsd-ubin-6.1-rpcgen-gcc41.patch 821 RMD160 e9f24023d500ae0347a73667e3246b36e2d180d5 SHA1 9512af45421330e2e436206cb220034759fe54e8 SHA256 3265ed49d4e9253068ee429134dc0276cf63a5787b79dbd7250acf77a344c224 -MD5 391fdbf643a8ec924a13cffa010eb628 files/freebsd-ubin-6.1-rpcgen-gcc41.patch 821 -RMD160 e9f24023d500ae0347a73667e3246b36e2d180d5 files/freebsd-ubin-6.1-rpcgen-gcc41.patch 821 -SHA256 3265ed49d4e9253068ee429134dc0276cf63a5787b79dbd7250acf77a344c224 files/freebsd-ubin-6.1-rpcgen-gcc41.patch 821 AUX freebsd-ubin-6.2-rpcgen-gcc4.1.patch 4451 RMD160 4b284ae72f58b7f057c2c501815fd9fb76e355b8 SHA1 69b9018f1558d7c2b4c027e533b6f7e063382778 SHA256 63455b81c40b015fe7b9a8f8ac8ca6c341a805b76315e9c538da7e4bd0bb9e7c MD5 79ab3c22bb9a7f4002dcc792d9f9cac5 files/freebsd-ubin-6.2-rpcgen-gcc4.1.patch 4451 RMD160 4b284ae72f58b7f057c2c501815fd9fb76e355b8 files/freebsd-ubin-6.2-rpcgen-gcc4.1.patch 4451 @@ -57,53 +49,32 @@ AUX su.pamd 420 RMD160 9888acbac2c2c79b64ec274cc7d96b13b86d8ad8 SHA1 80fb6670629 MD5 764135d89f71d46bd96de7271f1083fc files/su.pamd 420 RMD160 9888acbac2c2c79b64ec274cc7d96b13b86d8ad8 files/su.pamd 420 SHA256 efe3a5efafd7e97e9305f4d24f2b4aacb44f65b261ca54bca1306b918b82cb08 files/su.pamd 420 -DIST freebsd-bin-6.1.tar.bz2 405680 RMD160 33f2e5b49fce90dcaab652621af3b33e8e80b643 SHA1 83b10732b88c42205b7a8c542f1f9a4a83d82df8 SHA256 86d7a000827432c594f9d37b98a1f936f6168030cf033c6e621a37c670ef5271 DIST freebsd-bin-6.2_rc2.tar.bz2 406726 RMD160 49f94f065296854cf9020426db2d35aa2e1273bb SHA1 2d6eac350f889c123736ddfa171194b163ae7a66 SHA256 8bb7d1028e14dc2b967546e5aa4c18bfe1175cd2d380d6c37452f3b1b7ac637f -DIST freebsd-contrib-6.1.tar.bz2 36017365 RMD160 225f6ade032533d08b98b79cb29b75da2a3c74fa SHA1 adac960daad3f4169874fe0ba1050fe7e906aa23 SHA256 41283b7f78597cf81f98477aef04eb9cce2b130b1a2f8b5c7d647549c973c054 DIST freebsd-contrib-6.2_rc2.tar.bz2 36594463 RMD160 d957a4054073009fe20cc13353797c2dc1aa0eaa SHA1 b93129a87d91e9ef37748337667a68a7530a30c4 SHA256 aeddb53e9dea3da081419be386251c144c63496d769d07b61e9085a3e52c74e0 -DIST freebsd-etc-6.1.tar.bz2 184045 RMD160 b9a8bea64694c040c02b74f7633dc3cd77afa400 SHA1 4a1fff7fa1c77485c5efccf5ab1155e497d1cd82 SHA256 62b06b61e526c4a939503202aaca31cbce7a3de9daec03e67dc57119527eeff7 DIST freebsd-etc-6.2_rc2.tar.bz2 189416 RMD160 e98c8821fc4fbcf2890fcc8155c8fa0f74fd417c SHA1 4fad080351793c84c491407e797e62559245fc40 SHA256 b4f673da45ca646fae9e457c4a8e3255dbe5365445537d4e6ba39ac9b54ee40e -DIST freebsd-include-6.1.tar.bz2 127179 RMD160 f873b13bb16408a390932d14974b39336bd90a7c SHA1 747d7498ce80846274e49ed4487440dcbefe96af SHA256 9cd9d47c5cc8ea4fc7afe185c9b391317fe013adb3f0a960e9fe498f166177b5 DIST freebsd-include-6.2_rc2.tar.bz2 131650 RMD160 811494045dd44c953efeb690258a52ec89a169fe SHA1 b47035a25632a890f83889789c0a076e5e8a6bc6 SHA256 ab4264cf293c5acffb9cfbabce3605841187c900b76eb1cd4a403053ee57220c -DIST freebsd-lib-6.1.tar.bz2 2613584 RMD160 f71aad95ef2bac094bdab9e317a99fb866fba042 SHA1 c7fed3b4a996fdd25f97eef428dd40023dc53a7e SHA256 6ecb49695dc135e64cea949cb7e9b9998b15cb962797cdafc735a7e244744c37 DIST freebsd-lib-6.2_rc2.tar.bz2 2670872 RMD160 bd8b9837acfde404bed998ba3ef5450bb380b779 SHA1 b7df3ad81163558a02e9f4c960f33f8fa3c38106 SHA256 b805264da9f1826d2edb9f5b946ebaae5371fcce146623e4ed695a187c1a4993 -DIST freebsd-sys-6.1.tar.bz2 17361671 RMD160 eb19f6a345c665542df694a4f9170d227beaf3b6 SHA1 f9da69cabdaaad268c79670c06ba4fff3e3ef6a8 SHA256 d2ecd79b83ba06c12e358adfccc7e057e15fb7c5be76d92c537b99cbe1d84f0f DIST freebsd-sys-6.2_rc2.tar.bz2 18339807 RMD160 ab2e6110b767319a0135130f9ad16d074de61483 SHA1 f7881f43e815930fe3ef6c3517d4e2475f80479e SHA256 392d80c8dae6b7cddc4810f59869a87ec4d0d699c534d8a034b2b273640a7666 -DIST freebsd-ubin-6.1.tar.bz2 1763218 RMD160 5da58c546cebf30a6b661841dbcb5b53626a4a1e SHA1 7d1b0568d02f192dcd3bd7f972613376d3d0f16d SHA256 13429ed3cc8a14a4efda69b7d82004bf993b5a14591a6129a857d627221aeef6 DIST freebsd-ubin-6.2_rc2.tar.bz2 1773409 RMD160 be5fa09f2b84b77981ba6ae34d2c237b05164776 SHA1 6052972c318830a717cb3f6b72fe034c1a1fe147 SHA256 391d266053323b96a258a264abec848bd0799ded76dcad098b510bd5d9a75398 -EBUILD freebsd-ubin-6.1-r1.ebuild 3045 RMD160 42a1cec2067490706a6eb15745543a46816590e4 SHA1 b0104cbb24d589a821d81be860b44a8f4dbaf9b2 SHA256 6e412fad982eb61997eca902d50b7789baf82c1c37cce9e9e37d50579b227ce8 -MD5 83c9cc795f0a4e0919b12709e9b5b7c8 freebsd-ubin-6.1-r1.ebuild 3045 -RMD160 42a1cec2067490706a6eb15745543a46816590e4 freebsd-ubin-6.1-r1.ebuild 3045 -SHA256 6e412fad982eb61997eca902d50b7789baf82c1c37cce9e9e37d50579b227ce8 freebsd-ubin-6.1-r1.ebuild 3045 -EBUILD freebsd-ubin-6.1.ebuild 3035 RMD160 00f1357a8f928aeb249dbd17df4121da71716eae SHA1 e7bb907d040b7d5063a324ca4c93367f56d2882e SHA256 dbb4f8a53e5e2e8b4b77e1f69c44c7fd3258d57f22655329690c4e6af8f13485 -MD5 0adfe59c63a7ff52da8c0b505e45e607 freebsd-ubin-6.1.ebuild 3035 -RMD160 00f1357a8f928aeb249dbd17df4121da71716eae freebsd-ubin-6.1.ebuild 3035 -SHA256 dbb4f8a53e5e2e8b4b77e1f69c44c7fd3258d57f22655329690c4e6af8f13485 freebsd-ubin-6.1.ebuild 3035 EBUILD freebsd-ubin-6.2_rc2.ebuild 3452 RMD160 8920b46523fb4fe2b983fe0d4c33fdb7023bbc0f SHA1 f691f6f85cfd85b90c1a2e86303a8c7d6d25e1cb SHA256 9f7e628f6a2a104255613bcc99de43a8c4a97a8fa755e366cf3cbedcf965b6f4 MD5 ffec9f7378b00a16934b6dbe8bebcebb freebsd-ubin-6.2_rc2.ebuild 3452 RMD160 8920b46523fb4fe2b983fe0d4c33fdb7023bbc0f freebsd-ubin-6.2_rc2.ebuild 3452 SHA256 9f7e628f6a2a104255613bcc99de43a8c4a97a8fa755e366cf3cbedcf965b6f4 freebsd-ubin-6.2_rc2.ebuild 3452 -MISC ChangeLog 10947 RMD160 d2417a0850ef677a252cd3bd1de5714cb465fa4c SHA1 198054084e6b1f6f932534ae53655c75083cdd4d SHA256 a86f100ee2f108661cd4cf95b9b4b3fccbd0f7c48d50e5ceb83048d2d17ef494 -MD5 4f7123f6fe5d846a7eae47cc78908d21 ChangeLog 10947 -RMD160 d2417a0850ef677a252cd3bd1de5714cb465fa4c ChangeLog 10947 -SHA256 a86f100ee2f108661cd4cf95b9b4b3fccbd0f7c48d50e5ceb83048d2d17ef494 ChangeLog 10947 +MISC ChangeLog 11151 RMD160 5706436a2fcbdba78223a9c12b30da187103cf60 SHA1 7be0f2b00ec116bc2dca0dd84629d230a93bf793 SHA256 50bdcccb4d3b9e4f686573edef1aa109c63b688acd4aec615f6178d76c8ecd51 +MD5 af27fba4a309f9bd4a43abe631b56ca2 ChangeLog 11151 +RMD160 5706436a2fcbdba78223a9c12b30da187103cf60 ChangeLog 11151 +SHA256 50bdcccb4d3b9e4f686573edef1aa109c63b688acd4aec615f6178d76c8ecd51 ChangeLog 11151 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata.xml 156 -MD5 400c35bcf63ac6ea151a5a0f52b82393 files/digest-freebsd-ubin-6.1 1795 -RMD160 8d2c9a0cf9d6be3cebf366d295ae4b098f48b3ef files/digest-freebsd-ubin-6.1 1795 -SHA256 b185465d2d3030a516bbb26199657b865cf9ed25cfdebb7bc6d5a6963948a240 files/digest-freebsd-ubin-6.1 1795 -MD5 400c35bcf63ac6ea151a5a0f52b82393 files/digest-freebsd-ubin-6.1-r1 1795 -RMD160 8d2c9a0cf9d6be3cebf366d295ae4b098f48b3ef files/digest-freebsd-ubin-6.1-r1 1795 -SHA256 b185465d2d3030a516bbb26199657b865cf9ed25cfdebb7bc6d5a6963948a240 files/digest-freebsd-ubin-6.1-r1 1795 MD5 ff982742dc9cb33caa38e196b811ad71 files/digest-freebsd-ubin-6.2_rc2 1879 RMD160 4a5833735221160c47aae4b815266b3376865b40 files/digest-freebsd-ubin-6.2_rc2 1879 SHA256 ca06d8d29078fa67f87eb07df3291801d73fd10b056b71ee3eecd35def1dfe8e files/digest-freebsd-ubin-6.2_rc2 1879 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFnrq0AiZjviIA2XgRAvkuAKDam2YNptiHo/6RIckQuacInBE8vQCdFGZZ -ZXZk4rXz/V8JAbDAhtWTaBA= -=2ItT +iD8DBQFFnsPhAiZjviIA2XgRAoYrAJ4/jeZWFutl7WXCRMloZlVOmfv+xgCdG2sx +0z/9WCtFrbhscosChqnwAK8= +=aRqW -----END PGP SIGNATURE----- diff --git a/sys-freebsd/freebsd-ubin/files/SA-06-02-ee.patch b/sys-freebsd/freebsd-ubin/files/SA-06-02-ee.patch deleted file mode 100644 index 01157c42e0f1..000000000000 --- a/sys-freebsd/freebsd-ubin/files/SA-06-02-ee.patch +++ /dev/null @@ -1,104 +0,0 @@ -Index: usr.bin/ee/ee.c -=================================================================== -RCS file: /home/ncvs/src/usr.bin/ee/ee.c,v -retrieving revision 1.32 -diff -u -d -r1.32 ee.c ---- usr.bin/ee/ee.c 5 Nov 2004 10:18:05 -0000 1.32 -+++ usr.bin/ee/ee.c 1 Jan 2006 22:51:41 -0000 -@@ -300,7 +300,7 @@ - int quit P_((int noverify)); - void edit_abort P_((int arg)); - void delete_text P_((void)); --int write_file P_((char *file_name)); -+int write_file P_((char *file_name, int warn_if_exists)); - int search P_((int display_message)); - void search_prompt P_((void)); - void del_char P_((void)); -@@ -1688,7 +1688,7 @@ - cmd_str = cmd_str2 = get_string(file_write_prompt_str, TRUE); - } - tmp_file = resolve_name(cmd_str); -- write_file(tmp_file); -+ write_file(tmp_file, 1); - if (tmp_file != cmd_str) - free(tmp_file); - } -@@ -2395,7 +2395,7 @@ - file_name = tmp_file; - } - -- if (write_file(file_name)) -+ if (write_file(file_name, 1)) - { - text_changes = FALSE; - quit(0); -@@ -2472,8 +2472,9 @@ - } - - int --write_file(file_name) -+write_file(file_name, warn_if_exists) - char *file_name; -+int warn_if_exists; - { - char cr; - char *tmp_point; -@@ -2483,7 +2484,8 @@ - int write_flag = TRUE; - - charac = lines = 0; -- if ((in_file_name == NULL) || strcmp(in_file_name, file_name)) -+ if (warn_if_exists && -+ ((in_file_name == NULL) || strcmp(in_file_name, file_name))) - { - if ((temp_fp = fopen(file_name, "r"))) - { -@@ -3725,7 +3727,7 @@ - { - string = get_string(file_write_prompt_str, TRUE); - tmp_file = resolve_name(string); -- write_file(tmp_file); -+ write_file(tmp_file, 1); - if (tmp_file != string) - free(tmp_file); - free(string); -@@ -3762,7 +3764,7 @@ - string = tmp_file; - } - } -- if (write_file(string)) -+ if (write_file(string, 1)) - { - in_file_name = string; - text_changes = FALSE; -@@ -4375,17 +4377,25 @@ - void - ispell_op() - { -- char name[128]; -+ char template[128], *name; - char string[256]; -- int pid; -+ int fd; - - if (restrict_mode()) - { - return; - } -- pid = getpid(); -- sprintf(name, "/tmp/ee.%d", pid); -- if (write_file(name)) -+ (void)sprintf(template, "/tmp/ee.XXXXXXXX"); -+ name = mktemp(&template[0]); -+ fd = open(name, O_CREAT | O_EXCL | O_RDWR, 0600); -+ if (fd < 0) { -+ wmove(com_win, 0, 0); -+ wprintw(com_win, create_file_fail_msg, name); -+ wrefresh(com_win); -+ return; -+ } -+ close(fd); -+ if (write_file(name, 0)) - { - sprintf(string, "ispell %s", name); - sh_command(string); diff --git a/sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.1 b/sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.1 deleted file mode 100644 index fcc057a57fd9..000000000000 --- a/sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.1 +++ /dev/null @@ -1,21 +0,0 @@ -MD5 e8c5589329d476255f8a15f9f9bfebd1 freebsd-bin-6.1.tar.bz2 405680 -RMD160 33f2e5b49fce90dcaab652621af3b33e8e80b643 freebsd-bin-6.1.tar.bz2 405680 -SHA256 86d7a000827432c594f9d37b98a1f936f6168030cf033c6e621a37c670ef5271 freebsd-bin-6.1.tar.bz2 405680 -MD5 a04643beb2d94972200d6714688930cf freebsd-contrib-6.1.tar.bz2 36017365 -RMD160 225f6ade032533d08b98b79cb29b75da2a3c74fa freebsd-contrib-6.1.tar.bz2 36017365 -SHA256 41283b7f78597cf81f98477aef04eb9cce2b130b1a2f8b5c7d647549c973c054 freebsd-contrib-6.1.tar.bz2 36017365 -MD5 ac8defbdaaab754fee70ac27c02f2c0e freebsd-etc-6.1.tar.bz2 184045 -RMD160 b9a8bea64694c040c02b74f7633dc3cd77afa400 freebsd-etc-6.1.tar.bz2 184045 -SHA256 62b06b61e526c4a939503202aaca31cbce7a3de9daec03e67dc57119527eeff7 freebsd-etc-6.1.tar.bz2 184045 -MD5 d832298dc9565d138f86fd53e1d9ad3f freebsd-include-6.1.tar.bz2 127179 -RMD160 f873b13bb16408a390932d14974b39336bd90a7c freebsd-include-6.1.tar.bz2 127179 -SHA256 9cd9d47c5cc8ea4fc7afe185c9b391317fe013adb3f0a960e9fe498f166177b5 freebsd-include-6.1.tar.bz2 127179 -MD5 f33af43501169d9167c71c3a48a033c2 freebsd-lib-6.1.tar.bz2 2613584 -RMD160 f71aad95ef2bac094bdab9e317a99fb866fba042 freebsd-lib-6.1.tar.bz2 2613584 -SHA256 6ecb49695dc135e64cea949cb7e9b9998b15cb962797cdafc735a7e244744c37 freebsd-lib-6.1.tar.bz2 2613584 -MD5 8893a0a0ddfa8959f71e8ee561a11333 freebsd-sys-6.1.tar.bz2 17361671 -RMD160 eb19f6a345c665542df694a4f9170d227beaf3b6 freebsd-sys-6.1.tar.bz2 17361671 -SHA256 d2ecd79b83ba06c12e358adfccc7e057e15fb7c5be76d92c537b99cbe1d84f0f freebsd-sys-6.1.tar.bz2 17361671 -MD5 f9c5fe01da2eba4696619c63eb4cad8c freebsd-ubin-6.1.tar.bz2 1763218 -RMD160 5da58c546cebf30a6b661841dbcb5b53626a4a1e freebsd-ubin-6.1.tar.bz2 1763218 -SHA256 13429ed3cc8a14a4efda69b7d82004bf993b5a14591a6129a857d627221aeef6 freebsd-ubin-6.1.tar.bz2 1763218 diff --git a/sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.1-r1 b/sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.1-r1 deleted file mode 100644 index fcc057a57fd9..000000000000 --- a/sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.1-r1 +++ /dev/null @@ -1,21 +0,0 @@ -MD5 e8c5589329d476255f8a15f9f9bfebd1 freebsd-bin-6.1.tar.bz2 405680 -RMD160 33f2e5b49fce90dcaab652621af3b33e8e80b643 freebsd-bin-6.1.tar.bz2 405680 -SHA256 86d7a000827432c594f9d37b98a1f936f6168030cf033c6e621a37c670ef5271 freebsd-bin-6.1.tar.bz2 405680 -MD5 a04643beb2d94972200d6714688930cf freebsd-contrib-6.1.tar.bz2 36017365 -RMD160 225f6ade032533d08b98b79cb29b75da2a3c74fa freebsd-contrib-6.1.tar.bz2 36017365 -SHA256 41283b7f78597cf81f98477aef04eb9cce2b130b1a2f8b5c7d647549c973c054 freebsd-contrib-6.1.tar.bz2 36017365 -MD5 ac8defbdaaab754fee70ac27c02f2c0e freebsd-etc-6.1.tar.bz2 184045 -RMD160 b9a8bea64694c040c02b74f7633dc3cd77afa400 freebsd-etc-6.1.tar.bz2 184045 -SHA256 62b06b61e526c4a939503202aaca31cbce7a3de9daec03e67dc57119527eeff7 freebsd-etc-6.1.tar.bz2 184045 -MD5 d832298dc9565d138f86fd53e1d9ad3f freebsd-include-6.1.tar.bz2 127179 -RMD160 f873b13bb16408a390932d14974b39336bd90a7c freebsd-include-6.1.tar.bz2 127179 -SHA256 9cd9d47c5cc8ea4fc7afe185c9b391317fe013adb3f0a960e9fe498f166177b5 freebsd-include-6.1.tar.bz2 127179 -MD5 f33af43501169d9167c71c3a48a033c2 freebsd-lib-6.1.tar.bz2 2613584 -RMD160 f71aad95ef2bac094bdab9e317a99fb866fba042 freebsd-lib-6.1.tar.bz2 2613584 -SHA256 6ecb49695dc135e64cea949cb7e9b9998b15cb962797cdafc735a7e244744c37 freebsd-lib-6.1.tar.bz2 2613584 -MD5 8893a0a0ddfa8959f71e8ee561a11333 freebsd-sys-6.1.tar.bz2 17361671 -RMD160 eb19f6a345c665542df694a4f9170d227beaf3b6 freebsd-sys-6.1.tar.bz2 17361671 -SHA256 d2ecd79b83ba06c12e358adfccc7e057e15fb7c5be76d92c537b99cbe1d84f0f freebsd-sys-6.1.tar.bz2 17361671 -MD5 f9c5fe01da2eba4696619c63eb4cad8c freebsd-ubin-6.1.tar.bz2 1763218 -RMD160 5da58c546cebf30a6b661841dbcb5b53626a4a1e freebsd-ubin-6.1.tar.bz2 1763218 -SHA256 13429ed3cc8a14a4efda69b7d82004bf993b5a14591a6129a857d627221aeef6 freebsd-ubin-6.1.tar.bz2 1763218 diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.1-rpcgen-gcc41.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.1-rpcgen-gcc41.patch deleted file mode 100644 index 523f7041c0d5..000000000000 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.1-rpcgen-gcc41.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: fbsd-6.1/usr.bin/rpcgen/rpc_hout.c -=================================================================== ---- fbsd-6.1.orig/usr.bin/rpcgen/rpc_hout.c -+++ fbsd-6.1/usr.bin/rpcgen/rpc_hout.c -@@ -344,8 +344,7 @@ pprogramdef(def) - - if(!Cflag){ - ext = "extern "; -- f_print(fout, "%s", ext); -- pdispatch(def->def_name, vers->vers_num, 2); -+ /* pdispatch(def->def_name, vers->vers_num, 2); */ - for (proc = vers->procs; proc != NULL; - proc = proc->next) { - if (!define_printed(proc, -@@ -373,8 +372,7 @@ pprogramdef(def) - ext = "extern "; - } - -- f_print(fout, "%s", ext); -- pdispatch(def->def_name, vers->vers_num, i); -+ /* pdispatch(def->def_name, vers->vers_num, i); */ - for (proc = vers->procs; proc != NULL; - proc = proc->next) { - if (!define_printed(proc, diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-6.1-r1.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-6.1-r1.ebuild deleted file mode 100644 index d5ae1bd2f3ba..000000000000 --- a/sys-freebsd/freebsd-ubin/freebsd-ubin-6.1-r1.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/freebsd-ubin-6.1-r1.ebuild,v 1.1 2006/10/27 17:18:42 flameeyes Exp $ - -inherit bsdmk freebsd flag-o-matic pam - -DESCRIPTION="FreeBSD's base system source for /usr/bin" -SLOT="0" -KEYWORDS="~x86-fbsd" - -IUSE="atm bluetooth ssl usb nls ipv6 kerberos nis build" - -SRC_URI="mirror://gentoo/${UBIN}.tar.bz2 - mirror://gentoo/${CONTRIB}.tar.bz2 - mirror://gentoo/${LIB}.tar.bz2 - mirror://gentoo/${ETC}.tar.bz2 - mirror://gentoo/${BIN}.tar.bz2 - mirror://gentoo/${INCLUDE}.tar.bz2 - build? ( mirror://gentoo/${SYS}.tar.bz2 )" - -RDEPEND="sys-freebsd/freebsd-lib - ssl? ( dev-libs/openssl ) - kerberos? ( virtual/krb5 ) - sys-libs/zlib - virtual/pam" - -DEPEND="${RDEPEND} - sys-devel/flex - !build? ( =sys-freebsd/freebsd-sources-${RV}* ) - =sys-freebsd/freebsd-mk-defs-${RV}*" - -RDEPEND="${RDEPEND} - sys-process/cronbase" - -S="${WORKDIR}/usr.bin" - -pkg_setup() { - use nls || mymakeopts="${mymakeopts} NO_NLS= " - use atm || mymakeopts="${mymakeopts} NO_ATM= " - use bluetooth || mymakeopts="${mymakeopts} NO_BLUETOOTH= " - use ssl || mymakeopts="${mymakeopts} NO_OPENSSL= NO_CRYPT= " - use usb || mymakeopts="${mymakeopts} NO_USB= " - use ipv6 || mymakeopts="${mymakeopts} NO_INET6= " - use kerberos || mymakeopts="${mymakeopts} NO_KERBEROS= " - use nis || mymakeopts="${mymakeopts} NO_NIS= " - - mymakeopts="${mymakeopts} NO_SENDMAIL= " -} - -# List of patches to apply -PATCHES="${FILESDIR}/${PN}-6.0-bsdcmp.patch - ${FILESDIR}/${PN}-6.0-fixmakefiles.patch - ${FILESDIR}/${PN}-setXid.patch - ${FILESDIR}/${PN}-lint-stdarg.patch - ${FILESDIR}/${PN}-6.0-kdump-ioctl.patch - ${FILESDIR}/${P}-gcc41.patch - ${FILESDIR}/${P}-rpcgen-gcc41.patch" - -# Here we remove some sources we don't need because they are already -# provided by portage's packages or similar. In order: -# - Archiving tools, provided by their own ebuilds -# - ncurses stuff -# - less stuff -# - bind utils -# - rsh stuff -# and the rest are misc utils we already provide somewhere else. -REMOVE_SUBDIRS="bzip2 bzip2recover tar - tput tset - less lessecho lesskey - dig nslookup nsupdate host - rsh rlogin rusers rwho ruptime - compile_et lex vi smbutil file vacation nc ftp telnet - c99 c89 - whois" - -src_unpack() { - freebsd_src_unpack - - use build || ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" - - # Rename manpage for renamed cmp - mv ${S}/cmp/cmp.1 ${S}/cmp/bsdcmp.1 - # Fix whereis(1) manpath search. - sed -i -e 's:"manpath -q":"manpath":' "${S}/whereis/pathnames.h" -} - -src_install() { - freebsd_src_install - - dodir /bin - for bin in awk sed mkfifo uname true false touch tty; do - mv "${D}/usr/bin/${bin}" "${D}/bin/" || die "mv ${bin} failed" - dosym /bin/${bin} /usr/bin/${bin} || die "dosym ${bin} failed" - done - - for pamdfile in login passwd su; do - newpamd "${FILESDIR}/${pamdfile}.pamd" ${pamdfile} - done - - cd "${WORKDIR}/etc" - insinto /etc - doins remote phones opieaccess fbtab - - exeinto /etc/cron.daily - newexe "${FILESDIR}/locate-updatedb-cron" locate.updatedb -} diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-6.1.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-6.1.ebuild deleted file mode 100644 index 2613bcd50eb5..000000000000 --- a/sys-freebsd/freebsd-ubin/freebsd-ubin-6.1.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/freebsd-ubin-6.1.ebuild,v 1.12 2006/10/09 09:04:16 the_paya Exp $ - -inherit bsdmk freebsd flag-o-matic pam - -DESCRIPTION="FreeBSD's base system source for /usr/bin" -SLOT="0" -KEYWORDS="~x86-fbsd" - -IUSE="atm bluetooth ssl usb nls ipv6 kerberos nis build" - -SRC_URI="mirror://gentoo/${UBIN}.tar.bz2 - mirror://gentoo/${CONTRIB}.tar.bz2 - mirror://gentoo/${LIB}.tar.bz2 - mirror://gentoo/${ETC}.tar.bz2 - mirror://gentoo/${BIN}.tar.bz2 - mirror://gentoo/${INCLUDE}.tar.bz2 - build? ( mirror://gentoo/${SYS}.tar.bz2 )" - -RDEPEND="sys-freebsd/freebsd-lib - ssl? ( dev-libs/openssl ) - kerberos? ( virtual/krb5 ) - sys-libs/zlib - virtual/pam" - -DEPEND="${RDEPEND} - sys-devel/flex - !build? ( =sys-freebsd/freebsd-sources-${RV}* ) - =sys-freebsd/freebsd-mk-defs-${RV}*" - -RDEPEND="${RDEPEND} - sys-process/cronbase" - -S="${WORKDIR}/usr.bin" - -pkg_setup() { - use nls || mymakeopts="${mymakeopts} NO_NLS= " - use atm || mymakeopts="${mymakeopts} NO_ATM= " - use bluetooth || mymakeopts="${mymakeopts} NO_BLUETOOTH= " - use ssl || mymakeopts="${mymakeopts} NO_OPENSSL= NO_CRYPT= " - use usb || mymakeopts="${mymakeopts} NO_USB= " - use ipv6 || mymakeopts="${mymakeopts} NO_INET6= " - use kerberos || mymakeopts="${mymakeopts} NO_KERBEROS= " - use nis || mymakeopts="${mymakeopts} NO_NIS= " - - mymakeopts="${mymakeopts} NO_SENDMAIL= " -} - -# List of patches to apply -PATCHES="${FILESDIR}/${PN}-6.0-bsdcmp.patch - ${FILESDIR}/${PN}-6.0-fixmakefiles.patch - ${FILESDIR}/${PN}-setXid.patch - ${FILESDIR}/${PN}-lint-stdarg.patch - ${FILESDIR}/${PN}-6.0-kdump-ioctl.patch - ${FILESDIR}/${P}-gcc41.patch - ${FILESDIR}/${P}-rpcgen-gcc41.patch" - -# Here we remove some sources we don't need because they are already -# provided by portage's packages or similar. In order: -# - Archiving tools, provided by their own ebuilds -# - ncurses stuff -# - less stuff -# - bind utils -# - rsh stuff -# and the rest are misc utils we already provide somewhere else. -REMOVE_SUBDIRS="bzip2 bzip2recover tar - tput tset - less lessecho lesskey - dig nslookup nsupdate host - rsh rlogin rusers rwho ruptime - compile_et lex vi smbutil file vacation nc ftp telnet - c99 c89" - -src_unpack() { - freebsd_src_unpack - - use build || ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" - - # Rename manpage for renamed cmp - mv ${S}/cmp/cmp.1 ${S}/cmp/bsdcmp.1 - # Fix whereis(1) manpath search. - sed -i -e 's:"manpath -q":"manpath":' "${S}/whereis/pathnames.h" -} - -src_install() { - freebsd_src_install - - dodir /bin - for bin in awk sed mkfifo uname true false touch tty; do - mv "${D}/usr/bin/${bin}" "${D}/bin/" || die "mv ${bin} failed" - dosym /bin/${bin} /usr/bin/${bin} || die "dosym ${bin} failed" - done - - for pamdfile in login passwd su; do - newpamd "${FILESDIR}/${pamdfile}.pamd" ${pamdfile} - done - - cd "${WORKDIR}/etc" - insinto /etc - doins remote phones opieaccess fbtab - - exeinto /etc/cron.daily - newexe "${FILESDIR}/locate-updatedb-cron" locate.updatedb -} diff --git a/sys-freebsd/freebsd-usbin/Manifest b/sys-freebsd/freebsd-usbin/Manifest index 3ec405da3f84..fbcf1cc2d2ce 100644 --- a/sys-freebsd/freebsd-usbin/Manifest +++ b/sys-freebsd/freebsd-usbin/Manifest @@ -1,10 +1,6 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX SA-06-15-ypserv.patch 1932 RMD160 ac1091c913eec8ae1f0c0c479346caf718f0c87a SHA1 337bb241dfa1178c3ce5bb4ec83b1505dc35dc41 SHA256 e56e30d3eb2a23d4a659d5f3effe907b6b00844fab719d3ca3465ae122c703d9 -MD5 7d750e2e1b9f098a196e03c727775fa2 files/SA-06-15-ypserv.patch 1932 -RMD160 ac1091c913eec8ae1f0c0c479346caf718f0c87a files/SA-06-15-ypserv.patch 1932 -SHA256 e56e30d3eb2a23d4a659d5f3effe907b6b00844fab719d3ca3465ae122c703d9 files/SA-06-15-ypserv.patch 1932 AUX freebsd-usbin-6.0-fixmakefiles.patch 691 RMD160 247fdda9f51068dece3098d1ef01df0e30da7c65 SHA1 77a29d98fe51c2b848d663a150326baec5e718cc SHA256 d94f8d091ec7eaf75c264ee351b1b6c590297cb99f0c603c5e75672bb6c6c069 MD5 7158b6024cc0e8c5a8237fcc899e6210 files/freebsd-usbin-6.0-fixmakefiles.patch 691 RMD160 247fdda9f51068dece3098d1ef01df0e30da7c65 files/freebsd-usbin-6.0-fixmakefiles.patch 691 @@ -25,10 +21,6 @@ AUX freebsd-usbin-adduser.patch 428 RMD160 fecedb0bad9f29e9f0d889b2fce0edeb9a954 MD5 5444cbe3e2bc667285b7a68c02785017 files/freebsd-usbin-adduser.patch 428 RMD160 fecedb0bad9f29e9f0d889b2fce0edeb9a954d0b files/freebsd-usbin-adduser.patch 428 SHA256 2e91737ffefd3b7ce3b55da4ce98eb0425961bba2d4a7c4e7c7ffabc1d38f2af files/freebsd-usbin-adduser.patch 428 -AUX freebsd-usbin-nowrap.patch 1229 RMD160 2931c7cc81e6dcffdbdd9ea98ff5ae31654070cf SHA1 5b9cb96adcddd1216c6842f1d1f9311f637e4d49 SHA256 4ae0724d5e642e0399188b6805e94495af360ccf4f99443f9bfa80c220d29a8b -MD5 39d0d0915156088d99b1524fc39e8ebd files/freebsd-usbin-nowrap.patch 1229 -RMD160 2931c7cc81e6dcffdbdd9ea98ff5ae31654070cf files/freebsd-usbin-nowrap.patch 1229 -SHA256 4ae0724d5e642e0399188b6805e94495af360ccf4f99443f9bfa80c220d29a8b files/freebsd-usbin-nowrap.patch 1229 AUX moused.confd 827 RMD160 a9d0822aa3894caed9efa9df93ef25ec6ec6fb8e SHA1 e09f3f44ee29fa75a1ce6fbe9cdbfe503eaa11d6 SHA256 7c15a534c0b10a553848b13e1fccd27fad1684ddc1b252133269257e864d769e MD5 820d1c2ee0ee1c6d0c000b333a50001f files/moused.confd 827 RMD160 a9d0822aa3894caed9efa9df93ef25ec6ec6fb8e files/moused.confd 827 @@ -85,50 +77,34 @@ AUX syslogd.initd 573 RMD160 76333e56a971d1f1a3f8d1cec523662d01255c6f SHA1 22472 MD5 48a59f2d635b32605288394a094e9e0b files/syslogd.initd 573 RMD160 76333e56a971d1f1a3f8d1cec523662d01255c6f files/syslogd.initd 573 SHA256 32079c481847728f4cd182a7957edb2cbb21606ecae9dfab2b4f8ceb8ad7a3ac files/syslogd.initd 573 -DIST freebsd-contrib-6.1.tar.bz2 36017365 RMD160 225f6ade032533d08b98b79cb29b75da2a3c74fa SHA1 adac960daad3f4169874fe0ba1050fe7e906aa23 SHA256 41283b7f78597cf81f98477aef04eb9cce2b130b1a2f8b5c7d647549c973c054 DIST freebsd-contrib-6.2_rc2.tar.bz2 36594463 RMD160 d957a4054073009fe20cc13353797c2dc1aa0eaa SHA1 b93129a87d91e9ef37748337667a68a7530a30c4 SHA256 aeddb53e9dea3da081419be386251c144c63496d769d07b61e9085a3e52c74e0 -DIST freebsd-etc-6.1.tar.bz2 184045 RMD160 b9a8bea64694c040c02b74f7633dc3cd77afa400 SHA1 4a1fff7fa1c77485c5efccf5ab1155e497d1cd82 SHA256 62b06b61e526c4a939503202aaca31cbce7a3de9daec03e67dc57119527eeff7 DIST freebsd-etc-6.2_rc2.tar.bz2 189416 RMD160 e98c8821fc4fbcf2890fcc8155c8fa0f74fd417c SHA1 4fad080351793c84c491407e797e62559245fc40 SHA256 b4f673da45ca646fae9e457c4a8e3255dbe5365445537d4e6ba39ac9b54ee40e -DIST freebsd-include-6.1.tar.bz2 127179 RMD160 f873b13bb16408a390932d14974b39336bd90a7c SHA1 747d7498ce80846274e49ed4487440dcbefe96af SHA256 9cd9d47c5cc8ea4fc7afe185c9b391317fe013adb3f0a960e9fe498f166177b5 DIST freebsd-include-6.2_rc2.tar.bz2 131650 RMD160 811494045dd44c953efeb690258a52ec89a169fe SHA1 b47035a25632a890f83889789c0a076e5e8a6bc6 SHA256 ab4264cf293c5acffb9cfbabce3605841187c900b76eb1cd4a403053ee57220c -DIST freebsd-lib-6.1.tar.bz2 2613584 RMD160 f71aad95ef2bac094bdab9e317a99fb866fba042 SHA1 c7fed3b4a996fdd25f97eef428dd40023dc53a7e SHA256 6ecb49695dc135e64cea949cb7e9b9998b15cb962797cdafc735a7e244744c37 DIST freebsd-lib-6.2_rc2.tar.bz2 2670872 RMD160 bd8b9837acfde404bed998ba3ef5450bb380b779 SHA1 b7df3ad81163558a02e9f4c960f33f8fa3c38106 SHA256 b805264da9f1826d2edb9f5b946ebaae5371fcce146623e4ed695a187c1a4993 -DIST freebsd-libexec-6.1.tar.bz2 277860 RMD160 bef98efbc76812cf36b55067433039f3805cfbab SHA1 8204a510e44e21cbf53715f3d4a2518b8192400d SHA256 38eaddc9edc36597e42ca3c63ee8a2fd6f07f96c7294aea75a9988ac5b07b357 DIST freebsd-libexec-6.2_rc2.tar.bz2 277162 RMD160 e1868104643febadcd503d2da8b781ef7f24b22e SHA1 01b80b12889149052896be298548660f23b8a9f0 SHA256 28f1f8f60fac76043b46d701b60ea182d9f31af277ac82f4174c93f25f04a632 -DIST freebsd-sbin-6.1.tar.bz2 1156163 RMD160 167a4545da086f52b9a8fd52e48f9ec6cfdd3150 SHA1 2d3d393b843e071c20fad104bc610948eac6454b SHA256 fb15602238f98f6dd2b9d56bc9ece09c922b0c49599aea87620ba70c853f95d6 DIST freebsd-sbin-6.2_rc2.tar.bz2 1161795 RMD160 85e47cda22e8e5d8eff1b08abeafdbd02d3989d7 SHA1 6d2dce4b00a68d95f66b6a53ca2c7395ffd3feb6 SHA256 dcc67eeba323e4c55fdc7ba6a4fa6af6d004157eb3de6f6923cf7fbb6d55393a -DIST freebsd-sys-6.1.tar.bz2 17361671 RMD160 eb19f6a345c665542df694a4f9170d227beaf3b6 SHA1 f9da69cabdaaad268c79670c06ba4fff3e3ef6a8 SHA256 d2ecd79b83ba06c12e358adfccc7e057e15fb7c5be76d92c537b99cbe1d84f0f DIST freebsd-sys-6.2_rc2.tar.bz2 18339807 RMD160 ab2e6110b767319a0135130f9ad16d074de61483 SHA1 f7881f43e815930fe3ef6c3517d4e2475f80479e SHA256 392d80c8dae6b7cddc4810f59869a87ec4d0d699c534d8a034b2b273640a7666 -DIST freebsd-ubin-6.1.tar.bz2 1763218 RMD160 5da58c546cebf30a6b661841dbcb5b53626a4a1e SHA1 7d1b0568d02f192dcd3bd7f972613376d3d0f16d SHA256 13429ed3cc8a14a4efda69b7d82004bf993b5a14591a6129a857d627221aeef6 DIST freebsd-ubin-6.2_rc2.tar.bz2 1773409 RMD160 be5fa09f2b84b77981ba6ae34d2c237b05164776 SHA1 6052972c318830a717cb3f6b72fe034c1a1fe147 SHA256 391d266053323b96a258a264abec848bd0799ded76dcad098b510bd5d9a75398 -DIST freebsd-usbin-6.1.tar.bz2 2664570 RMD160 98a87538790a814d0afd35bb0f848bcff574c72d SHA1 c7e6856e7f6bd2d45790737f411348b301944b91 SHA256 70b4a494a72d130d641500bfa857bdf98c9a4a040da2699475902523ba5c374e DIST freebsd-usbin-6.2_rc2.tar.bz2 2696638 RMD160 c907088555c4bba3e4542f69649f6df9dba4fc8a SHA1 b5d65f1d02bcb4fc0aae3649a6b0699b11aee820 SHA256 952f3d8638035b31e65e4374139f49b993b55b88fbbe62ce0dead963ac552b25 -EBUILD freebsd-usbin-6.1-r1.ebuild 4711 RMD160 84233ad505daa08b6ac352edd733eee70c016672 SHA1 78139309e836b19b5a6cddb0c95022f1dfe08903 SHA256 c31b0b8d221d596f9eea396c655201fd2c6c7c18bbaf175f11ac81db9f459088 -MD5 f0ef09d38ccd6b0b7694725a18561ecd freebsd-usbin-6.1-r1.ebuild 4711 -RMD160 84233ad505daa08b6ac352edd733eee70c016672 freebsd-usbin-6.1-r1.ebuild 4711 -SHA256 c31b0b8d221d596f9eea396c655201fd2c6c7c18bbaf175f11ac81db9f459088 freebsd-usbin-6.1-r1.ebuild 4711 EBUILD freebsd-usbin-6.2_rc2.ebuild 5399 RMD160 ce007f8418426c948abb8644829442a735134192 SHA1 600841604b5683f3216e61406de66f32c5e015a0 SHA256 5dc86e43420554d08068ffec0a101475725346d93758f3dfb46b7b2c7867d9b1 MD5 3a55de49aad99994db0ff67272ae9893 freebsd-usbin-6.2_rc2.ebuild 5399 RMD160 ce007f8418426c948abb8644829442a735134192 freebsd-usbin-6.2_rc2.ebuild 5399 SHA256 5dc86e43420554d08068ffec0a101475725346d93758f3dfb46b7b2c7867d9b1 freebsd-usbin-6.2_rc2.ebuild 5399 -MISC ChangeLog 13060 RMD160 824b49397e7122b1d912860e7491d128d144ccd6 SHA1 d1381e7832543805d331a96270d20aee4bc562fa SHA256 6a312908b63aac5a37d0dca32829972500c006450eb980c7744f6dff56b89b39 -MD5 b203a88863b8db2d5a131dfe070f24e3 ChangeLog 13060 -RMD160 824b49397e7122b1d912860e7491d128d144ccd6 ChangeLog 13060 -SHA256 6a312908b63aac5a37d0dca32829972500c006450eb980c7744f6dff56b89b39 ChangeLog 13060 +MISC ChangeLog 13234 RMD160 c5cedbd9027396db1d8e49f75436c403626df514 SHA1 74680859fdcdad72ba300980e274e54ac03dea5b SHA256 46b5235dcdf7b86454a9aa811af37ecfa48eccbae39af61cb51e6fa36c405220 +MD5 259ea4ff5e25550d0fc11989ae542a5c ChangeLog 13234 +RMD160 c5cedbd9027396db1d8e49f75436c403626df514 ChangeLog 13234 +SHA256 46b5235dcdf7b86454a9aa811af37ecfa48eccbae39af61cb51e6fa36c405220 ChangeLog 13234 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata.xml 156 -MD5 8ea0ed97394ee68e83c7b64e32dae123 files/digest-freebsd-usbin-6.1-r1 2322 -RMD160 b91063f590c67c760e756be84b79a3e555726ce9 files/digest-freebsd-usbin-6.1-r1 2322 -SHA256 391134c7559b784e096c3464be161bc6d6e5217f3b5de4326a1ba032f4a74882 files/digest-freebsd-usbin-6.1-r1 2322 MD5 e041b4e19c86cc21217a557529768b0f files/digest-freebsd-usbin-6.2_rc2 2430 RMD160 4a1357c6bebfb43cdda1db2f802c945f9b1bc86c files/digest-freebsd-usbin-6.2_rc2 2430 SHA256 9f42c76dcdb48089548274792ad71c34328eb17ae23c9632eaedecfe9aa4ac8d files/digest-freebsd-usbin-6.2_rc2 2430 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFm9OjAiZjviIA2XgRAnVeAKDvqYTVp8aTsgelyA1uQvZTzOS1sACfSZUt -oPCSqN5IOQBZ0z4xqSc+ul4= -=J0eE +iD8DBQFFnsQGAiZjviIA2XgRAv/sAJ0SbTipiNmalihPd1j/uc5K6kv9mQCgzAgh +pxzzUJf2vsWKsreZ9hd8Dq8= +=Dyyl -----END PGP SIGNATURE----- diff --git a/sys-freebsd/freebsd-usbin/files/SA-06-15-ypserv.patch b/sys-freebsd/freebsd-usbin/files/SA-06-15-ypserv.patch deleted file mode 100644 index e5f62357a4d7..000000000000 --- a/sys-freebsd/freebsd-usbin/files/SA-06-15-ypserv.patch +++ /dev/null @@ -1,84 +0,0 @@ -Index: usr.sbin/ypserv/yp_access.c -=================================================================== -RCS file: /home/ncvs/src/usr.sbin/ypserv/yp_access.c,v -retrieving revision 1.22 -diff -u -I__FBSDID -r1.22 yp_access.c ---- usr.sbin/ypserv/yp_access.c 3 May 2003 21:06:42 -0000 1.22 -+++ usr.sbin/ypserv/yp_access.c 31 May 2006 03:41:25 -0000 -@@ -87,12 +87,6 @@ - "ypproc_maplist" - }; - --#ifdef TCP_WRAPPER --void --load_securenets(void) --{ --} --#else - struct securenet { - struct in_addr net; - struct in_addr mask; -@@ -177,7 +171,6 @@ - fclose(fp); - - } --#endif - - /* - * Access control functions. -@@ -219,11 +212,12 @@ - #endif - { - struct sockaddr_in *rqhost; -- int status = 0; -+ int status_securenets = 0; -+#ifdef TCP_WRAPPER -+ int status_tcpwrap; -+#endif - static unsigned long oldaddr = 0; --#ifndef TCP_WRAPPER - struct securenet *tmp; --#endif - const char *yp_procedure = NULL; - char procbuf[50]; - -@@ -274,21 +268,34 @@ - } - - #ifdef TCP_WRAPPER -- status = hosts_ctl("ypserv", STRING_UNKNOWN, -+ status_tcpwrap = hosts_ctl("ypserv", STRING_UNKNOWN, - inet_ntoa(rqhost->sin_addr), ""); --#else -+#endif - tmp = securenets; - while (tmp) { - if (((rqhost->sin_addr.s_addr & ~tmp->mask.s_addr) - | tmp->net.s_addr) == rqhost->sin_addr.s_addr) { -- status = 1; -+ status_securenets = 1; - break; - } - tmp = tmp->next; - } --#endif - -- if (!status) { -+#ifdef TCP_WRAPPER -+ if (status_securenets == 0 || status_tcpwrap == 0) { -+#else -+ if (status_securenets == 0) { -+#endif -+ /* -+ * One of the following two events occured: -+ * -+ * (1) The /var/yp/securenets exists and the remote host does not -+ * match any of the networks specified in it. -+ * (2) The hosts.allow file has denied access and TCP_WRAPPER is -+ * defined. -+ * -+ * In either case deny access. -+ */ - if (rqhost->sin_addr.s_addr != oldaddr) { - yp_error("connect from %s:%d to procedure %s refused", - inet_ntoa(rqhost->sin_addr), diff --git a/sys-freebsd/freebsd-usbin/files/digest-freebsd-usbin-6.1-r1 b/sys-freebsd/freebsd-usbin/files/digest-freebsd-usbin-6.1-r1 deleted file mode 100644 index 2cc68094886e..000000000000 --- a/sys-freebsd/freebsd-usbin/files/digest-freebsd-usbin-6.1-r1 +++ /dev/null @@ -1,27 +0,0 @@ -MD5 a04643beb2d94972200d6714688930cf freebsd-contrib-6.1.tar.bz2 36017365 -RMD160 225f6ade032533d08b98b79cb29b75da2a3c74fa freebsd-contrib-6.1.tar.bz2 36017365 -SHA256 41283b7f78597cf81f98477aef04eb9cce2b130b1a2f8b5c7d647549c973c054 freebsd-contrib-6.1.tar.bz2 36017365 -MD5 ac8defbdaaab754fee70ac27c02f2c0e freebsd-etc-6.1.tar.bz2 184045 -RMD160 b9a8bea64694c040c02b74f7633dc3cd77afa400 freebsd-etc-6.1.tar.bz2 184045 -SHA256 62b06b61e526c4a939503202aaca31cbce7a3de9daec03e67dc57119527eeff7 freebsd-etc-6.1.tar.bz2 184045 -MD5 d832298dc9565d138f86fd53e1d9ad3f freebsd-include-6.1.tar.bz2 127179 -RMD160 f873b13bb16408a390932d14974b39336bd90a7c freebsd-include-6.1.tar.bz2 127179 -SHA256 9cd9d47c5cc8ea4fc7afe185c9b391317fe013adb3f0a960e9fe498f166177b5 freebsd-include-6.1.tar.bz2 127179 -MD5 f33af43501169d9167c71c3a48a033c2 freebsd-lib-6.1.tar.bz2 2613584 -RMD160 f71aad95ef2bac094bdab9e317a99fb866fba042 freebsd-lib-6.1.tar.bz2 2613584 -SHA256 6ecb49695dc135e64cea949cb7e9b9998b15cb962797cdafc735a7e244744c37 freebsd-lib-6.1.tar.bz2 2613584 -MD5 244baf5f7ef26dbf33428970913a40f3 freebsd-libexec-6.1.tar.bz2 277860 -RMD160 bef98efbc76812cf36b55067433039f3805cfbab freebsd-libexec-6.1.tar.bz2 277860 -SHA256 38eaddc9edc36597e42ca3c63ee8a2fd6f07f96c7294aea75a9988ac5b07b357 freebsd-libexec-6.1.tar.bz2 277860 -MD5 33a8f60e595bc82c6abb7e47de1b9fa8 freebsd-sbin-6.1.tar.bz2 1156163 -RMD160 167a4545da086f52b9a8fd52e48f9ec6cfdd3150 freebsd-sbin-6.1.tar.bz2 1156163 -SHA256 fb15602238f98f6dd2b9d56bc9ece09c922b0c49599aea87620ba70c853f95d6 freebsd-sbin-6.1.tar.bz2 1156163 -MD5 8893a0a0ddfa8959f71e8ee561a11333 freebsd-sys-6.1.tar.bz2 17361671 -RMD160 eb19f6a345c665542df694a4f9170d227beaf3b6 freebsd-sys-6.1.tar.bz2 17361671 -SHA256 d2ecd79b83ba06c12e358adfccc7e057e15fb7c5be76d92c537b99cbe1d84f0f freebsd-sys-6.1.tar.bz2 17361671 -MD5 f9c5fe01da2eba4696619c63eb4cad8c freebsd-ubin-6.1.tar.bz2 1763218 -RMD160 5da58c546cebf30a6b661841dbcb5b53626a4a1e freebsd-ubin-6.1.tar.bz2 1763218 -SHA256 13429ed3cc8a14a4efda69b7d82004bf993b5a14591a6129a857d627221aeef6 freebsd-ubin-6.1.tar.bz2 1763218 -MD5 ca61245fd3ec21d31ab9e41cd1ad35b7 freebsd-usbin-6.1.tar.bz2 2664570 -RMD160 98a87538790a814d0afd35bb0f848bcff574c72d freebsd-usbin-6.1.tar.bz2 2664570 -SHA256 70b4a494a72d130d641500bfa857bdf98c9a4a040da2699475902523ba5c374e freebsd-usbin-6.1.tar.bz2 2664570 diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-nowrap.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-nowrap.patch deleted file mode 100644 index f01d6e2b9690..000000000000 --- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-nowrap.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -ur usr.sbin/rpcbind/Makefile usr.sbin-nowrap/rpcbind/Makefile ---- usr.sbin/rpcbind/Makefile 2003-04-04 17:49:18 +0000 -+++ usr.sbin-nowrap/rpcbind/Makefile 2005-06-20 14:15:59 +0000 -@@ -13,9 +13,19 @@ - rpcb_svc.c rpcb_svc_com.c security.c warmstart.c util.c \ - rpc_generic.c - --CFLAGS+= -I${LIBCRPCDIR} -I${LIBCINCLUDE} -DPORTMAP -DINET6 -DLIBWRAP -+CFLAGS+= -I${LIBCRPCDIR} -I${LIBCINCLUDE} -DPORTMAP - --DPADD= ${LIBWRAP} ${LIBUTIL} --LDADD= -lwrap -lutil -+DPADD= ${LIBUTIL} -+LDADD= -lutil -+ -+.if !defined(NO_WRAP) -+CFLAGS+= -DLIBWRAP -+DPADD+= ${LIBWRAP} -+LDADD+= -lwrap -+.endif -+ -+.if !defined(NOINET6) -+CFLAGS+= -DINET6 -+.endif - - .include -diff -ur usr.sbin/ypserv/Makefile usr.sbin-nowrap/ypserv/Makefile ---- usr.sbin/ypserv/Makefile 2003-04-04 17:49:20 +0000 -+++ usr.sbin-nowrap/ypserv/Makefile 2005-06-20 14:17:41 +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 - diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-6.1-r1.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-6.1-r1.ebuild deleted file mode 100644 index f84b83ae95a5..000000000000 --- a/sys-freebsd/freebsd-usbin/freebsd-usbin-6.1-r1.ebuild +++ /dev/null @@ -1,157 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-6.1-r1.ebuild,v 1.5 2006/10/05 22:14:26 flameeyes Exp $ - -inherit bsdmk freebsd flag-o-matic eutils - -DESCRIPTION="FreeBSD /usr/sbin tools" -SLOT="0" -KEYWORDS="~x86-fbsd" - -IUSE="atm bluetooth tcpd ssl usb ipv6 acpi ipfilter isdn pam ssl radius - minimal ipsec nis pam suid nat radius build" - -SRC_URI="mirror://gentoo/${P}.tar.bz2 - mirror://gentoo/${CONTRIB}.tar.bz2 - mirror://gentoo/${UBIN}.tar.bz2 - mirror://gentoo/${LIB}.tar.bz2 - mirror://gentoo/${SBIN}.tar.bz2 - mirror://gentoo/${ETC}.tar.bz2 - nis? ( mirror://gentoo/${LIBEXEC}.tar.bz2 ) - build? ( mirror://gentoo/${SYS}.tar.bz2 - mirror://gentoo/${INCLUDE}.tar.bz2 )" - -RDEPEND="=sys-freebsd/freebsd-lib-${RV}* - =sys-freebsd/freebsd-libexec-${RV}* - ssl? ( dev-libs/openssl ) - tcpd? ( sys-apps/tcp-wrappers ) - net-libs/libpcap" -DEPEND="${RDEPEND} - =sys-freebsd/freebsd-mk-defs-${RV}* - !build? ( =sys-freebsd/freebsd-sources-${RV}* ) - sys-apps/texinfo - sys-devel/flex" - -PROVIDE="virtual/logger" - -S="${WORKDIR}/usr.sbin" - -pkg_setup() { - # Release crunch is something like minimal. It seems to remove everything - # which is not needed to work. - use minimal && mymakeopts="${mymakeopts} RELEASE_CRUNCH= " - - use atm || mymakeopts="${mymakeopts} NO_ATM= " - use bluetooth || mymakeopts="${mymakeopts} NO_BLUETOOTH= " - use ipv6 || mymakeopts="${mymakeopts} NO_INET6= " - use ipfilter || mymakeopts="${mymakeopts} NO_IPFILTER= " - use ssl || mymakeopts="${mymakeopts} NO_OPENSSL= NO_CRYPT= " - use usb || mymakeopts="${mymakeopts} NO_USB= " - use acpi || mymakeopts="${mymakeopts} NO_ACPI= " - use isdn || mymakeopts="${mymakeopts} NO_I4B= " - use pam || mymakeopts="${mymakeopts} NO_PAM= " - use radius || mymakeopts="${mymakeopts} NO_RADIUS= " - use suid || mymakeopts="${mymakeopts} NO_SUID= " - use ipsec || mymakeopts="${mymakeopts} NO_IPSEC= " - use nis || mymakeopts="${mymakeopts} NO_NIS= " - use nat || mymakeopts="${mymakeopts} NO_NAT= " - use pam || mymakeopts="${mymakeopts} NO_PAM= " - use suid || mymakeopts="${mymakeopts} NO_SUID= PPP_NOSUID= " - use radius || mymakeopts="${mymakeopts} NO_RADIUS= " - use tcpd || mymakeopts="${mymakeopts} NO_WRAP= " - - mymakeopts="${mymakeopts} NO_MAILWRAPPER= NO_BIND= NO_SENDMAIL= NO_PF= NO_AUTHPF= NO_LPR=" - - # kldxref does not build with -O2 - replace-flags "-O?" "-O1" -} - -PATCHES="${FILESDIR}/${PN}-6.0-fixmakefiles.patch - ${FILESDIR}/${PN}-6.1-nowrap.patch - ${FILESDIR}/${P}-gcc41.patch - ${FILESDIR}/SA-06-15-ypserv.patch - ${FILESDIR}/${PN}-adduser.patch" - -REMOVE_SUBDIRS=" - named named-checkzone named-checkconf rndc rndc-confgen - dnssec-keygen dnssec-signzone - tcpdchk tcpdmatch - sendmail praliases editmap mailstats makemap - sysinstall cron mailwrapper ntp bsnmpd mount_smbfs - tcpdump ndp traceroute pkg_install inetd - wpa/wpa_supplicant wpa/hostapd wpa/hostapd_cli wpa/wpa_cli - zic amd" - -src_unpack() { - freebsd_src_unpack - - if ! use build; then - ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" - ln -s "/usr/include" "${WORKDIR}/include" - fi -} - -src_install() { - # By creating these directories we avoid having to do a - # more complex hack - dodir /usr/share/doc - dodir /sbin - dodir /usr/libexec - dodir /usr/bin - - # FILESDIR is used by some makefiles which will install files - # in the wrong place, just put it in the doc directory. - mkinstall DOCDIR=/usr/share/doc/${PF} || die "Install failed" - - for util in nfs nfsmount rpcbind syslogd moused powerd syscons; do - newinitd ${FILESDIR}/${util}.initd ${util} - [[ -e ${FILESDIR}/${util}.confd ]] && \ - newconfd ${FILESDIR}/${util}.confd ${util} - done - - for class in daily monthly weekly; do - cat - > ${T}/periodic.${class} <