From owner-dev-commits-ports-all@freebsd.org Wed May 12 06:52:05 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2D8C1633494; Wed, 12 May 2021 06:52:05 +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 4Fg57T0sBlz3nB4; Wed, 12 May 2021 06:52:05 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 10776268FC; Wed, 12 May 2021 06:52:05 +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 14C6q4wB019093; Wed, 12 May 2021 06:52:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14C6q4Yc019092; Wed, 12 May 2021 06:52:04 GMT (envelope-from git) Date: Wed, 12 May 2021 06:52:04 GMT Message-Id: <202105120652.14C6q4Yc019092@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kirill Ponomarev Subject: git: ee75dc9794e2 - main - lang/sbcl: re-sort variables and fix formatting MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: krion X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ee75dc9794e2f1d383d03093a6aaf9dffd3a122c Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 May 2021 06:52:05 -0000 The branch main has been updated by krion: URL: https://cgit.FreeBSD.org/ports/commit/?id=ee75dc9794e2f1d383d03093a6aaf9dffd3a122c commit ee75dc9794e2f1d383d03093a6aaf9dffd3a122c Author: Kirill Ponomarev AuthorDate: 2021-05-12 06:51:34 +0000 Commit: Kirill Ponomarev CommitDate: 2021-05-12 06:51:34 +0000 lang/sbcl: re-sort variables and fix formatting --- lang/sbcl/Makefile | 69 ++++++++++++++++++++++++------------------------------ 1 file changed, 31 insertions(+), 38 deletions(-) diff --git a/lang/sbcl/Makefile b/lang/sbcl/Makefile index 91de89410041..fc867ee6731f 100644 --- a/lang/sbcl/Makefile +++ b/lang/sbcl/Makefile @@ -26,57 +26,38 @@ RUN_DEPENDS= cl-asdf>=0:devel/cl-asdf USES= gmake makeinfo tar:bzip2 -BOOTVERSION= 1.2.7 -SBCL_BOOT_LIST= ${BOOTVERSION}-x86-64-freebsd ${BOOTVERSION}-x86-freebsd \ - ${BOOTVERSION}-x86-64-dragonfly - -CONMODULES= asdf sb-aclrepl sb-bsd-sockets sb-cltl2 sb-concurrency sb-cover \ - sb-executable sb-gmp sb-grovel sb-introspect sb-md5 sb-mpfr \ - sb-posix sb-queue sb-rotate-byte sb-rt sb-simple-streams \ - sb-sprof +SUB_FILES= pkg-message sbclrc WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -MAKE_SH_ARGS?= --prefix="${PREFIX}" --xc-host="${XC_HOST}" - -# You can use the DYNAMIC_SPACE_SIZE knob to change the size of SBCL dynamically-allocated memory. -# Default for arch: i386 = 512Mb, amd64 = 1Gb. -.if defined(DYNAMIC_SPACE_SIZE) -MAKE_SH_ARGS+= --dynamic-space-size=${DYNAMIC_SPACE_SIZE} -.endif - -SUB_FILES= pkg-message sbclrc +PORTDOCS= * # All options explained into file: ${WRKSRC}/base-target-features.lisp-expr OPTIONS_DEFINE= DOCS QSHOW RENAME SAFEPOINT THREADS UNICODE XREF ZLIB OPTIONS_DEFAULT= RENAME SBCL THREADS UNICODE -QSHOW_DESC= C runtime with low-level debugging output -RENAME_DESC= Rename suffix .core to _core -SAFEPOINT_DESC= Using safepoints instead of signals -XREF_DESC= XREF data for SBCL internals - OPTIONS_SINGLE= BOOTSTRAP OPTIONS_SINGLE_BOOTSTRAP= ABCL CCL CMUCL SBCL +OPTIONS_EXCLUDE= ABCL CMUCL ABCL_DESC= Armed Bear Common Lisp BOOTSTRAP_DESC= Supported languages of the build host CCL_DESC= Clozure Common Lisp CMUCL_DESC= Carnegie Mellon University Common Lisp +QSHOW_DESC= C runtime with low-level debugging output +RENAME_DESC= Rename suffix .core to _core +SAFEPOINT_DESC= Using safepoints instead of signals SBCL_DESC= Steel Bank Common Lisp +XREF_DESC= XREF data for SBCL internals -# On this moment CMUCL doesn't builds sbcl correctly -# ABCL - I haven't tested. Welcome volunteers. -OPTIONS_EXCLUDE= ABCL CMUCL - -ABCL_VARS= XC_HOST="abcl" ABCL_BUILD_DEPENDS= abcl:lang/abcl +ABCL_VARS= XC_HOST="abcl" -CCL_VARS= XC_HOST="ccl --no-init --batch --quiet" CCL_BUILD_DEPENDS= ccl:lang/ccl +CCL_VARS= XC_HOST="ccl --no-init --batch --quiet" -CMUCL_VARS= XC_HOST="lisp -nositeinit -noinit -batch -quiet" CMUCL_BUILD_DEPENDS= lisp:lang/cmucl +CMUCL_VARS= XC_HOST="lisp -nositeinit -noinit -batch -quiet" DOCS_VARS= INFO="asdf sbcl" @@ -86,12 +67,12 @@ QSHOW_VARS_OFF= MAKE_SH_ARGS+="--without-sb-qshow" RENAME_PLIST_SUB= CORE_SUFFIX="_core" RENAME_PLIST_SUB_OFF= CORE_SUFFIX=".core" +SAFEPOINT_IMPLIES= THREADS SAFEPOINT_VARS= MAKE_SH_ARGS+="--with-sb-safepoint --with-sb-thruption --with-sb-wtimer" SAFEPOINT_VARS_OFF= MAKE_SH_ARGS+="--without-sb-safepoint --without-sb-thruption --without-sb-wtimer" -SAFEPOINT_IMPLIES= THREADS -SBCL_VARS= XC_HOST="${BOOT_WRKSRC}/src/runtime/sbcl --core ${BOOT_WRKSRC}/output/${CORE} --noinform --disable-debugger --no-sysinit --no-userinit" SBCL_DISTFILES= ${PORTNAME}-${SBCL_BOOT_LIST:M${ARCHOS_PATTERN}}-binary${EXTRACT_SUFX}:binaries +SBCL_VARS= XC_HOST="${BOOT_WRKSRC}/src/runtime/sbcl --core ${BOOT_WRKSRC}/output/${CORE} --noinform --disable-debugger --no-sysinit --no-userinit" THREADS_VARS= MAKE_SH_ARGS+="--with-sb-thread" THREADS_VARS_OFF= MAKE_SH_ARGS+="--without-sb-thread" @@ -105,7 +86,19 @@ XREF_VARS_OFF= MAKE_SH_ARGS+="--without-sb-xref-for-internals" ZLIB_VARS= MAKE_SH_ARGS+="--with-sb-core-compression" ZLIB_VARS_OFF= MAKE_SH_ARGS+="--without-sb-core-compression" -PORTDOCS= * +BOOTVERSION= 1.2.7 +CONMODULES= asdf sb-aclrepl sb-bsd-sockets sb-cltl2 sb-concurrency sb-cover \ + sb-executable sb-gmp sb-grovel sb-introspect sb-md5 sb-mpfr \ + sb-posix sb-queue sb-rotate-byte sb-rt sb-simple-streams \ + sb-sprof +MAKE_SH_ARGS?= --prefix="${PREFIX}" --xc-host="${XC_HOST}" +# You can use the DYNAMIC_SPACE_SIZE knob to change the size of SBCL dynamically-allocated memory. +# Default for arch: i386 = 512Mb, amd64 = 1Gb. +.if defined(DYNAMIC_SPACE_SIZE) +MAKE_SH_ARGS+= --dynamic-space-size=${DYNAMIC_SPACE_SIZE} +.endif +SBCL_BOOT_LIST= ${BOOTVERSION}-x86-64-freebsd ${BOOTVERSION}-x86-freebsd \ + ${BOOTVERSION}-x86-64-dragonfly .include @@ -129,18 +122,21 @@ CORE= sbcl.core CORE= sbcl_core .endif -post-patch-RENAME-on: - ${GREP} -Frl '.core' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e 's|\.core|_core|g' - post-patch: @${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|' \ ${WRKSRC}/src/code/toplevel.lisp \ ${WRKSRC}/doc/${PORTNAME}.1 \ ${WRKSRC}/doc/manual/start-stop.texinfo +post-patch-RENAME-on: + ${GREP} -Frl '.core' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e 's|\.core|_core|g' + do-build: (cd ${WRKSRC} && ${SH} make.sh ${MAKE_SH_ARGS}) +post-build-DOCS-on: + ${DO_MAKE_BUILD} -C ${WRKSRC}/doc/manual info html + do-install: (cd ${WRKSRC} && ${SETENV} \ INSTALL_ROOT="${STAGEDIR}${PREFIX}" \ @@ -155,9 +151,6 @@ do-install: .endfor ${INSTALL_DATA} ${WRKDIR}/sbclrc ${STAGEDIR}${PREFIX}/etc/sbclrc.sample -post-build-DOCS-on: - ${DO_MAKE_BUILD} -C ${WRKSRC}/doc/manual info html - post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}