svn commit: r494301 - head/textproc/gnugrep
Alexey Dokuchaev
danfe at FreeBSD.org
Fri Mar 1 16:04:27 UTC 2019
Author: danfe
Date: Fri Mar 1 16:04:25 2019
New Revision: 494301
URL: https://svnweb.freebsd.org/changeset/ports/494301
Log:
- Belatedly update GNU grep to version 3.3
- Allow to build against GNU sigsegv (LIBSIGSEGV_DESC was shamelessly
stolen from `devel/m4') but retain existing OPTIONS_DEFAULT for now
- Do not pass preprocessor and linker flags directly, USES+=pkgconfig
- PCRE_CONFIGURE_OFF is not needed when PCRE_CONFIGURE_ENABLE is used
- Convert to option helper target (post-patch-NLS-off)
Approved by: maintainer (johans: numerous timeouts on GNU tools)
Modified:
head/textproc/gnugrep/Makefile
head/textproc/gnugrep/distinfo
Modified: head/textproc/gnugrep/Makefile
==============================================================================
--- head/textproc/gnugrep/Makefile Fri Mar 1 15:29:07 2019 (r494300)
+++ head/textproc/gnugrep/Makefile Fri Mar 1 16:04:25 2019 (r494301)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= grep
-PORTVERSION= 2.27
-PORTREVISION= 1
+PORTVERSION= 3.3
CATEGORIES= textproc
MASTER_SITES= GNU
PKGNAMEPREFIX= gnu
@@ -21,34 +20,35 @@ GNU_CONFIGURE= yes
INFO= grep
CPE_VENDOR= gnu
-OPTIONS_DEFINE= ICONV NLS PCRE
+OPTIONS_DEFINE= ICONV LIBSIGSEGV NLS PCRE
OPTIONS_DEFAULT= ICONV PCRE
+LIBSIGSEGV_DESC= Use alternative page fault handler (GNU libsigsegv)
OPTIONS_SUB= yes
ICONV_CONFIGURE_USES= iconv
ICONV_CONFIGURE_ON= --with-libiconv-prefix=${LOCALBASE}
ICONV_CONFIGURE_OFF= --without-libiconv-prefix
+LIBSIGSEGV_LIB_DEPENDS= libsigsegv.so:devel/libsigsegv
+LIBSIGSEGV_CONFIGURE_ON= --with-libsigsegv-prefix=${LOCALBASE}
+LIBSIGSEGV_CONFIGURE_OFF= --without-libsigsegv-prefix
+
NLS_USES= gettext
NLS_CONFIGURE_ENABLE= nls
NLS_CONFIGURE_ON= --with-libintl-prefix=${LOCALBASE}
NLS_CONFIGURE_OFF= --without-libintl-prefix
PCRE_LIB_DEPENDS= libpcre.so:devel/pcre
+PCRE_USES= pkgconfig
PCRE_CONFIGURE_ENABLE= perl-regexp
-PCRE_CPPFLAGS= -I${LOCALBASE}/include
-PCRE_LDFLAGS= -L${LOCALBASE}/lib
-PCRE_CONFIGURE_OFF= --disable-perl-regexp
-.include <bsd.port.options.mk>
-
post-patch:
@${REINPLACE_CMD} 's:@grep@:${LOCALBASE}/bin/&:' ${WRKSRC}/src/egrep.sh
-.if empty(PORT_OPTIONS:MNLS)
- @${REINPLACE_CMD} '/install-exec-local:/s/install-exec-localcharset//' \
- ${WRKSRC}/lib/Makefile.in
-.endif
@${REINPLACE_CMD} 's|mkinstalldirs = .*|mkinstalldirs = ${MKDIR}|g' \
${WRKSRC}/po/Makefile.in.in
+
+post-patch-NLS-off:
+ @${REINPLACE_CMD} '/install-exec-local:/s/install-exec-localcharset//' \
+ ${WRKSRC}/lib/Makefile.in
.include <bsd.port.mk>
Modified: head/textproc/gnugrep/distinfo
==============================================================================
--- head/textproc/gnugrep/distinfo Fri Mar 1 15:29:07 2019 (r494300)
+++ head/textproc/gnugrep/distinfo Fri Mar 1 16:04:25 2019 (r494301)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1482836406
-SHA256 (grep-2.27.tar.xz) = ad4cc44d23074a1c3a8baae8fbafff2a8c60f38a9a6108f985eef6fbee6dcaeb
-SIZE (grep-2.27.tar.xz) = 1360388
+TIMESTAMP = 1545367211
+SHA256 (grep-3.3.tar.xz) = b960541c499619efd6afe1fa795402e4733c8e11ebf9fafccc0bb4bccdc5b514
+SIZE (grep-3.3.tar.xz) = 1473056
More information about the svn-ports-head
mailing list