Attachment #252824 for bug #280755




PORTNAME=	multitail
PORTVERSION=	7.1.5
PORTREVISION=	1
CATEGORIES=	sysutils
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=	MIT
LICENSE_FILE=	${WRKSRC}/LICENSE

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.md LICENSE
MAKE_ARGS=	NCURSES_IMPL="${NCURSES_IMPL}"

OPTIONS_DEFINE= DOCS

do-install:
	${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.md ${STAGEDIR}${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/LICENSE ${STAGEDIR}${DOCSDIR}

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/sysutils/multitail/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1573322615	1	TIMESTAMP = 1723546600
2	SHA256 (multitail-6.5.0.tgz) = b29d5e77dfc663c7500f78da67de5d82d35d9417a4741a89a18ce9ee7bdba9ed	2	SHA256 (7.1.5.tar.gz) = b0c92bf5f504b39591bf3e2e30a1902925c11556e14b89a07cfa7533f9bd171b
3	SIZE (multitail-6.5.0.tgz) = 157578	3	SIZE (7.1.5.tar.gz) = 152590




--- 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)




--- 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>




--- 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>




--- 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>
 

Return to bug 280755

Lines 1-32 Link Here

(-)b/sysutils/multitail/Makefile (-12 / +14 lines)
1	PORTNAME= multitail	1	PORTNAME= multitail
2	PORTVERSION= 6.5.0	2	PORTVERSION= 7.1.5
3	PORTREVISION= 1	3	PORTREVISION= 1
4	CATEGORIES= sysutils	4	CATEGORIES= sysutils
5	MASTER_SITES= http://www.vanheusden.com/multitail/ \	5	MASTER_SITES= https://github.com/folkertvanheusden/multitail/archive/refs/tags/
6	http://fossies.org/unix/privat/	6	DISTNAME= ${PORTVERSION}
7		7
8	MAINTAINER= beat@FreeBSD.org	8	MAINTAINER= beat@FreeBSD.org
9	COMMENT= Tail multiple files on console with ncurses	9	COMMENT= Tail multiple files on console with ncurses
10	WWW= https://www.vanheusden.com/multitail/	10	WWW= https://www.vanheusden.com/multitail/
11		11
12	LICENSE= GPLv2	12	LICENSE= MIT
13	LICENSE_FILE= ${WRKSRC}/license.txt	13	LICENSE_FILE= ${WRKSRC}/LICENSE
14		14
15	USES= alias gmake ncurses tar:tgz	15	LIB_DEPENDS= libgnuregex.so:devel/libgnuregex
		16
		17	USES= alias cmake ncurses pkgconfig
		18	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
16		19
17	PLIST_FILES= bin/multitail etc/multitail.conf.sample \	20	PLIST_FILES= bin/multitail etc/multitail.conf.sample \
18	share/man/man1/multitail.1.gz	21	share/man/man1/multitail.1.gz
19	PORTDOCS= readme.txt license.txt	22	PORTDOCS= README.md LICENSE
20	MAKE_ARGS= NCURSES_IMPL="${NCURSES_IMPL}"
21		23
22	OPTIONS_DEFINE= DOCS	24	OPTIONS_DEFINE= DOCS
23		25
24	do-install:	26	do-install:
25	${INSTALL_PROGRAM} ${WRKSRC}/multitail ${STAGEDIR}${PREFIX}/bin/	27	${INSTALL_PROGRAM} ${WRKDIR}/.build/multitail ${STAGEDIR}${PREFIX}/bin/
26	${INSTALL_MAN} ${WRKSRC}/multitail.1 ${STAGEDIR}${PREFIX}/share/man/man1	28	${INSTALL_MAN} ${WRKSRC}/multitail.1 ${STAGEDIR}${PREFIX}/share/man/man1
27	${INSTALL_DATA} ${WRKSRC}/multitail.conf ${STAGEDIR}${PREFIX}/etc/multitail.conf.sample	29	${INSTALL_DATA} ${WRKSRC}/multitail.conf ${STAGEDIR}${PREFIX}/etc/multitail.conf.sample
28	@${MKDIR} ${STAGEDIR}${DOCSDIR}	30	@${MKDIR} ${STAGEDIR}${DOCSDIR}
29	${INSTALL_DATA} ${WRKSRC}/readme.txt ${STAGEDIR}${DOCSDIR}	31	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
30	${INSTALL_DATA} ${WRKSRC}/license.txt ${STAGEDIR}${DOCSDIR}	32	${INSTALL_DATA} ${WRKSRC}/LICENSE ${STAGEDIR}${DOCSDIR}
31		33
32	.include <bsd.port.mk>	34	.include <bsd.port.mk>

Removed Link Here

(-)a/sysutils/multitail/files/patch-Makefile (-25 lines)
1	--- Makefile.orig 2019-11-07 12:56:23 UTC
2	+++ Makefile
3	@@ -19,18 +19,12 @@ CPPFLAGS+=-D$(PLATFORM) -DVERSION=\"$(VERSION)\" $(DEB
4	# build dependency files while compile (*.d)
5	CPPFLAGS+= -MMD -MP
6
7	-
8	-ifeq ($(PLATFORM),Darwin)
9	- LDFLAGS+=-lpanel $(NCURSES_LIB) -lutil -lm
10	+ifeq ($(NCURSES_IMPL),ncursesw)
11	+LDFLAGS+=-lpanelw -lncursesw -lutil -lm
12	else
13	-ifeq ($(UTF8_SUPPORT),yes)
14	- LDFLAGS+=-lpanelw -lncursesw -lutil -lm
15	- CPPFLAGS+=-DUTF8_SUPPORT
16	-else
17	- LDFLAGS+=-lpanel -lncurses -lutil -lm
18	+LDFLAGS+=-lpanel -lncurses -lutil -lm
19	endif
20	-endif
21	-
22	+CPPFLAGS+=-DUTF8_SUPPORT
23
24	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
25	DEPENDS:= $(OBJS:%.o=%.d)

Removed Link Here

(-)a/sysutils/multitail/files/patch-mt.c (-15 lines)
1	--- mt.c.orig 2014-02-16 09:06:54.000000000 -0500
2	+++ mt.c 2014-02-24 14:35:45.000000000 -0500
3	@@ -23,8 +23,12 @@
4	#include <sys/ioctl.h>
5	#include <sys/stat.h>
6	#ifndef AIX
7	+#if defined(__FreeBSD__)
8	+#include <termios.h>
9	+#else
10	#include <sys/termios.h> /* needed on Solaris 8 */
11	#endif
12	+#endif
13	#include <sys/time.h>
14	#include <sys/wait.h>
15	#include <unistd.h>

Removed Link Here

(-)a/sysutils/multitail/files/patch-mt.h (-18 lines)
1	--- mt.h.orig 2019-11-09 18:07:35 UTC
2	+++ mt.h
3	@@ -60,8 +60,13 @@ typedef enum { SCHEME_TYPE_EDIT = 0, SCHEME_TYPE_FILTE
4	#endif
5
6	#if defined(UTF8_SUPPORT) && !defined(__APPLE__)
7	- #include <ncursesw/panel.h>
8	- #include <ncursesw/ncurses.h>
9	+ #if defined(__FreeBSD__)
10	+ #include <panel.h>
11	+ #include <curses.h>
12	+ #else
13	+ #include <ncursesw/panel.h>
14	+ #include <ncursesw/ncurses.h>
15	+ #endif
16	#else
17	#if defined(__APPLE__)
18	#include <ncurses.h>

Removed Link Here

(-)a/sysutils/multitail/files/patch-term.c (-15 lines)
1	--- term.c.orig 2014-02-24 14:33:39.000000000 -0500
2	+++ term.c 2014-02-24 14:35:02.000000000 -0500
3	@@ -16,8 +16,12 @@
4	#include <stropts.h>
5	#endif
6	#ifndef AIX
7	+#if defined(__FreeBSD__)
8	+#include <termios.h>
9	+#else
10	#include <sys/termios.h> /* needed on Solaris 8 */
11	#endif
12	+#endif
13	#include <sys/socket.h>
14	#include <netinet/in.h>
15