diff options
Diffstat (limited to 'misc/patchutils')
| -rw-r--r-- | misc/patchutils/Makefile | 3 | ||||
| -rw-r--r-- | misc/patchutils/distinfo | 4 | ||||
| -rw-r--r-- | misc/patchutils/files/patch-src_interdiff.c | 38 |
3 files changed, 6 insertions, 39 deletions
diff --git a/misc/patchutils/Makefile b/misc/patchutils/Makefile index 2717af6ff96a..d4f98d568e9a 100644 --- a/misc/patchutils/Makefile +++ b/misc/patchutils/Makefile @@ -3,6 +3,9 @@ PORTVERSION= 0.4.3 CATEGORIES= misc MASTER_SITES= http://cyberelk.net/tim/data/patchutils/stable/ +PATCH_SITES= https://github.com/twaugh/patchutils/commit/ +PATCHFILES= eaf8353cc8931535bbe8d05129eeeda034edb42c.patch:-p1 + MAINTAINER= sunpoet@FreeBSD.org COMMENT= Small collection of programs that operate on patch files WWW= http://cyberelk.net/tim/software/patchutils/ \ diff --git a/misc/patchutils/distinfo b/misc/patchutils/distinfo index b820f622e0ba..0f5ef5298b31 100644 --- a/misc/patchutils/distinfo +++ b/misc/patchutils/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1757120518 +TIMESTAMP = 1757436423 SHA256 (patchutils-0.4.3.tar.xz) = 0efc96a9565fd156fc1064fdcc54c82b6229db0d402827c4c48b02f6ef956445 SIZE (patchutils-0.4.3.tar.xz) = 404684 +SHA256 (eaf8353cc8931535bbe8d05129eeeda034edb42c.patch) = 10d0065cd421c4afc80d9338736a51b3a8128de81a27e798cd1b3e14e9953dbd +SIZE (eaf8353cc8931535bbe8d05129eeeda034edb42c.patch) = 2300 diff --git a/misc/patchutils/files/patch-src_interdiff.c b/misc/patchutils/files/patch-src_interdiff.c deleted file mode 100644 index bea783320fa6..000000000000 --- a/misc/patchutils/files/patch-src_interdiff.c +++ /dev/null @@ -1,38 +0,0 @@ ---- src/interdiff.c.orig 2025-08-22 00:37:41.000000000 -0700 -+++ src/interdiff.c 2025-09-11 13:06:21.163966000 -0700 -@@ -832,9 +832,9 @@ - - fflush (NULL); - char *argv[2 + num_diff_opts + 2 + 1]; -- memcpy (argv, (const char *[]) { DIFF, options }, 2 * sizeof (char *)); -+ memcpy (argv, ((const char *[]) { DIFF, options }), 2 * sizeof (char *)); - memcpy (argv + 2, diff_opts, num_diff_opts * sizeof (char *)); -- memcpy (argv + 2 + num_diff_opts, (char *[]) { tmpp1, tmpp2, NULL }, (2 + 1) * sizeof (char *)); -+ memcpy (argv + 2 + num_diff_opts, ((char *[]) { tmpp1, tmpp2, NULL }), (2 + 1) * sizeof (char *)); - in = xpipe (DIFF, &child, "r", argv); - - /* Eat the first line */ -@@ -1194,9 +1194,9 @@ - fflush (NULL); - - char *argv[2 + num_diff_opts + 2 + 1]; -- memcpy (argv, (const char *[]) { DIFF, options }, 2 * sizeof (char *)); -+ memcpy (argv, ((const char *[]) { DIFF, options }), 2 * sizeof (char *)); - memcpy (argv + 2, diff_opts, num_diff_opts * sizeof (char *)); -- memcpy (argv + 2 + num_diff_opts, (char *[]) { tmpp1, tmpp2, NULL }, (2 + 1) * sizeof (char *)); -+ memcpy (argv + 2 + num_diff_opts, ((char *[]) { tmpp1, tmpp2, NULL }), (2 + 1) * sizeof (char *)); - in = xpipe (DIFF, &child, "r", argv); - - /* Eat the first line */ -@@ -1613,9 +1613,9 @@ - sprintf (options, "-U%d", max_context); - - char *argv[2 + num_diff_opts + 2 + 1]; -- memcpy (argv, (const char *[]) { DIFF, options }, 2 * sizeof (char *)); -+ memcpy (argv, ((const char *[]) { DIFF, options }), 2 * sizeof (char *)); - memcpy (argv + 2, diff_opts, num_diff_opts * sizeof (char *)); -- memcpy (argv + 2 + num_diff_opts, (const char *[]) { f1, f2, NULL }, (2 + 1) * sizeof (char *)); -+ memcpy (argv + 2 + num_diff_opts, ((const char *[]) { f1, f2, NULL }), (2 + 1) * sizeof (char *)); - if (debug) { - fputs ("+", stdout); - for (int i = 0; argv[i]; i++) { |