From nobody Thu Feb 17 00:27:25 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 192ED19C93CC; Thu, 17 Feb 2022 00:27:26 +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 4JzbHx4shqz4Zpb; Thu, 17 Feb 2022 00:27:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645057645; 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=bSHeBT0MNIQPexIX1ybDBnFWbHtYohA/2nTP29FVCAc=; b=emLLGVmnFlxz0ZiSFn5QnB7boSfeQXMpA9gTzg5B9Fqr0Y021oS45ZhKDiTZJjLaIgM0q7 89SOVqEUV8g3xs7dW9eDSH2tODNXU9SCCZ0xeLiXaUigU2ZO0fqFs8n8r1TAdOxF+6XiYC L41ajnWtvzoAbojMOg3Lt+wfl16sItLyaotBEydyiZQHet/1FBFQufOIb9LfVR5P1Kjv1v 8BBvFI/uvQ7k6wAbDL5NnV1mxahCIv9RNLG2FYl7sRzQMCQd5UkF5soD35Ykr3T9X48IZD ccq5XaMeKcIpSgWp/SKdB5rumVY/LZmAg6kvX/N6O06eOz7LKeFL5jKceMM0jA== 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 6EB7E1FD57; Thu, 17 Feb 2022 00:27:25 +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 21H0RPG0074397; Thu, 17 Feb 2022 00:27:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21H0RPLb074396; Thu, 17 Feb 2022 00:27:25 GMT (envelope-from git) Date: Thu, 17 Feb 2022 00:27:25 GMT Message-Id: <202202170027.21H0RPLb074396@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: a99369a4becb - main - math/gap: Add test target, simplify post-build and post-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: a99369a4becb9667f0aaf52a9706ff11398bf57d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645057645; 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=bSHeBT0MNIQPexIX1ybDBnFWbHtYohA/2nTP29FVCAc=; b=DkMEv+55nLUb50fMG5xGNxWVD84YrsHiLM06xqCOmLf6jdBk/JjksCudTz2oLhLBz+zeeo CHyITTNjAFp4ObmYhrzTG7TFn2VpFvXL7Djbu2gCD5siITnM+Oc5ybxv/nIwc8hBdQmzz/ Z6vJ1M3cQR+/Abk6RVuQ/dK0Tfkby2WeCip8fCirJ3lX9BIuWRkuPi3lTy2UuXLa16yoTd qbAAo7s5/C0lBPgxTwzxbrPC1nYS4KZ9+kGLz5Ubw4dwUQV3vtbvb/pZoRWzKoRYV7dMLJ 6aYC+50JpLhIxWo8SCvDy7zCvV9aw3WfCu+Qwqu+PyI+ZrDREhVzu3/gEbEXJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645057645; a=rsa-sha256; cv=none; b=qv2o4ynoK8yEGbgZu0v/vC+6HF3kqTL5cdGW66eEUMmlU3lsaa8EKrKQQIje6N5/vU/7mw M4sRlNuWS3UoRO47B66msGJOd2F9xQLUArSdM/yNNMvjN6X/7U/ly4oTM+cPCUYcW9Gz8N eKZZ9ESFOOquzUQ3olZkIqclCWyxKsxfgvBnxKOksQUNUNL2YEgTROECCgYa0UXBe/Il8u 1gSAMvnhWjR9hz4B2n43QGg9ZCn6ywId9R01XtTX56SpGfWzxT5NWStWUegL5Yx8zveXb1 agCufYNtdMHAwYSwSgZIqEYLFK4XQvEkDrq4QJ+rfrQj+kJEn8BZa6s4gbuBAg== 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=a99369a4becb9667f0aaf52a9706ff11398bf57d commit a99369a4becb9667f0aaf52a9706ff11398bf57d Author: Yuri Victorovich AuthorDate: 2022-02-17 00:05:11 +0000 Commit: Yuri Victorovich CommitDate: 2022-02-17 00:27:20 +0000 math/gap: Add test target, simplify post-build and post-install --- math/gap/Makefile | 43 ++++++++++++++++++++++++++----------------- math/gap/files/test.g | 6 ++++++ 2 files changed, 32 insertions(+), 17 deletions(-) diff --git a/math/gap/Makefile b/math/gap/Makefile index ce7d31af1e39..348ee66c3d7d 100644 --- a/math/gap/Makefile +++ b/math/gap/Makefile @@ -67,32 +67,38 @@ pre-configure: .endfor post-build: - cd ${WRKSRC}/pkg/simpcomp && \ - ${SETENV} ${CONFIGURE_ENV} ${SH} configure \ - ${CONFIGURE_ARGS:N--with-*} && \ - ${MAKE} ${MAKEFLAGS} && \ - ${MAKE} ${MAKEFLAGS} install-strip && \ - ${RM} bistellar + @cd ${WRKSRC}/pkg/simpcomp && \ + ${SETENV} ${CONFIGURE_ENV} ${SH} configure \ + ${CONFIGURE_ARGS:N--with-*} && \ + ${MAKE} ${MAKEFLAGS} && \ + ${MAKE} ${MAKEFLAGS} install-strip && \ + ${RM} bistellar post-install: + # additional header ${INSTALL_DATA} ${WRKSRC}/gen/config.h ${STAGEDIR}${PREFIX}/include/gap - (cd ${WRKSRC} && \ - ./libtool --mode=install install gap ${STAGEDIR}${PREFIX}/bin/gap-bin) - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/gap-bin ${STAGEDIR}${PREFIX}/lib/libgap.so.0.0.0 - (cd ${WRKSRC} && \ - ./libtool --mode=install install gac ${STAGEDIR}${PREFIX}/bin/gac) + # install gap binary and wrapper + ${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}:" \ + ${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 - ${INSTALL_SCRIPT} ${WRKSRC}/bin/gap ${STAGEDIR}${PREFIX}/bin + -e "/^exec/s:/gap::" ${WRKSRC}/bin/gap.sh \ + > ${WRKSRC}/bin/gap + # install packages ${MKDIR} ${STAGEDIR}${DATADIR}/pkg -.for subdir in doc etc gen grp lib tst sysinfo.gap - ${CP} -R ${WRKSRC}/${subdir} ${STAGEDIR}${DATADIR}/ +.for f in doc etc gen grp lib tst sysinfo.gap + ${CP} -R ${WRKSRC}/${f} ${STAGEDIR}${DATADIR}/ .endfor .for p in ${MINPACK} ${ADD_PACK} - (cd ${WRKSRC}/pkg && ${CP} -R $$(ls -d ${p}*) ${STAGEDIR}${DATADIR}/pkg/) + cd ${WRKSRC}/pkg && ${CP} -R $$(ls -d ${p}*) ${STAGEDIR}${DATADIR}/pkg/ .endfor # correct paths in sysinfo.gap ${REINPLACE_CMD} -i '' -e ' \ @@ -100,4 +106,7 @@ post-install: s|^GAP_LIB_DIR=.*|GAP_LIB_DIR="${PREFIX}/lib"|; \ ' ${STAGEDIR}${DATADIR}/sysinfo.gap +do-test: + @cd ${WRKSRC} && ./gap ${FILESDIR}/test.g + .include diff --git a/math/gap/files/test.g b/math/gap/files/test.g new file mode 100644 index 000000000000..cbaeefdf7864 --- /dev/null +++ b/math/gap/files/test.g @@ -0,0 +1,6 @@ +## +## Test code is from https://www.gap-system.org/Download/ +## + +tst := Filename( DirectoriesLibrary("tst"), "testinstall.g" );; +Read(tst);