--- freebsd-ubin-9.2_rc3.ebuild 2013-08-29 01:01:35.000000000 +0900 +++ freebsd-ubin-10.0_beta1.ebuild 2013-10-16 20:45:21.000000000 +0900 @@ -48,12 +48,12 @@ "${FILESDIR}/${PN}-9.0-fixmakefiles.patch" "${FILESDIR}/${PN}-setXid.patch" "${FILESDIR}/${PN}-lint-stdarg.patch" - "${FILESDIR}/${PN}-9.1-kdump-ioctl.patch" "${FILESDIR}/${PN}-8.0-xinstall.patch" "${FILESDIR}/${PN}-9.1-bsdar.patch" "${FILESDIR}/${PN}-9.1-minigzip.patch" - "${FILESDIR}/${PN}-9.1-grep.patch" - "${FILESDIR}/${PN}-9.1-ar-libarchive3.patch" ) + "${FILESDIR}/${PN}-10.0-atf.patch" + "${FILESDIR}/${PN}-10.0-dtc-gcc46.patch" + "${FILESDIR}/${PN}-10.0-mandoc.patch" ) # Here we remove some sources we don't need because they are already # provided by portage's packages or similar. In order: @@ -71,7 +71,7 @@ unzip tput tset tabs less lessecho lesskey - dig hesinfo nslookup nsupdate host + hesinfo host rsh rlogin rusers rwho ruptime compile_et lex vi smbutil file vacation nc ftp telnet c99 c89 @@ -89,7 +89,7 @@ use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= " use usb || mymakeopts="${mymakeopts} WITHOUT_USB= " use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= " - mymakeopts="${mymakeopts} WITHOUT_CLANG= " + mymakeopts="${mymakeopts} WITHOUT_CLANG= WITHOUT_LZMA_SUPPORT= WITHOUT_ICONV= WITHOUT_SVN= WITHOUT_SVNLITE= WITHOUT_OPENSSH= " } pkg_preinst() { @@ -102,7 +102,9 @@ } src_prepare() { - use build || ln -s "/usr/src/sys" "${WORKDIR}/sys" + if [[ ${PV} != *9999* ]]; then + use build || ln -s "/usr/src/sys" "${WORKDIR}/sys" + fi # Rename manpage for renamed cmp mv "${S}"/cmp/cmp.1 "${S}"/cmp/bsdcmp.1 || die @@ -116,6 +118,9 @@ # Disable it here otherwise our patch wont apply use ar || dummy_mk ar + + # Preparing to build xlint + export LINT=xlint } setup_multilib_vars() { @@ -129,6 +134,11 @@ } src_compile() { + # Preparing to build mandoc + cd "${WORKDIR}/lib/libmandoc" + freebsd_src_compile + + cd "${S}" local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile }