* [gentoo-commits] repo/gentoo:master commit in: sys-apps/darwin-miscutils/files/, sys-apps/darwin-miscutils/
@ 2024-04-07 9:43 Fabian Groffen
0 siblings, 0 replies; 2+ messages in thread
From: Fabian Groffen @ 2024-04-07 9:43 UTC (permalink / raw
To: gentoo-commits
commit: 5ae690d4a2711c96f26b8158549a6e43566bbe6a
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 7 09:42:03 2024 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Apr 7 09:42:03 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ae690d4
sys-apps/darwin-miscutils: cleanup old
darwin-miscutils-12 compiles/installs/runs fine on ppc-darwin9, the
oldest target this is relevant for, so weed out all old versions
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
sys-apps/darwin-miscutils/Manifest | 12 --
.../darwin-miscutils/darwin-miscutils-10.ebuild | 157 --------------------
.../darwin-miscutils/darwin-miscutils-11.ebuild | 158 ---------------------
.../darwin-miscutils/darwin-miscutils-6-r1.ebuild | 139 ------------------
.../darwin-miscutils/darwin-miscutils-8.ebuild | 134 -----------------
.../darwin-miscutils/darwin-miscutils-9.ebuild | 131 -----------------
.../files/darwin-miscutils-5-error.patch | 14 --
.../files/darwin-miscutils-5-stdlib.patch | 20 ---
.../files/darwin-miscutils-5-w.patch | 10 --
9 files changed, 775 deletions(-)
diff --git a/sys-apps/darwin-miscutils/Manifest b/sys-apps/darwin-miscutils/Manifest
index 2bc123dcefa2..3696e7f13dba 100644
--- a/sys-apps/darwin-miscutils/Manifest
+++ b/sys-apps/darwin-miscutils/Manifest
@@ -1,18 +1,6 @@
DIST adv_cmds-md-147-compile.patch 5423 BLAKE2B f54aaaa8fcecb81fd8e628bcb384f537e572095b8210612c0748017f033e7bb6f9c5b1bd2c544fec23e8002a2ac7b99d840c85a8ca6faadac3b4da2edb77b459 SHA512 951e981b57e7d3d6ef51d638759559581dd4995ce66ec17bb2658f8a298683feb0842d10fd834b713ec39b2a0f671df56049b876d55f17bf1e988d76839fead1
DIST adv_cmds-md-147.1 3623 BLAKE2B 18b856770f0490ef241e19cc6f1661f6521bcc7f363bff41fbec548388d8f1e2d9e6aea879064cd3d7e7d16f8e0b2ff17ead990051a068a66f520a5ff504afa3 SHA512 459beb2b7c92b8718c76d744bbabf631bf8c329feb65c9434ce8a023c73ceac2d207c95e39c4b90b095a4724a74096a3d1bed9122883eb54e5311dfc64ffc718
DIST adv_cmds-md-147.c 25945 BLAKE2B 38af9e06e18a15cc74a81464a4c1ecdf98b800eb34f33f6ab6203b60540e693d459805432e51bae1008661aa566830c87357432428f62d8cbea9973b1e5fc59a SHA512 93e70f7d8697652b5a3c661975d21b51545d2eb07de64fd40524fcf0d5016dae9ae1dc63c4a85cb5ad455c8d1c246b7f5f2eac38226dcefbf4cab12b0b1c7592
-DIST developer_cmds-49.tar.gz 307753 BLAKE2B 774259d7b82efc85bf487111e5a3c4c0d4aa3f8a788463b503e4d108c684837327b97882114d3646dfba5f60a1a1a2671e0e574d92e159b5ea014fc9e2c61015 SHA512 3750374c891f6d681829986291d887cacf2c5b1c7a5de94f12c92ded0b3456157b85e57653c6061526d1f6626a7be8a9e6db9c1df09e2bb3e40c7fa20b9b4103
-DIST developer_cmds-53.1.tar.gz 139637 BLAKE2B cd61d6f86195ee43705b4b8e8802d7c1c578e2d64869ec33ed7acd7894a3231cab4152e08aa44694836fc542b4c3ab29d83b8a30b8b69545a25b12921c547fc9 SHA512 ac15b499d0642332e8deae2f498e5ffb0c64502e2d877bbdfe0fac4118e17fe525b169f3b015cfe8c9f40e2688bd30df4b050fe50eaa706b21a2e62ca9dd4b80
-DIST developer_cmds-55.tar.gz 139664 BLAKE2B 2dcd3b3e5ac9ebd8c15dbffe388fc016c037bfe8cbe0ae600552bf7de7dfc4351380eb0b16df0ecec2a79937d970044d1e937703cef6fb5205c62bd0b5298c4e SHA512 062e4c4a2b1ba4cffe7e850d07f4351c736988958450735f9f653936d64defa3347c9dac7b5fea3dcd25f8efe076133dc9ac3edb4a3e512387d6842bd177c35e
DIST developer_cmds-63.tar.gz 110662 BLAKE2B 383573203d124904d69e5dbc8f1c5e0aef1b5a2288e40449c8e95470b131c9dc1f181338c38f292a1bcc5a105a54010e23bc12e233d7a92d9c983eb975429474 SHA512 4f672835f0290feaf54c7c268b31774282325448f30c02e4f12ead84c41e15083784fac4c9c4916c098953bc61aa8f29bea24a7b51312428aa87448595be50a1
-DIST misc_cmds-23.tar.gz 114747 BLAKE2B 9c4a1376555775a6999437e0712f62200d10be972f6828c02cfc0215a6004b706e36030e66ebdca59fdb8bcb18fabe4e596ce485b45ffaa072f8262ee9b91d82 SHA512 0e02a939c308f4483cf11cb8b21face84f442589e3774b1827ed0ab5064ee2b433a4468ac634051fa0817919f5d39ac1ed56c67b1f5b011b83388a3806ed33c8
-DIST misc_cmds-27.tar.gz 116351 BLAKE2B 00aece4bc8679d9a7a1e114db65bca97e8f855ead64ee0672ac598c28069c56355f4a763fef0e56784ee9d2de9a081ef6f7e6d9390fc79cb0dec25dbe40ec881 SHA512 594560b179f7dafc651d3a336d33bcb7075f2199cf4964e95d63164faf19bd50ef3a6095124f0e4f91c50d1bceeb831fcd81ceecf740e2696a8e7445c1a690d2
-DIST misc_cmds-31.tar.gz 121187 BLAKE2B 3d12a13cbdc7c541b98596ab5ea675d27a0da93a913ee94945dc5b68b3238a85c3fd13472c3ead30219ae3317a6111ba8d22a6e702fe07f927318f5174870a70 SHA512 d49bb8a49c23aa7efaa7db1958676390b4d5ef1b2e57f80b0bea0f10b8b29a6c3ec6d2d7a1248d3af77d382c5113fb3cbf9d3632ca92bb51c01d8c286fd9f25f
-DIST misc_cmds-33.tar.gz 123114 BLAKE2B fb86518067b36de536503df521f1dc5e4f20fa1da74cfee4679dd728862b9ca4c1c272fd0ba39107d058f992acc04c2c98f3f44d6b2fc57386d3c458cfedd68f SHA512 34957adaebe4ce1569464a466e13aaaa6a567c582b784b99dd260c891a417d37a0297bf11acc9eb16dfabed18f42480058ae726e0a56b7d98ed93b59f75a5644
DIST misc_cmds-34.tar.gz 124023 BLAKE2B 3c634ab540f4b1046e6abe05476a399ea00fd6d35d2d450f68cd7c3f52c8b9321039221659647b6623d5621af1789dba3798ec9f5cff8677653fbb3f295d1d1c SHA512 5e4040c49cc6aed8d4b471cc5d26d978717c9ad29315d40098090d0f7fee5a78289f2092fd6e8c7b7adea31b766cfefdef0da957b86ffb4e0781c13f4b5e4dbe
-DIST shell_cmds-118.tar.gz 162145 BLAKE2B 5f6a2264bcbd9322cb50e39ac6594f083f9d0c0ffa68d67fccc6e4979c59edfab617bb7ffefb4ef647111a1abc7b855a19a1f3b309ad50a6a1f92900305ece6d SHA512 efce064b76087451293a6992b7946fb0811856275796efa9e1e30459edf9eb0462929a1f0d28d189bf7e85fdde4d9e80b8637d042497b1e6e9216c8888d0d57b
-DIST shell_cmds-149.tar.gz 173740 BLAKE2B d1cc69f204925628f812acf0f69704c8c0f5b94ee9b3bd8898ec773657ee6c8a617f1666a9ce9e63898eff1cfbc915b7dfd7a91c51eebe642affa41c14f0f828 SHA512 e0f87db828c994bad73e4340f1957378ce5c84419172ed1d6b9d63809b90edfa447cce658e715565c5c2a7d2eaf0a9ee75e24fdb6d86080063621e0f83eb2a77
-DIST shell_cmds-162.tar.gz 179189 BLAKE2B 975728cbfe262072c9fcc3aee457d3814ceffbd4f3f87a25e5f30d3b581c4ce05c112b2e023e1c132bc836e337e9edf74f699dc3e6cb797be5b589a3cb5eed82 SHA512 784b6b8b3a90967d79f5a60a23e7f31f7bc92712dac9cdb625770f92b58bd6902669aa19bb59997cc654fcc0e27ddd45f60b1990e7da95d0e6c90fd7f2434f95
-DIST shell_cmds-170.tar.gz 212954 BLAKE2B a9616f7604bb73c0d88f8a065441c2f4769747d407458b3844e3e9126c224b42501bf546b1bc82ab6cdfc318861b43318a8a8877e7a054209cbbc7bdaaec0e24 SHA512 b267a9b5e922c9952451ca05e5f9e328504dc46b5776e1a8405f8e41a604d7f184d70742cb6fa6646875bc1789082097c74eabcc151ac5568ba26ed858269ce7
-DIST shell_cmds-198.tar.gz 411088 BLAKE2B 074efebfdc0fb408df54ce763018c74370049d7c977c912c69bc399f3b3551280f1ea76fbd7205ad54ce676422c642431e297f269cafd2ee5fcb4cd916c91548 SHA512 6e3a43f0cd9b1e3799d1ba79f4fcc4c3bb9be178c35cba2bef9227ecc259ca52c39b4d0e39c71d9af689e07f48dbeee6806bd623286f116f7d3ee3889dc7c71f
DIST shell_cmds-203.tar.gz 428799 BLAKE2B 54103daa8a8758dd34a66f9c34a5fa4cad2e6a2dd36ff838498d82179566eb95c25c49126341ac481889381c2d39ebea3bf57959bb943536a7ba8a90fcf96f67 SHA512 ba9b00d6681d286e6210d49d70e1f526e86b0a76ed794050e9cdbdb8c0cc30dbe82ee9cd908578ddabb19c53c8994f1b84650f08bfeb88ea9f77d4de942c1cb1
diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-10.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-10.ebuild
deleted file mode 100644
index d35a067aea60..000000000000
--- a/sys-apps/darwin-miscutils/darwin-miscutils-10.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs epatch
-
-# from 10.8
-MISC_VER=31
-SHELL_VER=170
-# from 10.7.4
-DEV_VER=55
-MD_VER=147 # 148 in 10.8 has no md, bug #428530
-
-DESCRIPTION="Miscellaneous commands used on Darwin/Mac OS X systems, Mountain
-Lion 10.8"
-HOMEPAGE="http://www.opensource.apple.com/"
-SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/misc_cmds-${MISC_VER}.tar.gz
- http://www.opensource.apple.com/darwinsource/tarballs/other/shell_cmds-${SHELL_VER}.tar.gz
- http://www.opensource.apple.com/darwinsource/tarballs/other/developer_cmds-${DEV_VER}.tar.gz
- http://www.opensource.apple.com/source/adv_cmds/adv_cmds-${MD_VER}/md/md.c?txt -> adv_cmds-md-${MD_VER}.c
- http://www.opensource.apple.com/source/adv_cmds/adv_cmds-${MD_VER}/md/md.1?txt -> adv_cmds-md-${MD_VER}.1"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~arm64-macos ~ppc-macos ~x64-macos"
-IUSE=""
-
-S=${WORKDIR}
-
-src_prepare() {
- cd "${S}"/shell_cmds-${SHELL_VER} || die
- epatch "${FILESDIR}"/${PN}-6-w64.patch
-
- mkdir -p "${S}"/adv_cmds-${MD_VER}/md || die
- cp "${DISTDIR}"/adv_cmds-md-${MD_VER}.c \
- "${S}"/adv_cmds-${MD_VER}/md/md.c || die
- cp "${DISTDIR}"/adv_cmds-md-${MD_VER}.1 \
- "${S}"/adv_cmds-${MD_VER}/md/md.1 || die
-
- eapply_user
-}
-
-src_compile() {
- local flags=(
- ${CFLAGS}
- -I.
- -D__FBSDID=__RCSID
- -Wsystem-headers
- -Du_int=uint32_t
- -include stdint.h
- ${LDFLAGS}
- )
-
- local TS=${S}/misc_cmds-${MISC_VER}
- # tsort is provided by corepatch
- for t in leave units calendar; do
- cd "${TS}/${t}"
- echo "in ${TS}/${t}:"
- echo "$(tc-getCC) ${flags[@]} -o ${t}" *.c
- $(tc-getCC) ${flags[@]} -o ${t} *.c || die "failed to compile $t"
- done
- # compile cal separately
- cd "${TS}/ncal"
- echo "in ${TS}/ncal:"
- echo "$(tc-getCC) ${flags[@]} -c calendar.c"
- $(tc-getCC) ${flags[@]} -c calendar.c || die "failed to compile cal"
- echo "$(tc-getCC) ${flags[@]} -c easter.c"
- $(tc-getCC) ${flags[@]} -c easter.c || die "failed to compile cal"
- echo "$(tc-getCC) ${flags[@]} -c ncal.c"
- $(tc-getCC) ${flags[@]} -c ncal.c || die "failed to compile cal"
- echo "$(tc-getCC) ${flags[@]} -o cal calendar.o easter.o ncal.o"
- $(tc-getCC) ${flags[@]} -o cal calendar.o easter.o ncal.o || die "failed to compile cal"
-
- TS=${S}/shell_cmds-${SHELL_VER}
- # only pick those tools not provided by corepatch, findutils
- for t in \
- apply getopt hostname jot kill killall \
- lastcomm renice script shlock time whereis;
- do
- echo "in ${TS}/${t}:"
- echo "$(tc-getCC) ${flags[@]} -o ${t} ${t}.c"
- cd "${TS}/${t}"
- $(tc-getCC) ${flags[@]} -o ${t} ${t}.c || die "failed to compile $t"
- done
- cd "${TS}/w"
- sed -i -e '/#include <libutil.h>/d' w.c || die
- echo "in ${TS}/w:"
- echo "$(tc-getCC) ${flags[@]} -DHAVE_UTMPX=1 -lresolv -o w w.c pr_time.c proc_compare.c"
- $(tc-getCC) ${flags[@]} -DHAVE_UTMPX=1 -lresolv -o w w.c pr_time.c proc_compare.c \
- || die "failed to compile w"
-
- TS=${S}/developer_cmds-${DEV_VER}
- # only pick those tools that do not conflict (no ctags and indent)
- # do not install lorder, mkdep and vgrind as they are a non-prefix-aware
- # shell scripts
- # don't install rpcgen, as it is heavily related to the OS it runs
- # on (and this is the Snow Leopard version)
- for t in asa hexdump unifdef what ; do
- echo "in ${TS}/${t}:"
- cd "${TS}/${t}" || die
- echo "$(tc-getCC) ${flags[@]} -o ${t}" *.c
- $(tc-getCC) ${flags[@]} -o ${t} *.c || die "failed to compile $t"
- done
-
- TS=${S}/adv_cmds-${MD_VER}
- for t in md ; do
- echo "in ${TS}/${t}:"
- cd "${TS}/${t}" || die
- echo "$(tc-getCC) ${flags[@]} -o ${t}" *.c
- $(tc-getCC) ${flags[@]} -o ${t} *.c || die "failed to compile $t"
- done
-}
-
-src_install() {
- mkdir -p "${ED}"/bin
- mkdir -p "${ED}"/usr/bin
-
- local TS=${S}/misc_cmds-${MISC_VER}
- for t in leave units calendar ; do
- cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
- doman "${TS}/${t}/${t}.1"
- done
- # copy cal separately
- cp "${TS}/ncal/cal" "${ED}"/usr/bin/
- dosym /usr/bin/cal /usr/bin/ncal
- doman "${TS}/ncal/ncal.1"
- dosym /usr/share/man/man1/ncal.1 /usr/share/man/man1/cal.1
-
- TS=${S}/shell_cmds-${SHELL_VER}
- for t in \
- apply getopt jot killall lastcomm \
- renice script shlock time w whereis;
- do
- cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
- [[ -f "${TS}/${t}/${t}.1" ]] && doman "${TS}/${t}/${t}.1"
- [[ -f "${TS}/${t}/${t}.8" ]] && doman "${TS}/${t}/${t}.8"
- done
- cp "${TS}/w/w" "${ED}"/usr/bin/uptime
- doman "${TS}/w/uptime.1"
- for t in hostname kill; do
- cp "${TS}/${t}/${t}" "${ED}"/bin/
- doman "${TS}/${t}/${t}.1"
- done
-
- TS=${S}/developer_cmds-${DEV_VER}
- for t in asa hexdump unifdef what ; do
- cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
- doman "${TS}/${t}/${t}.1"
- done
-
- TS=${S}/adv_cmds-${MD_VER}
- for t in md ; do
- cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
- doman "${TS}/${t}/${t}.1"
- done
-}
diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-11.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-11.ebuild
deleted file mode 100644
index 7855631541ef..000000000000
--- a/sys-apps/darwin-miscutils/darwin-miscutils-11.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-# from macOS 10.12
-MISC_VER=33
-SHELL_VER=198
-# from DT 8.1
-DEV_VER=63
-# from 10.7.4
-MD_VER=147 # 148 in 10.8 has no md, bug #428530
-
-DESCRIPTION="Miscellaneous commands used on macOS, Sierra 10.12"
-HOMEPAGE="https://www.opensource.apple.com/"
-SRC_URI="https://opensource.apple.com/tarballs/misc_cmds/misc_cmds-${MISC_VER}.tar.gz
- https://opensource.apple.com/tarballs/shell_cmds/shell_cmds-${SHELL_VER}.tar.gz
- https://opensource.apple.com/tarballs/developer_cmds/developer_cmds-${DEV_VER}.tar.gz
- https://opensource.apple.com/source/adv_cmds/adv_cmds-${MD_VER}/md/md.c -> adv_cmds-md-${MD_VER}.c
- https://opensource.apple.com/source/adv_cmds/adv_cmds-${MD_VER}/md/md.1 -> adv_cmds-md-${MD_VER}.1"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~arm64-macos ~ppc-macos ~x64-macos"
-IUSE=""
-
-S=${WORKDIR}
-
-src_prepare() {
- cd "${S}"/shell_cmds-${SHELL_VER} || die
- eapply "${FILESDIR}"/${PN}-6-w64.patch
-
- mkdir -p "${S}"/adv_cmds-${MD_VER}/md || die
- cp "${DISTDIR}"/adv_cmds-md-${MD_VER}.c \
- "${S}"/adv_cmds-${MD_VER}/md/md.c || die
- cp "${DISTDIR}"/adv_cmds-md-${MD_VER}.1 \
- "${S}"/adv_cmds-${MD_VER}/md/md.1 || die
-
- eapply_user
-}
-
-src_compile() {
- local flags=(
- ${CFLAGS}
- -I.
- -D__FBSDID=__RCSID
- -Wsystem-headers
- -Du_int=uint32_t
- -include stdint.h
- ${LDFLAGS}
- )
-
- local TS=${S}/misc_cmds-${MISC_VER}
- # tsort is provided by coreutils
- for t in leave units calendar; do
- cd "${TS}/${t}"
- echo "in ${TS}/${t}:"
- echo "$(tc-getCC) ${flags[@]} -o ${t}" *.c
- $(tc-getCC) ${flags[@]} -o ${t} *.c || die "failed to compile $t"
- done
- # compile cal separately
- cd "${TS}/ncal"
- echo "in ${TS}/ncal:"
- echo "$(tc-getCC) ${flags[@]} -c calendar.c"
- $(tc-getCC) ${flags[@]} -c calendar.c || die "failed to compile cal"
- echo "$(tc-getCC) ${flags[@]} -c easter.c"
- $(tc-getCC) ${flags[@]} -c easter.c || die "failed to compile cal"
- echo "$(tc-getCC) ${flags[@]} -c ncal.c"
- $(tc-getCC) ${flags[@]} -c ncal.c || die "failed to compile cal"
- echo "$(tc-getCC) ${flags[@]} -o cal calendar.o easter.o ncal.o"
- $(tc-getCC) ${flags[@]} -o cal calendar.o easter.o ncal.o || die "failed to compile cal"
-
- TS=${S}/shell_cmds-${SHELL_VER}
- # only pick those tools not provided by coreutils, findutils
- for t in \
- apply getopt hexdump hostname jot kill killall \
- lastcomm renice script shlock time whereis;
- do
- echo "in ${TS}/${t}:"
- echo "$(tc-getCC) ${flags[@]} -o ${t} *.c"
- cd "${TS}/${t}"
- $(tc-getCC) ${flags[@]} -o ${t} *.c || die "failed to compile $t"
- done
- cd "${TS}/w"
- sed -i -e '/#include <libutil.h>/d' w.c || die
- echo "in ${TS}/w:"
- echo "$(tc-getCC) ${flags[@]} -DHAVE_UTMPX=1 -lresolv -o w *.c"
- $(tc-getCC) ${flags[@]} -DHAVE_UTMPX=1 -lresolv -o w *.c \
- || die "failed to compile w"
-
- TS=${S}/developer_cmds-${DEV_VER}
- # only pick those tools that do not conflict (no ctags and indent)
- # do not install lorder, mkdep and vgrind as they are a non-prefix-aware
- # shell scripts
- # don't install rpcgen, as it is heavily related to the OS it runs
- # on (and this is the Sierra version)
- for t in asa unifdef what ; do
- echo "in ${TS}/${t}:"
- cd "${TS}/${t}" || die
- echo "$(tc-getCC) ${flags[@]} -o ${t}" *.c
- $(tc-getCC) ${flags[@]} -o ${t} *.c || die "failed to compile $t"
- done
-
- # provide this one for gcc-apple
- TS=${S}/adv_cmds-${MD_VER}
- for t in md ; do
- echo "in ${TS}/${t}:"
- cd "${TS}/${t}" || die
- echo "$(tc-getCC) ${flags[@]} -o ${t}" *.c
- $(tc-getCC) ${flags[@]} -o ${t} *.c || die "failed to compile $t"
- done
-}
-
-src_install() {
- mkdir -p "${ED}"/bin
- mkdir -p "${ED}"/usr/bin
-
- local TS=${S}/misc_cmds-${MISC_VER}
- for t in leave units calendar ; do
- cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
- doman "${TS}/${t}/${t}.1"
- done
- # copy cal separately
- cp "${TS}/ncal/cal" "${ED}"/usr/bin/
- dosym /usr/bin/cal /usr/bin/ncal
- doman "${TS}/ncal/ncal.1"
- dosym /usr/share/man/man1/ncal.1 /usr/share/man/man1/cal.1
-
- TS=${S}/shell_cmds-${SHELL_VER}
- for t in \
- apply getopt hexdump hostname jot killall lastcomm \
- renice script shlock time w whereis;
- do
- cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
- [[ -f "${TS}/${t}/${t}.1" ]] && doman "${TS}/${t}/${t}.1"
- [[ -f "${TS}/${t}/${t}.8" ]] && doman "${TS}/${t}/${t}.8"
- done
- cp "${TS}/w/w" "${ED}"/usr/bin/uptime
- doman "${TS}/w/uptime.1"
- for t in hostname kill; do
- cp "${TS}/${t}/${t}" "${ED}"/bin/
- doman "${TS}/${t}/${t}.1"
- done
-
- TS=${S}/developer_cmds-${DEV_VER}
- for t in asa unifdef what ; do
- cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
- doman "${TS}/${t}/${t}.1"
- done
-
- TS=${S}/adv_cmds-${MD_VER}
- for t in md ; do
- cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
- doman "${TS}/${t}/${t}.1"
- done
-}
diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-6-r1.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-6-r1.ebuild
deleted file mode 100644
index 925ecd40fb14..000000000000
--- a/sys-apps/darwin-miscutils/darwin-miscutils-6-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs epatch
-
-MISC_VER=23
-SHELL_VER=118
-DEV_VER=49
-
-DESCRIPTION="Miscellaneous commands used on Darwin/Mac OS X systems, Leopard"
-HOMEPAGE="http://www.opensource.apple.com/"
-SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/misc_cmds-${MISC_VER}.tar.gz
- http://www.opensource.apple.com/darwinsource/tarballs/other/shell_cmds-${SHELL_VER}.tar.gz
- http://www.opensource.apple.com/darwinsource/tarballs/other/developer_cmds-${DEV_VER}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~arm64-macos ~ppc-macos ~x64-macos"
-IUSE=""
-
-S=${WORKDIR}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-5-w.patch
- epatch "${FILESDIR}"/${PN}-5-stdlib.patch
- epatch "${FILESDIR}"/${PN}-6-w64.patch
- cd "${S}"/developer_cmds-${DEV_VER}
- epatch "${FILESDIR}"/${PN}-5-error.patch
- # deal with OSX Lion and above
- sed -i -e 's/getline/ugetline/g' unifdef/unifdef.c || die
-
- eapply_user
-}
-
-src_compile() {
- local TS=${S}/misc_cmds-${MISC_VER}
- # tsort is provided by corepatch
- for t in leave units calendar; do
- cd "${TS}/${t}"
- echo "in ${TS}/${t}:"
- echo "$(tc-getCC) -o ${t}" *.c
- $(tc-getCC) -o ${t} *.c || die "failed to compile $t"
- done
- # compile cal separately
- cd "${TS}/ncal"
- echo "in ${TS}/ncal:"
- local flags
- flags[0]=-I.
- flags[1]=-D__FBSDID=__RCSID
- flags[2]=-Wsystem-headers
- echo "$(tc-getCC) ${flags[@]} -c calendar.c"
- $(tc-getCC) ${flags[@]} -c calendar.c || die "failed to compile cal"
- echo "$(tc-getCC) ${flags[@]} -c easter.c"
- $(tc-getCC) ${flags[@]} -c easter.c || die "failed to compile cal"
- echo "$(tc-getCC) ${flags[@]} -c ncal.c"
- $(tc-getCC) ${flags[@]} -c ncal.c || die "failed to compile cal"
- echo "$(tc-getCC) ${flags[@]} -o cal calendar.o easter.o ncal.o"
- $(tc-getCC) ${flags[@]} -o cal calendar.o easter.o ncal.o || die "failed to compile cal"
-
- TS=${S}/shell_cmds-${SHELL_VER}
- # only pick those tools not provided by corepatch, findutils
- for t in \
- alias apply getopt hostname jot kill \
- lastcomm renice shlock time whereis;
- do
- echo "in ${TS}/${t}:"
- echo "$(tc-getCC) -o ${t} ${t}.c"
- cd "${TS}/${t}"
- $(tc-getCC) -o ${t} ${t}.c || die "failed to compile $t"
- done
- # script and killall need additonal flags
- for t in \
- killall script
- do
- echo "in ${TS}/${t}:"
- echo "$(tc-getCC) -D__FBSDID=__RCSID -o ${t} ${t}.c"
- cd "${TS}/${t}"
- $(tc-getCC) -D__FBSDID=__RCSID -o ${t} ${t}.c || die "failed to compile $t"
- done
- cd "${TS}/w"
- echo "in ${TS}/w:"
- echo "$(tc-getCC) -DHAVE_UTMPX=1 -lresolv -o w w.c pr_time.c proc_compare.c"
- $(tc-getCC) -DHAVE_UTMPX=1 -lresolv -o w w.c pr_time.c proc_compare.c \
- || die "failed to compile w"
-
- TS=${S}/developer_cmds-${DEV_VER}
- # only pick those tools that do not conflict (no ctags and indent)
- # do not install lorder, mkdep and vgrind as they are a non-prefix-aware
- # shell scripts
- # don't install rpcgen, as it is heavily related to the OS it runs
- # on (and this is the Leopard version)
- for t in asa error hexdump unifdef what ; do
- echo "in ${TS}/${t}:"
- cd "${TS}/${t}"
- sed -i -e '/^__FBSDID/d' *.c
- echo "$(tc-getCC) -o ${t}" *.c
- $(tc-getCC) -o ${t} *.c || die "failed to compile $t"
- done
-}
-
-src_install() {
- mkdir -p "${ED}"/bin
- mkdir -p "${ED}"/usr/bin
-
- local TS=${S}/misc_cmds-${MISC_VER}
- for t in leave units calendar ; do
- cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
- doman "${TS}/${t}/${t}.1"
- done
- # copy cal separately
- cp "${TS}/ncal/cal" "${ED}"/usr/bin/
- dosym /usr/bin/cal /usr/bin/ncal
- doman "${TS}/ncal/ncal.1"
- dosym /usr/share/man/man1/ncal.1 /usr/share/man/man1/cal.1
-
- TS=${S}/shell_cmds-${SHELL_VER}
- for t in \
- alias apply getopt jot killall lastcomm \
- renice script shlock su time w whereis;
- do
- cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
- [[ -f "${TS}/${t}/${t}.1" ]] && doman "${TS}/${t}/${t}.1"
- [[ -f "${TS}/${t}/${t}.8" ]] && doman "${TS}/${t}/${t}.8"
- done
- cp "${TS}/w/w" "${ED}"/usr/bin/uptime
- doman "${TS}/w/uptime.1"
- for t in hostname kill; do
- cp "${TS}/${t}/${t}" "${ED}"/bin/
- doman "${TS}/${t}/${t}.1"
- done
-
- TS=${S}/developer_cmds-${DEV_VER}
- for t in asa error hexdump unifdef what ; do
- cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
- doman "${TS}/${t}/${t}.1"
- done
-}
diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-8.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-8.ebuild
deleted file mode 100644
index e9a8334e4054..000000000000
--- a/sys-apps/darwin-miscutils/darwin-miscutils-8.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs epatch
-
-MISC_VER=27
-SHELL_VER=149
-DEV_VER=53.1
-
-DESCRIPTION="Miscellaneous commands used on Darwin/Mac OS X systems, Snow Leopard 10.6.3"
-HOMEPAGE="http://www.opensource.apple.com/"
-SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/misc_cmds-${MISC_VER}.tar.gz
- http://www.opensource.apple.com/darwinsource/tarballs/other/shell_cmds-${SHELL_VER}.tar.gz
- http://www.opensource.apple.com/darwinsource/tarballs/other/developer_cmds-${DEV_VER}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~arm64-macos ~ppc-macos ~x64-macos"
-IUSE=""
-
-S=${WORKDIR}
-
-src_prepare() {
- cd "${S}"/shell_cmds-${SHELL_VER}
- epatch "${FILESDIR}"/${PN}-6-w64.patch
- # deal with OSX Lion and above
- cd "${S}"/developer_cmds-${DEV_VER}
- sed -i -e 's/getline/ugetline/g' unifdef/unifdef.c || die
-
- eapply_user
-}
-
-src_compile() {
- local flags=(
- ${CFLAGS}
- -I.
- -D__FBSDID=__RCSID
- -Wsystem-headers
- -Du_int=uint32_t
- -include stdint.h
- ${LDFLAGS}
- )
-
- local TS=${S}/misc_cmds-${MISC_VER}
- # tsort is provided by corepatch
- for t in leave units calendar; do
- cd "${TS}/${t}"
- echo "in ${TS}/${t}:"
- echo "$(tc-getCC) ${flags[@]} -o ${t}" *.c
- $(tc-getCC) ${flags[@]} -o ${t} *.c || die "failed to compile $t"
- done
- # compile cal separately
- cd "${TS}/ncal"
- echo "in ${TS}/ncal:"
- echo "$(tc-getCC) ${flags[@]} -c calendar.c"
- $(tc-getCC) ${flags[@]} -c calendar.c || die "failed to compile cal"
- echo "$(tc-getCC) ${flags[@]} -c easter.c"
- $(tc-getCC) ${flags[@]} -c easter.c || die "failed to compile cal"
- echo "$(tc-getCC) ${flags[@]} -c ncal.c"
- $(tc-getCC) ${flags[@]} -c ncal.c || die "failed to compile cal"
- echo "$(tc-getCC) ${flags[@]} -o cal calendar.o easter.o ncal.o"
- $(tc-getCC) ${flags[@]} -o cal calendar.o easter.o ncal.o || die "failed to compile cal"
-
- TS=${S}/shell_cmds-${SHELL_VER}
- # only pick those tools not provided by corepatch, findutils
- for t in \
- alias apply getopt hostname jot kill killall \
- lastcomm renice script shlock time whereis;
- do
- echo "in ${TS}/${t}:"
- echo "$(tc-getCC) ${flags[@]} -o ${t} ${t}.c"
- cd "${TS}/${t}"
- $(tc-getCC) ${flags[@]} -o ${t} ${t}.c || die "failed to compile $t"
- done
- cd "${TS}/w"
- sed -i -e '/#include <libutil.h>/d' w.c || die
- echo "in ${TS}/w:"
- echo "$(tc-getCC) ${flags[@]} -DHAVE_UTMPX=1 -lresolv -o w w.c pr_time.c proc_compare.c"
- $(tc-getCC) ${flags[@]} -DHAVE_UTMPX=1 -lresolv -o w w.c pr_time.c proc_compare.c \
- || die "failed to compile w"
-
- TS=${S}/developer_cmds-${DEV_VER}
- # only pick those tools that do not conflict (no ctags and indent)
- # do not install lorder, mkdep and vgrind as they are a non-prefix-aware
- # shell scripts
- # don't install rpcgen, as it is heavily related to the OS it runs
- # on (and this is the Snow Leopard version)
- for t in asa hexdump unifdef what ; do
- echo "in ${TS}/${t}:"
- cd "${TS}/${t}" || die
- echo "$(tc-getCC) ${flags[@]} -o ${t}" *.c
- $(tc-getCC) ${flags[@]} -o ${t} *.c || die "failed to compile $t"
- done
-}
-
-src_install() {
- mkdir -p "${ED}"/bin
- mkdir -p "${ED}"/usr/bin
-
- local TS=${S}/misc_cmds-${MISC_VER}
- for t in leave units calendar ; do
- cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
- doman "${TS}/${t}/${t}.1"
- done
- # copy cal separately
- cp "${TS}/ncal/cal" "${ED}"/usr/bin/
- dosym /usr/bin/cal /usr/bin/ncal
- doman "${TS}/ncal/ncal.1"
- dosym /usr/share/man/man1/ncal.1 /usr/share/man/man1/cal.1
-
- TS=${S}/shell_cmds-${SHELL_VER}
- for t in \
- alias apply getopt jot killall lastcomm \
- renice script shlock time w whereis;
- do
- cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
- [[ -f "${TS}/${t}/${t}.1" ]] && doman "${TS}/${t}/${t}.1"
- [[ -f "${TS}/${t}/${t}.8" ]] && doman "${TS}/${t}/${t}.8"
- done
- cp "${TS}/w/w" "${ED}"/usr/bin/uptime
- doman "${TS}/w/uptime.1"
- for t in hostname kill; do
- cp "${TS}/${t}/${t}" "${ED}"/bin/
- doman "${TS}/${t}/${t}.1"
- done
-
- TS=${S}/developer_cmds-${DEV_VER}
- for t in asa hexdump unifdef what ; do
- cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
- doman "${TS}/${t}/${t}.1"
- done
-}
diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-9.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-9.ebuild
deleted file mode 100644
index 8e33203bfe72..000000000000
--- a/sys-apps/darwin-miscutils/darwin-miscutils-9.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs epatch
-
-MISC_VER=31
-SHELL_VER=162
-DEV_VER=55
-
-DESCRIPTION="Miscellaneous commands used on Darwin/Mac OS X systems, Lion 10.7"
-HOMEPAGE="http://www.opensource.apple.com/"
-SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/misc_cmds-${MISC_VER}.tar.gz
- http://www.opensource.apple.com/darwinsource/tarballs/other/shell_cmds-${SHELL_VER}.tar.gz
- http://www.opensource.apple.com/darwinsource/tarballs/other/developer_cmds-${DEV_VER}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~arm64-macos ~ppc-macos ~x64-macos"
-IUSE=""
-
-S=${WORKDIR}
-
-src_prepare() {
- cd "${S}"/shell_cmds-${SHELL_VER}
- epatch "${FILESDIR}"/${PN}-6-w64.patch
-
- eapply_user
-}
-
-src_compile() {
- local flags=(
- ${CFLAGS}
- -I.
- -D__FBSDID=__RCSID
- -Wsystem-headers
- -Du_int=uint32_t
- -include stdint.h
- ${LDFLAGS}
- )
-
- local TS=${S}/misc_cmds-${MISC_VER}
- # tsort is provided by corepatch
- for t in leave units calendar; do
- cd "${TS}/${t}"
- echo "in ${TS}/${t}:"
- echo "$(tc-getCC) ${flags[@]} -o ${t}" *.c
- $(tc-getCC) ${flags[@]} -o ${t} *.c || die "failed to compile $t"
- done
- # compile cal separately
- cd "${TS}/ncal"
- echo "in ${TS}/ncal:"
- echo "$(tc-getCC) ${flags[@]} -c calendar.c"
- $(tc-getCC) ${flags[@]} -c calendar.c || die "failed to compile cal"
- echo "$(tc-getCC) ${flags[@]} -c easter.c"
- $(tc-getCC) ${flags[@]} -c easter.c || die "failed to compile cal"
- echo "$(tc-getCC) ${flags[@]} -c ncal.c"
- $(tc-getCC) ${flags[@]} -c ncal.c || die "failed to compile cal"
- echo "$(tc-getCC) ${flags[@]} -o cal calendar.o easter.o ncal.o"
- $(tc-getCC) ${flags[@]} -o cal calendar.o easter.o ncal.o || die "failed to compile cal"
-
- TS=${S}/shell_cmds-${SHELL_VER}
- # only pick those tools not provided by corepatch, findutils
- for t in \
- alias apply getopt hostname jot kill killall \
- lastcomm renice script shlock time whereis;
- do
- echo "in ${TS}/${t}:"
- echo "$(tc-getCC) ${flags[@]} -o ${t} ${t}.c"
- cd "${TS}/${t}"
- $(tc-getCC) ${flags[@]} -o ${t} ${t}.c || die "failed to compile $t"
- done
- cd "${TS}/w"
- sed -i -e '/#include <libutil.h>/d' w.c || die
- echo "in ${TS}/w:"
- echo "$(tc-getCC) ${flags[@]} -DHAVE_UTMPX=1 -lresolv -o w w.c pr_time.c proc_compare.c"
- $(tc-getCC) ${flags[@]} -DHAVE_UTMPX=1 -lresolv -o w w.c pr_time.c proc_compare.c \
- || die "failed to compile w"
-
- TS=${S}/developer_cmds-${DEV_VER}
- # only pick those tools that do not conflict (no ctags and indent)
- # do not install lorder, mkdep and vgrind as they are a non-prefix-aware
- # shell scripts
- # don't install rpcgen, as it is heavily related to the OS it runs
- # on (and this is the Snow Leopard version)
- for t in asa hexdump unifdef what ; do
- echo "in ${TS}/${t}:"
- cd "${TS}/${t}" || die
- echo "$(tc-getCC) ${flags[@]} -o ${t}" *.c
- $(tc-getCC) ${flags[@]} -o ${t} *.c || die "failed to compile $t"
- done
-}
-
-src_install() {
- mkdir -p "${ED}"/bin
- mkdir -p "${ED}"/usr/bin
-
- local TS=${S}/misc_cmds-${MISC_VER}
- for t in leave units calendar ; do
- cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
- doman "${TS}/${t}/${t}.1"
- done
- # copy cal separately
- cp "${TS}/ncal/cal" "${ED}"/usr/bin/
- dosym /usr/bin/cal /usr/bin/ncal
- doman "${TS}/ncal/ncal.1"
- dosym /usr/share/man/man1/ncal.1 /usr/share/man/man1/cal.1
-
- TS=${S}/shell_cmds-${SHELL_VER}
- for t in \
- alias apply getopt jot killall lastcomm \
- renice script shlock time w whereis;
- do
- cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
- [[ -f "${TS}/${t}/${t}.1" ]] && doman "${TS}/${t}/${t}.1"
- [[ -f "${TS}/${t}/${t}.8" ]] && doman "${TS}/${t}/${t}.8"
- done
- cp "${TS}/w/w" "${ED}"/usr/bin/uptime
- doman "${TS}/w/uptime.1"
- for t in hostname kill; do
- cp "${TS}/${t}/${t}" "${ED}"/bin/
- doman "${TS}/${t}/${t}.1"
- done
-
- TS=${S}/developer_cmds-${DEV_VER}
- for t in asa hexdump unifdef what ; do
- cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
- doman "${TS}/${t}/${t}.1"
- done
-}
diff --git a/sys-apps/darwin-miscutils/files/darwin-miscutils-5-error.patch b/sys-apps/darwin-miscutils/files/darwin-miscutils-5-error.patch
deleted file mode 100644
index 391dceb39188..000000000000
--- a/sys-apps/darwin-miscutils/files/darwin-miscutils-5-error.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- developer_cmds-48/error/error.h
-+++ developer_cmds-48/error/error.h
-@@ -194,11 +194,7 @@
- */
- extern int nerrors;
- extern Eptr er_head;
--#ifdef __APPLE__
--__private_extern__
--#else
- extern
--#endif
- Eptr *errors;
- /*
- * Resources for each of the files mentioned
diff --git a/sys-apps/darwin-miscutils/files/darwin-miscutils-5-stdlib.patch b/sys-apps/darwin-miscutils/files/darwin-miscutils-5-stdlib.patch
deleted file mode 100644
index 0605310bff42..000000000000
--- a/sys-apps/darwin-miscutils/files/darwin-miscutils-5-stdlib.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- misc_cmds-23/leave/leave.c
-+++ misc_cmds-23/leave/leave.c
-@@ -34,6 +34,7 @@
- */
-
- #include <sys/cdefs.h>
-+#include <stdlib.h>
- #ifndef lint
- __COPYRIGHT("@(#) Copyright (c) 1980, 1988, 1993\n\
- The Regents of the University of California. All rights reserved.\n");
---- shell_cmds-118/alias/alias.c
-+++ shell_cmds-118/alias/alias.c
-@@ -3,6 +3,7 @@
- the shell scripts. It does not lead to any deliverable. Do not remove this
- file from this (..../shell_cmds/alias) directory.
- */
-+#include <stdlib.h>
- int main()
- {
- exit(0);
diff --git a/sys-apps/darwin-miscutils/files/darwin-miscutils-5-w.patch b/sys-apps/darwin-miscutils/files/darwin-miscutils-5-w.patch
deleted file mode 100644
index f6db3753d930..000000000000
--- a/sys-apps/darwin-miscutils/files/darwin-miscutils-5-w.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- shell_cmds-118/w/w.c
-+++ shell_cmds-118/w/w.c
-@@ -75,7 +75,6 @@
- #include <kvm.h>
- #endif
- #include <langinfo.h>
--#include <libutil.h>
- #include <limits.h>
- #include <locale.h>
- #include <netdb.h>
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/darwin-miscutils/files/, sys-apps/darwin-miscutils/
@ 2024-04-07 10:30 Fabian Groffen
0 siblings, 0 replies; 2+ messages in thread
From: Fabian Groffen @ 2024-04-07 10:30 UTC (permalink / raw
To: gentoo-commits
commit: 0b459be146d2d379af518b7e8d02a9e0ecff6c50
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 7 10:29:27 2024 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Apr 7 10:30:52 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b459be1
app-misc/darwin-miscutils-12-r1: big cleanup
Remove most tools that are nowadays obsolete compared to host versions
and not really necessary either.
Patch md so we can have silent compilation with compilers from this era.
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
sys-apps/darwin-miscutils/Manifest | 4 +-
.../darwin-miscutils/darwin-miscutils-12-r1.ebuild | 96 ++-------
.../darwin-miscutils/darwin-miscutils-12.ebuild | 157 --------------
.../files/darwin-miscutils-12-md-modern-c.patch | 235 +++++++++++++++++++++
.../files/darwin-miscutils-12-md-register.patch | 14 --
.../files/darwin-miscutils-6-w64.patch | 17 --
6 files changed, 256 insertions(+), 267 deletions(-)
diff --git a/sys-apps/darwin-miscutils/Manifest b/sys-apps/darwin-miscutils/Manifest
index 3696e7f13dba..f2902a6d8de1 100644
--- a/sys-apps/darwin-miscutils/Manifest
+++ b/sys-apps/darwin-miscutils/Manifest
@@ -1,6 +1,4 @@
DIST adv_cmds-md-147-compile.patch 5423 BLAKE2B f54aaaa8fcecb81fd8e628bcb384f537e572095b8210612c0748017f033e7bb6f9c5b1bd2c544fec23e8002a2ac7b99d840c85a8ca6faadac3b4da2edb77b459 SHA512 951e981b57e7d3d6ef51d638759559581dd4995ce66ec17bb2658f8a298683feb0842d10fd834b713ec39b2a0f671df56049b876d55f17bf1e988d76839fead1
DIST adv_cmds-md-147.1 3623 BLAKE2B 18b856770f0490ef241e19cc6f1661f6521bcc7f363bff41fbec548388d8f1e2d9e6aea879064cd3d7e7d16f8e0b2ff17ead990051a068a66f520a5ff504afa3 SHA512 459beb2b7c92b8718c76d744bbabf631bf8c329feb65c9434ce8a023c73ceac2d207c95e39c4b90b095a4724a74096a3d1bed9122883eb54e5311dfc64ffc718
DIST adv_cmds-md-147.c 25945 BLAKE2B 38af9e06e18a15cc74a81464a4c1ecdf98b800eb34f33f6ab6203b60540e693d459805432e51bae1008661aa566830c87357432428f62d8cbea9973b1e5fc59a SHA512 93e70f7d8697652b5a3c661975d21b51545d2eb07de64fd40524fcf0d5016dae9ae1dc63c4a85cb5ad455c8d1c246b7f5f2eac38226dcefbf4cab12b0b1c7592
-DIST developer_cmds-63.tar.gz 110662 BLAKE2B 383573203d124904d69e5dbc8f1c5e0aef1b5a2288e40449c8e95470b131c9dc1f181338c38f292a1bcc5a105a54010e23bc12e233d7a92d9c983eb975429474 SHA512 4f672835f0290feaf54c7c268b31774282325448f30c02e4f12ead84c41e15083784fac4c9c4916c098953bc61aa8f29bea24a7b51312428aa87448595be50a1
-DIST misc_cmds-34.tar.gz 124023 BLAKE2B 3c634ab540f4b1046e6abe05476a399ea00fd6d35d2d450f68cd7c3f52c8b9321039221659647b6623d5621af1789dba3798ec9f5cff8677653fbb3f295d1d1c SHA512 5e4040c49cc6aed8d4b471cc5d26d978717c9ad29315d40098090d0f7fee5a78289f2092fd6e8c7b7adea31b766cfefdef0da957b86ffb4e0781c13f4b5e4dbe
-DIST shell_cmds-203.tar.gz 428799 BLAKE2B 54103daa8a8758dd34a66f9c34a5fa4cad2e6a2dd36ff838498d82179566eb95c25c49126341ac481889381c2d39ebea3bf57959bb943536a7ba8a90fcf96f67 SHA512 ba9b00d6681d286e6210d49d70e1f526e86b0a76ed794050e9cdbdb8c0cc30dbe82ee9cd908578ddabb19c53c8994f1b84650f08bfeb88ea9f77d4de942c1cb1
+DIST developer_cmds-63.tar.gz 110943 BLAKE2B 3dfa56406ca3bb3a56122c172151f20cdbf6191a1511e5cfe2db03bd133e565bee7ddd5cd7cbe34aa2e4513a21a8502d44d480f5bc20621cc615b2bc36f1b8c1 SHA512 c37dead04c6e4fb409704d206e5ad66c779917d21aa2930746ed1145be9a392db861f09feb9c97a2fc8c985cf6bce98ddb96fc2688bada1b21a3ac7abbb90f1f
diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-12-r1.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-12-r1.ebuild
index 5762a7cf8207..c8f3e71d0567 100644
--- a/sys-apps/darwin-miscutils/darwin-miscutils-12-r1.ebuild
+++ b/sys-apps/darwin-miscutils/darwin-miscutils-12-r1.ebuild
@@ -5,27 +5,20 @@ EAPI=8
inherit edo toolchain-funcs
-# from macOS 10.13
-MISC_VER=34
-SHELL_VER=203
# from DT 8.2.1
DEV_VER=63
# from 10.7.4
MD_VER=147 # adv_cmds-148 in 10.8 has no md, bug #428530
DESCRIPTION="Miscellaneous commands used on macOS, High Sierra 10.13"
-HOMEPAGE="
- https://www.opensource.apple.com/
- https://github.com/apple-oss-distributions"
+HOMEPAGE="https://github.com/apple-oss-distributions"
SRC_URI="
https://github.com/apple-oss-distributions/adv_cmds/blob/c8dbac91aa855b2d05282f45709b318f8bc3693d/md/md.1 \
-> adv_cmds-md-${MD_VER}.1
https://github.com/apple-oss-distributions/adv_cmds/blob/c8dbac91aa855b2d05282f45709b318f8bc3693d/md/md.c \
-> adv_cmds-md-${MD_VER}.c
https://642666.bugs.gentoo.org/attachment.cgi?id=511988 -> adv_cmds-md-${MD_VER}-compile.patch
- https://opensource.apple.com/tarballs/misc_cmds/misc_cmds-${MISC_VER}.tar.gz
- https://opensource.apple.com/tarballs/shell_cmds/shell_cmds-${SHELL_VER}.tar.gz
- https://opensource.apple.com/tarballs/developer_cmds/developer_cmds-${DEV_VER}.tar.gz"
+ https://github.com/apple-oss-distributions/developer_cmds/archive/refs/tags/developer_cmds-${DEV_VER}.tar.gz"
S="${WORKDIR}"
LICENSE="BSD"
@@ -33,25 +26,23 @@ SLOT="0"
KEYWORDS="~arm64-macos ~ppc-macos ~x64-macos"
# for ncal
-DEPEND="sys-libs/ncurses:="
+DEPEND=""
RDEPEND="${DEPEND}"
src_prepare() {
- cd "${S}"/shell_cmds-${SHELL_VER} || die
- eapply "${FILESDIR}"/${PN}-6-w64.patch
-
mkdir -p "${S}"/adv_cmds-${MD_VER}/md || die
cd "${S}"/adv_cmds-${MD_VER} || die
cp "${DISTDIR}"/adv_cmds-md-${MD_VER}.c md/md.c || die
cp "${DISTDIR}"/adv_cmds-md-${MD_VER}.1 md/md.1 || die
- eapply "${DISTDIR}"/adv_cmds-md-${MD_VER}-compile.patch
- eapply "${FILESDIR}"/${PN}-12-md-register.patch
+ eapply "${FILESDIR}"/${PN}-12-md-modern-c.patch
cd "${S}" || die
eapply_user
}
src_compile() {
+ local t
+ local TS
local flags=(
${CFLAGS}
-I.
@@ -60,38 +51,17 @@ src_compile() {
-include stdint.h
)
- local TS="${S}/misc_cmds-${MISC_VER}"
- local t
- # tsort is provided by coreutils
- for t in leave units calendar; do
- cd "${TS}/${t}" || die
- echo "in ${TS}/${t}:"
- edo $(tc-getCC) ${flags[@]} -o ${t} ${LDFLAGS} *.c
- done
- # compile cal separately
- cd "${TS}/ncal" || die
- echo "in ${TS}/ncal:"
- edo $(tc-getCC) ${flags[@]} -c calendar.c
- edo $(tc-getCC) ${flags[@]} -c easter.c
- edo $(tc-getCC) ${flags[@]} -c ncal.c
- edo $(tc-getCC) -o cal ${LDFLAGS} -lncurses calendar.o easter.o ncal.o
-
- TS="${S}/shell_cmds-${SHELL_VER}"
- # only pick those tools not provided by coreutils, findutils
- for t in \
- apply getopt hexdump hostname jot kill killall \
- lastcomm renice script shlock time whereis;
- do
- echo "in ${TS}/${t}:"
- cd "${TS}/${t}" || die
- edo $(tc-getCC) ${flags[@]} -o ${t} ${LDFLAGS} *.c
- done
- cd "${TS}/w" || die
- sed -i -e '/#include <libutil.h>/d' w.c || die
- echo "in ${TS}/w:"
- edo $(tc-getCC) ${flags[@]} -DHAVE_UTMPX=1 ${LDFLAGS} -lresolv -o w *.c
-
- TS="${S}/developer_cmds-${DEV_VER}"
+ # grobian 2024-04-07:
+ # removed most tools here that are provided by host as well, but
+ # newer versions, and they are in no way critical, but better
+ # figured out by Apple (e.g. tools like w/uptime and hostname)
+ # what's left here is developer tools that GCC interacts with
+ # tools from developer_cmds we could probably loose, but they've
+ # always worked up sofar, and they are needed on old targets
+ # (Darwin9) most likely, so keep them. md is just plain missing, so
+ # keep it in any case
+
+ TS="${S}/developer_cmds-developer_cmds-${DEV_VER}" # new github archives
# only pick those tools that do not conflict (no ctags and indent)
# do not install lorder, mkdep and vgrind as they are a non-prefix-aware
# shell scripts
@@ -113,37 +83,11 @@ src_compile() {
}
src_install() {
- mkdir -p "${ED}"/{,usr/}bin || die
-
- local TS="${S}/misc_cmds-${MISC_VER}"
local t
- for t in leave units calendar ; do
- cp "${TS}/${t}/${t}" "${ED}"/usr/bin/ || die
- doman "${TS}/${t}/${t}.1"
- done
- # copy cal separately
- cp "${TS}/ncal/cal" "${ED}"/usr/bin/ncal || die
- dosym ncal /usr/bin/cal
- doman "${TS}/ncal/ncal.1"
- dosym ncal.1 /usr/share/man/man1/cal.1
-
- TS="${S}/shell_cmds-${SHELL_VER}"
- for t in \
- apply getopt hexdump hostname jot killall lastcomm \
- renice script shlock time w whereis;
- do
- cp "${TS}/${t}/${t}" "${ED}"/usr/bin/ || die
- [[ -f "${TS}/${t}/${t}.1" ]] && doman "${TS}/${t}/${t}.1"
- [[ -f "${TS}/${t}/${t}.8" ]] && doman "${TS}/${t}/${t}.8"
- done
- cp "${TS}/w/w" "${ED}"/usr/bin/uptime || die
- doman "${TS}/w/uptime.1"
- for t in hostname kill; do
- cp "${TS}/${t}/${t}" "${ED}"/bin/ || die
- doman "${TS}/${t}/${t}.1"
- done
+ local TS
+ mkdir -p "${ED}"/{,usr/}bin || die
- TS="${S}/developer_cmds-${DEV_VER}"
+ TS="${S}/developer_cmds-developer_cmds-${DEV_VER}" # new github archives
for t in asa unifdef what ; do
cp "${TS}/${t}/${t}" "${ED}"/usr/bin/ || die
doman "${TS}/${t}/${t}.1"
diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-12.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-12.ebuild
deleted file mode 100644
index 829ce1672016..000000000000
--- a/sys-apps/darwin-miscutils/darwin-miscutils-12.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-# from macOS 10.13
-MISC_VER=34
-SHELL_VER=203
-# from DT 8.2.1
-DEV_VER=63
-# from 10.7.4
-MD_VER=147 # adv_cmds-148 in 10.8 has no md, bug #428530
-
-DESCRIPTION="Miscellaneous commands used on macOS, High Sierra 10.13"
-HOMEPAGE="https://www.opensource.apple.com/"
-SRC_URI="https://opensource.apple.com/tarballs/misc_cmds/misc_cmds-${MISC_VER}.tar.gz
- https://opensource.apple.com/tarballs/shell_cmds/shell_cmds-${SHELL_VER}.tar.gz
- https://opensource.apple.com/tarballs/developer_cmds/developer_cmds-${DEV_VER}.tar.gz
- https://opensource.apple.com/source/adv_cmds/adv_cmds-${MD_VER}/md/md.c -> adv_cmds-md-${MD_VER}.c
- https://opensource.apple.com/source/adv_cmds/adv_cmds-${MD_VER}/md/md.1 -> adv_cmds-md-${MD_VER}.1
- https://642666.bugs.gentoo.org/attachment.cgi?id=511988 -> adv_cmds-md-${MD_VER}-compile.patch"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~arm64-macos ~ppc-macos ~x64-macos"
-IUSE=""
-
-# for ncal
-DEPEND="sys-libs/ncurses:="
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}
-
-src_prepare() {
- cd "${S}"/shell_cmds-${SHELL_VER} || die
- eapply "${FILESDIR}"/${PN}-6-w64.patch
-
- mkdir -p "${S}"/adv_cmds-${MD_VER}/md || die
- cd "${S}"/adv_cmds-${MD_VER} || die
- cp "${DISTDIR}"/adv_cmds-md-${MD_VER}.c md/md.c || die
- cp "${DISTDIR}"/adv_cmds-md-${MD_VER}.1 md/md.1 || die
- eapply "${DISTDIR}"/adv_cmds-md-${MD_VER}-compile.patch
- eapply "${FILESDIR}"/${PN}-12-md-register.patch
-
- cd "${S}"
- eapply_user
-}
-
-src_compile() {
- local flags=(
- ${CFLAGS}
- -I.
- -D__FBSDID=__RCSID
- -Du_int=uint32_t
- -include stdint.h
- )
-
- v() {
- echo "$*"
- $@
- }
-
- local TS=${S}/misc_cmds-${MISC_VER}
- # tsort is provided by coreutils
- for t in leave units calendar; do
- cd "${TS}/${t}"
- echo "in ${TS}/${t}:"
- v $(tc-getCC) ${flags[@]} -o ${t} ${LDFLAGS} *.c || die
- done
- # compile cal separately
- cd "${TS}/ncal"
- echo "in ${TS}/ncal:"
- v $(tc-getCC) ${flags[@]} -c calendar.c || die
- v $(tc-getCC) ${flags[@]} -c easter.c || die
- v $(tc-getCC) ${flags[@]} -c ncal.c || die
- v $(tc-getCC) -o cal ${LDFLAGS} -lncurses calendar.o easter.o ncal.o || die
-
- TS=${S}/shell_cmds-${SHELL_VER}
- # only pick those tools not provided by coreutils, findutils
- for t in \
- apply getopt hexdump hostname jot kill killall \
- lastcomm renice script shlock time whereis;
- do
- echo "in ${TS}/${t}:"
- cd "${TS}/${t}"
- v $(tc-getCC) ${flags[@]} -o ${t} ${LDFLAGS} *.c || die
- done
- cd "${TS}/w"
- sed -i -e '/#include <libutil.h>/d' w.c || die
- echo "in ${TS}/w:"
- v $(tc-getCC) ${flags[@]} -DHAVE_UTMPX=1 ${LDFLAGS} -lresolv -o w *.c || die
-
- TS=${S}/developer_cmds-${DEV_VER}
- # only pick those tools that do not conflict (no ctags and indent)
- # do not install lorder, mkdep and vgrind as they are a non-prefix-aware
- # shell scripts
- # don't install rpcgen, as it is heavily related to the OS it runs
- # on (and this is the High Sierra version)
- for t in asa unifdef what ; do
- echo "in ${TS}/${t}:"
- cd "${TS}/${t}" || die
- v $(tc-getCC) ${flags[@]} -o ${t} ${LDFLAGS} *.c || die
- done
-
- # provide this one for gcc-apple
- TS=${S}/adv_cmds-${MD_VER}
- for t in md ; do
- echo "in ${TS}/${t}:"
- cd "${TS}/${t}" || die
- v $(tc-getCC) ${flags[@]} -o ${t} ${LDFLAGS} *.c || die
- done
-}
-
-src_install() {
- mkdir -p "${ED}"/{,usr/}bin
-
- local TS=${S}/misc_cmds-${MISC_VER}
- for t in leave units calendar ; do
- cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
- doman "${TS}/${t}/${t}.1"
- done
- # copy cal separately
- cp "${TS}/ncal/cal" "${ED}"/usr/bin/ncal
- dosym ncal /usr/bin/cal
- doman "${TS}/ncal/ncal.1"
- dosym ncal.1 /usr/share/man/man1/cal.1
-
- TS=${S}/shell_cmds-${SHELL_VER}
- for t in \
- apply getopt hexdump hostname jot killall lastcomm \
- renice script shlock time w whereis;
- do
- cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
- [[ -f "${TS}/${t}/${t}.1" ]] && doman "${TS}/${t}/${t}.1"
- [[ -f "${TS}/${t}/${t}.8" ]] && doman "${TS}/${t}/${t}.8"
- done
- cp "${TS}/w/w" "${ED}"/usr/bin/uptime
- doman "${TS}/w/uptime.1"
- for t in hostname kill; do
- cp "${TS}/${t}/${t}" "${ED}"/bin/
- doman "${TS}/${t}/${t}.1"
- done
-
- TS=${S}/developer_cmds-${DEV_VER}
- for t in asa unifdef what ; do
- cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
- doman "${TS}/${t}/${t}.1"
- done
-
- TS=${S}/adv_cmds-${MD_VER}
- for t in md ; do
- cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
- doman "${TS}/${t}/${t}.1"
- done
-}
diff --git a/sys-apps/darwin-miscutils/files/darwin-miscutils-12-md-modern-c.patch b/sys-apps/darwin-miscutils/files/darwin-miscutils-12-md-modern-c.patch
new file mode 100644
index 000000000000..2e6dcdb50d4b
--- /dev/null
+++ b/sys-apps/darwin-miscutils/files/darwin-miscutils-12-md-modern-c.patch
@@ -0,0 +1,235 @@
+md: bring up to date for modern C to allow Clang and recent GCC to compile
+
+Authors:
+Michael Weiser, https://bugs.gentoo.org/642666
+Alexey Sokolov, https://bugs.gentoo.org/758167
+Fabian Groffen
+
+--- adv_cmds-147/md/md.c
++++ adv_cmds-147/md/md.c
+@@ -78,6 +78,8 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <unistd.h>
++#include <fcntl.h>
+
+ #define LINESIZE 65536 // NeXT_MOD
+
+@@ -100,6 +102,7 @@
+ } dep_files[1000];
+ int dep_file_index;
+
++static int
+ qsort_strcmp(a, b)
+ struct dep *a, *b;
+ {
+@@ -137,9 +140,15 @@
+
+ static void scan_mak(FILE *, FILE *, char *);
+ static void finish_mak(FILE *, FILE *);
++static int read_dep(char *);
++static void expunge_mak(FILE *, FILE *);
++static void skip_mak(FILE *, FILE *);
++static void output_dep(FILE *);
++static void parse_dep();
++static void save_dot_o();
+
+-main(argc,argv)
+-register char **argv;
++int
++main(int argc, char** argv)
+ {
+ int size;
+
+@@ -152,7 +161,7 @@
+ if (*token++ != '-' || !*token)
+ break;
+ else { register int flag;
+- for ( ; flag = *token++ ; ) {
++ for ( ; (flag = *token++) ; ) {
+ switch (flag) {
+ case 'd':
+ delete++;
+@@ -177,7 +186,7 @@
+ expunge++;
+ break;
+ case 'D':
+- for ( ; flag = *token++ ; )
++ for ( ; (flag = *token++) ; )
+ switch (flag) {
+ case 'c':
+ D_contents++;
+@@ -211,10 +220,10 @@
+ }
+
+ if (!expunge && argc < 1) goto usage;
+- if ((int) outfile && (int) makefile) /* not both */
++ if (outfile && makefile) /* not both */
+ goto usage;
+
+- if ((int) outfile) {
++ if (outfile) {
+ /*
+ * NeXT_MOD, For SGS stuff, in case still linked to master version
+ */
+@@ -227,7 +236,7 @@
+ exit(1);
+ } else if (D_open)
+ printf("%s: opened outfile \"%s\"\n", name, outfile);
+- } else if (mak = find_mak(makefile)) {
++ } else if ((mak = find_mak(makefile))) {
+ makout = temp_mak();
+ out = makout;
+ if (expunge)
+@@ -235,7 +244,7 @@
+ else
+ skip_mak(mak, makout);
+ } else if (mak_eof && /* non existent file == mt file */
+- (int)(makout = temp_mak())) { /* but we need to be able */
++ (makout = temp_mak()) != NULL) { /* but we need to be able */
+ out = makout; /* to write here */
+ } else if (makefile) {
+ fprintf(stderr, "%s: makefile \"%s\" can not be opened or stat'ed\n",
+@@ -246,7 +255,7 @@
+ for (; argc--; argv++) {
+ dep_file_index = 0;
+
+- if (size = read_dep(*argv)) {
++ if ((size = read_dep(*argv))) {
+
+ save_dot_o();
+ if (D_depend) printf("%s: dot_o = \"%s\"\n", name, dot_o);
+@@ -269,8 +278,8 @@
+ }
+
+
+-read_dep(file)
+-register char *file;
++int
++read_dep(char *file)
+ {
+ register int fd;
+ register int size;
+@@ -294,7 +303,7 @@
+ switch(statbuf.st_mode & S_IFMT) {
+ case S_IFREG:
+ if (D_time)
+- printf("%s: file time = %d\n", name, statbuf.st_mtime);
++ printf("%s: file time = %ld\n", name, statbuf.st_mtime);
+
+ if (statbuf.st_size > IObuffer) {
+ fprintf(stderr, "%s: file \"%s\" tooo big for IObuffer\n",
+@@ -302,9 +311,9 @@
+ goto out;
+ } else if (force)
+ break;
+- else if ((int) mak && statbuf.st_mtime < makstat.st_mtime) {
++ else if (mak && statbuf.st_mtime < makstat.st_mtime) {
+ if (verbose || D_time)
+- fprintf(stderr, "%s: skipping \"%s\" %d < %d \"%s\"\n",
++ fprintf(stderr, "%s: skipping \"%s\" %ld < %ld \"%s\"\n",
+ name, file, statbuf.st_mtime, makstat.st_mtime,
+ real_mak_name);
+ goto out;
+@@ -345,6 +354,7 @@
+ return 0;
+ }
+
++static void
+ save_dot_o()
+ {
+ register char *cp = file_array;
+@@ -355,6 +365,7 @@
+ *svp = 0;
+ }
+
++static void
+ parse_dep()
+ {
+ register char *lp = file_array;
+@@ -381,7 +392,8 @@
+ cp = dep_line;
+ lp[-1] = 0;
+ /* skip .o file name */
+- while ((c = *cp++) && c != ':'); if (!c) continue;
++ while ((c = *cp++) && c != ':');
++ if (!c) continue;
+ next_filename:
+ i = 0;
+ abspath = 0;
+@@ -415,7 +427,7 @@
+ if (abspath)
+ *cp++ = '/';
+ for (c=0; c<i; c++) {register char *ccp = path_component[c];
+- while (*cp++ = *ccp++);
++ while ((*cp++ = *ccp++));
+ *--cp = '/';
+ cp++;
+ }
+@@ -425,7 +437,7 @@
+ dep_files[c].str = tlp;
+ dep_files[c].len = cp - tlp;
+ if (D_depend)
+- printf("%s: dep_file[%d] = \"%s\" Len %d\n",
++ printf("%s: dep_file[%d] = \"%s\" Len %ld\n",
+ name, dep_file_index - 1, tlp, cp - tlp);
+ tlp = cp + 1;
+ if (oldc)
+@@ -436,8 +448,8 @@
+ }
+ }
+
+-output_dep(out)
+-FILE *out;
++static void
++output_dep(FILE *out)
+ {
+ register int j;
+ register int size = 1000;
+@@ -479,12 +491,11 @@
+
+ /* process makefile */
+ FILE *
+-find_mak(file)
+-char *file;
++find_mak(char *file)
+ {
+ FILE *mak;
+
+- if ((int) file) {
++ if (file) {
+ if ((mak = fopen(file, "r")) != NULL) {
+ real_mak_name = file;
+ } else if (update) {
+@@ -514,7 +525,7 @@
+ if (D_open)
+ printf("%s: opened makefile \"%s\"\n", name, real_mak_name);
+ if (D_time)
+- printf("%s: makefile time = %d\n", name, makstat.st_mtime);
++ printf("%s: makefile time = %ld\n", name, makstat.st_mtime);
+
+ return mak;
+ }
+@@ -543,8 +554,8 @@
+ return mak;
+ }
+
+-skip_mak(makin, makout)
+-register FILE *makin, *makout;
++static void
++skip_mak(FILE *makin, FILE *makout)
+ {
+ register int len = SALUTATIONLEN;
+
+@@ -566,8 +577,8 @@
+ printf("eof = %d str = \"%s\"", mak_eof, makbuf);
+ }
+
+-expunge_mak(makin, makout)
+-register FILE *makin, *makout;
++static void
++expunge_mak(FILE *makin, FILE *makout)
+ {
+ register int len = SALUTATIONLEN;
+ register int oldlen = OLDSALUTATIONLEN;
diff --git a/sys-apps/darwin-miscutils/files/darwin-miscutils-12-md-register.patch b/sys-apps/darwin-miscutils/files/darwin-miscutils-12-md-register.patch
deleted file mode 100644
index dc4aa32ce5bc..000000000000
--- a/sys-apps/darwin-miscutils/files/darwin-miscutils-12-md-register.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Fix build with clang https://bugs.gentoo.org/758167
-
---- a/md/md.c
-+++ b/md/md.c
-@@ -148,8 +148,7 @@ static void parse_dep();
- static void save_dot_o();
-
- int
--main(argc,argv)
--register char **argv;
-+main(int argc, char** argv)
- {
- int size;
-
diff --git a/sys-apps/darwin-miscutils/files/darwin-miscutils-6-w64.patch b/sys-apps/darwin-miscutils/files/darwin-miscutils-6-w64.patch
deleted file mode 100644
index 77c194e6df9b..000000000000
--- a/sys-apps/darwin-miscutils/files/darwin-miscutils-6-w64.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-grobian@gentoo.org:
-The provided libresolv library is faulty for 64-bits, or this call is
-doing something wrong. It is highly undocumented, so it feels like
-messing around with some pointers is not going to work. Doing this in
-64-bits mode, at least results in a nice Bus Error.
-
---- shell_cmds-118/w/w.c
-+++ shell_cmds-118/w/w.c
-@@ -262,7 +262,7 @@
- argc -= optind;
- argv += optind;
-
--#if !TARGET_OS_EMBEDDED
-+#if !defined(TARGET_OS_EMBEDDED) && !defined(__LP64__)
- if (!(_res.options & RES_INIT))
- res_init();
- _res.retrans = 2; /* resolver timeout to 2 seconds per try */
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-04-07 10:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-07 10:30 [gentoo-commits] repo/gentoo:master commit in: sys-apps/darwin-miscutils/files/, sys-apps/darwin-miscutils/ Fabian Groffen
-- strict thread matches above, loose matches on Subject: below --
2024-04-07 9:43 Fabian Groffen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox