From owner-svn-ports-all@freebsd.org Fri Oct 16 13:51:18 2020 Return-Path: Delivered-To: svn-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 29B9B436F34; Fri, 16 Oct 2020 13:51:18 +0000 (UTC) (envelope-from gahr@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CCSHB0Myzz3VyM; Fri, 16 Oct 2020 13:51:18 +0000 (UTC) (envelope-from gahr@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C9D72111CE; Fri, 16 Oct 2020 13:51:17 +0000 (UTC) (envelope-from gahr@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09GDpHlf063563; Fri, 16 Oct 2020 13:51:17 GMT (envelope-from gahr@FreeBSD.org) Received: (from gahr@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09GDpHsw063560; Fri, 16 Oct 2020 13:51:17 GMT (envelope-from gahr@FreeBSD.org) Message-Id: <202010161351.09GDpHsw063560@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gahr set sender to gahr@FreeBSD.org using -f From: Pietro Cerutti Date: Fri, 16 Oct 2020 13:51:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r552510 - in head/lang/chibi-scheme: . files X-SVN-Group: ports-head X-SVN-Commit-Author: gahr X-SVN-Commit-Paths: in head/lang/chibi-scheme: . files X-SVN-Commit-Revision: 552510 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Oct 2020 13:51:18 -0000 Author: gahr Date: Fri Oct 16 13:51:16 2020 New Revision: 552510 URL: https://svnweb.freebsd.org/changeset/ports/552510 Log: lang/chibi-scheme: modernize, sync patches with upstream PRs Modified: head/lang/chibi-scheme/Makefile head/lang/chibi-scheme/files/patch-Makefile head/lang/chibi-scheme/files/patch-Makefile.detect Modified: head/lang/chibi-scheme/Makefile ============================================================================== --- head/lang/chibi-scheme/Makefile Fri Oct 16 13:45:43 2020 (r552509) +++ head/lang/chibi-scheme/Makefile Fri Oct 16 13:51:16 2020 (r552510) @@ -29,13 +29,14 @@ PLIST_SUB= SOVERSION=${DISTVERSION} PORTDOCS= * post-patch: - @${REINPLACE_CMD} -e 's@ -g -g3 -O3 @ @' \ - -e '/$$(SO)/ s@$$(INSTALL_EXE) -m0755 @$$(BSD_INSTALL_LIB) @' \ - -e '/tools/ s@$$(INSTALL) -m0755 @$$(BSD_INSTALL_SCRIPT) @' \ - -e 's@$$(INSTALL_EXE) -m0755 @$$(BSD_INSTALL_PROGRAM) @' \ - -e '/$$(MANDIR)/ s@$$(INSTALL) -m0644 @$$(BSD_INSTALL_MAN) @' \ - -e 's@$$(INSTALL) -m0644 @$$(BSD_INSTALL_DATA) @' \ - ${WRKSRC}/Makefile + @${REINPLACE_CMD} \ + -e '/$$(SO)/s|$$(INSTALL_EXE) -m0755|$$(BSD_INSTALL_LIB)|' \ + -e '/tools/s|$$(INSTALL) -m0755|$$(BSD_INSTALL_SCRIPT)|' \ + -e 's|$$(INSTALL_EXE) -m0755|$$(BSD_INSTALL_PROGRAM)|' \ + -e '/$$(MANDIR)/s|$$(INSTALL) -m0644|$$(BSD_INSTALL_MAN)|' \ + -e 's|$$(INSTALL) -m0644|$$(BSD_INSTALL_DATA)|' \ + ${WRKSRC}/Makefile + @${REINPLACE_CMD} 's|-g -g3 -O3 ||' ${WRKSRC}/Makefile.detect post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR}/lib Modified: head/lang/chibi-scheme/files/patch-Makefile ============================================================================== --- head/lang/chibi-scheme/files/patch-Makefile Fri Oct 16 13:45:43 2020 (r552509) +++ head/lang/chibi-scheme/files/patch-Makefile Fri Oct 16 13:51:16 2020 (r552510) @@ -1,6 +1,6 @@ ---- Makefile.orig 2020-10-14 09:49:18.314212000 +0000 -+++ Makefile 2020-10-14 09:51:06.922727000 +0000 -@@ -11,7 +11,7 @@ +--- Makefile.orig 2020-08-13 02:03:03 UTC ++++ Makefile +@@ -11,7 +11,7 @@ CHIBI_FFI ?= $(CHIBI) -q tools/chibi-ffi CHIBI_FFI_DEPENDENCIES ?= $(CHIBI_DEPENDENCIES) tools/chibi-ffi CHIBI_DOC ?= $(CHIBI) tools/chibi-doc Modified: head/lang/chibi-scheme/files/patch-Makefile.detect ============================================================================== --- head/lang/chibi-scheme/files/patch-Makefile.detect Fri Oct 16 13:45:43 2020 (r552509) +++ head/lang/chibi-scheme/files/patch-Makefile.detect Fri Oct 16 13:51:16 2020 (r552510) @@ -1,10 +1,10 @@ ---- Makefile.detect.orig 2020-07-31 15:00:38 UTC +--- Makefile.detect.orig 2020-10-16 13:28:43 UTC +++ Makefile.detect -@@ -75,6 +75,7 @@ CLIBFLAGS = -fPIC - CLINKFLAGS = -shared - LIBDL = - RLDFLAGS=-Wl,-R$(LIBDIR) +@@ -9,6 +9,7 @@ PLATFORM=macosx + else + ifeq ($(shell uname),FreeBSD) + PLATFORM=bsd +LIBCHIBI_FLAGS = -Wl,-soname,libchibi-scheme$(SO).$(SOVERSION_MAJOR) else - ifeq ($(PLATFORM),solaris) - SO = .so + ifeq ($(shell uname),NetBSD) + PLATFORM=bsd