diff options
Diffstat (limited to 'misc/patchutils')
| -rw-r--r-- | misc/patchutils/Makefile | 13 | ||||
| -rw-r--r-- | misc/patchutils/distinfo | 6 | ||||
| -rw-r--r-- | misc/patchutils/files/patch-src_interdiff.c | 38 | ||||
| -rw-r--r-- | misc/patchutils/pkg-plist | 50 |
4 files changed, 86 insertions, 21 deletions
diff --git a/misc/patchutils/Makefile b/misc/patchutils/Makefile index 296c6737cb78..2717af6ff96a 100644 --- a/misc/patchutils/Makefile +++ b/misc/patchutils/Makefile @@ -1,6 +1,5 @@ PORTNAME= patchutils -PORTVERSION= 0.4.2 -PORTREVISION= 1 +PORTVERSION= 0.4.3 CATEGORIES= misc MASTER_SITES= http://cyberelk.net/tim/data/patchutils/stable/ @@ -13,14 +12,22 @@ LICENSE= GPLv2+ RUN_DEPENDS= bash:shells/bash -USES= perl5 python:run shebangfix tar:xz +USES= gmake perl5 python:run shebangfix tar:xz GNU_CONFIGURE= yes SHEBANG_FILES= patchview/gitdiff scripts/*.in +OPTIONS_DEFINE= MANPAGES +OPTIONS_DEFAULT=MANPAGES +OPTIONS_SUB= yes + +MANPAGES_BUILD_DEPENDS= xmlto>=0:textproc/xmlto + post-install: ${MV} ${STAGEDIR}${PREFIX}/bin/svndiff ${STAGEDIR}${PREFIX}/bin/svndiff.patchutils + +post-install-MANPAGES-on: ${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${STAGEDIR}${PREFIX}/share/man/man1 .include <bsd.port.mk> diff --git a/misc/patchutils/distinfo b/misc/patchutils/distinfo index 399fef46d8c4..b820f622e0ba 100644 --- a/misc/patchutils/distinfo +++ b/misc/patchutils/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1595416527 -SHA256 (patchutils-0.4.2.tar.xz) = 8875b0965fe33de62b890f6cd793be7fafe41a4e552edbf641f1fed5ebbf45ed -SIZE (patchutils-0.4.2.tar.xz) = 159504 +TIMESTAMP = 1757120518 +SHA256 (patchutils-0.4.3.tar.xz) = 0efc96a9565fd156fc1064fdcc54c82b6229db0d402827c4c48b02f6ef956445 +SIZE (patchutils-0.4.3.tar.xz) = 404684 diff --git a/misc/patchutils/files/patch-src_interdiff.c b/misc/patchutils/files/patch-src_interdiff.c new file mode 100644 index 000000000000..bea783320fa6 --- /dev/null +++ b/misc/patchutils/files/patch-src_interdiff.c @@ -0,0 +1,38 @@ +--- 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++) { diff --git a/misc/patchutils/pkg-plist b/misc/patchutils/pkg-plist index 975f7479712a..10959cd27226 100644 --- a/misc/patchutils/pkg-plist +++ b/misc/patchutils/pkg-plist @@ -17,18 +17,38 @@ bin/splitdiff bin/svndiff.patchutils bin/svndiffview bin/unwrapdiff -share/man/man1/combinediff.1.gz -share/man/man1/dehtmldiff.1.gz -share/man/man1/editdiff.1.gz -share/man/man1/espdiff.1.gz -share/man/man1/filterdiff.1.gz -share/man/man1/fixcvsdiff.1.gz -share/man/man1/flipdiff.1.gz -share/man/man1/grepdiff.1.gz -share/man/man1/interdiff.1.gz -share/man/man1/lsdiff.1.gz -share/man/man1/patchview.1.gz -share/man/man1/recountdiff.1.gz -share/man/man1/rediff.1.gz -share/man/man1/splitdiff.1.gz -share/man/man1/unwrapdiff.1.gz +share/bash-completion/completions/combinediff +share/bash-completion/completions/dehtmldiff +share/bash-completion/completions/editdiff +share/bash-completion/completions/espdiff +share/bash-completion/completions/filterdiff +share/bash-completion/completions/fixcvsdiff +share/bash-completion/completions/flipdiff +share/bash-completion/completions/gitdiff +share/bash-completion/completions/gitdiffview +share/bash-completion/completions/grepdiff +share/bash-completion/completions/interdiff +share/bash-completion/completions/lsdiff +share/bash-completion/completions/patchutils +share/bash-completion/completions/patchview +share/bash-completion/completions/recountdiff +share/bash-completion/completions/rediff +share/bash-completion/completions/splitdiff +share/bash-completion/completions/svndiff +share/bash-completion/completions/svndiffview +share/bash-completion/completions/unwrapdiff +%%MANPAGES%%share/man/man1/combinediff.1.gz +%%MANPAGES%%share/man/man1/dehtmldiff.1.gz +%%MANPAGES%%share/man/man1/editdiff.1.gz +%%MANPAGES%%share/man/man1/espdiff.1.gz +%%MANPAGES%%share/man/man1/filterdiff.1.gz +%%MANPAGES%%share/man/man1/fixcvsdiff.1.gz +%%MANPAGES%%share/man/man1/flipdiff.1.gz +%%MANPAGES%%share/man/man1/grepdiff.1.gz +%%MANPAGES%%share/man/man1/interdiff.1.gz +%%MANPAGES%%share/man/man1/lsdiff.1.gz +%%MANPAGES%%share/man/man1/patchview.1.gz +%%MANPAGES%%share/man/man1/recountdiff.1.gz +%%MANPAGES%%share/man/man1/rediff.1.gz +%%MANPAGES%%share/man/man1/splitdiff.1.gz +%%MANPAGES%%share/man/man1/unwrapdiff.1.gz |