diff options
| author |   Yuta SATOH <nigoro.dev@gmail.com> | 2016-10-03 20:21:09 +0900 |
|---|---|---|
| committer | Yuta SATOH <nigoro.dev@gmail.com> | 2016-10-03 20:21:09 +0900 |
| commit | 0821460d6a35dd331a721b8ffe9b2017f32598ca (patch) | |
| tree | 6c6fa4b002a28c069addd0135c638ff2d0d8bfec | |
| parent | sys-freebsd/freebsd-sources: add WITHOUT_FORMAT_EXTENSIONS=. (diff) | |
| download | gentoo-bsd-0821460d6a35dd331a721b8ffe9b2017f32598ca.tar.gz gentoo-bsd-0821460d6a35dd331a721b8ffe9b2017f32598ca.tar.bz2 gentoo-bsd-0821460d6a35dd331a721b8ffe9b2017f32598ca.zip | |
Drop unnecessary mk files, and put all of mk to /usr/share/mk/system for sys-freebsd/*
| -rw-r--r-- | eclass/freebsd.eclass | 10 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-mk-defs/Manifest | 2 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild | 15 |
3 files changed, 23 insertions, 4 deletions
diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass index 1e141da..0e6ad01 100644 --- a/eclass/freebsd.eclass +++ b/eclass/freebsd.eclass @@ -102,7 +102,15 @@ doperiodic() { freebsd_get_bmake() { local bmake bmake=$(get_bmake) - [[ ${CBUILD} == *-freebsd* ]] || bmake="${bmake} -m /usr/share/mk/freebsd" + if version_is_at_least 11.0 ${RV} ; then + if [[ ${CBUILD} == *-freebsd* ]] ; then + bmake="${bmake} -m /usr/share/mk/system" + else + bmake="${bmake} -m /usr/share/mk/freebsd/system" + fi + else + [[ ${CBUILD} == *-freebsd* ]] || bmake="${bmake} -m /usr/share/mk/freebsd" + fi echo "${bmake}" } diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest index 798a003..a9c3535 100644 --- a/sys-freebsd/freebsd-mk-defs/Manifest +++ b/sys-freebsd/freebsd-mk-defs/Manifest @@ -10,5 +10,5 @@ AUX freebsd-mk-defs-9.1-gentoo.patch 11769 SHA256 d9f0585ecdbaec0483d9443543974f AUX freebsd-mk-defs-9.1-gnu.patch 2273 SHA256 6b8ebbfd2ff724099d593a00dc226ca7f2e12020a9afcf0602b3098b95a2bb18 SHA512 b1537d3c9dcac78de5ddc026b1281887f755990a4a164e9f05cee53acfc1d7f2674ab1dfb4345b3862bdf971d9403e677e0900fb64a4e7b200c38b8d06c64fbd WHIRLPOOL 91b7e4a43f5f83fdd3c9bbaa9a2a82ab28373cca6050e7f558baa67fcc39983be84d43e64b17949c4ed3066c0b2e27d409b4cf18c930e4de793a4f41a54a10e6 AUX freebsd-mk-defs-add-nossp-cflags.patch 1017 SHA256 fa9f47aa7bee35feee0462b6c91995f648143384c547326bcec3b58f69d3db5b SHA512 012897f4f4b4c3f71d1288ab57adeed56d7f399e508cfa4f593a1f787443e3e4752f7002c86f5da65952ac57eb908d0cce751d7b029048b1c70a9b3c79bea913 WHIRLPOOL 98c8fd10f85e9b2e780ef639de932caaa68ae4da50d7417601ae3366d119445364d15307016561b11fa91e4849a0ba45599a85b988702688e15ebd44457883c1 DIST freebsd-src-11.0.tar.xz 139318840 SHA256 faaab4f70862f9a7cad781544516094298441b75230a02c45f6e19fbc5f888ba SHA512 4d1960e5a157ee5fa9a905157062455f1fbfe1259fb78244479b349afd4e0231d890c6bad20d30ee003676e24c59b608bd65e7626515524d78eff3fc04572a88 WHIRLPOOL 023e169b0efbb761270b5ff7fbfab144ee9d2a70af7ead2c91249e0e930472ee89565a0d755ec7fd64e06c0c1a1a68dc97c8d16cdbcb3afa7141be67dcf7f419 -EBUILD freebsd-mk-defs-11.0.ebuild 910 SHA256 2df2e883dba970a27f5fec499b8516f1b8a1126763cc2b590a5661a979a8b966 SHA512 1e2f8d4fac2c461a2fbf0127cb8bb27cdda9dad8d5d93513a28d77baf87bc5199fd781134e67fd5e2a31c03fec9b71f2e4732e700e3f2e3fdca759c27d89ac87 WHIRLPOOL b5c335c9bb20746a9a630226cf9601fc767476eb65ca3e1f8661172d392b60e6186b4a167ecc02962b935e11c987716f078674356f8027a816794a4b65a4d712 +EBUILD freebsd-mk-defs-11.0.ebuild 1149 SHA256 a8bb1967bbdbb85bcf60a4f03897f054b8cccf976d8dde5710d1ee0e67b9b062 SHA512 c87470787cd155c32432a2f3269562b5caad9ed8f6c0af934266d20a8c3e2d443dbdd2253b3b89074a103a434766dba95156b1b2b0e2484d6127b77a7b6c33c6 WHIRLPOOL 99fad21dad8365698ef626113fef87007dd70db849b74874eb2ab2685cbb45f14337722f6013fef290b4a1a4ec86861568deceeb6cda44c695b1af34559c78c1 MISC metadata.xml 238 SHA256 501d93b0c41ed422505100f002758cd173cd9783ae7fbb53e2ec5f238c868340 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d WHIRLPOOL 4ca51d994f011a5e7e4939f02a54b5c2f9f3e526665893c9ac2876c9871b7dc80361393d41c5247b3a5520e82d31d0dd10da520e7715c94b806a94ce0fed2a5a diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild index 0a7d87b..720012d 100644 --- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild +++ b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild @@ -25,20 +25,31 @@ RESTRICT="strip" S="${WORKDIR}/share/mk" src_prepare() { + local installdir + epatch "${FILESDIR}/${PN}-11.0-gentoo.patch" epatch "${FILESDIR}/${PN}-11.0-rename-libs.patch" epatch "${FILESDIR}/${PN}-11.0-libproc-libcxx.patch" epatch "${FILESDIR}/${PN}-11.0-drop-unsupport-cflags.patch" use userland_GNU && epatch "${FILESDIR}/${PN}-10.2-gnu.patch" + + if [[ ${CHOST} != *-freebsd* ]]; then + installdir="/usr/share/mk/freebsd" + else + installdir="/usr/share/mk" + fi + + sed -i -e "s:FILESDIR=.*:FILESDIR= ${installdir}:" "${S}"/Makefile } src_compile() { :; } src_install() { + freebsd_src_install if [[ ${CHOST} != *-freebsd* ]]; then - insinto /usr/share/mk/freebsd + insinto /usr/share/mk/freebsd/system else - insinto /usr/share/mk + insinto /usr/share/mk/system fi doins *.mk *.awk } |