sys-freebsd: change from mkinstall to freebsd_src_install

8 files changed, 8 insertions, 8 deletions

diff --git a/sys-freebsd/boot0/Manifest b/sys-freebsd/boot0/Manifest
index 470b480..bda3b4c 100644
--- a/sys-freebsd/boot0/Manifest
+++ b/sys-freebsd/boot0/Manifest
@@ -9,5 +9,5 @@ AUX boot0-8.2-zfsboot-makefile.patch 436 SHA256 74a494fce8011f018542a54d6d188c1a
 AUX boot0-9.2-gcc46.patch 2119 SHA256 745245270e8ac2e8a1084f1785bb31ce7a5d2c7242f762260ad9a97fa02970f5 SHA512 ee834269bdc4a79da6854f59fe896b8e13efd1f60d97aefc8829cd1137f8f84810bba4344aac79424a4f31503a1a8579caf468e83a60d127d81f5d10fcbc4ae9 WHIRLPOOL 0c057ffe2baa7cb1b74912cebed5ec5f31adee7780a77993b40bad256e89baf3ed4dc18567c263bfed9a76e63e274072945e37dd729ac62c8538ab7678e4dfe1
 AUX boot0-add-nossp-cflags.patch 341 SHA256 ed801285f9e9846c7fc4f334a2dfceec2d023be9b22e53aa3713d648cac899be SHA512 980a6b8f247f0d51724f409627c81e5e089e4b2a7b11732bc3cf569f87a5c308e7c2e5985ce3ba32c61c489a5a1e16596bde43ef3c260b0730ec67e50f42e9bb WHIRLPOOL 06ae4058fd8c39abe215e417fdffd1c13fdc641891fcb8f8a37af3ac31e781da666c3cd9cf2b800174439ebcc2ecb5b6efb9e9e5880a216878fb4ced7ffd9bfe
 DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827
-EBUILD boot0-11.0.ebuild 1878 SHA256 3ce95c8f57d76659c63e4afe0eb07d083ddee0695bfc140e8b8fb2bc4fb4c171 SHA512 1f886907cdd3fd5ef36e4f2cafe73c3deb8013904c50d01c25b025fb479a185932d999e60a4d63fdeecc25e78ca02e51053e41ee712b57b13f2d783189c458d6 WHIRLPOOL c419f3f87a9fa95b65764c819e554f40e91b351b0c6cc8fd5472ba24eb54ac0a207bf9973f5e0384cc125faba3f2be1901d9f7d0b74dcaadd97cd6c5d0ee8c88
+EBUILD boot0-11.0.ebuild 1862 SHA256 3247b5ca4135f21acf4710536c85389f5a76738da24ded110711678aaa4364a4 SHA512 fdb37a29b7916ff1f8912bb544ddb3e40cd95395a7b42e830adac5c9c8df21b3a5577d3b8baf6ecd74482c53bebd63ecf3d7bbec47923ffe9f7ef96cd23b2558 WHIRLPOOL dc761ab66f1b874dfee3fb458cc97ce0e98a35589fc9f45520edc1449b1ccb42b5e130e634f741d2e164217e34bfd4de1556cf87ea3a32a8ce0bc6bcffe48111
 MISC metadata.xml 385 SHA256 1b6dbb50d321102c9a48b5f6bce5825e88ce8dfcabd86892194b2fa10e540b11 SHA512 b65045bfb5e261f1a26102c00ff576065570701658bc643ded73761de269e72fb8843ce38231e92def5c7823720e1ec687b8cce575307097847d10dd35b8a808 WHIRLPOOL f073e698718e05e55026bad3888ce2809d2a0a7f4d0e4090e5c1fb16be55846e0bbf81c09748b76ea960a77e74b96678031c888852b8e4e259640d67386cc655
