[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-lib/, sys-freebsd/freebsd-lib/files/

[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-lib/, sys-freebsd/freebsd-lib/files/

[Yuta SATOH]

commit:     639a2f971958c3346e6c433e1a4198454bfd4db1
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Fri Aug 30 12:10:45 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Fri Aug 30 12:10:45 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=639a2f97

freebsd-lib-9.2-liblink.patch: fix bug 482918

---
 sys-freebsd/freebsd-lib/Manifest                            |  2 +-
 sys-freebsd/freebsd-lib/files/freebsd-lib-9.2-liblink.patch | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index ad60477..8538f2e 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -12,7 +12,7 @@ AUX freebsd-lib-9.0-opieincludes.patch 4495 SHA256 0868e7454053170c3399f1a03a68f
 AUX freebsd-lib-9.0-trylock-adaptive.patch 439 SHA256 af501c40124e628c2f739d88a4efa7ef3513694bd79ab44db30e4b3f73864612 SHA512 ceeeea302294db5a25b5534685dce563778572010f0072ecb300a66550ee8cc241e0ae5523e32fd5424560e82d913c37aefe06c2a6725e951ba4ad5df73a1a68 WHIRLPOOL d2a65eab4b03a7fb65e2dd6f03c2e60fe1248412e28a0829757e6cb733d1f487ee79959680f1db8af20fc409a165c5f4aea3038171e7b82aee7d38c29552531e
 AUX freebsd-lib-9.1-.eh_frame_hdr-fix.patch 695 SHA256 6c6d7a958c989edc6ee76c5b9c2146fa449adda11c3b89b550780c7a78d93190 SHA512 c40270e8890a1152a6f2e705461ac64f8cc44e6d0306d895a0d146017d4fe3553853de88178e0744fc1be4197a4eb35b578c68593c80467dd8cf15c35720413d WHIRLPOOL 1fa3c5cdba333951b918eb5c1eb793ab49921268a6a397e38f2adad383c2c03ccf382892ed8d44e2480f8ca891ce3c3a0b122a026cbf232058ac3bcf2f2d5133
 AUX freebsd-lib-9.1-rmgssapi.patch 699 SHA256 0dc94a565f140beca0800446c72bd874f99c56125181f7a037154dcd898d2615 SHA512 cb0b292cca0c321ed72b1a792a3975be239303b3990efc6665b0c960dfe17fdbb4529405286c0a956c4b4711462d2ee9d7d1c9d343ad3246b43c49edfc87dae0 WHIRLPOOL 55adff8c3436959b4545ba54c0eff3cd640dd4f0d0871bd66dad2501c04e84eb24f27b882dde9050b088dadecc9af6049493e848a1d508646149075180c8c414
-AUX freebsd-lib-9.2-liblink.patch 1694 SHA256 7586ac9aed55c833099840fd0f7b7c119ca9fe35fcce9b507b235ae0ae5aceca SHA512 0d9b33b5bd8b661c1403485ba2005d6c7d34341d1ae6c710a4516583ca9bacee050f71e06c039378b826278db570036a4b8f107833d9151c7a3cdab43f64ceb3 WHIRLPOOL 9b2782a936dc5be5f2d789633b6eb9b68d2f199bbe7dc12c7c86a848191abbedbef942370d233e4398688ef5832e114039126662b9821e2ef04bd7e723e6fe8a
+AUX freebsd-lib-9.2-liblink.patch 2012 SHA256 065522cabf7dca8062f41c7c9154931864ec3304a2c1f59d44f88b894bf55afc SHA512 97f2f326f431337da5d14a4a37b6fced3224c85bb25ea1f0fcd121790d94dbfb27c98c7b15eb92b1967634be15db96653d5bc6fc458de63a4c988e9e650d965d WHIRLPOOL 45392c571d0f05130836d6d4f0d6b3503f58e4f4d8907d07e1011329b9285d6a010bc35606ff74d529906f6c8f240336bc265eef105196cd3e26390b3bac6d77
 AUX freebsd-lib-bsdxml2expat.patch 708 SHA256 0c3ec3657155c5032479181119c488d43a479ab0dfe7a7d7ed0dabce16853e85 SHA512 d3b321062886ee636a09af4b8714ae90317c17eb954a3d491cd21ca90605e26491033df4d6f02a517eda423783db74dad16adf7ee1bdc5557392cc70218ee9c7 WHIRLPOOL 5c262c59aee9e642d3a8929a453b56c7a55ba60f3011d6ac07b750a30297eb992a564ba4db18714b7eac58bbe3ded1ff4249150128947d25dd1344e59e16c9cb
 AUX freebsd-lib-includes.patch 316 SHA256 be4dd4c905715c2d165be282cf377f799b32ccb76986947bc0bf1b5730b57b06 SHA512 31b7f368a4d3998e42486cb944a001a8371c365276eac94fa8712e29dbe9a13a7756a2fd77fbff87a1f7f4c19b32721c74bbb099f611d46a8c78b73f92d9255e WHIRLPOOL 8c4c2c6d1e9556303520c4cd8f6996f0f24c8b45985d4326db880c187b6db30e914a6e47b40ea4a79d7a309fdd579b39232329daf74758412ac518b0a9d0a317
 AUX freebsd-sources-9.0-sysctluint.patch 403 SHA256 884fbc5d6d3766ea3d4609946f56072f36f95368dc13ee316c330a46d42f0c9e SHA512 f3a87cb187858bc6fd1bafda3c3bd7bbda52b07239a50a7c1aa201df2c52a58d4809e196b8799b1949c8ca1a556519d454ad1789358540e3a96cd480fc0a504c WHIRLPOOL 1fd9852d59378b3fa8682886085f4f63ccd2a57806161b9a3ccb0cbe0c465be2e5620ed57942a8687656859e1a9df17c7d298ea66ec037514bbe7707783aa9f8

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.2-liblink.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.2-liblink.patch
index 3759c91..99ee36a 100644
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.2-liblink.patch
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.2-liblink.patch
@@ -65,3 +65,16 @@ index fcb16de..6d0312b 100644
  
  MAN=		cam.3 cam_cdbparse.3
  
+diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile
+index 446f552..f55b3ba 100644
+--- a/lib/libtelnet/Makefile
++++ b/lib/libtelnet/Makefile
+@@ -13,6 +13,8 @@ INTERNALLIB=
+ SRCS=		genget.c getent.c misc.c
+ CFLAGS+=	-I${TELNETDIR}
+ 
++CFLAGS+=	-I${.CURDIR}/../libmp
++
+ WARNS?=		2
+ 
+ .if !defined(RELEASE_CRUNCH)

[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-lib/, sys-freebsd/freebsd-lib/files/

[Yuta SATOH]

commit:     88af79cd9bee910ef20561f3bc2872c61ccf4452
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Thu Jul  3 15:09:33 2014 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Thu Jul  3 15:09:33 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=88af79cd

freebsd-lib-10.0.0.9999-r1: security fix CVE-2014-3951

---
 sys-freebsd/freebsd-lib/Manifest                   |   3 +-
 .../files/freebsd-lib-10.0-cve-2014-3951.patch     | 175 +++++++++++++++++++++
 ...99.ebuild => freebsd-lib-10.0.0.9999-r1.ebuild} |   1 +
 3 files changed, 178 insertions(+), 1 deletion(-)

diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 51eb8c0..27ef4e5 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -1,5 +1,6 @@
 AUX freebsd-lib-10.0-atfcxx.patch 1545 SHA256 eef9680da13fb24adc01fab170d83787e8b9926ec2bbb89cd7933b3dd8b35306 SHA512 37d8fc83b97addef48807196738be511fdc74b002dce321c2eaf38db5b618ff4a2f8e8447677c60b96b8add8f1dc586a66a30992289fa95e20e2005589e83953 WHIRLPOOL 78096c4064b98cbb05617355c8c65c306f9d6ceb2a2c8f772cf39f20c81395da9a2d1e128f5b1382bdd65d7e6d7df2d08606933ac5fa8a9aa3d55ec8b76363e2
 AUX freebsd-lib-10.0-clang34.patch 939 SHA256 c8755730fb0cf7bd7d7deed870550a36cada5dadef06390b8dabba824129af4e SHA512 5252167e5d938edf43fb71eb3bb41f87844809abe230efc88f9697bb1f69388e6cc71a9682fb89db1cd6ad45a8987df9eb251444f638eaaa750640ab3bcc9ae8 WHIRLPOOL e68346ae50163021c72a0baa234cda74020796aa4e6375ba60342e83ee8127944ad82c71306c967a8548c2e0a4ace13be08349866d0833167e5477dd02c855e0
+AUX freebsd-lib-10.0-cve-2014-3951.patch 5795 SHA256 0babc677e0af00828a3203fb55e05c23d46a7c5e56179d187d9753f38dd87849 SHA512 27c08aacc0e33f80ea6164bdd29acd6134393c002a6e544ce2b2d5893b24766dbed96e2b7216ef714f5f77fd197e93dac6ef2f909272483aa3ecdafaa5f0e42c WHIRLPOOL 188c0fd6880353c78985e76fe59626dfaa366159e67aeaa9b170331aad5394a5e1dad959b9cb3cb572e79d41b4660ab97f78067410cba10eefd15ece04cbf498
 AUX freebsd-lib-10.0-libiconv_modules.patch 645 SHA256 eeaf5e8dd482935982f4c232c227eadae4258e63a8dd9631cb59140ec21cbe08 SHA512 6d07c28a92985a8de517bd0eee5bf4a9ca60eee214c7111cda74d2eb6b2cfac1105b2673b09f64d9da2e54ecddf77bc27890a42a4d4f79243778f14fed8a4fdd WHIRLPOOL 27383421a4a7ee3c275db4f82ccedd3004c24d1ef5408db31f5647a06c8d31dc47b0ad3d3a202b8598676229953854656c8bc9f74febc76792dd085894c8d31b
 AUX freebsd-lib-10.0-liblink.patch 2448 SHA256 cbdcca5cc893b0d0b1ff98d1c1046519cebe9877b4cddd180340cfafbbbd2726 SHA512 c77049fa170d08d6ce035a8b9ae799f6d8e0b899371c1644a7493543fc07511515f68d54c82c618064954e48023c09bfcff452bd93e69ac07b7f8c6fc0e5089d WHIRLPOOL 12a22aeb74491960bf12da6d0db67504f1f804e732d332fd607cf58a78f0fc291af7d6a3d9f65744fedc36daa9326b463b2ebbe545d88deccc29135b6be60dbf
 AUX freebsd-lib-10.0-libproc-libcxx.patch 393 SHA256 da065c458716e8a56a3c3aab87c9e5135287d6c8fa46eb26092c197e167b7acd SHA512 086d71467dcaccefdb2d9d31deab1905407aadca625853ff222610ea713e80dd8dd61caae3765107045b376f4162f73d12407d1d27aad29603b45b108c09cd8f WHIRLPOOL 3bed09ac5887736dcb15583b4d6cde50419d156bc12f1e1a55668ed85bfb0f502c79c760e8cde3db7172b72775786bb8968df811980ad046c677ff0aff176b33
@@ -25,5 +26,5 @@ AUX freebsd-sources-9.0-sysctluint.patch 403 SHA256 884fbc5d6d3766ea3d4609946f56
 AUX libmap.conf 201 SHA256 36a1bd56965f171cbb058f6e1762801e3b92c083fe36f6fe046bd669beed9742 SHA512 abc358dff495fe96b9ed549bacb5278577ca4da46b89b87e9211a2f6acdd455111df02ba11b797287f839af6cc22f8810e8ac1dc52154acc8b22364e667b3c49 WHIRLPOOL 0827a0ea9b8a2faed019d13356a793b2b572e54d6f8ebf32a9f12214759153433e21f7d8fdedf43e038ac1925432c1f4843441db47d29895eda51781f1fedb5e
 AUX libusb-1.0.pc.in 207 SHA256 edf35e887cbfed2df288825434c467e0a946eeb21e0d631f55940bb177c2ba15 SHA512 93289cecfc298a31fd4fd0848bf25a63048a7549bd81792d7bd158731246221c24ec9f469a918430da56873a0936fb2b372cedaaa32a38ccd5323de0f9a89b93 WHIRLPOOL 7c81b0df4548a9391b4e1420186f1e970aa9e2e73a89e817adbff9de52b8797cbd8a4d8b3ca01f782f86e4b1e48fad72a08b5bff49d5ee6ffaa5135c015ca5ae
 AUX libusb.pc.in 208 SHA256 9bfe398a335f8b9b1c3dd167ab0c9206fe3bdd4e1da318ece977e20f3c2d7c56 SHA512 e9c6d5f04057cf8c13f69a3d8e07bdd517fdb01d572a69a1beb397766311b3c53894b108caaaea740bfc27b227a9620621dac5846bff1a367fbf9954f38bb40c WHIRLPOOL e80e76a8a564655d924a7148a841c7c7cf0be0ea3bdbd76e95e5004124543826e5d925dfe791f4b040e042a10923865bb517499d9f5be39611fedbcceebe32d8
-EBUILD freebsd-lib-10.0.0.9999.ebuild 19158 SHA256 7cceb08cea700054e4113cf9e97981a0583e394bf8279b80acd58e6fdcdbb6b6 SHA512 fbdd1cdbc5fcce047d30b0de835e4803d3205294f244a71ed4943d4e5f8ea71c6ede423666705860efec12d3a9a7ee54c36c1b2fc9e9a3066a4af5966b32b563 WHIRLPOOL e3dfa5e2b4bb7b292ac11347c9a5df3f7cf13f7baa63211acf2ab74e7bd663a08ad12381572e95c7e000ef4156a0b68f988dd9816869c953329d4c93e17ea248
+EBUILD freebsd-lib-10.0.0.9999-r1.ebuild 19204 SHA256 db7fff3f5795385173fab86fb5025d5f8ebdb98b63a70c6b3623db7d8d37a1a4 SHA512 bb22114d0a09d47057c40ceaa2ddfefb99b02af45ed5a2ace82890160ce4d1b1959282e2664fedd79f48598f3341587cd0fb6d690289f8f332eda224a9c18a01 WHIRLPOOL 60a0755c5cb550308eeef4017b19e6c8dcec015d4afc87caeb8b63c7b2f6514e5d2c78b2d75dceaa264b3c19c7e92db882207129fc7e7a76e188e34a57934895
 EBUILD freebsd-lib-9.9999_p266864.ebuild 18221 SHA256 c45e817337cfead70472d5f9520ffaf1d635fb6db5004af4f45c96b5c4cfdb02 SHA512 996b157741fce88ee78389ce1220c681dc408296cc1e075435a6f120c0efaa1a306e494408ecb1ad95ca88f11dd086e620c650d5250a084c020ef2d064694d0b WHIRLPOOL 754621d3194e2f400a6b7c59c4d612becb32fb1a41e57686477b3f7fc5a4b935063634eae68b2904ca225b07306c9dbbf6d79cfc337b9fbc4f47f0896591e39a

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-cve-2014-3951.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-cve-2014-3951.patch
new file mode 100644
index 0000000..5ac0ac8
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-cve-2014-3951.patch
@@ -0,0 +1,175 @@
+Index: lib/libc/iconv/citrus_prop.c
+===================================================================
+--- lib/libc/iconv/citrus_prop.c	(revision 267591)
++++ lib/libc/iconv/citrus_prop.c	(working copy)
+@@ -339,7 +339,7 @@ name_found:
+ 
+ static int
+ _citrus_prop_parse_element(struct _memstream * __restrict ms,
+-    const _citrus_prop_hint_t * __restrict hints, void ** __restrict context)
++    const _citrus_prop_hint_t * __restrict hints, void * __restrict context)
+ {
+ 	int ch, errnum;
+ #define _CITRUS_PROP_HINT_NAME_LEN_MAX	255
+@@ -435,8 +435,7 @@ _citrus_prop_parse_variable(const _citrus_prop_hin
+ 		if (ch == EOF || ch == '\0')
+ 			break;
+ 		_memstream_ungetc(&ms, ch);
+-		errnum = _citrus_prop_parse_element(
+-		    &ms, hints, (void ** __restrict)context);
++		errnum = _citrus_prop_parse_element(&ms, hints, context);
+ 		if (errnum != 0)
+ 			return (errnum);
+ 	}
+Index: lib/libc/iconv/citrus_prop.h
+===================================================================
+--- lib/libc/iconv/citrus_prop.h	(revision 267591)
++++ lib/libc/iconv/citrus_prop.h	(working copy)
+@@ -42,7 +42,7 @@ typedef struct _citrus_prop_hint_t _citrus_prop_hi
+ 
+ #define _CITRUS_PROP_CB0_T(_func_, _type_) \
+ typedef int (*_citrus_prop_##_func_##_cb_func_t) \
+-    (void ** __restrict, const char *, _type_); \
++    (void * __restrict, const char *, _type_); \
+ typedef struct { \
+ 	_citrus_prop_##_func_##_cb_func_t func; \
+ } _citrus_prop_##_func_##_cb_t;
+@@ -52,7 +52,7 @@ _CITRUS_PROP_CB0_T(str, const char *)
+ 
+ #define _CITRUS_PROP_CB1_T(_func_, _type_) \
+ typedef int (*_citrus_prop_##_func_##_cb_func_t) \
+-    (void ** __restrict, const char *, _type_, _type_); \
++    (void * __restrict, const char *, _type_, _type_); \
+ typedef struct { \
+ 	_citrus_prop_##_func_##_cb_func_t func; \
+ } _citrus_prop_##_func_##_cb_t;
+Index: lib/libiconv_modules/BIG5/citrus_big5.c
+===================================================================
+--- lib/libiconv_modules/BIG5/citrus_big5.c	(revision 267591)
++++ lib/libiconv_modules/BIG5/citrus_big5.c	(working copy)
+@@ -170,7 +170,7 @@ _citrus_BIG5_check_excludes(_BIG5EncodingInfo *ei,
+ }
+ 
+ static int
+-_citrus_BIG5_fill_rowcol(void ** __restrict ctx, const char * __restrict s,
++_citrus_BIG5_fill_rowcol(void * __restrict ctx, const char * __restrict s,
+     uint64_t start, uint64_t end)
+ {
+ 	_BIG5EncodingInfo *ei;
+@@ -189,7 +189,7 @@ static int
+ 
+ static int
+ /*ARGSUSED*/
+-_citrus_BIG5_fill_excludes(void ** __restrict ctx,
++_citrus_BIG5_fill_excludes(void * __restrict ctx,
+     const char * __restrict s __unused, uint64_t start, uint64_t end)
+ {
+ 	_BIG5EncodingInfo *ei;
+@@ -235,7 +235,6 @@ static int
+ _citrus_BIG5_encoding_module_init(_BIG5EncodingInfo * __restrict ei,
+     const void * __restrict var, size_t lenvar)
+ {
+-	void *ctx = (void *)ei;
+ 	const char *s;
+ 	int err;
+ 
+@@ -257,9 +256,9 @@ _citrus_BIG5_encoding_module_init(_BIG5EncodingInf
+ 	}
+ 
+ 	/* fallback Big5-1984, for backward compatibility. */
+-	_citrus_BIG5_fill_rowcol((void **)&ctx, "row", 0xA1, 0xFE);
+-	_citrus_BIG5_fill_rowcol((void **)&ctx, "col", 0x40, 0x7E);
+-	_citrus_BIG5_fill_rowcol((void **)&ctx, "col", 0xA1, 0xFE);
++	_citrus_BIG5_fill_rowcol(ei, "row", 0xA1, 0xFE);
++	_citrus_BIG5_fill_rowcol(ei, "col", 0x40, 0x7E);
++	_citrus_BIG5_fill_rowcol(ei, "col", 0xA1, 0xFE);
+ 
+ 	return (0);
+ }
+Index: lib/libiconv_modules/HZ/citrus_hz.c
+===================================================================
+--- lib/libiconv_modules/HZ/citrus_hz.c	(revision 267591)
++++ lib/libiconv_modules/HZ/citrus_hz.c	(working copy)
+@@ -65,8 +65,8 @@ typedef enum {
+ } charset_t;
+ 
+ typedef struct {
++	int	 start;
+ 	int	 end;
+-	int	 start;
+ 	int	 width;
+ } range_t;
+ 
+@@ -503,12 +503,12 @@ _citrus_HZ_encoding_module_uninit(_HZEncodingInfo
+ }
+ 
+ static int
+-_citrus_HZ_parse_char(void **context, const char *name __unused, const char *s)
++_citrus_HZ_parse_char(void *context, const char *name __unused, const char *s)
+ {
+ 	escape_t *escape;
+ 	void **p;
+ 
+-	p = (void **)*context;
++	p = (void **)context;
+ 	escape = (escape_t *)p[0];
+ 	if (escape->ch != '\0')
+ 		return (EINVAL);
+@@ -520,7 +520,7 @@ static int
+ }
+ 
+ static int
+-_citrus_HZ_parse_graphic(void **context, const char *name, const char *s)
++_citrus_HZ_parse_graphic(void *context, const char *name, const char *s)
+ {
+ 	_HZEncodingInfo *ei;
+ 	escape_t *escape;
+@@ -527,7 +527,7 @@ static int
+ 	graphic_t *graphic;
+ 	void **p;
+ 
+-	p = (void **)*context;
++	p = (void **)context;
+ 	escape = (escape_t *)p[0];
+ 	ei = (_HZEncodingInfo *)p[1];
+ 	graphic = malloc(sizeof(*graphic));
+@@ -589,13 +589,13 @@ _CITRUS_PROP_HINT_END
+ };
+ 
+ static int
+-_citrus_HZ_parse_escape(void **context, const char *name, const char *s)
++_citrus_HZ_parse_escape(void *context, const char *name, const char *s)
+ {
+ 	_HZEncodingInfo *ei;
+ 	escape_t *escape;
+ 	void *p[2];
+ 
+-	ei = (_HZEncodingInfo *)*context;
++	ei = (_HZEncodingInfo *)context;
+ 	escape = malloc(sizeof(*escape));
+ 	if (escape == NULL)
+ 		return (EINVAL);
+Index: lib/libiconv_modules/VIQR/citrus_viqr.c
+===================================================================
+--- lib/libiconv_modules/VIQR/citrus_viqr.c	(revision 267591)
++++ lib/libiconv_modules/VIQR/citrus_viqr.c	(working copy)
+@@ -431,7 +431,6 @@ static int
+ _citrus_VIQR_encoding_module_init(_VIQREncodingInfo * __restrict ei,
+     const void * __restrict var __unused, size_t lenvar __unused)
+ {
+-	const mnemonic_def_t *p;
+ 	const char *s;
+ 	size_t i, n;
+ 	int errnum;
+@@ -455,7 +454,10 @@ _citrus_VIQR_encoding_module_init(_VIQREncodingInf
+ 			return (errnum);
+ 		}
+ 	}
+-	for (i = 0;; ++i) {
++	/* a + 1 < b + 1 here to silence gcc warning about unsigned < 0. */
++	for (i = 0; i + 1 < mnemonic_ext_size + 1; ++i) {
++		const mnemonic_def_t *p;
++
+ 		p = &mnemonic_ext[i];
+ 		n = strlen(p->name);
+ 		if (ei->mb_cur_max < n)

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-10.0.0.9999.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-10.0.0.9999-r1.ebuild
similarity index 99%
rename from sys-freebsd/freebsd-lib/freebsd-lib-10.0.0.9999.ebuild
rename to sys-freebsd/freebsd-lib/freebsd-lib-10.0.0.9999-r1.ebuild
index fb61177..8cb0dfa 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-10.0.0.9999.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-10.0.0.9999-r1.ebuild
@@ -101,6 +101,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-10.0-libusb.patch"
 	"${FILESDIR}/${PN}-10.0-libproc-libcxx.patch"
 	"${FILESDIR}/${PN}-10.0-libiconv_modules.patch"
+	"${FILESDIR}/${PN}-10.0-cve-2014-3951.patch"
 	"${FILESDIR}/${PN}-bsdxml2expat.patch"
 	"${FILESDIR}/${PN}-9.0-bluetooth.patch"
 	"${FILESDIR}/${PN}-9.1-.eh_frame_hdr-fix.patch"

[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-lib/, sys-freebsd/freebsd-lib/files/

[Yuta SATOH]

commit:     dba22f673be6729463328b481cb0f91931f07eeb
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Thu Dec 19 13:00:55 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Thu Dec 19 13:00:55 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=dba22f67

freebsd-lib-10.0-libproc-libcxx.patch:

---
 sys-freebsd/freebsd-lib/Manifest                                 | 2 +-
 .../freebsd-lib/files/freebsd-lib-10.0-libproc-libcxx.patch      | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 8bdf23a..877d1d8 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -1,7 +1,7 @@
 AUX freebsd-lib-10.0-atfcxx.patch 1545 SHA256 eef9680da13fb24adc01fab170d83787e8b9926ec2bbb89cd7933b3dd8b35306 SHA512 37d8fc83b97addef48807196738be511fdc74b002dce321c2eaf38db5b618ff4a2f8e8447677c60b96b8add8f1dc586a66a30992289fa95e20e2005589e83953 WHIRLPOOL 78096c4064b98cbb05617355c8c65c306f9d6ceb2a2c8f772cf39f20c81395da9a2d1e128f5b1382bdd65d7e6d7df2d08606933ac5fa8a9aa3d55ec8b76363e2
 AUX freebsd-lib-10.0-libiconv_modules.patch 645 SHA256 eeaf5e8dd482935982f4c232c227eadae4258e63a8dd9631cb59140ec21cbe08 SHA512 6d07c28a92985a8de517bd0eee5bf4a9ca60eee214c7111cda74d2eb6b2cfac1105b2673b09f64d9da2e54ecddf77bc27890a42a4d4f79243778f14fed8a4fdd WHIRLPOOL 27383421a4a7ee3c275db4f82ccedd3004c24d1ef5408db31f5647a06c8d31dc47b0ad3d3a202b8598676229953854656c8bc9f74febc76792dd085894c8d31b
 AUX freebsd-lib-10.0-liblink.patch 2448 SHA256 cbdcca5cc893b0d0b1ff98d1c1046519cebe9877b4cddd180340cfafbbbd2726 SHA512 c77049fa170d08d6ce035a8b9ae799f6d8e0b899371c1644a7493543fc07511515f68d54c82c618064954e48023c09bfcff452bd93e69ac07b7f8c6fc0e5089d WHIRLPOOL 12a22aeb74491960bf12da6d0db67504f1f804e732d332fd607cf58a78f0fc291af7d6a3d9f65744fedc36daa9326b463b2ebbe545d88deccc29135b6be60dbf
-AUX freebsd-lib-10.0-libproc-libcxx.patch 346 SHA256 9480625a92fd1d82655e928105c91c914a89a534c04a504ec09b98d9b35b00f0 SHA512 976977904c7a28a55159b92be55a6cbcbecee3c89d9fcbf0060e9d6b047ec0fa5b072ab68fea47814c5fb2b6deeaf8db91364232883c25ea5f18f3298b60def3 WHIRLPOOL 7383592f10b49f83b3184ba018a84564c2a9d6997a453b8d5f30d835f63148be902f416a931c9750758b1b6cd573be72373d0a2d38b7ae62434c3a08922004ea
+AUX freebsd-lib-10.0-libproc-libcxx.patch 393 SHA256 da065c458716e8a56a3c3aab87c9e5135287d6c8fa46eb26092c197e167b7acd SHA512 086d71467dcaccefdb2d9d31deab1905407aadca625853ff222610ea713e80dd8dd61caae3765107045b376f4162f73d12407d1d27aad29603b45b108c09cd8f WHIRLPOOL 3bed09ac5887736dcb15583b4d6cde50419d156bc12f1e1a55668ed85bfb0f502c79c760e8cde3db7172b72775786bb8968df811980ad046c677ff0aff176b33
 AUX freebsd-lib-10.0-libusb.patch 764 SHA256 5e7bede29a900eda7ee3935203574bd6547b75864087ded60473f19dfcfa40eb SHA512 5b56af4f0ad5706001ed89075ff37b88412a1de7dd18742fdbfdd674581f20f39068fb6002c43e7ee22ae3051c11428f1c2e6cdab319da2ede065cffd330ceb9 WHIRLPOOL 2fdbe9ca0fc40b6626e40413d2364cb5de00611d674cdd6128d6e70e91fcfe0dffb60eb6c3e868907ee613f32258e519ea50e0722b180ab8021d766ebeef8370
 AUX freebsd-lib-6.0-flex-2.5.31.patch 421 SHA256 1d46cf13e1059ae3731ba5555764e020fcf4de7db5abf039fac83423e05d53c4 SHA512 c16a99b85e7908e77915796245741cbfcfb30ab1f4f0a8d565c28256b25d1532209ed27328d8b1571f61677251830f1fb6bbec17a8104686f56afd87f3226dec WHIRLPOOL 177f7ee5764f79fcdab768b13016e809f677cfd57a06ebb5e1bbafc6520f309b328908716ee02a8155f35566faefa95b67b064dafa8de9a7d2a19bde92b386b0
 AUX freebsd-lib-6.0-gccfloat.patch 542 SHA256 d549125f174c86c2d5e7e1f1c99cf1303b84e91ce8ee51db8c962be48b7a7951 SHA512 810745085c601757397b6d0338dba1631e4f623c3bae8a588e9f0b5c7cd9a9416d832093f97925fcef27ffcf20929bef8a5bcbeecf7a583c0a7eb6ce71f39495 WHIRLPOOL dee1bcf99935ae9ead0d5f498049a46ee89416f06eb7361901c69f40d0151ae1d3647a7dbb1c58b1aca7f541169b20d622019bc20b12953ba0c06fba56fd375e

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libproc-libcxx.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libproc-libcxx.patch
index 51e7499..55987aa 100644
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libproc-libcxx.patch
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libproc-libcxx.patch
@@ -1,13 +1,16 @@
 diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile
-index 4449c06..c4b703f 100644
+index f9e01ab..15b27d8 100644
 --- a/lib/libproc/Makefile
 +++ b/lib/libproc/Makefile
-@@ -15,7 +15,7 @@ INCS=	libproc.h
+@@ -15,7 +15,10 @@ INCS=	libproc.h
  
  CFLAGS+=	-I${.CURDIR}
  
 -.if ${MK_LIBCPLUSPLUS} != "no"
-+.if ${CXX:T:M*-stdlib=libc++*}||${CXXFLAGS:T:M*-stdlib=libc++*}
++.if ${CXX:T:M*-stdlib=libc++*}
++LDADD+=		-lcxxrt
++DPADD+=		${LIBCXXRT}
++.elif ${CXXFLAGS:T:M*-stdlib=libc++*}
  LDADD+=		-lcxxrt
  DPADD+=		${LIBCXXRT}
  .else

[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-lib/, sys-freebsd/freebsd-lib/files/

[Yuta SATOH]

commit:     d1cf6aad084104972f80f642caf84958d6275451
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Thu Dec 19 11:03:01 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Thu Dec 19 11:03:01 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=d1cf6aad

freebsd-lib-10.0-libproc-libcxx.patch: added ${CXX:T:M*-stdlib=libc++*}

---
 sys-freebsd/freebsd-lib/Manifest                                    | 2 +-
 sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libproc-libcxx.patch | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 81dfbd9..8bdf23a 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -1,7 +1,7 @@
 AUX freebsd-lib-10.0-atfcxx.patch 1545 SHA256 eef9680da13fb24adc01fab170d83787e8b9926ec2bbb89cd7933b3dd8b35306 SHA512 37d8fc83b97addef48807196738be511fdc74b002dce321c2eaf38db5b618ff4a2f8e8447677c60b96b8add8f1dc586a66a30992289fa95e20e2005589e83953 WHIRLPOOL 78096c4064b98cbb05617355c8c65c306f9d6ceb2a2c8f772cf39f20c81395da9a2d1e128f5b1382bdd65d7e6d7df2d08606933ac5fa8a9aa3d55ec8b76363e2
 AUX freebsd-lib-10.0-libiconv_modules.patch 645 SHA256 eeaf5e8dd482935982f4c232c227eadae4258e63a8dd9631cb59140ec21cbe08 SHA512 6d07c28a92985a8de517bd0eee5bf4a9ca60eee214c7111cda74d2eb6b2cfac1105b2673b09f64d9da2e54ecddf77bc27890a42a4d4f79243778f14fed8a4fdd WHIRLPOOL 27383421a4a7ee3c275db4f82ccedd3004c24d1ef5408db31f5647a06c8d31dc47b0ad3d3a202b8598676229953854656c8bc9f74febc76792dd085894c8d31b
 AUX freebsd-lib-10.0-liblink.patch 2448 SHA256 cbdcca5cc893b0d0b1ff98d1c1046519cebe9877b4cddd180340cfafbbbd2726 SHA512 c77049fa170d08d6ce035a8b9ae799f6d8e0b899371c1644a7493543fc07511515f68d54c82c618064954e48023c09bfcff452bd93e69ac07b7f8c6fc0e5089d WHIRLPOOL 12a22aeb74491960bf12da6d0db67504f1f804e732d332fd607cf58a78f0fc291af7d6a3d9f65744fedc36daa9326b463b2ebbe545d88deccc29135b6be60dbf
-AUX freebsd-lib-10.0-libproc-libcxx.patch 318 SHA256 bc1a6e7821f123c8a404ff2024264de226f0ca349f2b5b040437f74cf4a31cf4 SHA512 149101d161e1f43b0d28d131c80142ee45515f02ed0d6f8f180f2ecd2ea479607df38a37049c346dee8c848892bd64f151e094c006d32741d7c1030016e56d88 WHIRLPOOL 2f31d9b77a41bbc6ef842092b20266158e46eed6c49398fa80d193ad19c42334c4fcdb6dda82a38165730b6b37882849baf438f597f5f00a9f22e8f730017400
+AUX freebsd-lib-10.0-libproc-libcxx.patch 346 SHA256 9480625a92fd1d82655e928105c91c914a89a534c04a504ec09b98d9b35b00f0 SHA512 976977904c7a28a55159b92be55a6cbcbecee3c89d9fcbf0060e9d6b047ec0fa5b072ab68fea47814c5fb2b6deeaf8db91364232883c25ea5f18f3298b60def3 WHIRLPOOL 7383592f10b49f83b3184ba018a84564c2a9d6997a453b8d5f30d835f63148be902f416a931c9750758b1b6cd573be72373d0a2d38b7ae62434c3a08922004ea
 AUX freebsd-lib-10.0-libusb.patch 764 SHA256 5e7bede29a900eda7ee3935203574bd6547b75864087ded60473f19dfcfa40eb SHA512 5b56af4f0ad5706001ed89075ff37b88412a1de7dd18742fdbfdd674581f20f39068fb6002c43e7ee22ae3051c11428f1c2e6cdab319da2ede065cffd330ceb9 WHIRLPOOL 2fdbe9ca0fc40b6626e40413d2364cb5de00611d674cdd6128d6e70e91fcfe0dffb60eb6c3e868907ee613f32258e519ea50e0722b180ab8021d766ebeef8370
 AUX freebsd-lib-6.0-flex-2.5.31.patch 421 SHA256 1d46cf13e1059ae3731ba5555764e020fcf4de7db5abf039fac83423e05d53c4 SHA512 c16a99b85e7908e77915796245741cbfcfb30ab1f4f0a8d565c28256b25d1532209ed27328d8b1571f61677251830f1fb6bbec17a8104686f56afd87f3226dec WHIRLPOOL 177f7ee5764f79fcdab768b13016e809f677cfd57a06ebb5e1bbafc6520f309b328908716ee02a8155f35566faefa95b67b064dafa8de9a7d2a19bde92b386b0
 AUX freebsd-lib-6.0-gccfloat.patch 542 SHA256 d549125f174c86c2d5e7e1f1c99cf1303b84e91ce8ee51db8c962be48b7a7951 SHA512 810745085c601757397b6d0338dba1631e4f623c3bae8a588e9f0b5c7cd9a9416d832093f97925fcef27ffcf20929bef8a5bcbeecf7a583c0a7eb6ce71f39495 WHIRLPOOL dee1bcf99935ae9ead0d5f498049a46ee89416f06eb7361901c69f40d0151ae1d3647a7dbb1c58b1aca7f541169b20d622019bc20b12953ba0c06fba56fd375e

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libproc-libcxx.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libproc-libcxx.patch
index dacbee9..51e7499 100644
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libproc-libcxx.patch
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libproc-libcxx.patch
@@ -7,7 +7,7 @@ index 4449c06..c4b703f 100644
  CFLAGS+=	-I${.CURDIR}
  
 -.if ${MK_LIBCPLUSPLUS} != "no"
-+.if ${CXXFLAGS:T:M*-stdlib=libc++*}
++.if ${CXX:T:M*-stdlib=libc++*}||${CXXFLAGS:T:M*-stdlib=libc++*}
  LDADD+=		-lcxxrt
  DPADD+=		${LIBCXXRT}
  .else

[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-lib/, sys-freebsd/freebsd-lib/files/

[Yuta SATOH]

commit:     a2e41a8ffacbfa3d6ab7a1db17e74925f50e8eeb
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Wed Dec  4 11:22:33 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Wed Dec  4 11:22:33 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=a2e41a8f

freebsd-lib-10.9999_p258774: fixed iconv issue.

---
 sys-freebsd/freebsd-lib/Manifest                   |  3 ++-
 .../files/freebsd-lib-10.0-libiconv_modules.patch  | 24 ++++++++++++++++++++++
 .../freebsd-lib/freebsd-lib-10.9999_p258774.ebuild | 13 +++++++-----
 3 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 8d04cb5..bccf6d5 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -1,4 +1,5 @@
 AUX freebsd-lib-10.0-atfcxx.patch 1545 SHA256 eef9680da13fb24adc01fab170d83787e8b9926ec2bbb89cd7933b3dd8b35306 SHA512 37d8fc83b97addef48807196738be511fdc74b002dce321c2eaf38db5b618ff4a2f8e8447677c60b96b8add8f1dc586a66a30992289fa95e20e2005589e83953 WHIRLPOOL 78096c4064b98cbb05617355c8c65c306f9d6ceb2a2c8f772cf39f20c81395da9a2d1e128f5b1382bdd65d7e6d7df2d08606933ac5fa8a9aa3d55ec8b76363e2
+AUX freebsd-lib-10.0-libiconv_modules.patch 645 SHA256 eeaf5e8dd482935982f4c232c227eadae4258e63a8dd9631cb59140ec21cbe08 SHA512 6d07c28a92985a8de517bd0eee5bf4a9ca60eee214c7111cda74d2eb6b2cfac1105b2673b09f64d9da2e54ecddf77bc27890a42a4d4f79243778f14fed8a4fdd WHIRLPOOL 27383421a4a7ee3c275db4f82ccedd3004c24d1ef5408db31f5647a06c8d31dc47b0ad3d3a202b8598676229953854656c8bc9f74febc76792dd085894c8d31b
 AUX freebsd-lib-10.0-liblink.patch 2448 SHA256 cbdcca5cc893b0d0b1ff98d1c1046519cebe9877b4cddd180340cfafbbbd2726 SHA512 c77049fa170d08d6ce035a8b9ae799f6d8e0b899371c1644a7493543fc07511515f68d54c82c618064954e48023c09bfcff452bd93e69ac07b7f8c6fc0e5089d WHIRLPOOL 12a22aeb74491960bf12da6d0db67504f1f804e732d332fd607cf58a78f0fc291af7d6a3d9f65744fedc36daa9326b463b2ebbe545d88deccc29135b6be60dbf
 AUX freebsd-lib-10.0-libproc-libcxx.patch 318 SHA256 bc1a6e7821f123c8a404ff2024264de226f0ca349f2b5b040437f74cf4a31cf4 SHA512 149101d161e1f43b0d28d131c80142ee45515f02ed0d6f8f180f2ecd2ea479607df38a37049c346dee8c848892bd64f151e094c006d32741d7c1030016e56d88 WHIRLPOOL 2f31d9b77a41bbc6ef842092b20266158e46eed6c49398fa80d193ad19c42334c4fcdb6dda82a38165730b6b37882849baf438f597f5f00a9f22e8f730017400
 AUX freebsd-lib-10.0-libusb.patch 764 SHA256 5e7bede29a900eda7ee3935203574bd6547b75864087ded60473f19dfcfa40eb SHA512 5b56af4f0ad5706001ed89075ff37b88412a1de7dd18742fdbfdd674581f20f39068fb6002c43e7ee22ae3051c11428f1c2e6cdab319da2ede065cffd330ceb9 WHIRLPOOL 2fdbe9ca0fc40b6626e40413d2364cb5de00611d674cdd6128d6e70e91fcfe0dffb60eb6c3e868907ee613f32258e519ea50e0722b180ab8021d766ebeef8370
@@ -23,5 +24,5 @@ AUX freebsd-sources-9.0-sysctluint.patch 403 SHA256 884fbc5d6d3766ea3d4609946f56
 AUX libmap.conf 201 SHA256 36a1bd56965f171cbb058f6e1762801e3b92c083fe36f6fe046bd669beed9742 SHA512 abc358dff495fe96b9ed549bacb5278577ca4da46b89b87e9211a2f6acdd455111df02ba11b797287f839af6cc22f8810e8ac1dc52154acc8b22364e667b3c49 WHIRLPOOL 0827a0ea9b8a2faed019d13356a793b2b572e54d6f8ebf32a9f12214759153433e21f7d8fdedf43e038ac1925432c1f4843441db47d29895eda51781f1fedb5e
 AUX libusb-1.0.pc.in 207 SHA256 edf35e887cbfed2df288825434c467e0a946eeb21e0d631f55940bb177c2ba15 SHA512 93289cecfc298a31fd4fd0848bf25a63048a7549bd81792d7bd158731246221c24ec9f469a918430da56873a0936fb2b372cedaaa32a38ccd5323de0f9a89b93 WHIRLPOOL 7c81b0df4548a9391b4e1420186f1e970aa9e2e73a89e817adbff9de52b8797cbd8a4d8b3ca01f782f86e4b1e48fad72a08b5bff49d5ee6ffaa5135c015ca5ae
 AUX libusb.pc.in 208 SHA256 9bfe398a335f8b9b1c3dd167ab0c9206fe3bdd4e1da318ece977e20f3c2d7c56 SHA512 e9c6d5f04057cf8c13f69a3d8e07bdd517fdb01d572a69a1beb397766311b3c53894b108caaaea740bfc27b227a9620621dac5846bff1a367fbf9954f38bb40c WHIRLPOOL e80e76a8a564655d924a7148a841c7c7cf0be0ea3bdbd76e95e5004124543826e5d925dfe791f4b040e042a10923865bb517499d9f5be39611fedbcceebe32d8
-EBUILD freebsd-lib-10.9999_p258774.ebuild 18845 SHA256 bd1cb454de3c146b1681176926087ebe606d85c4bd4c69acaeef7bdd6837f0c7 SHA512 02bf47e4101598638201ddcf964cedbcd6fc14c833328e69d5a79620438863c39646876eb92e98f7071045ddac1fe9f1fc70c99012dda1d539549c175c1e7f4e WHIRLPOOL e45eaaaaecd2e198989dcd06e41ac803be481fdfb31c08cb5f1fc3498f6bbc34c301d8eb99cc7e02a407393120005e2c32dc7263a8d69868ac534d12db75cd1c
+EBUILD freebsd-lib-10.9999_p258774.ebuild 19004 SHA256 768ffff60507b879443f30c970ec810bb41e5212c1f009171483a7a619794ae9 SHA512 4fd74c0c32611f3a2a18b4d6a176524c3c18b84c1df83fb16a9cf3b268311b8b279e72770bdccde038f2cfcb11e83d93637de8fa65a093530706780ef9fc9f59 WHIRLPOOL ec1bbbcc7f00a8a0a4a89d5d419eda11d3368eb46894ed9499f0ef0f22499a306db1d40b7a25413a89a9f630b4fe9e4634e38a8eb3ae504438b4f16dee5e7d65
 EBUILD freebsd-lib-9.9999.ebuild 18187 SHA256 4194f47078997d306111c39d7b5aa64991e8f3cad8124b42ab6927053597646f SHA512 d16df71160fc8ed5aa23c0894baa3b1cce734feae8f2eea837e9ea04b2a6eb0836314d05c925630db2d3be32a52b8da4c2cc79c64083cef2fe829d25fccb99ef WHIRLPOOL 5797e57eb7b1b67921426d7cfa4a8ead67b5223213cde5cffa57ce5002f34da81e9e05b5d1950681aada430ec6f3299294ab223c418ebd39854d63471a8a475a

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libiconv_modules.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libiconv_modules.patch
new file mode 100644
index 0000000..69126e5
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libiconv_modules.patch
@@ -0,0 +1,24 @@
+Should install lib/libiconv_modules to /usr/$(get_libdir)/i18n.
+
+Drop libiconv_modules from lib/Makefile. And set the following in ebuild.
+NON_NATIVE_SUBDIRS="lib/libiconv_modules"
+NATIVE_SUBDIRS="lib/libiconv_modules"
+
+Install to /usr/$(get_libdir)/i18n to force.
+mymakeopts="${mymakeopts} SHLIBDIR=/usr/$(get_libdir)/i18n LIBDIR=/usr/$(get_libdir)/i18n"
+
+
+Welcome a better solution...
+
+diff --git a/lib/Makefile b/lib/Makefile
+index 8722cc2..12a0516 100644
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -38,7 +38,6 @@ SUBDIR_ORDERED=	${_csu} \
+ 	libcompiler_rt \
+ 	libcrypt \
+ 	libelf \
+-	${_libiconv_modules} \
+ 	libkvm \
+ 	${_libldns} \
+ 	msun \

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-10.9999_p258774.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-10.9999_p258774.ebuild
index 9f4a66f..3ab127c 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-10.9999_p258774.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-10.9999_p258774.ebuild
@@ -80,7 +80,7 @@ pkg_setup() {
 	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
 	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
 
-	mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_CLANG= WITHOUT_LIBCPLUSPLUS= WITHOUT_LDNS= WITHOUT_UNBOUND= WITH_LIBICONV_COMPAT=yes "
+	mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_CLANG= WITHOUT_LIBCPLUSPLUS= WITHOUT_LDNS= WITHOUT_UNBOUND= "
 
 	if [ "${CTARGET}" != "${CHOST}" ]; then
 		mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})"
@@ -95,6 +95,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-10.0-atfcxx.patch"
 	"${FILESDIR}/${PN}-10.0-libusb.patch"
 	"${FILESDIR}/${PN}-10.0-libproc-libcxx.patch"
+	"${FILESDIR}/${PN}-10.0-libiconv_modules.patch"
 	"${FILESDIR}/${PN}-bsdxml2expat.patch"
 	"${FILESDIR}/${PN}-9.0-bluetooth.patch"
 	"${FILESDIR}/${PN}-9.1-.eh_frame_hdr-fix.patch"
@@ -256,13 +257,13 @@ bootstrap_libthr() {
 
 # What to build for a cross-compiler.
 # We also need the csu but this has to be handled separately.
-CROSS_SUBDIRS="lib/libc lib/msun gnu/lib/libssp/libssp_nonshared lib/libthr lib/libutil lib/librt"
+CROSS_SUBDIRS="lib/libc lib/msun gnu/lib/libssp/libssp_nonshared lib/libthr lib/libutil lib/librt lib/libc_nonshared"
 
 # What to build for non-default ABIs.
-NON_NATIVE_SUBDIRS="${CROSS_SUBDIRS} gnu/lib/csu lib/libcompiler_rt gnu/lib/libgcc lib/libmd lib/libcrypt lib/libsbuf lib/libcam lib/libelf lib/libiconv_modules lib/libiconv_compat"
+NON_NATIVE_SUBDIRS="${CROSS_SUBDIRS} gnu/lib/csu lib/libcompiler_rt gnu/lib/libgcc lib/libmd lib/libcrypt lib/libsbuf lib/libcam lib/libelf lib/libiconv_modules"
 
 # Subdirs for a native build:
-NATIVE_SUBDIRS="lib gnu/lib/libssp/libssp_nonshared gnu/lib/libregex gnu/lib/csu gnu/lib/libgcc lib/libiconv_compat"
+NATIVE_SUBDIRS="lib gnu/lib/libssp/libssp_nonshared gnu/lib/libregex gnu/lib/csu gnu/lib/libgcc lib/libiconv_modules"
 
 # Is my $ABI native ?
 is_native_abi() {
@@ -403,6 +404,8 @@ gen_libc_ldscript() {
 	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
 	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
 
+	# iconv symbol provided by libc_nonshared.a.
+	# http://svnweb.freebsd.org/base?view=revision&amp;revision=258283
 	cat > "${D}/$2/libc.so" <<-END_LDSCRIPT
 /* GNU ld script
    SSP (-fstack-protector) requires __stack_chk_fail_local to be local.
@@ -411,7 +414,7 @@ gen_libc_ldscript() {
    libssp_nonshared.a from here.
  */
 ${output_format}
-GROUP ( /$1/libc.so.7 /$3/libssp_nonshared.a )
+GROUP ( /$1/libc.so.7 /$3/libc_nonshared.a /$3/libssp_nonshared.a )
 END_LDSCRIPT
 }
 

[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-lib/, sys-freebsd/freebsd-lib/files/

[Yuta SATOH]

commit:     dd08dabd79970708d75db6011ae6d9e3f6df6ca3
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Mon Dec  2 11:30:37 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Mon Dec  2 11:30:37 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=dd08dabd

update freebsd-lib-10.0-liblink.patch

---
 sys-freebsd/freebsd-lib/Manifest                          |  2 +-
 .../freebsd-lib/files/freebsd-lib-10.0-liblink.patch      | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index e979756..db58f0f 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -1,5 +1,5 @@
 AUX freebsd-lib-10.0-atfcxx.patch 1545 SHA256 eef9680da13fb24adc01fab170d83787e8b9926ec2bbb89cd7933b3dd8b35306 SHA512 37d8fc83b97addef48807196738be511fdc74b002dce321c2eaf38db5b618ff4a2f8e8447677c60b96b8add8f1dc586a66a30992289fa95e20e2005589e83953 WHIRLPOOL 78096c4064b98cbb05617355c8c65c306f9d6ceb2a2c8f772cf39f20c81395da9a2d1e128f5b1382bdd65d7e6d7df2d08606933ac5fa8a9aa3d55ec8b76363e2
-AUX freebsd-lib-10.0-liblink.patch 2074 SHA256 e138b28fbf3a131231dfce1a111cc8ae2d6922bd47332a16bab4ae7d29bb628a SHA512 701657e5ae480cecc83a28c69b27791b7ac29c0d12ca518ffae8b05b377a2c2b6fdcfa72ccefdc502d85ac476046231cee2dca3baafb721b738f6bf6f724a0b9 WHIRLPOOL f95184614ebb77535943aa8c4db3e02a75a869c0d71574721768152d8dd9c4f60268f4b5f0e60db54e3422372f1b2dfaf977623c625e89c1186b9eab6afc6b97
+AUX freebsd-lib-10.0-liblink.patch 2448 SHA256 cbdcca5cc893b0d0b1ff98d1c1046519cebe9877b4cddd180340cfafbbbd2726 SHA512 c77049fa170d08d6ce035a8b9ae799f6d8e0b899371c1644a7493543fc07511515f68d54c82c618064954e48023c09bfcff452bd93e69ac07b7f8c6fc0e5089d WHIRLPOOL 12a22aeb74491960bf12da6d0db67504f1f804e732d332fd607cf58a78f0fc291af7d6a3d9f65744fedc36daa9326b463b2ebbe545d88deccc29135b6be60dbf
 AUX freebsd-lib-10.0-libproc-libcxx.patch 318 SHA256 bc1a6e7821f123c8a404ff2024264de226f0ca349f2b5b040437f74cf4a31cf4 SHA512 149101d161e1f43b0d28d131c80142ee45515f02ed0d6f8f180f2ecd2ea479607df38a37049c346dee8c848892bd64f151e094c006d32741d7c1030016e56d88 WHIRLPOOL 2f31d9b77a41bbc6ef842092b20266158e46eed6c49398fa80d193ad19c42334c4fcdb6dda82a38165730b6b37882849baf438f597f5f00a9f22e8f730017400
 AUX freebsd-lib-10.0-libusb.patch 764 SHA256 5e7bede29a900eda7ee3935203574bd6547b75864087ded60473f19dfcfa40eb SHA512 5b56af4f0ad5706001ed89075ff37b88412a1de7dd18742fdbfdd674581f20f39068fb6002c43e7ee22ae3051c11428f1c2e6cdab319da2ede065cffd330ceb9 WHIRLPOOL 2fdbe9ca0fc40b6626e40413d2364cb5de00611d674cdd6128d6e70e91fcfe0dffb60eb6c3e868907ee613f32258e519ea50e0722b180ab8021d766ebeef8370
 AUX freebsd-lib-6.0-flex-2.5.31.patch 421 SHA256 1d46cf13e1059ae3731ba5555764e020fcf4de7db5abf039fac83423e05d53c4 SHA512 c16a99b85e7908e77915796245741cbfcfb30ab1f4f0a8d565c28256b25d1532209ed27328d8b1571f61677251830f1fb6bbec17a8104686f56afd87f3226dec WHIRLPOOL 177f7ee5764f79fcdab768b13016e809f677cfd57a06ebb5e1bbafc6520f309b328908716ee02a8155f35566faefa95b67b064dafa8de9a7d2a19bde92b386b0

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-liblink.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-liblink.patch
index 6e7ebdd..6ef3f07 100644
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-liblink.patch
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-liblink.patch
@@ -81,3 +81,18 @@ index 1cf52a0..3d25fae 100644
  WARNS?=		2
  
  .if !defined(RELEASE_CRUNCH)
+diff --git a/lib/libexecinfo/Makefile b/lib/libexecinfo/Makefile
+index 30a1dfb..9f8a99c 100644
+--- a/lib/libexecinfo/Makefile
++++ b/lib/libexecinfo/Makefile
+@@ -10,8 +10,10 @@ SHLIB_MAJOR=	1
+ INCS=		execinfo.h
+ SRCS=		backtrace.c symtab.c unwind.c
+ 
++CFLAGS+=	-I${.CURDIR}/../libelf
+ DPADD=		${LIBELF}
+ LDADD=		-lelf
++LDFLAGS+=	-L${.OBJDIR}/../libelf
+ 
+ MAN=		backtrace.3
+ 

[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-lib/, sys-freebsd/freebsd-lib/files/

[Yuta SATOH]

commit:     a08151501b89c867fb6deb094b257fe15ab37194
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Wed Oct 23 11:10:27 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Wed Oct 23 11:10:27 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=a0815150

freebsd-lib-10.9999_p256420: Fixed libusb-*.pc is fail to install.

---
 sys-freebsd/freebsd-lib/Manifest                      |  3 ++-
 .../freebsd-lib/files/freebsd-lib-10.0-libusb.patch   | 19 +++++++++++++++++++
 .../freebsd-lib/freebsd-lib-10.9999_p256420.ebuild    | 14 +++++++-------
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 12fb18f..35747d6 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -1,6 +1,7 @@
 AUX freebsd-lib-10.0-atfcxx.patch 1545 SHA256 eef9680da13fb24adc01fab170d83787e8b9926ec2bbb89cd7933b3dd8b35306 SHA512 37d8fc83b97addef48807196738be511fdc74b002dce321c2eaf38db5b618ff4a2f8e8447677c60b96b8add8f1dc586a66a30992289fa95e20e2005589e83953 WHIRLPOOL 78096c4064b98cbb05617355c8c65c306f9d6ceb2a2c8f772cf39f20c81395da9a2d1e128f5b1382bdd65d7e6d7df2d08606933ac5fa8a9aa3d55ec8b76363e2
 AUX freebsd-lib-10.0-liblink.patch 2074 SHA256 e138b28fbf3a131231dfce1a111cc8ae2d6922bd47332a16bab4ae7d29bb628a SHA512 701657e5ae480cecc83a28c69b27791b7ac29c0d12ca518ffae8b05b377a2c2b6fdcfa72ccefdc502d85ac476046231cee2dca3baafb721b738f6bf6f724a0b9 WHIRLPOOL f95184614ebb77535943aa8c4db3e02a75a869c0d71574721768152d8dd9c4f60268f4b5f0e60db54e3422372f1b2dfaf977623c625e89c1186b9eab6afc6b97
 AUX freebsd-lib-10.0-libproc-libcxx.patch 318 SHA256 bc1a6e7821f123c8a404ff2024264de226f0ca349f2b5b040437f74cf4a31cf4 SHA512 149101d161e1f43b0d28d131c80142ee45515f02ed0d6f8f180f2ecd2ea479607df38a37049c346dee8c848892bd64f151e094c006d32741d7c1030016e56d88 WHIRLPOOL 2f31d9b77a41bbc6ef842092b20266158e46eed6c49398fa80d193ad19c42334c4fcdb6dda82a38165730b6b37882849baf438f597f5f00a9f22e8f730017400
+AUX freebsd-lib-10.0-libusb.patch 764 SHA256 5e7bede29a900eda7ee3935203574bd6547b75864087ded60473f19dfcfa40eb SHA512 5b56af4f0ad5706001ed89075ff37b88412a1de7dd18742fdbfdd674581f20f39068fb6002c43e7ee22ae3051c11428f1c2e6cdab319da2ede065cffd330ceb9 WHIRLPOOL 2fdbe9ca0fc40b6626e40413d2364cb5de00611d674cdd6128d6e70e91fcfe0dffb60eb6c3e868907ee613f32258e519ea50e0722b180ab8021d766ebeef8370
 AUX freebsd-lib-6.0-flex-2.5.31.patch 421 SHA256 1d46cf13e1059ae3731ba5555764e020fcf4de7db5abf039fac83423e05d53c4 SHA512 c16a99b85e7908e77915796245741cbfcfb30ab1f4f0a8d565c28256b25d1532209ed27328d8b1571f61677251830f1fb6bbec17a8104686f56afd87f3226dec WHIRLPOOL 177f7ee5764f79fcdab768b13016e809f677cfd57a06ebb5e1bbafc6520f309b328908716ee02a8155f35566faefa95b67b064dafa8de9a7d2a19bde92b386b0
 AUX freebsd-lib-6.0-gccfloat.patch 542 SHA256 d549125f174c86c2d5e7e1f1c99cf1303b84e91ce8ee51db8c962be48b7a7951 SHA512 810745085c601757397b6d0338dba1631e4f623c3bae8a588e9f0b5c7cd9a9416d832093f97925fcef27ffcf20929bef8a5bcbeecf7a583c0a7eb6ce71f39495 WHIRLPOOL dee1bcf99935ae9ead0d5f498049a46ee89416f06eb7361901c69f40d0151ae1d3647a7dbb1c58b1aca7f541169b20d622019bc20b12953ba0c06fba56fd375e
 AUX freebsd-lib-6.0-pmc.patch 338 SHA256 36ca464f0aa1ed8784c8f1edc4a3580704c9a7813963684305250d806000075f SHA512 33187ec853ddf0c39680af60b669e60d3e213eba20a2e1ba995c991f04c053c5adcc5169b92c5d1d4cfbc7e03b72af2df4a5349361b41c56ca4a9b91e81bb327 WHIRLPOOL 1744ed829c1775c01b5d1b827b5677b6b5d731cff376da4d8e7ab8facbb0c465131a34157d77186bfcf1a1097f515e3909d1e753aa2b8e72efaf7feae319361f
@@ -22,5 +23,5 @@ AUX freebsd-sources-9.0-sysctluint.patch 403 SHA256 884fbc5d6d3766ea3d4609946f56
 AUX libmap.conf 201 SHA256 36a1bd56965f171cbb058f6e1762801e3b92c083fe36f6fe046bd669beed9742 SHA512 abc358dff495fe96b9ed549bacb5278577ca4da46b89b87e9211a2f6acdd455111df02ba11b797287f839af6cc22f8810e8ac1dc52154acc8b22364e667b3c49 WHIRLPOOL 0827a0ea9b8a2faed019d13356a793b2b572e54d6f8ebf32a9f12214759153433e21f7d8fdedf43e038ac1925432c1f4843441db47d29895eda51781f1fedb5e
 AUX libusb-1.0.pc.in 207 SHA256 edf35e887cbfed2df288825434c467e0a946eeb21e0d631f55940bb177c2ba15 SHA512 93289cecfc298a31fd4fd0848bf25a63048a7549bd81792d7bd158731246221c24ec9f469a918430da56873a0936fb2b372cedaaa32a38ccd5323de0f9a89b93 WHIRLPOOL 7c81b0df4548a9391b4e1420186f1e970aa9e2e73a89e817adbff9de52b8797cbd8a4d8b3ca01f782f86e4b1e48fad72a08b5bff49d5ee6ffaa5135c015ca5ae
 AUX libusb.pc.in 208 SHA256 9bfe398a335f8b9b1c3dd167ab0c9206fe3bdd4e1da318ece977e20f3c2d7c56 SHA512 e9c6d5f04057cf8c13f69a3d8e07bdd517fdb01d572a69a1beb397766311b3c53894b108caaaea740bfc27b227a9620621dac5846bff1a367fbf9954f38bb40c WHIRLPOOL e80e76a8a564655d924a7148a841c7c7cf0be0ea3bdbd76e95e5004124543826e5d925dfe791f4b040e042a10923865bb517499d9f5be39611fedbcceebe32d8
-EBUILD freebsd-lib-10.9999_p256420.ebuild 18985 SHA256 cb25ae0e3c2aa20472935a4e7f41089497f9e99b9d4278d1af95dce9658a1cc6 SHA512 8372f2b4099a0416776bd18e557e34492bc4d303e1d88e0569bf575f6f6a6ad0a7602d1d373cd120cc24212a6004ae65c4fa471c56f43ad8418a7158f33dc2a2 WHIRLPOOL 63b55c43b61155a9e9bcba55ca873adfc984e1423937860165de35475f5f83abe83b5a7a308de6a250c28db12b801a9710542b7feddd19ac017d56d33ac1a417
+EBUILD freebsd-lib-10.9999_p256420.ebuild 18850 SHA256 1b6712a8f8f03dec1f10d1177c5279a119e2a104303c947d06a37ac735050787 SHA512 96115890a5cbf05919ab8839268781b33c835fb97da7afaf956b2cdf9c8a20c1ec42645a6dcc7a653d9e6b3a46cf6b503b52d42b5b2d3a69d078e4140d984d5d WHIRLPOOL 268d6addf874ea648ced5307b09768a876e8d8277c86cd028b598e17206a46525275b3fe269c9445e8ea3d2de67c782145be4227765f4a3762c8dc77d7306190
 EBUILD freebsd-lib-9.9999.ebuild 18187 SHA256 4194f47078997d306111c39d7b5aa64991e8f3cad8124b42ab6927053597646f SHA512 d16df71160fc8ed5aa23c0894baa3b1cce734feae8f2eea837e9ea04b2a6eb0836314d05c925630db2d3be32a52b8da4c2cc79c64083cef2fe829d25fccb99ef WHIRLPOOL 5797e57eb7b1b67921426d7cfa4a8ead67b5223213cde5cffa57ce5002f34da81e9e05b5d1950681aada430ec6f3299294ab223c418ebd39854d63471a8a475a

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libusb.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libusb.patch
new file mode 100644
index 0000000..2968252
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libusb.patch
@@ -0,0 +1,19 @@
+diff --git a/lib/libusb/Makefile b/lib/libusb/Makefile
+index 21016a9..26010e8 100644
+--- a/lib/libusb/Makefile
++++ b/lib/libusb/Makefile
+@@ -40,11 +40,11 @@ CFLAGS+=	-DCOMPAT_32BIT
+ 
+ beforeinstall:
+ 	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+-		${.CURDIR}/libusb-0.1.pc ${DESTDIR}${LIBDATADIR}/pkgconfig
++		${.CURDIR}/libusb-0.1.pc ${DESTDIR}${LIBDIR}/pkgconfig
+ 	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+-		${.CURDIR}/libusb-1.0.pc ${DESTDIR}${LIBDATADIR}/pkgconfig
++		${.CURDIR}/libusb-1.0.pc ${DESTDIR}${LIBDIR}/pkgconfig
+ 	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+-		${.CURDIR}/libusb-2.0.pc ${DESTDIR}${LIBDATADIR}/pkgconfig
++		${.CURDIR}/libusb-2.0.pc ${DESTDIR}${LIBDIR}/pkgconfig
+ 
+ #
+ # Cross platform support

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-10.9999_p256420.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-10.9999_p256420.ebuild
index b00d0c8..97c3340 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-10.9999_p256420.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-10.9999_p256420.ebuild
@@ -93,6 +93,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-6.1-csu.patch"
 	"${FILESDIR}/${PN}-10.0-liblink.patch"
 	"${FILESDIR}/${PN}-10.0-atfcxx.patch"
+	"${FILESDIR}/${PN}-10.0-libusb.patch"
 	"${FILESDIR}/${PN}-10.0-libproc-libcxx.patch"
 	"${FILESDIR}/${PN}-bsdxml2expat.patch"
 	"${FILESDIR}/${PN}-9.0-bluetooth.patch"
@@ -480,6 +481,12 @@ do_install() {
 
 	is_crosscompile && use crosscompile_opts_headers-only && return 0
 
+	# Install a libusb.pc for better compat with Linux's libusb
+	if use usb ; then
+		dodir /usr/$(get_libdir)/pkgconfig
+		sed -i.bkp "s:^libdir=.*:libdir=/usr/$(get_libdir):g" ${S}/libusb/libusb-*.pc
+	fi
+
 	for i in $(get_subdirs) ; do
 		if [[ ${i} != *libiconv_modules* ]] ; then
 			einfo "Installing in ${i}..."
@@ -512,13 +519,6 @@ do_install() {
 		return 0
 	fi
 
-	# Install a libusb.pc for better compat with Linux's libusb
-	if use usb ; then
-		dodir /usr/$(get_libdir)/pkgconfig
-		sed -e "s:@LIBDIR@:/usr/$(get_libdir):" "${FILESDIR}/libusb.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/libusb.pc" || die
-		sed -e "s:@LIBDIR@:/usr/$(get_libdir):" "${FILESDIR}/libusb-1.0.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/libusb-1.0.pc" || die
-	fi
-
 	# Generate ldscripts for core libraries that will go in /
 	multilib_is_native_abi && \
 		gen_usr_ldscript -a alias cam geom ipsec jail kiconv \

[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-lib/, sys-freebsd/freebsd-lib/files/

[Yuta SATOH]

commit:     37186e58e57aa82efd9b9dc3af593f8c226f12ee
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Wed Sep 18 12:22:28 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Wed Sep 18 12:22:28 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=37186e58

update freebsd-lib-9999-atfcxx.patch

---
 sys-freebsd/freebsd-lib/Manifest                   |  2 +-
 .../files/freebsd-lib-9999-atfcxx.patch            | 45 +++++++++++++++++++---
 2 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 9e84ef2..6cec911 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -13,7 +13,7 @@ AUX freebsd-lib-9.0-trylock-adaptive.patch 439 SHA256 af501c40124e628c2f739d88a4
 AUX freebsd-lib-9.1-.eh_frame_hdr-fix.patch 695 SHA256 6c6d7a958c989edc6ee76c5b9c2146fa449adda11c3b89b550780c7a78d93190 SHA512 c40270e8890a1152a6f2e705461ac64f8cc44e6d0306d895a0d146017d4fe3553853de88178e0744fc1be4197a4eb35b578c68593c80467dd8cf15c35720413d WHIRLPOOL 1fa3c5cdba333951b918eb5c1eb793ab49921268a6a397e38f2adad383c2c03ccf382892ed8d44e2480f8ca891ce3c3a0b122a026cbf232058ac3bcf2f2d5133
 AUX freebsd-lib-9.1-rmgssapi.patch 699 SHA256 0dc94a565f140beca0800446c72bd874f99c56125181f7a037154dcd898d2615 SHA512 cb0b292cca0c321ed72b1a792a3975be239303b3990efc6665b0c960dfe17fdbb4529405286c0a956c4b4711462d2ee9d7d1c9d343ad3246b43c49edfc87dae0 WHIRLPOOL 55adff8c3436959b4545ba54c0eff3cd640dd4f0d0871bd66dad2501c04e84eb24f27b882dde9050b088dadecc9af6049493e848a1d508646149075180c8c414
 AUX freebsd-lib-9.2-liblink.patch 2012 SHA256 065522cabf7dca8062f41c7c9154931864ec3304a2c1f59d44f88b894bf55afc SHA512 97f2f326f431337da5d14a4a37b6fced3224c85bb25ea1f0fcd121790d94dbfb27c98c7b15eb92b1967634be15db96653d5bc6fc458de63a4c988e9e650d965d WHIRLPOOL 45392c571d0f05130836d6d4f0d6b3503f58e4f4d8907d07e1011329b9285d6a010bc35606ff74d529906f6c8f240336bc265eef105196cd3e26390b3bac6d77
-AUX freebsd-lib-9999-atfcxx.patch 391 SHA256 423ed9105e87d4f3d78d4e257a88dbd237706eea391a947fa6ecad11a0943e75 SHA512 bc003e3ba5d1c2006ea316b3d0b7bae8b1db6658e9a4ad593740fa2ebd3b487431601be5c56d77364bf2fdd206aafecd5ddb753e6fa534545b32f5800378117f WHIRLPOOL 8e74e446ddf074ca82b2c51b6657c270e9f16bc19ec83525fcc58242a21e2856adc0b90e9b979f4a285ddd4dd5483ad60e1a890e5cd986eb0a243aad0df0df96
+AUX freebsd-lib-9999-atfcxx.patch 1545 SHA256 eef9680da13fb24adc01fab170d83787e8b9926ec2bbb89cd7933b3dd8b35306 SHA512 37d8fc83b97addef48807196738be511fdc74b002dce321c2eaf38db5b618ff4a2f8e8447677c60b96b8add8f1dc586a66a30992289fa95e20e2005589e83953 WHIRLPOOL 78096c4064b98cbb05617355c8c65c306f9d6ceb2a2c8f772cf39f20c81395da9a2d1e128f5b1382bdd65d7e6d7df2d08606933ac5fa8a9aa3d55ec8b76363e2
 AUX freebsd-lib-9999-liblink.patch 2074 SHA256 e138b28fbf3a131231dfce1a111cc8ae2d6922bd47332a16bab4ae7d29bb628a SHA512 701657e5ae480cecc83a28c69b27791b7ac29c0d12ca518ffae8b05b377a2c2b6fdcfa72ccefdc502d85ac476046231cee2dca3baafb721b738f6bf6f724a0b9 WHIRLPOOL f95184614ebb77535943aa8c4db3e02a75a869c0d71574721768152d8dd9c4f60268f4b5f0e60db54e3422372f1b2dfaf977623c625e89c1186b9eab6afc6b97
 AUX freebsd-lib-9999-libproc-libcxx.patch 318 SHA256 bc1a6e7821f123c8a404ff2024264de226f0ca349f2b5b040437f74cf4a31cf4 SHA512 149101d161e1f43b0d28d131c80142ee45515f02ed0d6f8f180f2ecd2ea479607df38a37049c346dee8c848892bd64f151e094c006d32741d7c1030016e56d88 WHIRLPOOL 2f31d9b77a41bbc6ef842092b20266158e46eed6c49398fa80d193ad19c42334c4fcdb6dda82a38165730b6b37882849baf438f597f5f00a9f22e8f730017400
 AUX freebsd-lib-bsdxml2expat.patch 708 SHA256 0c3ec3657155c5032479181119c488d43a479ab0dfe7a7d7ed0dabce16853e85 SHA512 d3b321062886ee636a09af4b8714ae90317c17eb954a3d491cd21ca90605e26491033df4d6f02a517eda423783db74dad16adf7ee1bdc5557392cc70218ee9c7 WHIRLPOOL 5c262c59aee9e642d3a8929a453b56c7a55ba60f3011d6ac07b750a30297eb992a564ba4db18714b7eac58bbe3ded1ff4249150128947d25dd1344e59e16c9cb

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9999-atfcxx.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9999-atfcxx.patch
index 011582e..42b64b5 100644
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9999-atfcxx.patch
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-9999-atfcxx.patch
@@ -1,16 +1,49 @@
+diff --git a/lib/atf/Makefile.inc b/lib/atf/Makefile.inc
+index 937187a..d5277f3 100644
+--- a/lib/atf/Makefile.inc
++++ b/lib/atf/Makefile.inc
+@@ -49,6 +49,24 @@ CFLAGS+=	-DATF_PKGDATADIR='"${SHAREDIR}/atf"'
+ CFLAGS+=	-DATF_SHELL='"/bin/sh"'
+ CFLAGS+=	-DATF_WORKDIR='"/tmp"'
+ 
++CXXFLAGS+=	-DHAVE_CONFIG_H
++CXXFLAGS+=	-DATF_ARCH='"${MACHINE}"'
++CXXFLAGS+=	-DATF_BUILD_CC='"${CC}"'
++CXXFLAGS+=	-DATF_BUILD_CXXFLAGS='"${_CXXFLAGS}"'
++CXXFLAGS+=	-DATF_BUILD_CPP='"${CPP}"'
++CXXFLAGS+=	-DATF_BUILD_CPPFLAGS='"${_CPPFLAGS}"'
++CXXFLAGS+=	-DATF_BUILD_CXX='"${CXX}"'
++CXXFLAGS+=	-DATF_BUILD_CXXFLAGS='"${_CXXFLAGS}"'
++CXXFLAGS+=	-DATF_CONFDIR='"${CONFDIR}/atf"'
++CXXFLAGS+=	-DATF_INCLUDEDIR='"${INCLUDEDIR}"'
++CXXFLAGS+=	-DATF_LIBDIR='"${LIBDIR}"'
++CXXFLAGS+=	-DATF_LIBEXECDIR='"${LIBEXECDIR}"'
++CXXFLAGS+=	-DATF_MACHINE='"${MACHINE_ARCH}"'
++CXXFLAGS+=	-DATF_M4='"/usr/bin/m4"'
++CXXFLAGS+=	-DATF_PKGDATADIR='"${SHAREDIR}/atf"'
++CXXFLAGS+=	-DATF_SHELL='"/bin/sh"'
++CXXFLAGS+=	-DATF_WORKDIR='"/tmp"'
++
+ WARNS?=		3
+ 
+ # vim: syntax=make
 diff --git a/lib/atf/libatf-c++/Makefile b/lib/atf/libatf-c++/Makefile
-index 37d6073..47cb495 100644
+index 37d6073..90a2687 100644
 --- a/lib/atf/libatf-c++/Makefile
 +++ b/lib/atf/libatf-c++/Makefile
-@@ -46,6 +46,11 @@ CFLAGS+=	-I.
- 
- CFLAGS+=	-DHAVE_CONFIG_H
+@@ -40,11 +40,11 @@ LDFLAGS+=	-L${.OBJDIR}/../libatf-c
+ .PATH:		${ATF}/atf-c++
+ .PATH:		${ATF}/atf-c++/detail
  
+-CFLAGS+=	-I${ATF}
+-CFLAGS+=	-I${.CURDIR}/../libatf-c
+-CFLAGS+=	-I.
 +CXXFLAGS+=	-I${ATF}
 +CXXFLAGS+=	-I${.CURDIR}/../libatf-c
 +CXXFLAGS+=	-I.
+ 
+-CFLAGS+=	-DHAVE_CONFIG_H
 +CXXFLAGS+=	-DHAVE_CONFIG_H
-+
+ 
  SRCS=		application.cpp \
  		build.cpp \
- 		check.cpp \

[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-lib/, sys-freebsd/freebsd-lib/files/

[Yuta SATOH]

commit:     cda05a399f1d84e33285f4017670ea8d19110f2f
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Tue Sep 17 13:27:51 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Tue Sep 17 13:27:51 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=cda05a39

added freebsd-lib-9999-libproc-libcxx.patch

---
 sys-freebsd/freebsd-lib/Manifest                            |  3 ++-
 .../freebsd-lib/files/freebsd-lib-9999-libproc-libcxx.patch | 13 +++++++++++++
 sys-freebsd/freebsd-lib/freebsd-lib-9999_p255489.ebuild     |  1 +
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index bb0341e..9e84ef2 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -15,6 +15,7 @@ AUX freebsd-lib-9.1-rmgssapi.patch 699 SHA256 0dc94a565f140beca0800446c72bd874f9
 AUX freebsd-lib-9.2-liblink.patch 2012 SHA256 065522cabf7dca8062f41c7c9154931864ec3304a2c1f59d44f88b894bf55afc SHA512 97f2f326f431337da5d14a4a37b6fced3224c85bb25ea1f0fcd121790d94dbfb27c98c7b15eb92b1967634be15db96653d5bc6fc458de63a4c988e9e650d965d WHIRLPOOL 45392c571d0f05130836d6d4f0d6b3503f58e4f4d8907d07e1011329b9285d6a010bc35606ff74d529906f6c8f240336bc265eef105196cd3e26390b3bac6d77
 AUX freebsd-lib-9999-atfcxx.patch 391 SHA256 423ed9105e87d4f3d78d4e257a88dbd237706eea391a947fa6ecad11a0943e75 SHA512 bc003e3ba5d1c2006ea316b3d0b7bae8b1db6658e9a4ad593740fa2ebd3b487431601be5c56d77364bf2fdd206aafecd5ddb753e6fa534545b32f5800378117f WHIRLPOOL 8e74e446ddf074ca82b2c51b6657c270e9f16bc19ec83525fcc58242a21e2856adc0b90e9b979f4a285ddd4dd5483ad60e1a890e5cd986eb0a243aad0df0df96
 AUX freebsd-lib-9999-liblink.patch 2074 SHA256 e138b28fbf3a131231dfce1a111cc8ae2d6922bd47332a16bab4ae7d29bb628a SHA512 701657e5ae480cecc83a28c69b27791b7ac29c0d12ca518ffae8b05b377a2c2b6fdcfa72ccefdc502d85ac476046231cee2dca3baafb721b738f6bf6f724a0b9 WHIRLPOOL f95184614ebb77535943aa8c4db3e02a75a869c0d71574721768152d8dd9c4f60268f4b5f0e60db54e3422372f1b2dfaf977623c625e89c1186b9eab6afc6b97
+AUX freebsd-lib-9999-libproc-libcxx.patch 318 SHA256 bc1a6e7821f123c8a404ff2024264de226f0ca349f2b5b040437f74cf4a31cf4 SHA512 149101d161e1f43b0d28d131c80142ee45515f02ed0d6f8f180f2ecd2ea479607df38a37049c346dee8c848892bd64f151e094c006d32741d7c1030016e56d88 WHIRLPOOL 2f31d9b77a41bbc6ef842092b20266158e46eed6c49398fa80d193ad19c42334c4fcdb6dda82a38165730b6b37882849baf438f597f5f00a9f22e8f730017400
 AUX freebsd-lib-bsdxml2expat.patch 708 SHA256 0c3ec3657155c5032479181119c488d43a479ab0dfe7a7d7ed0dabce16853e85 SHA512 d3b321062886ee636a09af4b8714ae90317c17eb954a3d491cd21ca90605e26491033df4d6f02a517eda423783db74dad16adf7ee1bdc5557392cc70218ee9c7 WHIRLPOOL 5c262c59aee9e642d3a8929a453b56c7a55ba60f3011d6ac07b750a30297eb992a564ba4db18714b7eac58bbe3ded1ff4249150128947d25dd1344e59e16c9cb
 AUX freebsd-lib-includes.patch 316 SHA256 be4dd4c905715c2d165be282cf377f799b32ccb76986947bc0bf1b5730b57b06 SHA512 31b7f368a4d3998e42486cb944a001a8371c365276eac94fa8712e29dbe9a13a7756a2fd77fbff87a1f7f4c19b32721c74bbb099f611d46a8c78b73f92d9255e WHIRLPOOL 8c4c2c6d1e9556303520c4cd8f6996f0f24c8b45985d4326db880c187b6db30e914a6e47b40ea4a79d7a309fdd579b39232329daf74758412ac518b0a9d0a317
 AUX freebsd-sources-9.0-sysctluint.patch 403 SHA256 884fbc5d6d3766ea3d4609946f56072f36f95368dc13ee316c330a46d42f0c9e SHA512 f3a87cb187858bc6fd1bafda3c3bd7bbda52b07239a50a7c1aa201df2c52a58d4809e196b8799b1949c8ca1a556519d454ad1789358540e3a96cd480fc0a504c WHIRLPOOL 1fd9852d59378b3fa8682886085f4f63ccd2a57806161b9a3ccb0cbe0c465be2e5620ed57942a8687656859e1a9df17c7d298ea66ec037514bbe7707783aa9f8
@@ -22,4 +23,4 @@ AUX libmap.conf 201 SHA256 36a1bd56965f171cbb058f6e1762801e3b92c083fe36f6fe046bd
 AUX libusb-1.0.pc.in 207 SHA256 edf35e887cbfed2df288825434c467e0a946eeb21e0d631f55940bb177c2ba15 SHA512 93289cecfc298a31fd4fd0848bf25a63048a7549bd81792d7bd158731246221c24ec9f469a918430da56873a0936fb2b372cedaaa32a38ccd5323de0f9a89b93 WHIRLPOOL 7c81b0df4548a9391b4e1420186f1e970aa9e2e73a89e817adbff9de52b8797cbd8a4d8b3ca01f782f86e4b1e48fad72a08b5bff49d5ee6ffaa5135c015ca5ae
 AUX libusb.pc.in 208 SHA256 9bfe398a335f8b9b1c3dd167ab0c9206fe3bdd4e1da318ece977e20f3c2d7c56 SHA512 e9c6d5f04057cf8c13f69a3d8e07bdd517fdb01d572a69a1beb397766311b3c53894b108caaaea740bfc27b227a9620621dac5846bff1a367fbf9954f38bb40c WHIRLPOOL e80e76a8a564655d924a7148a841c7c7cf0be0ea3bdbd76e95e5004124543826e5d925dfe791f4b040e042a10923865bb517499d9f5be39611fedbcceebe32d8
 EBUILD freebsd-lib-9.9999.ebuild 18177 SHA256 214e7ca1c8e7436a32786ef3df4f74e6cd159ef9265c7b8bf913cb9e27ce13a5 SHA512 8589bc21ce7a58f74f06d42111b42338f7ecc9eb0024079247a8e11761ec8dba40a867487ea9de24e71e7b7be595eba79194e80bab3c21ac5695efdd7cdc4deb WHIRLPOOL 0dd8a3381317a38aaf3bc1042e956518326cfd9c70cec6720a321e134ecb01147f2c045562d075e7754ee369c62abbbdd495244f9250fa01a763d80e61bab2b6
-EBUILD freebsd-lib-9999_p255489.ebuild 18550 SHA256 516785cc588dc5e5fd0cf62815f4da3292fa78138febdcf169bf11b93f31c25f SHA512 f52b82c6dd9d86ae5059b8587cd3af8a5f2d35a027c7dfb10ae749036add8d2c01ba2cffa5bc510e9267dd8ab04692d6250081b1a20c99c0502ac45a920d91ee WHIRLPOOL 249ecd39b335a48be39bab3c7002ad5f6a2e2fcf531a6a38c49aa82181ce446f9aadfff415ea18266ecfe521ea7f4beee1e9ca4b26f3b702b4e3d5c94107cb1f
+EBUILD freebsd-lib-9999_p255489.ebuild 18597 SHA256 74c5aafde405019e67e666c829d479c39c1ddb4cd1cc3e375e5e98f1ed1ed2a4 SHA512 dd362291141d74a4ad0fb9779ce819333c8fd1f62ac296df51dec7b63bfceb5df916dc531fef06ab0461d028aceb725a8812fd2ab6641676373c671717258000 WHIRLPOOL ca90bfa3cb9e744b86a5498e801831e1171fb980e63dd9d5e53eb6e3cb496efe71ea1f414446454030429bfdbef394041193d8503ee216b1b1c8545fb9c87cc4

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9999-libproc-libcxx.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9999-libproc-libcxx.patch
new file mode 100644
index 0000000..dacbee9
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-9999-libproc-libcxx.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile
+index 4449c06..c4b703f 100644
+--- a/lib/libproc/Makefile
++++ b/lib/libproc/Makefile
+@@ -15,7 +15,7 @@ INCS=	libproc.h
+ 
+ CFLAGS+=	-I${.CURDIR}
+ 
+-.if ${MK_LIBCPLUSPLUS} != "no"
++.if ${CXXFLAGS:T:M*-stdlib=libc++*}
+ LDADD+=		-lcxxrt
+ DPADD+=		${LIBCXXRT}
+ .else

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9999_p255489.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9999_p255489.ebuild
index 0241f2d..2e6aa92 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9999_p255489.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9999_p255489.ebuild
@@ -91,6 +91,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-6.1-csu.patch"
 	"${FILESDIR}/${PN}-9999-liblink.patch"
 	"${FILESDIR}/${PN}-9999-atfcxx.patch"
+	"${FILESDIR}/${PN}-9999-libproc-libcxx.patch"
 	"${FILESDIR}/${PN}-bsdxml2expat.patch"
 	"${FILESDIR}/${PN}-9.0-bluetooth.patch"
 	"${FILESDIR}/${PN}-9.1-.eh_frame_hdr-fix.patch"

[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-lib/, sys-freebsd/freebsd-lib/files/

[Yuta SATOH]

commit:     fd6c609a1069af34dedb39d7a2ef60cab82f2410
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Tue Aug 13 12:04:22 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Tue Aug 13 12:04:22 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=fd6c609a

sys-freebsd/freebsd-lib-9.9999: sync to 9.2_rc1 ebuild (rev 1.7).

---
 sys-freebsd/freebsd-lib/Manifest                            |  4 ++--
 sys-freebsd/freebsd-lib/files/freebsd-lib-9.2-liblink.patch | 12 ++++++++++++
 sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild           |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 492ca19..3dc9187 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -12,11 +12,11 @@ AUX freebsd-lib-9.0-opieincludes.patch 4495 SHA256 0868e7454053170c3399f1a03a68f
 AUX freebsd-lib-9.0-trylock-adaptive.patch 439 SHA256 af501c40124e628c2f739d88a4efa7ef3513694bd79ab44db30e4b3f73864612 SHA512 ceeeea302294db5a25b5534685dce563778572010f0072ecb300a66550ee8cc241e0ae5523e32fd5424560e82d913c37aefe06c2a6725e951ba4ad5df73a1a68 WHIRLPOOL d2a65eab4b03a7fb65e2dd6f03c2e60fe1248412e28a0829757e6cb733d1f487ee79959680f1db8af20fc409a165c5f4aea3038171e7b82aee7d38c29552531e
 AUX freebsd-lib-9.1-.eh_frame_hdr-fix.patch 695 SHA256 6c6d7a958c989edc6ee76c5b9c2146fa449adda11c3b89b550780c7a78d93190 SHA512 c40270e8890a1152a6f2e705461ac64f8cc44e6d0306d895a0d146017d4fe3553853de88178e0744fc1be4197a4eb35b578c68593c80467dd8cf15c35720413d WHIRLPOOL 1fa3c5cdba333951b918eb5c1eb793ab49921268a6a397e38f2adad383c2c03ccf382892ed8d44e2480f8ca891ce3c3a0b122a026cbf232058ac3bcf2f2d5133
 AUX freebsd-lib-9.1-rmgssapi.patch 699 SHA256 0dc94a565f140beca0800446c72bd874f99c56125181f7a037154dcd898d2615 SHA512 cb0b292cca0c321ed72b1a792a3975be239303b3990efc6665b0c960dfe17fdbb4529405286c0a956c4b4711462d2ee9d7d1c9d343ad3246b43c49edfc87dae0 WHIRLPOOL 55adff8c3436959b4545ba54c0eff3cd640dd4f0d0871bd66dad2501c04e84eb24f27b882dde9050b088dadecc9af6049493e848a1d508646149075180c8c414
-AUX freebsd-lib-9.2-liblink.patch 1420 SHA256 c8fa4315a89d3acc378c89ecd778a43ab5b4824783ef19af1082732f6b2dc3a4 SHA512 88e564e13399c88eb238a10bea1a4959c62a6af6d3c9c41c331878e0c6a1680767ebdb58f555a9f1145a2c47cdfc65e3f98387947f1941327b800cb18983cda4 WHIRLPOOL b6f2654138e9e46b0fe193b1488150e4f84c5f1b14ab1a8f21348a4158570f99499e94c54acaf8244fc1d2cc0775a40c77585b88387cf2a73ed33062335c5255
+AUX freebsd-lib-9.2-liblink.patch 1694 SHA256 7586ac9aed55c833099840fd0f7b7c119ca9fe35fcce9b507b235ae0ae5aceca SHA512 0d9b33b5bd8b661c1403485ba2005d6c7d34341d1ae6c710a4516583ca9bacee050f71e06c039378b826278db570036a4b8f107833d9151c7a3cdab43f64ceb3 WHIRLPOOL 9b2782a936dc5be5f2d789633b6eb9b68d2f199bbe7dc12c7c86a848191abbedbef942370d233e4398688ef5832e114039126662b9821e2ef04bd7e723e6fe8a
 AUX freebsd-lib-bsdxml2expat.patch 708 SHA256 0c3ec3657155c5032479181119c488d43a479ab0dfe7a7d7ed0dabce16853e85 SHA512 d3b321062886ee636a09af4b8714ae90317c17eb954a3d491cd21ca90605e26491033df4d6f02a517eda423783db74dad16adf7ee1bdc5557392cc70218ee9c7 WHIRLPOOL 5c262c59aee9e642d3a8929a453b56c7a55ba60f3011d6ac07b750a30297eb992a564ba4db18714b7eac58bbe3ded1ff4249150128947d25dd1344e59e16c9cb
 AUX freebsd-lib-includes.patch 316 SHA256 be4dd4c905715c2d165be282cf377f799b32ccb76986947bc0bf1b5730b57b06 SHA512 31b7f368a4d3998e42486cb944a001a8371c365276eac94fa8712e29dbe9a13a7756a2fd77fbff87a1f7f4c19b32721c74bbb099f611d46a8c78b73f92d9255e WHIRLPOOL 8c4c2c6d1e9556303520c4cd8f6996f0f24c8b45985d4326db880c187b6db30e914a6e47b40ea4a79d7a309fdd579b39232329daf74758412ac518b0a9d0a317
 AUX freebsd-sources-9.0-sysctluint.patch 403 SHA256 884fbc5d6d3766ea3d4609946f56072f36f95368dc13ee316c330a46d42f0c9e SHA512 f3a87cb187858bc6fd1bafda3c3bd7bbda52b07239a50a7c1aa201df2c52a58d4809e196b8799b1949c8ca1a556519d454ad1789358540e3a96cd480fc0a504c WHIRLPOOL 1fd9852d59378b3fa8682886085f4f63ccd2a57806161b9a3ccb0cbe0c465be2e5620ed57942a8687656859e1a9df17c7d298ea66ec037514bbe7707783aa9f8
 AUX libmap.conf 201 SHA256 36a1bd56965f171cbb058f6e1762801e3b92c083fe36f6fe046bd669beed9742 SHA512 abc358dff495fe96b9ed549bacb5278577ca4da46b89b87e9211a2f6acdd455111df02ba11b797287f839af6cc22f8810e8ac1dc52154acc8b22364e667b3c49 WHIRLPOOL 0827a0ea9b8a2faed019d13356a793b2b572e54d6f8ebf32a9f12214759153433e21f7d8fdedf43e038ac1925432c1f4843441db47d29895eda51781f1fedb5e
 AUX libusb-1.0.pc.in 207 SHA256 edf35e887cbfed2df288825434c467e0a946eeb21e0d631f55940bb177c2ba15 SHA512 93289cecfc298a31fd4fd0848bf25a63048a7549bd81792d7bd158731246221c24ec9f469a918430da56873a0936fb2b372cedaaa32a38ccd5323de0f9a89b93 WHIRLPOOL 7c81b0df4548a9391b4e1420186f1e970aa9e2e73a89e817adbff9de52b8797cbd8a4d8b3ca01f782f86e4b1e48fad72a08b5bff49d5ee6ffaa5135c015ca5ae
 AUX libusb.pc.in 208 SHA256 9bfe398a335f8b9b1c3dd167ab0c9206fe3bdd4e1da318ece977e20f3c2d7c56 SHA512 e9c6d5f04057cf8c13f69a3d8e07bdd517fdb01d572a69a1beb397766311b3c53894b108caaaea740bfc27b227a9620621dac5846bff1a367fbf9954f38bb40c WHIRLPOOL e80e76a8a564655d924a7148a841c7c7cf0be0ea3bdbd76e95e5004124543826e5d925dfe791f4b040e042a10923865bb517499d9f5be39611fedbcceebe32d8
-EBUILD freebsd-lib-9.9999.ebuild 18159 SHA256 ddd0673a0389e96389294951bcf847304f02dbdc62539f0b8f1636f3d83381f5 SHA512 5b6366c03d8b5e0053f518d72005844a276b45a871d9373d9e258684ad2aec1e37f094abc11461735d11c57714fd441c30c0e29f528e6c73e4f147c13d6659f9 WHIRLPOOL 388a625048570de077df71edd2ef6ac434c04fa39be01c7660c189e44d841790ea364d8f9e8bacd2600665208b485fe188a5bf5f83d7051b793e79805d8e567c
+EBUILD freebsd-lib-9.9999.ebuild 18148 SHA256 01ebde201896a88989be2771f8e86de25d7e61ca38de326fc3802afc236caf1c SHA512 1994e14b018cd5097811276141ccf5e0906d40ce7ece220b381ee5a5fe749dcb400e616e0f20aabf4ef67e03cb0f04c5863255b83af758fec6082226f3917279 WHIRLPOOL eaa728ae4bd391781314d3b0de875cd8a50bcef1be73449ba57b20cb46a3f5b9492dbde857a4bd4db045dd4513f6faa38d7ecee80eb5210142437e81ff375c96

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.2-liblink.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.2-liblink.patch
index cfc7181..3759c91 100644
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.2-liblink.patch
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.2-liblink.patch
@@ -53,3 +53,15 @@ diff -uNr lib.old/libprocstat/Makefile lib/libprocstat/Makefile
  CFLAGS+=	-I. -I${.CURDIR} -D_KVM_VNODE
  SHLIB_MAJOR=	1
  
+diff --git a/lib/libcam/Makefile b/lib/libcam/Makefile
+index fcb16de..6d0312b 100644
+--- a/lib/libcam/Makefile
++++ b/lib/libcam/Makefile
+@@ -8,6 +8,7 @@ INCS=		camlib.h
+ 
+ DPADD=		${LIBSBUF}
+ LDADD=		-lsbuf
++LDFLAGS+=	-L${.OBJDIR}/../libsbuf
+ 
+ MAN=		cam.3 cam_cdbparse.3
+ 

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild
index 49c05d0..0922d05 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild
@@ -22,6 +22,7 @@ if [[ ${PV} != *9999* ]]; then
 			mirror://gentoo/${INCLUDE}.tar.bz2
 			mirror://gentoo/${USBIN}.tar.bz2
 			mirror://gentoo/${GNU}.tar.bz2
+			mirror://gentoo/${SECURE}.tar.bz2
 			build? ( mirror://gentoo/${SYS}.tar.bz2 )
 			zfs? ( mirror://gentoo/${CDDL}.tar.bz2 )"
 fi
@@ -307,7 +308,6 @@ do_bootstrap() {
 	is_crosscompile && bootstrap_lib "lib/libc"
 	is_crosscompile || is_native_abi || bootstrap_libgcc
 	is_native_abi   || bootstrap_libthr
-	is_native_abi   || bootstrap_lib "lib/libsbuf"
 }
 
 # Compile it. Assume we have the toolchain setup correctly.

[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-lib/, sys-freebsd/freebsd-lib/files/

[Yuta SATOH]

commit:     9f831b9bc6680a70068d1ec3aaa381464afd6286
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Fri Jun 28 10:48:55 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Fri Jun 28 10:48:55 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=9f831b9b

freebsd-lib-9.9999: sync to 9.1-r9 ebuild.

---
 sys-freebsd/freebsd-lib/Manifest                   |  3 ++-
 .../files/freebsd-lib-9.1-rmgssapi.patch           | 16 +++++++++++++
 sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild  | 26 ++++++++++++----------
 3 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 56d4475..5138ee2 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -11,6 +11,7 @@ AUX freebsd-lib-9.0-netware.patch 400 SHA256 e83d43f5bf9461c3d332365cca12db7b041
 AUX freebsd-lib-9.0-opieincludes.patch 4495 SHA256 0868e7454053170c3399f1a03a68f3e70410c79db865e7e2f2b51f5961b5718b SHA512 a3828985f7da9e72ad44d88640952d56079693024bc11b4e3cca86b6f455a9e4756ba76f9e6d4c15960898f39e1dac7bc833e3241082f532c7fbd6d7d6f9418b WHIRLPOOL e0180dd0086c054e9f6895ecfe34bfb21d0e1db483dfc63ad411c651954c4703996d9b537a9566133a01770f2cf0f331727865013413181728c3b21740735473
 AUX freebsd-lib-9.0-trylock-adaptive.patch 439 SHA256 af501c40124e628c2f739d88a4efa7ef3513694bd79ab44db30e4b3f73864612 SHA512 ceeeea302294db5a25b5534685dce563778572010f0072ecb300a66550ee8cc241e0ae5523e32fd5424560e82d913c37aefe06c2a6725e951ba4ad5df73a1a68 WHIRLPOOL d2a65eab4b03a7fb65e2dd6f03c2e60fe1248412e28a0829757e6cb733d1f487ee79959680f1db8af20fc409a165c5f4aea3038171e7b82aee7d38c29552531e
 AUX freebsd-lib-9.1-.eh_frame_hdr-fix.patch 695 SHA256 6c6d7a958c989edc6ee76c5b9c2146fa449adda11c3b89b550780c7a78d93190 SHA512 c40270e8890a1152a6f2e705461ac64f8cc44e6d0306d895a0d146017d4fe3553853de88178e0744fc1be4197a4eb35b578c68593c80467dd8cf15c35720413d WHIRLPOOL 1fa3c5cdba333951b918eb5c1eb793ab49921268a6a397e38f2adad383c2c03ccf382892ed8d44e2480f8ca891ce3c3a0b122a026cbf232058ac3bcf2f2d5133
+AUX freebsd-lib-9.1-rmgssapi.patch 699 SHA256 0dc94a565f140beca0800446c72bd874f99c56125181f7a037154dcd898d2615 SHA512 cb0b292cca0c321ed72b1a792a3975be239303b3990efc6665b0c960dfe17fdbb4529405286c0a956c4b4711462d2ee9d7d1c9d343ad3246b43c49edfc87dae0 WHIRLPOOL 55adff8c3436959b4545ba54c0eff3cd640dd4f0d0871bd66dad2501c04e84eb24f27b882dde9050b088dadecc9af6049493e848a1d508646149075180c8c414
 AUX freebsd-lib-9.9999-flex.patch 397 SHA256 0beba174e1946bf9a5e703443acd33eb95c9df12d33515cd734746dd13b9fb38 SHA512 9fe3854e35ee8ce11f8a150297eb2e1e7d1d0de9a809023aa6d86e12110124bca01ee0040df91e4af5f0bc671d9570719687044bceaf25633fe4771801f54112 WHIRLPOOL 2a628aa4c5ecd90e6706da1ecb290925bba088ba1f865f8c3de51cce3955d5826681481a0a5bb1bc270f64dd00a085e0dba530ae9cd6bb77df292ddb24b8dc8d
 AUX freebsd-lib-9.9999-telnet.h.patch 497 SHA256 46e9ef90213e61e0dc31897a89d5103cce76ac7dbc51888a38fb144f94a35af8 SHA512 537df980f8675d72ed8ad872f382bf9c7bc1bbe3efe5e3d8e5e175feb45ed40dbc115d6b11983fa66abdd33e3c7fefa31c2f736db82ef1d2c81dc0a633e8855a WHIRLPOOL bb9353449455eb93ee4ac0584732110913daefe9c56d1372aaad6c5a3f9ba65f32fef236f1d1491982a21541f0ff7ebaf9dde6e7d36f269938206133a992939d
 AUX freebsd-lib-bsdxml2expat.patch 708 SHA256 0c3ec3657155c5032479181119c488d43a479ab0dfe7a7d7ed0dabce16853e85 SHA512 d3b321062886ee636a09af4b8714ae90317c17eb954a3d491cd21ca90605e26491033df4d6f02a517eda423783db74dad16adf7ee1bdc5557392cc70218ee9c7 WHIRLPOOL 5c262c59aee9e642d3a8929a453b56c7a55ba60f3011d6ac07b750a30297eb992a564ba4db18714b7eac58bbe3ded1ff4249150128947d25dd1344e59e16c9cb
@@ -19,4 +20,4 @@ AUX freebsd-sources-9.0-sysctluint.patch 403 SHA256 884fbc5d6d3766ea3d4609946f56
 AUX libmap.conf 201 SHA256 36a1bd56965f171cbb058f6e1762801e3b92c083fe36f6fe046bd669beed9742 SHA512 abc358dff495fe96b9ed549bacb5278577ca4da46b89b87e9211a2f6acdd455111df02ba11b797287f839af6cc22f8810e8ac1dc52154acc8b22364e667b3c49 WHIRLPOOL 0827a0ea9b8a2faed019d13356a793b2b572e54d6f8ebf32a9f12214759153433e21f7d8fdedf43e038ac1925432c1f4843441db47d29895eda51781f1fedb5e
 AUX libusb-1.0.pc.in 207 SHA256 edf35e887cbfed2df288825434c467e0a946eeb21e0d631f55940bb177c2ba15 SHA512 93289cecfc298a31fd4fd0848bf25a63048a7549bd81792d7bd158731246221c24ec9f469a918430da56873a0936fb2b372cedaaa32a38ccd5323de0f9a89b93 WHIRLPOOL 7c81b0df4548a9391b4e1420186f1e970aa9e2e73a89e817adbff9de52b8797cbd8a4d8b3ca01f782f86e4b1e48fad72a08b5bff49d5ee6ffaa5135c015ca5ae
 AUX libusb.pc.in 208 SHA256 9bfe398a335f8b9b1c3dd167ab0c9206fe3bdd4e1da318ece977e20f3c2d7c56 SHA512 e9c6d5f04057cf8c13f69a3d8e07bdd517fdb01d572a69a1beb397766311b3c53894b108caaaea740bfc27b227a9620621dac5846bff1a367fbf9954f38bb40c WHIRLPOOL e80e76a8a564655d924a7148a841c7c7cf0be0ea3bdbd76e95e5004124543826e5d925dfe791f4b040e042a10923865bb517499d9f5be39611fedbcceebe32d8
-EBUILD freebsd-lib-9.9999.ebuild 18226 SHA256 125ab601dfb05dcf14448f34fd30688bcd01fd82a5b1036f79a24535093bb154 SHA512 f41b5ccf468388a0e464b640537e971624a23aaf02cba0b3f8f4d5b097f61715cd617d711df645bee682182522f771dfb49168b3beeec40cf9a4cc3a1d830ce5 WHIRLPOOL b40033f1c22f55af8033ed7eb3baf50b27195cb2b25005d986fde097d2d74873bde37d4b6cc78e2245a38c279515a2a3e2f27fd53410c00cef6e523230566e23
+EBUILD freebsd-lib-9.9999.ebuild 18247 SHA256 532de3d66f54a9a3895f239a853c4635af21ed3db10da0362acc1bc8426376aa SHA512 c8802ed5cf8b5d47e9e14dcff03655675eab7b5e54ba98bb79f9c3cfd365ae2f0256b1e0f03b6cb5133360344a0afae0168725ba78e71a4d58d6e65833b8e719 WHIRLPOOL b309f937ff605bbd1dbe27df2c3477bd4afef330f31e62edb6e66d090e28db48172bb49fd513779b0087927cbe8ec82dfc8d9a4e1fbb3b9ab66529454de4ecc9

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.1-rmgssapi.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.1-rmgssapi.patch
new file mode 100644
index 0000000..62357e0
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.1-rmgssapi.patch
@@ -0,0 +1,16 @@
+--- include/Makefile.orig	2013-06-16 10:47:52.000000000 +0200
++++ include/Makefile	2013-06-16 10:47:37.000000000 +0200
+@@ -6,11 +6,11 @@
+ .include <bsd.own.mk>
+ 
+ CLEANFILES= osreldate.h version vers.c
++SUBDIR= arpa protocols rpcsvc rpc xlocale
+-SUBDIR= arpa gssapi protocols rpcsvc rpc xlocale
+ INCS=	a.out.h ar.h assert.h bitstring.h complex.h cpio.h _ctype.h ctype.h \
+ 	db.h \
+ 	dirent.h dlfcn.h elf.h elf-hints.h err.h fmtmsg.h fnmatch.h fstab.h \
++	fts.h ftw.h getopt.h glob.h grp.h \
+-	fts.h ftw.h getopt.h glob.h grp.h gssapi.h \
+ 	ieeefp.h ifaddrs.h \
+ 	inttypes.h iso646.h kenv.h langinfo.h libgen.h limits.h link.h \
+ 	locale.h malloc.h malloc_np.h memory.h monetary.h mpool.h mqueue.h \

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild
index f4dc8f8..1f34233 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild
@@ -31,7 +31,7 @@ fi
 if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then
 	RDEPEND="ssl? ( dev-libs/openssl )
 		hesiod? ( net-dns/hesiod )
-		kerberos? ( virtual/krb5 )
+		kerberos? ( app-crypt/heimdal )
 		usb? ( !dev-libs/libusb !dev-libs/libusbx )
 		zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )
 		>=dev-libs/expat-2.0.1
@@ -72,7 +72,7 @@ pkg_setup() {
 	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
 	use hesiod || mymakeopts="${mymakeopts} WITHOUT_HESIOD= "
 	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6_SUPPORT= "
-	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= "
+	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= WITHOUT_GSSAPI= "
 	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
 	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
 	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
@@ -88,9 +88,7 @@ pkg_setup() {
 
 PATCHES=(
 	"${FILESDIR}/${PN}-6.0-pmc.patch"
-	"${FILESDIR}/${PN}-6.0-gccfloat.patch"
 	"${FILESDIR}/${PN}-6.1-csu.patch"
-	"${FILESDIR}/${PN}-8.0-rpcsec_gss.patch"
 	"${FILESDIR}/${PN}-9.0-liblink.patch"
 	"${FILESDIR}/${PN}-9.0-bluetooth.patch"
 	"${FILESDIR}/${PN}-9.0-netware.patch"
@@ -121,7 +119,8 @@ REMOVE_SUBDIRS="ncurses \
 	libpam libpcap bind libwrap libmagic \
 	libcom_err libtelnet
 	libelf libedit
-	libstand"
+	libstand
+	libgssapi"
 
 # For doing multilib over multibuild.eclass
 MULTIBUILD_VARIANTS=( $(get_all_abis) )
@@ -154,6 +153,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-includes.patch"
 	epatch "${FILESDIR}/${PN}-8.0-gcc45.patch"
 	epatch "${FILESDIR}/${PN}-9.0-opieincludes.patch"
+	epatch "${FILESDIR}/${PN}-9.1-rmgssapi.patch"
 	epatch "${FILESDIR}/${PN}-9.9999-telnet.h.patch"
 
 	# Don't install the hesiod man page or header
@@ -236,6 +236,12 @@ bootstrap_libssp_nonshared() {
 	export LDADD="-lssp_nonshared"
 }
 
+bootstrap_libc() {
+	cd "${WORKDIR}/lib/libc" || die
+	freebsd_src_compile
+	append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libc"
+}
+
 bootstrap_libgcc() {
 	cd "${WORKDIR}/lib/libcompiler_rt" || die
 	freebsd_src_compile
@@ -243,9 +249,7 @@ bootstrap_libgcc() {
 	ln -s libcompiler_rt.a libgcc.a || die
 	append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libcompiler_rt"
 
-	cd "${WORKDIR}/lib/libc" || die
-	freebsd_src_compile
-	append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libc"
+	bootstrap_libc
 
 	cd "${WORKDIR}/gnu/lib/libgcc" || die
 	freebsd_src_compile
@@ -310,10 +314,8 @@ do_bootstrap() {
 	fi
 	bootstrap_csu
 	bootstrap_libssp_nonshared
-	if ! is_crosscompile && ! is_native_abi ; then
-		# Bootstrap the compiler libs
-		bootstrap_libgcc
-	fi
+	is_crosscompile && bootstrap_libc
+	is_crosscompile || is_native_abi || bootstrap_libgcc
 }
 
 # Compile it. Assume we have the toolchain setup correctly.

[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-lib/, sys-freebsd/freebsd-lib/files/

[Yuta SATOH]

commit:     e95fcdb504c7d3d547952a146ff3ed909d85d7c9
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Fri Jun 28 10:39:35 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Fri Jun 28 10:39:35 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=e95fcdb5

freebsd-lib-9.9999-flex.patch: Since source code has been changed, update the patch.

---
 sys-freebsd/freebsd-lib/Manifest                            |  3 ++-
 sys-freebsd/freebsd-lib/files/freebsd-lib-9.9999-flex.patch | 13 +++++++++++++
 sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild           |  2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 4a8c30d..56d4475 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -11,6 +11,7 @@ AUX freebsd-lib-9.0-netware.patch 400 SHA256 e83d43f5bf9461c3d332365cca12db7b041
 AUX freebsd-lib-9.0-opieincludes.patch 4495 SHA256 0868e7454053170c3399f1a03a68f3e70410c79db865e7e2f2b51f5961b5718b SHA512 a3828985f7da9e72ad44d88640952d56079693024bc11b4e3cca86b6f455a9e4756ba76f9e6d4c15960898f39e1dac7bc833e3241082f532c7fbd6d7d6f9418b WHIRLPOOL e0180dd0086c054e9f6895ecfe34bfb21d0e1db483dfc63ad411c651954c4703996d9b537a9566133a01770f2cf0f331727865013413181728c3b21740735473
 AUX freebsd-lib-9.0-trylock-adaptive.patch 439 SHA256 af501c40124e628c2f739d88a4efa7ef3513694bd79ab44db30e4b3f73864612 SHA512 ceeeea302294db5a25b5534685dce563778572010f0072ecb300a66550ee8cc241e0ae5523e32fd5424560e82d913c37aefe06c2a6725e951ba4ad5df73a1a68 WHIRLPOOL d2a65eab4b03a7fb65e2dd6f03c2e60fe1248412e28a0829757e6cb733d1f487ee79959680f1db8af20fc409a165c5f4aea3038171e7b82aee7d38c29552531e
 AUX freebsd-lib-9.1-.eh_frame_hdr-fix.patch 695 SHA256 6c6d7a958c989edc6ee76c5b9c2146fa449adda11c3b89b550780c7a78d93190 SHA512 c40270e8890a1152a6f2e705461ac64f8cc44e6d0306d895a0d146017d4fe3553853de88178e0744fc1be4197a4eb35b578c68593c80467dd8cf15c35720413d WHIRLPOOL 1fa3c5cdba333951b918eb5c1eb793ab49921268a6a397e38f2adad383c2c03ccf382892ed8d44e2480f8ca891ce3c3a0b122a026cbf232058ac3bcf2f2d5133
+AUX freebsd-lib-9.9999-flex.patch 397 SHA256 0beba174e1946bf9a5e703443acd33eb95c9df12d33515cd734746dd13b9fb38 SHA512 9fe3854e35ee8ce11f8a150297eb2e1e7d1d0de9a809023aa6d86e12110124bca01ee0040df91e4af5f0bc671d9570719687044bceaf25633fe4771801f54112 WHIRLPOOL 2a628aa4c5ecd90e6706da1ecb290925bba088ba1f865f8c3de51cce3955d5826681481a0a5bb1bc270f64dd00a085e0dba530ae9cd6bb77df292ddb24b8dc8d
 AUX freebsd-lib-9.9999-telnet.h.patch 497 SHA256 46e9ef90213e61e0dc31897a89d5103cce76ac7dbc51888a38fb144f94a35af8 SHA512 537df980f8675d72ed8ad872f382bf9c7bc1bbe3efe5e3d8e5e175feb45ed40dbc115d6b11983fa66abdd33e3c7fefa31c2f736db82ef1d2c81dc0a633e8855a WHIRLPOOL bb9353449455eb93ee4ac0584732110913daefe9c56d1372aaad6c5a3f9ba65f32fef236f1d1491982a21541f0ff7ebaf9dde6e7d36f269938206133a992939d
 AUX freebsd-lib-bsdxml2expat.patch 708 SHA256 0c3ec3657155c5032479181119c488d43a479ab0dfe7a7d7ed0dabce16853e85 SHA512 d3b321062886ee636a09af4b8714ae90317c17eb954a3d491cd21ca90605e26491033df4d6f02a517eda423783db74dad16adf7ee1bdc5557392cc70218ee9c7 WHIRLPOOL 5c262c59aee9e642d3a8929a453b56c7a55ba60f3011d6ac07b750a30297eb992a564ba4db18714b7eac58bbe3ded1ff4249150128947d25dd1344e59e16c9cb
 AUX freebsd-lib-includes.patch 316 SHA256 be4dd4c905715c2d165be282cf377f799b32ccb76986947bc0bf1b5730b57b06 SHA512 31b7f368a4d3998e42486cb944a001a8371c365276eac94fa8712e29dbe9a13a7756a2fd77fbff87a1f7f4c19b32721c74bbb099f611d46a8c78b73f92d9255e WHIRLPOOL 8c4c2c6d1e9556303520c4cd8f6996f0f24c8b45985d4326db880c187b6db30e914a6e47b40ea4a79d7a309fdd579b39232329daf74758412ac518b0a9d0a317
@@ -18,4 +19,4 @@ AUX freebsd-sources-9.0-sysctluint.patch 403 SHA256 884fbc5d6d3766ea3d4609946f56
 AUX libmap.conf 201 SHA256 36a1bd56965f171cbb058f6e1762801e3b92c083fe36f6fe046bd669beed9742 SHA512 abc358dff495fe96b9ed549bacb5278577ca4da46b89b87e9211a2f6acdd455111df02ba11b797287f839af6cc22f8810e8ac1dc52154acc8b22364e667b3c49 WHIRLPOOL 0827a0ea9b8a2faed019d13356a793b2b572e54d6f8ebf32a9f12214759153433e21f7d8fdedf43e038ac1925432c1f4843441db47d29895eda51781f1fedb5e
 AUX libusb-1.0.pc.in 207 SHA256 edf35e887cbfed2df288825434c467e0a946eeb21e0d631f55940bb177c2ba15 SHA512 93289cecfc298a31fd4fd0848bf25a63048a7549bd81792d7bd158731246221c24ec9f469a918430da56873a0936fb2b372cedaaa32a38ccd5323de0f9a89b93 WHIRLPOOL 7c81b0df4548a9391b4e1420186f1e970aa9e2e73a89e817adbff9de52b8797cbd8a4d8b3ca01f782f86e4b1e48fad72a08b5bff49d5ee6ffaa5135c015ca5ae
 AUX libusb.pc.in 208 SHA256 9bfe398a335f8b9b1c3dd167ab0c9206fe3bdd4e1da318ece977e20f3c2d7c56 SHA512 e9c6d5f04057cf8c13f69a3d8e07bdd517fdb01d572a69a1beb397766311b3c53894b108caaaea740bfc27b227a9620621dac5846bff1a367fbf9954f38bb40c WHIRLPOOL e80e76a8a564655d924a7148a841c7c7cf0be0ea3bdbd76e95e5004124543826e5d925dfe791f4b040e042a10923865bb517499d9f5be39611fedbcceebe32d8
-EBUILD freebsd-lib-9.9999.ebuild 18230 SHA256 455f47d8e22fda04d02fe06cbc6d0507f287160898502670bc7e795e739dda8b SHA512 50af63b645d92e02e9fe5594a0308854540a38bf91672dd11f3bae8e760fcc3cf69f9a76dbdce16f4e224591bb652f7a65e7f2b6dc3ecaa2c5b735f7e2261073 WHIRLPOOL 5172f5b324cb306ef6f9d8b550f43a8cf4adbdf4612b89e21ddf0b6ad714870ea28e52a64d0cc3687b30ae7fa98b4fc4570e1dc390adc2eefc9564929dacabb2
+EBUILD freebsd-lib-9.9999.ebuild 18226 SHA256 125ab601dfb05dcf14448f34fd30688bcd01fd82a5b1036f79a24535093bb154 SHA512 f41b5ccf468388a0e464b640537e971624a23aaf02cba0b3f8f4d5b097f61715cd617d711df645bee682182522f771dfb49168b3beeec40cf9a4cc3a1d830ce5 WHIRLPOOL b40033f1c22f55af8033ed7eb3baf50b27195cb2b25005d986fde097d2d74873bde37d4b6cc78e2245a38c279515a2a3e2f27fd53410c00cef6e523230566e23

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.9999-flex.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.9999-flex.patch
new file mode 100644
index 0000000..eb4d066
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.9999-flex.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/libipsec/policy_token.l b/lib/libipsec/policy_token.l
+index 219cce4..a5d3c03 100644
+--- a/lib/libipsec/policy_token.l
++++ b/lib/libipsec/policy_token.l
+@@ -139,8 +139,6 @@ void
+ __policy__strbuffer__init__(msg)
+ 	char *msg;
+ {
+-	if (YY_CURRENT_BUFFER)
+-		yy_delete_buffer(YY_CURRENT_BUFFER);
+ 	strbuffer = (YY_BUFFER_STATE)yy_scan_string(msg);
+ 	yy_switch_to_buffer(strbuffer);
+ 

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild
index c2550a7..f4dc8f8 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild
@@ -89,13 +89,13 @@ pkg_setup() {
 PATCHES=(
 	"${FILESDIR}/${PN}-6.0-pmc.patch"
 	"${FILESDIR}/${PN}-6.0-gccfloat.patch"
-	"${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
 	"${FILESDIR}/${PN}-6.1-csu.patch"
 	"${FILESDIR}/${PN}-8.0-rpcsec_gss.patch"
 	"${FILESDIR}/${PN}-9.0-liblink.patch"
 	"${FILESDIR}/${PN}-9.0-bluetooth.patch"
 	"${FILESDIR}/${PN}-9.0-netware.patch"
 	"${FILESDIR}/${PN}-9.1-.eh_frame_hdr-fix.patch"
+	"${FILESDIR}/${PN}-9.9999-flex.patch"
 	"${FILESDIR}/${PN}-bsdxml2expat.patch" )
 
 # Here we disable and remove source which we don't need or want

[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-lib/, sys-freebsd/freebsd-lib/files/

[Yuta SATOH]

commit:     719184b570e3ce3360c6fc5870b43e3b3bd23eb8
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Wed Mar 20 10:35:18 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Wed Mar 20 10:35:18 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=719184b5

freebsd-lib-9.9999: force install telnet.h , freebsd-{rescue,usbin}-9.9999 requires it.

---
 sys-freebsd/freebsd-lib/Manifest                   |    3 ++-
 .../files/freebsd-lib-9.9999-telnet.h.patch        |   20 ++++++++++++++++++++
 sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild  |    1 +
 3 files changed, 23 insertions(+), 1 deletions(-)

diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 2a44d9f..dafe62e 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -11,10 +11,11 @@ AUX freebsd-lib-9.0-netware.patch 400 SHA256 e83d43f5bf9461c3d332365cca12db7b041
 AUX freebsd-lib-9.0-opieincludes.patch 4495 SHA256 0868e7454053170c3399f1a03a68f3e70410c79db865e7e2f2b51f5961b5718b SHA512 a3828985f7da9e72ad44d88640952d56079693024bc11b4e3cca86b6f455a9e4756ba76f9e6d4c15960898f39e1dac7bc833e3241082f532c7fbd6d7d6f9418b WHIRLPOOL e0180dd0086c054e9f6895ecfe34bfb21d0e1db483dfc63ad411c651954c4703996d9b537a9566133a01770f2cf0f331727865013413181728c3b21740735473
 AUX freebsd-lib-9.0-trylock-adaptive.patch 439 SHA256 af501c40124e628c2f739d88a4efa7ef3513694bd79ab44db30e4b3f73864612 SHA512 ceeeea302294db5a25b5534685dce563778572010f0072ecb300a66550ee8cc241e0ae5523e32fd5424560e82d913c37aefe06c2a6725e951ba4ad5df73a1a68 WHIRLPOOL d2a65eab4b03a7fb65e2dd6f03c2e60fe1248412e28a0829757e6cb733d1f487ee79959680f1db8af20fc409a165c5f4aea3038171e7b82aee7d38c29552531e
 AUX freebsd-lib-9.1-.eh_frame_hdr-fix.patch 695 SHA256 6c6d7a958c989edc6ee76c5b9c2146fa449adda11c3b89b550780c7a78d93190 SHA512 c40270e8890a1152a6f2e705461ac64f8cc44e6d0306d895a0d146017d4fe3553853de88178e0744fc1be4197a4eb35b578c68593c80467dd8cf15c35720413d WHIRLPOOL 1fa3c5cdba333951b918eb5c1eb793ab49921268a6a397e38f2adad383c2c03ccf382892ed8d44e2480f8ca891ce3c3a0b122a026cbf232058ac3bcf2f2d5133
+AUX freebsd-lib-9.9999-telnet.h.patch 497 SHA256 46e9ef90213e61e0dc31897a89d5103cce76ac7dbc51888a38fb144f94a35af8 SHA512 537df980f8675d72ed8ad872f382bf9c7bc1bbe3efe5e3d8e5e175feb45ed40dbc115d6b11983fa66abdd33e3c7fefa31c2f736db82ef1d2c81dc0a633e8855a WHIRLPOOL bb9353449455eb93ee4ac0584732110913daefe9c56d1372aaad6c5a3f9ba65f32fef236f1d1491982a21541f0ff7ebaf9dde6e7d36f269938206133a992939d
 AUX freebsd-lib-bsdxml2expat.patch 708 SHA256 0c3ec3657155c5032479181119c488d43a479ab0dfe7a7d7ed0dabce16853e85 SHA512 d3b321062886ee636a09af4b8714ae90317c17eb954a3d491cd21ca90605e26491033df4d6f02a517eda423783db74dad16adf7ee1bdc5557392cc70218ee9c7 WHIRLPOOL 5c262c59aee9e642d3a8929a453b56c7a55ba60f3011d6ac07b750a30297eb992a564ba4db18714b7eac58bbe3ded1ff4249150128947d25dd1344e59e16c9cb
 AUX freebsd-lib-includes.patch 316 SHA256 be4dd4c905715c2d165be282cf377f799b32ccb76986947bc0bf1b5730b57b06 SHA512 31b7f368a4d3998e42486cb944a001a8371c365276eac94fa8712e29dbe9a13a7756a2fd77fbff87a1f7f4c19b32721c74bbb099f611d46a8c78b73f92d9255e WHIRLPOOL 8c4c2c6d1e9556303520c4cd8f6996f0f24c8b45985d4326db880c187b6db30e914a6e47b40ea4a79d7a309fdd579b39232329daf74758412ac518b0a9d0a317
 AUX freebsd-sources-9.0-sysctluint.patch 403 SHA256 884fbc5d6d3766ea3d4609946f56072f36f95368dc13ee316c330a46d42f0c9e SHA512 f3a87cb187858bc6fd1bafda3c3bd7bbda52b07239a50a7c1aa201df2c52a58d4809e196b8799b1949c8ca1a556519d454ad1789358540e3a96cd480fc0a504c WHIRLPOOL 1fd9852d59378b3fa8682886085f4f63ccd2a57806161b9a3ccb0cbe0c465be2e5620ed57942a8687656859e1a9df17c7d298ea66ec037514bbe7707783aa9f8
 AUX libmap.conf 201 SHA256 36a1bd56965f171cbb058f6e1762801e3b92c083fe36f6fe046bd669beed9742 SHA512 abc358dff495fe96b9ed549bacb5278577ca4da46b89b87e9211a2f6acdd455111df02ba11b797287f839af6cc22f8810e8ac1dc52154acc8b22364e667b3c49 WHIRLPOOL 0827a0ea9b8a2faed019d13356a793b2b572e54d6f8ebf32a9f12214759153433e21f7d8fdedf43e038ac1925432c1f4843441db47d29895eda51781f1fedb5e
 AUX libusb-1.0.pc.in 207 SHA256 edf35e887cbfed2df288825434c467e0a946eeb21e0d631f55940bb177c2ba15 SHA512 93289cecfc298a31fd4fd0848bf25a63048a7549bd81792d7bd158731246221c24ec9f469a918430da56873a0936fb2b372cedaaa32a38ccd5323de0f9a89b93 WHIRLPOOL 7c81b0df4548a9391b4e1420186f1e970aa9e2e73a89e817adbff9de52b8797cbd8a4d8b3ca01f782f86e4b1e48fad72a08b5bff49d5ee6ffaa5135c015ca5ae
 AUX libusb.pc.in 208 SHA256 9bfe398a335f8b9b1c3dd167ab0c9206fe3bdd4e1da318ece977e20f3c2d7c56 SHA512 e9c6d5f04057cf8c13f69a3d8e07bdd517fdb01d572a69a1beb397766311b3c53894b108caaaea740bfc27b227a9620621dac5846bff1a367fbf9954f38bb40c WHIRLPOOL e80e76a8a564655d924a7148a841c7c7cf0be0ea3bdbd76e95e5004124543826e5d925dfe791f4b040e042a10923865bb517499d9f5be39611fedbcceebe32d8
-EBUILD freebsd-lib-9.9999.ebuild 17349 SHA256 503854555f31fedb9f1048e49ec27a472143ad08a529d23dd43f256715b43af4 SHA512 08e5ef80eacfed47c71f8a6454de484cf04014f2fe97c84c62dabef4602f97cbbff2012169d41b671c0e73632cdb1f9628b3f14a2b0f3818aa70961e5a713ab6 WHIRLPOOL dc17ce7f49689f454fd014af99e8e9f4fc27039f6430d5ae9d26ec97c4c0013f2f48601349e3f972d08b31341f5f452536cb9e4d2585b30b33d51b6e7ac91d76
+EBUILD freebsd-lib-9.9999.ebuild 17399 SHA256 2de275cb603c58a1a8d097732e7a17b5908effb1e6ebfa704af41c92d5bd5628 SHA512 97a3532ebb83cb400d96111114c568683a894f5fa37854078363cfdb979db6572897feffd9fb609f5e5c0647751d322bbfe1bec55ae35da588fba765679aa04b WHIRLPOOL 36d25dd62d53aaa54af694d49def873240e7761b7f74d802bc58c3cfca4653ae5f6df3404fa39059886084d8c52f8c55fac6f0d99382fb4e0c216c699648830e

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.9999-telnet.h.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.9999-telnet.h.patch
new file mode 100644
index 0000000..7a08f13
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.9999-telnet.h.patch
@@ -0,0 +1,20 @@
+freebsd-{rescue,usbin}-9.9999 needs /usr/include/arpa/telnet.h
+
+diff --git a/include/arpa/Makefile b/include/arpa/Makefile
+index 8a7f63d..a480b31 100644
+--- a/include/arpa/Makefile
++++ b/include/arpa/Makefile
+@@ -1,12 +1,7 @@
+ # $FreeBSD$
+ 
+-.include <bsd.own.mk>
+-
+ NO_OBJ=
+-INCS=	ftp.h inet.h nameser.h nameser_compat.h tftp.h
+-.if ${MK_TELNET} == "no"
+-INCS+=	telnet.h
+-.endif
++INCS=	ftp.h inet.h nameser.h nameser_compat.h telnet.h tftp.h
+ INCSDIR=${INCLUDEDIR}/arpa
+ 
+ .include <bsd.prog.mk>

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild
index 033262e..5bf4256 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild
@@ -151,6 +151,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-includes.patch"
 	epatch "${FILESDIR}/${PN}-8.0-gcc45.patch"
 	epatch "${FILESDIR}/${PN}-9.0-opieincludes.patch"
+	epatch "${FILESDIR}/${PN}-9.9999-telnet.h.patch"
 
 	# Don't install the hesiod man page or header
 	rm "${WORKDIR}"/include/hesiod.h || die

[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-lib/, sys-freebsd/freebsd-lib/files/

[Yuta SATOH]

commit:     8cf162ecaebe22da2f59c2c7c914ff5072e60c18
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Tue Mar  5 16:37:36 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Tue Mar  5 16:37:36 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=8cf162ec

freebsd-lib: Fix "no .eh_frame_hdr table will be created" error on x86-fbsd.

---
 sys-freebsd/freebsd-lib/Manifest                   |    3 ++-
 .../files/freebsd-lib-9.1-.eh_frame_hdr-fix.patch  |   17 +++++++++++++++++
 sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild  |    1 +
 3 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 23df47a..2a44d9f 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -10,10 +10,11 @@ AUX freebsd-lib-9.0-liblink.patch 627 SHA256 41f0b7f92f2a8f0a3e422447b830d7dec70
 AUX freebsd-lib-9.0-netware.patch 400 SHA256 e83d43f5bf9461c3d332365cca12db7b041b765c79eef392970665740411c382 SHA512 07ebde5797480f37502e60db2a8c9ce9459bd55b176e79c0f20a859cf737f619559cb27706fb0e83fb501493677a3ffeaa9a98d45db3c0c539b71d2f18140246 WHIRLPOOL 2d78565fe0bc0dcdd61d028ba24b20d2db94f32b40536e7e8e1d5e7f485e0e2f3125807dbb6607d26e4366a6aa8ee89a8f0af7c9498f1fba9431f652c181a8f1
 AUX freebsd-lib-9.0-opieincludes.patch 4495 SHA256 0868e7454053170c3399f1a03a68f3e70410c79db865e7e2f2b51f5961b5718b SHA512 a3828985f7da9e72ad44d88640952d56079693024bc11b4e3cca86b6f455a9e4756ba76f9e6d4c15960898f39e1dac7bc833e3241082f532c7fbd6d7d6f9418b WHIRLPOOL e0180dd0086c054e9f6895ecfe34bfb21d0e1db483dfc63ad411c651954c4703996d9b537a9566133a01770f2cf0f331727865013413181728c3b21740735473
 AUX freebsd-lib-9.0-trylock-adaptive.patch 439 SHA256 af501c40124e628c2f739d88a4efa7ef3513694bd79ab44db30e4b3f73864612 SHA512 ceeeea302294db5a25b5534685dce563778572010f0072ecb300a66550ee8cc241e0ae5523e32fd5424560e82d913c37aefe06c2a6725e951ba4ad5df73a1a68 WHIRLPOOL d2a65eab4b03a7fb65e2dd6f03c2e60fe1248412e28a0829757e6cb733d1f487ee79959680f1db8af20fc409a165c5f4aea3038171e7b82aee7d38c29552531e
+AUX freebsd-lib-9.1-.eh_frame_hdr-fix.patch 695 SHA256 6c6d7a958c989edc6ee76c5b9c2146fa449adda11c3b89b550780c7a78d93190 SHA512 c40270e8890a1152a6f2e705461ac64f8cc44e6d0306d895a0d146017d4fe3553853de88178e0744fc1be4197a4eb35b578c68593c80467dd8cf15c35720413d WHIRLPOOL 1fa3c5cdba333951b918eb5c1eb793ab49921268a6a397e38f2adad383c2c03ccf382892ed8d44e2480f8ca891ce3c3a0b122a026cbf232058ac3bcf2f2d5133
 AUX freebsd-lib-bsdxml2expat.patch 708 SHA256 0c3ec3657155c5032479181119c488d43a479ab0dfe7a7d7ed0dabce16853e85 SHA512 d3b321062886ee636a09af4b8714ae90317c17eb954a3d491cd21ca90605e26491033df4d6f02a517eda423783db74dad16adf7ee1bdc5557392cc70218ee9c7 WHIRLPOOL 5c262c59aee9e642d3a8929a453b56c7a55ba60f3011d6ac07b750a30297eb992a564ba4db18714b7eac58bbe3ded1ff4249150128947d25dd1344e59e16c9cb
 AUX freebsd-lib-includes.patch 316 SHA256 be4dd4c905715c2d165be282cf377f799b32ccb76986947bc0bf1b5730b57b06 SHA512 31b7f368a4d3998e42486cb944a001a8371c365276eac94fa8712e29dbe9a13a7756a2fd77fbff87a1f7f4c19b32721c74bbb099f611d46a8c78b73f92d9255e WHIRLPOOL 8c4c2c6d1e9556303520c4cd8f6996f0f24c8b45985d4326db880c187b6db30e914a6e47b40ea4a79d7a309fdd579b39232329daf74758412ac518b0a9d0a317
 AUX freebsd-sources-9.0-sysctluint.patch 403 SHA256 884fbc5d6d3766ea3d4609946f56072f36f95368dc13ee316c330a46d42f0c9e SHA512 f3a87cb187858bc6fd1bafda3c3bd7bbda52b07239a50a7c1aa201df2c52a58d4809e196b8799b1949c8ca1a556519d454ad1789358540e3a96cd480fc0a504c WHIRLPOOL 1fd9852d59378b3fa8682886085f4f63ccd2a57806161b9a3ccb0cbe0c465be2e5620ed57942a8687656859e1a9df17c7d298ea66ec037514bbe7707783aa9f8
 AUX libmap.conf 201 SHA256 36a1bd56965f171cbb058f6e1762801e3b92c083fe36f6fe046bd669beed9742 SHA512 abc358dff495fe96b9ed549bacb5278577ca4da46b89b87e9211a2f6acdd455111df02ba11b797287f839af6cc22f8810e8ac1dc52154acc8b22364e667b3c49 WHIRLPOOL 0827a0ea9b8a2faed019d13356a793b2b572e54d6f8ebf32a9f12214759153433e21f7d8fdedf43e038ac1925432c1f4843441db47d29895eda51781f1fedb5e
 AUX libusb-1.0.pc.in 207 SHA256 edf35e887cbfed2df288825434c467e0a946eeb21e0d631f55940bb177c2ba15 SHA512 93289cecfc298a31fd4fd0848bf25a63048a7549bd81792d7bd158731246221c24ec9f469a918430da56873a0936fb2b372cedaaa32a38ccd5323de0f9a89b93 WHIRLPOOL 7c81b0df4548a9391b4e1420186f1e970aa9e2e73a89e817adbff9de52b8797cbd8a4d8b3ca01f782f86e4b1e48fad72a08b5bff49d5ee6ffaa5135c015ca5ae
 AUX libusb.pc.in 208 SHA256 9bfe398a335f8b9b1c3dd167ab0c9206fe3bdd4e1da318ece977e20f3c2d7c56 SHA512 e9c6d5f04057cf8c13f69a3d8e07bdd517fdb01d572a69a1beb397766311b3c53894b108caaaea740bfc27b227a9620621dac5846bff1a367fbf9954f38bb40c WHIRLPOOL e80e76a8a564655d924a7148a841c7c7cf0be0ea3bdbd76e95e5004124543826e5d925dfe791f4b040e042a10923865bb517499d9f5be39611fedbcceebe32d8
-EBUILD freebsd-lib-9.9999.ebuild 17300 SHA256 be925626ad52ce3ae2d22df6907920a2a5efc3706267184f6e706640b4f68dc4 SHA512 f970cffab2b95fcc301fb24c74a5460cff4b09bbf24fc744538a466d236243fa8151c228d219af59940a4236284e13a93f1defdc97dc921a62cb1e874bbff0cc WHIRLPOOL 1a5a13a6532f7b5843674179c683041de491d2d3359d16a66472079a84990bb2ecd8a18d272b3d93ac9421ee9792649194e397bb2231ebcc83ab2124a94b6e11
+EBUILD freebsd-lib-9.9999.ebuild 17349 SHA256 503854555f31fedb9f1048e49ec27a472143ad08a529d23dd43f256715b43af4 SHA512 08e5ef80eacfed47c71f8a6454de484cf04014f2fe97c84c62dabef4602f97cbbff2012169d41b671c0e73632cdb1f9628b3f14a2b0f3818aa70961e5a713ab6 WHIRLPOOL dc17ce7f49689f454fd014af99e8e9f4fc27039f6430d5ae9d26ec97c4c0013f2f48601349e3f972d08b31341f5f452536cb9e4d2585b30b33d51b6e7ac91d76

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.1-.eh_frame_hdr-fix.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.1-.eh_frame_hdr-fix.patch
new file mode 100644
index 0000000..fdb7e16
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.1-.eh_frame_hdr-fix.patch
@@ -0,0 +1,17 @@
+Fix "no .eh_frame_hdr table will be created" error.
+
+http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47829
+http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/4a0e0cd7377c45dc21d5c71bcab931b5e5727e74
+
+diff -Nur lib.orig/csu/i386-elf/Makefile lib/csu/i386-elf/Makefile
+--- lib.orig/csu/i386-elf/Makefile	2013-03-06 01:07:57.000000000 +0900
++++ lib/csu/i386-elf/Makefile	2013-03-06 01:10:09.000000000 +0900
+@@ -10,6 +10,8 @@
+ FILESDIR=	${LIBDIR}
+ CFLAGS+=	-I${.CURDIR}/../common \
+ 		-I${.CURDIR}/../../libc/include
++CFLAGS+=	-fno-omit-frame-pointer
++CFLAGS+=	-fno-asynchronous-unwind-tables
+ CLEANFILES=	${FILES} crt1_c.o crt1_s.o gcrt1_c.o Scrt1_c.o
+ CLEANFILES+=	crt1_c.s gcrt1_c.s Scrt1_c.s
+ 

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild
index ab4a835..033262e 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild
@@ -96,6 +96,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-9.0-liblink.patch"
 	"${FILESDIR}/${PN}-9.0-bluetooth.patch"
 	"${FILESDIR}/${PN}-9.0-netware.patch"
+	"${FILESDIR}/${PN}-9.1-.eh_frame_hdr-fix.patch"
 	"${FILESDIR}/${PN}-bsdxml2expat.patch" )
 
 # Here we disable and remove source which we don't need or want

[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-lib/, sys-freebsd/freebsd-lib/files/

[Yuta SATOH]

commit:     3315a32b7f83be298675db5453b42f52299f85ce
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Tue Dec 25 16:01:06 2012 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Tue Dec 25 16:01:06 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=3315a32b

freebsd-lib-9.1_rc3-r1: fixed bug 448506

---
 sys-freebsd/freebsd-lib/Manifest                   |    4 +++-
 .../files/freebsd-lib-9.0-bluetooth.patch          |   12 ++++++++++++
 .../files/freebsd-lib-9.0-netware.patch            |   11 +++++++++++
 .../freebsd-lib/freebsd-lib-9.1_rc3-r1.ebuild      |    2 ++
 4 files changed, 28 insertions(+), 1 deletions(-)

diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 67f3295..516aa09 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -11,7 +11,9 @@ AUX freebsd-lib-8.0-log2.patch 667 SHA256 dc421c3d92790da46360225de2dd4d707c314e
 AUX freebsd-lib-8.0-rpcsec_gss.patch 298 SHA256 775ec2ee12c49f134938fa8264c04c6b2bf95f8001371f20b85058c25ff1c472 SHA512 2dd63be1a31a1e78fff38a3061469148b673423d958223a459d157accd3a2d1b1f4e568910c49979b0a214322c4e7371f2710ef78fab7d161545fec2a78dc702 WHIRLPOOL 884b76cd6d5d01f801b2fb13f53cfa6ed26dd0b9b2a5062ac9dbe63a6813bfe737e4c3f98b3d94c32dfb6ce3cc19cd5c8760c81250f4b2d5980a4f084d7dc54b
 AUX freebsd-lib-8.2-liblink.patch 510 SHA256 38f967683e9d335ff7860150b2e6ae4d749266937ba195c6747d42d64c8e31ee SHA512 52a050078dc71163709e6dbe6d1c3177adbc51cb9b30a6990194ddd32f5b54e107b758801f0ff5632c4fe800c6734d63d42e53378a78caa0072847060fbb0dee WHIRLPOOL c0b95cb074ff6fd7699a03dfe31572a5edbde2b59c8aac3431fb85a0a0d71ad28566500951e0fb96ed9a8d3081abca7ec507c26e12e988f0ff2ece51bb0df2d1
 AUX freebsd-lib-8.2-nlm_syscall.patch 385 SHA256 4b26be44718cb3deb7fb295d403e892ed73ceba7ba43499a889bd49a5e43852b SHA512 1c871dc00da4b6d1106720954014f60933c99508dfc34fe08ae37b2f67ca05f70ac5e1bb75d0d1d119c7750405871ee3fb6e95ebd3ec378fc84e819cc0c4c9fd WHIRLPOOL 4d335910c00f21d2d8d5f80cd99c5316e5c485f935eefb782398e2e308e20a2cd4da0e1acf74c07a2c6d8ff446b3757cc416c0bee7e1be9d9cae0843a45e0748
+AUX freebsd-lib-9.0-bluetooth.patch 318 SHA256 5b8810471bd57e1100cc7ee6eee3ed92799e1a5c0244f5ae42f3715189fb06c3 SHA512 71cba168c1530407840dde9e25ce374abb7e0d69800e85bf6f5aff28d1a777ff31f47a84ab763e1518d3492f604d1c09ca95cf8ec5b4e05e8bd5b85267ca4488 WHIRLPOOL eccb54dd10a01358aa7e8267e64f103b89c2981ab2475f27282d5ea0bfe8adb8a106c869ca661553c3d2eda0c1d3d9dec669da6cfe61c23d5749535bdcc8c28b
 AUX freebsd-lib-9.0-liblink.patch 627 SHA256 41f0b7f92f2a8f0a3e422447b830d7dec70a068573086484d5efd6826b7c4c3c SHA512 0c570fea9cc386afe4b742985cf7de4d49370be3f34b2059dee76869d8e64bd52db0a07e61fac8924848d12d0e6d510ad6a266ce8ef76e2be885d81d909ab616 WHIRLPOOL b59e3bb0aaede34492d1940a77b11c7e5192643122f18ee6ad363053f9dec2600218ca416dd153e1d0b3bb6621d6f9e2ec50621e6e7f4b610abbd69993dc428a
+AUX freebsd-lib-9.0-netware.patch 400 SHA256 e83d43f5bf9461c3d332365cca12db7b041b765c79eef392970665740411c382 SHA512 07ebde5797480f37502e60db2a8c9ce9459bd55b176e79c0f20a859cf737f619559cb27706fb0e83fb501493677a3ffeaa9a98d45db3c0c539b71d2f18140246 WHIRLPOOL 2d78565fe0bc0dcdd61d028ba24b20d2db94f32b40536e7e8e1d5e7f485e0e2f3125807dbb6607d26e4366a6aa8ee89a8f0af7c9498f1fba9431f652c181a8f1
 AUX freebsd-lib-9.0-opieincludes.patch 4495 SHA256 0868e7454053170c3399f1a03a68f3e70410c79db865e7e2f2b51f5961b5718b SHA512 a3828985f7da9e72ad44d88640952d56079693024bc11b4e3cca86b6f455a9e4756ba76f9e6d4c15960898f39e1dac7bc833e3241082f532c7fbd6d7d6f9418b WHIRLPOOL e0180dd0086c054e9f6895ecfe34bfb21d0e1db483dfc63ad411c651954c4703996d9b537a9566133a01770f2cf0f331727865013413181728c3b21740735473
 AUX freebsd-lib-9.0-trylock-adaptive.patch 439 SHA256 af501c40124e628c2f739d88a4efa7ef3513694bd79ab44db30e4b3f73864612 SHA512 ceeeea302294db5a25b5534685dce563778572010f0072ecb300a66550ee8cc241e0ae5523e32fd5424560e82d913c37aefe06c2a6725e951ba4ad5df73a1a68 WHIRLPOOL d2a65eab4b03a7fb65e2dd6f03c2e60fe1248412e28a0829757e6cb733d1f487ee79959680f1db8af20fc409a165c5f4aea3038171e7b82aee7d38c29552531e
 AUX freebsd-lib-bsdxml.patch 339 SHA256 c1ac47d6c7176475f0f4b86bb17288a980b44a799fb6f4e7b1920f69e0447dc9 SHA512 8d14ebc848426cf600cf2206f60b91d3a5e555c738be8bb84707dcf2455be98ea3dd0a6929495b93027f71097ff0232cc85c16be4d5381a167ee0aae5a14d542 WHIRLPOOL dbafb2f98b56cac9c3ec1377c7fae40935ca3c8b1116665ce36b82a55242dbead24dc4fc38d0268cf5af82e7f908543f1376fdd3f7d847bd92dc51438a3934ee
@@ -32,4 +34,4 @@ DIST freebsd-lib-9.1_rc3.tar.bz2 3205238 SHA256 da7001a8c23fcc614b230414cb830c12
 DIST freebsd-libexec-9.1_rc3.tar.bz2 305301 SHA256 4cf56ff81096112b33276f619e823c8426bc1c97904f183b431e2e98c29ef698 SHA512 3122faf7f88934c05bee6c6d5faa24998d27c35e11bf4f809af26d7b8ad0a26519715b7a29f303ba878e3e8897742486a0a86a123d00b9deb60246c8cac4e1a7 WHIRLPOOL 1b10d85d2d426457189143350b375c7a1723ff8067c37200cce15f18fa6d963b94fdd0339e91d01ed16b87e4338761e33c7afb022e50b3bbff8dbcc3a45f5b73
 DIST freebsd-sys-9.1_rc3.tar.bz2 32605500 SHA256 5194ac93850aff4f10978b739573ab8ee54a95a0b2d4e46f754314ae381b442b SHA512 17cd41ea66bf1d2e10b56001e6e1c80db78e1572aff4ad1ac945bc24d38dfef612e1a4b7eead8bc50b94df798b0bde3dcc13a0596860322569272b3239a30b9b WHIRLPOOL 8628c5a97675b3fe4ebfcb92c4fb6d5aebaa3a11551e4f16004a6ffb23b3d10334b623c70f255762038bf1fc80a7a27abd587f10ac9706ac1bb0b22adda266b8
 DIST freebsd-usbin-9.1_rc3.tar.bz2 2669370 SHA256 de606bb756c413e85a302bc91033952f1beb8066ef555db26d79943bf128aa74 SHA512 3a002d5b7cd98f1139a8bd949633434e8aec8352c3d49bca9c72b3744d60ea63a9fd5e651eedb3d439405bcfa197bfd05d5e658428e57b01e021ba1ab0304d7e WHIRLPOOL 43f066d202d053383f9f7d4b19dd06b22d9c19ad79f258905e5dc2dc9451c936c128b512d3e8cdf90c70f8a19230a536d7c119b2f45a234f04bb9dde2d87fc52
-EBUILD freebsd-lib-9.1_rc3-r1.ebuild 17065 SHA256 e1316cc5c8087b8c1c6221432abae5fd224db623e45b46eee085ed5058361fff SHA512 a046a312248a3f4a6a1ab50375630ba92eead847f93ff479a18b1f28b40550cb5ba8f22f4225ad8cdd1e141640b7e11084f796346948c4b463544b9822daec40 WHIRLPOOL 456b399d020bec757c3e56c7298b90bc8938c8de4dd0944cc1e3a767355c53d82c3f17096f5d7e020c151ac7d0728bcab9c4be6ba22eda33dac0a17092dd38b0
+EBUILD freebsd-lib-9.1_rc3-r1.ebuild 17145 SHA256 196bfafe12f2efb397630b1be8af2adc1cd2b01ec45b55791e828c790ba44d17 SHA512 63431ff753cb26404f3dd9189c957a7bd5741359d3bede45c38be7a1ba8e5bc11136a0b32fb01c729f93d310702fb48d4eaff53d1ff242b35c689138068fc7c1 WHIRLPOOL 898d3f5895ce0e9072fd6e600ed8056d75cf7aeba6b0101efbb8b5887e04094489c2f599c89d76eb019ff10d20715e5587657852557dcaf109655855dd067ebb

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-bluetooth.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-bluetooth.patch
new file mode 100644
index 0000000..cf1172a
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-bluetooth.patch
@@ -0,0 +1,12 @@
+diff -Nur lib.orig/libsdp/Makefile lib/libsdp/Makefile
+--- lib.orig/libsdp/Makefile	2012-12-25 20:28:50.000000000 +0900
++++ lib/libsdp/Makefile	2012-12-25 20:31:19.000000000 +0900
+@@ -5,7 +5,7 @@
+ MAN=		sdp.3
+ 
+ WARNS?=		2
+-CFLAGS+=	-I${.CURDIR}
++CFLAGS+=	-I${.CURDIR} -I${.CURDIR}/../libbluetooth
+ 
+ SHLIB_MAJOR=	4
+ 

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-netware.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-netware.patch
new file mode 100644
index 0000000..c1c2a0e
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-netware.patch
@@ -0,0 +1,11 @@
+diff -Nur lib.orig/libncp/Makefile lib/libncp/Makefile
+--- lib.orig/libncp/Makefile	2012-12-25 20:35:16.000000000 +0900
++++ lib/libncp/Makefile	2012-12-25 20:36:23.000000000 +0900
+@@ -6,6 +6,7 @@
+ 
+ DPADD=		${LIBIPX}
+ LDADD=		-lipx
++LDFLAGS+=-L${.OBJDIR}/../libipx
+ 
+ SRCS=	ncpl_subr.c ncpl_bind.c ncpl_queue.c ncpl_file.c ncpl_misc.c \
+ 	ncpl_net.c ncpl_rcfile.c ncpl_conn.c ncpl_nls.c ncpl_msg.c \

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.1_rc3-r1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.1_rc3-r1.ebuild
index 8e76d4c..95e68a8 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.1_rc3-r1.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.1_rc3-r1.ebuild
@@ -92,6 +92,8 @@ PATCHES=(
 	"${FILESDIR}/${PN}-6.1-csu.patch"
 	"${FILESDIR}/${PN}-8.0-rpcsec_gss.patch"
 	"${FILESDIR}/${PN}-9.0-liblink.patch"
+	"${FILESDIR}/${PN}-9.0-bluetooth.patch"
+	"${FILESDIR}/${PN}-9.0-netware.patch"
 	"${FILESDIR}/${PN}-bsdxml2expat.patch" )
 
 # Here we disable and remove source which we don't need or want

[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-lib/, sys-freebsd/freebsd-lib/files/

[Yuta SATOH]

commit:     a2bc3d1ad023569fa6211d656ed51379d87aa007
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Thu Nov 29 13:58:53 2012 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Thu Nov 29 13:58:53 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=a2bc3d1a

added freebsd-lib -- fixed build fails on x86-fbsd, bug 444920

---
 sys-freebsd/freebsd-lib/Manifest                   |   35 ++
 .../files/freebsd-lib-6.0-flex-2.5.31.patch        |   13 +
 .../files/freebsd-lib-6.0-gccfloat.patch           |   16 +
 .../freebsd-lib/files/freebsd-lib-6.0-pmc.patch    |   13 +
 .../freebsd-lib/files/freebsd-lib-6.1-csu.patch    |   20 +
 .../files/freebsd-lib-6.2-bluetooth.patch          |   11 +
 .../files/freebsd-lib-7.0-CVE-2008-1391.patch      |   11 +
 .../files/freebsd-lib-7.1-types.h-fix.patch        |   15 +
 .../files/freebsd-lib-7.2-rtldnoload.patch         |   30 ++
 .../freebsd-lib/files/freebsd-lib-8.0-gcc45.patch  |   28 +
 .../freebsd-lib/files/freebsd-lib-8.0-log2.patch   |   21 +
 .../files/freebsd-lib-8.0-rpcsec_gss.patch         |   12 +
 .../files/freebsd-lib-8.2-liblink.patch            |   19 +
 .../files/freebsd-lib-8.2-nlm_syscall.patch        |   10 +
 .../files/freebsd-lib-9.0-liblink.patch            |   21 +
 .../files/freebsd-lib-9.0-opieincludes.patch       |  122 +++++
 .../files/freebsd-lib-9.0-trylock-adaptive.patch   |   14 +
 .../freebsd-lib/files/freebsd-lib-bsdxml.patch     |   13 +
 .../files/freebsd-lib-bsdxml2expat.patch           |   26 +
 .../freebsd-lib/files/freebsd-lib-includes.patch   |   13 +
 .../freebsd-lib/files/freebsd-lib-new_as.patch     |   68 +++
 .../files/freebsd-sources-9.0-sysctluint.patch     |   13 +
 sys-freebsd/freebsd-lib/files/libmap.conf          |    8 +
 sys-freebsd/freebsd-lib/files/libusb-1.0.pc.in     |   11 +
 sys-freebsd/freebsd-lib/files/libusb.pc.in         |   11 +
 .../freebsd-lib/freebsd-lib-9.1_rc3-r1.ebuild      |  528 ++++++++++++++++++++
 26 files changed, 1102 insertions(+), 0 deletions(-)

diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
new file mode 100644
index 0000000..ee2fab9
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -0,0 +1,35 @@
+AUX freebsd-lib-6.0-flex-2.5.31.patch 421 SHA256 1d46cf13e1059ae3731ba5555764e020fcf4de7db5abf039fac83423e05d53c4 SHA512 c16a99b85e7908e77915796245741cbfcfb30ab1f4f0a8d565c28256b25d1532209ed27328d8b1571f61677251830f1fb6bbec17a8104686f56afd87f3226dec WHIRLPOOL 177f7ee5764f79fcdab768b13016e809f677cfd57a06ebb5e1bbafc6520f309b328908716ee02a8155f35566faefa95b67b064dafa8de9a7d2a19bde92b386b0
+AUX freebsd-lib-6.0-gccfloat.patch 542 SHA256 d549125f174c86c2d5e7e1f1c99cf1303b84e91ce8ee51db8c962be48b7a7951 SHA512 810745085c601757397b6d0338dba1631e4f623c3bae8a588e9f0b5c7cd9a9416d832093f97925fcef27ffcf20929bef8a5bcbeecf7a583c0a7eb6ce71f39495 WHIRLPOOL dee1bcf99935ae9ead0d5f498049a46ee89416f06eb7361901c69f40d0151ae1d3647a7dbb1c58b1aca7f541169b20d622019bc20b12953ba0c06fba56fd375e
+AUX freebsd-lib-6.0-pmc.patch 338 SHA256 36ca464f0aa1ed8784c8f1edc4a3580704c9a7813963684305250d806000075f SHA512 33187ec853ddf0c39680af60b669e60d3e213eba20a2e1ba995c991f04c053c5adcc5169b92c5d1d4cfbc7e03b72af2df4a5349361b41c56ca4a9b91e81bb327 WHIRLPOOL 1744ed829c1775c01b5d1b827b5677b6b5d731cff376da4d8e7ab8facbb0c465131a34157d77186bfcf1a1097f515e3909d1e753aa2b8e72efaf7feae319361f
+AUX freebsd-lib-6.1-csu.patch 655 SHA256 e6fe72a4183227b275815a75eec9639321046dc1e02b80c507ae6bf902a58cf1 SHA512 926d8aafd6f517a0fb97af61746d53bafab7fe7003f71181c43b4f9b31e7652624d060a350cc23d83ca7da7c1be2dcc048bb00a581c3524f0f2b7b06de6100b4 WHIRLPOOL fada1ac622c48e1e5af34245bdb17507b2b317938265f722c8cbdbbce3d14bbe76f39a231c0e7237bd229a8c0687952643c6f56e65ffc56b18508969fad837f7
+AUX freebsd-lib-6.2-bluetooth.patch 243 SHA256 4c90cb6d45fa24a07e21255949f219cc561a94011f645c58bce2a68027db6658 SHA512 60d938a6f1162f106ec93c4122707a4dd9ca6afc73be4d90871db745ad084ca1d229e7460f4faa9885c4f6d192a41cb8be7cf671b0c8ec720eccd1c7af994bbc WHIRLPOOL df2ab6e6d9223c7e2369fb8baf19638cb897343b6ba571c7b9294be7d335068b7978690b2cd50174b4ee0215f2409322a9cc2a374140fc14dff460e181c05578
+AUX freebsd-lib-7.0-CVE-2008-1391.patch 344 SHA256 662a6f26d99257221fa686423fd9fe22862b827cd9ae146c2add5e5ac85290cc SHA512 58c785bfaa3da9c570643a6ca1ddffdfc933eb9fce7576975a8217a5e9e74d4db9be2b3d99f5e0e73d0788fbc5cf2c9a5d179e1780c8c23fabfd4edc4e07db2c WHIRLPOOL ac3c19fc14d05f3726b503549ca784904ccffd88fe98a94d57942d2642e5e376239fbd4bcd8fb1af3e6442d6a9c20033f8fbb225fe4f422caef8f8cf4660345c
+AUX freebsd-lib-7.1-types.h-fix.patch 371 SHA256 9e745fcfe046c405a365d8d0db8763867f0a618952f7d6bab4c76a8c82273473 SHA512 133ab13e98c3f2dc5f96cd5e45cd11c4da9757f4ea64831a6e17b309bc4692e4213b48c7ab6dd634f1feb069ca2dfc3a8afe1585d0d1425b5304fd7494cd342f WHIRLPOOL d284dd82244a108e4677be143cfc302c18f18e5b39c39fcaa8915c61053d94bf7171e48028f40d25f8058f8ec910c3e55a3753ccecb46bbabbb0e5ba86e808e3
+AUX freebsd-lib-7.2-rtldnoload.patch 1037 SHA256 b9ba0e322f15d8761bb33cf9199b95cc61d6a9b5129d08399f49c89fdeaa095b SHA512 0bde6c62f05e356c7992862f0da1a14e7e7fb18c27563fc9ef39ae83ab751a885e624aa9dafe185c8499c6f4b06234f2458d8df22cce5588c051f9d909ef7ee2 WHIRLPOOL 780753118034ae6732940e3c100654382244dd739762d2b4e22bdad4392b0dc4be53e82b80a2e9599aea4d2003c8306a23f05308a99e08fae6ef7a5a2d8ae573
+AUX freebsd-lib-8.0-gcc45.patch 1264 SHA256 5288e313beffa0e50fc0301e859c59f1a95302d546d27eae50b97c4a98c81c4d SHA512 12b81def4e7690cf5b910f31466b06c3fdf58f38a41f63dd359582d8f480e8081b54fd4997c6595e9e1a8912f991ba1b8d04989e270f242dd547d72c9ad5ea57 WHIRLPOOL 0cb37d909a02492a1ca700a5b990e4b6ce42a7f7d55e14a5a3fe685d28f360a10e95d97bd489f1dae0b152e168e9d901bfc13bf08bc91d8dfa1d263d4dba9abf
+AUX freebsd-lib-8.0-log2.patch 667 SHA256 dc421c3d92790da46360225de2dd4d707c314e962ecb95650799ee12f166a214 SHA512 72f99ecc4632ba9b5ea8f26cbe7311a2ada1822c1c3ccf2c6690d72fb91748e7e70915f33e0f29087125c4027ef084c1d37638fc423bde533595e8d4910084c3 WHIRLPOOL dbe9a686efa26dab9ca129ed39ddab49556490fee22b43f6aa07bd9cbebfa24bd8ccb6e30f0d213bab857571a022bcd1b110d47bd85c6f70462441772bfeb243
+AUX freebsd-lib-8.0-rpcsec_gss.patch 298 SHA256 775ec2ee12c49f134938fa8264c04c6b2bf95f8001371f20b85058c25ff1c472 SHA512 2dd63be1a31a1e78fff38a3061469148b673423d958223a459d157accd3a2d1b1f4e568910c49979b0a214322c4e7371f2710ef78fab7d161545fec2a78dc702 WHIRLPOOL 884b76cd6d5d01f801b2fb13f53cfa6ed26dd0b9b2a5062ac9dbe63a6813bfe737e4c3f98b3d94c32dfb6ce3cc19cd5c8760c81250f4b2d5980a4f084d7dc54b
+AUX freebsd-lib-8.2-liblink.patch 510 SHA256 38f967683e9d335ff7860150b2e6ae4d749266937ba195c6747d42d64c8e31ee SHA512 52a050078dc71163709e6dbe6d1c3177adbc51cb9b30a6990194ddd32f5b54e107b758801f0ff5632c4fe800c6734d63d42e53378a78caa0072847060fbb0dee WHIRLPOOL c0b95cb074ff6fd7699a03dfe31572a5edbde2b59c8aac3431fb85a0a0d71ad28566500951e0fb96ed9a8d3081abca7ec507c26e12e988f0ff2ece51bb0df2d1
+AUX freebsd-lib-8.2-nlm_syscall.patch 385 SHA256 4b26be44718cb3deb7fb295d403e892ed73ceba7ba43499a889bd49a5e43852b SHA512 1c871dc00da4b6d1106720954014f60933c99508dfc34fe08ae37b2f67ca05f70ac5e1bb75d0d1d119c7750405871ee3fb6e95ebd3ec378fc84e819cc0c4c9fd WHIRLPOOL 4d335910c00f21d2d8d5f80cd99c5316e5c485f935eefb782398e2e308e20a2cd4da0e1acf74c07a2c6d8ff446b3757cc416c0bee7e1be9d9cae0843a45e0748
+AUX freebsd-lib-9.0-liblink.patch 627 SHA256 41f0b7f92f2a8f0a3e422447b830d7dec70a068573086484d5efd6826b7c4c3c SHA512 0c570fea9cc386afe4b742985cf7de4d49370be3f34b2059dee76869d8e64bd52db0a07e61fac8924848d12d0e6d510ad6a266ce8ef76e2be885d81d909ab616 WHIRLPOOL b59e3bb0aaede34492d1940a77b11c7e5192643122f18ee6ad363053f9dec2600218ca416dd153e1d0b3bb6621d6f9e2ec50621e6e7f4b610abbd69993dc428a
+AUX freebsd-lib-9.0-opieincludes.patch 4495 SHA256 0868e7454053170c3399f1a03a68f3e70410c79db865e7e2f2b51f5961b5718b SHA512 a3828985f7da9e72ad44d88640952d56079693024bc11b4e3cca86b6f455a9e4756ba76f9e6d4c15960898f39e1dac7bc833e3241082f532c7fbd6d7d6f9418b WHIRLPOOL e0180dd0086c054e9f6895ecfe34bfb21d0e1db483dfc63ad411c651954c4703996d9b537a9566133a01770f2cf0f331727865013413181728c3b21740735473
+AUX freebsd-lib-9.0-trylock-adaptive.patch 439 SHA256 af501c40124e628c2f739d88a4efa7ef3513694bd79ab44db30e4b3f73864612 SHA512 ceeeea302294db5a25b5534685dce563778572010f0072ecb300a66550ee8cc241e0ae5523e32fd5424560e82d913c37aefe06c2a6725e951ba4ad5df73a1a68 WHIRLPOOL d2a65eab4b03a7fb65e2dd6f03c2e60fe1248412e28a0829757e6cb733d1f487ee79959680f1db8af20fc409a165c5f4aea3038171e7b82aee7d38c29552531e
+AUX freebsd-lib-bsdxml.patch 339 SHA256 c1ac47d6c7176475f0f4b86bb17288a980b44a799fb6f4e7b1920f69e0447dc9 SHA512 8d14ebc848426cf600cf2206f60b91d3a5e555c738be8bb84707dcf2455be98ea3dd0a6929495b93027f71097ff0232cc85c16be4d5381a167ee0aae5a14d542 WHIRLPOOL dbafb2f98b56cac9c3ec1377c7fae40935ca3c8b1116665ce36b82a55242dbead24dc4fc38d0268cf5af82e7f908543f1376fdd3f7d847bd92dc51438a3934ee
+AUX freebsd-lib-bsdxml2expat.patch 708 SHA256 0c3ec3657155c5032479181119c488d43a479ab0dfe7a7d7ed0dabce16853e85 SHA512 d3b321062886ee636a09af4b8714ae90317c17eb954a3d491cd21ca90605e26491033df4d6f02a517eda423783db74dad16adf7ee1bdc5557392cc70218ee9c7 WHIRLPOOL 5c262c59aee9e642d3a8929a453b56c7a55ba60f3011d6ac07b750a30297eb992a564ba4db18714b7eac58bbe3ded1ff4249150128947d25dd1344e59e16c9cb
+AUX freebsd-lib-includes.patch 316 SHA256 be4dd4c905715c2d165be282cf377f799b32ccb76986947bc0bf1b5730b57b06 SHA512 31b7f368a4d3998e42486cb944a001a8371c365276eac94fa8712e29dbe9a13a7756a2fd77fbff87a1f7f4c19b32721c74bbb099f611d46a8c78b73f92d9255e WHIRLPOOL 8c4c2c6d1e9556303520c4cd8f6996f0f24c8b45985d4326db880c187b6db30e914a6e47b40ea4a79d7a309fdd579b39232329daf74758412ac518b0a9d0a317
+AUX freebsd-lib-new_as.patch 1494 SHA256 6021f34246dcf768a94ffe7273ea2f5590adf6d82ce7fb555234f8012bdbd982 SHA512 f53aa3833179c701a8c0fc6c48c3ab9d1a2694a1c30287ae08e9ea94ddf8c547f7bfe632908b9c3a3ffc4541ed2bf41277a309ffbb7d3eea58d389198d884adb WHIRLPOOL 738b312f04f8a51ab7182c4fde21bfa18d90c9a85486cd071724a61c2ecdb58cb3cdf4c52c50219baab91f15ccebf7de7700267952da65ec52e7c71eab3f954b
+AUX freebsd-sources-9.0-sysctluint.patch 403 SHA256 884fbc5d6d3766ea3d4609946f56072f36f95368dc13ee316c330a46d42f0c9e SHA512 f3a87cb187858bc6fd1bafda3c3bd7bbda52b07239a50a7c1aa201df2c52a58d4809e196b8799b1949c8ca1a556519d454ad1789358540e3a96cd480fc0a504c WHIRLPOOL 1fd9852d59378b3fa8682886085f4f63ccd2a57806161b9a3ccb0cbe0c465be2e5620ed57942a8687656859e1a9df17c7d298ea66ec037514bbe7707783aa9f8
+AUX libmap.conf 201 SHA256 36a1bd56965f171cbb058f6e1762801e3b92c083fe36f6fe046bd669beed9742 SHA512 abc358dff495fe96b9ed549bacb5278577ca4da46b89b87e9211a2f6acdd455111df02ba11b797287f839af6cc22f8810e8ac1dc52154acc8b22364e667b3c49 WHIRLPOOL 0827a0ea9b8a2faed019d13356a793b2b572e54d6f8ebf32a9f12214759153433e21f7d8fdedf43e038ac1925432c1f4843441db47d29895eda51781f1fedb5e
+AUX libusb-1.0.pc.in 207 SHA256 edf35e887cbfed2df288825434c467e0a946eeb21e0d631f55940bb177c2ba15 SHA512 93289cecfc298a31fd4fd0848bf25a63048a7549bd81792d7bd158731246221c24ec9f469a918430da56873a0936fb2b372cedaaa32a38ccd5323de0f9a89b93 WHIRLPOOL 7c81b0df4548a9391b4e1420186f1e970aa9e2e73a89e817adbff9de52b8797cbd8a4d8b3ca01f782f86e4b1e48fad72a08b5bff49d5ee6ffaa5135c015ca5ae
+AUX libusb.pc.in 208 SHA256 9bfe398a335f8b9b1c3dd167ab0c9206fe3bdd4e1da318ece977e20f3c2d7c56 SHA512 e9c6d5f04057cf8c13f69a3d8e07bdd517fdb01d572a69a1beb397766311b3c53894b108caaaea740bfc27b227a9620621dac5846bff1a367fbf9954f38bb40c WHIRLPOOL e80e76a8a564655d924a7148a841c7c7cf0be0ea3bdbd76e95e5004124543826e5d925dfe791f4b040e042a10923865bb517499d9f5be39611fedbcceebe32d8
+DIST freebsd-cddl-9.1_rc3.tar.bz2 899359 SHA256 9b9df1bbe109f760fa8dc46655362a6527e4c6b2e0d5c814de2f3a6f8c8d110d SHA512 73c5392c22450853ca745a4e12546b71070ae59dcec82e069d79109eda9b48525f74c15d3d7a936a4ea382dc7c390a1c3739fc3b09c16ccff7bc48992240abcf WHIRLPOOL e60c993e277a54d299731c2230fb40b1c1290c2db267e5e9fddb433a39361550a71a85544e27320259eadb7794137bc2aab366654ad6683e8e5aaa4efd3dc71f
+DIST freebsd-contrib-9.1_rc3.tar.bz2 54754779 SHA256 90613296d804b3632902fb6fe180e6c2525ef29ba02a11efc3d73657b0476a8b SHA512 6564c77b02f472e063c439d2cbfd3bbdbd7d6507d9591eb020d0748fafa9eaaab1927f06c379f2b059f515cb2f77e13c5337f856866f0210be34d9a803885f20 WHIRLPOOL a2db66d867c4c65c7f95d627e38ea3615b650bd0eadda722e2f5e38cb34167c7c822dbe5a87b02d16bb11f37605e306764aef50368b54a8beb8cd39537702ea0
+DIST freebsd-crypto-9.1_rc3.tar.bz2 5680339 SHA256 67bcd36ac7ca4148d5706021c30739f337ad8e865d811613cbdc00e556d787d7 SHA512 b45085bd62c9c0063c0fd8805b2094e5cf4b0478645792ad5b79df450fb069cc6bb472996bc4958696450cd5884927eb14c7c7ea98e8c19863338866487f6eac WHIRLPOOL a0ef0c3cec5fcac47b8e5baab97a0e81b48fa18e5360773b01606a91c3488c6e5031691c4db4c37e47746c7e755c5bf4178ec8149114fb4940dc63f60a24424b
+DIST freebsd-etc-9.1_rc3.tar.bz2 207784 SHA256 c6d6b208077ccff739484b2b473892ee1a650c52029beff2d2b435da6dd469b7 SHA512 15153dfefa59aea78b017b9af2295a6ad488c805080dd613c0955fc9797881a3636570074cfd4adf3f4d13119ab05ccec83107b0fc809fbb8b7dab6a7a2333b3 WHIRLPOOL 6234b73f300db3e9ed8f37124892333fe80d6b39e48d4ac101cce6219db7c2a13992af56d18caffcaef8501873b2703780bdb890472e8717e1ace294f0a2ecb3
+DIST freebsd-gnu-9.1_rc3.tar.bz2 795216 SHA256 43f493dbf3ccfea445cff838bf9b9887ed4f9d5437278529fee306444a3ea8e4 SHA512 0679f100f83e7347d00b2749aeb57a9582404a5f9160b170f5fcac715e8f401738cf89025e23b2c036b67be2a4030e283105dc707bf745e9cd4c199cd7a2689d WHIRLPOOL 9b4a12009c0826c891907d2312bc4eef4466b8124c9c00b70775556487a1a6e88676528a682ca29c3e36cdad13d61065b955d886a79885147cfc7731186ae8f4
+DIST freebsd-include-9.1_rc3.tar.bz2 146460 SHA256 427fdc76ffb4fb38a2e909d492328be48cf08c62e2f2243c0d11faefd2006c85 SHA512 e7c584beaa2c574079a2c05509bee100d03d66b823de4473d8319f594810f66b3ad524297c21bef83106e4c9f3100fedabc8da0b131a9c41d9728a65a09d9486 WHIRLPOOL 26a2e5e6c1d17493b5b8e14453fdfcf36917b759e50f844762dd5d2701e8c93fe1a26550173f5ad1455304a9504a73872e9e3026b21d7debfbc2570752f32f44
+DIST freebsd-lib-9.1_rc3.tar.bz2 3205238 SHA256 da7001a8c23fcc614b230414cb830c12d7b238c38a15c905c695c5a1621c10f8 SHA512 761219c55b0ac067685057b519e506869fba6c472179f9d151b0e12eeacad11004ec2ec504953ace7139694c934785555e98bc16b41a248470241464599e6914 WHIRLPOOL 653258d8752cfc401a632ca59a05cce02821cf1ca279696463c6c0f71e761853617b9b0f51b1849e89b4067dc1799b1b4c528644bcd42b260af0f851caccc63e
+DIST freebsd-libexec-9.1_rc3.tar.bz2 305301 SHA256 4cf56ff81096112b33276f619e823c8426bc1c97904f183b431e2e98c29ef698 SHA512 3122faf7f88934c05bee6c6d5faa24998d27c35e11bf4f809af26d7b8ad0a26519715b7a29f303ba878e3e8897742486a0a86a123d00b9deb60246c8cac4e1a7 WHIRLPOOL 1b10d85d2d426457189143350b375c7a1723ff8067c37200cce15f18fa6d963b94fdd0339e91d01ed16b87e4338761e33c7afb022e50b3bbff8dbcc3a45f5b73
+DIST freebsd-sys-9.1_rc3.tar.bz2 32605500 SHA256 5194ac93850aff4f10978b739573ab8ee54a95a0b2d4e46f754314ae381b442b SHA512 17cd41ea66bf1d2e10b56001e6e1c80db78e1572aff4ad1ac945bc24d38dfef612e1a4b7eead8bc50b94df798b0bde3dcc13a0596860322569272b3239a30b9b WHIRLPOOL 8628c5a97675b3fe4ebfcb92c4fb6d5aebaa3a11551e4f16004a6ffb23b3d10334b623c70f255762038bf1fc80a7a27abd587f10ac9706ac1bb0b22adda266b8
+DIST freebsd-usbin-9.1_rc3.tar.bz2 2669370 SHA256 de606bb756c413e85a302bc91033952f1beb8066ef555db26d79943bf128aa74 SHA512 3a002d5b7cd98f1139a8bd949633434e8aec8352c3d49bca9c72b3744d60ea63a9fd5e651eedb3d439405bcfa197bfd05d5e658428e57b01e021ba1ab0304d7e WHIRLPOOL 43f066d202d053383f9f7d4b19dd06b22d9c19ad79f258905e5dc2dc9451c936c128b512d3e8cdf90c70f8a19230a536d7c119b2f45a234f04bb9dde2d87fc52
+EBUILD freebsd-lib-9.1_rc3-r1.ebuild 17056 SHA256 536292268d9e271f00a001459a0432f43a04405e1c8ad4f1e20d3734ca418862 SHA512 da4f02c675d1ee0a1eee67701b26e92b528d654bc7a7f91b24fa64f8e47b360ea10aac474041f0331f9cd64c4f3127ff9b056ce111dcbfe25ec95373cf97b3d1 WHIRLPOOL bde30163ee3d59407743858528d4dcb2250970a8256e8acf7512257e274b385397579b128876ec37c26db7a2cadad5a4ab808397cc2259c89e42a49c0b0a5e2f

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-flex-2.5.31.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-flex-2.5.31.patch
new file mode 100644
index 0000000..00de8a6
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-flex-2.5.31.patch
@@ -0,0 +1,13 @@
+Index: fbsd-6/lib/libipsec/policy_token.l
+===================================================================
+--- fbsd-6.orig/lib/libipsec/policy_token.l
++++ fbsd-6/lib/libipsec/policy_token.l
+@@ -138,8 +138,6 @@ void
+ __policy__strbuffer__init__(msg)
+ 	char *msg;
+ {
+-	if (yy_current_buffer)
+-		yy_delete_buffer(yy_current_buffer);
+ 	strbuffer = (YY_BUFFER_STATE)yy_scan_string(msg);
+ 	yy_switch_to_buffer(strbuffer);
+ 

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-gccfloat.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-gccfloat.patch
new file mode 100644
index 0000000..a3e7d5e
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-gccfloat.patch
@@ -0,0 +1,16 @@
+This patch is needed to avoid inclusion of GCC's float.h that defines
+LDBL_MANT_DIG at 53 (while the source file checks for 113 or 64.
+
+Index: freebsd-6.0_beta4/lib/msun/src/s_fmal.c
+===================================================================
+--- freebsd-6.0_beta4.orig/lib/msun/src/s_fmal.c
++++ freebsd-6.0_beta4/lib/msun/src/s_fmal.c
+@@ -28,7 +28,7 @@
+ __FBSDID("$FreeBSD: src/lib/msun/src/s_fmal.c,v 1.2 2005/03/18 02:27:59 das Exp $");
+ 
+ #include <fenv.h>
+-#include <float.h>
++#include <machine/float.h>
+ #include <math.h>
+ 
+ /*

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-pmc.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-pmc.patch
new file mode 100644
index 0000000..2f6de46
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-pmc.patch
@@ -0,0 +1,13 @@
+Index: freebsd-6.0_beta4/lib/libpmc/Makefile
+===================================================================
+--- freebsd-6.0_beta4.orig/lib/libpmc/Makefile
++++ freebsd-6.0_beta4/lib/libpmc/Makefile
+@@ -9,6 +9,8 @@ WARNS?=	6
+ 
+ MAN=	pmc.3 pmclog.3
+ 
++CFLAGS+= -I${.CURDIR}
++
+ MLINKS+= \
+ 	pmc.3 pmc_allocate.3 \
+ 	pmc.3 pmc_attach.3 \

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.1-csu.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.1-csu.patch
new file mode 100644
index 0000000..075f278
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.1-csu.patch
@@ -0,0 +1,20 @@
+--- lib/csu/amd64/Makefile.orig	2006-07-04 07:49:58 -0300
++++ lib/csu/amd64/Makefile	2006-07-04 07:50:15 -0300
+@@ -16,6 +16,7 @@
+ 	${CC} ${CFLAGS} -DGCRT -c -o gcrt1.o ${.CURDIR}/crt1.c
+ 
+ realinstall:
++	${INSTALL} -d ${DESTDIR}${LIBDIR}
+ 	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ 	    ${OBJS} ${DESTDIR}${LIBDIR}
+ 
+--- lib/csu/sparc64/Makefile.orig	2006-10-06 15:13:55 +0100
++++ lib/csu/sparc64/Makefile	2006-10-06 15:15:06 +0100
+@@ -15,6 +15,7 @@
+ 	${CC} ${CFLAGS} -DGCRT -c -o gcrt1.o ${.ALLSRC}
+ 
+ realinstall:
++	${INSTALL} -d ${DESTDIR}${LIBDIR}
+ 	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ 	    ${OBJS} ${DESTDIR}${LIBDIR}
+ 

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.2-bluetooth.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.2-bluetooth.patch
new file mode 100644
index 0000000..a9b8435
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.2-bluetooth.patch
@@ -0,0 +1,11 @@
+--- lib/libsdp/Makefile	2007-06-15 12:04:37 +0200
++++ lib.sdp/libsdp/Makefile	2007-06-15 12:26:14 +0200
+@@ -5,7 +5,7 @@
+ MAN=		sdp.3
+ 
+ WARNS?=		2
+-CFLAGS+=	-I${.CURDIR}
++CFLAGS+=	-I${.CURDIR}  -I${.CURDIR}/../libbluetooth
+ 
+ SHLIB_MAJOR=	2
+ 

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-7.0-CVE-2008-1391.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-7.0-CVE-2008-1391.patch
new file mode 100644
index 0000000..2b8d401
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-7.0-CVE-2008-1391.patch
@@ -0,0 +1,11 @@
+--- lib/libc/stdlib/strfmon.c	2008/04/22 13:23:34
++++ lib/libc/stdlib/strfmon.c	2008/04/24 07:49:00
+@@ -65,6 +65,8 @@
+ #define GET_NUMBER(VAR)	do {					\
+ 	VAR = 0;						\
+ 	while (isdigit((unsigned char)*fmt)) {			\
++		if (VAR > INT_MAX / 10)				\
++			goto e2big_error;			\
+ 		VAR *= 10;					\
+ 		VAR += *fmt - '0';				\
+ 		if (VAR < 0)					\

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-7.1-types.h-fix.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-7.1-types.h-fix.patch
new file mode 100644
index 0000000..8de5df2
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-7.1-types.h-fix.patch
@@ -0,0 +1,15 @@
+Fixes a compile error if XOPEN_SOURCE 600 is defined.
+
+See: http://www.mailinglistarchive.com/freebsd-current@freebsd.org/msg15011.html
+
+--- sys/sys/types.h.orig
++++ sys/sys/types.h
+@@ -46,7 +46,7 @@
+ 
+ #include <sys/_pthreadtypes.h>
+ 
+-#if __BSD_VISIBLE
++#ifndef _POSIX_SOURCE
+ typedef	unsigned char	u_char;
+ typedef	unsigned short	u_short;
+ typedef	unsigned int	u_int;

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-7.2-rtldnoload.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-7.2-rtldnoload.patch
new file mode 100644
index 0000000..77bbe2e
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-7.2-rtldnoload.patch
@@ -0,0 +1,30 @@
+Backported from 8.0.
+Even if RTLD_NOLOAD is not standard, dev-libs/nss expects it.
+Since it has made it to 8.0 we can afford backporting it.
+
+--- include/dlfcn.h.old	2010-01-10 18:42:04 +0100
++++ include/dlfcn.h	2010-01-10 18:42:19 +0100
+@@ -47,6 +47,7 @@
+ #define	RTLD_GLOBAL	0x100	/* Make symbols globally available. */
+ #define	RTLD_LOCAL	0	/* Opposite of RTLD_GLOBAL, and the default. */
+ #define	RTLD_TRACE	0x200	/* Trace loaded objects and exit. */
++#define	RTLD_NOLOAD	0x02000	/* Do not load if not already loaded. */
+ 
+ /*
+  * Request arguments for dlinfo().
+--- lib/libc/gen/dlopen.3.old	2010-01-10 18:43:15 +0100
++++ lib/libc/gen/dlopen.3	2010-01-10 18:45:27 +0100
+@@ -141,6 +141,13 @@
+ With this flag
+ .Fn dlopen
+ will return to the caller only in the case of error.
++.It Dv RTLD_NOLOAD
++Only return valid handle for the object if it is already loaded in
++the process address space, otherwise
++.Dv NULL
++is returned.
++Other mode flags may be specified, which will be applied for promotion
++for the found object.
+ .El
+ .Pp
+ If

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-gcc45.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-gcc45.patch
new file mode 100644
index 0000000..2ddb9ea
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-gcc45.patch
@@ -0,0 +1,28 @@
+diff -Nur work.orig/include/rpcsvc/nis.x work/include/rpcsvc/nis.x
+--- work.orig/include/rpcsvc/nis.x	2009-10-25 10:10:29.000000000 +0900
++++ work/include/rpcsvc/nis.x	2011-04-13 21:25:13.000000000 +0900
+@@ -399,10 +399,7 @@
+ %#define OARIGHTS(d, n) (((d)->do_armask.do_armask_val+n)->oa_rights)
+ %#define WORLD_DEFAULT (NIS_READ_ACC)
+ %#define GROUP_DEFAULT (NIS_READ_ACC << 8)
+-%#define OWNER_DEFAULT ((NIS_READ_ACC +\
+-			 NIS_MODIFY_ACC +\
+-			 NIS_CREATE_ACC +\
+-			 NIS_DESTROY_ACC) << 16)
++%#define OWNER_DEFAULT ((NIS_READ_ACC + NIS_MODIFY_ACC + NIS_CREATE_ACC + NIS_DESTROY_ACC) << 16)
+ %#define DEFAULT_RIGHTS (WORLD_DEFAULT | GROUP_DEFAULT | OWNER_DEFAULT)
+ %
+ %/* Result manipulation defines ... */
+@@ -431,10 +428,8 @@
+ % * these definitions they take an nis_object *, and an int and return
+ % * a u_char * for Value, and an int for length.
+ % */
+-%#define ENTRY_VAL(obj, col) \
+-	(obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_val
+-%#define ENTRY_LEN(obj, col) \
+-	(obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_len
++%#define ENTRY_VAL(obj, col) (obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_val
++%#define ENTRY_LEN(obj, col) (obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_len
+ %
+ %#ifdef __cplusplus
+ %}

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-log2.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-log2.patch
new file mode 100644
index 0000000..a9fd189
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-log2.patch
@@ -0,0 +1,21 @@
+log2 and log2f are required by C99 and are not implemented.
+Workaround the deficiency.
+
+--- lib/msun/src/math.h.old	2010-03-14 17:02:25.000000000 +0100
++++ lib/msun/src/math.h	2010-03-14 17:07:03.000000000 +0100
+@@ -203,6 +203,7 @@
+ double	frexp(double, int *);	/* fundamentally !__pure2 */
+ double	ldexp(double, int);
+ double	log(double);
++#define log2(x) log(x)/log(2.0)
+ double	log10(double);
+ double	modf(double, double *);	/* fundamentally !__pure2 */
+ 
+@@ -319,6 +320,7 @@
+ float	log10f(float);
+ float	log1pf(float);
+ float	logf(float);
++#define log2f(x) logf(x)/logf(2.0)
+ float	modff(float, float *);	/* fundamentally !__pure2 */
+ 
+ float	powf(float, float);

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-rpcsec_gss.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-rpcsec_gss.patch
new file mode 100644
index 0000000..a7de06f
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-rpcsec_gss.patch
@@ -0,0 +1,12 @@
+Without this linking fails during a stage3 build.
+
+--- lib/librpcsec_gss/Makefile.orig
++++ lib/librpcsec_gss/Makefile
+@@ -8,6 +8,7 @@
+ 
+ DPADD+=	${LIBGSSAPI}
+ LDADD+=	-lgssapi
++LDFLAGS+= 	-L${.OBJDIR}/../libgssapi
+ 
+ VERSION_DEF=	${.CURDIR}/../libc/Versions.def
+ SYMBOL_MAPS=	${.CURDIR}/Symbol.map

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-liblink.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-liblink.patch
new file mode 100644
index 0000000..c8be7f4
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-liblink.patch
@@ -0,0 +1,19 @@
+--- lib/libproc/Makefile.old	2011-07-06 00:58:04.000000000 +0000
++++ lib/libproc/Makefile	2011-07-06 00:58:58.000000000 +0000
+@@ -18,5 +18,6 @@
+ WARNS?=	6
+ 
+ WITHOUT_MAN=	yes
++LDADD=-lelf
+ 
+ .include <bsd.lib.mk>
+--- lib/librtld_db/Makefile.old	2011-07-06 00:58:12.000000000 +0000
++++ lib/librtld_db/Makefile	2011-07-06 00:59:27.000000000 +0000
+@@ -10,5 +10,7 @@
+ INCS=		rtld_db.h
+ 
+ CFLAGS+= -I${.CURDIR}
++LDADD=-lutil -lproc
++LDFLAGS+=-L${.CURDIR}/../libutil -L${.CURDIR}/../libproc
+ 
+ .include <bsd.lib.mk>

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-nlm_syscall.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-nlm_syscall.patch
new file mode 100644
index 0000000..556ade5
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-nlm_syscall.patch
@@ -0,0 +1,10 @@
+--- include/unistd.h	2010/12/20 20:39:49	216602
++++ include/unistd.h	2010/12/20 21:12:18	216603
+@@ -529,6 +529,7 @@
+ #define	_MKTEMP_DECLARED
+ #endif
+ int	 nfssvc(int, void *);
++int	 nlm_syscall(int, int, int, char **);
+ int	 profil(char *, size_t, vm_offset_t, int);
+ int	 rcmd(char **, int, const char *, const char *, const char *, int *);
+ int	 rcmd_af(char **, int, const char *,

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-liblink.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-liblink.patch
new file mode 100644
index 0000000..f8e4707
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-liblink.patch
@@ -0,0 +1,21 @@
+diff -uNr lib.ol/libproc/Makefile lib/libproc/Makefile
+--- lib.ol/libproc/Makefile	2011-11-02 14:02:17.000000000 +0000
++++ lib/libproc/Makefile	2011-11-02 14:03:09.000000000 +0000
+@@ -16,5 +16,6 @@
+ SHLIB_MAJOR=	2
+ 
+ WITHOUT_MAN=
++LDADD+=-lelf
+ 
+ .include <bsd.lib.mk>
+diff -uNr lib.ol/librtld_db/Makefile lib/librtld_db/Makefile
+--- lib.ol/librtld_db/Makefile	2011-11-02 14:02:13.000000000 +0000
++++ lib/librtld_db/Makefile	2011-11-02 14:04:00.000000000 +0000
+@@ -10,5 +10,7 @@
+ INCS=		rtld_db.h
+ 
+ CFLAGS+= -I${.CURDIR}
++LDADD+=-lutil -lproc
++LDFLAGS+=-L${.OBJDIR}/../libutil -L${.OBJDIR}/../libproc
+ 
+ .include <bsd.lib.mk>

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-opieincludes.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-opieincludes.patch
new file mode 100644
index 0000000..bf77a0a
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-opieincludes.patch
@@ -0,0 +1,122 @@
+Fixes warnings like:
+/var/tmp/portage/sys-freebsd/freebsd-lib-9.0-r2/work/lib/libopie/../../contrib/opie/libopie/randomchallenge.c:43:5:
+warning: incompatible implicit declaration of built-in function ‘strcpy’ 
+
+diff -uNr contrib.old/opie/libopie/accessfile.c contrib/opie/libopie/accessfile.c
+--- contrib.old/opie/libopie/accessfile.c	2012-05-25 08:54:33.000000000 -0400
++++ contrib/opie/libopie/accessfile.c	2012-05-25 09:12:34.000000000 -0400
+@@ -46,6 +46,7 @@
+ #ifdef DEBUG
+ #include <syslog.h>
+ #endif /* DEBUG */
++#include <ctype.h>
+ 
+ #include "opie.h"
+ 
+diff -uNr contrib.old/opie/libopie/generator.c contrib/opie/libopie/generator.c
+--- contrib.old/opie/libopie/generator.c	2012-05-25 08:54:33.000000000 -0400
++++ contrib/opie/libopie/generator.c	2012-05-25 08:58:10.000000000 -0400
+@@ -50,6 +50,7 @@
+ #include <syslog.h>
+ #endif /* DEBUG */
+ #include "opie.h"
++#include <stdio.h>
+ 
+ static char *algids[] = { NULL, NULL, NULL, "sha1", "md4", "md5" };
+ 
+diff -uNr contrib.old/opie/libopie/lookup.c contrib/opie/libopie/lookup.c
+--- contrib.old/opie/libopie/lookup.c	2012-05-25 08:54:33.000000000 -0400
++++ contrib/opie/libopie/lookup.c	2012-05-25 09:15:08.000000000 -0400
+@@ -14,6 +14,7 @@
+ #include "opie_cfg.h"
+ #include <stdio.h>
+ #include "opie.h"
++#include <string.h>
+ 
+ int opielookup FUNCTION((opie, principal), struct opie *opie AND char *principal)
+ {
+diff -uNr contrib.old/opie/libopie/newseed.c contrib/opie/libopie/newseed.c
+--- contrib.old/opie/libopie/newseed.c	2012-05-25 08:54:33.000000000 -0400
++++ contrib/opie/libopie/newseed.c	2012-05-25 09:14:37.000000000 -0400
+@@ -36,6 +36,9 @@
+ #include <syslog.h>
+ #endif /* DEBUG */
+ #include "opie.h"
++#include <stdio.h>
++#include <stdlib.h>
++#include <time.h>
+ 
+ int opienewseed FUNCTION((seed), char *seed)
+ {
+diff -uNr contrib.old/opie/libopie/parsechallenge.c contrib/opie/libopie/parsechallenge.c
+--- contrib.old/opie/libopie/parsechallenge.c	2012-05-25 08:54:33.000000000 -0400
++++ contrib/opie/libopie/parsechallenge.c	2012-05-25 09:15:54.000000000 -0400
+@@ -20,6 +20,8 @@
+ #include <string.h>
+ #endif /* HAVE_STRING_H */
+ #include "opie.h"
++#include <stdlib.h>
++#include <ctype.h>
+ 
+ struct algorithm {
+   char *name;
+diff -uNr contrib.old/opie/libopie/passwd.c contrib/opie/libopie/passwd.c
+--- contrib.old/opie/libopie/passwd.c	2012-05-25 08:54:33.000000000 -0400
++++ contrib/opie/libopie/passwd.c	2012-05-25 09:13:45.000000000 -0400
+@@ -22,6 +22,7 @@
+ 
+ #include "opie_cfg.h"
+ #include "opie.h"
++#include <string.h>
+ 
+ int opiepasswd FUNCTION((old, flags, principal, n, seed, ks), struct opie *old AND int flags AND char *principal AND int n AND char *seed AND char *ks)
+ {
+diff -uNr contrib.old/opie/libopie/randomchallenge.c contrib/opie/libopie/randomchallenge.c
+--- contrib.old/opie/libopie/randomchallenge.c	2012-05-25 08:54:33.000000000 -0400
++++ contrib/opie/libopie/randomchallenge.c	2012-05-25 09:00:27.000000000 -0400
+@@ -28,6 +28,9 @@
+ 
+ #include "opie_cfg.h"
+ #include "opie.h"
++#include <stdio.h>
++#include <string.h>
++#include <stdlib.h>
+ 
+ static char *algids[] = { 0, 0, 0, "sha1", "md4", "md5" };
+ 
+diff -uNr contrib.old/opie/libopie/verify.c contrib/opie/libopie/verify.c
+--- contrib.old/opie/libopie/verify.c	2012-05-25 08:54:33.000000000 -0400
++++ contrib/opie/libopie/verify.c	2012-05-25 09:12:09.000000000 -0400
+@@ -25,6 +25,7 @@
+ #include <string.h>
+ #endif /* HAVE_STRING_H */
+ #include "opie.h"
++#include <ctype.h>
+ 
+ #define RESPONSE_STANDARD  0
+ #define RESPONSE_WORD      1
+diff -uNr contrib.old/opie/libopie/version.c contrib/opie/libopie/version.c
+--- contrib.old/opie/libopie/version.c	2012-05-25 08:54:33.000000000 -0400
++++ contrib/opie/libopie/version.c	2012-05-25 09:13:15.000000000 -0400
+@@ -19,6 +19,8 @@
+ */
+ #include "opie_cfg.h"
+ #include "opie.h"
++#include <stdio.h>
++#include <stdlib.h>
+ 
+ VOIDRET opieversion FUNCTION_NOARGS
+ {
+diff -uNr contrib.old/opie/opie.h contrib/opie/opie.h
+--- contrib.old/opie/opie.h	2012-05-25 08:54:33.000000000 -0400
++++ contrib/opie/opie.h	2012-05-25 09:21:28.000000000 -0400
+@@ -158,6 +158,9 @@
+ int __opiereadrec __P((struct opie *));
+ int __opiewriterec __P((struct opie *));
+ int __opieparsechallenge __P((char *buffer, int *algorithm, int *sequence, char **seed, int *exts));
++VOIDRET opiehashlen FUNCTION((algorithm, in, out, n), int algorithm AND VOIDPTR in AND struct opie_otpkey *out AND int n);
++int opieinsecure FUNCTION_NOARGS;
++int opienewseed FUNCTION((seed), char *seed);
+ __END_DECLS
+ 
+ #define opiestrncpy(dst, src, n) \

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-trylock-adaptive.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-trylock-adaptive.patch
new file mode 100644
index 0000000..e72b171
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-trylock-adaptive.patch
@@ -0,0 +1,14 @@
+http://www.freebsd.org/cgi/query-pr.cgi?pr=168317
+
+Index: lib/libthr/thread/thr_mutex.c
+===================================================================
+--- lib/libthr/thread/thr_mutex.c	(revision 235924)
++++ lib/libthr/thread/thr_mutex.c	(working copy)
+@@ -538,6 +538,7 @@
+ 	switch (PMUTEX_TYPE(m->m_flags)) {
+ 	case PTHREAD_MUTEX_ERRORCHECK:
+ 	case PTHREAD_MUTEX_NORMAL:
++	case PTHREAD_MUTEX_ADAPTIVE_NP:
+ 		ret = EBUSY; 
+ 		break;
+ 

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml.patch
new file mode 100644
index 0000000..ec90def
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml.patch
@@ -0,0 +1,13 @@
+diff -u lib/libgeom/Makefile lib.xml/libgeom/Makefile
+--- lib/libgeom/Makefile	2004-03-07 16:07:57 +0000
++++ lib.xml/libgeom/Makefile	2005-05-06 10:38:41 +0000
+@@ -8,7 +8,8 @@
+ SRCS+=	geom_ctl.c
+ INCS=	libgeom.h
+ 
+-CFLAGS += -I${.CURDIR}
++CFLAGS += -I${.CURDIR} -I${.CURDIR}/../libexpat
++LDFLAGS += -L${.CURDIR}/../libexpat
+ 
+ WARNS?=	3
+ 

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml2expat.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml2expat.patch
new file mode 100644
index 0000000..1b4e791
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml2expat.patch
@@ -0,0 +1,26 @@
+diff -ur lib/libgeom.old/Makefile lib/libgeom/Makefile
+--- lib/libgeom.old/Makefile	2011-07-10 14:23:51.000000000 +0000
++++ lib/libgeom/Makefile	2011-07-10 15:12:39.000000000 +0000
+@@ -13,8 +13,8 @@
+ 
+ WARNS?=	3
+ 
+-DPADD=	${LIBBSDXML} ${LIBSBUF}
+-LDADD=	-lbsdxml -lsbuf
++DPADD=	${LIBSBUF}
++LDADD=	-lexpat -lsbuf
+ 
+ MAN=	libgeom.3
+ 
+diff -ur lib/libgeom.old/geom_xml2tree.c lib/libgeom/geom_xml2tree.c
+--- lib/libgeom.old/geom_xml2tree.c	2010-12-21 17:09:25.000000000 +0000
++++ lib/libgeom/geom_xml2tree.c	2011-07-10 15:12:52.000000000 +0000
+@@ -43,7 +43,7 @@
+ #include <sys/sbuf.h>
+ #include <sys/sysctl.h>
+ #include <err.h>
+-#include <bsdxml.h>
++#include <expat.h>
+ #include <libgeom.h>
+ 
+ struct mystate {

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-includes.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-includes.patch
new file mode 100644
index 0000000..c2cf142
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-includes.patch
@@ -0,0 +1,13 @@
+Fix headers dependencies so that they can be included alone.
+
+--- include/ifaddrs.h.old	2009-05-15 13:50:10 +0000
++++ include/ifaddrs.h	2009-05-15 13:50:23 +0000
+@@ -28,6 +28,8 @@
+ #ifndef	_IFADDRS_H_
+ #define	_IFADDRS_H_
+ 
++#include <sys/types.h>
++
+ struct ifaddrs {
+ 	struct ifaddrs  *ifa_next;
+ 	char		*ifa_name;

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-new_as.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-new_as.patch
new file mode 100644
index 0000000..c9288a4
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-new_as.patch
@@ -0,0 +1,68 @@
+--- lib/msun/i387/fenv.c.orig	2007-01-05 04:15:26 -0300
++++ lib/msun/i387/fenv.c	2008-06-14 00:49:30 -0300
+@@ -152,7 +152,8 @@
+ int
+ feupdateenv(const fenv_t *envp)
+ {
+-	int mxcsr, status;
++	int mxcsr;
++	short status;
+ 
+ 	__fnstsw(&status);
+ 	if (__HAS_SSE())
+--- lib/msun/i387/fenv.h.orig	2007-01-06 18:46:23 -0300
++++ lib/msun/i387/fenv.h	2008-06-14 01:06:40 -0300
+@@ -134,7 +134,8 @@
+ static __inline int
+ fegetexceptflag(fexcept_t *__flagp, int __excepts)
+ {
+-	int __mxcsr, __status;
++	int __mxcsr;
++	short __status;
+ 
+ 	__fnstsw(&__status);
+ 	if (__HAS_SSE())
+@@ -151,7 +152,8 @@
+ static __inline int
+ fetestexcept(int __excepts)
+ {
+-	int __mxcsr, __status;
++	int __mxcsr;
++	short __status;
+ 
+ 	__fnstsw(&__status);
+ 	if (__HAS_SSE())
+--- lib/msun/amd64/fenv.c.orig	2007-01-05 04:15:26 -0300
++++ lib/msun/amd64/fenv.c	2008-06-14 01:02:41 -0300
+@@ -101,7 +101,8 @@
+ int
+ feupdateenv(const fenv_t *envp)
+ {
+-	int mxcsr, status;
++	int mxcsr;
++	short status;
+ 
+ 	__fnstsw(&status);
+ 	__stmxcsr(&mxcsr);
+--- lib/msun/amd64/fenv.h.orig	2007-01-06 18:46:23 -0300
++++ lib/msun/amd64/fenv.h	2008-06-14 01:08:23 -0300
+@@ -110,7 +110,8 @@
+ static __inline int
+ fegetexceptflag(fexcept_t *__flagp, int __excepts)
+ {
+-	int __mxcsr, __status;
++	int __mxcsr;
++	short __status;
+ 
+ 	__stmxcsr(&__mxcsr);
+ 	__fnstsw(&__status);
+@@ -124,7 +125,8 @@
+ static __inline int
+ fetestexcept(int __excepts)
+ {
+-	int __mxcsr, __status;
++	int __mxcsr;
++	short __status;
+ 
+ 	__stmxcsr(&__mxcsr);
+ 	__fnstsw(&__status);

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-sources-9.0-sysctluint.patch b/sys-freebsd/freebsd-lib/files/freebsd-sources-9.0-sysctluint.patch
new file mode 100644
index 0000000..751a77c
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-sources-9.0-sysctluint.patch
@@ -0,0 +1,13 @@
+u_int is defined in sys/types.h
+makes header usable alone.
+
+--- sys/sys/sysctl.h.old	2012-05-25 11:08:53.000000000 -0400
++++ sys/sys/sysctl.h	2012-05-25 11:09:16.000000000 -0400
+@@ -788,6 +788,7 @@
+ 		    struct sysctl_req *);
+ #else	/* !_KERNEL */
+ #include <sys/cdefs.h>
++#include <sys/types.h> /* for u_int */
+ 
+ __BEGIN_DECLS
+ int	sysctl(const int *, u_int, void *, size_t *, const void *, size_t);

diff --git a/sys-freebsd/freebsd-lib/files/libmap.conf b/sys-freebsd/freebsd-lib/files/libmap.conf
new file mode 100644
index 0000000..7a879f9
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/libmap.conf
@@ -0,0 +1,8 @@
+# /etc/libmap.conf
+
+# Ensure that libthr does all threading
+libpthread.so.2         libthr.so.2
+libpthread.so           libthr.so
+libc_r.so.6             libthr.so.2
+libc_r.so               libthr.so
+

diff --git a/sys-freebsd/freebsd-lib/files/libusb-1.0.pc.in b/sys-freebsd/freebsd-lib/files/libusb-1.0.pc.in
new file mode 100644
index 0000000..058ecb4
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/libusb-1.0.pc.in
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=@LIBDIR@
+includedir=${prefix}/include
+
+Name: libusb
+Description: USB access library (FreeBSD version)
+Version: 1.0.1
+Libs: -L${libdir} -lusb
+Cflags: -I${includedir}
+

diff --git a/sys-freebsd/freebsd-lib/files/libusb.pc.in b/sys-freebsd/freebsd-lib/files/libusb.pc.in
new file mode 100644
index 0000000..f63c6e3
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/libusb.pc.in
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=@LIBDIR@
+includedir=${prefix}/include
+
+Name: libusb
+Description: USB access library (FreeBSD version)
+Version: 0.1.12
+Libs: -L${libdir} -lusb
+Cflags: -I${includedir}
+

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.1_rc3-r1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.1_rc3-r1.ebuild
new file mode 100644
index 0000000..aca6bd9
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.1_rc3-r1.ebuild
@@ -0,0 +1,528 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.1_rc3-r1.ebuild,v 1.1 2012/11/09 20:58:00 ryao Exp $
+
+EAPI=2
+
+inherit bsdmk freebsd flag-o-matic multilib toolchain-funcs eutils
+
+DESCRIPTION="FreeBSD's base system libraries"
+SLOT="0"
+KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+
+# Crypto is needed to have an internal OpenSSL header
+# sys is needed for libalias, probably we can just extract that instead of
+# extracting the whole tarball
+SRC_URI="mirror://gentoo/${LIB}.tar.bz2
+		mirror://gentoo/${CONTRIB}.tar.bz2
+		mirror://gentoo/${CRYPTO}.tar.bz2
+		mirror://gentoo/${LIBEXEC}.tar.bz2
+		mirror://gentoo/${ETC}.tar.bz2
+		mirror://gentoo/${INCLUDE}.tar.bz2
+		mirror://gentoo/${USBIN}.tar.bz2
+		mirror://gentoo/${GNU}.tar.bz2
+		build? (
+			mirror://gentoo/${SYS}.tar.bz2 )
+		zfs? (
+			mirror://gentoo/${CDDL}.tar.bz2 )"
+
+if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then
+	RDEPEND="ssl? ( dev-libs/openssl )
+		hesiod? ( net-dns/hesiod )
+		kerberos? ( virtual/krb5 )
+		usb? ( !dev-libs/libusb !dev-libs/libusbx )
+		userland_GNU? ( sys-apps/mtree )
+		zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )
+		>=dev-libs/expat-2.0.1
+		!sys-libs/libutempter
+		!sys-freebsd/freebsd-headers"
+	DEPEND="${RDEPEND}
+		>=sys-devel/flex-2.5.31-r2
+		=sys-freebsd/freebsd-sources-${RV}*
+		!bootstrap? ( app-arch/bzip2 )"
+else
+	SRC_URI="${SRC_URI}
+			mirror://gentoo/${SYS}.tar.bz2"
+fi
+
+DEPEND="${DEPEND}
+		=sys-freebsd/freebsd-mk-defs-${RV}*"
+
+S="${WORKDIR}/lib"
+
+export CTARGET=${CTARGET:-${CHOST}}
+if [ "${CTARGET}" = "${CHOST}" -a "${CATEGORY#*cross-}" != "${CATEGORY}" ]; then
+	export CTARGET=${CATEGORY/cross-}
+fi
+
+IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware
+	build bootstrap crosscompile_opts_headers-only zfs
+	userland_GNU userland_BSD multilib"
+
+pkg_setup() {
+	[ -c /dev/zero ] || \
+		die "You forgot to mount /dev; the compiled libc would break."
+
+	if ! use ssl && use kerberos; then
+		eerror "If you want kerberos support you need to enable ssl support, too."
+	fi
+
+	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
+	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
+	use hesiod || mymakeopts="${mymakeopts} WITHOUT_HESIOD= "
+	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6_SUPPORT= "
+	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= "
+	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
+	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
+	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
+	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
+
+	mymakeopts="${mymakeopts} WITHOUT_BIND= WITHOUT_BIND_LIBS= WITHOUT_SENDMAIL= WITHOUT_CLANG= "
+
+	if [ "${CTARGET}" != "${CHOST}" ]; then
+		mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})"
+		mymakeopts="${mymakeopts} MACHINE_ARCH=$(tc-arch-kernel ${CTARGET})"
+	fi
+}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.0-pmc.patch"
+	"${FILESDIR}/${PN}-6.0-gccfloat.patch"
+	"${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
+	"${FILESDIR}/${PN}-6.1-csu.patch"
+	"${FILESDIR}/${PN}-8.0-rpcsec_gss.patch"
+	"${FILESDIR}/${PN}-9.0-liblink.patch"
+	"${FILESDIR}/${PN}-bsdxml2expat.patch" )
+
+# Here we disable and remove source which we don't need or want
+# In order:
+# - ncurses stuff
+# - libexpat creates a bsdxml library which is the same as expat
+# - archiving libraries (have their own ebuild)
+# - sendmail libraries (they are installed by sendmail)
+# - SNMP library and dependency (have their own ebuilds)
+# - Clang (compiler_rt and blocksruntime)
+#
+# The rest are libraries we already have somewhere else because
+# they are contribution.
+# Note: libtelnet is an internal lib used by telnet and telnetd programs
+# as it's not used in freebsd-lib package itself, it's pointless building
+# it here.
+REMOVE_SUBDIRS="ncurses \
+	libexpat \
+	libz libbz2 libarchive liblzma \
+	libsm libsmdb libsmutil \
+	libbegemot libbsnmp \
+	libcompiler_rt libblocksruntime \
+	libpam libpcap bind libwrap libmagic \
+	libcom_err libtelnet
+	libelf libedit"
+
+# Are we building a cross-compiler?
+is_crosscompile() {
+	[ "${CATEGORY#*cross-}" != "${CATEGORY}" ]
+}
+
+src_prepare() {
+	sed -i.bak -e 's:-o/dev/stdout:-t:' "${S}/libc/net/Makefile.inc"
+
+	# Upstream Display Managers default to using VT7
+	# We should make FreeBSD allow this by default
+	local x=
+	for x in "${WORKDIR}"/etc/etc.*/ttys ; do
+		sed -i.bak \
+			-e '/ttyv5[[:space:]]/ a\
+# Display Managers default to VT7.\
+# If you use the xdm init script, keep ttyv6 commented out\
+# unless you force a different VT for the DM being used.' \
+			-e '/^ttyv[678][[:space:]]/ s/^/# /' "${x}" \
+			|| die "Failed to sed ${x}"
+		rm "${x}".bak
+	done
+
+	# This one is here because it also
+	# patches "${WORKDIR}/include"
+	cd "${WORKDIR}"
+	epatch "${FILESDIR}/${PN}-includes.patch"
+	epatch "${FILESDIR}/${PN}-8.0-gcc45.patch"
+	epatch "${FILESDIR}/${PN}-9.0-opieincludes.patch"
+
+	# Don't install the hesiod man page or header
+	rm "${WORKDIR}"/include/hesiod.h || die
+	sed -i.bak -e 's:hesiod.h::' "${WORKDIR}"/include/Makefile || die
+	sed -i.bak -e 's:hesiod.c::' -e 's:hesiod.3::' \
+	"${WORKDIR}"/lib/libc/net/Makefile.inc || die
+
+	# Fix the Makefiles of these few libraries that will overwrite our LDADD.
+	cd "${S}"
+	for dir in libradius libtacplus libcam libdevstat libfetch libgeom libmemstat libopie \
+		libsmb; do sed -i.bak -e 's:LDADD=:LDADD+=:g' "${dir}/Makefile" || \
+		die "Problem fixing \"${dir}/Makefile"
+	done
+	# Call LD with LDFLAGS, rename them to RAW_LDFLAGS
+	sed -e 's/LDFLAGS/RAW_LDFLAGS/g' \
+		-i "${S}/csu/i386-elf/Makefile" \
+		-i "${S}/csu/ia64/Makefile" || die
+	if use build; then
+		cd "${WORKDIR}"
+		# This patch has to be applied on ${WORKDIR}/sys, so we do it here since it
+		# shouldn't be a symlink to /usr/src/sys (which should be already patched)
+		epatch "${FILESDIR}"/${PN}-7.1-types.h-fix.patch
+		epatch "${FILESDIR}"/freebsd-sources-9.0-sysctluint.patch
+		return 0
+	fi
+
+	if ! is_crosscompile ; then
+		ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" || die "Couldn't make sys symlink!"
+	else
+		sed -i.bak -e "s:/usr/include:/usr/${CTARGET}/usr/include:g" \
+			"${S}/libc/rpc/Makefile.inc" \
+			"${S}/libc/yp/Makefile.inc"
+	fi
+
+	if install --version 2> /dev/null | grep -q GNU; then
+		sed -i.bak -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile"
+	fi
+
+	# Let arch-specific includes to be found
+	local machine
+	machine=$(tc-arch-kernel ${CTARGET})
+	ln -s "${WORKDIR}/sys/${machine}/include" "${WORKDIR}/include/machine" || \
+		die "Couldn't make ${machine}/include symlink."
+
+	cd "${S}"
+	use bootstrap && dummy_mk libstand
+	# Try to fix sed calls for GNU sed. Do it only with GNU userland and force
+	# BSD's sed on BSD.
+	if use userland_GNU; then
+		find . -name Makefile -exec sed -ibak 's/sed -i /sed -i/' {} \;
+	fi
+}
+
+get_csudir() {
+	if [ -d "${WORKDIR}/lib/csu/$1-elf" ]; then
+		echo "lib/csu/$1-elf"
+	else
+		echo "lib/csu/$1"
+	fi
+}
+
+bootstrap_csu() {
+	local csudir="$(get_csudir $(tc-arch-kernel ${CTARGET}))"
+	export RAW_LDFLAGS=$(raw-ldflags)
+	cd "${WORKDIR}/${csudir}" || die "Missing ${csudir}."
+	freebsd_src_compile
+
+	CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
+	append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
+}
+
+# Compile libssp_nonshared.a and add it's path to LDFLAGS.
+bootstrap_libssp_nonshared() {
+	cd "${WORKDIR}/gnu/lib/libssp/libssp_nonshared/" || die "missing libssp."
+	freebsd_src_compile
+	append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/libssp/libssp_nonshared/"
+	export LDADD="-lssp_nonshared"
+}
+
+# What to build for a non-native build: cross-compiler, non-native abi in
+# multilib. We also need the csu but this has to be handled separately.
+NON_NATIVE_SUBDIRS="lib/libc lib/msun gnu/lib/libssp/libssp_nonshared lib/libthr lib/libutil"
+
+# Subdirs for a native build:
+NATIVE_SUBDIRS="lib gnu/lib/libssp/libssp_nonshared gnu/lib/libregex"
+
+# Is my $ABI native ?
+is_native_abi() {
+	is_crosscompile && return 1
+	use multilib || return 0
+	[ "${ABI}" = "${DEFAULT_ABI}" ]
+}
+
+# Do we need to bootstrap the csu and libssp_nonshared?
+need_bootstrap() {
+	is_crosscompile || use build || ! is_native_abi || has_version "<${CATEGORY}/${P}"
+}
+
+# Get the subdirs we are building.
+get_subdirs() {
+	local ret=""
+	if is_native_abi ; then
+		# If we are building for the native ABI, build everything
+		ret="${NATIVE_SUBDIRS}"
+	elif is_crosscompile ; then
+		# With a cross-compiler we only build the very core parts.
+		ret="${NON_NATIVE_SUBDIRS}"
+		if [ "${EBUILD_PHASE}" = "install" ]; then
+			# Add the csu dir first when installing. We treat it separately for
+			# compiling.
+			ret="$(get_csudir $(tc-arch-kernel ${CTARGET})) ${ret}"
+		fi
+	elif use build ; then
+		# For the non-native ABIs we only build the csu parts and very core
+		# libraries for now.
+		ret="gnu/lib/libssp/libssp_nonshared"
+		if [ "${EBUILD_PHASE}" = "install" ]; then
+			ret="$(get_csudir $(tc-arch-kernel ${CHOST})) ${ret}"
+		fi
+	else
+		# Only build the csu parts and core libraries for now.
+		ret="gnu/lib/libssp/libssp_nonshared"
+		if [ "${EBUILD_PHASE}" = "install" ]; then
+			ret="$(get_csudir $(tc-arch-kernel ${CHOST})) ${ret}"
+		fi
+		# Finally, with a non-native ABI without USE=build, we build everything
+		# too.
+		#ret="${NATIVE_SUBDIRS}"
+	fi
+	echo "${ret}"
+}
+
+# Bootstrap the core libraries and setup the flags so that the other parts can
+# build against it.
+do_bootstrap() {
+	einfo "Bootstrapping on ${CHOST} for ${CTARGET}"
+	if ! is_crosscompile ; then
+		# Pre-install headers, but not when building a cross-compiler since we
+		# assume they have been installed in the previous pass.
+		einfo "Pre-installing includes in include_proper_${ABI}"
+		mkdir "${WORKDIR}/include_proper_${ABI}" || die
+		CTARGET="${CHOST}" install_includes "/include_proper_${ABI}"
+		CFLAGS="${CFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}"
+	fi
+	bootstrap_csu
+	bootstrap_libssp_nonshared
+}
+
+# Compile it. Assume we have the toolchain setup correctly.
+do_compile() {
+	export MAKEOBJDIRPREFIX="${WORKDIR}/${CHOST}"
+	mkdir "${MAKEOBJDIRPREFIX}" || die "Could not create ${MAKEOBJDIRPREFIX}."
+	need_bootstrap && do_bootstrap
+
+	export RAW_LDFLAGS=$(raw-ldflags)
+
+	# Everything is now setup, build it!
+	for i in $(get_subdirs) ; do
+		einfo "Building in ${i}... with CC=${CC} and CFLAGS=${CFLAGS}"
+		cd "${WORKDIR}/${i}/" || die "missing ${i}."
+		freebsd_src_compile || die "make ${i} failed"
+	done
+}
+
+src_compile() {
+	# Does not work with GNU sed
+	# Force BSD's sed on BSD.
+	if use userland_BSD ; then
+		export ESED=/usr/bin/sed
+		unalias sed
+	fi
+
+	cd "${WORKDIR}/include"
+	$(freebsd_get_bmake) CC="$(tc-getCC)" || die "make include failed"
+
+	use crosscompile_opts_headers-only && return 0
+
+	# Bug #270098
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	# Bug #324445
+	append-flags $(test-flags -fno-strict-overflow)
+
+	# strip flags and do not do it later, we only add safe, and in fact
+	# needed flags after all
+	strip-flags
+	export NOFLAGSTRIP=yes
+	if is_crosscompile ; then
+		export YACC='yacc -by'
+		CHOST=${CTARGET} tc-export CC LD CXX RANLIB
+		mymakeopts="${mymakeopts} NLS="
+		append-flags "-I/usr/${CTARGET}/usr/include"
+		append-ldflags "-L${WORKDIR}/${CHOST}/${WORKDIR}/lib/libc"
+	fi
+
+	if is_crosscompile ; then
+		do_compile
+	else
+		for ABI in $(get_all_abis) ; do
+			# First, save the variables: CFLAGS, CXXFLAGS, LDFLAGS and mymakeopts.
+			for i in CFLAGS CXXFLAGS LDFLAGS mymakeopts ; do
+				export ${i}_SAVE="${!i}"
+			done
+
+			multilib_toolchain_setup ${ABI}
+
+			local target="$(tc-arch-kernel ${CHOST})"
+			mymakeopts="${mymakeopts} TARGET=${target} MACHINE=${target} MACHINE_ARCH=${target}"
+			CFLAGADD=""
+			if ! is_native_abi ; then
+				mymakeopts="${mymakeopts} COMPAT_32BIT="
+			fi
+			need_bootstrap || CFLAGS="${CFLAGS} -isystem /usr/include";
+
+			einfo "Building for ABI ${ABI} and TARGET=$(tc-arch-kernel ${CHOST})"
+
+			CTARGET="${CHOST}" do_compile
+
+			# Restore the variables now.
+			for i in CFLAGS CXXFLAGS LDFLAGS mymakeopts ; do
+				ii="${i}_SAVE"
+				export ${i}="${!ii}"
+			done
+		done
+	fi
+}
+
+gen_libc_ldscript() {
+	# Parameters:
+	#   $1 = target libdir
+	#   $2 = source libc dir
+	#   $3 = source libssp_nonshared dir
+
+	# Clear the symlink.
+	rm -f "${D}/$2/libc.so" || die
+
+	# Move the library if needed
+	if [ "$1" != "$2" ] ; then
+		mv "${D}/$2/libc.so.7" "${D}/$1/" || die
+	fi
+
+	# Generate libc.so ldscript for inclusion of libssp_nonshared.a when linking
+	# this is done to avoid having to touch gcc spec file as it is currently
+	# done on FreeBSD upstream, mostly because their binutils aren't able to
+	# cope with linker scripts yet.
+	# Taken from toolchain-funcs.eclass:
+	local output_format
+	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
+	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
+
+	cat > "${D}/$2/libc.so" <<-END_LDSCRIPT
+/* GNU ld script
+   SSP (-fstack-protector) requires __stack_chk_fail_local to be local.
+   GCC invokes this symbol in a non-PIC way, which results in TEXTRELs if
+   this symbol was provided by a shared libc. So we link in
+   libssp_nonshared.a from here.
+ */
+${output_format}
+GROUP ( /$1/libc.so.7 /$3/libssp_nonshared.a )
+END_LDSCRIPT
+}
+
+do_install() {
+	export MAKEOBJDIRPREFIX="${WORKDIR}/${CHOST}"
+	for i in $(get_subdirs) ; do
+		einfo "Installing in ${i}..."
+		cd "${WORKDIR}/${i}/" || die "missing ${i}."
+		freebsd_src_install || die "Install ${i} failed"
+	done
+}
+
+src_install() {
+	[ "${CTARGET}" = "${CHOST}" ] \
+		&& INCLUDEDIR="/usr/include" \
+		|| INCLUDEDIR="/usr/${CTARGET}/usr/include"
+	dodir ${INCLUDEDIR}
+	einfo "Installing for ${CTARGET} in ${CHOST}.."
+	install_includes ${INCLUDEDIR}
+
+	use crosscompile_opts_headers-only && return 0
+	local mylibdir=$(get_libdir)
+
+	if is_crosscompile ; then
+		mymakeopts="${mymakeopts} NO_MAN= \
+			INCLUDEDIR=/usr/${CTARGET}/usr/include \
+			SHLIBDIR=/usr/${CTARGET}/usr/lib \
+			LIBDIR=/usr/${CTARGET}/usr/lib"
+
+		dosym "usr/include" "/usr/${CTARGET}/sys-include"
+		do_install
+	else
+		if ! use multilib ; then
+			# Set SHLIBDIR and LIBDIR for multilib
+			mymakeopts="${mymakeopts} SHLIBDIR=/usr/${mylibdir} LIBDIR=/usr/${mylibdir}"
+			do_install
+		else
+			for ABI in $(get_all_abis) ; do
+				mymakeopts_SAVE="${mymakeopts}"
+				multilib_toolchain_setup ${ABI}
+				mymakeopts="${mymakeopts} SHLIBDIR=/usr/$(get_libdir) LIBDIR=/usr/$(get_libdir)"
+				do_install
+				mymakeopts="${mymakeopts_SAVE}"
+			done
+		fi
+	fi
+
+	# Don't install the rest of the configuration files if crosscompiling
+	if is_crosscompile ; then
+		# This is to get it stripped with the correct tools, otherwise it gets
+		# stripped with the host strip.
+		# And also get the correct OUTPUT_FORMAT in the libc ldscript.
+		export CHOST=${CTARGET}
+		gen_libc_ldscript "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib"
+		return 0
+	fi
+
+	cd "${WORKDIR}/etc/"
+	insinto /etc
+	doins auth.conf nls.alias mac.conf netconfig
+
+	# Install ttys file
+	local MACHINE="$(tc-arch-kernel)"
+	doins "etc.${MACHINE}"/*
+
+	# Generate ldscripts for core libraries that will go in /
+	gen_usr_ldscript -a alias cam geom ipsec jail kiconv \
+		kvm m md procstat sbuf thr ufs util
+
+	gen_libc_ldscript "${mylibdir}" "usr/${mylibdir}" "usr/${mylibdir}"
+
+	# Install a libusb.pc for better compat with Linux's libusb
+	if use usb ; then
+		dodir /usr/$(get_libdir)/pkgconfig
+		sed -e "s:@LIBDIR@:/usr/$(get_libdir):" "${FILESDIR}/libusb.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/libusb.pc" || die
+		sed -e "s:@LIBDIR@:/usr/$(get_libdir):" "${FILESDIR}/libusb-1.0.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/libusb1.0.pc" || die
+	fi
+}
+
+install_includes()
+{
+	local INCLUDEDIR="$1"
+
+	# The idea is to be called from either install or unpack.
+	# During unpack it's required to install them as portage's user.
+	if [[ "${EBUILD_PHASE}" == "install" ]]; then
+		local DESTDIR="${D}"
+		BINOWN="root"
+		BINGRP="wheel"
+	else
+		local DESTDIR="${WORKDIR}"
+		[[ -z "${USER}" ]] && USER="portage"
+		BINOWN="${USER}"
+		[[ -z "${GROUPS}" ]] && GROUPS="portage"
+		BINGRP="${GROUPS}"
+	fi
+
+	# Must exist before we use it.
+	[[ -d "${DESTDIR}${INCLUDEDIR}" ]] || die "dodir or mkdir ${INCLUDEDIR} before using install_includes."
+	cd "${WORKDIR}/include"
+
+	local MACHINE="$(tc-arch-kernel)"
+
+	einfo "Installing includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
+	$(freebsd_get_bmake) installincludes \
+		MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
+		DESTDIR="${DESTDIR}" \
+		INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
+		BINGRP="${BINGRP}" || die "install_includes() failed"
+	einfo "includes installed ok."
+	EXTRA_INCLUDES="lib/librtld_db lib/libutil lib/msun gnu/lib/libregex"
+	for i in $EXTRA_INCLUDES; do
+		einfo "Installing $i includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
+		cd "${WORKDIR}/$i" || die
+		$(freebsd_get_bmake) installincludes DESTDIR="${DESTDIR}" \
+			MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
+			INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
+			BINGRP="${BINGRP}" || die "problem installing $i includes."
+		einfo "$i includes installed ok."
+	done
+}

[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-lib/, sys-freebsd/freebsd-lib/files/

[Yuta SATOH]

commit:     dcea4d82ed19658d5505a614af19f0e079dba6fe
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Thu Sep 20 11:38:53 2012 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Thu Sep 20 11:38:53 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=dcea4d82

remove freebsd-lib-9.1_rc1 fixed in official tree, close bug #435422

---
 sys-freebsd/freebsd-lib/Manifest                   |   34 --
 .../files/freebsd-lib-6.0-flex-2.5.31.patch        |   13 -
 .../files/freebsd-lib-6.0-gccfloat.patch           |   16 -
 .../freebsd-lib/files/freebsd-lib-6.0-pmc.patch    |   13 -
 .../freebsd-lib/files/freebsd-lib-6.1-csu.patch    |   20 -
 .../files/freebsd-lib-6.2-bluetooth.patch          |   11 -
 .../files/freebsd-lib-7.0-CVE-2008-1391.patch      |   11 -
 .../files/freebsd-lib-7.1-types.h-fix.patch        |   15 -
 .../files/freebsd-lib-7.2-rtldnoload.patch         |   30 --
 .../freebsd-lib/files/freebsd-lib-8.0-gcc45.patch  |   28 -
 .../freebsd-lib/files/freebsd-lib-8.0-log2.patch   |   21 -
 .../files/freebsd-lib-8.0-rpcsec_gss.patch         |   12 -
 .../files/freebsd-lib-8.2-liblink.patch            |   19 -
 .../files/freebsd-lib-8.2-nlm_syscall.patch        |   10 -
 .../files/freebsd-lib-9.0-liblink.patch            |   21 -
 .../files/freebsd-lib-9.0-opieincludes.patch       |  122 -----
 .../files/freebsd-lib-9.0-trylock-adaptive.patch   |   14 -
 .../freebsd-lib/files/freebsd-lib-bsdxml.patch     |   13 -
 .../files/freebsd-lib-bsdxml2expat.patch           |   26 -
 .../freebsd-lib/files/freebsd-lib-includes.patch   |   13 -
 .../freebsd-lib/files/freebsd-lib-new_as.patch     |   68 ---
 .../files/freebsd-sources-9.0-sysctluint.patch     |   13 -
 sys-freebsd/freebsd-lib/files/libmap.conf          |    8 -
 sys-freebsd/freebsd-lib/files/libusb.pc.in         |   11 -
 sys-freebsd/freebsd-lib/freebsd-lib-9.1_rc1.ebuild |  537 --------------------
 25 files changed, 0 insertions(+), 1099 deletions(-)

diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
deleted file mode 100644
index 2915277..0000000
--- a/sys-freebsd/freebsd-lib/Manifest
+++ /dev/null
@@ -1,34 +0,0 @@
-AUX freebsd-lib-6.0-flex-2.5.31.patch 421 RMD160 6ef83c6b09e31a81ba3c25772b02aef34540dbe8 SHA1 1408a36a967b0ff5ba94e23921357f4296e31bc2 SHA256 1d46cf13e1059ae3731ba5555764e020fcf4de7db5abf039fac83423e05d53c4
-AUX freebsd-lib-6.0-gccfloat.patch 542 RMD160 564f5a1b1aba59479c22f91570635de717e8b7bf SHA1 94f463f123fdc3009d4ca1d5ab351aa76d768c6b SHA256 d549125f174c86c2d5e7e1f1c99cf1303b84e91ce8ee51db8c962be48b7a7951
-AUX freebsd-lib-6.0-pmc.patch 338 RMD160 bb284cc2f9eafd3f65090087af215c3da679fefa SHA1 18343fc612bd231ec722b579dff61c887542b1c2 SHA256 36ca464f0aa1ed8784c8f1edc4a3580704c9a7813963684305250d806000075f
-AUX freebsd-lib-6.1-csu.patch 655 RMD160 d4fa9ade913ef3ce90351ae368f0944265eae2e4 SHA1 b165b704258d2ce600bcd2a900363d851a4a2a77 SHA256 e6fe72a4183227b275815a75eec9639321046dc1e02b80c507ae6bf902a58cf1
-AUX freebsd-lib-6.2-bluetooth.patch 243 RMD160 eaaeafc3f8305d4755070d9d1354289a140bf6a1 SHA1 6988dfc998b18efd7a91e86a827e921cdabf4997 SHA256 4c90cb6d45fa24a07e21255949f219cc561a94011f645c58bce2a68027db6658
-AUX freebsd-lib-7.0-CVE-2008-1391.patch 344 RMD160 44e20da80ab544895d8dd65b5c6bcdf693c2dd7a SHA1 50105f89d3296793857230a27f909f9c0d713293 SHA256 662a6f26d99257221fa686423fd9fe22862b827cd9ae146c2add5e5ac85290cc
-AUX freebsd-lib-7.1-types.h-fix.patch 371 RMD160 d514196ccf1ba246a158b5f421f009d96d2dd8c4 SHA1 b04bec25903446c20bdfd144796fe9924f9ba39f SHA256 9e745fcfe046c405a365d8d0db8763867f0a618952f7d6bab4c76a8c82273473
-AUX freebsd-lib-7.2-rtldnoload.patch 1037 RMD160 f7f0e833a4ba182f17731eb77ccd6dc8e39f8fad SHA1 2158d4a5183875d52acd0cd538630685d609fac6 SHA256 b9ba0e322f15d8761bb33cf9199b95cc61d6a9b5129d08399f49c89fdeaa095b
-AUX freebsd-lib-8.0-gcc45.patch 1264 RMD160 c2c6b5a3fa8efe0bcb3487cc71117a9411d18f73 SHA1 55e96a2f3a31f3a58ec5fc509a5d15ec47868773 SHA256 5288e313beffa0e50fc0301e859c59f1a95302d546d27eae50b97c4a98c81c4d
-AUX freebsd-lib-8.0-log2.patch 667 RMD160 63f115ff4262cbcb46377f7bfb2fc7a01167e50b SHA1 7daafed62b95bc8c2aeb19e3c0b1e697a152187d SHA256 dc421c3d92790da46360225de2dd4d707c314e962ecb95650799ee12f166a214
-AUX freebsd-lib-8.0-rpcsec_gss.patch 298 RMD160 155eeb638eedb291ea739ad64993817e5d985f7b SHA1 005d80f43b2558d1c8ecc41192b28e1dff53b39a SHA256 170d07c44d02a6b4dde1d0d209c57f3bbab567a5c4a592a82b270140a2a1d7f1
-AUX freebsd-lib-8.2-liblink.patch 510 RMD160 99364b405782a3cd7d7c4f84db9c74e976c0c8ba SHA1 54810b4414733691020ffd8db648fe46a8beef9f SHA256 38f967683e9d335ff7860150b2e6ae4d749266937ba195c6747d42d64c8e31ee
-AUX freebsd-lib-8.2-nlm_syscall.patch 385 RMD160 c3466ada961bd75248d0a62219898d5f936b33ce SHA1 a7bed1eff5f1cda67076b5661cf7ac3e8694ff82 SHA256 4b26be44718cb3deb7fb295d403e892ed73ceba7ba43499a889bd49a5e43852b
-AUX freebsd-lib-9.0-liblink.patch 627 RMD160 ea3f0d6f35457d70ee22461d5c6a5cf34285df93 SHA1 e4670e2c34f96f1e725ab10d3a38e2e6f742e7c5 SHA256 b0c71ae271e4a7a621bdf437254256afb80c3053961a8ad187ba28bc9084e813
-AUX freebsd-lib-9.0-opieincludes.patch 4495 RMD160 d7ffb8dbab8effbd0ca0b69708b99a9361ca3962 SHA1 848b66bd435a48d56e2e3593684ee9b30dd71d4f SHA256 0868e7454053170c3399f1a03a68f3e70410c79db865e7e2f2b51f5961b5718b
-AUX freebsd-lib-9.0-trylock-adaptive.patch 439 RMD160 056ea3082ef46645c5af0374aa092f8fe68221ae SHA1 759dc8dd9975a448c79f5fffafac1838ead91516 SHA256 af501c40124e628c2f739d88a4efa7ef3513694bd79ab44db30e4b3f73864612
-AUX freebsd-lib-bsdxml.patch 339 RMD160 27b501cda2ac76230a72dfc3ee6593cb50f8d4b0 SHA1 3b456d272de5d0c56bc650fe60f38524857f8b31 SHA256 c1ac47d6c7176475f0f4b86bb17288a980b44a799fb6f4e7b1920f69e0447dc9
-AUX freebsd-lib-bsdxml2expat.patch 708 RMD160 4a973e39a5860bd7b0fbba438302c65ec2b66e33 SHA1 95ed47baf5e189865d3989fad625a2160d2abe13 SHA256 0c3ec3657155c5032479181119c488d43a479ab0dfe7a7d7ed0dabce16853e85
-AUX freebsd-lib-includes.patch 316 RMD160 655d20a7a86715983469dbda678bca0ae726c069 SHA1 65cd796b0f8747d8d063b1f6e3ea53f82cdcdbe1 SHA256 be4dd4c905715c2d165be282cf377f799b32ccb76986947bc0bf1b5730b57b06
-AUX freebsd-lib-new_as.patch 1494 RMD160 36ac871434f9994d5a0d7e1b73765c055d49948a SHA1 10e2e6b7b27459548a17809ada287520e3ffeeea SHA256 6021f34246dcf768a94ffe7273ea2f5590adf6d82ce7fb555234f8012bdbd982
-AUX freebsd-sources-9.0-sysctluint.patch 403 RMD160 46bb18c424ea7011db86341e427fd095495c4bcc SHA1 9d3c1606c886d96a88c89283bc18a2717c87fc76 SHA256 884fbc5d6d3766ea3d4609946f56072f36f95368dc13ee316c330a46d42f0c9e
-AUX libmap.conf 201 RMD160 ad0ab6c08b5c541e0e45636dcbbaa468bbae2f95 SHA1 df81db07a94d988f1c41b4696b4d3b0058e73f83 SHA256 36a1bd56965f171cbb058f6e1762801e3b92c083fe36f6fe046bd669beed9742
-AUX libusb.pc.in 208 RMD160 13c7e5587c565453fc6a11d156da302fa7590ee0 SHA1 f0f9815fa27a8f1cf8405c1a8987df5d5d6a6b1b SHA256 9bfe398a335f8b9b1c3dd167ab0c9206fe3bdd4e1da318ece977e20f3c2d7c56
-DIST freebsd-cddl-9.1_rc1.tar.bz2 899168 RMD160 8c9f94e80b999485f84f4b0d028dc3e3f0ee49c3 SHA1 3091df8d95f3e1bce885f5d5eb3cdf4a1406401d SHA256 966eb6b9dccb0f00381e68cf6fe4b56e485ac4e44914b655e3e4f7106053fb22
-DIST freebsd-contrib-9.1_rc1.tar.bz2 54751775 RMD160 34aa7ac4cf35b8c0924c711e1383b717f7a0a326 SHA1 77beb4040d309a2ea09dc5cf3c1813e59d10f259 SHA256 ecef816eb33391e120baea101d2f06d1d229dfc1f929eab4527fdbe424b42190
-DIST freebsd-crypto-9.1_rc1.tar.bz2 5680649 RMD160 2b6c61c9fe332439d884ff939341127ed4d29519 SHA1 05801d078d4044871893a2023d5d9f773bdfe76e SHA256 a6b7b7aba5dfca7ffae79c7691ed24cd632fa07d8ed73808d3f9e72c63afab8d
-DIST freebsd-etc-9.1_rc1.tar.bz2 207859 RMD160 4f6a63edf07e9a18425cece068e122bbbcadd0bd SHA1 5c0345d701fb8ea528d8bcc4643fcf2db0f66495 SHA256 84d7bc249fb9646fb3550e22041d2856825ea499d1e841c9afaa07d12dbbfb30
-DIST freebsd-gnu-9.1_rc1.tar.bz2 795320 RMD160 5ecd1e98bbe719584a8ddb8ae40b083d4b457993 SHA1 92e106be91f2fb2f0d04789d439c742f658ace8d SHA256 ac444e3019c602020e0177fdfacecd274e6df6e7602519468e84564b52f1c413
-DIST freebsd-include-9.1_rc1.tar.bz2 146833 RMD160 b7d2b285bc116807ad2b5a299258e8a310d3c497 SHA1 2f3cbc158fcb208ce1d489ac251c7ac8b6376e53 SHA256 2f9f98bafb48ba143e05348cefb28b2a1a6095dc3f973c4258fe56635094522a
-DIST freebsd-lib-9.1_rc1.tar.bz2 3205820 RMD160 1d1b7aa837aad9a25feec5a1667fdaaf4cbecfca SHA1 c6ce46a2c0965ce64bad46cf30b3a3f49fff5f90 SHA256 a01031b645a3e9cc80c74d362682244434fc93b2af15c6db7854cb0ac2cdcb87
-DIST freebsd-libexec-9.1_rc1.tar.bz2 304745 RMD160 01f0132f3d39d11de4f08c62746fc92e5bc60aeb SHA1 cce74926fcba8cc5640cb8d08765fb8e4325c336 SHA256 191aa176de7b21cf82f84a1671ce7641e29c139d039040fd8368bf41e17eb15c
-DIST freebsd-sys-9.1_rc1.tar.bz2 32607060 RMD160 1e5c930de245ae9eab01f8baba57c910b7c89544 SHA1 35d03b142a65e75ae4deb271517b454a6b7c8da9 SHA256 0f375b358f5c407c16308a4884207b97022a7a5466e0291087642685f3c83957
-DIST freebsd-usbin-9.1_rc1.tar.bz2 2667842 RMD160 0e667af2dd418c624c093b45b3a5de6033b808f1 SHA1 6881483917f39d18c2f348a035b45b9e31dbabce SHA256 6f567fcacbe185d1fb0441b830621260970846534e39d767c92b448e2bb8ca60
-EBUILD freebsd-lib-9.1_rc1.ebuild 17255 RMD160 6fb76fccaaea0c5aca7e0cff41401c57b9135aba SHA1 267ccb80d7c47eca4c1f16223332282b56fc2f68 SHA256 d28313a4fec383387d65465aa15911b051d619a9f98dc414ee0aca652f8e6fa5

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-flex-2.5.31.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-flex-2.5.31.patch
deleted file mode 100644
index 00de8a6..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-flex-2.5.31.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: fbsd-6/lib/libipsec/policy_token.l
-===================================================================
---- fbsd-6.orig/lib/libipsec/policy_token.l
-+++ fbsd-6/lib/libipsec/policy_token.l
-@@ -138,8 +138,6 @@ void
- __policy__strbuffer__init__(msg)
- 	char *msg;
- {
--	if (yy_current_buffer)
--		yy_delete_buffer(yy_current_buffer);
- 	strbuffer = (YY_BUFFER_STATE)yy_scan_string(msg);
- 	yy_switch_to_buffer(strbuffer);
- 

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-gccfloat.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-gccfloat.patch
deleted file mode 100644
index a3e7d5e..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-gccfloat.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-This patch is needed to avoid inclusion of GCC's float.h that defines
-LDBL_MANT_DIG at 53 (while the source file checks for 113 or 64.
-
-Index: freebsd-6.0_beta4/lib/msun/src/s_fmal.c
-===================================================================
---- freebsd-6.0_beta4.orig/lib/msun/src/s_fmal.c
-+++ freebsd-6.0_beta4/lib/msun/src/s_fmal.c
-@@ -28,7 +28,7 @@
- __FBSDID("$FreeBSD: src/lib/msun/src/s_fmal.c,v 1.2 2005/03/18 02:27:59 das Exp $");
- 
- #include <fenv.h>
--#include <float.h>
-+#include <machine/float.h>
- #include <math.h>
- 
- /*

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-pmc.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-pmc.patch
deleted file mode 100644
index 2f6de46..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-pmc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: freebsd-6.0_beta4/lib/libpmc/Makefile
-===================================================================
---- freebsd-6.0_beta4.orig/lib/libpmc/Makefile
-+++ freebsd-6.0_beta4/lib/libpmc/Makefile
-@@ -9,6 +9,8 @@ WARNS?=	6
- 
- MAN=	pmc.3 pmclog.3
- 
-+CFLAGS+= -I${.CURDIR}
-+
- MLINKS+= \
- 	pmc.3 pmc_allocate.3 \
- 	pmc.3 pmc_attach.3 \

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.1-csu.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.1-csu.patch
deleted file mode 100644
index 075f278..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.1-csu.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- lib/csu/amd64/Makefile.orig	2006-07-04 07:49:58 -0300
-+++ lib/csu/amd64/Makefile	2006-07-04 07:50:15 -0300
-@@ -16,6 +16,7 @@
- 	${CC} ${CFLAGS} -DGCRT -c -o gcrt1.o ${.CURDIR}/crt1.c
- 
- realinstall:
-+	${INSTALL} -d ${DESTDIR}${LIBDIR}
- 	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${OBJS} ${DESTDIR}${LIBDIR}
- 
---- lib/csu/sparc64/Makefile.orig	2006-10-06 15:13:55 +0100
-+++ lib/csu/sparc64/Makefile	2006-10-06 15:15:06 +0100
-@@ -15,6 +15,7 @@
- 	${CC} ${CFLAGS} -DGCRT -c -o gcrt1.o ${.ALLSRC}
- 
- realinstall:
-+	${INSTALL} -d ${DESTDIR}${LIBDIR}
- 	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${OBJS} ${DESTDIR}${LIBDIR}
- 

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.2-bluetooth.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.2-bluetooth.patch
deleted file mode 100644
index a9b8435..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.2-bluetooth.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/libsdp/Makefile	2007-06-15 12:04:37 +0200
-+++ lib.sdp/libsdp/Makefile	2007-06-15 12:26:14 +0200
-@@ -5,7 +5,7 @@
- MAN=		sdp.3
- 
- WARNS?=		2
--CFLAGS+=	-I${.CURDIR}
-+CFLAGS+=	-I${.CURDIR}  -I${.CURDIR}/../libbluetooth
- 
- SHLIB_MAJOR=	2
- 

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-7.0-CVE-2008-1391.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-7.0-CVE-2008-1391.patch
deleted file mode 100644
index 2b8d401..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-7.0-CVE-2008-1391.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/libc/stdlib/strfmon.c	2008/04/22 13:23:34
-+++ lib/libc/stdlib/strfmon.c	2008/04/24 07:49:00
-@@ -65,6 +65,8 @@
- #define GET_NUMBER(VAR)	do {					\
- 	VAR = 0;						\
- 	while (isdigit((unsigned char)*fmt)) {			\
-+		if (VAR > INT_MAX / 10)				\
-+			goto e2big_error;			\
- 		VAR *= 10;					\
- 		VAR += *fmt - '0';				\
- 		if (VAR < 0)					\

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-7.1-types.h-fix.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-7.1-types.h-fix.patch
deleted file mode 100644
index 8de5df2..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-7.1-types.h-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fixes a compile error if XOPEN_SOURCE 600 is defined.
-
-See: http://www.mailinglistarchive.com/freebsd-current@freebsd.org/msg15011.html
-
---- sys/sys/types.h.orig
-+++ sys/sys/types.h
-@@ -46,7 +46,7 @@
- 
- #include <sys/_pthreadtypes.h>
- 
--#if __BSD_VISIBLE
-+#ifndef _POSIX_SOURCE
- typedef	unsigned char	u_char;
- typedef	unsigned short	u_short;
- typedef	unsigned int	u_int;

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-7.2-rtldnoload.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-7.2-rtldnoload.patch
deleted file mode 100644
index 77bbe2e..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-7.2-rtldnoload.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Backported from 8.0.
-Even if RTLD_NOLOAD is not standard, dev-libs/nss expects it.
-Since it has made it to 8.0 we can afford backporting it.
-
---- include/dlfcn.h.old	2010-01-10 18:42:04 +0100
-+++ include/dlfcn.h	2010-01-10 18:42:19 +0100
-@@ -47,6 +47,7 @@
- #define	RTLD_GLOBAL	0x100	/* Make symbols globally available. */
- #define	RTLD_LOCAL	0	/* Opposite of RTLD_GLOBAL, and the default. */
- #define	RTLD_TRACE	0x200	/* Trace loaded objects and exit. */
-+#define	RTLD_NOLOAD	0x02000	/* Do not load if not already loaded. */
- 
- /*
-  * Request arguments for dlinfo().
---- lib/libc/gen/dlopen.3.old	2010-01-10 18:43:15 +0100
-+++ lib/libc/gen/dlopen.3	2010-01-10 18:45:27 +0100
-@@ -141,6 +141,13 @@
- With this flag
- .Fn dlopen
- will return to the caller only in the case of error.
-+.It Dv RTLD_NOLOAD
-+Only return valid handle for the object if it is already loaded in
-+the process address space, otherwise
-+.Dv NULL
-+is returned.
-+Other mode flags may be specified, which will be applied for promotion
-+for the found object.
- .El
- .Pp
- If

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-gcc45.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-gcc45.patch
deleted file mode 100644
index 2ddb9ea..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-gcc45.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Nur work.orig/include/rpcsvc/nis.x work/include/rpcsvc/nis.x
---- work.orig/include/rpcsvc/nis.x	2009-10-25 10:10:29.000000000 +0900
-+++ work/include/rpcsvc/nis.x	2011-04-13 21:25:13.000000000 +0900
-@@ -399,10 +399,7 @@
- %#define OARIGHTS(d, n) (((d)->do_armask.do_armask_val+n)->oa_rights)
- %#define WORLD_DEFAULT (NIS_READ_ACC)
- %#define GROUP_DEFAULT (NIS_READ_ACC << 8)
--%#define OWNER_DEFAULT ((NIS_READ_ACC +\
--			 NIS_MODIFY_ACC +\
--			 NIS_CREATE_ACC +\
--			 NIS_DESTROY_ACC) << 16)
-+%#define OWNER_DEFAULT ((NIS_READ_ACC + NIS_MODIFY_ACC + NIS_CREATE_ACC + NIS_DESTROY_ACC) << 16)
- %#define DEFAULT_RIGHTS (WORLD_DEFAULT | GROUP_DEFAULT | OWNER_DEFAULT)
- %
- %/* Result manipulation defines ... */
-@@ -431,10 +428,8 @@
- % * these definitions they take an nis_object *, and an int and return
- % * a u_char * for Value, and an int for length.
- % */
--%#define ENTRY_VAL(obj, col) \
--	(obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_val
--%#define ENTRY_LEN(obj, col) \
--	(obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_len
-+%#define ENTRY_VAL(obj, col) (obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_val
-+%#define ENTRY_LEN(obj, col) (obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_len
- %
- %#ifdef __cplusplus
- %}

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-log2.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-log2.patch
deleted file mode 100644
index a9fd189..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-log2.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-log2 and log2f are required by C99 and are not implemented.
-Workaround the deficiency.
-
---- lib/msun/src/math.h.old	2010-03-14 17:02:25.000000000 +0100
-+++ lib/msun/src/math.h	2010-03-14 17:07:03.000000000 +0100
-@@ -203,6 +203,7 @@
- double	frexp(double, int *);	/* fundamentally !__pure2 */
- double	ldexp(double, int);
- double	log(double);
-+#define log2(x) log(x)/log(2.0)
- double	log10(double);
- double	modf(double, double *);	/* fundamentally !__pure2 */
- 
-@@ -319,6 +320,7 @@
- float	log10f(float);
- float	log1pf(float);
- float	logf(float);
-+#define log2f(x) logf(x)/logf(2.0)
- float	modff(float, float *);	/* fundamentally !__pure2 */
- 
- float	powf(float, float);

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-rpcsec_gss.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-rpcsec_gss.patch
deleted file mode 100644
index 3b23387..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-rpcsec_gss.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Without this linking fails during a stage3 build.
-
---- lib/librpcsec_gss/Makefile.orig
-+++ lib/librpcsec_gss/Makefile
-@@ -8,6 +8,7 @@
- 
- DPADD+=	${LIBGSSAPI}
- LDADD+=	-lgssapi
-+LDFLAGS+= 	-L${.CURDIR}/../libgssapi
- 
- VERSION_DEF=	${.CURDIR}/../libc/Versions.def
- SYMBOL_MAPS=	${.CURDIR}/Symbol.map

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-liblink.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-liblink.patch
deleted file mode 100644
index c8be7f4..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-liblink.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- lib/libproc/Makefile.old	2011-07-06 00:58:04.000000000 +0000
-+++ lib/libproc/Makefile	2011-07-06 00:58:58.000000000 +0000
-@@ -18,5 +18,6 @@
- WARNS?=	6
- 
- WITHOUT_MAN=	yes
-+LDADD=-lelf
- 
- .include <bsd.lib.mk>
---- lib/librtld_db/Makefile.old	2011-07-06 00:58:12.000000000 +0000
-+++ lib/librtld_db/Makefile	2011-07-06 00:59:27.000000000 +0000
-@@ -10,5 +10,7 @@
- INCS=		rtld_db.h
- 
- CFLAGS+= -I${.CURDIR}
-+LDADD=-lutil -lproc
-+LDFLAGS+=-L${.CURDIR}/../libutil -L${.CURDIR}/../libproc
- 
- .include <bsd.lib.mk>

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-nlm_syscall.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-nlm_syscall.patch
deleted file mode 100644
index 556ade5..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-nlm_syscall.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- include/unistd.h	2010/12/20 20:39:49	216602
-+++ include/unistd.h	2010/12/20 21:12:18	216603
-@@ -529,6 +529,7 @@
- #define	_MKTEMP_DECLARED
- #endif
- int	 nfssvc(int, void *);
-+int	 nlm_syscall(int, int, int, char **);
- int	 profil(char *, size_t, vm_offset_t, int);
- int	 rcmd(char **, int, const char *, const char *, const char *, int *);
- int	 rcmd_af(char **, int, const char *,

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-liblink.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-liblink.patch
deleted file mode 100644
index 5d7526f..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-liblink.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -uNr lib.ol/libproc/Makefile lib/libproc/Makefile
---- lib.ol/libproc/Makefile	2011-11-02 14:02:17.000000000 +0000
-+++ lib/libproc/Makefile	2011-11-02 14:03:09.000000000 +0000
-@@ -16,5 +16,6 @@
- SHLIB_MAJOR=	2
- 
- WITHOUT_MAN=
-+LDADD+=-lelf
- 
- .include <bsd.lib.mk>
-diff -uNr lib.ol/librtld_db/Makefile lib/librtld_db/Makefile
---- lib.ol/librtld_db/Makefile	2011-11-02 14:02:13.000000000 +0000
-+++ lib/librtld_db/Makefile	2011-11-02 14:04:00.000000000 +0000
-@@ -10,5 +10,7 @@
- INCS=		rtld_db.h
- 
- CFLAGS+= -I${.CURDIR}
-+LDADD+=-lutil -lproc
-+LDFLAGS+=-L${.CURDIR}/../libutil -L${.CURDIR}/../libproc
- 
- .include <bsd.lib.mk>

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-opieincludes.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-opieincludes.patch
deleted file mode 100644
index bf77a0a..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-opieincludes.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-Fixes warnings like:
-/var/tmp/portage/sys-freebsd/freebsd-lib-9.0-r2/work/lib/libopie/../../contrib/opie/libopie/randomchallenge.c:43:5:
-warning: incompatible implicit declaration of built-in function ‘strcpy’ 
-
-diff -uNr contrib.old/opie/libopie/accessfile.c contrib/opie/libopie/accessfile.c
---- contrib.old/opie/libopie/accessfile.c	2012-05-25 08:54:33.000000000 -0400
-+++ contrib/opie/libopie/accessfile.c	2012-05-25 09:12:34.000000000 -0400
-@@ -46,6 +46,7 @@
- #ifdef DEBUG
- #include <syslog.h>
- #endif /* DEBUG */
-+#include <ctype.h>
- 
- #include "opie.h"
- 
-diff -uNr contrib.old/opie/libopie/generator.c contrib/opie/libopie/generator.c
---- contrib.old/opie/libopie/generator.c	2012-05-25 08:54:33.000000000 -0400
-+++ contrib/opie/libopie/generator.c	2012-05-25 08:58:10.000000000 -0400
-@@ -50,6 +50,7 @@
- #include <syslog.h>
- #endif /* DEBUG */
- #include "opie.h"
-+#include <stdio.h>
- 
- static char *algids[] = { NULL, NULL, NULL, "sha1", "md4", "md5" };
- 
-diff -uNr contrib.old/opie/libopie/lookup.c contrib/opie/libopie/lookup.c
---- contrib.old/opie/libopie/lookup.c	2012-05-25 08:54:33.000000000 -0400
-+++ contrib/opie/libopie/lookup.c	2012-05-25 09:15:08.000000000 -0400
-@@ -14,6 +14,7 @@
- #include "opie_cfg.h"
- #include <stdio.h>
- #include "opie.h"
-+#include <string.h>
- 
- int opielookup FUNCTION((opie, principal), struct opie *opie AND char *principal)
- {
-diff -uNr contrib.old/opie/libopie/newseed.c contrib/opie/libopie/newseed.c
---- contrib.old/opie/libopie/newseed.c	2012-05-25 08:54:33.000000000 -0400
-+++ contrib/opie/libopie/newseed.c	2012-05-25 09:14:37.000000000 -0400
-@@ -36,6 +36,9 @@
- #include <syslog.h>
- #endif /* DEBUG */
- #include "opie.h"
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <time.h>
- 
- int opienewseed FUNCTION((seed), char *seed)
- {
-diff -uNr contrib.old/opie/libopie/parsechallenge.c contrib/opie/libopie/parsechallenge.c
---- contrib.old/opie/libopie/parsechallenge.c	2012-05-25 08:54:33.000000000 -0400
-+++ contrib/opie/libopie/parsechallenge.c	2012-05-25 09:15:54.000000000 -0400
-@@ -20,6 +20,8 @@
- #include <string.h>
- #endif /* HAVE_STRING_H */
- #include "opie.h"
-+#include <stdlib.h>
-+#include <ctype.h>
- 
- struct algorithm {
-   char *name;
-diff -uNr contrib.old/opie/libopie/passwd.c contrib/opie/libopie/passwd.c
---- contrib.old/opie/libopie/passwd.c	2012-05-25 08:54:33.000000000 -0400
-+++ contrib/opie/libopie/passwd.c	2012-05-25 09:13:45.000000000 -0400
-@@ -22,6 +22,7 @@
- 
- #include "opie_cfg.h"
- #include "opie.h"
-+#include <string.h>
- 
- int opiepasswd FUNCTION((old, flags, principal, n, seed, ks), struct opie *old AND int flags AND char *principal AND int n AND char *seed AND char *ks)
- {
-diff -uNr contrib.old/opie/libopie/randomchallenge.c contrib/opie/libopie/randomchallenge.c
---- contrib.old/opie/libopie/randomchallenge.c	2012-05-25 08:54:33.000000000 -0400
-+++ contrib/opie/libopie/randomchallenge.c	2012-05-25 09:00:27.000000000 -0400
-@@ -28,6 +28,9 @@
- 
- #include "opie_cfg.h"
- #include "opie.h"
-+#include <stdio.h>
-+#include <string.h>
-+#include <stdlib.h>
- 
- static char *algids[] = { 0, 0, 0, "sha1", "md4", "md5" };
- 
-diff -uNr contrib.old/opie/libopie/verify.c contrib/opie/libopie/verify.c
---- contrib.old/opie/libopie/verify.c	2012-05-25 08:54:33.000000000 -0400
-+++ contrib/opie/libopie/verify.c	2012-05-25 09:12:09.000000000 -0400
-@@ -25,6 +25,7 @@
- #include <string.h>
- #endif /* HAVE_STRING_H */
- #include "opie.h"
-+#include <ctype.h>
- 
- #define RESPONSE_STANDARD  0
- #define RESPONSE_WORD      1
-diff -uNr contrib.old/opie/libopie/version.c contrib/opie/libopie/version.c
---- contrib.old/opie/libopie/version.c	2012-05-25 08:54:33.000000000 -0400
-+++ contrib/opie/libopie/version.c	2012-05-25 09:13:15.000000000 -0400
-@@ -19,6 +19,8 @@
- */
- #include "opie_cfg.h"
- #include "opie.h"
-+#include <stdio.h>
-+#include <stdlib.h>
- 
- VOIDRET opieversion FUNCTION_NOARGS
- {
-diff -uNr contrib.old/opie/opie.h contrib/opie/opie.h
---- contrib.old/opie/opie.h	2012-05-25 08:54:33.000000000 -0400
-+++ contrib/opie/opie.h	2012-05-25 09:21:28.000000000 -0400
-@@ -158,6 +158,9 @@
- int __opiereadrec __P((struct opie *));
- int __opiewriterec __P((struct opie *));
- int __opieparsechallenge __P((char *buffer, int *algorithm, int *sequence, char **seed, int *exts));
-+VOIDRET opiehashlen FUNCTION((algorithm, in, out, n), int algorithm AND VOIDPTR in AND struct opie_otpkey *out AND int n);
-+int opieinsecure FUNCTION_NOARGS;
-+int opienewseed FUNCTION((seed), char *seed);
- __END_DECLS
- 
- #define opiestrncpy(dst, src, n) \

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-trylock-adaptive.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-trylock-adaptive.patch
deleted file mode 100644
index e72b171..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-trylock-adaptive.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://www.freebsd.org/cgi/query-pr.cgi?pr=168317
-
-Index: lib/libthr/thread/thr_mutex.c
-===================================================================
---- lib/libthr/thread/thr_mutex.c	(revision 235924)
-+++ lib/libthr/thread/thr_mutex.c	(working copy)
-@@ -538,6 +538,7 @@
- 	switch (PMUTEX_TYPE(m->m_flags)) {
- 	case PTHREAD_MUTEX_ERRORCHECK:
- 	case PTHREAD_MUTEX_NORMAL:
-+	case PTHREAD_MUTEX_ADAPTIVE_NP:
- 		ret = EBUSY; 
- 		break;
- 

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml.patch
deleted file mode 100644
index ec90def..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -u lib/libgeom/Makefile lib.xml/libgeom/Makefile
---- lib/libgeom/Makefile	2004-03-07 16:07:57 +0000
-+++ lib.xml/libgeom/Makefile	2005-05-06 10:38:41 +0000
-@@ -8,7 +8,8 @@
- SRCS+=	geom_ctl.c
- INCS=	libgeom.h
- 
--CFLAGS += -I${.CURDIR}
-+CFLAGS += -I${.CURDIR} -I${.CURDIR}/../libexpat
-+LDFLAGS += -L${.CURDIR}/../libexpat
- 
- WARNS?=	3
- 

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml2expat.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml2expat.patch
deleted file mode 100644
index 1b4e791..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml2expat.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur lib/libgeom.old/Makefile lib/libgeom/Makefile
---- lib/libgeom.old/Makefile	2011-07-10 14:23:51.000000000 +0000
-+++ lib/libgeom/Makefile	2011-07-10 15:12:39.000000000 +0000
-@@ -13,8 +13,8 @@
- 
- WARNS?=	3
- 
--DPADD=	${LIBBSDXML} ${LIBSBUF}
--LDADD=	-lbsdxml -lsbuf
-+DPADD=	${LIBSBUF}
-+LDADD=	-lexpat -lsbuf
- 
- MAN=	libgeom.3
- 
-diff -ur lib/libgeom.old/geom_xml2tree.c lib/libgeom/geom_xml2tree.c
---- lib/libgeom.old/geom_xml2tree.c	2010-12-21 17:09:25.000000000 +0000
-+++ lib/libgeom/geom_xml2tree.c	2011-07-10 15:12:52.000000000 +0000
-@@ -43,7 +43,7 @@
- #include <sys/sbuf.h>
- #include <sys/sysctl.h>
- #include <err.h>
--#include <bsdxml.h>
-+#include <expat.h>
- #include <libgeom.h>
- 
- struct mystate {

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-includes.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-includes.patch
deleted file mode 100644
index c2cf142..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-includes.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Fix headers dependencies so that they can be included alone.
-
---- include/ifaddrs.h.old	2009-05-15 13:50:10 +0000
-+++ include/ifaddrs.h	2009-05-15 13:50:23 +0000
-@@ -28,6 +28,8 @@
- #ifndef	_IFADDRS_H_
- #define	_IFADDRS_H_
- 
-+#include <sys/types.h>
-+
- struct ifaddrs {
- 	struct ifaddrs  *ifa_next;
- 	char		*ifa_name;

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-new_as.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-new_as.patch
deleted file mode 100644
index c9288a4..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-new_as.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- lib/msun/i387/fenv.c.orig	2007-01-05 04:15:26 -0300
-+++ lib/msun/i387/fenv.c	2008-06-14 00:49:30 -0300
-@@ -152,7 +152,8 @@
- int
- feupdateenv(const fenv_t *envp)
- {
--	int mxcsr, status;
-+	int mxcsr;
-+	short status;
- 
- 	__fnstsw(&status);
- 	if (__HAS_SSE())
---- lib/msun/i387/fenv.h.orig	2007-01-06 18:46:23 -0300
-+++ lib/msun/i387/fenv.h	2008-06-14 01:06:40 -0300
-@@ -134,7 +134,8 @@
- static __inline int
- fegetexceptflag(fexcept_t *__flagp, int __excepts)
- {
--	int __mxcsr, __status;
-+	int __mxcsr;
-+	short __status;
- 
- 	__fnstsw(&__status);
- 	if (__HAS_SSE())
-@@ -151,7 +152,8 @@
- static __inline int
- fetestexcept(int __excepts)
- {
--	int __mxcsr, __status;
-+	int __mxcsr;
-+	short __status;
- 
- 	__fnstsw(&__status);
- 	if (__HAS_SSE())
---- lib/msun/amd64/fenv.c.orig	2007-01-05 04:15:26 -0300
-+++ lib/msun/amd64/fenv.c	2008-06-14 01:02:41 -0300
-@@ -101,7 +101,8 @@
- int
- feupdateenv(const fenv_t *envp)
- {
--	int mxcsr, status;
-+	int mxcsr;
-+	short status;
- 
- 	__fnstsw(&status);
- 	__stmxcsr(&mxcsr);
---- lib/msun/amd64/fenv.h.orig	2007-01-06 18:46:23 -0300
-+++ lib/msun/amd64/fenv.h	2008-06-14 01:08:23 -0300
-@@ -110,7 +110,8 @@
- static __inline int
- fegetexceptflag(fexcept_t *__flagp, int __excepts)
- {
--	int __mxcsr, __status;
-+	int __mxcsr;
-+	short __status;
- 
- 	__stmxcsr(&__mxcsr);
- 	__fnstsw(&__status);
-@@ -124,7 +125,8 @@
- static __inline int
- fetestexcept(int __excepts)
- {
--	int __mxcsr, __status;
-+	int __mxcsr;
-+	short __status;
- 
- 	__stmxcsr(&__mxcsr);
- 	__fnstsw(&__status);

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-sources-9.0-sysctluint.patch b/sys-freebsd/freebsd-lib/files/freebsd-sources-9.0-sysctluint.patch
deleted file mode 100644
index 751a77c..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-sources-9.0-sysctluint.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-u_int is defined in sys/types.h
-makes header usable alone.
-
---- sys/sys/sysctl.h.old	2012-05-25 11:08:53.000000000 -0400
-+++ sys/sys/sysctl.h	2012-05-25 11:09:16.000000000 -0400
-@@ -788,6 +788,7 @@
- 		    struct sysctl_req *);
- #else	/* !_KERNEL */
- #include <sys/cdefs.h>
-+#include <sys/types.h> /* for u_int */
- 
- __BEGIN_DECLS
- int	sysctl(const int *, u_int, void *, size_t *, const void *, size_t);

diff --git a/sys-freebsd/freebsd-lib/files/libmap.conf b/sys-freebsd/freebsd-lib/files/libmap.conf
deleted file mode 100644
index 7a879f9..0000000
--- a/sys-freebsd/freebsd-lib/files/libmap.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# /etc/libmap.conf
-
-# Ensure that libthr does all threading
-libpthread.so.2         libthr.so.2
-libpthread.so           libthr.so
-libc_r.so.6             libthr.so.2
-libc_r.so               libthr.so
-

diff --git a/sys-freebsd/freebsd-lib/files/libusb.pc.in b/sys-freebsd/freebsd-lib/files/libusb.pc.in
deleted file mode 100644
index f63c6e3..0000000
--- a/sys-freebsd/freebsd-lib/files/libusb.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=@LIBDIR@
-includedir=${prefix}/include
-
-Name: libusb
-Description: USB access library (FreeBSD version)
-Version: 0.1.12
-Libs: -L${libdir} -lusb
-Cflags: -I${includedir}
-

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.1_rc1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.1_rc1.ebuild
deleted file mode 100644
index 66be4c8..0000000
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.1_rc1.ebuild
+++ /dev/null
@@ -1,537 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit bsdmk freebsd flag-o-matic multilib toolchain-funcs eutils
-
-DESCRIPTION="FreeBSD's base system libraries"
-SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-
-# Crypto is needed to have an internal OpenSSL header
-# sys is needed for libalias, probably we can just extract that instead of
-# extracting the whole tarball
-SRC_URI="mirror://gentoo/${LIB}.tar.bz2
-		mirror://gentoo/${CONTRIB}.tar.bz2
-		mirror://gentoo/${CRYPTO}.tar.bz2
-		mirror://gentoo/${LIBEXEC}.tar.bz2
-		mirror://gentoo/${ETC}.tar.bz2
-		mirror://gentoo/${INCLUDE}.tar.bz2
-		mirror://gentoo/${USBIN}.tar.bz2
-		mirror://gentoo/${GNU}.tar.bz2
-		build? (
-			mirror://gentoo/${SYS}.tar.bz2 )
-		zfs? (
-			mirror://gentoo/${CDDL}.tar.bz2 )"
-
-if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then
-	RDEPEND="ssl? ( dev-libs/openssl )
-		hesiod? ( net-dns/hesiod )
-		kerberos? ( virtual/krb5 )
-		usb? ( !dev-libs/libusb !dev-libs/libusbx )
-		userland_GNU? ( sys-apps/mtree )
-		zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )
-		>=dev-libs/expat-2.0.1
-		!sys-libs/libutempter
-		!sys-freebsd/freebsd-headers"
-	DEPEND="${RDEPEND}
-		>=sys-devel/flex-2.5.31-r2
-		=sys-freebsd/freebsd-sources-${RV}*
-		!bootstrap? ( app-arch/bzip2 )"
-else
-	SRC_URI="${SRC_URI}
-			mirror://gentoo/${SYS}.tar.bz2"
-fi
-
-DEPEND="${DEPEND}
-		=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-S="${WORKDIR}/lib"
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [ "${CTARGET}" = "${CHOST}" -a "${CATEGORY#*cross-}" != "${CATEGORY}" ]; then
-	export CTARGET=${CATEGORY/cross-}
-fi
-
-IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware
-	build bootstrap crosscompile_opts_headers-only zfs
-	userland_GNU userland_BSD multilib"
-
-pkg_setup() {
-	[ -c /dev/zero ] || \
-		die "You forgot to mount /dev; the compiled libc would break."
-
-	if ! use ssl && use kerberos; then
-		eerror "If you want kerberos support you need to enable ssl support, too."
-	fi
-
-	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
-	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
-	use hesiod || mymakeopts="${mymakeopts} WITHOUT_HESIOD= "
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6_SUPPORT= "
-	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= "
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
-	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-
-	mymakeopts="${mymakeopts} WITHOUT_BIND= WITHOUT_BIND_LIBS= WITHOUT_SENDMAIL= WITHOUT_CLANG= "
-
-	if [ "${CTARGET}" != "${CHOST}" ]; then
-		mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})"
-		mymakeopts="${mymakeopts} MACHINE_ARCH=$(tc-arch-kernel ${CTARGET})"
-	fi
-}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.0-pmc.patch"
-	"${FILESDIR}/${PN}-6.0-gccfloat.patch"
-	"${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
-	"${FILESDIR}/${PN}-6.1-csu.patch"
-	"${FILESDIR}/${PN}-8.0-rpcsec_gss.patch"
-	"${FILESDIR}/${PN}-9.0-liblink.patch"
-	"${FILESDIR}/${PN}-bsdxml2expat.patch" )
-
-# Here we disable and remove source which we don't need or want
-# In order:
-# - ncurses stuff
-# - libexpat creates a bsdxml library which is the same as expat
-# - archiving libraries (have their own ebuild)
-# - sendmail libraries (they are installed by sendmail)
-# - SNMP library and dependency (have their own ebuilds)
-# - Clang (compiler_rt and blocksruntime)
-#
-# The rest are libraries we already have somewhere else because
-# they are contribution.
-# Note: libtelnet is an internal lib used by telnet and telnetd programs
-# as it's not used in freebsd-lib package itself, it's pointless building
-# it here.
-REMOVE_SUBDIRS="ncurses \
-	libexpat \
-	libz libbz2 libarchive liblzma \
-	libsm libsmdb libsmutil \
-	libbegemot libbsnmp \
-	libcompiler_rt libblocksruntime \
-	libpam libpcap bind libwrap libmagic \
-	libcom_err libtelnet
-	libelf libedit"
-
-# Are we building a cross-compiler?
-is_crosscompile() {
-	[ "${CATEGORY#*cross-}" != "${CATEGORY}" ]
-}
-
-src_prepare() {
-	sed -i.bak -e 's:-o/dev/stdout:-t:' "${S}/libc/net/Makefile.inc"
-
-	# Upstream Display Managers default to using VT7
-	# We should make FreeBSD allow this by default
-	local x=
-	for x in "${WORKDIR}"/etc/etc.*/ttys ; do
-		sed -i.bak \
-			-e '/ttyv5[[:space:]]/ a\
-# Display Managers default to VT7.\
-# If you use the xdm init script, keep ttyv6 commented out\
-# unless you force a different VT for the DM being used.' \
-			-e '/^ttyv[678][[:space:]]/ s/^/# /' "${x}" \
-			|| die "Failed to sed ${x}"
-		rm "${x}".bak
-	done
-
-	# This one is here because it also
-	# patches "${WORKDIR}/include"
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}/${PN}-includes.patch"
-	epatch "${FILESDIR}/${PN}-8.0-gcc45.patch"
-	epatch "${FILESDIR}/${PN}-9.0-opieincludes.patch"
-
-	# Don't install the hesiod man page or header
-	rm "${WORKDIR}"/include/hesiod.h || die
-	sed -i.bak -e 's:hesiod.h::' "${WORKDIR}"/include/Makefile || die
-	sed -i.bak -e 's:hesiod.c::' -e 's:hesiod.3::' \
-	"${WORKDIR}"/lib/libc/net/Makefile.inc || die
-
-	# Fix the Makefiles of these few libraries that will overwrite our LDADD.
-	cd "${S}"
-	for dir in libradius libtacplus libcam libdevstat libfetch libgeom libmemstat libopie \
-		libsmb; do sed -i.bak -e 's:LDADD=:LDADD+=:g' "${dir}/Makefile" || \
-		die "Problem fixing \"${dir}/Makefile"
-	done
-	# Call LD with LDFLAGS, rename them to RAW_LDFLAGS
-	sed -e 's/LDFLAGS/RAW_LDFLAGS/g' \
-		-i "${S}/csu/i386-elf/Makefile" \
-		-i "${S}/csu/ia64/Makefile" || die
-	if use build; then
-		cd "${WORKDIR}"
-		# This patch has to be applied on ${WORKDIR}/sys, so we do it here since it
-		# shouldn't be a symlink to /usr/src/sys (which should be already patched)
-		epatch "${FILESDIR}"/${PN}-7.1-types.h-fix.patch
-		epatch "${FILESDIR}"/freebsd-sources-9.0-sysctluint.patch
-		return 0
-	fi
-
-	if ! is_crosscompile ; then
-		ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" || die "Couldn't make sys symlink!"
-	else
-		sed -i.bak -e "s:/usr/include:/usr/${CTARGET}/usr/include:g" \
-			"${S}/libc/rpc/Makefile.inc" \
-			"${S}/libc/yp/Makefile.inc"
-	fi
-
-	if install --version 2> /dev/null | grep -q GNU; then
-		sed -i.bak -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile"
-	fi
-
-	# Let arch-specific includes to be found
-	local machine
-	machine=$(tc-arch-kernel ${CTARGET})
-	ln -s "${WORKDIR}/sys/${machine}/include" "${WORKDIR}/include/machine" || \
-		die "Couldn't make ${machine}/include symlink."
-
-	cd "${S}"
-	use bootstrap && dummy_mk libstand
-	# Try to fix sed calls for GNU sed. Do it only with GNU userland and force
-	# BSD's sed on BSD.
-	if use userland_GNU; then
-		find . -name Makefile -exec sed -ibak 's/sed -i /sed -i/' {} \;
-	fi
-}
-
-get_csudir() {
-	if [ -d "${WORKDIR}/lib/csu/$1-elf" ]; then
-		echo "lib/csu/$1-elf"
-	else
-		echo "lib/csu/$1"
-	fi
-}
-
-bootstrap_csu() {
-	local csudir="$(get_csudir $(tc-arch-kernel ${CTARGET}))"
-	export RAW_LDFLAGS=$(raw-ldflags)
-	cd "${WORKDIR}/${csudir}" || die "Missing ${csudir}."
-	freebsd_src_compile
-
-	CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
-	append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
-}
-
-# Compile libssp_nonshared.a and add it's path to LDFLAGS.
-bootstrap_libssp_nonshared() {
-	cd "${WORKDIR}/gnu/lib/libssp/libssp_nonshared/" || die "missing libssp."
-	freebsd_src_compile
-	append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/libssp/libssp_nonshared/"
-	export LDADD="-lssp_nonshared"
-}
-
-# What to build for a non-native build: cross-compiler, non-native abi in
-# multilib. We also need the csu but this has to be handled separately.
-NON_NATIVE_SUBDIRS="lib/libc lib/msun gnu/lib/libssp/libssp_nonshared lib/libthr lib/libutil"
-
-# Subdirs for a native build:
-NATIVE_SUBDIRS="lib gnu/lib/libssp/libssp_nonshared gnu/lib/libregex"
-
-# Is my $ABI native ?
-is_native_abi() {
-	is_crosscompile && return 1
-	use multilib || return 0
-	[ "${ABI}" = "${DEFAULT_ABI}" ]
-}
-
-# Do we need to bootstrap the csu and libssp_nonshared?
-need_bootstrap() {
-	is_crosscompile || use build || ! is_native_abi || has_version "<${CATEGORY}/${P}"
-}
-
-# Get the subdirs we are building.
-get_subdirs() {
-	local ret=""
-	if is_native_abi ; then
-		# If we are building for the native ABI, build everything
-		ret="${NATIVE_SUBDIRS}"
-	elif is_crosscompile ; then
-		# With a cross-compiler we only build the very core parts.
-		ret="${NON_NATIVE_SUBDIRS}"
-		if [ "${EBUILD_PHASE}" = "install" ]; then
-			# Add the csu dir first when installing. We treat it separately for
-			# compiling.
-			ret="$(get_csudir $(tc-arch-kernel ${CTARGET})) ${ret}"
-		fi
-	elif use build ; then
-		# For the non-native ABIs we only build the csu parts and very core
-		# libraries for now.
-		ret="gnu/lib/libssp/libssp_nonshared"
-		if [ "${EBUILD_PHASE}" = "install" ]; then
-			ret="$(get_csudir $(tc-arch-kernel ${CHOST})) ${ret}"
-		fi
-	else
-		# Only build the csu parts and core libraries for now.
-		ret="gnu/lib/libssp/libssp_nonshared"
-		if [ "${EBUILD_PHASE}" = "install" ]; then
-			ret="$(get_csudir $(tc-arch-kernel ${CHOST})) ${ret}"
-		fi
-		# Finally, with a non-native ABI without USE=build, we build everything
-		# too.
-		#ret="${NATIVE_SUBDIRS}"
-	fi
-	echo "${ret}"
-}
-
-# Bootstrap the core libraries and setup the flags so that the other parts can
-# build against it.
-do_bootstrap() {
-	einfo "Bootstrapping on ${CHOST} for ${CTARGET}"
-	if ! is_crosscompile ; then
-		# Pre-install headers, but not when building a cross-compiler since we
-		# assume they have been installed in the previous pass.
-		einfo "Pre-installing includes in include_proper_${ABI}"
-		mkdir "${WORKDIR}/include_proper_${ABI}" || die
-		CTARGET="${CHOST}" install_includes "/include_proper_${ABI}"
-		CFLAGS="${CFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}"
-	fi
-	bootstrap_csu
-	bootstrap_libssp_nonshared
-}
-
-# Compile it. Assume we have the toolchain setup correctly.
-do_compile() {
-	export MAKEOBJDIRPREFIX="${WORKDIR}/${CHOST}"
-	mkdir "${MAKEOBJDIRPREFIX}" || die "Could not create ${MAKEOBJDIRPREFIX}."
-	need_bootstrap && do_bootstrap
-
-	export RAW_LDFLAGS=$(raw-ldflags)
-
-	#fixes bug 419477, multilib support
-	cd "${S}"
-	sed -i -e "s:^LDFLAGS+=.*:LDFLAGS+=-L ${MAKEOBJDIRPREFIX}/${S}/libgssapi:" \
-		librpcsec_gss/Makefile || die "Problem fixing \"librpcsec_gss/Makefile"
-	sed -i -e "s:^LDFLAGS+=.*:LDFLAGS+=-L ${MAKEOBJDIRPREFIX}/${S}/libutil -L ${MAKEOBJDIRPREFIX}/${S}/libproc:" \
-		librtld_db/Makefile || die "Problem fixing \"librtld_db/Makefile"
-
-	# Everything is now setup, build it!
-	for i in $(get_subdirs) ; do
-		einfo "Building in ${i}... with CC=${CC} and CFLAGS=${CFLAGS}"
-		cd "${WORKDIR}/${i}/" || die "missing ${i}."
-		freebsd_src_compile || die "make ${i} failed"
-	done
-}
-
-src_compile() {
-	# Does not work with GNU sed
-	# Force BSD's sed on BSD.
-	if use userland_BSD ; then
-		export ESED=/usr/bin/sed
-		unalias sed
-	fi
-
-	cd "${WORKDIR}/include"
-	$(freebsd_get_bmake) CC="$(tc-getCC)" || die "make include failed"
-
-	use crosscompile_opts_headers-only && return 0
-
-	# Bug #270098
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	# Bug #324445
-	append-flags $(test-flags -fno-strict-overflow)
-
-	# strip flags and do not do it later, we only add safe, and in fact
-	# needed flags after all
-	strip-flags
-	export NOFLAGSTRIP=yes
-	if is_crosscompile ; then
-		export YACC='yacc -by'
-		CHOST=${CTARGET} tc-export CC LD CXX RANLIB
-		mymakeopts="${mymakeopts} NLS="
-		append-flags "-I/usr/${CTARGET}/usr/include"
-		append-ldflags "-L${WORKDIR}/${CHOST}/${WORKDIR}/lib/libc"
-	fi
-
-	if is_crosscompile ; then
-		do_compile
-	else
-		for ABI in $(get_all_abis) ; do
-			# First, save the variables: CFLAGS, CXXFLAGS, LDFLAGS and mymakeopts.
-			for i in CFLAGS CXXFLAGS LDFLAGS mymakeopts ; do
-				export ${i}_SAVE="${!i}"
-			done
-
-			multilib_toolchain_setup ${ABI}
-
-			local target="$(tc-arch-kernel ${CHOST})"
-			mymakeopts="${mymakeopts} TARGET=${target} MACHINE=${target} MACHINE_ARCH=${target}"
-			CFLAGADD=""
-			if ! is_native_abi ; then
-				mymakeopts="${mymakeopts} COMPAT_32BIT="
-			else
-				if ! has_version "<${CATEGORY}/${PF}" ; then
-					use build || CFLAGS="${CFLAGS} -isystem /usr/include";
-				fi
-			fi
-
-			einfo "Building for ABI ${ABI} and TARGET=$(tc-arch-kernel ${CHOST})"
-
-			CTARGET="${CHOST}" do_compile
-
-			# Restore the variables now.
-			for i in CFLAGS CXXFLAGS LDFLAGS mymakeopts ; do
-				ii="${i}_SAVE"
-				export ${i}="${!ii}"
-			done
-		done
-	fi
-}
-
-gen_libc_ldscript() {
-	# Parameters:
-	#   $1 = target libdir
-	#   $2 = source libc dir
-	#   $3 = source libssp_nonshared dir
-
-	# Clear the symlink.
-	rm -f "${D}/$2/libc.so" || die
-
-	# Move the library if needed
-	if [ "$1" != "$2" ] ; then
-		mv "${D}/$2/libc.so.7" "${D}/$1/" || die
-	fi
-
-	# Generate libc.so ldscript for inclusion of libssp_nonshared.a when linking
-	# this is done to avoid having to touch gcc spec file as it is currently
-	# done on FreeBSD upstream, mostly because their binutils aren't able to
-	# cope with linker scripts yet.
-	# Taken from toolchain-funcs.eclass:
-	local output_format
-	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
-	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
-
-	cat > "${D}/$2/libc.so" <<-END_LDSCRIPT
-/* GNU ld script
-   SSP (-fstack-protector) requires __stack_chk_fail_local to be local.
-   GCC invokes this symbol in a non-PIC way, which results in TEXTRELs if
-   this symbol was provided by a shared libc. So we link in
-   libssp_nonshared.a from here.
- */
-${output_format}
-GROUP ( /$1/libc.so.7 /$3/libssp_nonshared.a )
-END_LDSCRIPT
-}
-
-do_install() {
-	export MAKEOBJDIRPREFIX="${WORKDIR}/${CHOST}"
-	for i in $(get_subdirs) ; do
-		einfo "Installing in ${i}..."
-		cd "${WORKDIR}/${i}/" || die "missing ${i}."
-		freebsd_src_install || die "Install ${i} failed"
-	done
-}
-
-src_install() {
-	[ "${CTARGET}" = "${CHOST}" ] \
-		&& INCLUDEDIR="/usr/include" \
-		|| INCLUDEDIR="/usr/${CTARGET}/usr/include"
-	dodir ${INCLUDEDIR}
-	einfo "Installing for ${CTARGET} in ${CHOST}.."
-	install_includes ${INCLUDEDIR}
-
-	use crosscompile_opts_headers-only && return 0
-	local mylibdir=$(get_libdir)
-
-	if is_crosscompile ; then
-		mymakeopts="${mymakeopts} NO_MAN= \
-			INCLUDEDIR=/usr/${CTARGET}/usr/include \
-			SHLIBDIR=/usr/${CTARGET}/usr/lib \
-			LIBDIR=/usr/${CTARGET}/usr/lib"
-
-		dosym "usr/include" "/usr/${CTARGET}/sys-include"
-		do_install
-	else
-		if ! use multilib ; then
-			# Set SHLIBDIR and LIBDIR for multilib
-			mymakeopts="${mymakeopts} SHLIBDIR=/usr/${mylibdir} LIBDIR=/usr/${mylibdir}"
-			do_install
-		else
-			for ABI in $(get_all_abis) ; do
-				mymakeopts_SAVE="${mymakeopts}"
-				multilib_toolchain_setup ${ABI}
-				mymakeopts="${mymakeopts} SHLIBDIR=/usr/$(get_libdir) LIBDIR=/usr/$(get_libdir)"
-				do_install
-				mymakeopts="${mymakeopts_SAVE}"
-			done
-		fi
-	fi
-
-	# Don't install the rest of the configuration files if crosscompiling
-	if is_crosscompile ; then
-		# This is to get it stripped with the correct tools, otherwise it gets
-		# stripped with the host strip.
-		# And also get the correct OUTPUT_FORMAT in the libc ldscript.
-		export CHOST=${CTARGET}
-		gen_libc_ldscript "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib"
-		return 0
-	fi
-
-	cd "${WORKDIR}/etc/"
-	insinto /etc
-	doins auth.conf nls.alias mac.conf netconfig
-
-	# Install ttys file
-	local MACHINE="$(tc-arch-kernel)"
-	doins "etc.${MACHINE}"/*
-
-	# Generate ldscripts for core libraries that will go in /
-	gen_usr_ldscript -a alias cam geom ipsec jail kiconv \
-		kvm m md procstat sbuf thr ufs util
-
-	gen_libc_ldscript "${mylibdir}" "usr/${mylibdir}" "usr/${mylibdir}"
-
-	# Install a libusb.pc for better compat with Linux's libusb
-	if use usb ; then
-		dodir /usr/$(get_libdir)/pkgconfig
-		sed -e "s:@LIBDIR@:/usr/$(get_libdir):" "${FILESDIR}/libusb.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/libusb.pc" || die
-	fi
-}
-
-install_includes()
-{
-	local INCLUDEDIR="$1"
-
-	# The idea is to be called from either install or unpack.
-	# During unpack it's required to install them as portage's user.
-	if [[ "${EBUILD_PHASE}" == "install" ]]; then
-		local DESTDIR="${D}"
-		BINOWN="root"
-		BINGRP="wheel"
-	else
-		local DESTDIR="${WORKDIR}"
-		[[ -z "${USER}" ]] && USER="portage"
-		BINOWN="${USER}"
-		[[ -z "${GROUPS}" ]] && GROUPS="portage"
-		BINGRP="${GROUPS}"
-	fi
-
-	# Must exist before we use it.
-	[[ -d "${DESTDIR}${INCLUDEDIR}" ]] || die "dodir or mkdir ${INCLUDEDIR} before using install_includes."
-	cd "${WORKDIR}/include"
-
-	local MACHINE="$(tc-arch-kernel)"
-
-	einfo "Installing includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
-	$(freebsd_get_bmake) installincludes \
-		MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
-		DESTDIR="${DESTDIR}" \
-		INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
-		BINGRP="${BINGRP}" || die "install_includes() failed"
-	einfo "includes installed ok."
-	EXTRA_INCLUDES="lib/librtld_db lib/libutil lib/msun gnu/lib/libregex"
-	for i in $EXTRA_INCLUDES; do
-		einfo "Installing $i includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
-		cd "${WORKDIR}/$i" || die
-		$(freebsd_get_bmake) installincludes DESTDIR="${DESTDIR}" \
-			MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
-			INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
-			BINGRP="${BINGRP}" || die "problem installing $i includes."
-		einfo "$i includes installed ok."
-	done
-}

[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-lib/, sys-freebsd/freebsd-lib/files/

[Yuta SATOH]

commit:     48ba130fbfba9adfe642f56c2db6b5c79ca9a4cd
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Tue Sep 18 15:41:22 2012 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Tue Sep 18 15:41:22 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=48ba130f

freebsd-lib-9.1_rc1 -- readded from latest portage tree

---
 .../files/freebsd-lib-6.0-flex-2.5.31.patch        |   13 +
 .../files/freebsd-lib-6.0-gccfloat.patch           |   16 +
 .../freebsd-lib/files/freebsd-lib-6.0-pmc.patch    |   13 +
 .../freebsd-lib/files/freebsd-lib-6.1-csu.patch    |   20 +
 .../files/freebsd-lib-6.2-bluetooth.patch          |   11 +
 .../files/freebsd-lib-7.0-CVE-2008-1391.patch      |   11 +
 .../files/freebsd-lib-7.1-types.h-fix.patch        |   15 +
 .../files/freebsd-lib-7.2-rtldnoload.patch         |   30 ++
 .../freebsd-lib/files/freebsd-lib-8.0-gcc45.patch  |   28 +
 .../freebsd-lib/files/freebsd-lib-8.0-log2.patch   |   21 +
 .../files/freebsd-lib-8.0-rpcsec_gss.patch         |   12 +
 .../files/freebsd-lib-8.2-liblink.patch            |   19 +
 .../files/freebsd-lib-8.2-nlm_syscall.patch        |   10 +
 .../files/freebsd-lib-9.0-liblink.patch            |   21 +
 .../files/freebsd-lib-9.0-opieincludes.patch       |  122 +++++
 .../files/freebsd-lib-9.0-trylock-adaptive.patch   |   14 +
 .../freebsd-lib/files/freebsd-lib-bsdxml.patch     |   13 +
 .../files/freebsd-lib-bsdxml2expat.patch           |   26 +
 .../freebsd-lib/files/freebsd-lib-includes.patch   |   13 +
 .../freebsd-lib/files/freebsd-lib-new_as.patch     |   68 +++
 .../files/freebsd-sources-9.0-sysctluint.patch     |   13 +
 sys-freebsd/freebsd-lib/files/libmap.conf          |    8 +
 sys-freebsd/freebsd-lib/files/libusb.pc.in         |   11 +
 sys-freebsd/freebsd-lib/freebsd-lib-9.1_rc1.ebuild |  535 ++++++++++++++++++++
 24 files changed, 1063 insertions(+), 0 deletions(-)

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-flex-2.5.31.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-flex-2.5.31.patch
new file mode 100644
index 0000000..00de8a6
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-flex-2.5.31.patch
@@ -0,0 +1,13 @@
+Index: fbsd-6/lib/libipsec/policy_token.l
+===================================================================
+--- fbsd-6.orig/lib/libipsec/policy_token.l
++++ fbsd-6/lib/libipsec/policy_token.l
+@@ -138,8 +138,6 @@ void
+ __policy__strbuffer__init__(msg)
+ 	char *msg;
+ {
+-	if (yy_current_buffer)
+-		yy_delete_buffer(yy_current_buffer);
+ 	strbuffer = (YY_BUFFER_STATE)yy_scan_string(msg);
+ 	yy_switch_to_buffer(strbuffer);
+ 

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-gccfloat.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-gccfloat.patch
new file mode 100644
index 0000000..a3e7d5e
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-gccfloat.patch
@@ -0,0 +1,16 @@
+This patch is needed to avoid inclusion of GCC's float.h that defines
+LDBL_MANT_DIG at 53 (while the source file checks for 113 or 64.
+
+Index: freebsd-6.0_beta4/lib/msun/src/s_fmal.c
+===================================================================
+--- freebsd-6.0_beta4.orig/lib/msun/src/s_fmal.c
++++ freebsd-6.0_beta4/lib/msun/src/s_fmal.c
+@@ -28,7 +28,7 @@
+ __FBSDID("$FreeBSD: src/lib/msun/src/s_fmal.c,v 1.2 2005/03/18 02:27:59 das Exp $");
+ 
+ #include <fenv.h>
+-#include <float.h>
++#include <machine/float.h>
+ #include <math.h>
+ 
+ /*

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-pmc.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-pmc.patch
new file mode 100644
index 0000000..2f6de46
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-pmc.patch
@@ -0,0 +1,13 @@
+Index: freebsd-6.0_beta4/lib/libpmc/Makefile
+===================================================================
+--- freebsd-6.0_beta4.orig/lib/libpmc/Makefile
++++ freebsd-6.0_beta4/lib/libpmc/Makefile
+@@ -9,6 +9,8 @@ WARNS?=	6
+ 
+ MAN=	pmc.3 pmclog.3
+ 
++CFLAGS+= -I${.CURDIR}
++
+ MLINKS+= \
+ 	pmc.3 pmc_allocate.3 \
+ 	pmc.3 pmc_attach.3 \

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.1-csu.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.1-csu.patch
new file mode 100644
index 0000000..075f278
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.1-csu.patch
@@ -0,0 +1,20 @@
+--- lib/csu/amd64/Makefile.orig	2006-07-04 07:49:58 -0300
++++ lib/csu/amd64/Makefile	2006-07-04 07:50:15 -0300
+@@ -16,6 +16,7 @@
+ 	${CC} ${CFLAGS} -DGCRT -c -o gcrt1.o ${.CURDIR}/crt1.c
+ 
+ realinstall:
++	${INSTALL} -d ${DESTDIR}${LIBDIR}
+ 	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ 	    ${OBJS} ${DESTDIR}${LIBDIR}
+ 
+--- lib/csu/sparc64/Makefile.orig	2006-10-06 15:13:55 +0100
++++ lib/csu/sparc64/Makefile	2006-10-06 15:15:06 +0100
+@@ -15,6 +15,7 @@
+ 	${CC} ${CFLAGS} -DGCRT -c -o gcrt1.o ${.ALLSRC}
+ 
+ realinstall:
++	${INSTALL} -d ${DESTDIR}${LIBDIR}
+ 	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ 	    ${OBJS} ${DESTDIR}${LIBDIR}
+ 

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.2-bluetooth.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.2-bluetooth.patch
new file mode 100644
index 0000000..a9b8435
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.2-bluetooth.patch
@@ -0,0 +1,11 @@
+--- lib/libsdp/Makefile	2007-06-15 12:04:37 +0200
++++ lib.sdp/libsdp/Makefile	2007-06-15 12:26:14 +0200
+@@ -5,7 +5,7 @@
+ MAN=		sdp.3
+ 
+ WARNS?=		2
+-CFLAGS+=	-I${.CURDIR}
++CFLAGS+=	-I${.CURDIR}  -I${.CURDIR}/../libbluetooth
+ 
+ SHLIB_MAJOR=	2
+ 

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-7.0-CVE-2008-1391.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-7.0-CVE-2008-1391.patch
new file mode 100644
index 0000000..2b8d401
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-7.0-CVE-2008-1391.patch
@@ -0,0 +1,11 @@
+--- lib/libc/stdlib/strfmon.c	2008/04/22 13:23:34
++++ lib/libc/stdlib/strfmon.c	2008/04/24 07:49:00
+@@ -65,6 +65,8 @@
+ #define GET_NUMBER(VAR)	do {					\
+ 	VAR = 0;						\
+ 	while (isdigit((unsigned char)*fmt)) {			\
++		if (VAR > INT_MAX / 10)				\
++			goto e2big_error;			\
+ 		VAR *= 10;					\
+ 		VAR += *fmt - '0';				\
+ 		if (VAR < 0)					\

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-7.1-types.h-fix.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-7.1-types.h-fix.patch
new file mode 100644
index 0000000..8de5df2
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-7.1-types.h-fix.patch
@@ -0,0 +1,15 @@
+Fixes a compile error if XOPEN_SOURCE 600 is defined.
+
+See: http://www.mailinglistarchive.com/freebsd-current@freebsd.org/msg15011.html
+
+--- sys/sys/types.h.orig
++++ sys/sys/types.h
+@@ -46,7 +46,7 @@
+ 
+ #include <sys/_pthreadtypes.h>
+ 
+-#if __BSD_VISIBLE
++#ifndef _POSIX_SOURCE
+ typedef	unsigned char	u_char;
+ typedef	unsigned short	u_short;
+ typedef	unsigned int	u_int;

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-7.2-rtldnoload.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-7.2-rtldnoload.patch
new file mode 100644
index 0000000..77bbe2e
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-7.2-rtldnoload.patch
@@ -0,0 +1,30 @@
+Backported from 8.0.
+Even if RTLD_NOLOAD is not standard, dev-libs/nss expects it.
+Since it has made it to 8.0 we can afford backporting it.
+
+--- include/dlfcn.h.old	2010-01-10 18:42:04 +0100
++++ include/dlfcn.h	2010-01-10 18:42:19 +0100
+@@ -47,6 +47,7 @@
+ #define	RTLD_GLOBAL	0x100	/* Make symbols globally available. */
+ #define	RTLD_LOCAL	0	/* Opposite of RTLD_GLOBAL, and the default. */
+ #define	RTLD_TRACE	0x200	/* Trace loaded objects and exit. */
++#define	RTLD_NOLOAD	0x02000	/* Do not load if not already loaded. */
+ 
+ /*
+  * Request arguments for dlinfo().
+--- lib/libc/gen/dlopen.3.old	2010-01-10 18:43:15 +0100
++++ lib/libc/gen/dlopen.3	2010-01-10 18:45:27 +0100
+@@ -141,6 +141,13 @@
+ With this flag
+ .Fn dlopen
+ will return to the caller only in the case of error.
++.It Dv RTLD_NOLOAD
++Only return valid handle for the object if it is already loaded in
++the process address space, otherwise
++.Dv NULL
++is returned.
++Other mode flags may be specified, which will be applied for promotion
++for the found object.
+ .El
+ .Pp
+ If

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-gcc45.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-gcc45.patch
new file mode 100644
index 0000000..2ddb9ea
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-gcc45.patch
@@ -0,0 +1,28 @@
+diff -Nur work.orig/include/rpcsvc/nis.x work/include/rpcsvc/nis.x
+--- work.orig/include/rpcsvc/nis.x	2009-10-25 10:10:29.000000000 +0900
++++ work/include/rpcsvc/nis.x	2011-04-13 21:25:13.000000000 +0900
+@@ -399,10 +399,7 @@
+ %#define OARIGHTS(d, n) (((d)->do_armask.do_armask_val+n)->oa_rights)
+ %#define WORLD_DEFAULT (NIS_READ_ACC)
+ %#define GROUP_DEFAULT (NIS_READ_ACC << 8)
+-%#define OWNER_DEFAULT ((NIS_READ_ACC +\
+-			 NIS_MODIFY_ACC +\
+-			 NIS_CREATE_ACC +\
+-			 NIS_DESTROY_ACC) << 16)
++%#define OWNER_DEFAULT ((NIS_READ_ACC + NIS_MODIFY_ACC + NIS_CREATE_ACC + NIS_DESTROY_ACC) << 16)
+ %#define DEFAULT_RIGHTS (WORLD_DEFAULT | GROUP_DEFAULT | OWNER_DEFAULT)
+ %
+ %/* Result manipulation defines ... */
+@@ -431,10 +428,8 @@
+ % * these definitions they take an nis_object *, and an int and return
+ % * a u_char * for Value, and an int for length.
+ % */
+-%#define ENTRY_VAL(obj, col) \
+-	(obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_val
+-%#define ENTRY_LEN(obj, col) \
+-	(obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_len
++%#define ENTRY_VAL(obj, col) (obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_val
++%#define ENTRY_LEN(obj, col) (obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_len
+ %
+ %#ifdef __cplusplus
+ %}

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-log2.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-log2.patch
new file mode 100644
index 0000000..a9fd189
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-log2.patch
@@ -0,0 +1,21 @@
+log2 and log2f are required by C99 and are not implemented.
+Workaround the deficiency.
+
+--- lib/msun/src/math.h.old	2010-03-14 17:02:25.000000000 +0100
++++ lib/msun/src/math.h	2010-03-14 17:07:03.000000000 +0100
+@@ -203,6 +203,7 @@
+ double	frexp(double, int *);	/* fundamentally !__pure2 */
+ double	ldexp(double, int);
+ double	log(double);
++#define log2(x) log(x)/log(2.0)
+ double	log10(double);
+ double	modf(double, double *);	/* fundamentally !__pure2 */
+ 
+@@ -319,6 +320,7 @@
+ float	log10f(float);
+ float	log1pf(float);
+ float	logf(float);
++#define log2f(x) logf(x)/logf(2.0)
+ float	modff(float, float *);	/* fundamentally !__pure2 */
+ 
+ float	powf(float, float);

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-rpcsec_gss.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-rpcsec_gss.patch
new file mode 100644
index 0000000..3b23387
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-rpcsec_gss.patch
@@ -0,0 +1,12 @@
+Without this linking fails during a stage3 build.
+
+--- lib/librpcsec_gss/Makefile.orig
++++ lib/librpcsec_gss/Makefile
+@@ -8,6 +8,7 @@
+ 
+ DPADD+=	${LIBGSSAPI}
+ LDADD+=	-lgssapi
++LDFLAGS+= 	-L${.CURDIR}/../libgssapi
+ 
+ VERSION_DEF=	${.CURDIR}/../libc/Versions.def
+ SYMBOL_MAPS=	${.CURDIR}/Symbol.map

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-liblink.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-liblink.patch
new file mode 100644
index 0000000..c8be7f4
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-liblink.patch
@@ -0,0 +1,19 @@
+--- lib/libproc/Makefile.old	2011-07-06 00:58:04.000000000 +0000
++++ lib/libproc/Makefile	2011-07-06 00:58:58.000000000 +0000
+@@ -18,5 +18,6 @@
+ WARNS?=	6
+ 
+ WITHOUT_MAN=	yes
++LDADD=-lelf
+ 
+ .include <bsd.lib.mk>
+--- lib/librtld_db/Makefile.old	2011-07-06 00:58:12.000000000 +0000
++++ lib/librtld_db/Makefile	2011-07-06 00:59:27.000000000 +0000
+@@ -10,5 +10,7 @@
+ INCS=		rtld_db.h
+ 
+ CFLAGS+= -I${.CURDIR}
++LDADD=-lutil -lproc
++LDFLAGS+=-L${.CURDIR}/../libutil -L${.CURDIR}/../libproc
+ 
+ .include <bsd.lib.mk>

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-nlm_syscall.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-nlm_syscall.patch
new file mode 100644
index 0000000..556ade5
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-nlm_syscall.patch
@@ -0,0 +1,10 @@
+--- include/unistd.h	2010/12/20 20:39:49	216602
++++ include/unistd.h	2010/12/20 21:12:18	216603
+@@ -529,6 +529,7 @@
+ #define	_MKTEMP_DECLARED
+ #endif
+ int	 nfssvc(int, void *);
++int	 nlm_syscall(int, int, int, char **);
+ int	 profil(char *, size_t, vm_offset_t, int);
+ int	 rcmd(char **, int, const char *, const char *, const char *, int *);
+ int	 rcmd_af(char **, int, const char *,

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-liblink.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-liblink.patch
new file mode 100644
index 0000000..5d7526f
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-liblink.patch
@@ -0,0 +1,21 @@
+diff -uNr lib.ol/libproc/Makefile lib/libproc/Makefile
+--- lib.ol/libproc/Makefile	2011-11-02 14:02:17.000000000 +0000
++++ lib/libproc/Makefile	2011-11-02 14:03:09.000000000 +0000
+@@ -16,5 +16,6 @@
+ SHLIB_MAJOR=	2
+ 
+ WITHOUT_MAN=
++LDADD+=-lelf
+ 
+ .include <bsd.lib.mk>
+diff -uNr lib.ol/librtld_db/Makefile lib/librtld_db/Makefile
+--- lib.ol/librtld_db/Makefile	2011-11-02 14:02:13.000000000 +0000
++++ lib/librtld_db/Makefile	2011-11-02 14:04:00.000000000 +0000
+@@ -10,5 +10,7 @@
+ INCS=		rtld_db.h
+ 
+ CFLAGS+= -I${.CURDIR}
++LDADD+=-lutil -lproc
++LDFLAGS+=-L${.CURDIR}/../libutil -L${.CURDIR}/../libproc
+ 
+ .include <bsd.lib.mk>

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-opieincludes.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-opieincludes.patch
new file mode 100644
index 0000000..bf77a0a
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-opieincludes.patch
@@ -0,0 +1,122 @@
+Fixes warnings like:
+/var/tmp/portage/sys-freebsd/freebsd-lib-9.0-r2/work/lib/libopie/../../contrib/opie/libopie/randomchallenge.c:43:5:
+warning: incompatible implicit declaration of built-in function ‘strcpy’ 
+
+diff -uNr contrib.old/opie/libopie/accessfile.c contrib/opie/libopie/accessfile.c
+--- contrib.old/opie/libopie/accessfile.c	2012-05-25 08:54:33.000000000 -0400
++++ contrib/opie/libopie/accessfile.c	2012-05-25 09:12:34.000000000 -0400
+@@ -46,6 +46,7 @@
+ #ifdef DEBUG
+ #include <syslog.h>
+ #endif /* DEBUG */
++#include <ctype.h>
+ 
+ #include "opie.h"
+ 
+diff -uNr contrib.old/opie/libopie/generator.c contrib/opie/libopie/generator.c
+--- contrib.old/opie/libopie/generator.c	2012-05-25 08:54:33.000000000 -0400
++++ contrib/opie/libopie/generator.c	2012-05-25 08:58:10.000000000 -0400
+@@ -50,6 +50,7 @@
+ #include <syslog.h>
+ #endif /* DEBUG */
+ #include "opie.h"
++#include <stdio.h>
+ 
+ static char *algids[] = { NULL, NULL, NULL, "sha1", "md4", "md5" };
+ 
+diff -uNr contrib.old/opie/libopie/lookup.c contrib/opie/libopie/lookup.c
+--- contrib.old/opie/libopie/lookup.c	2012-05-25 08:54:33.000000000 -0400
++++ contrib/opie/libopie/lookup.c	2012-05-25 09:15:08.000000000 -0400
+@@ -14,6 +14,7 @@
+ #include "opie_cfg.h"
+ #include <stdio.h>
+ #include "opie.h"
++#include <string.h>
+ 
+ int opielookup FUNCTION((opie, principal), struct opie *opie AND char *principal)
+ {
+diff -uNr contrib.old/opie/libopie/newseed.c contrib/opie/libopie/newseed.c
+--- contrib.old/opie/libopie/newseed.c	2012-05-25 08:54:33.000000000 -0400
++++ contrib/opie/libopie/newseed.c	2012-05-25 09:14:37.000000000 -0400
+@@ -36,6 +36,9 @@
+ #include <syslog.h>
+ #endif /* DEBUG */
+ #include "opie.h"
++#include <stdio.h>
++#include <stdlib.h>
++#include <time.h>
+ 
+ int opienewseed FUNCTION((seed), char *seed)
+ {
+diff -uNr contrib.old/opie/libopie/parsechallenge.c contrib/opie/libopie/parsechallenge.c
+--- contrib.old/opie/libopie/parsechallenge.c	2012-05-25 08:54:33.000000000 -0400
++++ contrib/opie/libopie/parsechallenge.c	2012-05-25 09:15:54.000000000 -0400
+@@ -20,6 +20,8 @@
+ #include <string.h>
+ #endif /* HAVE_STRING_H */
+ #include "opie.h"
++#include <stdlib.h>
++#include <ctype.h>
+ 
+ struct algorithm {
+   char *name;
+diff -uNr contrib.old/opie/libopie/passwd.c contrib/opie/libopie/passwd.c
+--- contrib.old/opie/libopie/passwd.c	2012-05-25 08:54:33.000000000 -0400
++++ contrib/opie/libopie/passwd.c	2012-05-25 09:13:45.000000000 -0400
+@@ -22,6 +22,7 @@
+ 
+ #include "opie_cfg.h"
+ #include "opie.h"
++#include <string.h>
+ 
+ int opiepasswd FUNCTION((old, flags, principal, n, seed, ks), struct opie *old AND int flags AND char *principal AND int n AND char *seed AND char *ks)
+ {
+diff -uNr contrib.old/opie/libopie/randomchallenge.c contrib/opie/libopie/randomchallenge.c
+--- contrib.old/opie/libopie/randomchallenge.c	2012-05-25 08:54:33.000000000 -0400
++++ contrib/opie/libopie/randomchallenge.c	2012-05-25 09:00:27.000000000 -0400
+@@ -28,6 +28,9 @@
+ 
+ #include "opie_cfg.h"
+ #include "opie.h"
++#include <stdio.h>
++#include <string.h>
++#include <stdlib.h>
+ 
+ static char *algids[] = { 0, 0, 0, "sha1", "md4", "md5" };
+ 
+diff -uNr contrib.old/opie/libopie/verify.c contrib/opie/libopie/verify.c
+--- contrib.old/opie/libopie/verify.c	2012-05-25 08:54:33.000000000 -0400
++++ contrib/opie/libopie/verify.c	2012-05-25 09:12:09.000000000 -0400
+@@ -25,6 +25,7 @@
+ #include <string.h>
+ #endif /* HAVE_STRING_H */
+ #include "opie.h"
++#include <ctype.h>
+ 
+ #define RESPONSE_STANDARD  0
+ #define RESPONSE_WORD      1
+diff -uNr contrib.old/opie/libopie/version.c contrib/opie/libopie/version.c
+--- contrib.old/opie/libopie/version.c	2012-05-25 08:54:33.000000000 -0400
++++ contrib/opie/libopie/version.c	2012-05-25 09:13:15.000000000 -0400
+@@ -19,6 +19,8 @@
+ */
+ #include "opie_cfg.h"
+ #include "opie.h"
++#include <stdio.h>
++#include <stdlib.h>
+ 
+ VOIDRET opieversion FUNCTION_NOARGS
+ {
+diff -uNr contrib.old/opie/opie.h contrib/opie/opie.h
+--- contrib.old/opie/opie.h	2012-05-25 08:54:33.000000000 -0400
++++ contrib/opie/opie.h	2012-05-25 09:21:28.000000000 -0400
+@@ -158,6 +158,9 @@
+ int __opiereadrec __P((struct opie *));
+ int __opiewriterec __P((struct opie *));
+ int __opieparsechallenge __P((char *buffer, int *algorithm, int *sequence, char **seed, int *exts));
++VOIDRET opiehashlen FUNCTION((algorithm, in, out, n), int algorithm AND VOIDPTR in AND struct opie_otpkey *out AND int n);
++int opieinsecure FUNCTION_NOARGS;
++int opienewseed FUNCTION((seed), char *seed);
+ __END_DECLS
+ 
+ #define opiestrncpy(dst, src, n) \

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-trylock-adaptive.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-trylock-adaptive.patch
new file mode 100644
index 0000000..e72b171
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-trylock-adaptive.patch
@@ -0,0 +1,14 @@
+http://www.freebsd.org/cgi/query-pr.cgi?pr=168317
+
+Index: lib/libthr/thread/thr_mutex.c
+===================================================================
+--- lib/libthr/thread/thr_mutex.c	(revision 235924)
++++ lib/libthr/thread/thr_mutex.c	(working copy)
+@@ -538,6 +538,7 @@
+ 	switch (PMUTEX_TYPE(m->m_flags)) {
+ 	case PTHREAD_MUTEX_ERRORCHECK:
+ 	case PTHREAD_MUTEX_NORMAL:
++	case PTHREAD_MUTEX_ADAPTIVE_NP:
+ 		ret = EBUSY; 
+ 		break;
+ 

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml.patch
new file mode 100644
index 0000000..ec90def
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml.patch
@@ -0,0 +1,13 @@
+diff -u lib/libgeom/Makefile lib.xml/libgeom/Makefile
+--- lib/libgeom/Makefile	2004-03-07 16:07:57 +0000
++++ lib.xml/libgeom/Makefile	2005-05-06 10:38:41 +0000
+@@ -8,7 +8,8 @@
+ SRCS+=	geom_ctl.c
+ INCS=	libgeom.h
+ 
+-CFLAGS += -I${.CURDIR}
++CFLAGS += -I${.CURDIR} -I${.CURDIR}/../libexpat
++LDFLAGS += -L${.CURDIR}/../libexpat
+ 
+ WARNS?=	3
+ 

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml2expat.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml2expat.patch
new file mode 100644
index 0000000..1b4e791
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml2expat.patch
@@ -0,0 +1,26 @@
+diff -ur lib/libgeom.old/Makefile lib/libgeom/Makefile
+--- lib/libgeom.old/Makefile	2011-07-10 14:23:51.000000000 +0000
++++ lib/libgeom/Makefile	2011-07-10 15:12:39.000000000 +0000
+@@ -13,8 +13,8 @@
+ 
+ WARNS?=	3
+ 
+-DPADD=	${LIBBSDXML} ${LIBSBUF}
+-LDADD=	-lbsdxml -lsbuf
++DPADD=	${LIBSBUF}
++LDADD=	-lexpat -lsbuf
+ 
+ MAN=	libgeom.3
+ 
+diff -ur lib/libgeom.old/geom_xml2tree.c lib/libgeom/geom_xml2tree.c
+--- lib/libgeom.old/geom_xml2tree.c	2010-12-21 17:09:25.000000000 +0000
++++ lib/libgeom/geom_xml2tree.c	2011-07-10 15:12:52.000000000 +0000
+@@ -43,7 +43,7 @@
+ #include <sys/sbuf.h>
+ #include <sys/sysctl.h>
+ #include <err.h>
+-#include <bsdxml.h>
++#include <expat.h>
+ #include <libgeom.h>
+ 
+ struct mystate {

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-includes.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-includes.patch
new file mode 100644
index 0000000..c2cf142
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-includes.patch
@@ -0,0 +1,13 @@
+Fix headers dependencies so that they can be included alone.
+
+--- include/ifaddrs.h.old	2009-05-15 13:50:10 +0000
++++ include/ifaddrs.h	2009-05-15 13:50:23 +0000
+@@ -28,6 +28,8 @@
+ #ifndef	_IFADDRS_H_
+ #define	_IFADDRS_H_
+ 
++#include <sys/types.h>
++
+ struct ifaddrs {
+ 	struct ifaddrs  *ifa_next;
+ 	char		*ifa_name;

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-new_as.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-new_as.patch
new file mode 100644
index 0000000..c9288a4
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-new_as.patch
@@ -0,0 +1,68 @@
+--- lib/msun/i387/fenv.c.orig	2007-01-05 04:15:26 -0300
++++ lib/msun/i387/fenv.c	2008-06-14 00:49:30 -0300
+@@ -152,7 +152,8 @@
+ int
+ feupdateenv(const fenv_t *envp)
+ {
+-	int mxcsr, status;
++	int mxcsr;
++	short status;
+ 
+ 	__fnstsw(&status);
+ 	if (__HAS_SSE())
+--- lib/msun/i387/fenv.h.orig	2007-01-06 18:46:23 -0300
++++ lib/msun/i387/fenv.h	2008-06-14 01:06:40 -0300
+@@ -134,7 +134,8 @@
+ static __inline int
+ fegetexceptflag(fexcept_t *__flagp, int __excepts)
+ {
+-	int __mxcsr, __status;
++	int __mxcsr;
++	short __status;
+ 
+ 	__fnstsw(&__status);
+ 	if (__HAS_SSE())
+@@ -151,7 +152,8 @@
+ static __inline int
+ fetestexcept(int __excepts)
+ {
+-	int __mxcsr, __status;
++	int __mxcsr;
++	short __status;
+ 
+ 	__fnstsw(&__status);
+ 	if (__HAS_SSE())
+--- lib/msun/amd64/fenv.c.orig	2007-01-05 04:15:26 -0300
++++ lib/msun/amd64/fenv.c	2008-06-14 01:02:41 -0300
+@@ -101,7 +101,8 @@
+ int
+ feupdateenv(const fenv_t *envp)
+ {
+-	int mxcsr, status;
++	int mxcsr;
++	short status;
+ 
+ 	__fnstsw(&status);
+ 	__stmxcsr(&mxcsr);
+--- lib/msun/amd64/fenv.h.orig	2007-01-06 18:46:23 -0300
++++ lib/msun/amd64/fenv.h	2008-06-14 01:08:23 -0300
+@@ -110,7 +110,8 @@
+ static __inline int
+ fegetexceptflag(fexcept_t *__flagp, int __excepts)
+ {
+-	int __mxcsr, __status;
++	int __mxcsr;
++	short __status;
+ 
+ 	__stmxcsr(&__mxcsr);
+ 	__fnstsw(&__status);
+@@ -124,7 +125,8 @@
+ static __inline int
+ fetestexcept(int __excepts)
+ {
+-	int __mxcsr, __status;
++	int __mxcsr;
++	short __status;
+ 
+ 	__stmxcsr(&__mxcsr);
+ 	__fnstsw(&__status);

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-sources-9.0-sysctluint.patch b/sys-freebsd/freebsd-lib/files/freebsd-sources-9.0-sysctluint.patch
new file mode 100644
index 0000000..751a77c
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-sources-9.0-sysctluint.patch
@@ -0,0 +1,13 @@
+u_int is defined in sys/types.h
+makes header usable alone.
+
+--- sys/sys/sysctl.h.old	2012-05-25 11:08:53.000000000 -0400
++++ sys/sys/sysctl.h	2012-05-25 11:09:16.000000000 -0400
+@@ -788,6 +788,7 @@
+ 		    struct sysctl_req *);
+ #else	/* !_KERNEL */
+ #include <sys/cdefs.h>
++#include <sys/types.h> /* for u_int */
+ 
+ __BEGIN_DECLS
+ int	sysctl(const int *, u_int, void *, size_t *, const void *, size_t);

diff --git a/sys-freebsd/freebsd-lib/files/libmap.conf b/sys-freebsd/freebsd-lib/files/libmap.conf
new file mode 100644
index 0000000..7a879f9
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/libmap.conf
@@ -0,0 +1,8 @@
+# /etc/libmap.conf
+
+# Ensure that libthr does all threading
+libpthread.so.2         libthr.so.2
+libpthread.so           libthr.so
+libc_r.so.6             libthr.so.2
+libc_r.so               libthr.so
+

diff --git a/sys-freebsd/freebsd-lib/files/libusb.pc.in b/sys-freebsd/freebsd-lib/files/libusb.pc.in
new file mode 100644
index 0000000..f63c6e3
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/libusb.pc.in
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=@LIBDIR@
+includedir=${prefix}/include
+
+Name: libusb
+Description: USB access library (FreeBSD version)
+Version: 0.1.12
+Libs: -L${libdir} -lusb
+Cflags: -I${includedir}
+

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.1_rc1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.1_rc1.ebuild
new file mode 100644
index 0000000..39bb356
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.1_rc1.ebuild
@@ -0,0 +1,535 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit bsdmk freebsd flag-o-matic multilib toolchain-funcs eutils
+
+DESCRIPTION="FreeBSD's base system libraries"
+SLOT="0"
+KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+
+# Crypto is needed to have an internal OpenSSL header
+# sys is needed for libalias, probably we can just extract that instead of
+# extracting the whole tarball
+SRC_URI="mirror://gentoo/${LIB}.tar.bz2
+		mirror://gentoo/${CONTRIB}.tar.bz2
+		mirror://gentoo/${CRYPTO}.tar.bz2
+		mirror://gentoo/${LIBEXEC}.tar.bz2
+		mirror://gentoo/${ETC}.tar.bz2
+		mirror://gentoo/${INCLUDE}.tar.bz2
+		mirror://gentoo/${USBIN}.tar.bz2
+		mirror://gentoo/${GNU}.tar.bz2
+		build? (
+			mirror://gentoo/${SYS}.tar.bz2 )
+		zfs? (
+			mirror://gentoo/${CDDL}.tar.bz2 )"
+
+if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then
+	RDEPEND="ssl? ( dev-libs/openssl )
+		hesiod? ( net-dns/hesiod )
+		kerberos? ( virtual/krb5 )
+		usb? ( !dev-libs/libusb !dev-libs/libusbx )
+		userland_GNU? ( sys-apps/mtree )
+		zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )
+		>=dev-libs/expat-2.0.1
+		!sys-libs/libutempter
+		!sys-freebsd/freebsd-headers"
+	DEPEND="${RDEPEND}
+		>=sys-devel/flex-2.5.31-r2
+		=sys-freebsd/freebsd-sources-${RV}*
+		!bootstrap? ( app-arch/bzip2 )"
+else
+	SRC_URI="${SRC_URI}
+			mirror://gentoo/${SYS}.tar.bz2"
+fi
+
+DEPEND="${DEPEND}
+		=sys-freebsd/freebsd-mk-defs-${RV}*"
+
+S="${WORKDIR}/lib"
+
+export CTARGET=${CTARGET:-${CHOST}}
+if [ "${CTARGET}" = "${CHOST}" -a "${CATEGORY#*cross-}" != "${CATEGORY}" ]; then
+	export CTARGET=${CATEGORY/cross-}
+fi
+
+IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware
+	build bootstrap crosscompile_opts_headers-only zfs
+	userland_GNU userland_BSD multilib"
+
+pkg_setup() {
+	[ -c /dev/zero ] || \
+		die "You forgot to mount /dev; the compiled libc would break."
+
+	if ! use ssl && use kerberos; then
+		eerror "If you want kerberos support you need to enable ssl support, too."
+	fi
+
+	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
+	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
+	use hesiod || mymakeopts="${mymakeopts} WITHOUT_HESIOD= "
+	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6_SUPPORT= "
+	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= "
+	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
+	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
+	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
+	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
+
+	mymakeopts="${mymakeopts} WITHOUT_BIND= WITHOUT_BIND_LIBS= WITHOUT_SENDMAIL= WITHOUT_CLANG= "
+
+	if [ "${CTARGET}" != "${CHOST}" ]; then
+		mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})"
+		mymakeopts="${mymakeopts} MACHINE_ARCH=$(tc-arch-kernel ${CTARGET})"
+	fi
+}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.0-pmc.patch"
+	"${FILESDIR}/${PN}-6.0-gccfloat.patch"
+	"${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
+	"${FILESDIR}/${PN}-6.1-csu.patch"
+	"${FILESDIR}/${PN}-8.0-rpcsec_gss.patch"
+	"${FILESDIR}/${PN}-9.0-liblink.patch"
+	"${FILESDIR}/${PN}-bsdxml2expat.patch" )
+
+# Here we disable and remove source which we don't need or want
+# In order:
+# - ncurses stuff
+# - libexpat creates a bsdxml library which is the same as expat
+# - archiving libraries (have their own ebuild)
+# - sendmail libraries (they are installed by sendmail)
+# - SNMP library and dependency (have their own ebuilds)
+# - Clang (compiler_rt and blocksruntime)
+#
+# The rest are libraries we already have somewhere else because
+# they are contribution.
+# Note: libtelnet is an internal lib used by telnet and telnetd programs
+# as it's not used in freebsd-lib package itself, it's pointless building
+# it here.
+REMOVE_SUBDIRS="ncurses \
+	libexpat \
+	libz libbz2 libarchive liblzma \
+	libsm libsmdb libsmutil \
+	libbegemot libbsnmp \
+	libcompiler_rt libblocksruntime \
+	libpam libpcap bind libwrap libmagic \
+	libcom_err libtelnet
+	libelf libedit"
+
+# Are we building a cross-compiler?
+is_crosscompile() {
+	[ "${CATEGORY#*cross-}" != "${CATEGORY}" ]
+}
+
+src_prepare() {
+	sed -i.bak -e 's:-o/dev/stdout:-t:' "${S}/libc/net/Makefile.inc"
+
+	# Upstream Display Managers default to using VT7
+	# We should make FreeBSD allow this by default
+	local x=
+	for x in "${WORKDIR}"/etc/etc.*/ttys ; do
+		sed -i.bak \
+			-e '/ttyv5[[:space:]]/ a\
+# Display Managers default to VT7.\
+# If you use the xdm init script, keep ttyv6 commented out\
+# unless you force a different VT for the DM being used.' \
+			-e '/^ttyv[678][[:space:]]/ s/^/# /' "${x}" \
+			|| die "Failed to sed ${x}"
+		rm "${x}".bak
+	done
+
+	# This one is here because it also
+	# patches "${WORKDIR}/include"
+	cd "${WORKDIR}"
+	epatch "${FILESDIR}/${PN}-includes.patch"
+	epatch "${FILESDIR}/${PN}-8.0-gcc45.patch"
+	epatch "${FILESDIR}/${PN}-9.0-opieincludes.patch"
+
+	# Don't install the hesiod man page or header
+	rm "${WORKDIR}"/include/hesiod.h || die
+	sed -i.bak -e 's:hesiod.h::' "${WORKDIR}"/include/Makefile || die
+	sed -i.bak -e 's:hesiod.c::' -e 's:hesiod.3::' \
+	"${WORKDIR}"/lib/libc/net/Makefile.inc || die
+
+	# Fix the Makefiles of these few libraries that will overwrite our LDADD.
+	cd "${S}"
+	for dir in libradius libtacplus libcam libdevstat libfetch libgeom libmemstat libopie \
+		libsmb; do sed -i.bak -e 's:LDADD=:LDADD+=:g' "${dir}/Makefile" || \
+		die "Problem fixing \"${dir}/Makefile"
+	done
+	# Call LD with LDFLAGS, rename them to RAW_LDFLAGS
+	sed -e 's/LDFLAGS/RAW_LDFLAGS/g' \
+		-i "${S}/csu/i386-elf/Makefile" \
+		-i "${S}/csu/ia64/Makefile" || die
+	if use build; then
+		cd "${WORKDIR}"
+		# This patch has to be applied on ${WORKDIR}/sys, so we do it here since it
+		# shouldn't be a symlink to /usr/src/sys (which should be already patched)
+		epatch "${FILESDIR}"/${PN}-7.1-types.h-fix.patch
+		epatch "${FILESDIR}"/freebsd-sources-9.0-sysctluint.patch
+		return 0
+	fi
+
+	if ! is_crosscompile ; then
+		ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" || die "Couldn't make sys symlink!"
+	else
+		sed -i.bak -e "s:/usr/include:/usr/${CTARGET}/usr/include:g" \
+			"${S}/libc/rpc/Makefile.inc" \
+			"${S}/libc/yp/Makefile.inc"
+	fi
+
+	if install --version 2> /dev/null | grep -q GNU; then
+		sed -i.bak -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile"
+	fi
+
+	# Let arch-specific includes to be found
+	local machine
+	machine=$(tc-arch-kernel ${CTARGET})
+	ln -s "${WORKDIR}/sys/${machine}/include" "${WORKDIR}/include/machine" || \
+		die "Couldn't make ${machine}/include symlink."
+
+	cd "${S}"
+	use bootstrap && dummy_mk libstand
+	# Try to fix sed calls for GNU sed. Do it only with GNU userland and force
+	# BSD's sed on BSD.
+	if use userland_GNU; then
+		find . -name Makefile -exec sed -ibak 's/sed -i /sed -i/' {} \;
+	fi
+}
+
+get_csudir() {
+	if [ -d "${WORKDIR}/lib/csu/$1-elf" ]; then
+		echo "lib/csu/$1-elf"
+	else
+		echo "lib/csu/$1"
+	fi
+}
+
+bootstrap_csu() {
+	local csudir="$(get_csudir $(tc-arch-kernel ${CTARGET}))"
+	export RAW_LDFLAGS=$(raw-ldflags)
+	cd "${WORKDIR}/${csudir}" || die "Missing ${csudir}."
+	freebsd_src_compile
+
+	CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
+	append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
+}
+
+# Compile libssp_nonshared.a and add it's path to LDFLAGS.
+bootstrap_libssp_nonshared() {
+	cd "${WORKDIR}/gnu/lib/libssp/libssp_nonshared/" || die "missing libssp."
+	freebsd_src_compile
+	append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/libssp/libssp_nonshared/"
+	export LDADD="-lssp_nonshared"
+}
+
+# What to build for a non-native build: cross-compiler, non-native abi in
+# multilib. We also need the csu but this has to be handled separately.
+NON_NATIVE_SUBDIRS="lib/libc lib/msun gnu/lib/libssp/libssp_nonshared lib/libthr lib/libutil"
+
+# Subdirs for a native build:
+NATIVE_SUBDIRS="lib gnu/lib/libssp/libssp_nonshared gnu/lib/libregex"
+
+# Is my $ABI native ?
+is_native_abi() {
+	is_crosscompile && return 1
+	use multilib || return 0
+	[ "${ABI}" = "${DEFAULT_ABI}" ]
+}
+
+# Do we need to bootstrap the csu and libssp_nonshared?
+need_bootstrap() {
+	is_crosscompile || use build || ! is_native_abi || has_version "<${CATEGORY}/${P}"
+}
+
+# Get the subdirs we are building.
+get_subdirs() {
+	local ret=""
+	if is_native_abi ; then
+		# If we are building for the native ABI, build everything
+		ret="${NATIVE_SUBDIRS}"
+	elif is_crosscompile ; then
+		# With a cross-compiler we only build the very core parts.
+		ret="${NON_NATIVE_SUBDIRS}"
+		if [ "${EBUILD_PHASE}" = "install" ]; then
+			# Add the csu dir first when installing. We treat it separately for
+			# compiling.
+			ret="$(get_csudir $(tc-arch-kernel ${CTARGET})) ${ret}"
+		fi
+	elif use build ; then
+		# For the non-native ABIs we only build the csu parts and very core
+		# libraries for now.
+		ret="gnu/lib/libssp/libssp_nonshared"
+		if [ "${EBUILD_PHASE}" = "install" ]; then
+			ret="$(get_csudir $(tc-arch-kernel ${CHOST})) ${ret}"
+		fi
+	else
+		# Only build the csu parts and core libraries for now.
+		ret="gnu/lib/libssp/libssp_nonshared"
+		if [ "${EBUILD_PHASE}" = "install" ]; then
+			ret="$(get_csudir $(tc-arch-kernel ${CHOST})) ${ret}"
+		fi
+		# Finally, with a non-native ABI without USE=build, we build everything
+		# too.
+		#ret="${NATIVE_SUBDIRS}"
+	fi
+	echo "${ret}"
+}
+
+# Bootstrap the core libraries and setup the flags so that the other parts can
+# build against it.
+do_bootstrap() {
+	einfo "Bootstrapping on ${CHOST} for ${CTARGET}"
+	if ! is_crosscompile ; then
+		# Pre-install headers, but not when building a cross-compiler since we
+		# assume they have been installed in the previous pass.
+		einfo "Pre-installing includes in include_proper_${ABI}"
+		mkdir "${WORKDIR}/include_proper_${ABI}" || die
+		CTARGET="${CHOST}" install_includes "/include_proper_${ABI}"
+		CFLAGS="${CFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}"
+	fi
+	bootstrap_csu
+	bootstrap_libssp_nonshared
+}
+
+# Compile it. Assume we have the toolchain setup correctly.
+do_compile() {
+	export MAKEOBJDIRPREFIX="${WORKDIR}/${CHOST}"
+	mkdir "${MAKEOBJDIRPREFIX}" || die "Could not create ${MAKEOBJDIRPREFIX}."
+	need_bootstrap && do_bootstrap
+
+	export RAW_LDFLAGS=$(raw-ldflags)
+
+	#fixes bug 419477, multilib support
+	cd "${S}"
+	sed -i -e "s:^LDFLAGS+=.*:LDFLAGS+=-L ${MAKEOBJDIRPREFIX}/${S}/libgssapi:" \
+		librpcsec_gss/Makefile || die "Problem fixing \"librpcsec_gss/Makefile"
+	sed -i -e "s:^LDFLAGS+=.*:LDFLAGS+=-L ${MAKEOBJDIRPREFIX}/${S}/libutil -L ${MAKEOBJDIRPREFIX}/${S}/libproc:" \
+		librtld_db/Makefile || die "Problem fixing \"librtld_db/Makefile"
+
+	# Everything is now setup, build it!
+	for i in $(get_subdirs) ; do
+		einfo "Building in ${i}... with CC=${CC} and CFLAGS=${CFLAGS}"
+		cd "${WORKDIR}/${i}/" || die "missing ${i}."
+		freebsd_src_compile || die "make ${i} failed"
+	done
+}
+
+src_compile() {
+	# Does not work with GNU sed
+	# Force BSD's sed on BSD.
+	if use userland_BSD ; then
+		export ESED=/usr/bin/sed
+		unalias sed
+	fi
+
+	cd "${WORKDIR}/include"
+	$(freebsd_get_bmake) CC="$(tc-getCC)" || die "make include failed"
+
+	use crosscompile_opts_headers-only && return 0
+
+	# Bug #270098
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	# Bug #324445
+	append-flags $(test-flags -fno-strict-overflow)
+
+	# strip flags and do not do it later, we only add safe, and in fact
+	# needed flags after all
+	strip-flags
+	export NOFLAGSTRIP=yes
+	if is_crosscompile ; then
+		export YACC='yacc -by'
+		CHOST=${CTARGET} tc-export CC LD CXX RANLIB
+		mymakeopts="${mymakeopts} NLS="
+		append-flags "-I/usr/${CTARGET}/usr/include"
+		append-ldflags "-L${WORKDIR}/${CHOST}/${WORKDIR}/lib/libc"
+	fi
+
+	if is_crosscompile ; then
+		do_compile
+	else
+		for ABI in $(get_all_abis) ; do
+			# First, save the variables: CFLAGS, CXXFLAGS, LDFLAGS and mymakeopts.
+			for i in CFLAGS CXXFLAGS LDFLAGS mymakeopts ; do
+				export ${i}_SAVE="${!i}"
+			done
+
+			multilib_toolchain_setup ${ABI}
+
+			local target="$(tc-arch-kernel ${CHOST})"
+			mymakeopts="${mymakeopts} TARGET=${target} MACHINE=${target} MACHINE_ARCH=${target}"
+			CFLAGADD=""
+			if ! is_native_abi ; then
+				mymakeopts="${mymakeopts} COMPAT_32BIT="
+			else
+				use build || CFLAGS="${CFLAGS} -isystem /usr/include";
+			fi
+
+			einfo "Building for ABI ${ABI} and TARGET=$(tc-arch-kernel ${CHOST})"
+
+			CTARGET="${CHOST}" do_compile
+
+			# Restore the variables now.
+			for i in CFLAGS CXXFLAGS LDFLAGS mymakeopts ; do
+				ii="${i}_SAVE"
+				export ${i}="${!ii}"
+			done
+		done
+	fi
+}
+
+gen_libc_ldscript() {
+	# Parameters:
+	#   $1 = target libdir
+	#   $2 = source libc dir
+	#   $3 = source libssp_nonshared dir
+
+	# Clear the symlink.
+	rm -f "${D}/$2/libc.so" || die
+
+	# Move the library if needed
+	if [ "$1" != "$2" ] ; then
+		mv "${D}/$2/libc.so.7" "${D}/$1/" || die
+	fi
+
+	# Generate libc.so ldscript for inclusion of libssp_nonshared.a when linking
+	# this is done to avoid having to touch gcc spec file as it is currently
+	# done on FreeBSD upstream, mostly because their binutils aren't able to
+	# cope with linker scripts yet.
+	# Taken from toolchain-funcs.eclass:
+	local output_format
+	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
+	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
+
+	cat > "${D}/$2/libc.so" <<-END_LDSCRIPT
+/* GNU ld script
+   SSP (-fstack-protector) requires __stack_chk_fail_local to be local.
+   GCC invokes this symbol in a non-PIC way, which results in TEXTRELs if
+   this symbol was provided by a shared libc. So we link in
+   libssp_nonshared.a from here.
+ */
+${output_format}
+GROUP ( /$1/libc.so.7 /$3/libssp_nonshared.a )
+END_LDSCRIPT
+}
+
+do_install() {
+	export MAKEOBJDIRPREFIX="${WORKDIR}/${CHOST}"
+	for i in $(get_subdirs) ; do
+		einfo "Installing in ${i}..."
+		cd "${WORKDIR}/${i}/" || die "missing ${i}."
+		freebsd_src_install || die "Install ${i} failed"
+	done
+}
+
+src_install() {
+	[ "${CTARGET}" = "${CHOST}" ] \
+		&& INCLUDEDIR="/usr/include" \
+		|| INCLUDEDIR="/usr/${CTARGET}/usr/include"
+	dodir ${INCLUDEDIR}
+	einfo "Installing for ${CTARGET} in ${CHOST}.."
+	install_includes ${INCLUDEDIR}
+
+	use crosscompile_opts_headers-only && return 0
+	local mylibdir=$(get_libdir)
+
+	if is_crosscompile ; then
+		mymakeopts="${mymakeopts} NO_MAN= \
+			INCLUDEDIR=/usr/${CTARGET}/usr/include \
+			SHLIBDIR=/usr/${CTARGET}/usr/lib \
+			LIBDIR=/usr/${CTARGET}/usr/lib"
+
+		dosym "usr/include" "/usr/${CTARGET}/sys-include"
+		do_install
+	else
+		if ! use multilib ; then
+			# Set SHLIBDIR and LIBDIR for multilib
+			mymakeopts="${mymakeopts} SHLIBDIR=/usr/${mylibdir} LIBDIR=/usr/${mylibdir}"
+			do_install
+		else
+			for ABI in $(get_all_abis) ; do
+				mymakeopts_SAVE="${mymakeopts}"
+				multilib_toolchain_setup ${ABI}
+				mymakeopts="${mymakeopts} SHLIBDIR=/usr/$(get_libdir) LIBDIR=/usr/$(get_libdir)"
+				do_install
+				mymakeopts="${mymakeopts_SAVE}"
+			done
+		fi
+	fi
+
+	# Don't install the rest of the configuration files if crosscompiling
+	if is_crosscompile ; then
+		# This is to get it stripped with the correct tools, otherwise it gets
+		# stripped with the host strip.
+		# And also get the correct OUTPUT_FORMAT in the libc ldscript.
+		export CHOST=${CTARGET}
+		gen_libc_ldscript "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib"
+		return 0
+	fi
+
+	cd "${WORKDIR}/etc/"
+	insinto /etc
+	doins auth.conf nls.alias mac.conf netconfig
+
+	# Install ttys file
+	local MACHINE="$(tc-arch-kernel)"
+	doins "etc.${MACHINE}"/*
+
+	# Generate ldscripts for core libraries that will go in /
+	gen_usr_ldscript -a alias cam geom ipsec jail kiconv \
+		kvm m md procstat sbuf thr ufs util
+
+	gen_libc_ldscript "${mylibdir}" "usr/${mylibdir}" "usr/${mylibdir}"
+
+	# Install a libusb.pc for better compat with Linux's libusb
+	if use usb ; then
+		dodir /usr/$(get_libdir)/pkgconfig
+		sed -e "s:@LIBDIR@:/usr/$(get_libdir):" "${FILESDIR}/libusb.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/libusb.pc" || die
+	fi
+}
+
+install_includes()
+{
+	local INCLUDEDIR="$1"
+
+	# The idea is to be called from either install or unpack.
+	# During unpack it's required to install them as portage's user.
+	if [[ "${EBUILD_PHASE}" == "install" ]]; then
+		local DESTDIR="${D}"
+		BINOWN="root"
+		BINGRP="wheel"
+	else
+		local DESTDIR="${WORKDIR}"
+		[[ -z "${USER}" ]] && USER="portage"
+		BINOWN="${USER}"
+		[[ -z "${GROUPS}" ]] && GROUPS="portage"
+		BINGRP="${GROUPS}"
+	fi
+
+	# Must exist before we use it.
+	[[ -d "${DESTDIR}${INCLUDEDIR}" ]] || die "dodir or mkdir ${INCLUDEDIR} before using install_includes."
+	cd "${WORKDIR}/include"
+
+	local MACHINE="$(tc-arch-kernel)"
+
+	einfo "Installing includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
+	$(freebsd_get_bmake) installincludes \
+		MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
+		DESTDIR="${DESTDIR}" \
+		INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
+		BINGRP="${BINGRP}" || die "install_includes() failed"
+	einfo "includes installed ok."
+	EXTRA_INCLUDES="lib/librtld_db lib/libutil lib/msun gnu/lib/libregex"
+	for i in $EXTRA_INCLUDES; do
+		einfo "Installing $i includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
+		cd "${WORKDIR}/$i" || die
+		$(freebsd_get_bmake) installincludes DESTDIR="${DESTDIR}" \
+			MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
+			INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
+			BINGRP="${BINGRP}" || die "problem installing $i includes."
+		einfo "$i includes installed ok."
+	done
+}

[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-lib/, sys-freebsd/freebsd-lib/files/

[Alexis Ballier]

commit:     55145fbcf614ee6e537750c2b3371ef8315a1058
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 11 16:46:51 2012 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Sep 11 16:46:51 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=55145fbc

remove freebsd-lib, merged to the main tree

---
 sys-freebsd/freebsd-lib/Manifest                   |   45 --
 .../files/freebsd-lib-6.0-flex-2.5.31.patch        |   13 -
 .../files/freebsd-lib-6.0-gccfloat.patch           |   16 -
 .../freebsd-lib/files/freebsd-lib-6.0-pmc.patch    |   13 -
 .../freebsd-lib/files/freebsd-lib-6.1-csu.patch    |   20 -
 .../files/freebsd-lib-6.2-bluetooth.patch          |   11 -
 .../files/freebsd-lib-7.0-CVE-2008-1391.patch      |   11 -
 .../files/freebsd-lib-7.1-types.h-fix.patch        |   15 -
 .../files/freebsd-lib-7.2-rtldnoload.patch         |   30 --
 .../freebsd-lib/files/freebsd-lib-8.0-gcc45.patch  |   28 -
 .../freebsd-lib/files/freebsd-lib-8.0-log2.patch   |   21 -
 .../files/freebsd-lib-8.0-rpcsec_gss.patch         |   12 -
 .../files/freebsd-lib-8.2-liblink.patch            |   19 -
 .../files/freebsd-lib-8.2-nlm_syscall.patch        |   10 -
 .../files/freebsd-lib-9.0-liblink.patch            |   21 -
 .../files/freebsd-lib-9.0-opieincludes.patch       |  122 -----
 .../files/freebsd-lib-9.0-trylock-adaptive.patch   |   14 -
 .../freebsd-lib/files/freebsd-lib-bsdxml.patch     |   13 -
 .../files/freebsd-lib-bsdxml2expat.patch           |   26 -
 .../freebsd-lib/files/freebsd-lib-includes.patch   |   13 -
 .../freebsd-lib/files/freebsd-lib-new_as.patch     |   68 ---
 .../files/freebsd-sources-9.0-sysctluint.patch     |   13 -
 sys-freebsd/freebsd-lib/files/libmap.conf          |    8 -
 sys-freebsd/freebsd-lib/files/libusb.pc.in         |   11 -
 sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild  |  535 --------------------
 sys-freebsd/freebsd-lib/freebsd-lib-9.1_rc1.ebuild |  535 --------------------
 26 files changed, 0 insertions(+), 1643 deletions(-)

diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
deleted file mode 100644
index 0a0c6e3..0000000
--- a/sys-freebsd/freebsd-lib/Manifest
+++ /dev/null
@@ -1,45 +0,0 @@
-AUX freebsd-lib-6.0-flex-2.5.31.patch 421 RMD160 6ef83c6b09e31a81ba3c25772b02aef34540dbe8 SHA1 1408a36a967b0ff5ba94e23921357f4296e31bc2 SHA256 1d46cf13e1059ae3731ba5555764e020fcf4de7db5abf039fac83423e05d53c4
-AUX freebsd-lib-6.0-gccfloat.patch 542 RMD160 564f5a1b1aba59479c22f91570635de717e8b7bf SHA1 94f463f123fdc3009d4ca1d5ab351aa76d768c6b SHA256 d549125f174c86c2d5e7e1f1c99cf1303b84e91ce8ee51db8c962be48b7a7951
-AUX freebsd-lib-6.0-pmc.patch 338 RMD160 bb284cc2f9eafd3f65090087af215c3da679fefa SHA1 18343fc612bd231ec722b579dff61c887542b1c2 SHA256 36ca464f0aa1ed8784c8f1edc4a3580704c9a7813963684305250d806000075f
-AUX freebsd-lib-6.1-csu.patch 655 RMD160 d4fa9ade913ef3ce90351ae368f0944265eae2e4 SHA1 b165b704258d2ce600bcd2a900363d851a4a2a77 SHA256 e6fe72a4183227b275815a75eec9639321046dc1e02b80c507ae6bf902a58cf1
-AUX freebsd-lib-6.2-bluetooth.patch 243 RMD160 eaaeafc3f8305d4755070d9d1354289a140bf6a1 SHA1 6988dfc998b18efd7a91e86a827e921cdabf4997 SHA256 4c90cb6d45fa24a07e21255949f219cc561a94011f645c58bce2a68027db6658
-AUX freebsd-lib-7.0-CVE-2008-1391.patch 344 RMD160 44e20da80ab544895d8dd65b5c6bcdf693c2dd7a SHA1 50105f89d3296793857230a27f909f9c0d713293 SHA256 662a6f26d99257221fa686423fd9fe22862b827cd9ae146c2add5e5ac85290cc
-AUX freebsd-lib-7.1-types.h-fix.patch 371 RMD160 d514196ccf1ba246a158b5f421f009d96d2dd8c4 SHA1 b04bec25903446c20bdfd144796fe9924f9ba39f SHA256 9e745fcfe046c405a365d8d0db8763867f0a618952f7d6bab4c76a8c82273473
-AUX freebsd-lib-7.2-rtldnoload.patch 1037 RMD160 f7f0e833a4ba182f17731eb77ccd6dc8e39f8fad SHA1 2158d4a5183875d52acd0cd538630685d609fac6 SHA256 b9ba0e322f15d8761bb33cf9199b95cc61d6a9b5129d08399f49c89fdeaa095b
-AUX freebsd-lib-8.0-gcc45.patch 1264 RMD160 c2c6b5a3fa8efe0bcb3487cc71117a9411d18f73 SHA1 55e96a2f3a31f3a58ec5fc509a5d15ec47868773 SHA256 5288e313beffa0e50fc0301e859c59f1a95302d546d27eae50b97c4a98c81c4d
-AUX freebsd-lib-8.0-log2.patch 667 RMD160 63f115ff4262cbcb46377f7bfb2fc7a01167e50b SHA1 7daafed62b95bc8c2aeb19e3c0b1e697a152187d SHA256 dc421c3d92790da46360225de2dd4d707c314e962ecb95650799ee12f166a214
-AUX freebsd-lib-8.0-rpcsec_gss.patch 298 RMD160 155eeb638eedb291ea739ad64993817e5d985f7b SHA1 005d80f43b2558d1c8ecc41192b28e1dff53b39a SHA256 170d07c44d02a6b4dde1d0d209c57f3bbab567a5c4a592a82b270140a2a1d7f1
-AUX freebsd-lib-8.2-liblink.patch 510 RMD160 99364b405782a3cd7d7c4f84db9c74e976c0c8ba SHA1 54810b4414733691020ffd8db648fe46a8beef9f SHA256 38f967683e9d335ff7860150b2e6ae4d749266937ba195c6747d42d64c8e31ee
-AUX freebsd-lib-8.2-nlm_syscall.patch 385 RMD160 c3466ada961bd75248d0a62219898d5f936b33ce SHA1 a7bed1eff5f1cda67076b5661cf7ac3e8694ff82 SHA256 4b26be44718cb3deb7fb295d403e892ed73ceba7ba43499a889bd49a5e43852b
-AUX freebsd-lib-9.0-liblink.patch 627 RMD160 ea3f0d6f35457d70ee22461d5c6a5cf34285df93 SHA1 e4670e2c34f96f1e725ab10d3a38e2e6f742e7c5 SHA256 b0c71ae271e4a7a621bdf437254256afb80c3053961a8ad187ba28bc9084e813
-AUX freebsd-lib-9.0-opieincludes.patch 4495 RMD160 d7ffb8dbab8effbd0ca0b69708b99a9361ca3962 SHA1 848b66bd435a48d56e2e3593684ee9b30dd71d4f SHA256 0868e7454053170c3399f1a03a68f3e70410c79db865e7e2f2b51f5961b5718b
-AUX freebsd-lib-9.0-trylock-adaptive.patch 439 RMD160 056ea3082ef46645c5af0374aa092f8fe68221ae SHA1 759dc8dd9975a448c79f5fffafac1838ead91516 SHA256 af501c40124e628c2f739d88a4efa7ef3513694bd79ab44db30e4b3f73864612
-AUX freebsd-lib-bsdxml.patch 339 RMD160 27b501cda2ac76230a72dfc3ee6593cb50f8d4b0 SHA1 3b456d272de5d0c56bc650fe60f38524857f8b31 SHA256 c1ac47d6c7176475f0f4b86bb17288a980b44a799fb6f4e7b1920f69e0447dc9
-AUX freebsd-lib-bsdxml2expat.patch 708 RMD160 4a973e39a5860bd7b0fbba438302c65ec2b66e33 SHA1 95ed47baf5e189865d3989fad625a2160d2abe13 SHA256 0c3ec3657155c5032479181119c488d43a479ab0dfe7a7d7ed0dabce16853e85
-AUX freebsd-lib-includes.patch 316 RMD160 655d20a7a86715983469dbda678bca0ae726c069 SHA1 65cd796b0f8747d8d063b1f6e3ea53f82cdcdbe1 SHA256 be4dd4c905715c2d165be282cf377f799b32ccb76986947bc0bf1b5730b57b06
-AUX freebsd-lib-new_as.patch 1494 RMD160 36ac871434f9994d5a0d7e1b73765c055d49948a SHA1 10e2e6b7b27459548a17809ada287520e3ffeeea SHA256 6021f34246dcf768a94ffe7273ea2f5590adf6d82ce7fb555234f8012bdbd982
-AUX freebsd-sources-9.0-sysctluint.patch 403 RMD160 46bb18c424ea7011db86341e427fd095495c4bcc SHA1 9d3c1606c886d96a88c89283bc18a2717c87fc76 SHA256 884fbc5d6d3766ea3d4609946f56072f36f95368dc13ee316c330a46d42f0c9e
-AUX libmap.conf 201 RMD160 ad0ab6c08b5c541e0e45636dcbbaa468bbae2f95 SHA1 df81db07a94d988f1c41b4696b4d3b0058e73f83 SHA256 36a1bd56965f171cbb058f6e1762801e3b92c083fe36f6fe046bd669beed9742
-AUX libusb.pc.in 208 RMD160 13c7e5587c565453fc6a11d156da302fa7590ee0 SHA1 f0f9815fa27a8f1cf8405c1a8987df5d5d6a6b1b SHA256 9bfe398a335f8b9b1c3dd167ab0c9206fe3bdd4e1da318ece977e20f3c2d7c56
-DIST freebsd-cddl-9.0.tar.bz2 878299 RMD160 187504c1cd008c47d71a60be496eab62846bd3c8 SHA1 5eb6d065afe49ae48d1b3581038b30bf43532ca7 SHA256 80d2efbe5a0dcba98050e420ecc16c6fb8ad4c410c05424a5bf6800de58ced4b
-DIST freebsd-cddl-9.1_rc1.tar.bz2 910010 RMD160 54476d310621277b6d56ba6f7ffcff7bfe05dff2 SHA1 f92527d3dd6aa0278fb0882f3c633315c521ce49 SHA256 ac64b78bb3313d811d065bf1f4299897c3fd78d1f976eedf218ae361c56d0fd7
-DIST freebsd-contrib-9.0.tar.bz2 53993596 RMD160 b0e602dec32f4dc9ba29b132b3d27fb98fc95cb9 SHA1 e637f40d0f0ed2441b9a7737c88451e1327384c1 SHA256 5c7daec9f77bb295d9e65e35017fc625320423623e7e9bee98645a20f10ed14c
-DIST freebsd-contrib-9.1_rc1.tar.bz2 54330060 RMD160 9b455ff06a8a4ec62e8d5e4a3ae14243a41de7ec SHA1 b2f93389475bf368cac731f0f855a609c413d291 SHA256 b9be1e2328cd3cf5b7b010f033a1a4233e4df19bf305c6125f2442f56a895c9d
-DIST freebsd-crypto-9.0.tar.bz2 5669925 RMD160 fb0a5815254ad1aa601e621349059edcccd2c493 SHA1 a6b5e8cb3214adbeef10f9f39058bfabb0c00f95 SHA256 98f1a203d20c1a8884a04a0349d49c75f257dddfd71a4c3c60414d535dd782a8
-DIST freebsd-crypto-9.1_rc1.tar.bz2 5698339 RMD160 204562bf67e6352d183909cbbddfdd4e74f710ad SHA1 936937335e158c0f9b0eb864099d7f388d9015f2 SHA256 56299e9cb51d325cfa0ce2b5a23df61110384b917826ef7f75584421727be2f1
-DIST freebsd-etc-9.0.tar.bz2 207258 RMD160 67688c29d95270f03a43ed3f15f31bae1ccbe1c7 SHA1 03a7d766a451d61cb9a5677f3cf49f4ef62f706a SHA256 a4fe6ae59e966bdc3129613ebeb61d8247588125d2157855838f267a84c744d1
-DIST freebsd-etc-9.1_rc1.tar.bz2 205627 RMD160 dc9c4914ad9f76a1166d338bb550e2b55cc3a1e9 SHA1 faff7e4847dbb99dee1e6ab5c511f6244ee57058 SHA256 ac84b97965a359744b5171078476e4b5f024faaf13d61ebe2f8c43d2ea70c77b
-DIST freebsd-gnu-9.0.tar.bz2 783723 RMD160 f0776cb32a30f173acbebb4bedfc103c029769dc SHA1 f0db654d836ad03e06adc2a528a612fb14503930 SHA256 39d2215e97f321d08b3c1de9dd5572aa1fe0ae9577d5ed6d6b3dc9221bc33e2c
-DIST freebsd-gnu-9.1_rc1.tar.bz2 802034 RMD160 663b9e12ef05446be9f465dea292267745c94124 SHA1 9628e7a6f11c7f1dc3a4efa275d9a9515cb4619a SHA256 00bebcad9d87f06b0b33a1eac62d2345d258f47fca2b8aaba3b955c70d40e985
-DIST freebsd-include-9.0.tar.bz2 141657 RMD160 5ad8d85f5c1d8adef755684b704e21db5e7fbff5 SHA1 3b6304699da72b15754c0f1a9cc6594a0c26fee1 SHA256 bd0196dfeb7e491638f76d626dd02d122a7702bbddd7330f6aeb4f44e4c7dcf0
-DIST freebsd-include-9.1_rc1.tar.bz2 146409 RMD160 ced0903d8c1eff121e1b5c7acc8da946132227c0 SHA1 7cbaa00e333299eb8453ae551ac983f5333037f3 SHA256 c6febd4ace254d2109375d38c1ec4a960999aa62c1409c9ea9f2d336595d42c5
-DIST freebsd-lib-9.0.tar.bz2 3547388 RMD160 4b0de140bad6bb7fa9423d7d96ff695b0aba1ecd SHA1 6ffb802e0f8433b5a83128f55ead4e6759059a53 SHA256 920a4fdcdbcc980328bc2156e3e9d07353c3982db495f341b63815142cf6a03a
-DIST freebsd-lib-9.1_rc1.tar.bz2 3210622 RMD160 be2d13a21d9938eaa832c8ee3894e098979bd528 SHA1 d89ecc023712d91203f5c583400c2e76f313ab56 SHA256 afa4631d86c0e6bc1811199e1408bc8302a72808d6a0bffcf078e6d81d9a7a12
-DIST freebsd-libexec-9.0.tar.bz2 298680 RMD160 2f27821e1e9cccc409a6f4762957dcf851306237 SHA1 f8c023cf511f5b53724124f062bd9c8269353bb1 SHA256 2b259cdb01e520a875af2c04553dd096178aa6f243e11f7215e461ecd13c945e
-DIST freebsd-libexec-9.1_rc1.tar.bz2 310066 RMD160 4635555af871b887a3385605132af25cbf020eff SHA1 e259145ea2b1a6b68a8e0f7af9d08f48edc709b4 SHA256 e2b7d0c0583b3053b5a91b547576eca78f4035826f056534b17824126c4d4cb8
-DIST freebsd-sys-9.0.tar.bz2 30369960 RMD160 137ac728d78767eae184ac0bf00014d1bfeffc37 SHA1 cc09df384bd519ddf39254605a5ad80f702f3d68 SHA256 1c5e2181db9e92209933b1de9488109d88f0b2f15d07ee37aa491920e1990a54
-DIST freebsd-sys-9.1_rc1.tar.bz2 32435903 RMD160 14a7d3cec29ae5fb76e090563f15eb73e86d95a5 SHA1 c78a688b3156a136a6f9c9bf1035da878251d9ed SHA256 7c5e705cc9ca5efb60f9959a71315c118cb8cfe910c923c59a7f6180cfa86a0f
-DIST freebsd-usbin-9.0.tar.bz2 2608252 RMD160 fb070b602615289a849ec19d35b670bc2290423b SHA1 db82960e36f7585b25b09fa686328bcd9f7cfcb3 SHA256 384ab18281aa1afb39a0f98bcef0fc734840fd294b22b7d405b0d3eee8f835ea
-DIST freebsd-usbin-9.1_rc1.tar.bz2 2682082 RMD160 2b0286fc1fdc0e7cdf28bce44b30bc8e1e0e8dfc SHA1 5e172d3b02f632dbeab71fd2e2ba466c39c6a387 SHA256 81db21415611ed6ee0400e901e77bb7eaac9450ba06848f2e0c4d2cd8b695164
-EBUILD freebsd-lib-9.0-r3.ebuild 17211 RMD160 38e5f30c6407bab50d2775b77fc879f97e46516b SHA1 25b7a49e9e83b27d0bec49349a16d270c0824987 SHA256 4b06e34ecf076d35d041135cfe07ae76f40288de61d83ff966824cd1dc8d7926
-EBUILD freebsd-lib-9.1_rc1.ebuild 17198 RMD160 f97fca4ac58ad45c2b401d493d2e2c5dbe497fd7 SHA1 48c88d5a3f7e8285711f1377dfa179a32a958d0d SHA256 bbfc7cd976b580611e9a539a3d429ee01d21c9d7196ca359a0a8ed9797ea8ed5

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-flex-2.5.31.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-flex-2.5.31.patch
deleted file mode 100644
index 00de8a6..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-flex-2.5.31.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: fbsd-6/lib/libipsec/policy_token.l
-===================================================================
---- fbsd-6.orig/lib/libipsec/policy_token.l
-+++ fbsd-6/lib/libipsec/policy_token.l
-@@ -138,8 +138,6 @@ void
- __policy__strbuffer__init__(msg)
- 	char *msg;
- {
--	if (yy_current_buffer)
--		yy_delete_buffer(yy_current_buffer);
- 	strbuffer = (YY_BUFFER_STATE)yy_scan_string(msg);
- 	yy_switch_to_buffer(strbuffer);
- 

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-gccfloat.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-gccfloat.patch
deleted file mode 100644
index a3e7d5e..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-gccfloat.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-This patch is needed to avoid inclusion of GCC's float.h that defines
-LDBL_MANT_DIG at 53 (while the source file checks for 113 or 64.
-
-Index: freebsd-6.0_beta4/lib/msun/src/s_fmal.c
-===================================================================
---- freebsd-6.0_beta4.orig/lib/msun/src/s_fmal.c
-+++ freebsd-6.0_beta4/lib/msun/src/s_fmal.c
-@@ -28,7 +28,7 @@
- __FBSDID("$FreeBSD: src/lib/msun/src/s_fmal.c,v 1.2 2005/03/18 02:27:59 das Exp $");
- 
- #include <fenv.h>
--#include <float.h>
-+#include <machine/float.h>
- #include <math.h>
- 
- /*

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-pmc.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-pmc.patch
deleted file mode 100644
index 2f6de46..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-pmc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: freebsd-6.0_beta4/lib/libpmc/Makefile
-===================================================================
---- freebsd-6.0_beta4.orig/lib/libpmc/Makefile
-+++ freebsd-6.0_beta4/lib/libpmc/Makefile
-@@ -9,6 +9,8 @@ WARNS?=	6
- 
- MAN=	pmc.3 pmclog.3
- 
-+CFLAGS+= -I${.CURDIR}
-+
- MLINKS+= \
- 	pmc.3 pmc_allocate.3 \
- 	pmc.3 pmc_attach.3 \

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.1-csu.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.1-csu.patch
deleted file mode 100644
index 075f278..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.1-csu.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- lib/csu/amd64/Makefile.orig	2006-07-04 07:49:58 -0300
-+++ lib/csu/amd64/Makefile	2006-07-04 07:50:15 -0300
-@@ -16,6 +16,7 @@
- 	${CC} ${CFLAGS} -DGCRT -c -o gcrt1.o ${.CURDIR}/crt1.c
- 
- realinstall:
-+	${INSTALL} -d ${DESTDIR}${LIBDIR}
- 	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${OBJS} ${DESTDIR}${LIBDIR}
- 
---- lib/csu/sparc64/Makefile.orig	2006-10-06 15:13:55 +0100
-+++ lib/csu/sparc64/Makefile	2006-10-06 15:15:06 +0100
-@@ -15,6 +15,7 @@
- 	${CC} ${CFLAGS} -DGCRT -c -o gcrt1.o ${.ALLSRC}
- 
- realinstall:
-+	${INSTALL} -d ${DESTDIR}${LIBDIR}
- 	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${OBJS} ${DESTDIR}${LIBDIR}
- 

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.2-bluetooth.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.2-bluetooth.patch
deleted file mode 100644
index a9b8435..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.2-bluetooth.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/libsdp/Makefile	2007-06-15 12:04:37 +0200
-+++ lib.sdp/libsdp/Makefile	2007-06-15 12:26:14 +0200
-@@ -5,7 +5,7 @@
- MAN=		sdp.3
- 
- WARNS?=		2
--CFLAGS+=	-I${.CURDIR}
-+CFLAGS+=	-I${.CURDIR}  -I${.CURDIR}/../libbluetooth
- 
- SHLIB_MAJOR=	2
- 

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-7.0-CVE-2008-1391.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-7.0-CVE-2008-1391.patch
deleted file mode 100644
index 2b8d401..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-7.0-CVE-2008-1391.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/libc/stdlib/strfmon.c	2008/04/22 13:23:34
-+++ lib/libc/stdlib/strfmon.c	2008/04/24 07:49:00
-@@ -65,6 +65,8 @@
- #define GET_NUMBER(VAR)	do {					\
- 	VAR = 0;						\
- 	while (isdigit((unsigned char)*fmt)) {			\
-+		if (VAR > INT_MAX / 10)				\
-+			goto e2big_error;			\
- 		VAR *= 10;					\
- 		VAR += *fmt - '0';				\
- 		if (VAR < 0)					\

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-7.1-types.h-fix.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-7.1-types.h-fix.patch
deleted file mode 100644
index 8de5df2..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-7.1-types.h-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fixes a compile error if XOPEN_SOURCE 600 is defined.
-
-See: http://www.mailinglistarchive.com/freebsd-current@freebsd.org/msg15011.html
-
---- sys/sys/types.h.orig
-+++ sys/sys/types.h
-@@ -46,7 +46,7 @@
- 
- #include <sys/_pthreadtypes.h>
- 
--#if __BSD_VISIBLE
-+#ifndef _POSIX_SOURCE
- typedef	unsigned char	u_char;
- typedef	unsigned short	u_short;
- typedef	unsigned int	u_int;

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-7.2-rtldnoload.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-7.2-rtldnoload.patch
deleted file mode 100644
index 77bbe2e..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-7.2-rtldnoload.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Backported from 8.0.
-Even if RTLD_NOLOAD is not standard, dev-libs/nss expects it.
-Since it has made it to 8.0 we can afford backporting it.
-
---- include/dlfcn.h.old	2010-01-10 18:42:04 +0100
-+++ include/dlfcn.h	2010-01-10 18:42:19 +0100
-@@ -47,6 +47,7 @@
- #define	RTLD_GLOBAL	0x100	/* Make symbols globally available. */
- #define	RTLD_LOCAL	0	/* Opposite of RTLD_GLOBAL, and the default. */
- #define	RTLD_TRACE	0x200	/* Trace loaded objects and exit. */
-+#define	RTLD_NOLOAD	0x02000	/* Do not load if not already loaded. */
- 
- /*
-  * Request arguments for dlinfo().
---- lib/libc/gen/dlopen.3.old	2010-01-10 18:43:15 +0100
-+++ lib/libc/gen/dlopen.3	2010-01-10 18:45:27 +0100
-@@ -141,6 +141,13 @@
- With this flag
- .Fn dlopen
- will return to the caller only in the case of error.
-+.It Dv RTLD_NOLOAD
-+Only return valid handle for the object if it is already loaded in
-+the process address space, otherwise
-+.Dv NULL
-+is returned.
-+Other mode flags may be specified, which will be applied for promotion
-+for the found object.
- .El
- .Pp
- If

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-gcc45.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-gcc45.patch
deleted file mode 100644
index 2ddb9ea..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-gcc45.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Nur work.orig/include/rpcsvc/nis.x work/include/rpcsvc/nis.x
---- work.orig/include/rpcsvc/nis.x	2009-10-25 10:10:29.000000000 +0900
-+++ work/include/rpcsvc/nis.x	2011-04-13 21:25:13.000000000 +0900
-@@ -399,10 +399,7 @@
- %#define OARIGHTS(d, n) (((d)->do_armask.do_armask_val+n)->oa_rights)
- %#define WORLD_DEFAULT (NIS_READ_ACC)
- %#define GROUP_DEFAULT (NIS_READ_ACC << 8)
--%#define OWNER_DEFAULT ((NIS_READ_ACC +\
--			 NIS_MODIFY_ACC +\
--			 NIS_CREATE_ACC +\
--			 NIS_DESTROY_ACC) << 16)
-+%#define OWNER_DEFAULT ((NIS_READ_ACC + NIS_MODIFY_ACC + NIS_CREATE_ACC + NIS_DESTROY_ACC) << 16)
- %#define DEFAULT_RIGHTS (WORLD_DEFAULT | GROUP_DEFAULT | OWNER_DEFAULT)
- %
- %/* Result manipulation defines ... */
-@@ -431,10 +428,8 @@
- % * these definitions they take an nis_object *, and an int and return
- % * a u_char * for Value, and an int for length.
- % */
--%#define ENTRY_VAL(obj, col) \
--	(obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_val
--%#define ENTRY_LEN(obj, col) \
--	(obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_len
-+%#define ENTRY_VAL(obj, col) (obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_val
-+%#define ENTRY_LEN(obj, col) (obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_len
- %
- %#ifdef __cplusplus
- %}

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-log2.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-log2.patch
deleted file mode 100644
index a9fd189..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-log2.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-log2 and log2f are required by C99 and are not implemented.
-Workaround the deficiency.
-
---- lib/msun/src/math.h.old	2010-03-14 17:02:25.000000000 +0100
-+++ lib/msun/src/math.h	2010-03-14 17:07:03.000000000 +0100
-@@ -203,6 +203,7 @@
- double	frexp(double, int *);	/* fundamentally !__pure2 */
- double	ldexp(double, int);
- double	log(double);
-+#define log2(x) log(x)/log(2.0)
- double	log10(double);
- double	modf(double, double *);	/* fundamentally !__pure2 */
- 
-@@ -319,6 +320,7 @@
- float	log10f(float);
- float	log1pf(float);
- float	logf(float);
-+#define log2f(x) logf(x)/logf(2.0)
- float	modff(float, float *);	/* fundamentally !__pure2 */
- 
- float	powf(float, float);

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-rpcsec_gss.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-rpcsec_gss.patch
deleted file mode 100644
index 3b23387..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-rpcsec_gss.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Without this linking fails during a stage3 build.
-
---- lib/librpcsec_gss/Makefile.orig
-+++ lib/librpcsec_gss/Makefile
-@@ -8,6 +8,7 @@
- 
- DPADD+=	${LIBGSSAPI}
- LDADD+=	-lgssapi
-+LDFLAGS+= 	-L${.CURDIR}/../libgssapi
- 
- VERSION_DEF=	${.CURDIR}/../libc/Versions.def
- SYMBOL_MAPS=	${.CURDIR}/Symbol.map

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-liblink.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-liblink.patch
deleted file mode 100644
index c8be7f4..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-liblink.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- lib/libproc/Makefile.old	2011-07-06 00:58:04.000000000 +0000
-+++ lib/libproc/Makefile	2011-07-06 00:58:58.000000000 +0000
-@@ -18,5 +18,6 @@
- WARNS?=	6
- 
- WITHOUT_MAN=	yes
-+LDADD=-lelf
- 
- .include <bsd.lib.mk>
---- lib/librtld_db/Makefile.old	2011-07-06 00:58:12.000000000 +0000
-+++ lib/librtld_db/Makefile	2011-07-06 00:59:27.000000000 +0000
-@@ -10,5 +10,7 @@
- INCS=		rtld_db.h
- 
- CFLAGS+= -I${.CURDIR}
-+LDADD=-lutil -lproc
-+LDFLAGS+=-L${.CURDIR}/../libutil -L${.CURDIR}/../libproc
- 
- .include <bsd.lib.mk>

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-nlm_syscall.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-nlm_syscall.patch
deleted file mode 100644
index 556ade5..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-nlm_syscall.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- include/unistd.h	2010/12/20 20:39:49	216602
-+++ include/unistd.h	2010/12/20 21:12:18	216603
-@@ -529,6 +529,7 @@
- #define	_MKTEMP_DECLARED
- #endif
- int	 nfssvc(int, void *);
-+int	 nlm_syscall(int, int, int, char **);
- int	 profil(char *, size_t, vm_offset_t, int);
- int	 rcmd(char **, int, const char *, const char *, const char *, int *);
- int	 rcmd_af(char **, int, const char *,

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-liblink.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-liblink.patch
deleted file mode 100644
index 5d7526f..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-liblink.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -uNr lib.ol/libproc/Makefile lib/libproc/Makefile
---- lib.ol/libproc/Makefile	2011-11-02 14:02:17.000000000 +0000
-+++ lib/libproc/Makefile	2011-11-02 14:03:09.000000000 +0000
-@@ -16,5 +16,6 @@
- SHLIB_MAJOR=	2
- 
- WITHOUT_MAN=
-+LDADD+=-lelf
- 
- .include <bsd.lib.mk>
-diff -uNr lib.ol/librtld_db/Makefile lib/librtld_db/Makefile
---- lib.ol/librtld_db/Makefile	2011-11-02 14:02:13.000000000 +0000
-+++ lib/librtld_db/Makefile	2011-11-02 14:04:00.000000000 +0000
-@@ -10,5 +10,7 @@
- INCS=		rtld_db.h
- 
- CFLAGS+= -I${.CURDIR}
-+LDADD+=-lutil -lproc
-+LDFLAGS+=-L${.CURDIR}/../libutil -L${.CURDIR}/../libproc
- 
- .include <bsd.lib.mk>

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-opieincludes.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-opieincludes.patch
deleted file mode 100644
index bf77a0a..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-opieincludes.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-Fixes warnings like:
-/var/tmp/portage/sys-freebsd/freebsd-lib-9.0-r2/work/lib/libopie/../../contrib/opie/libopie/randomchallenge.c:43:5:
-warning: incompatible implicit declaration of built-in function ‘strcpy’ 
-
-diff -uNr contrib.old/opie/libopie/accessfile.c contrib/opie/libopie/accessfile.c
---- contrib.old/opie/libopie/accessfile.c	2012-05-25 08:54:33.000000000 -0400
-+++ contrib/opie/libopie/accessfile.c	2012-05-25 09:12:34.000000000 -0400
-@@ -46,6 +46,7 @@
- #ifdef DEBUG
- #include <syslog.h>
- #endif /* DEBUG */
-+#include <ctype.h>
- 
- #include "opie.h"
- 
-diff -uNr contrib.old/opie/libopie/generator.c contrib/opie/libopie/generator.c
---- contrib.old/opie/libopie/generator.c	2012-05-25 08:54:33.000000000 -0400
-+++ contrib/opie/libopie/generator.c	2012-05-25 08:58:10.000000000 -0400
-@@ -50,6 +50,7 @@
- #include <syslog.h>
- #endif /* DEBUG */
- #include "opie.h"
-+#include <stdio.h>
- 
- static char *algids[] = { NULL, NULL, NULL, "sha1", "md4", "md5" };
- 
-diff -uNr contrib.old/opie/libopie/lookup.c contrib/opie/libopie/lookup.c
---- contrib.old/opie/libopie/lookup.c	2012-05-25 08:54:33.000000000 -0400
-+++ contrib/opie/libopie/lookup.c	2012-05-25 09:15:08.000000000 -0400
-@@ -14,6 +14,7 @@
- #include "opie_cfg.h"
- #include <stdio.h>
- #include "opie.h"
-+#include <string.h>
- 
- int opielookup FUNCTION((opie, principal), struct opie *opie AND char *principal)
- {
-diff -uNr contrib.old/opie/libopie/newseed.c contrib/opie/libopie/newseed.c
---- contrib.old/opie/libopie/newseed.c	2012-05-25 08:54:33.000000000 -0400
-+++ contrib/opie/libopie/newseed.c	2012-05-25 09:14:37.000000000 -0400
-@@ -36,6 +36,9 @@
- #include <syslog.h>
- #endif /* DEBUG */
- #include "opie.h"
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <time.h>
- 
- int opienewseed FUNCTION((seed), char *seed)
- {
-diff -uNr contrib.old/opie/libopie/parsechallenge.c contrib/opie/libopie/parsechallenge.c
---- contrib.old/opie/libopie/parsechallenge.c	2012-05-25 08:54:33.000000000 -0400
-+++ contrib/opie/libopie/parsechallenge.c	2012-05-25 09:15:54.000000000 -0400
-@@ -20,6 +20,8 @@
- #include <string.h>
- #endif /* HAVE_STRING_H */
- #include "opie.h"
-+#include <stdlib.h>
-+#include <ctype.h>
- 
- struct algorithm {
-   char *name;
-diff -uNr contrib.old/opie/libopie/passwd.c contrib/opie/libopie/passwd.c
---- contrib.old/opie/libopie/passwd.c	2012-05-25 08:54:33.000000000 -0400
-+++ contrib/opie/libopie/passwd.c	2012-05-25 09:13:45.000000000 -0400
-@@ -22,6 +22,7 @@
- 
- #include "opie_cfg.h"
- #include "opie.h"
-+#include <string.h>
- 
- int opiepasswd FUNCTION((old, flags, principal, n, seed, ks), struct opie *old AND int flags AND char *principal AND int n AND char *seed AND char *ks)
- {
-diff -uNr contrib.old/opie/libopie/randomchallenge.c contrib/opie/libopie/randomchallenge.c
---- contrib.old/opie/libopie/randomchallenge.c	2012-05-25 08:54:33.000000000 -0400
-+++ contrib/opie/libopie/randomchallenge.c	2012-05-25 09:00:27.000000000 -0400
-@@ -28,6 +28,9 @@
- 
- #include "opie_cfg.h"
- #include "opie.h"
-+#include <stdio.h>
-+#include <string.h>
-+#include <stdlib.h>
- 
- static char *algids[] = { 0, 0, 0, "sha1", "md4", "md5" };
- 
-diff -uNr contrib.old/opie/libopie/verify.c contrib/opie/libopie/verify.c
---- contrib.old/opie/libopie/verify.c	2012-05-25 08:54:33.000000000 -0400
-+++ contrib/opie/libopie/verify.c	2012-05-25 09:12:09.000000000 -0400
-@@ -25,6 +25,7 @@
- #include <string.h>
- #endif /* HAVE_STRING_H */
- #include "opie.h"
-+#include <ctype.h>
- 
- #define RESPONSE_STANDARD  0
- #define RESPONSE_WORD      1
-diff -uNr contrib.old/opie/libopie/version.c contrib/opie/libopie/version.c
---- contrib.old/opie/libopie/version.c	2012-05-25 08:54:33.000000000 -0400
-+++ contrib/opie/libopie/version.c	2012-05-25 09:13:15.000000000 -0400
-@@ -19,6 +19,8 @@
- */
- #include "opie_cfg.h"
- #include "opie.h"
-+#include <stdio.h>
-+#include <stdlib.h>
- 
- VOIDRET opieversion FUNCTION_NOARGS
- {
-diff -uNr contrib.old/opie/opie.h contrib/opie/opie.h
---- contrib.old/opie/opie.h	2012-05-25 08:54:33.000000000 -0400
-+++ contrib/opie/opie.h	2012-05-25 09:21:28.000000000 -0400
-@@ -158,6 +158,9 @@
- int __opiereadrec __P((struct opie *));
- int __opiewriterec __P((struct opie *));
- int __opieparsechallenge __P((char *buffer, int *algorithm, int *sequence, char **seed, int *exts));
-+VOIDRET opiehashlen FUNCTION((algorithm, in, out, n), int algorithm AND VOIDPTR in AND struct opie_otpkey *out AND int n);
-+int opieinsecure FUNCTION_NOARGS;
-+int opienewseed FUNCTION((seed), char *seed);
- __END_DECLS
- 
- #define opiestrncpy(dst, src, n) \

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-trylock-adaptive.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-trylock-adaptive.patch
deleted file mode 100644
index e72b171..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-trylock-adaptive.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://www.freebsd.org/cgi/query-pr.cgi?pr=168317
-
-Index: lib/libthr/thread/thr_mutex.c
-===================================================================
---- lib/libthr/thread/thr_mutex.c	(revision 235924)
-+++ lib/libthr/thread/thr_mutex.c	(working copy)
-@@ -538,6 +538,7 @@
- 	switch (PMUTEX_TYPE(m->m_flags)) {
- 	case PTHREAD_MUTEX_ERRORCHECK:
- 	case PTHREAD_MUTEX_NORMAL:
-+	case PTHREAD_MUTEX_ADAPTIVE_NP:
- 		ret = EBUSY; 
- 		break;
- 

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml.patch
deleted file mode 100644
index ec90def..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -u lib/libgeom/Makefile lib.xml/libgeom/Makefile
---- lib/libgeom/Makefile	2004-03-07 16:07:57 +0000
-+++ lib.xml/libgeom/Makefile	2005-05-06 10:38:41 +0000
-@@ -8,7 +8,8 @@
- SRCS+=	geom_ctl.c
- INCS=	libgeom.h
- 
--CFLAGS += -I${.CURDIR}
-+CFLAGS += -I${.CURDIR} -I${.CURDIR}/../libexpat
-+LDFLAGS += -L${.CURDIR}/../libexpat
- 
- WARNS?=	3
- 

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml2expat.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml2expat.patch
deleted file mode 100644
index 1b4e791..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml2expat.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur lib/libgeom.old/Makefile lib/libgeom/Makefile
---- lib/libgeom.old/Makefile	2011-07-10 14:23:51.000000000 +0000
-+++ lib/libgeom/Makefile	2011-07-10 15:12:39.000000000 +0000
-@@ -13,8 +13,8 @@
- 
- WARNS?=	3
- 
--DPADD=	${LIBBSDXML} ${LIBSBUF}
--LDADD=	-lbsdxml -lsbuf
-+DPADD=	${LIBSBUF}
-+LDADD=	-lexpat -lsbuf
- 
- MAN=	libgeom.3
- 
-diff -ur lib/libgeom.old/geom_xml2tree.c lib/libgeom/geom_xml2tree.c
---- lib/libgeom.old/geom_xml2tree.c	2010-12-21 17:09:25.000000000 +0000
-+++ lib/libgeom/geom_xml2tree.c	2011-07-10 15:12:52.000000000 +0000
-@@ -43,7 +43,7 @@
- #include <sys/sbuf.h>
- #include <sys/sysctl.h>
- #include <err.h>
--#include <bsdxml.h>
-+#include <expat.h>
- #include <libgeom.h>
- 
- struct mystate {

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-includes.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-includes.patch
deleted file mode 100644
index c2cf142..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-includes.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Fix headers dependencies so that they can be included alone.
-
---- include/ifaddrs.h.old	2009-05-15 13:50:10 +0000
-+++ include/ifaddrs.h	2009-05-15 13:50:23 +0000
-@@ -28,6 +28,8 @@
- #ifndef	_IFADDRS_H_
- #define	_IFADDRS_H_
- 
-+#include <sys/types.h>
-+
- struct ifaddrs {
- 	struct ifaddrs  *ifa_next;
- 	char		*ifa_name;

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-new_as.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-new_as.patch
deleted file mode 100644
index c9288a4..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-new_as.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- lib/msun/i387/fenv.c.orig	2007-01-05 04:15:26 -0300
-+++ lib/msun/i387/fenv.c	2008-06-14 00:49:30 -0300
-@@ -152,7 +152,8 @@
- int
- feupdateenv(const fenv_t *envp)
- {
--	int mxcsr, status;
-+	int mxcsr;
-+	short status;
- 
- 	__fnstsw(&status);
- 	if (__HAS_SSE())
---- lib/msun/i387/fenv.h.orig	2007-01-06 18:46:23 -0300
-+++ lib/msun/i387/fenv.h	2008-06-14 01:06:40 -0300
-@@ -134,7 +134,8 @@
- static __inline int
- fegetexceptflag(fexcept_t *__flagp, int __excepts)
- {
--	int __mxcsr, __status;
-+	int __mxcsr;
-+	short __status;
- 
- 	__fnstsw(&__status);
- 	if (__HAS_SSE())
-@@ -151,7 +152,8 @@
- static __inline int
- fetestexcept(int __excepts)
- {
--	int __mxcsr, __status;
-+	int __mxcsr;
-+	short __status;
- 
- 	__fnstsw(&__status);
- 	if (__HAS_SSE())
---- lib/msun/amd64/fenv.c.orig	2007-01-05 04:15:26 -0300
-+++ lib/msun/amd64/fenv.c	2008-06-14 01:02:41 -0300
-@@ -101,7 +101,8 @@
- int
- feupdateenv(const fenv_t *envp)
- {
--	int mxcsr, status;
-+	int mxcsr;
-+	short status;
- 
- 	__fnstsw(&status);
- 	__stmxcsr(&mxcsr);
---- lib/msun/amd64/fenv.h.orig	2007-01-06 18:46:23 -0300
-+++ lib/msun/amd64/fenv.h	2008-06-14 01:08:23 -0300
-@@ -110,7 +110,8 @@
- static __inline int
- fegetexceptflag(fexcept_t *__flagp, int __excepts)
- {
--	int __mxcsr, __status;
-+	int __mxcsr;
-+	short __status;
- 
- 	__stmxcsr(&__mxcsr);
- 	__fnstsw(&__status);
-@@ -124,7 +125,8 @@
- static __inline int
- fetestexcept(int __excepts)
- {
--	int __mxcsr, __status;
-+	int __mxcsr;
-+	short __status;
- 
- 	__stmxcsr(&__mxcsr);
- 	__fnstsw(&__status);

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-sources-9.0-sysctluint.patch b/sys-freebsd/freebsd-lib/files/freebsd-sources-9.0-sysctluint.patch
deleted file mode 100644
index 751a77c..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-sources-9.0-sysctluint.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-u_int is defined in sys/types.h
-makes header usable alone.
-
---- sys/sys/sysctl.h.old	2012-05-25 11:08:53.000000000 -0400
-+++ sys/sys/sysctl.h	2012-05-25 11:09:16.000000000 -0400
-@@ -788,6 +788,7 @@
- 		    struct sysctl_req *);
- #else	/* !_KERNEL */
- #include <sys/cdefs.h>
-+#include <sys/types.h> /* for u_int */
- 
- __BEGIN_DECLS
- int	sysctl(const int *, u_int, void *, size_t *, const void *, size_t);

diff --git a/sys-freebsd/freebsd-lib/files/libmap.conf b/sys-freebsd/freebsd-lib/files/libmap.conf
deleted file mode 100644
index 7a879f9..0000000
--- a/sys-freebsd/freebsd-lib/files/libmap.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# /etc/libmap.conf
-
-# Ensure that libthr does all threading
-libpthread.so.2         libthr.so.2
-libpthread.so           libthr.so
-libc_r.so.6             libthr.so.2
-libc_r.so               libthr.so
-

diff --git a/sys-freebsd/freebsd-lib/files/libusb.pc.in b/sys-freebsd/freebsd-lib/files/libusb.pc.in
deleted file mode 100644
index f63c6e3..0000000
--- a/sys-freebsd/freebsd-lib/files/libusb.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=@LIBDIR@
-includedir=${prefix}/include
-
-Name: libusb
-Description: USB access library (FreeBSD version)
-Version: 0.1.12
-Libs: -L${libdir} -lusb
-Cflags: -I${includedir}
-

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild
deleted file mode 100644
index d812ba3..0000000
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild
+++ /dev/null
@@ -1,535 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit bsdmk freebsd flag-o-matic multilib toolchain-funcs eutils
-
-DESCRIPTION="FreeBSD's base system libraries"
-SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-
-# Crypto is needed to have an internal OpenSSL header
-# sys is needed for libalias, probably we can just extract that instead of
-# extracting the whole tarball
-SRC_URI="mirror://gentoo/${LIB}.tar.bz2
-		mirror://gentoo/${CONTRIB}.tar.bz2
-		mirror://gentoo/${CRYPTO}.tar.bz2
-		mirror://gentoo/${LIBEXEC}.tar.bz2
-		mirror://gentoo/${ETC}.tar.bz2
-		mirror://gentoo/${INCLUDE}.tar.bz2
-		mirror://gentoo/${USBIN}.tar.bz2
-		mirror://gentoo/${GNU}.tar.bz2
-		build? (
-			mirror://gentoo/${SYS}.tar.bz2 )
-		zfs? (
-			mirror://gentoo/${CDDL}.tar.bz2 )"
-
-if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then
-	RDEPEND="ssl? ( dev-libs/openssl )
-		hesiod? ( net-dns/hesiod )
-		kerberos? ( virtual/krb5 )
-		usb? ( !dev-libs/libusb !dev-libs/libusbx )
-		userland_GNU? ( sys-apps/mtree )
-		zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )
-		>=dev-libs/expat-2.0.1
-		!sys-libs/libutempter
-		!sys-freebsd/freebsd-headers"
-	DEPEND="${RDEPEND}
-		>=sys-devel/flex-2.5.31-r2
-		=sys-freebsd/freebsd-sources-${RV}*
-		!bootstrap? ( app-arch/bzip2 )"
-else
-	SRC_URI="${SRC_URI}
-			mirror://gentoo/${SYS}.tar.bz2"
-fi
-
-DEPEND="${DEPEND}
-		=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-S="${WORKDIR}/lib"
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [ "${CTARGET}" = "${CHOST}" -a "${CATEGORY#*cross-}" != "${CATEGORY}" ]; then
-	export CTARGET=${CATEGORY/cross-}
-fi
-
-IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware
-	build bootstrap crosscompile_opts_headers-only zfs
-	userland_GNU userland_BSD multilib"
-
-pkg_setup() {
-	[ -c /dev/zero ] || \
-		die "You forgot to mount /dev; the compiled libc would break."
-
-	if ! use ssl && use kerberos; then
-		eerror "If you want kerberos support you need to enable ssl support, too."
-	fi
-
-	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
-	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
-	use hesiod || mymakeopts="${mymakeopts} WITHOUT_HESIOD= "
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6_SUPPORT= "
-	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= "
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
-	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-
-	mymakeopts="${mymakeopts} WITHOUT_BIND= WITHOUT_BIND_LIBS= WITHOUT_SENDMAIL= WITHOUT_CLANG= "
-
-	if [ "${CTARGET}" != "${CHOST}" ]; then
-		mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})"
-		mymakeopts="${mymakeopts} MACHINE_ARCH=$(tc-arch-kernel ${CTARGET})"
-	fi
-}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.0-gccfloat.patch"
-	"${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
-	"${FILESDIR}/${PN}-6.1-csu.patch"
-	"${FILESDIR}/${PN}-8.0-rpcsec_gss.patch"
-	"${FILESDIR}/${PN}-9.0-liblink.patch"
-	"${FILESDIR}/${PN}-bsdxml2expat.patch"
-	"${FILESDIR}/${PN}-9.0-trylock-adaptive.patch" )
-
-# Here we disable and remove source which we don't need or want
-# In order:
-# - ncurses stuff
-# - libexpat creates a bsdxml library which is the same as expat
-# - archiving libraries (have their own ebuild)
-# - sendmail libraries (they are installed by sendmail)
-# - SNMP library and dependency (have their own ebuilds)
-# - Clang (compiler_rt and blocksruntime)
-#
-# The rest are libraries we already have somewhere else because
-# they are contribution.
-# Note: libtelnet is an internal lib used by telnet and telnetd programs
-# as it's not used in freebsd-lib package itself, it's pointless building
-# it here.
-REMOVE_SUBDIRS="ncurses \
-	libexpat \
-	libz libbz2 libarchive liblzma \
-	libsm libsmdb libsmutil \
-	libbegemot libbsnmp \
-	libcompiler_rt libblocksruntime \
-	libpam libpcap bind libwrap libmagic \
-	libcom_err libtelnet
-	libelf libedit"
-
-# Are we building a cross-compiler?
-is_crosscompile() {
-	[ "${CATEGORY#*cross-}" != "${CATEGORY}" ]
-}
-
-src_prepare() {
-	sed -i.bak -e 's:-o/dev/stdout:-t:' "${S}/libc/net/Makefile.inc"
-
-	# Upstream Display Managers default to using VT7
-	# We should make FreeBSD allow this by default
-	local x=
-	for x in "${WORKDIR}"/etc/etc.*/ttys ; do
-		sed -i.bak \
-			-e '/ttyv5[[:space:]]/ a\
-# Display Managers default to VT7.\
-# If you use the xdm init script, keep ttyv6 commented out\
-# unless you force a different VT for the DM being used.' \
-			-e '/^ttyv[678][[:space:]]/ s/^/# /' "${x}" \
-			|| die "Failed to sed ${x}"
-		rm "${x}".bak
-	done
-
-	# This one is here because it also
-	# patches "${WORKDIR}/include"
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}/${PN}-includes.patch"
-	epatch "${FILESDIR}/${PN}-8.0-gcc45.patch"
-	epatch "${FILESDIR}/${PN}-9.0-opieincludes.patch"
-
-	# Don't install the hesiod man page or header
-	rm "${WORKDIR}"/include/hesiod.h || die
-	sed -i.bak -e 's:hesiod.h::' "${WORKDIR}"/include/Makefile || die
-	sed -i.bak -e 's:hesiod.c::' -e 's:hesiod.3::' \
-	"${WORKDIR}"/lib/libc/net/Makefile.inc || die
-
-	# Fix the Makefiles of these few libraries that will overwrite our LDADD.
-	cd "${S}"
-	for dir in libradius libtacplus libcam libdevstat libfetch libgeom libmemstat libopie \
-		libsmb; do sed -i.bak -e 's:LDADD=:LDADD+=:g' "${dir}/Makefile" || \
-		die "Problem fixing \"${dir}/Makefile"
-	done
-	# Call LD with LDFLAGS, rename them to RAW_LDFLAGS
-	sed -e 's/LDFLAGS/RAW_LDFLAGS/g' \
-		-i "${S}/csu/i386-elf/Makefile" \
-		-i "${S}/csu/ia64/Makefile" || die
-	if use build; then
-		cd "${WORKDIR}"
-		# This patch has to be applied on ${WORKDIR}/sys, so we do it here since it
-		# shouldn't be a symlink to /usr/src/sys (which should be already patched)
-		epatch "${FILESDIR}"/${PN}-7.1-types.h-fix.patch
-		epatch "${FILESDIR}"/freebsd-sources-9.0-sysctluint.patch
-		return 0
-	fi
-
-	if ! is_crosscompile ; then
-		ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" || die "Couldn't make sys symlink!"
-	else
-		sed -i.bak -e "s:/usr/include:/usr/${CTARGET}/usr/include:g" \
-			"${S}/libc/rpc/Makefile.inc" \
-			"${S}/libc/yp/Makefile.inc"
-	fi
-
-	if install --version 2> /dev/null | grep -q GNU; then
-		sed -i.bak -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile"
-	fi
-
-	# Let arch-specific includes to be found
-	local machine
-	machine=$(tc-arch-kernel ${CTARGET})
-	ln -s "${WORKDIR}/sys/${machine}/include" "${WORKDIR}/include/machine" || \
-		die "Couldn't make ${machine}/include symlink."
-
-	cd "${S}"
-	use bootstrap && dummy_mk libstand
-	# Try to fix sed calls for GNU sed. Do it only with GNU userland and force
-	# BSD's sed on BSD.
-	if use userland_GNU; then
-		find . -name Makefile -exec sed -ibak 's/sed -i /sed -i/' {} \;
-	fi
-}
-
-get_csudir() {
-	if [ -d "${WORKDIR}/lib/csu/$1-elf" ]; then
-		echo "lib/csu/$1-elf"
-	else
-		echo "lib/csu/$1"
-	fi
-}
-
-bootstrap_csu() {
-	local csudir="$(get_csudir $(tc-arch-kernel ${CTARGET}))"
-	export RAW_LDFLAGS=$(raw-ldflags)
-	cd "${WORKDIR}/${csudir}" || die "Missing ${csudir}."
-	freebsd_src_compile
-
-	CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
-	append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
-}
-
-# Compile libssp_nonshared.a and add it's path to LDFLAGS.
-bootstrap_libssp_nonshared() {
-	cd "${WORKDIR}/gnu/lib/libssp/libssp_nonshared/" || die "missing libssp."
-	freebsd_src_compile
-	append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/libssp/libssp_nonshared/"
-	export LDADD="-lssp_nonshared"
-}
-
-# What to build for a non-native build: cross-compiler, non-native abi in
-# multilib. We also need the csu but this has to be handled separately.
-NON_NATIVE_SUBDIRS="lib/libc lib/msun gnu/lib/libssp/libssp_nonshared lib/libthr lib/libutil"
-
-# Subdirs for a native build:
-NATIVE_SUBDIRS="lib gnu/lib/libssp/libssp_nonshared gnu/lib/libregex"
-
-# Is my $ABI native ?
-is_native_abi() {
-	is_crosscompile && return 1
-	use multilib || return 0
-	[ "${ABI}" = "${DEFAULT_ABI}" ]
-}
-
-# Do we need to bootstrap the csu and libssp_nonshared?
-need_bootstrap() {
-	is_crosscompile || use build || ! is_native_abi || has_version "<${CATEGORY}/${P}"
-}
-
-# Get the subdirs we are building.
-get_subdirs() {
-	local ret=""
-	if is_native_abi ; then
-		# If we are building for the native ABI, build everything
-		ret="${NATIVE_SUBDIRS}"
-	elif is_crosscompile ; then
-		# With a cross-compiler we only build the very core parts.
-		ret="${NON_NATIVE_SUBDIRS}"
-		if [ "${EBUILD_PHASE}" = "install" ]; then
-			# Add the csu dir first when installing. We treat it separately for
-			# compiling.
-			ret="$(get_csudir $(tc-arch-kernel ${CTARGET})) ${ret}"
-		fi
-	elif use build ; then
-		# For the non-native ABIs we only build the csu parts and very core
-		# libraries for now.
-		ret="gnu/lib/libssp/libssp_nonshared"
-		if [ "${EBUILD_PHASE}" = "install" ]; then
-			ret="$(get_csudir $(tc-arch-kernel ${CHOST})) ${ret}"
-		fi
-	else
-		# Only build the csu parts and core libraries for now.
-		ret="gnu/lib/libssp/libssp_nonshared"
-		if [ "${EBUILD_PHASE}" = "install" ]; then
-			ret="$(get_csudir $(tc-arch-kernel ${CHOST})) ${ret}"
-		fi
-		# Finally, with a non-native ABI without USE=build, we build everything
-		# too.
-		#ret="${NATIVE_SUBDIRS}"
-	fi
-	echo "${ret}"
-}
-
-# Bootstrap the core libraries and setup the flags so that the other parts can
-# build against it.
-do_bootstrap() {
-	einfo "Bootstrapping on ${CHOST} for ${CTARGET}"
-	if ! is_crosscompile ; then
-		# Pre-install headers, but not when building a cross-compiler since we
-		# assume they have been installed in the previous pass.
-		einfo "Pre-installing includes in include_proper_${ABI}"
-		mkdir "${WORKDIR}/include_proper_${ABI}" || die
-		CTARGET="${CHOST}" install_includes "/include_proper_${ABI}"
-		CFLAGS="${CFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}"
-	fi
-	bootstrap_csu
-	bootstrap_libssp_nonshared
-}
-
-# Compile it. Assume we have the toolchain setup correctly.
-do_compile() {
-	export MAKEOBJDIRPREFIX="${WORKDIR}/${CHOST}"
-	mkdir "${MAKEOBJDIRPREFIX}" || die "Could not create ${MAKEOBJDIRPREFIX}."
-	need_bootstrap && do_bootstrap
-
-	export RAW_LDFLAGS=$(raw-ldflags)
-
-	#fixes bug 419477, multilib support
-	cd "${S}"
-	sed -i -e "s:^LDFLAGS+=.*:LDFLAGS+=-L ${MAKEOBJDIRPREFIX}/${S}/libgssapi:" \
-		librpcsec_gss/Makefile || die "Problem fixing \"librpcsec_gss/Makefile"
-	sed -i -e "s:^LDFLAGS+=.*:LDFLAGS+=-L ${MAKEOBJDIRPREFIX}/${S}/libutil -L ${MAKEOBJDIRPREFIX}/${S}/libproc:" \
-		librtld_db/Makefile || die "Problem fixing \"librtld_db/Makefile"
-
-	# Everything is now setup, build it!
-	for i in $(get_subdirs) ; do
-		einfo "Building in ${i}... with CC=${CC} and CFLAGS=${CFLAGS}"
-		cd "${WORKDIR}/${i}/" || die "missing ${i}."
-		freebsd_src_compile || die "make ${i} failed"
-	done
-}
-
-src_compile() {
-	# Does not work with GNU sed
-	# Force BSD's sed on BSD.
-	if use userland_BSD ; then
-		export ESED=/usr/bin/sed
-		unalias sed
-	fi
-
-	cd "${WORKDIR}/include"
-	$(freebsd_get_bmake) CC="$(tc-getCC)" || die "make include failed"
-
-	use crosscompile_opts_headers-only && return 0
-
-	# Bug #270098
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	# Bug #324445
-	append-flags $(test-flags -fno-strict-overflow)
-
-	# strip flags and do not do it later, we only add safe, and in fact
-	# needed flags after all
-	strip-flags
-	export NOFLAGSTRIP=yes
-	if is_crosscompile ; then
-		export YACC='yacc -by'
-		CHOST=${CTARGET} tc-export CC LD CXX RANLIB
-		mymakeopts="${mymakeopts} NLS="
-		append-flags "-I/usr/${CTARGET}/usr/include"
-		append-ldflags "-L${WORKDIR}/${CHOST}/${WORKDIR}/lib/libc"
-	fi
-
-	if is_crosscompile ; then
-		do_compile
-	else
-		for ABI in $(get_all_abis) ; do
-			# First, save the variables: CFLAGS, CXXFLAGS, LDFLAGS and mymakeopts.
-			for i in CFLAGS CXXFLAGS LDFLAGS mymakeopts ; do
-				export ${i}_SAVE="${!i}"
-			done
-
-			multilib_toolchain_setup ${ABI}
-
-			local target="$(tc-arch-kernel ${CHOST})"
-			mymakeopts="${mymakeopts} TARGET=${target} MACHINE=${target} MACHINE_ARCH=${target}"
-			CFLAGADD=""
-			if ! is_native_abi ; then
-				mymakeopts="${mymakeopts} COMPAT_32BIT="
-			else
-				use build || CFLAGS="${CFLAGS} -isystem /usr/include";
-			fi
-
-			einfo "Building for ABI ${ABI} and TARGET=$(tc-arch-kernel ${CHOST})"
-
-			CTARGET="${CHOST}" do_compile
-
-			# Restore the variables now.
-			for i in CFLAGS CXXFLAGS LDFLAGS mymakeopts ; do
-				ii="${i}_SAVE"
-				export ${i}="${!ii}"
-			done
-		done
-	fi
-}
-
-gen_libc_ldscript() {
-	# Parameters:
-	#   $1 = target libdir
-	#   $2 = source libc dir
-	#   $3 = source libssp_nonshared dir
-
-	# Clear the symlink.
-	rm -f "${D}/$2/libc.so" || die
-
-	# Move the library if needed
-	if [ "$1" != "$2" ] ; then
-		mv "${D}/$2/libc.so.7" "${D}/$1/" || die
-	fi
-
-	# Generate libc.so ldscript for inclusion of libssp_nonshared.a when linking
-	# this is done to avoid having to touch gcc spec file as it is currently
-	# done on FreeBSD upstream, mostly because their binutils aren't able to
-	# cope with linker scripts yet.
-	# Taken from toolchain-funcs.eclass:
-	local output_format
-	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
-	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
-
-	cat > "${D}/$2/libc.so" <<-END_LDSCRIPT
-/* GNU ld script
-   SSP (-fstack-protector) requires __stack_chk_fail_local to be local.
-   GCC invokes this symbol in a non-PIC way, which results in TEXTRELs if
-   this symbol was provided by a shared libc. So we link in
-   libssp_nonshared.a from here.
- */
-${output_format}
-GROUP ( /$1/libc.so.7 /$3/libssp_nonshared.a )
-END_LDSCRIPT
-}
-
-do_install() {
-	export MAKEOBJDIRPREFIX="${WORKDIR}/${CHOST}"
-	for i in $(get_subdirs) ; do
-		einfo "Installing in ${i}..."
-		cd "${WORKDIR}/${i}/" || die "missing ${i}."
-		freebsd_src_install || die "Install ${i} failed"
-	done
-}
-
-src_install() {
-	[ "${CTARGET}" = "${CHOST}" ] \
-		&& INCLUDEDIR="/usr/include" \
-		|| INCLUDEDIR="/usr/${CTARGET}/usr/include"
-	dodir ${INCLUDEDIR}
-	einfo "Installing for ${CTARGET} in ${CHOST}.."
-	install_includes ${INCLUDEDIR}
-
-	use crosscompile_opts_headers-only && return 0
-	local mylibdir=$(get_libdir)
-
-	if is_crosscompile ; then
-		mymakeopts="${mymakeopts} NO_MAN= \
-			INCLUDEDIR=/usr/${CTARGET}/usr/include \
-			SHLIBDIR=/usr/${CTARGET}/usr/lib \
-			LIBDIR=/usr/${CTARGET}/usr/lib"
-
-		dosym "usr/include" "/usr/${CTARGET}/sys-include"
-		do_install
-	else
-		if ! use multilib ; then
-			# Set SHLIBDIR and LIBDIR for multilib
-			mymakeopts="${mymakeopts} SHLIBDIR=/usr/${mylibdir} LIBDIR=/usr/${mylibdir}"
-			do_install
-		else
-			for ABI in $(get_all_abis) ; do
-				mymakeopts_SAVE="${mymakeopts}"
-				multilib_toolchain_setup ${ABI}
-				mymakeopts="${mymakeopts} SHLIBDIR=/usr/$(get_libdir) LIBDIR=/usr/$(get_libdir)"
-				do_install
-				mymakeopts="${mymakeopts_SAVE}"
-			done
-		fi
-	fi
-
-	# Don't install the rest of the configuration files if crosscompiling
-	if is_crosscompile ; then
-		# This is to get it stripped with the correct tools, otherwise it gets
-		# stripped with the host strip.
-		# And also get the correct OUTPUT_FORMAT in the libc ldscript.
-		export CHOST=${CTARGET}
-		gen_libc_ldscript "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib"
-		return 0
-	fi
-
-	cd "${WORKDIR}/etc/"
-	insinto /etc
-	doins auth.conf nls.alias mac.conf netconfig
-
-	# Install ttys file
-	local MACHINE="$(tc-arch-kernel)"
-	doins "etc.${MACHINE}"/*
-
-	# Generate ldscripts for core libraries that will go in /
-	gen_usr_ldscript -a alias cam geom ipsec jail kiconv \
-		kvm m md procstat sbuf thr ufs util
-
-	gen_libc_ldscript "${mylibdir}" "usr/${mylibdir}" "usr/${mylibdir}"
-
-	# Install a libusb.pc for better compat with Linux's libusb
-	if use usb ; then
-		dodir /usr/$(get_libdir)/pkgconfig
-		sed -e "s:@LIBDIR@:/usr/$(get_libdir):" "${FILESDIR}/libusb.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/libusb.pc" || die
-	fi
-}
-
-install_includes()
-{
-	local INCLUDEDIR="$1"
-
-	# The idea is to be called from either install or unpack.
-	# During unpack it's required to install them as portage's user.
-	if [[ "${EBUILD_PHASE}" == "install" ]]; then
-		local DESTDIR="${D}"
-		BINOWN="root"
-		BINGRP="wheel"
-	else
-		local DESTDIR="${WORKDIR}"
-		[[ -z "${USER}" ]] && USER="portage"
-		BINOWN="${USER}"
-		[[ -z "${GROUPS}" ]] && GROUPS="portage"
-		BINGRP="${GROUPS}"
-	fi
-
-	# Must exist before we use it.
-	[[ -d "${DESTDIR}${INCLUDEDIR}" ]] || die "dodir or mkdir ${INCLUDEDIR} before using install_includes."
-	cd "${WORKDIR}/include"
-
-	local MACHINE="$(tc-arch-kernel)"
-
-	einfo "Installing includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
-	$(freebsd_get_bmake) installincludes \
-		MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
-		DESTDIR="${DESTDIR}" \
-		INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
-		BINGRP="${BINGRP}" || die "install_includes() failed"
-	einfo "includes installed ok."
-	EXTRA_INCLUDES="lib/librtld_db lib/libutil lib/msun gnu/lib/libregex"
-	for i in $EXTRA_INCLUDES; do
-		einfo "Installing $i includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
-		cd "${WORKDIR}/$i" || die
-		$(freebsd_get_bmake) installincludes DESTDIR="${DESTDIR}" \
-			MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
-			INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
-			BINGRP="${BINGRP}" || die "problem installing $i includes."
-		einfo "$i includes installed ok."
-	done
-}

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.1_rc1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.1_rc1.ebuild
deleted file mode 100644
index 39bb356..0000000
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.1_rc1.ebuild
+++ /dev/null
@@ -1,535 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit bsdmk freebsd flag-o-matic multilib toolchain-funcs eutils
-
-DESCRIPTION="FreeBSD's base system libraries"
-SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-
-# Crypto is needed to have an internal OpenSSL header
-# sys is needed for libalias, probably we can just extract that instead of
-# extracting the whole tarball
-SRC_URI="mirror://gentoo/${LIB}.tar.bz2
-		mirror://gentoo/${CONTRIB}.tar.bz2
-		mirror://gentoo/${CRYPTO}.tar.bz2
-		mirror://gentoo/${LIBEXEC}.tar.bz2
-		mirror://gentoo/${ETC}.tar.bz2
-		mirror://gentoo/${INCLUDE}.tar.bz2
-		mirror://gentoo/${USBIN}.tar.bz2
-		mirror://gentoo/${GNU}.tar.bz2
-		build? (
-			mirror://gentoo/${SYS}.tar.bz2 )
-		zfs? (
-			mirror://gentoo/${CDDL}.tar.bz2 )"
-
-if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then
-	RDEPEND="ssl? ( dev-libs/openssl )
-		hesiod? ( net-dns/hesiod )
-		kerberos? ( virtual/krb5 )
-		usb? ( !dev-libs/libusb !dev-libs/libusbx )
-		userland_GNU? ( sys-apps/mtree )
-		zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )
-		>=dev-libs/expat-2.0.1
-		!sys-libs/libutempter
-		!sys-freebsd/freebsd-headers"
-	DEPEND="${RDEPEND}
-		>=sys-devel/flex-2.5.31-r2
-		=sys-freebsd/freebsd-sources-${RV}*
-		!bootstrap? ( app-arch/bzip2 )"
-else
-	SRC_URI="${SRC_URI}
-			mirror://gentoo/${SYS}.tar.bz2"
-fi
-
-DEPEND="${DEPEND}
-		=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-S="${WORKDIR}/lib"
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [ "${CTARGET}" = "${CHOST}" -a "${CATEGORY#*cross-}" != "${CATEGORY}" ]; then
-	export CTARGET=${CATEGORY/cross-}
-fi
-
-IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware
-	build bootstrap crosscompile_opts_headers-only zfs
-	userland_GNU userland_BSD multilib"
-
-pkg_setup() {
-	[ -c /dev/zero ] || \
-		die "You forgot to mount /dev; the compiled libc would break."
-
-	if ! use ssl && use kerberos; then
-		eerror "If you want kerberos support you need to enable ssl support, too."
-	fi
-
-	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
-	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
-	use hesiod || mymakeopts="${mymakeopts} WITHOUT_HESIOD= "
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6_SUPPORT= "
-	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= "
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
-	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-
-	mymakeopts="${mymakeopts} WITHOUT_BIND= WITHOUT_BIND_LIBS= WITHOUT_SENDMAIL= WITHOUT_CLANG= "
-
-	if [ "${CTARGET}" != "${CHOST}" ]; then
-		mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})"
-		mymakeopts="${mymakeopts} MACHINE_ARCH=$(tc-arch-kernel ${CTARGET})"
-	fi
-}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.0-pmc.patch"
-	"${FILESDIR}/${PN}-6.0-gccfloat.patch"
-	"${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
-	"${FILESDIR}/${PN}-6.1-csu.patch"
-	"${FILESDIR}/${PN}-8.0-rpcsec_gss.patch"
-	"${FILESDIR}/${PN}-9.0-liblink.patch"
-	"${FILESDIR}/${PN}-bsdxml2expat.patch" )
-
-# Here we disable and remove source which we don't need or want
-# In order:
-# - ncurses stuff
-# - libexpat creates a bsdxml library which is the same as expat
-# - archiving libraries (have their own ebuild)
-# - sendmail libraries (they are installed by sendmail)
-# - SNMP library and dependency (have their own ebuilds)
-# - Clang (compiler_rt and blocksruntime)
-#
-# The rest are libraries we already have somewhere else because
-# they are contribution.
-# Note: libtelnet is an internal lib used by telnet and telnetd programs
-# as it's not used in freebsd-lib package itself, it's pointless building
-# it here.
-REMOVE_SUBDIRS="ncurses \
-	libexpat \
-	libz libbz2 libarchive liblzma \
-	libsm libsmdb libsmutil \
-	libbegemot libbsnmp \
-	libcompiler_rt libblocksruntime \
-	libpam libpcap bind libwrap libmagic \
-	libcom_err libtelnet
-	libelf libedit"
-
-# Are we building a cross-compiler?
-is_crosscompile() {
-	[ "${CATEGORY#*cross-}" != "${CATEGORY}" ]
-}
-
-src_prepare() {
-	sed -i.bak -e 's:-o/dev/stdout:-t:' "${S}/libc/net/Makefile.inc"
-
-	# Upstream Display Managers default to using VT7
-	# We should make FreeBSD allow this by default
-	local x=
-	for x in "${WORKDIR}"/etc/etc.*/ttys ; do
-		sed -i.bak \
-			-e '/ttyv5[[:space:]]/ a\
-# Display Managers default to VT7.\
-# If you use the xdm init script, keep ttyv6 commented out\
-# unless you force a different VT for the DM being used.' \
-			-e '/^ttyv[678][[:space:]]/ s/^/# /' "${x}" \
-			|| die "Failed to sed ${x}"
-		rm "${x}".bak
-	done
-
-	# This one is here because it also
-	# patches "${WORKDIR}/include"
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}/${PN}-includes.patch"
-	epatch "${FILESDIR}/${PN}-8.0-gcc45.patch"
-	epatch "${FILESDIR}/${PN}-9.0-opieincludes.patch"
-
-	# Don't install the hesiod man page or header
-	rm "${WORKDIR}"/include/hesiod.h || die
-	sed -i.bak -e 's:hesiod.h::' "${WORKDIR}"/include/Makefile || die
-	sed -i.bak -e 's:hesiod.c::' -e 's:hesiod.3::' \
-	"${WORKDIR}"/lib/libc/net/Makefile.inc || die
-
-	# Fix the Makefiles of these few libraries that will overwrite our LDADD.
-	cd "${S}"
-	for dir in libradius libtacplus libcam libdevstat libfetch libgeom libmemstat libopie \
-		libsmb; do sed -i.bak -e 's:LDADD=:LDADD+=:g' "${dir}/Makefile" || \
-		die "Problem fixing \"${dir}/Makefile"
-	done
-	# Call LD with LDFLAGS, rename them to RAW_LDFLAGS
-	sed -e 's/LDFLAGS/RAW_LDFLAGS/g' \
-		-i "${S}/csu/i386-elf/Makefile" \
-		-i "${S}/csu/ia64/Makefile" || die
-	if use build; then
-		cd "${WORKDIR}"
-		# This patch has to be applied on ${WORKDIR}/sys, so we do it here since it
-		# shouldn't be a symlink to /usr/src/sys (which should be already patched)
-		epatch "${FILESDIR}"/${PN}-7.1-types.h-fix.patch
-		epatch "${FILESDIR}"/freebsd-sources-9.0-sysctluint.patch
-		return 0
-	fi
-
-	if ! is_crosscompile ; then
-		ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" || die "Couldn't make sys symlink!"
-	else
-		sed -i.bak -e "s:/usr/include:/usr/${CTARGET}/usr/include:g" \
-			"${S}/libc/rpc/Makefile.inc" \
-			"${S}/libc/yp/Makefile.inc"
-	fi
-
-	if install --version 2> /dev/null | grep -q GNU; then
-		sed -i.bak -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile"
-	fi
-
-	# Let arch-specific includes to be found
-	local machine
-	machine=$(tc-arch-kernel ${CTARGET})
-	ln -s "${WORKDIR}/sys/${machine}/include" "${WORKDIR}/include/machine" || \
-		die "Couldn't make ${machine}/include symlink."
-
-	cd "${S}"
-	use bootstrap && dummy_mk libstand
-	# Try to fix sed calls for GNU sed. Do it only with GNU userland and force
-	# BSD's sed on BSD.
-	if use userland_GNU; then
-		find . -name Makefile -exec sed -ibak 's/sed -i /sed -i/' {} \;
-	fi
-}
-
-get_csudir() {
-	if [ -d "${WORKDIR}/lib/csu/$1-elf" ]; then
-		echo "lib/csu/$1-elf"
-	else
-		echo "lib/csu/$1"
-	fi
-}
-
-bootstrap_csu() {
-	local csudir="$(get_csudir $(tc-arch-kernel ${CTARGET}))"
-	export RAW_LDFLAGS=$(raw-ldflags)
-	cd "${WORKDIR}/${csudir}" || die "Missing ${csudir}."
-	freebsd_src_compile
-
-	CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
-	append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
-}
-
-# Compile libssp_nonshared.a and add it's path to LDFLAGS.
-bootstrap_libssp_nonshared() {
-	cd "${WORKDIR}/gnu/lib/libssp/libssp_nonshared/" || die "missing libssp."
-	freebsd_src_compile
-	append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/libssp/libssp_nonshared/"
-	export LDADD="-lssp_nonshared"
-}
-
-# What to build for a non-native build: cross-compiler, non-native abi in
-# multilib. We also need the csu but this has to be handled separately.
-NON_NATIVE_SUBDIRS="lib/libc lib/msun gnu/lib/libssp/libssp_nonshared lib/libthr lib/libutil"
-
-# Subdirs for a native build:
-NATIVE_SUBDIRS="lib gnu/lib/libssp/libssp_nonshared gnu/lib/libregex"
-
-# Is my $ABI native ?
-is_native_abi() {
-	is_crosscompile && return 1
-	use multilib || return 0
-	[ "${ABI}" = "${DEFAULT_ABI}" ]
-}
-
-# Do we need to bootstrap the csu and libssp_nonshared?
-need_bootstrap() {
-	is_crosscompile || use build || ! is_native_abi || has_version "<${CATEGORY}/${P}"
-}
-
-# Get the subdirs we are building.
-get_subdirs() {
-	local ret=""
-	if is_native_abi ; then
-		# If we are building for the native ABI, build everything
-		ret="${NATIVE_SUBDIRS}"
-	elif is_crosscompile ; then
-		# With a cross-compiler we only build the very core parts.
-		ret="${NON_NATIVE_SUBDIRS}"
-		if [ "${EBUILD_PHASE}" = "install" ]; then
-			# Add the csu dir first when installing. We treat it separately for
-			# compiling.
-			ret="$(get_csudir $(tc-arch-kernel ${CTARGET})) ${ret}"
-		fi
-	elif use build ; then
-		# For the non-native ABIs we only build the csu parts and very core
-		# libraries for now.
-		ret="gnu/lib/libssp/libssp_nonshared"
-		if [ "${EBUILD_PHASE}" = "install" ]; then
-			ret="$(get_csudir $(tc-arch-kernel ${CHOST})) ${ret}"
-		fi
-	else
-		# Only build the csu parts and core libraries for now.
-		ret="gnu/lib/libssp/libssp_nonshared"
-		if [ "${EBUILD_PHASE}" = "install" ]; then
-			ret="$(get_csudir $(tc-arch-kernel ${CHOST})) ${ret}"
-		fi
-		# Finally, with a non-native ABI without USE=build, we build everything
-		# too.
-		#ret="${NATIVE_SUBDIRS}"
-	fi
-	echo "${ret}"
-}
-
-# Bootstrap the core libraries and setup the flags so that the other parts can
-# build against it.
-do_bootstrap() {
-	einfo "Bootstrapping on ${CHOST} for ${CTARGET}"
-	if ! is_crosscompile ; then
-		# Pre-install headers, but not when building a cross-compiler since we
-		# assume they have been installed in the previous pass.
-		einfo "Pre-installing includes in include_proper_${ABI}"
-		mkdir "${WORKDIR}/include_proper_${ABI}" || die
-		CTARGET="${CHOST}" install_includes "/include_proper_${ABI}"
-		CFLAGS="${CFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}"
-	fi
-	bootstrap_csu
-	bootstrap_libssp_nonshared
-}
-
-# Compile it. Assume we have the toolchain setup correctly.
-do_compile() {
-	export MAKEOBJDIRPREFIX="${WORKDIR}/${CHOST}"
-	mkdir "${MAKEOBJDIRPREFIX}" || die "Could not create ${MAKEOBJDIRPREFIX}."
-	need_bootstrap && do_bootstrap
-
-	export RAW_LDFLAGS=$(raw-ldflags)
-
-	#fixes bug 419477, multilib support
-	cd "${S}"
-	sed -i -e "s:^LDFLAGS+=.*:LDFLAGS+=-L ${MAKEOBJDIRPREFIX}/${S}/libgssapi:" \
-		librpcsec_gss/Makefile || die "Problem fixing \"librpcsec_gss/Makefile"
-	sed -i -e "s:^LDFLAGS+=.*:LDFLAGS+=-L ${MAKEOBJDIRPREFIX}/${S}/libutil -L ${MAKEOBJDIRPREFIX}/${S}/libproc:" \
-		librtld_db/Makefile || die "Problem fixing \"librtld_db/Makefile"
-
-	# Everything is now setup, build it!
-	for i in $(get_subdirs) ; do
-		einfo "Building in ${i}... with CC=${CC} and CFLAGS=${CFLAGS}"
-		cd "${WORKDIR}/${i}/" || die "missing ${i}."
-		freebsd_src_compile || die "make ${i} failed"
-	done
-}
-
-src_compile() {
-	# Does not work with GNU sed
-	# Force BSD's sed on BSD.
-	if use userland_BSD ; then
-		export ESED=/usr/bin/sed
-		unalias sed
-	fi
-
-	cd "${WORKDIR}/include"
-	$(freebsd_get_bmake) CC="$(tc-getCC)" || die "make include failed"
-
-	use crosscompile_opts_headers-only && return 0
-
-	# Bug #270098
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	# Bug #324445
-	append-flags $(test-flags -fno-strict-overflow)
-
-	# strip flags and do not do it later, we only add safe, and in fact
-	# needed flags after all
-	strip-flags
-	export NOFLAGSTRIP=yes
-	if is_crosscompile ; then
-		export YACC='yacc -by'
-		CHOST=${CTARGET} tc-export CC LD CXX RANLIB
-		mymakeopts="${mymakeopts} NLS="
-		append-flags "-I/usr/${CTARGET}/usr/include"
-		append-ldflags "-L${WORKDIR}/${CHOST}/${WORKDIR}/lib/libc"
-	fi
-
-	if is_crosscompile ; then
-		do_compile
-	else
-		for ABI in $(get_all_abis) ; do
-			# First, save the variables: CFLAGS, CXXFLAGS, LDFLAGS and mymakeopts.
-			for i in CFLAGS CXXFLAGS LDFLAGS mymakeopts ; do
-				export ${i}_SAVE="${!i}"
-			done
-
-			multilib_toolchain_setup ${ABI}
-
-			local target="$(tc-arch-kernel ${CHOST})"
-			mymakeopts="${mymakeopts} TARGET=${target} MACHINE=${target} MACHINE_ARCH=${target}"
-			CFLAGADD=""
-			if ! is_native_abi ; then
-				mymakeopts="${mymakeopts} COMPAT_32BIT="
-			else
-				use build || CFLAGS="${CFLAGS} -isystem /usr/include";
-			fi
-
-			einfo "Building for ABI ${ABI} and TARGET=$(tc-arch-kernel ${CHOST})"
-
-			CTARGET="${CHOST}" do_compile
-
-			# Restore the variables now.
-			for i in CFLAGS CXXFLAGS LDFLAGS mymakeopts ; do
-				ii="${i}_SAVE"
-				export ${i}="${!ii}"
-			done
-		done
-	fi
-}
-
-gen_libc_ldscript() {
-	# Parameters:
-	#   $1 = target libdir
-	#   $2 = source libc dir
-	#   $3 = source libssp_nonshared dir
-
-	# Clear the symlink.
-	rm -f "${D}/$2/libc.so" || die
-
-	# Move the library if needed
-	if [ "$1" != "$2" ] ; then
-		mv "${D}/$2/libc.so.7" "${D}/$1/" || die
-	fi
-
-	# Generate libc.so ldscript for inclusion of libssp_nonshared.a when linking
-	# this is done to avoid having to touch gcc spec file as it is currently
-	# done on FreeBSD upstream, mostly because their binutils aren't able to
-	# cope with linker scripts yet.
-	# Taken from toolchain-funcs.eclass:
-	local output_format
-	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
-	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
-
-	cat > "${D}/$2/libc.so" <<-END_LDSCRIPT
-/* GNU ld script
-   SSP (-fstack-protector) requires __stack_chk_fail_local to be local.
-   GCC invokes this symbol in a non-PIC way, which results in TEXTRELs if
-   this symbol was provided by a shared libc. So we link in
-   libssp_nonshared.a from here.
- */
-${output_format}
-GROUP ( /$1/libc.so.7 /$3/libssp_nonshared.a )
-END_LDSCRIPT
-}
-
-do_install() {
-	export MAKEOBJDIRPREFIX="${WORKDIR}/${CHOST}"
-	for i in $(get_subdirs) ; do
-		einfo "Installing in ${i}..."
-		cd "${WORKDIR}/${i}/" || die "missing ${i}."
-		freebsd_src_install || die "Install ${i} failed"
-	done
-}
-
-src_install() {
-	[ "${CTARGET}" = "${CHOST}" ] \
-		&& INCLUDEDIR="/usr/include" \
-		|| INCLUDEDIR="/usr/${CTARGET}/usr/include"
-	dodir ${INCLUDEDIR}
-	einfo "Installing for ${CTARGET} in ${CHOST}.."
-	install_includes ${INCLUDEDIR}
-
-	use crosscompile_opts_headers-only && return 0
-	local mylibdir=$(get_libdir)
-
-	if is_crosscompile ; then
-		mymakeopts="${mymakeopts} NO_MAN= \
-			INCLUDEDIR=/usr/${CTARGET}/usr/include \
-			SHLIBDIR=/usr/${CTARGET}/usr/lib \
-			LIBDIR=/usr/${CTARGET}/usr/lib"
-
-		dosym "usr/include" "/usr/${CTARGET}/sys-include"
-		do_install
-	else
-		if ! use multilib ; then
-			# Set SHLIBDIR and LIBDIR for multilib
-			mymakeopts="${mymakeopts} SHLIBDIR=/usr/${mylibdir} LIBDIR=/usr/${mylibdir}"
-			do_install
-		else
-			for ABI in $(get_all_abis) ; do
-				mymakeopts_SAVE="${mymakeopts}"
-				multilib_toolchain_setup ${ABI}
-				mymakeopts="${mymakeopts} SHLIBDIR=/usr/$(get_libdir) LIBDIR=/usr/$(get_libdir)"
-				do_install
-				mymakeopts="${mymakeopts_SAVE}"
-			done
-		fi
-	fi
-
-	# Don't install the rest of the configuration files if crosscompiling
-	if is_crosscompile ; then
-		# This is to get it stripped with the correct tools, otherwise it gets
-		# stripped with the host strip.
-		# And also get the correct OUTPUT_FORMAT in the libc ldscript.
-		export CHOST=${CTARGET}
-		gen_libc_ldscript "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib"
-		return 0
-	fi
-
-	cd "${WORKDIR}/etc/"
-	insinto /etc
-	doins auth.conf nls.alias mac.conf netconfig
-
-	# Install ttys file
-	local MACHINE="$(tc-arch-kernel)"
-	doins "etc.${MACHINE}"/*
-
-	# Generate ldscripts for core libraries that will go in /
-	gen_usr_ldscript -a alias cam geom ipsec jail kiconv \
-		kvm m md procstat sbuf thr ufs util
-
-	gen_libc_ldscript "${mylibdir}" "usr/${mylibdir}" "usr/${mylibdir}"
-
-	# Install a libusb.pc for better compat with Linux's libusb
-	if use usb ; then
-		dodir /usr/$(get_libdir)/pkgconfig
-		sed -e "s:@LIBDIR@:/usr/$(get_libdir):" "${FILESDIR}/libusb.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/libusb.pc" || die
-	fi
-}
-
-install_includes()
-{
-	local INCLUDEDIR="$1"
-
-	# The idea is to be called from either install or unpack.
-	# During unpack it's required to install them as portage's user.
-	if [[ "${EBUILD_PHASE}" == "install" ]]; then
-		local DESTDIR="${D}"
-		BINOWN="root"
-		BINGRP="wheel"
-	else
-		local DESTDIR="${WORKDIR}"
-		[[ -z "${USER}" ]] && USER="portage"
-		BINOWN="${USER}"
-		[[ -z "${GROUPS}" ]] && GROUPS="portage"
-		BINGRP="${GROUPS}"
-	fi
-
-	# Must exist before we use it.
-	[[ -d "${DESTDIR}${INCLUDEDIR}" ]] || die "dodir or mkdir ${INCLUDEDIR} before using install_includes."
-	cd "${WORKDIR}/include"
-
-	local MACHINE="$(tc-arch-kernel)"
-
-	einfo "Installing includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
-	$(freebsd_get_bmake) installincludes \
-		MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
-		DESTDIR="${DESTDIR}" \
-		INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
-		BINGRP="${BINGRP}" || die "install_includes() failed"
-	einfo "includes installed ok."
-	EXTRA_INCLUDES="lib/librtld_db lib/libutil lib/msun gnu/lib/libregex"
-	for i in $EXTRA_INCLUDES; do
-		einfo "Installing $i includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
-		cd "${WORKDIR}/$i" || die
-		$(freebsd_get_bmake) installincludes DESTDIR="${DESTDIR}" \
-			MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
-			INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
-			BINGRP="${BINGRP}" || die "problem installing $i includes."
-		einfo "$i includes installed ok."
-	done
-}