diff options
| author | Pietro Cerutti <gahr@FreeBSD.org> | 2020-10-16 21:51:16 +0800 |
|---|---|---|
| committer | Pietro Cerutti <gahr@FreeBSD.org> | 2020-10-16 21:51:16 +0800 |
| commit | b3859a4880056798186e0343803a4fa9fb9b773d (patch) | |
| tree | 535f17e9bb88a98b4c029a437a96b4129d9c01cc /lang | |
| parent | 6a024e82bea6a62ed2d22416752049dd337c197b (diff) | |
| download | freebsd-ports-gnome-b3859a4880056798186e0343803a4fa9fb9b773d.tar.gz freebsd-ports-gnome-b3859a4880056798186e0343803a4fa9fb9b773d.tar.zst freebsd-ports-gnome-b3859a4880056798186e0343803a4fa9fb9b773d.zip | |
lang/chibi-scheme: modernize, sync patches with upstream PRs
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/chibi-scheme/Makefile | 15 | ||||
| -rw-r--r-- | lang/chibi-scheme/files/patch-Makefile | 6 | ||||
| -rw-r--r-- | lang/chibi-scheme/files/patch-Makefile.detect | 14 |
3 files changed, 18 insertions, 17 deletions
diff --git a/lang/chibi-scheme/Makefile b/lang/chibi-scheme/Makefile index 7f64e5017349..6b119114b38b 100644 --- a/lang/chibi-scheme/Makefile +++ b/lang/chibi-scheme/Makefile @@ -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 diff --git a/lang/chibi-scheme/files/patch-Makefile b/lang/chibi-scheme/files/patch-Makefile index b7234090636a..81836371cec6 100644 --- a/lang/chibi-scheme/files/patch-Makefile +++ b/lang/chibi-scheme/files/patch-Makefile @@ -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 diff --git a/lang/chibi-scheme/files/patch-Makefile.detect b/lang/chibi-scheme/files/patch-Makefile.detect index 36795ddc8ea5..25a4b975d3d3 100644 --- a/lang/chibi-scheme/files/patch-Makefile.detect +++ b/lang/chibi-scheme/files/patch-Makefile.detect @@ -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 |