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

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

[Yuta SATOH]

commit:     9a24825000ea17da823d1912a08f1f247d0ca005
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Fri Sep 20 13:04:41 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Fri Sep 20 13:04:41 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=9a248250

added freebsd-usbin-9999-bsdxml2expat.patch

---
 sys-freebsd/freebsd-usbin/Manifest                 |  3 ++-
 .../files/freebsd-usbin-9999-bsdxml2expat.patch    | 24 ++++++++++++++++++++++
 .../freebsd-usbin-9999_p255619.ebuild              |  2 +-
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/sys-freebsd/freebsd-usbin/Manifest b/sys-freebsd/freebsd-usbin/Manifest
index 3c32c1d..003eeef 100644
--- a/sys-freebsd/freebsd-usbin/Manifest
+++ b/sys-freebsd/freebsd-usbin/Manifest
@@ -1,5 +1,6 @@
 AUX freebsd-usbin-9.0-newsyslog.patch 507 SHA256 d5f910655c66a3e766f227c25837347d11d796655d71480c3cf3526f4136d557 SHA512 5423fc577035c2a272d4cb4305c5ee5e1e910a68af44595524665f7b867bd0a48bab0349b2fa13eabc385b2ec29c8f578d018cd8196f3ad20a13a68d36a335ae WHIRLPOOL 0551fde1581f3642535d1e34f2b111ed1404fc153ed14f4d7d4c75bc96715ed1eb3f218fc55fb2bb038616a929e106b8d8355f2de95447f7a93c09c515cdd511
 AUX freebsd-usbin-9.1-bsdxml2expat.patch 431 SHA256 43f0ebe5406f6065d7dad45b4270f0645e7dc1d6db1bcdf1443e32aede9d7af6 SHA512 ef1e9be49796b50e8dd818ac1a6f363eaa54d767ac9477e3df09354df78dff887a31a3c793288f321b7976bd98de79821742550ee8e7f9fcf3b1a42cccbc68b0 WHIRLPOOL 17c14ef758cede73619f774710afd38862609da6302e0d2378e7b5124d38dd60c427218f140f67e1ea255a24f7eb6d900df1ad5835d23a135cef7cb5cc94bc73
+AUX freebsd-usbin-9999-bsdxml2expat.patch 835 SHA256 765ab05ef6d5d828d2cc54e78e0676dc2b6caac7193788524a7dd4cc5a983c8c SHA512 23bcfdc1657c1dd7fdb59c3717af5a5560c8f3c10d498aaae539e1779838a0a33cf247ae806c72c09d298fc9be3c02b5c3d1d9f1a879493c0e5d1aeb4dbf3509 WHIRLPOOL 2342438a26ef915f29d487aecedfd0920baa6c2130b3efd6fbd64d7a2bf81f74444e7409ceaceb29d4c5ad210af4cee0a4d98b0935131ff577a6103023f83f44
 AUX freebsd-usbin-adduser.patch 428 SHA256 2e91737ffefd3b7ce3b55da4ce98eb0425961bba2d4a7c4e7c7ffabc1d38f2af SHA512 51720e3db9bf3728afc0dc370a469746cb1bf61623c44a20c58e27d647e5a5d0360145b1d174382176d803f2558afa2f2a29eca6c85c638529d0e11e2859c0c3 WHIRLPOOL 15a5a7e2c123a3103546134a27baad0a459758ec66bb0a7011684f367c7dd46435688f837d9d5fb5a9a51e95a58d6ce0e672c57a9dc2ef16a1e094a4b6e78931
 AUX moused.confd 827 SHA256 7c15a534c0b10a553848b13e1fccd27fad1684ddc1b252133269257e864d769e SHA512 88919d638fe67ce8c8a43e470851eafd3ff8185a44e67b175d43107fa030721c91d7ac4e2959326aa3910e6788f59d851598edfda593515e3571ba42df564a4f WHIRLPOOL bf2065b2d39ae534349c4186b1d7e254ed7bbf96bddcaf92453f79265f73de6e09a0f9a55a3eadd31f57e110dbfbe380cf51930136ea3eec6f6b80761ec6d3bb
 AUX moused.initd 1783 SHA256 84f2d221ce16f5ffce43170fdcf86675dae79a776e1f2abf3b1b490b585f6d0e SHA512 eb5465ab4f9fc94bfb70c56ad144fed79cbe604d1970ea1c56f050afc42fe9fb8e605e58c7924e82de1ffc0f32994a94e23a11cdb75db4e855bb7f67dc81b499 WHIRLPOOL 9f37fcef86e2a9797090e2e4d62f0a73f8cf20736b5b798f1f4435734f067b3cb298f25f2d0581b23f5bd6e92c1944dbf566f5828608040691f4ad547a687d36
