From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 42C5A1381F3 for ; Wed, 23 Oct 2013 11:10:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2EF72E0ABB; Wed, 23 Oct 2013 11:10:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 80B67E0AB7 for ; Wed, 23 Oct 2013 11:10:54 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4F08233EE7D for ; Wed, 23 Oct 2013 11:10:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 09DF2E545D for ; Wed, 23 Oct 2013 11:10:52 +0000 (UTC) From: "Yuta SATOH" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Yuta SATOH" Message-ID: <1382526627.a08151501b89c867fb6deb094b257fe15ab37194.yuta_satoh@gentoo> Subject: [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-lib/, sys-freebsd/freebsd-lib/files/ X-VCS-Repository: proj/gentoo-bsd X-VCS-Files: sys-freebsd/freebsd-lib/Manifest sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libusb.patch sys-freebsd/freebsd-lib/freebsd-lib-10.9999_p256420.ebuild X-VCS-Directories: sys-freebsd/freebsd-lib/ sys-freebsd/freebsd-lib/files/ X-VCS-Committer: yuta_satoh X-VCS-Committer-Name: Yuta SATOH X-VCS-Revision: a08151501b89c867fb6deb094b257fe15ab37194 X-VCS-Branch: master Date: Wed, 23 Oct 2013 11:10:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 47177c9c-24f4-403c-ba8b-3d0440654070 X-Archives-Hash: cfd1a7eae7275334d83cb55d8d979153 commit: a08151501b89c867fb6deb094b257fe15ab37194 Author: Yuta SATOH gentoo gr jp> AuthorDate: Wed Oct 23 11:10:27 2013 +0000 Commit: Yuta SATOH 0x100 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 \