From owner-svn-ports-all@freebsd.org Fri Mar 1 16:04:27 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DCEF8151C579; Fri, 1 Mar 2019 16:04:26 +0000 (UTC) (envelope-from danfe@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 7FC3C8653D; Fri, 1 Mar 2019 16:04:26 +0000 (UTC) (envelope-from danfe@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 596EA1EFC1; Fri, 1 Mar 2019 16:04:26 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x21G4QNc002523; Fri, 1 Mar 2019 16:04:26 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x21G4QHU002521; Fri, 1 Mar 2019 16:04:26 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201903011604.x21G4QHU002521@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Fri, 1 Mar 2019 16:04:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r494301 - head/textproc/gnugrep X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: head/textproc/gnugrep X-SVN-Commit-Revision: 494301 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 7FC3C8653D X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.95)[-0.947,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Mar 2019 16:04:27 -0000 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 - 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 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