diff --git a/sysutils/less/Makefile b/sysutils/less/Makefile index 0b2c4ebc3ec6..0aa6173f2f59 100644 --- a/sysutils/less/Makefile +++ b/sysutils/less/Makefile @@ -1,40 +1,37 @@ PORTNAME= less -PORTVERSION= 551 -PORTREVISION= 1 +PORTVERSION= 643 CATEGORIES= sysutils -MASTER_SITES= http://www.greenwoodsoftware.com/less/ +MASTER_SITES= https://www.greenwoodsoftware.com/less/ -MAINTAINER= jharris@widomaker.com +MAINTAINER= sunpoet@FreeBSD.org COMMENT= Better pager utility -WWW= https://www.greenwoodsoftware.com/less/ +WWW= https://www.greenwoodsoftware.com/less/ \ + https://github.com/gwsw/less LICENSE= GPLv3+ MIT LICENSE_COMB= dual LICENSE_FILE_GPLv3+ = ${WRKSRC}/COPYING LICENSE_FILE_MIT= ${WRKSRC}/LICENSE -USES= cpe ncurses +USES= cpe gmake localbase:ldflags ncurses -CPE_VENDOR= gnu GNU_CONFIGURE= yes -PLIST_FILES= bin/less \ - bin/lessecho \ - bin/lesskey \ - man/man1/less.1.gz \ - man/man1/lessecho.1.gz \ - man/man1/lesskey.1.gz +CPE_VENDOR= gnu -OPTIONS_DEFINE= COLORS PCRE -OPTIONS_DEFAULT= COLORS PCRE +OPTIONS_RADIO= REGEX +OPTIONS_RADIO_REGEX= PCRE PCRE2 POSIX +OPTIONS_DEFAULT=PCRE2 +PCRE_DESC= Perl compatible regular expression support via pcre +PCRE2_DESC= Perl compatible regular expression support via pcre2 +POSIX_DESC= POSIX regular expression support -PCRE_USES= localbase PCRE_CONFIGURE_ON= --with-regex=pcre +PCRE_LDFLAGS= -lpcre 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 -COLORS_CPPFLAGS= -DCOLOR_LESS +PCRE2_CONFIGURE_ON= --with-regex=pcre2 +PCRE2_LDFLAGS= -lpcre2-8 +PCRE2_LIB_DEPENDS= libpcre2-8.so:devel/pcre2 +POSIX_CONFIGURE_ON= --with-regex=posix .include diff --git a/sysutils/less/distinfo b/sysutils/less/distinfo index 8eac56099940..ed1aea6e4fc8 100644 --- a/sysutils/less/distinfo +++ b/sysutils/less/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1586909564 -SHA256 (less-551.tar.gz) = ff165275859381a63f19135a8f1f6c5a194d53ec3187f94121ecd8ef0795fe3d -SIZE (less-551.tar.gz) = 347007 +TIMESTAMP = 1693947213 +SHA256 (less-643.tar.gz) = 2911b5432c836fa084c8a2e68f6cd6312372c026a58faaa98862731c8b6052e8 +SIZE (less-643.tar.gz) = 592291 diff --git a/sysutils/less/files/patch-Makefile.in b/sysutils/less/files/patch-Makefile.in deleted file mode 100644 index 02b9334bb5f2..000000000000 --- a/sysutils/less/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig 2013-04-04 16:55:06 UTC -+++ Makefile.in -@@ -17,7 +17,7 @@ CPPFLAGS = @CPPFLAGS@ - EXEEXT = @EXEEXT@ - O=o - --LIBS = @LIBS@ -+LIBS = -lncurses - - prefix = @prefix@ - exec_prefix = @exec_prefix@ diff --git a/sysutils/less/files/patch-edit.c b/sysutils/less/files/patch-edit.c new file mode 100644 index 000000000000..ed80cb8fe511 --- /dev/null +++ b/sysutils/less/files/patch-edit.c @@ -0,0 +1,12 @@ +--- edit.c.orig 2023-07-20 22:43:14 UTC ++++ edit.c +@@ -16,9 +16,7 @@ + #if HAVE_SYS_WAIT_H + #include + #endif +-#if OS2 + #include +-#endif + + public int fd0 = 0; + diff --git a/sysutils/less/pkg-plist b/sysutils/less/pkg-plist new file mode 100644 index 000000000000..b0edecca86f5 --- /dev/null +++ b/sysutils/less/pkg-plist @@ -0,0 +1,6 @@ +bin/less +bin/lessecho +bin/lesskey +man/man1/less.1.gz +man/man1/lessecho.1.gz +man/man1/lesskey.1.gz