From 543f5569845323795ff8f30f98fd86c253f0df05 Mon Sep 17 00:00:00 2001 From: fbrosson Date: Thu, 4 Oct 2018 10:28:06 +0000 Subject: [PATCH] bmake: bump to 20180919, add a tiny PATCH to simplify INSTALL. --- ...-20180512.recipe => bmake-20180919.recipe} | 29 +++++++++---------- 1 file changed, 13 insertions(+), 16 deletions(-) rename sys-devel/bmake/{bmake-20180512.recipe => bmake-20180919.recipe} (64%) diff --git a/sys-devel/bmake/bmake-20180512.recipe b/sys-devel/bmake/bmake-20180919.recipe similarity index 64% rename from sys-devel/bmake/bmake-20180512.recipe rename to sys-devel/bmake/bmake-20180919.recipe index 8ce9d7891..6389b0ebd 100644 --- a/sys-devel/bmake/bmake-20180512.recipe +++ b/sys-devel/bmake/bmake-20180919.recipe @@ -12,7 +12,7 @@ COPYRIGHT="1990-2018 NetBSD and sjg" LICENSE="BSD (3-clause)" REVISION="1" SOURCE_URI="http://www.crufty.net/ftp/pub/sjg/bmake-$portVersion.tar.gz" -CHECKSUM_SHA256="ac3cd262065fcc20c1dec7c95f06306c8138b3e17025b949343a06a8980a5508" +CHECKSUM_SHA256="b0dd038583fe4a627f52f109887b71d365d8c51ec87f0e3fcb3ab6a9124eccee" SOURCE_DIR="bmake" ARCHITECTURES="x86_gcc2 x86 x86_64" @@ -36,29 +36,26 @@ BUILD_PREREQUIRES=" cmd:sed " +PATCH() +{ + # This seems to be the only way to nicely workaround a "Force these" + sed -i \ + -e "/^SHAREDIR=/ s|/share|/$relativeDataDir|;" \ + Makefile +} + BUILD() { - runConfigure ./configure --with-default-sys-path=$dataDir/mk - make MANDIR=$manDir + runConfigure ./configure --with-default-sys-path="$dataDir"/mk + make MANDIR="$manDir" } INSTALL() { - # The install process needs a root user, and there is no such thing in the - # chroot. - echo "root:x:0:" > /etc/group - useradd root || true # Don't fail if user already exists - - make install MANDIR=$manDir - - # Even when configured to look for files in dataDir, they are installed in - # share... - rm -rf $dataDir - mv $prefix/share $dataDir + make install MANDIR="$manDir" ROOT_GROUP="`id -g -n`" } TEST() { - ROOT_GROUP=root \ - make test + make test ROOT_GROUP="`id -g -n`" }