From owner-svn-ports-head@freebsd.org Fri Dec 27 16:07:56 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 732C81EFB6E; Fri, 27 Dec 2019 16:07:56 +0000 (UTC) (envelope-from bapt@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47ksDX2Cyxz4Fcw; Fri, 27 Dec 2019 16:07:56 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 42C251B47A; Fri, 27 Dec 2019 16:07:56 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBRG7uuO081600; Fri, 27 Dec 2019 16:07:56 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBRG7tQF081598; Fri, 27 Dec 2019 16:07:55 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201912271607.xBRG7tQF081598@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Fri, 27 Dec 2019 16:07:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r521006 - in head/sysutils/multitail: . files X-SVN-Group: ports-head X-SVN-Commit-Author: bapt X-SVN-Commit-Paths: in head/sysutils/multitail: . files X-SVN-Commit-Revision: 521006 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Dec 2019 16:07:56 -0000 Author: bapt Date: Fri Dec 27 16:07:55 2019 New Revision: 521006 URL: https://svnweb.freebsd.org/changeset/ports/521006 Log: Rework multitail to be futur friendly regarding ncurses Drop useless post-patch which are not doing anything anymore Patch the Makefile to link to ncursesw if this is the implementation we do use or in the futur link to ncurses (and panel) when only this version will be left in base Added: head/sysutils/multitail/files/patch-Makefile (contents, props changed) Modified: head/sysutils/multitail/Makefile Modified: head/sysutils/multitail/Makefile ============================================================================== --- head/sysutils/multitail/Makefile Fri Dec 27 15:41:42 2019 (r521005) +++ head/sysutils/multitail/Makefile Fri Dec 27 16:07:55 2019 (r521006) @@ -18,13 +18,9 @@ USES= alias gmake ncurses tar:tgz PLIST_FILES= bin/multitail etc/multitail.conf.sample \ man/man1/multitail.1.gz PORTDOCS= readme.txt license.txt +MAKE_ARGS= NCURSES_IMPL="${NCURSES_IMPL}" OPTIONS_DEFINE= DOCS - -post-patch: - @${REINPLACE_CMD} -e 's,$$(DESTDIR)/etc/multitail.conf,${PREFIX}/etc/multitail.conf,' \ - -e 's/CC=gcc/CC?=gcc/' \ - ${WRKSRC}/mt.c ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/multitail ${STAGEDIR}${PREFIX}/bin/ Added: head/sysutils/multitail/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/multitail/files/patch-Makefile Fri Dec 27 16:07:55 2019 (r521006) @@ -0,0 +1,25 @@ +--- 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)