Attachment 252824 Details for Bug 280755 – "Unwronged" patch to 7.1.5

[patch] "Unwronged" patch to 7.1.5

multitail-7.1.5_1.patch (text/plain), 5.06 KB, created by László Károlyi on 2024-08-16 15:04:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: László Károlyi

Created: 2024-08-16 15:04:30 UTC

Size: 5.06 KB

patch

obsolete

>diff --git a/sysutils/multitail/Makefile b/sysutils/multitail/Makefile
>index b5b80e4293ad..a3bc96799ac1 100644
>--- a/sysutils/multitail/Makefile
>+++ b/sysutils/multitail/Makefile
>@@ -1,32 +1,34 @@
> PORTNAME=	multitail
>-PORTVERSION=	6.5.0
>+PORTVERSION=	7.1.5
> PORTREVISION=	1
> CATEGORIES=	sysutils
>-MASTER_SITES=	http://www.vanheusden.com/multitail/ \
>-		http://fossies.org/unix/privat/
>+MASTER_SITES=	https://github.com/folkertvanheusden/multitail/archive/refs/tags/
>+DISTNAME=	${PORTVERSION}
> 
> MAINTAINER=	beat@FreeBSD.org
> COMMENT=	Tail multiple files on console with ncurses
> WWW=		https://www.vanheusden.com/multitail/
> 
>-LICENSE=	GPLv2
>-LICENSE_FILE=	${WRKSRC}/license.txt
>+LICENSE=	MIT
>+LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-USES=		alias gmake ncurses tar:tgz
>+LIB_DEPENDS=	libgnuregex.so:devel/libgnuregex
>+
>+USES=		alias cmake ncurses pkgconfig
>+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
> 
> PLIST_FILES=	bin/multitail etc/multitail.conf.sample \
> 		share/man/man1/multitail.1.gz
>-PORTDOCS=	readme.txt license.txt
>-MAKE_ARGS=	NCURSES_IMPL="${NCURSES_IMPL}"
>+PORTDOCS=	README.md LICENSE
> 
>-OPTIONS_DEFINE=	DOCS
>+OPTIONS_DEFINE= DOCS
> 
> do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/multitail ${STAGEDIR}${PREFIX}/bin/
>+	${INSTALL_PROGRAM} ${WRKDIR}/.build/multitail ${STAGEDIR}${PREFIX}/bin/
> 	${INSTALL_MAN} ${WRKSRC}/multitail.1 ${STAGEDIR}${PREFIX}/share/man/man1
> 	${INSTALL_DATA} ${WRKSRC}/multitail.conf ${STAGEDIR}${PREFIX}/etc/multitail.conf.sample
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>-	${INSTALL_DATA} ${WRKSRC}/readme.txt ${STAGEDIR}${DOCSDIR}
>-	${INSTALL_DATA} ${WRKSRC}/license.txt ${STAGEDIR}${DOCSDIR}
>+	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
>+	${INSTALL_DATA} ${WRKSRC}/LICENSE ${STAGEDIR}${DOCSDIR}
> 
> .include <bsd.port.mk>
>diff --git a/sysutils/multitail/distinfo b/sysutils/multitail/distinfo
>index 54cbb3652b56..6972db7456ce 100644
>--- a/sysutils/multitail/distinfo
>+++ b/sysutils/multitail/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1573322615
>-SHA256 (multitail-6.5.0.tgz) = b29d5e77dfc663c7500f78da67de5d82d35d9417a4741a89a18ce9ee7bdba9ed
>-SIZE (multitail-6.5.0.tgz) = 157578
>+TIMESTAMP = 1723546600
>+SHA256 (7.1.5.tar.gz) = b0c92bf5f504b39591bf3e2e30a1902925c11556e14b89a07cfa7533f9bd171b
>+SIZE (7.1.5.tar.gz) = 152590
>diff --git a/sysutils/multitail/files/patch-Makefile b/sysutils/multitail/files/patch-Makefile
>deleted file mode 100644
>index b969d8e75dd2..000000000000
>--- a/sysutils/multitail/files/patch-Makefile
>+++ /dev/null
>@@ -1,25 +0,0 @@
>---- Makefile.orig	2019-11-07 12:56:23 UTC
>-+++ Makefile
>-@@ -19,18 +19,12 @@ CPPFLAGS+=-D$(PLATFORM) -DVERSION=\"$(VERSION)\" $(DEB
>- # build dependency files while compile (*.d)
>- CPPFLAGS+= -MMD -MP
>- 
>--
>--ifeq ($(PLATFORM),Darwin)
>--    LDFLAGS+=-lpanel $(NCURSES_LIB) -lutil -lm
>-+ifeq ($(NCURSES_IMPL),ncursesw)
>-+LDFLAGS+=-lpanelw -lncursesw -lutil -lm
>- else
>--ifeq ($(UTF8_SUPPORT),yes)
>--    LDFLAGS+=-lpanelw -lncursesw -lutil -lm
>--    CPPFLAGS+=-DUTF8_SUPPORT
>--else
>--    LDFLAGS+=-lpanel -lncurses -lutil -lm
>-+LDFLAGS+=-lpanel -lncurses -lutil -lm
>- endif
>--endif
>--
>-+CPPFLAGS+=-DUTF8_SUPPORT
>- 
>- OBJS:=utils.o mt.o error.o my_pty.o term.o scrollback.o help.o mem.o cv.o selbox.o stripstring.o color.o misc.o ui.o exec.o diff.o config.o cmdline.o globals.o history.o clipboard.o
>- DEPENDS:= $(OBJS:%.o=%.d)
>diff --git a/sysutils/multitail/files/patch-mt.c b/sysutils/multitail/files/patch-mt.c
>deleted file mode 100644
>index 0d96aa962c3c..000000000000
>--- a/sysutils/multitail/files/patch-mt.c
>+++ /dev/null
>@@ -1,15 +0,0 @@
>---- mt.c.orig	2014-02-16 09:06:54.000000000 -0500
>-+++ mt.c	2014-02-24 14:35:45.000000000 -0500
>-@@ -23,8 +23,12 @@
>- #include <sys/ioctl.h>
>- #include <sys/stat.h>
>- #ifndef AIX
>-+#if defined(__FreeBSD__)
>-+#include <termios.h>
>-+#else
>- #include <sys/termios.h> /* needed on Solaris 8 */
>- #endif
>-+#endif
>- #include <sys/time.h>
>- #include <sys/wait.h>
>- #include <unistd.h>
>diff --git a/sysutils/multitail/files/patch-mt.h b/sysutils/multitail/files/patch-mt.h
>deleted file mode 100644
>index 6dff3df8494e..000000000000
>--- a/sysutils/multitail/files/patch-mt.h
>+++ /dev/null
>@@ -1,18 +0,0 @@
>---- mt.h.orig	2019-11-09 18:07:35 UTC
>-+++ mt.h
>-@@ -60,8 +60,13 @@ typedef enum { SCHEME_TYPE_EDIT = 0, SCHEME_TYPE_FILTE
>- #endif
>- 
>- #if defined(UTF8_SUPPORT) && !defined(__APPLE__)
>--	#include <ncursesw/panel.h>
>--	#include <ncursesw/ncurses.h>
>-+	#if defined(__FreeBSD__)
>-+		#include <panel.h>
>-+		#include <curses.h>
>-+	#else
>-+		#include <ncursesw/panel.h>
>-+		#include <ncursesw/ncurses.h>
>-+	#endif
>- #else
>- 	#if defined(__APPLE__)
>-         #include <ncurses.h>
>diff --git a/sysutils/multitail/files/patch-term.c b/sysutils/multitail/files/patch-term.c
>deleted file mode 100644
>index ea0ef2709ef1..000000000000
>--- a/sysutils/multitail/files/patch-term.c
>+++ /dev/null
>@@ -1,15 +0,0 @@
>---- term.c.orig	2014-02-24 14:33:39.000000000 -0500
>-+++ term.c	2014-02-24 14:35:02.000000000 -0500
>-@@ -16,8 +16,12 @@
>- #include <stropts.h>
>- #endif
>- #ifndef AIX
>-+#if defined(__FreeBSD__)
>-+#include <termios.h>
>-+#else
>- #include <sys/termios.h> /* needed on Solaris 8 */
>- #endif
>-+#endif
>- #include <sys/socket.h>
>- #include <netinet/in.h>
>-

Actions: View | Diff

Attachments on bug 280755: 252691 | 252693 | 252727 | 252728 | 252824