From owner-svn-ports-all@freebsd.org Fri Dec 28 08:22:31 2018 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 9CB5C1430D34; Fri, 28 Dec 2018 08:22:31 +0000 (UTC) (envelope-from tobik@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 3F5DF77C52; Fri, 28 Dec 2018 08:22:31 +0000 (UTC) (envelope-from tobik@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 3275A2052D; Fri, 28 Dec 2018 08:22:31 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wBS8MUgC095699; Fri, 28 Dec 2018 08:22:30 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wBS8MUZu095698; Fri, 28 Dec 2018 08:22:30 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201812280822.wBS8MUZu095698@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Fri, 28 Dec 2018 08:22:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r488585 - head/sysutils/grub2 X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/sysutils/grub2 X-SVN-Commit-Revision: 488585 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 3F5DF77C52 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.94)[-0.943,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,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, 28 Dec 2018 08:22:31 -0000 Author: tobik Date: Fri Dec 28 08:22:30 2018 New Revision: 488585 URL: https://svnweb.freebsd.org/changeset/ports/488585 Log: sysutils/grub2: Fix grub-mkconfig Currently grub-mkconfig creates a bogus grub.cfg with lines like tinsmod part_gpt tinsmod ufs2 grub-mkconfig and helpers use sed expressions like "s/^/\t/" or similar to indent grub.cfg with tabs which only really work as intended with gsed at the moment and currently just prefixes lines with a 't'. Switch grub-mkconfig and other scripts over to gsed. help2man calls some scripts at build time, so add gsed as a build dependency too. PR: 228062 Reported by: vas@mpeks.tomsk.su Modified: head/sysutils/grub2/Makefile Modified: head/sysutils/grub2/Makefile ============================================================================== --- head/sysutils/grub2/Makefile Fri Dec 28 07:30:21 2018 (r488584) +++ head/sysutils/grub2/Makefile Fri Dec 28 08:22:30 2018 (r488585) @@ -3,7 +3,7 @@ PORTNAME= grub2 PORTVERSION= 2.00 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= sysutils MASTER_SITES= GNU/grub DISTNAME= grub-${PORTVERSION} @@ -19,7 +19,9 @@ EXPIRATION_DATE=2019-02-04 ONLY_FOR_ARCHS= amd64 i386 BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex \ + gsed:textproc/gsed \ help2man:misc/help2man +RUN_DEPENDS= gsed:textproc/gsed USES= autoreconf bison cpe gettext gmake tar:xz USE_GCC= 7 # Fails to build with GCC 8, cf. PR 232961, or clang @@ -59,6 +61,9 @@ PLIST_SUB+= EFIEMU="" post-patch: @${LN} -s ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf ${WRKSRC} @${TOUCH} -t 200001010000 ${WRKSRC}/Makefile.util.def + @${REINPLACE_CMD} -e '/[^auU]sed/ s,sed,gsed,g' ${WRKSRC}/util/grub.d/*.in \ + ${WRKSRC}/util/*.in ${WRKSRC}/util/i386/efi/grub-dumpdevtree \ + ${WRKSRC}/util/bash-completion.d/grub-completion.bash.in post-configure: @${LN} -sfh /usr/include/machine /usr/include/sys /usr/include/x86 \