Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 16 Oct 2020 13:51:17 +0000 (UTC)
From:      Pietro Cerutti <gahr@FreeBSD.org>
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
Message-ID:  <202010161351.09GDpHsw063560@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010161351.09GDpHsw063560>