Attachment 196666 Details for Bug 227601 – Update; Adjust options; remove conflicts

[patch] Update; Adjust options; remove conflicts

gnugrep (text/plain), 2.43 KB, created by Nathan on 2018-08-29 05:13:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nathan

Created: 2018-08-29 05:13:23 UTC

Size: 2.43 KB

patch

obsolete

>textproc/gnugrep:
>* Update to 3.1
>* Added uses perl
> -- configure looks for it and gives
>    warning without
>* Changed on/off
> --Makes Makefile clean
> --Allow auto on/off swap
>* Removed conflicts
> -- BSD's grep is installed in /usr/bin
>    This port installs in /usr/local/bin
>* Added test target
> -- Tests passes
>
>Index: textproc/gnugrep/Makefile
>===================================================================
>--- textproc/gnugrep/Makefile	(revision 478337)
>+++ textproc/gnugrep/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	grep
>-PORTVERSION=	2.27
>+PORTVERSION=	3.1
> CATEGORIES=	textproc
> MASTER_SITES=	GNU
> PKGNAMEPREFIX=	gnu
>@@ -12,10 +12,9 @@
> 
> LICENSE=	GPLv3+
> 
>-CONFLICTS=	bsd-grep-[0-9]*
>-
>-USES=		charsetfix cpe tar:xz
>+USES=		charsetfix cpe pkgconfig tar:xz
> GNU_CONFIGURE=	yes
>+TEST_TARGET=	check
> 
> INFO=		grep
> CPE_VENDOR=	gnu
>@@ -25,29 +24,17 @@
> OPTIONS_SUB=		yes
> 
> ICONV_CONFIGURE_USES=	iconv
>-ICONV_CONFIGURE_ON=	--with-libiconv-prefix=${LOCALBASE}
>-ICONV_CONFIGURE_OFF=	--without-libiconv-prefix
>+ICONV_CONFIGURE_WITH=	libiconv-prefix=${LOCALBASE}
> 
> NLS_USES=		gettext
> NLS_CONFIGURE_ENABLE=	nls
>-NLS_CONFIGURE_ON=	--with-libintl-prefix=${LOCALBASE}
>-NLS_CONFIGURE_OFF=	--without-libintl-prefix
>+NLS_CONFIGURE_WITH=	libintl-prefix=${LOCALBASE}
> 
> PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
> PCRE_CONFIGURE_ENABLE=	perl-regexp
>-PCRE_CPPFLAGS=		-I${LOCALBASE}/include
>-PCRE_LDFLAGS=		-L${LOCALBASE}/lib
>-PCRE_CONFIGURE_OFF=	--disable-perl-regexp
>+PCRE_USES=		perl5
> 
>-.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
>+	@${REINPLACE_CMD} 's:@grep@:${PREFIX}/bin/&:' ${WRKSRC}/src/egrep.sh
> 
> .include <bsd.port.mk>
>Index: textproc/gnugrep/distinfo
>===================================================================
>--- textproc/gnugrep/distinfo	(revision 478337)
>+++ textproc/gnugrep/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1482836406
>-SHA256 (grep-2.27.tar.xz) = ad4cc44d23074a1c3a8baae8fbafff2a8c60f38a9a6108f985eef6fbee6dcaeb
>-SIZE (grep-2.27.tar.xz) = 1360388
>+TIMESTAMP = 1523923533
>+SHA256 (grep-3.1.tar.xz) = db625c7ab3bb3ee757b3926a5cfa8d9e1c3991ad24707a83dde8a5ef2bf7a07e
>+SIZE (grep-3.1.tar.xz) = 1370880

Actions: View | Diff

Attachments on bug 227601: 192610 | 196665 | 196666