diff --git a/sys-apps/darwin-miscutils/Manifest b/sys-apps/darwin-miscutils/Manifest deleted file mode 100644 index f2902a6d8de19..0000000000000 --- a/sys-apps/darwin-miscutils/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -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 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 deleted file mode 100644 index c8f3e71d05678..0000000000000 --- a/sys-apps/darwin-miscutils/darwin-miscutils-12-r1.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit edo toolchain-funcs - -# 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://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://github.com/apple-oss-distributions/developer_cmds/archive/refs/tags/developer_cmds-${DEV_VER}.tar.gz" -S="${WORKDIR}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~arm64-macos ~ppc-macos ~x64-macos" - -# for ncal -DEPEND="" -RDEPEND="${DEPEND}" - -src_prepare() { - 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 "${FILESDIR}"/${PN}-12-md-modern-c.patch - - cd "${S}" || die - eapply_user -} - -src_compile() { - local t - local TS - local flags=( - ${CFLAGS} - -I. - -D__FBSDID=__RCSID - -Du_int=uint32_t - -include stdint.h - ) - - # 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 - # 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 - edo $(tc-getCC) ${flags[@]} -o ${t} ${LDFLAGS} *.c - 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 - edo $(tc-getCC) ${flags[@]} -o ${t} ${LDFLAGS} *.c - done -} - -src_install() { - local t - local TS - mkdir -p "${ED}"/{,usr/}bin || die - - 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" - done - - TS="${S}/adv_cmds-${MD_VER}" - for t in md ; do - cp "${TS}/${t}/${t}" "${ED}"/usr/bin/ || die - 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 deleted file mode 100644 index 2e6dcdb50d4b6..0000000000000 --- a/sys-apps/darwin-miscutils/files/darwin-miscutils-12-md-modern-c.patch +++ /dev/null @@ -1,235 +0,0 @@ -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 - #include - #include -+#include -+#include - - #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 - - - - prefix@gentoo.org - Gentoo Prefix - - - apple-oss-distributions/adv_cmds - apple-oss-distributions/developer_cmds - -