Date: Fri, 28 Dec 2018 08:22:30 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r488585 - head/sysutils/grub2 Message-ID: <201812280822.wBS8MUZu095698@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812280822.wBS8MUZu095698>