diff --git a/sys-freebsd/boot0/boot0-11.0.ebuild b/sys-freebsd/boot0/boot0-11.0.ebuild
index 71b9564..d108508 100644
--- a/sys-freebsd/boot0/boot0-11.0.ebuild
+++ b/sys-freebsd/boot0/boot0-11.0.ebuild
@@ -71,7 +71,7 @@ src_compile() {
 
 src_install() {
 	dodir /boot/defaults
-	mkinstall FILESDIR=/boot || die "mkinstall failed"
+	freebsd_src_install FILESDIR=/boot
 
 	cd "${WORKDIR}/sys/$(tc-arch-kernel)/conf" || die
 	insinto /boot
diff --git a/sys-freebsd/freebsd-cddl/Manifest b/sys-freebsd/freebsd-cddl/Manifest
index 827823c..3220295 100644
--- a/sys-freebsd/freebsd-cddl/Manifest
+++ b/sys-freebsd/freebsd-cddl/Manifest
@@ -12,5 +12,5 @@ AUX zfs.initd 375 SHA256 4d87977d430ba846a0b1c8ef383838891d93b40480d4a2816c94902
 AUX zvol.initd 845 SHA256 70f237d969b5e539ad1c83fa49b0e5e85d4e2f588e97c1f2e65161edc9c93484 SHA512 18b706cd611858299228a7b74314149fc9a30351f03695accea8a0afbae164acfd8b10df4018b8103273adea1b6e764ca52e0ee3cb07d8f3ff8952b16201edb0 WHIRLPOOL 430d429b43c7be432133859dcd12820362ea03ea4a28a3f335230d66873bcc1658dcbb62e779942de06e7e8a987be30fc968194f31d5431f3b0e3e609509e79a
 AUX zvol.initd-9.0 819 SHA256 42d8b9a3eed04273e1638e0e7f7aa1f3b939e925c068260ef11a760fc61b5afb SHA512 1d59d5001ecb0ab4416f4bea8e2f4ff2c7ca19891d23b2a24cd1f389ca66f7cbe3a12bf913633dd90c013b730301dd704c072b94e5d95f7724203d3810314c70 WHIRLPOOL bdb6f1da1c420a254fb12776c0af378619b98c030c0830bcb3fcf2ee6eabf3e89576079d1a31a797e311e9b98d45dfcdf0ea22bddfe7ebc0a1936016474a469b
 DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827
-EBUILD freebsd-cddl-11.0.ebuild 1701 SHA256 2005d53ff0f34d43239538705d6a155c7fd6f7ee189bb79a99111bd78330e674 SHA512 b38c666498758c8e2edc5ca49961bb287759978df442adad68e585d9a84117ab2737562340bd75685393e1fcfb16586294b8aff119abc92ce82e888840a8a117 WHIRLPOOL 7e2e44c8579a2112aff97116410bf18745f18fc2a0542c41db4237d0fdf1fb87bd765c0d522ae529e725b83f4a5237c96d367e863924e195d709958e9d128985
+EBUILD freebsd-cddl-11.0.ebuild 1704 SHA256 7a6e92ff6ec2dbb86f162ac9467653f4c3590e1442eaa3d960caf84276d6cead SHA512 a8cb91aa73872dbfdce2ecab214614a28df3b13c703e73d998346cec986cd98abc5a8532344d2422e0780494290cb39ca17e24c761ad17dd8b776d7ec432b933 WHIRLPOOL 32b02d13f2f2f691536f3e654bda0f2144ec07c6faba033926771bffc185ce1842d9a95b8e1f61957da805dc48b699a258d7733d137852e4f5012aea060c8b90
 MISC metadata.xml 238 SHA256 501d93b0c41ed422505100f002758cd173cd9783ae7fbb53e2ec5f238c868340 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d WHIRLPOOL 4ca51d994f011a5e7e4939f02a54b5c2f9f3e526665893c9ac2876c9871b7dc80361393d41c5247b3a5520e82d31d0dd10da520e7715c94b806a94ce0fed2a5a
diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-11.0.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-11.0.ebuild
index b6d18cf..384ffc2 100644
--- a/sys-freebsd/freebsd-cddl/freebsd-cddl-11.0.ebuild
+++ b/sys-freebsd/freebsd-cddl/freebsd-cddl-11.0.ebuild
@@ -65,7 +65,7 @@ src_compile() {
 src_install() {
 	# Install libraries proper place
 	local mylibdir=$(get_libdir)
-	mkinstall SHLIBDIR="/usr/${mylibdir}" LIBDIR="/usr/${mylibdir}" || die
+	freebsd_src_install SHLIBDIR="/usr/${mylibdir}" LIBDIR="/usr/${mylibdir}"
 
 	gen_usr_ldscript -a avl nvpair umem uutil zfs zpool zfs_core
 
diff --git a/sys-freebsd/freebsd-pam-modules/Manifest b/sys-freebsd/freebsd-pam-modules/Manifest
index e1a4c8c..dd5d3c6 100644
--- a/sys-freebsd/freebsd-pam-modules/Manifest
+++ b/sys-freebsd/freebsd-pam-modules/Manifest
@@ -2,5 +2,5 @@ AUX README.pamd 2846 SHA256 cc15a45d85590c1c1267a6083048e410b0175d863f1685b51e26
 AUX freebsd-pam-modules-6.0-gentoo.patch 701 SHA256 8346d95aa5b4f283fedf4387ebb85a61f5f10fac38dc45bdea8c2c345fdc633d SHA512 7adba1261547c11bb1a0b0d3c8cc800bba9aca4a878c9fa63f8b68e270a3a0d54388eb1e156aadcba54d9dd23a2817232b3f287522d820da15abb7dd9c8cd995 WHIRLPOOL 2b02611fce484145fe62468826bbdb8f1dedfb1c4a7a14b01234c99f13daefe9597d08a23e0836f5804f92c26cc1b950180f7fcbd1698af360b23e06c143621c
 AUX freebsd-pam-modules-9.0-gentoo.patch 622 SHA256 b397d5d646712c4a63606d94c45d25551344872d77d7b6b5f646403a2b09f7fb SHA512 752b593a8bea623110683a181deefd7126eaded7bf94973bcd994b2415db5739cd69a125ee9bd0c960fd5a3e30e3a2eaf8c711893f94966a9cc5a9b0c3191af0 WHIRLPOOL 168b0ba47e9a326ff1db9cfe46724c83a45d744df0fa737599894ef1574b0e199c46e7626b16f5cc83cd4886fd79320c5f92e4c2b37801ef3604ffd4ec1b2de7
 DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827
-EBUILD freebsd-pam-modules-11.0.ebuild 1056 SHA256 50c82cf12e40d7725f466890a0b5949ceaff28b61e8d6792d9bf72650b5332e6 SHA512 65fd64d165dd3fc04998de25e95592ac73557027909d14520adf40800cc21af26430cf49594ee0c73a1da765118e38fe773c0fd652297d8eed449b067d6badf7 WHIRLPOOL 708584468a0cce199e64798b1312c7fa496e790608782120692f9b980979b29c3d9c9f97e6a906d6b0a5b64fafe1b16da4c6bf77dde2025eb8480057d8e8c1ad
+EBUILD freebsd-pam-modules-11.0.ebuild 1042 SHA256 4442bd6cdd5ab3a18b02e000ee7d4f55131d7bd27493081c5222325cac0c55f6 SHA512 a75de8d65675770d75690cd48ba4c6d3a231fefd84e2315756a11b4632851d2643b2786e3924ac52825ae66230f598f6bd92ecd1e32c59e6554c1d67a8968a29 WHIRLPOOL 4d12fe089999575321b0c1832e19a67fd526b86fea65613fa6e1f4e9f1a7e410e246406e004b218eef6acf3193b91e7f5e9ffc712c74b2418e71d7f59e4d712e
 MISC metadata.xml 238 SHA256 501d93b0c41ed422505100f002758cd173cd9783ae7fbb53e2ec5f238c868340 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d WHIRLPOOL 4ca51d994f011a5e7e4939f02a54b5c2f9f3e526665893c9ac2876c9871b7dc80361393d41c5247b3a5520e82d31d0dd10da520e7715c94b806a94ce0fed2a5a
diff --git a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-11.0.ebuild b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-11.0.ebuild
index ab93176..0172c4e 100644
--- a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-11.0.ebuild
+++ b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-11.0.ebuild
@@ -40,7 +40,7 @@ src_prepare() {
 }
 
 src_install() {
-	mkinstall "LIBDIR=/$(get_libdir)/security" || die "install failed"
+	freebsd_src_install "LIBDIR=/$(get_libdir)/security"
 
 	dodoc "${FILESDIR}/README.pamd"
 }
diff --git a/sys-freebsd/freebsd-usbin/Manifest b/sys-freebsd/freebsd-usbin/Manifest
index 8422477..bc6c98c 100644
--- a/sys-freebsd/freebsd-usbin/Manifest
+++ b/sys-freebsd/freebsd-usbin/Manifest
@@ -29,5 +29,5 @@ AUX syscons.confd 348 SHA256 8d963ed1d6b63eed6b9f8bc1492c1e589458051e99f601e1ee0
 AUX syscons.initd 1599 SHA256 e3637bc00a18ef3377c64123926a9079c57b8d113a338ac8306f4f1f7c585127 SHA512 5f4fb657f34584ebfd8f967724b840722f2efb918850fe41a9b734bb81f6c1ab2e9173c38a98c99668795cbc80976f06c37f44f9319bc71bb329ab28e9ab4a83 WHIRLPOOL ec9ad9d2069656dc4011fc237e3ac80149a2db0cc1345212a353991bf94c76f63396a26015508e722c23530c860258a1035cc4037e225c88179febd2e2e14f18
 AUX syslogd.initd 457 SHA256 7e75bdcbc173c124d1991f8cab9cef86815e1685a2ffcf2fa6b8087216080443 SHA512 202402ab88c27ffce9dca28618435f4b7fdb54c37a41819c436d8d53f3b92c7063f3cb7d93f617007a2999f07e3a0cea55858b18f920da889d84fd526cad1c6b WHIRLPOOL da5646797d6ef2cba65ebf7a53b156d4c534ffdcd2938aba5d61187e6f87980728dbbc03731df2a3b2ea8350aaa93b9769f7d7324932315392005c42e71aa91c
 DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827
-EBUILD freebsd-usbin-11.0.ebuild 5430 SHA256 5589b1d853f78184cf00addf99bdda7d5fa23c145b343d449ff717f2c17dfd3e SHA512 412fa9a90552f41fe585e0c0b735283259015eac2e04c3db911e6fc7963f646277006c89cdd2dd39cbc4a6058ad73a67aabc7287e5bf05756a99d04d5bbe9195 WHIRLPOOL 7b379c3099484b4ac488ee3ffcb9c5b90634fc6a3762e4e946e629573e4d9e69cdd3795202ba3020950d6ef73072622e0f5fb40f22c6771b0455421c782a112f
+EBUILD freebsd-usbin-11.0.ebuild 5416 SHA256 3ca5c73ab7023eb741bd0bf5a12358f6feafd8143ec6d5268245dfb62282dfba SHA512 9bf3ad98cd4bf7ab366ff0de110b060a2bfc87ff89fd7901fc8baf7057a46181d45a9c8cb70f8df90b3b2252d74841eaefd92a98c050c639d16c7a7b2bc00bd8 WHIRLPOOL 5e7abeb04b6f154f3489935210dc2c2bc12ba5fb28156d9b939a1e686d3aafb6b80ca5bbd656d67087573517972e2970571a3ea43a3e63fffa5f263347e1369d
 MISC metadata.xml 599 SHA256 3f2851ed1214525bc9fd9887db068c00324b466bc9f54342517f3101d34f2659 SHA512 afe1f9e8ccacac89bcd308b6476bba009035542f86d71f70f27df029ff20dda7ff7ff8c9510e6939d502a31750c6bf69de608440fb61b1d590d018446aa14f99 WHIRLPOOL 3514ef434513a233cd7e525442c9a4de763deb680c2d2a3e380a5d69f2f31e397a97c5e0d4512045c957c650777e8b66a803b0a6c008cf1e79f0c87d597f7ae5
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-11.0.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-11.0.ebuild
index eb51009..6309b60 100644
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-11.0.ebuild
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-11.0.ebuild
@@ -122,7 +122,7 @@ src_install() {
 
 	# FILESDIR is used by some makefiles which will install files
 	# in the wrong place, just put it in the doc directory.
-	mkinstall DOCDIR=/usr/share/doc/${PF} || die "Install failed"
+	freebsd_src_install DOCDIR=/usr/share/doc/${PF}
 
 	# Most of these now come from openrc.
 	for util in iscsid nfs nfsuserd rpc.statd rpc.lockd; do