From nobody Wed Sep 25 17:29:17 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XDNy54242z5XV5b; Wed, 25 Sep 2024 17:29:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XDNy53Chrz4fCr; Wed, 25 Sep 2024 17:29:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727285357; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P1hK+VqDx/+9T2njLhB+pd9HN9vtL8Jp18Nf7I+h88Q=; b=AWn8nlP8EPgegrEuC8nEaoRLzzK4yg3CALyVoMF2jNXdKiuwSQGf8BmnTcHb8NvaMv1DET EwOVRsfZR64vnfkj7+LcBNl2Fgj3/hBvmJrpa6y9RcH/CJ12noIGC2vIRFxfy5q6zD9Wv5 V7c/sVOYeujUbi3BA1VG6y8ucgB832A15MvRSbxcfkNYxTMhYk5tCaUsuPYjraptNLM+mW KEROlZy3rdFxQJi3FWfV9Q1a7VXWtcXkxz5s60ZqCG5ao63mr+6mfVd9pULz+hMhAFaNff cIWvbqbt4ObMWOHaWXq60wU+JKfGAn/EMuXhYtWiPTbKcEPaRqiEvxqwMyo43Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727285357; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P1hK+VqDx/+9T2njLhB+pd9HN9vtL8Jp18Nf7I+h88Q=; b=q97Mm2xb//FV2KpiIXNMdZJ8vw2zqpMjhm2O8dEqj5Rp34SAD28vC/vtSHjXobjcRInr2M Cb5Il+m46VsAb6Jku25HSMlvLHzFPDTf+3oPtJiiK0jJ5X4JPFga4bmjpuGROs/r0Gz+qZ qBAeq0nxU8vPXJ00oVkMdbxyB97wzfouCRGH8XwOLj1Nd9WbZlOoyp/tlaqFAikzirucGN Keo3o3Bhc80GOjlD137Dil3I6esd1V4weKKpRjHSYdu2UVIQbpJwtqotnbwyG25DwGursx RphHwcS/EopNeShybHFmcLgKh147wZIkiBxRJZTDIKwytMobr2BdkRWZzFIgAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727285357; a=rsa-sha256; cv=none; b=tDyRo6bAoYfN2tmkea3kjBlLR3YeXzpsfDWP3QvDA0S1nQOdQped5Mp6H+0cJEjE74r0pw 1oZzzwy+y+PFBI9rbwBgeRNdvgs9SdTtyWEcEFpYjRrkko4yY2J3fQmSsCMztW8OwnZP+Z TOxayFU+zNNTZEZXE16nWWGpRHBItOoy10CEUD6uAjR4eFvEUnyE2vmkqjaiSHm6N2Yv7C QljSkGfLBsMsL5wJRyLZ2Vo1+dXUpawVa/hiuBwhuvaQNjQKZqCdtI/aUkyKNOcQRDbasE 2Dos2T+erkO/ocaUwVMb6obLH6Aa6DIePYdK79lZfoEk/o7CAoGn4b+AKpOEyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XDNy52d1bzM4P; Wed, 25 Sep 2024 17:29:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48PHTHus064384; Wed, 25 Sep 2024 17:29:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48PHTH53064381; Wed, 25 Sep 2024 17:29:17 GMT (envelope-from git) Date: Wed, 25 Sep 2024 17:29:17 GMT Message-Id: <202409251729.48PHTH53064381@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Beat Gaetzi Subject: git: 726bf485e70e - main - sysutils/multitail: Update to 7.1.5 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: beat X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 726bf485e70ed68f7b09b4ca3a24a28ceb890faf Auto-Submitted: auto-generated The branch main has been updated by beat: URL: https://cgit.FreeBSD.org/ports/commit/?id=726bf485e70ed68f7b09b4ca3a24a28ceb890faf commit 726bf485e70ed68f7b09b4ca3a24a28ceb890faf Author: Beat Gaetzi AuthorDate: 2024-09-25 17:26:49 +0000 Commit: Beat Gaetzi CommitDate: 2024-09-25 17:26:49 +0000 sysutils/multitail: Update to 7.1.5 - Pass maintainership to submitter PR: 280755 --- sysutils/multitail/Makefile | 28 +++++++++++++++------------- sysutils/multitail/distinfo | 6 +++--- sysutils/multitail/files/patch-Makefile | 25 ------------------------- sysutils/multitail/files/patch-mt.c | 15 --------------- sysutils/multitail/files/patch-mt.h | 18 ------------------ sysutils/multitail/files/patch-term.c | 15 --------------- 6 files changed, 18 insertions(+), 89 deletions(-) diff --git a/sysutils/multitail/Makefile b/sysutils/multitail/Makefile index b5b80e4293ad..ee31b0fe0cd2 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 +MAINTAINER= laszlo@karolyi.hu 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 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 - #include - #ifndef AIX -+#if defined(__FreeBSD__) -+#include -+#else - #include /* needed on Solaris 8 */ - #endif -+#endif - #include - #include - #include 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 -- #include -+ #if defined(__FreeBSD__) -+ #include -+ #include -+ #else -+ #include -+ #include -+ #endif - #else - #if defined(__APPLE__) - #include 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 - #endif - #ifndef AIX -+#if defined(__FreeBSD__) -+#include -+#else - #include /* needed on Solaris 8 */ - #endif -+#endif - #include - #include -