From nobody Thu Feb 17 20:17:03 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 6104A19D14B3; Thu, 17 Feb 2022 20:17:04 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K05hb6b1Gz3FXD; Thu, 17 Feb 2022 20:17:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645129024; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+see67glcm1Kj2tEZv9Hd/Qblqty0EIM3rfDqD6Ko6I=; b=PMi9IP0+uAp9gGk4VPvoEF9UHY6zxKXRkXT6lb0H2mkI2rL5sgJHP+ceN50OJ85teB6i1h bBNTXKXBqjK6vmBnCsQOwlBLYQAxdXn4iv93X3/37/HZcOEJV+rwr3V/mVpxj+rQvHToun uK7hxr+pBDQkuKLQ4r1AAlR7951lVfS7SD0DI/tAt6SGP4l64PTRxVu2n5bf6rfxihVDzC 3qzJ2w7MRkDZo5a2Uc8WpRDWHkz4U9USmexpP0Kkzbz/UOIOQFtqie05ixkxyawzGLVXdE IkFC1r7ceZ+RlzuZkPfp4rZ8JWjWiyBvbPlzX6n+X/z/faOwwfhgtgrIJnpYOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8736010648; Thu, 17 Feb 2022 20:17:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21HKH3jP072367; Thu, 17 Feb 2022 20:17:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21HKH386072366; Thu, 17 Feb 2022 20:17:03 GMT (envelope-from git) Date: Thu, 17 Feb 2022 20:17:03 GMT Message-Id: <202202172017.21HKH386072366@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: a36f5280a8e5 - main - math/gap: Fix install List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a36f5280a8e5bde7b267be78aaf7d6f92c1cc399 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645129024; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+see67glcm1Kj2tEZv9Hd/Qblqty0EIM3rfDqD6Ko6I=; b=I46Q+qDjtrlzNESYGq72lr9reH5i2J7/Ji4NiCJMN6ftIWoaEflp2z9WBey5FZVL048GNQ iO8F972dqXG/01CIZ9+1dTXIhPdbf68lGSuUo2o/OeOKiqdZ9lQQrCEoC6xli57pQwOvHD uF1PKXKJqu5ozQ8BHbRNetFMOnLC+WG9FjxlWobXUAtB9zh+mKy+5tciHiKOOXutEx2UWo mVSzh3aWhBBYyQ8dlRkOhm4tDxm2T26VsSI1IW6ij/lTdUbhjO39mIYZJu90c1nbSypnMW YbSxTNnoVoIqCmHB0vk46ecIYtlO4TThvMnKnwNAsOk0v4GBG3PzWwQ5XpAGcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645129024; a=rsa-sha256; cv=none; b=TnznRZSn39tAs5LA7jUxD9wZIOSJw+pH9k4wTCpC1ZaZ8zI9jLu4vFQBewWZGRB4jM+3ie pBBMIpOXED94agcZwpogoK7skkwHgiNGq9KGw7GUAzbmjg3PW7bbWCZVJVIVb7vsAndEVK ijqytqR6WFa/yVfqmVuGeWvK2FDsYgYC7JbN7PKXGBstkL1VZ2U+TFb8hc44bOMNFpSRab Xz4BBkRCs3zTc9VEjUfsnp5wnJJ4INSgkzJtnobqdMMD6N90T8Z/lA98+x354a+WuRYBUp s+LbrXyE8rhZ6X0Qvc9eV4+NO8UVRqQQUaYoa/xg9L+PzAMCNKLj0qEvEolGxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=a36f5280a8e5bde7b267be78aaf7d6f92c1cc399 commit a36f5280a8e5bde7b267be78aaf7d6f92c1cc399 Author: Yuri Victorovich AuthorDate: 2022-02-17 20:05:03 +0000 Commit: Yuri Victorovich CommitDate: 2022-02-17 20:16:58 +0000 math/gap: Fix install ... that was accidentally broken by the previous commit. --- math/gap/Makefile | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/math/gap/Makefile b/math/gap/Makefile index 348ee66c3d7d..caf2e3ec1e92 100644 --- a/math/gap/Makefile +++ b/math/gap/Makefile @@ -77,21 +77,20 @@ post-build: post-install: # additional header ${INSTALL_DATA} ${WRKSRC}/gen/config.h ${STAGEDIR}${PREFIX}/include/gap - # install gap binary and wrapper + # install gap binary ${INSTALL_PROGRAM} ${WRKSRC}/gap ${STAGEDIR}${PREFIX}/bin/gap-bin - ${INSTALL_SCRIPT} ${WRKSRC}/bin/gap ${STAGEDIR}${PREFIX}/bin # strip cd ${STAGEDIR}${PREFIX} && ${STRIP_CMD} bin/gap-bin lib/libgap.so.0.0.0 # install gac executable ${INSTALL_SCRIPT} ${WRKSRC}/gac ${STAGEDIR}${PREFIX}/bin/gac - # - ${SED} -e "s:${WRKSRC}:${GAP_LIBDIR}:" ${WRKSRC}/bin/gap.sh \ - > ${WRKSRC}/bin/gap - ${SED} \ - -e "s:GAP_DIR=.*:GAP_DIR=${DATADIR}:" \ - -e "s:GAP_EXE=.*:GAP_EXE=${PREFIX}/bin/gap-bin:" \ - -e "/^exec/s:/gap::" ${WRKSRC}/bin/gap.sh \ - > ${WRKSRC}/bin/gap + # prepare and install wrapper + @${CAT} ${WRKSRC}/bin/gap.sh | ${SED} -e ' \ + s:${WRKSRC}:${GAP_LIBDIR}:; \ + s:GAP_DIR=.*:GAP_DIR=${DATADIR}:; \ + s:GAP_EXE=.*:GAP_EXE=${PREFIX}/bin/gap-bin:; \ + /^exec/s:/gap::; \ + ' > ${WRKSRC}/bin/gap + ${INSTALL_SCRIPT} ${WRKSRC}/bin/gap ${STAGEDIR}${PREFIX}/bin # install packages ${MKDIR} ${STAGEDIR}${DATADIR}/pkg .for f in doc etc gen grp lib tst sysinfo.gap