svn commit: r490864 - head/textproc/gsed

[Alexey Dokuchaev]

Author: danfe
Date: Mon Jan 21 14:37:46 2019
New Revision: 490864
URL: https://svnweb.freebsd.org/changeset/ports/490864

Log:
  Update GNU sed to version 4.7.
  
  PR:		215768
  Submitted by:	pfg
  Exp-run by:	antoine

Modified:
  head/textproc/gsed/Makefile
  head/textproc/gsed/distinfo
  head/textproc/gsed/pkg-plist

Modified: head/textproc/gsed/Makefile
==============================================================================
--- head/textproc/gsed/Makefile	Mon Jan 21 14:30:18 2019	(r490863)
+++ head/textproc/gsed/Makefile	Mon Jan 21 14:37:46 2019	(r490864)
@@ -2,32 +2,30 @@
 # $FreeBSD$
 
 PORTNAME=	sed
-PORTVERSION=	4.2.2
-PORTREVISION=	2
+PORTVERSION=	4.7
 CATEGORIES=	textproc
 MASTER_SITES=	GNU
 PKGNAMEPREFIX=	g
 
 MAINTAINER=	johans at FreeBSD.org
-COMMENT=	The GNU stream editor
+COMMENT=	GNU stream editor
 
 LICENSE=	GPLv3+ GFDL
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv3+ =	${WRKSRC}/COPYING
-LICENSE_FILE_GFDL=	${WRKSRC}/COPYING.DOC
 
+USES=		charsetfix makeinfo tar:xz
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--program-prefix=g
 CONFIGURE_ENV+=	MAKEINFO="${MAKEINFO} --no-split"
 TEST_TARGET=	check
 
-USES=		charsetfix makeinfo gmake
-PATCH_SUBDIRS=	. doc lib sed
 DATADIR=	${PREFIX}/share/${PKGBASE}
-SAMP_FILES=	binary*.sed dc.sed
-EXAMPLESDIR=	${PREFIX}/share/examples/${PKGBASE}
-PORTDOCS=	AUTHORS BUGS NEWS README THANKS
 DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
+EXAMPLESDIR=	${PREFIX}/share/examples/${PKGBASE}
 INFO=		sed
+PORTDOCS=	AUTHORS BUGS ChangeLog ChangeLog-2014 NEWS README THANKS
+PORTEXAMPLES=	binary*.sed dc.sed
 
 OPTIONS_DEFINE=	NLS DOCS EXAMPLES
 OPTIONS_SUB=	yes
@@ -38,25 +36,14 @@ NLS_CONFIGURE_ENABLE=	nls
 post-patch:
 	@${REINPLACE_CMD} 's,^\* sed:,* GNU sed:,' \
 		${WRKSRC}/doc/config.texi
-	@${REINPLACE_CMD} "s|#include <alloca.h>||" ${WRKSRC}/lib/regex_internal.h
 
-post-configure:
-.for subdir in ${PATCH_SUBDIRS}
-	@${REINPLACE_CMD} -e 's|s,x,x,|s,^,g,|' \
-			  -e 's|^doc_DATA|#doc_DATA|' \
-		${WRKSRC}/${subdir}/Makefile
-.endfor
-
-post-install:
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-.for f in ${SAMP_FILES}
-	${INSTALL_DATA} ${WRKSRC}/testsuite/${f} ${STAGEDIR}${EXAMPLESDIR}
-.endfor
-
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
-.endfor
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
+
+post-install-EXAMPLES-on:
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${PORTEXAMPLES:S,^,${WRKSRC}/testsuite/,} \
+		${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>

Modified: head/textproc/gsed/distinfo
==============================================================================
--- head/textproc/gsed/distinfo	Mon Jan 21 14:30:18 2019	(r490863)
+++ head/textproc/gsed/distinfo	Mon Jan 21 14:37:46 2019	(r490864)
@@ -1,2 +1,3 @@
-SHA256 (sed-4.2.2.tar.gz) = fea0a94d4b605894f3e2d5572e3f96e4413bcad3a085aae7367c2cf07908b2ff
-SIZE (sed-4.2.2.tar.gz) = 1349912
+TIMESTAMP = 1545372280
+SHA256 (sed-4.7.tar.xz) = 2885768cd0a29ff8d58a6280a270ff161f6a3deb5690b2be6c49f46d4c67bd6a
+SIZE (sed-4.7.tar.xz) = 1298316

Modified: head/textproc/gsed/pkg-plist
==============================================================================
--- head/textproc/gsed/pkg-plist	Mon Jan 21 14:30:18 2019	(r490863)
+++ head/textproc/gsed/pkg-plist	Mon Jan 21 14:37:46 2019	(r490864)
@@ -1,11 +1,8 @@
 bin/gsed
 man/man1/gsed.1.gz
-%%EXAMPLESDIR%%/binary.sed
-%%EXAMPLESDIR%%/binary2.sed
-%%EXAMPLESDIR%%/binary3.sed
-%%EXAMPLESDIR%%/dc.sed
 %%NLS%%share/locale/af/LC_MESSAGES/sed.mo
 %%NLS%%share/locale/ast/LC_MESSAGES/sed.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/sed.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/sed.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/sed.mo
 %%NLS%%share/locale/da/LC_MESSAGES/sed.mo