diff options
Diffstat (limited to 'sys-freebsd')
| -rw-r--r-- | sys-freebsd/freebsd-ubin/Manifest | 6 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-ubin/freebsd-ubin-10.3-r2.ebuild | 20 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-ubin/freebsd-ubin-11.0-r1.ebuild | 16 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-ubin/freebsd-ubin-11.1.ebuild | 14 |
4 files changed, 29 insertions, 27 deletions
diff --git a/sys-freebsd/freebsd-ubin/Manifest b/sys-freebsd/freebsd-ubin/Manifest index a07df9c2af70..8a16a456dea8 100644 --- a/sys-freebsd/freebsd-ubin/Manifest +++ b/sys-freebsd/freebsd-ubin/Manifest @@ -50,9 +50,9 @@ DIST freebsd-ubin-9.1.tar.bz2 1910472 SHA256 ff6e586f213534b6ec2e65002c0dee64063 DIST freebsd-ubin-EN-1621-localedef.patch 1958 SHA256 4cc2fe1bed57c303f919c1824b8754d7804dcf96bc2c349b5051995995e3a878 SHA512 191661a189dbb33979de04f68cac1701ee0f3af52921be1e0566590b462e475e5883cd0495b001c42b7bfdaf60e0360ea53ddc2ea729cc1bc13cbf228aaa284a WHIRLPOOL 73fa520f2f24fce7dfdefc8b7306e9802936f37296d1dab6339cb86c51a917f1acc60e14070ff71e96d5234fc186a1112c6f7f2196265e367f04a496b739c1bd DIST freebsd-ubin-SA-1625-bspatch.patch 286 SHA256 22ab941e324509a1cd2608407ef7ca998ac1b4bd9602c8ef643b4c078c5b4134 SHA512 f2a0210e582076bac93faa3a226cd9301b6d0245938d6c5a17e1aa275401934d7848bcb908f63a689f5e36f961dfbf1d0a0b5717ff54f67a76b5d1908ae39703 WHIRLPOOL 15a1dc7546964556bab0dbaf7054c4644c3be1bce6c2cc3e8baa74ccb49871d0dd3fc4b702c21e0a5a5a68298f225da6b19e1f2736f29cdf394a8a9f081ea507 DIST freebsd-ubin-SA-1629-bspatch.patch 9323 SHA256 087fcfb0e4f6c63e58656cf6a6f30411bc6183d81e0a1a2dcd40f9b41cb640e4 SHA512 ae061869db3a01e0002b2159306ff72c5629147b8e594f0fda5f6d3aa956f4a73a4a3fbc299ef2c69231cf619049e8eb5bed34067be6d5d419f108958c97f59f WHIRLPOOL 9dd2fab13103bdeca6df6060948b755f8552bd3216167bc417ce137b8f28080e129667f3e483badd5cf2ae3b8926d22493b5654a85cfcbc744915e683b56ec52 -EBUILD freebsd-ubin-10.3-r2.ebuild 6052 SHA256 673a3576b3ae5d57486ae876b492bf56864edff32e3762acd9226efa0ecbe4d2 SHA512 5f3c679b039c8475f18e5626e5b6c30afc93c4b21b8ee659fb6c48208a12ae059799131eb7d1ce71fb312b439c2cffa3cf21040fa4770b98278fc71d6e1205e3 WHIRLPOOL 380885db6941ee6ddebc13deefa9be37b75614ef719b5d2a6a9923c82e29998a7a5a20748741e1468d68cd545272ae36ce3e9dff0c51ba13e0732923405dc34e -EBUILD freebsd-ubin-11.0-r1.ebuild 6215 SHA256 240b76acc253936df4df0b286abd69be236348d23c53b992233ffdc8d1144818 SHA512 ae7c60695e0eafd8e066ad430d4ecfaeedd95781547e4e39c4202eca4fe41dd61671faf14a6cd6a1c1d95e84a0c3eaf86068dcbfc8d2c544eebb6034ce8d562d WHIRLPOOL f9b1da2d545a2310c48b6114e5482276397fde0034050a5f8d52f6ab08a8151211487a36e60a16bfb0b2b78ebb8a6c333f54c26f359c3fd9b624bf0fe2281eb0 -EBUILD freebsd-ubin-11.1.ebuild 6201 SHA256 fa08e9a5c8bd91dcf93b3ad6b271b27e9a04ca199d7632917c576abb3283965b SHA512 f853ff1cb10810272d3677159204fa1c3f9e22ab6556b17c74b39c1e653d83cc44997878812e5557ce9025befdb9e0005fac37b05ff2386334f00b0e91336b5f WHIRLPOOL 3c7f8b09476ce074cbfcba749e4ba2bb94922fb6257f6f9512fe65b5607c5c73e2fa58513f8b7bcdd61d648cef8c2880dfb67bf7e32f45545730ed1207e905c6 +EBUILD freebsd-ubin-10.3-r2.ebuild 6085 SHA256 0cd889262b2a3d8a1d73d3a3aff75bf39b1c34fd3f79c9cb1d2f3ab1889ee405 SHA512 813f6f90a58fe4000f52f712ef687c62490ef3c88023a6cd962adecfaac88d1d116c0f89f73268d7e6dd8c8dd7183d3fb8e3c03659b7a74974a4237f99c0846c WHIRLPOOL ea25302ea48c2131504939e8b633199d5b71bdf9e0826874206a22af99cce3d1b983cf8483d20e6835cbbebcab012181ef04145c808bd56ad25ee71b3e2a4286 +EBUILD freebsd-ubin-11.0-r1.ebuild 6240 SHA256 8ed634f4ab06957cb5a8f818f5c0462ac26f1ebb8a14fde8032272101c377157 SHA512 474b3b19bc64e9b13f5ba9151b832009ad6b454cfb1d433636faa8195bf9b1624d2ee9107b8fd2f9af42d4412ce01e0b75ac50936e073752352c0eef792f2a86 WHIRLPOOL e88ade047cdbba30a01cad9eac1d564589d95db4cf645e860e75bed704601c5d0ae702cd6b660de19bf50ec1851038e82101af7c80211243339c41076a2a627d +EBUILD freebsd-ubin-11.1.ebuild 6220 SHA256 0b3515326ee83d84d4d84c99c33d6c514c1abc0bc511dd31a28951b7a292d1d7 SHA512 da456b53200aa54d11dad64b36a541621a4f3bbbadd5a06f8fd2513414ebe400bf35ed9983cb5446c8391793852de11e8ab57efdfa85b6b69f42bb904ccbebd7 WHIRLPOOL 3188378248a824bc8731dd1263ec83804ac95c7080d38445ea05d9a89cce2de7cbfc25637286640cfb6d048babf8ca4c877fca04602a025bc4b0a25cff532c8b EBUILD freebsd-ubin-8.2-r1.ebuild 4520 SHA256 1aad9172aca1469d125b5dcdd7e34c44ad8e0b7519c1ac50901d29f25eabb816 SHA512 92a14a5812aafea6a7c772e4da874651babc2fd8e0c03172ed5dfea7ab50c51cde3ace435a7e8ccfcbfdb45e725c9cfdf6b307efd2e2f77f5a00295b5d7c148e WHIRLPOOL 72e25500f403baefde2fbd9c2ab964c9b141c192b45d231aff81286a048e9adbf5cf4cf9b31d591ea6ca291870aaa2157dbe17d00d355dc1753748133d269b8d EBUILD freebsd-ubin-9.1-r2.ebuild 5447 SHA256 611256a27827a980775f8423fbbc886443ea5cfe07d4e90e79535ac44dc1215c SHA512 fc4dc85aa3a37cd734e6ff59811e55e4679a178a9feb6f7e99410835cac73fe95730067267e7c808bba718ce9ca1d5f9d532c96080b7b61238e657869ec5027d WHIRLPOOL 50a57b381b62cf9a66df58f0a95906578e492e9ba97a7b3df6d6b2eea1490d5ee609baa725a768e7b3aa09c0771206cab53ff70fda2846df7fd539553b162f5f EBUILD freebsd-ubin-9.1-r3.ebuild 5454 SHA256 5b631517accd0504df55523d9b1cd39d563855fd7a188d08a6f0b1258d300796 SHA512 b70bb34cf6536e080f2fc40f3018dce2e1c4061932e6f9137709bea5d0878e6f4625d4d7d7f34b3bd51e48a46ff9f3d352ac112b66579de6d0249bb7a0a3eb57 WHIRLPOOL e8a5a6c45bf3c6c1aab885e28c87c441f8a178b0310791586fb77e8e5293758c86b9a53b8df4a089aac182c62ae413000b5025be13968d0df9b104563442143c diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-10.3-r2.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-10.3-r2.ebuild index 3a6db423d7ee..001f0be4599b 100644 --- a/sys-freebsd/freebsd-ubin/freebsd-ubin-10.3-r2.ebuild +++ b/sys-freebsd/freebsd-ubin/freebsd-ubin-10.3-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -11,8 +11,10 @@ IUSE="ar atm audit bluetooth ipv6 kerberos netware nis ssl usb build zfs" LICENSE="BSD zfs? ( CDDL )" # Security Advisory and Errata patches. -UPSTREAM_PATCHES=( "SA-16:25/bspatch.patch" - "SA-16:29/bspatch.patch" ) +UPSTREAM_PATCHES=( + "SA-16:25/bspatch.patch" + "SA-16:29/bspatch.patch" +) if [[ ${PV} != *9999* ]]; then KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" @@ -113,8 +115,8 @@ pkg_preinst() { # bison installs a /usr/bin/yacc symlink ... # we need to remove it to avoid triggering # collision-protect errors - if [[ -L ${ROOT}/usr/bin/yacc ]] ; then - rm -f "${ROOT}"/usr/bin/yacc + if [[ -L ${ROOT}/usr/bin/yacc ]]; then + rm -f "${ROOT}"/usr/bin/yacc || die fi } @@ -128,7 +130,7 @@ src_prepare() { # Rename manpage for renamed ar mv "${S}"/ar/ar.1 "${S}"/ar/freebsd-ar.1 || die # Fix whereis(1) manpath search. - sed -i -e 's:"manpath -q":"manpath":' "${S}/whereis/pathnames.h" + sed -i -e 's:"manpath -q":"manpath":' "${S}/whereis/pathnames.h" || die # Build a dynamic make sed -i -e '/^NO_SHARED/ s/^/#/' "${S}"/make/Makefile || die @@ -141,7 +143,7 @@ src_prepare() { } setup_multilib_vars() { - if ! multilib_is_native_abi ; then + if ! multilib_is_native_abi; then cd "${WORKDIR}/usr.bin/ldd" || die export mymakeopts="${mymakeopts} PROG=ldd32 WITHOUT_MAN=" else @@ -196,7 +198,7 @@ pkg_postinst() { # We need to ensure that login.conf.db is up-to-date. if [[ -e "${ROOT}"etc/login.conf ]] ; then einfo "Updating ${ROOT}etc/login.conf.db" - "${ROOT}"usr/bin/cap_mkdb -f "${ROOT}"etc/login.conf "${ROOT}"etc/login.conf + "${ROOT}"usr/bin/cap_mkdb -f "${ROOT}"etc/login.conf "${ROOT}"etc/login.conf || die elog "Remember to run cap_mkdb /etc/login.conf after making changes to it" fi } @@ -205,6 +207,6 @@ pkg_postrm() { # and if we uninstall yacc but keep bison, # lets restore the /usr/bin/yacc symlink if [[ ! -e ${ROOT}/usr/bin/yacc ]] && [[ -e ${ROOT}/usr/bin/yacc.bison ]] ; then - ln -s yacc.bison "${ROOT}"/usr/bin/yacc + ln -s yacc.bison "${ROOT}"/usr/bin/yacc || die fi } diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-11.0-r1.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-11.0-r1.ebuild index 7c9aac54f997..bf7da86b52e6 100644 --- a/sys-freebsd/freebsd-ubin/freebsd-ubin-11.0-r1.ebuild +++ b/sys-freebsd/freebsd-ubin/freebsd-ubin-11.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -108,8 +108,8 @@ pkg_preinst() { # bison installs a /usr/bin/yacc symlink ... # we need to remove it to avoid triggering # collision-protect errors - if [[ -L ${ROOT}/usr/bin/yacc ]] ; then - rm -f "${ROOT}"/usr/bin/yacc + if [[ -L ${ROOT}/usr/bin/yacc ]]; then + rm -f "${ROOT}"/usr/bin/yacc || die fi } @@ -123,7 +123,7 @@ src_prepare() { # Rename manpage for renamed ar mv "${S}"/ar/ar.1 "${S}"/ar/freebsd-ar.1 || die # Fix whereis(1) manpath search. - sed -i -e 's:"manpath -q":"manpath":' "${S}/whereis/pathnames.h" + sed -i -e 's:"manpath -q":"manpath":' "${S}/whereis/pathnames.h" || die # Build a dynamic make sed -i -e '/^NO_SHARED/ s/^/#/' "${S}"/bmake/Makefile.inc || die @@ -148,7 +148,7 @@ setup_multilib_vars() { src_compile() { local MULTIBUILD_VARIANTS="${DEFAULT_ABI}" # Preparing to build addr2line, elfcopy, m4 - for dir in libelftc libpe libopenbsd ; do + for dir in libelftc libpe libopenbsd; do cd "${WORKDIR}/lib/${dir}" || die multibuild_foreach_variant freebsd_multilib_multibuild_wrapper freebsd_src_compile -j1 done @@ -168,7 +168,7 @@ src_install() { # baselayout requires these in /bin dodir /bin - for bin in sed printf ; do + for bin in sed printf; do mv "${D}/usr/bin/${bin}" "${D}/bin/" || die "mv ${bin} failed" dosym /bin/${bin} /usr/bin/${bin} || die "dosym ${bin} failed" done @@ -198,7 +198,7 @@ pkg_postinst() { # We need to ensure that login.conf.db is up-to-date. if [[ -e "${ROOT}"etc/login.conf ]] ; then einfo "Updating ${ROOT}etc/login.conf.db" - "${ROOT}"usr/bin/cap_mkdb -f "${ROOT}"etc/login.conf "${ROOT}"etc/login.conf + "${ROOT}"usr/bin/cap_mkdb -f "${ROOT}"etc/login.conf "${ROOT}"etc/login.conf || die elog "Remember to run cap_mkdb /etc/login.conf after making changes to it" fi } @@ -207,6 +207,6 @@ pkg_postrm() { # and if we uninstall yacc but keep bison, # lets restore the /usr/bin/yacc symlink if [[ ! -e ${ROOT}/usr/bin/yacc ]] && [[ -e ${ROOT}/usr/bin/yacc.bison ]] ; then - ln -s yacc.bison "${ROOT}"/usr/bin/yacc + ln -s yacc.bison "${ROOT}"/usr/bin/yacc || die fi } diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-11.1.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-11.1.ebuild index e55479c3e21c..b731c32e8f4d 100644 --- a/sys-freebsd/freebsd-ubin/freebsd-ubin-11.1.ebuild +++ b/sys-freebsd/freebsd-ubin/freebsd-ubin-11.1.ebuild @@ -107,8 +107,8 @@ pkg_preinst() { # bison installs a /usr/bin/yacc symlink ... # we need to remove it to avoid triggering # collision-protect errors - if [[ -L ${ROOT}/usr/bin/yacc ]] ; then - rm -f "${ROOT}"/usr/bin/yacc + if [[ -L ${ROOT}/usr/bin/yacc ]]; then + rm -f "${ROOT}"/usr/bin/yacc || die fi } @@ -122,7 +122,7 @@ src_prepare() { # Rename manpage for renamed ar mv "${S}"/ar/ar.1 "${S}"/ar/freebsd-ar.1 || die # Fix whereis(1) manpath search. - sed -i -e 's:"manpath -q":"manpath":' "${S}/whereis/pathnames.h" + sed -i -e 's:"manpath -q":"manpath":' "${S}/whereis/pathnames.h" || die # Build a dynamic make sed -i -e '/^NO_SHARED/ s/^/#/' "${S}"/bmake/Makefile.inc || die @@ -158,7 +158,7 @@ src_compile() { src_install() { cd "${S}"/calendar/calendars || die - for dir in $(find . -type d ! -name "." ) ; do + for dir in $(find . -type d ! -name "." ); do dodir /usr/share/calendar/"$(basename ${dir})" done @@ -178,7 +178,7 @@ src_install() { cd "${WORKDIR}/etc" || die insinto /etc - doins remote phones opieaccess fbtab || die + doins remote phones opieaccess fbtab exeinto /etc/cron.daily newexe "${FILESDIR}/locate-updatedb-cron" locate.updatedb || die @@ -197,7 +197,7 @@ pkg_postinst() { # We need to ensure that login.conf.db is up-to-date. if [[ -e "${ROOT}"etc/login.conf ]] ; then einfo "Updating ${ROOT}etc/login.conf.db" - "${ROOT}"usr/bin/cap_mkdb -f "${ROOT}"etc/login.conf "${ROOT}"etc/login.conf + "${ROOT}"usr/bin/cap_mkdb -f "${ROOT}"etc/login.conf "${ROOT}"etc/login.conf || die elog "Remember to run cap_mkdb /etc/login.conf after making changes to it" fi } @@ -206,6 +206,6 @@ pkg_postrm() { # and if we uninstall yacc but keep bison, # lets restore the /usr/bin/yacc symlink if [[ ! -e ${ROOT}/usr/bin/yacc ]] && [[ -e ${ROOT}/usr/bin/yacc.bison ]] ; then - ln -s yacc.bison "${ROOT}"/usr/bin/yacc + ln -s yacc.bison "${ROOT}"/usr/bin/yacc || die fi } |