@@ -18,4 +19,4 @@ AUX syscons.confd 464 SHA256 7e566edb81fef49b662ad6b84dd0bf4657d5f05efe9791a515b
 AUX syscons.initd 1711 SHA256 16f5ab3ceb67accc10350d21527321c1e559c432f0b52e7b3adf08b67d9f62aa SHA512 41fef393e1fe732de065cb9ac3fdb4bbe73158a86f7c8b6175b496d0a65b9c682d888ce7b34c8a43732909c12626a2f5783457607e4b9bf6b4210589c3397d76 WHIRLPOOL 7a11eed37860db8dce71ad09299bd48427cf2beb349da3799189ef93d4d5c618b4c33b51e60f17cb485989dd3e0480458f5559c61deaa3f542f920df43f89801
 AUX syslogd.initd 571 SHA256 3f0f242197be7c59f36edffd36918935189d17ca7d8f5c2de6238c7a7f52d005 SHA512 0c67138b2461ba3629a7aa87dca35357ee17f2a1c1c13e1951417f4c05054ad006efb7f98dcf7fa24f0b90e0c0331e6fb7d1e3459c1db17f1bc82baa63b3beeb WHIRLPOOL e8dc6a0f402a474bb98c5d4a9a21b331a2a55726d517411c2b7c7adec28219e5a538ebb448c6c27dd1540affb914e935e91160cb0795ca6eb624f4ee163b0e9d
 EBUILD freebsd-usbin-9.9999.ebuild 5492 SHA256 2b9a464f14211c948286939b4ad3c262847cbc3a4f0c00160c7bcf58bf3f7e01 SHA512 3803166af8a0fb30647c739902ac3a5658cd98411d79e369068564b1ee90c2185d1ef7e07a14553977f8ffb0025b58dea5b8ecc275170a54399d3a0b1ae4bb92 WHIRLPOOL bf16a610b7463ee7ba692736d74c7085ffa0ff9ddd7cfed137bf5754ff016761664a8cf3c41336e50c1d6b00403f7215da5a136b236a672f4b8e20e12f856c72
-EBUILD freebsd-usbin-9999_p255619.ebuild 5472 SHA256 bacfc22fb009e43a586ef3b65fba43986e3e2637656d7722bb3fbb511f460e60 SHA512 74d04d9561f3d9677ca051e9963ddb0591f7850e10e69f470d05873744dc39679ea6651377976287f06d78fa009f9083905591f10a52b62ddaf062c0e8bb5ef3 WHIRLPOOL 59943ee38925bd889bb381cda98ae2955f6aa21e7388c5616522b82dbbe8a49bee19e7d8235bcb3cabf227ac137cd979ac2e7737d04ef77e419e542f491e0e6c
+EBUILD freebsd-usbin-9999_p255619.ebuild 5473 SHA256 8bccd3d4bafaa07230dced49abacd86d78174317a208880c08b1fea5e90075f7 SHA512 b0f1dbed0fc8f955df57a6376c98ebb0d34e850eb16f8855002000457d2ad60479cb96e60281ffd8cd7f85aa703a8263d93182909e0559821a98a8afc101d0ad WHIRLPOOL 209782468da9921088ce144a0f4f00272b7291338919c210f8321b9cf1fc05571fe3ab547ca3682a9b948c2cdb27dc39e3acf362ef0dbc43c12b6da295db8fc5

diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9999-bsdxml2expat.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9999-bsdxml2expat.patch
new file mode 100644
index 0000000..a84f96d
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9999-bsdxml2expat.patch
@@ -0,0 +1,24 @@
+diff -Nur work.orig/usr.sbin/ctladm/ctladm.c work/usr.sbin/ctladm/ctladm.c
+--- work.orig/usr.sbin/ctladm/ctladm.c	2012-07-12 13:25:58.000000000 +0900
++++ work/usr.sbin/ctladm/ctladm.c	2012-07-16 05:37:14.000000000 +0900
+@@ -60,7 +60,7 @@
+ #include <errno.h>
+ #include <err.h>
+ #include <ctype.h>
+-#include <bsdxml.h>
++#include <expat.h>
+ #include <cam/scsi/scsi_all.h>
+ #include <cam/scsi/scsi_message.h>
+ #include <cam/ctl/ctl.h>
+diff -Nur work.orig/usr.sbin/ctld/kernel.c work/usr.sbin/ctld/kernel.c
+--- work.orig/usr.sbin/ctld/kernel.c	2013-09-20 21:55:45.000000000 +0900
++++ work/usr.sbin/ctld/kernel.c	2013-09-20 22:01:17.000000000 +0900
+@@ -45,7 +45,7 @@
+ #include <sys/sbuf.h>
+ #include <sys/capability.h>
+ #include <assert.h>
+-#include <bsdxml.h>
++#include <expat.h>
+ #include <ctype.h>
+ #include <errno.h>
+ #include <fcntl.h>

diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-9999_p255619.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-9999_p255619.ebuild
index 9eddc16..0a6fc2a 100644
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-9999_p255619.ebuild
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-9999_p255619.ebuild
@@ -70,7 +70,7 @@ pkg_setup() {
 PATCHES=(
 	"${FILESDIR}/${PN}-adduser.patch"
 	"${FILESDIR}/${PN}-9.0-newsyslog.patch"
-	"${FILESDIR}/${PN}-9.1-bsdxml2expat.patch"
+	"${FILESDIR}/${PN}-9999-bsdxml2expat.patch"
 	)
 
 REMOVE_SUBDIRS="