Date: Fri, 27 Dec 2019 16:07:55 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r521006 - in head/sysutils/multitail: . files Message-ID: <201912271607.xBRG7tQF081598@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912271607.xBRG7tQF081598>