Date: Wed, 17 Mar 2021 19:39:37 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r568686 - in head/sysutils/less: . files Message-ID: <202103171939.12HJdbIU086635@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Wed Mar 17 19:39:36 2021 New Revision: 568686 URL: https://svnweb.freebsd.org/changeset/ports/568686 Log: - Remove obsolete patch which breaks colorized output (-R option) - While here, fix LICENSE and switch to options helpers PR: 248754 Submitted by: jm-fbbz@yagi.h-net.org Approved by: jharris@widomaker.com (maintainer) Deleted: head/sysutils/less/files/patch-charset.c Modified: head/sysutils/less/Makefile Modified: head/sysutils/less/Makefile ============================================================================== --- head/sysutils/less/Makefile Wed Mar 17 19:33:46 2021 (r568685) +++ head/sysutils/less/Makefile Wed Mar 17 19:39:36 2021 (r568686) @@ -3,14 +3,17 @@ PORTNAME= less PORTVERSION= 551 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://www.greenwoodsoftware.com/less/ MAINTAINER= jharris@widomaker.com COMMENT= Better pager utility -LICENSE= GPLv3 -LICENSE_FILE= ${WRKSRC}/LICENSE +LICENSE= GPLv3+ MIT +LICENSE_COMB= dual +LICENSE_FILE_GPLv3+ = ${WRKSRC}/COPYING +LICENSE_FILE_MIT= ${WRKSRC}/LICENSE USES= cpe ncurses @@ -28,21 +31,12 @@ OPTIONS_DEFINE= COLORS PCRE OPTIONS_DEFAULT= COLORS PCRE PCRE_USES= localbase +PCRE_CONFIGURE_ON= --with-regex=pcre PCRE_LIB_DEPENDS= libpcre.so:devel/pcre +PCRE_LDFLAGS= -L${LOCALBASE}/lib -lpcre +PCRE_CONFIGURE_OFF= --with-regex=posix -COLORS_DESC= Enable colors support via escape sequence - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MCOLORS} -CPPFLAGS+= -DCOLOR_LESS -.endif - -.if ${PORT_OPTIONS:MPCRE} -CONFIGURE_ARGS+= --with-regex=pcre -LDFLAGS+= -L${LOCALBASE}/lib -lpcre -.else -CONFIGURE_ARGS+= --with-regex=posix -.endif +COLORS_DESC= Enable colors support via escape sequence +COLORS_CPPFLAGS= -DCOLOR_LESS .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103171939.12HJdbIU086635>