Attachment 165184 Details for Bug 205982 – chibi-scheme.diff

[patch] chibi-scheme.diff

chibi-scheme.diff (text/plain), 12.56 KB, created by Tobias Kortkamp on 2016-01-06 21:04:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Kortkamp

Created: 2016-01-06 21:04:17 UTC

Size: 12.56 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 405371)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	chibi-scheme
>-PORTVERSION=	0.7.2
>-PORTREVISION=	1
>+PORTVERSION=	0.7.3
> CATEGORIES=	lang
> 
> MAINTAINER=	t@tobik.me
>@@ -18,6 +17,8 @@
> USE_LDCONFIG=	yes
> 
> MAKE_ARGS=	MODDIR=${LOCALBASE}/lib/chibi \
>+		MANDIR=${LOCALBASE}/man/man1 \
>+		INSTALL_BIN="${INSTALL} -s" \
> 		PKGCONFDIR=${LOCALBASE}/libdata/pkgconfig
> 
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 405371)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (ashinn-chibi-scheme-0.7.2_GH0.tar.gz) = 07a7b28575a2dab8aa1d0ceb080a840c3a751bf473155f53014b14c9d82e97c9
>-SIZE (ashinn-chibi-scheme-0.7.2_GH0.tar.gz) = 757456
>+SHA256 (ashinn-chibi-scheme-0.7.3_GH0.tar.gz) = 821ce808573ca4eadfeb84bfd18d4ef839dde24ba882eb232207e48f89bb979b
>+SIZE (ashinn-chibi-scheme-0.7.3_GH0.tar.gz) = 812703
>Index: files/patch-Makefile
>===================================================================
>--- files/patch-Makefile	(revision 405371)
>+++ files/patch-Makefile	(working copy)
>@@ -1,6 +1,6 @@
>---- Makefile.orig	2014-11-24 02:25:56 UTC
>+--- Makefile.orig	2015-05-10 13:47:12 UTC
> +++ Makefile
>-@@ -66,15 +66,15 @@ endif
>+@@ -72,15 +72,15 @@ endif
>  
>  ifeq ($(SEXP_USE_DL),0)
>  XLDFLAGS  := $(LDFLAGS) $(RLDFLAGS) $(GCLDFLAGS) -lm
>@@ -19,20 +19,21 @@
>  
>  include/chibi/install.h: Makefile
>  	echo '#define sexp_so_extension "'$(SO)'"' > $@
>-@@ -274,7 +274,7 @@ dist-clean: dist-clean-libs cleaner
>+@@ -250,7 +250,7 @@ dist-clean: dist-clean-libs cleaner
>  
>  install: all
>  	$(MKDIR) $(DESTDIR)$(BINDIR)
> -	$(INSTALL) -m0755 chibi-scheme$(EXE) $(DESTDIR)$(BINDIR)/
>-+	$(INSTALL) -s -m0755 chibi-scheme$(EXE) $(DESTDIR)$(BINDIR)/
>++	$(INSTALL_BIN) -m0755 chibi-scheme$(EXE) $(DESTDIR)$(BINDIR)/
>  	$(INSTALL) -m0755 tools/chibi-ffi $(DESTDIR)$(BINDIR)/
>  	$(INSTALL) -m0755 tools/chibi-doc $(DESTDIR)$(BINDIR)/
>  	$(INSTALL) -m0755 tools/snow-chibi $(DESTDIR)$(BINDIR)/
>-@@ -316,32 +316,31 @@ install: all
>+@@ -294,28 +294,28 @@ install: all
>  	$(MKDIR) $(DESTDIR)$(BINMODDIR)/chibi/optimize/
>  	$(MKDIR) $(DESTDIR)$(BINMODDIR)/scheme/
>  	$(MKDIR) $(DESTDIR)$(BINMODDIR)/srfi/18 $(DESTDIR)$(BINMODDIR)/srfi/27 $(DESTDIR)$(BINMODDIR)/srfi/33 $(DESTDIR)$(BINMODDIR)/srfi/39 $(DESTDIR)$(BINMODDIR)/srfi/69 $(DESTDIR)$(BINMODDIR)/srfi/95 $(DESTDIR)$(BINMODDIR)/srfi/98
> -	$(INSTALL) -m0755 $(CHIBI_COMPILED_LIBS) $(DESTDIR)$(BINMODDIR)/chibi/
>+-	$(INSTALL) -m0755 $(CHIBI_CRYPTO_COMPILED_LIBS) $(DESTDIR)$(BINMODDIR)/chibi/crypto/
> -	$(INSTALL) -m0755 $(CHIBI_IO_COMPILED_LIBS) $(DESTDIR)$(BINMODDIR)/chibi/io/
> -	$(INSTALL) -m0755 $(CHIBI_OPT_COMPILED_LIBS) $(DESTDIR)$(BINMODDIR)/chibi/optimize/
> -	$(INSTALL) -m0755 lib/scheme/time$(SO) $(DESTDIR)$(BINMODDIR)/scheme/
>@@ -43,23 +44,24 @@
> -	$(INSTALL) -m0755 lib/srfi/69/hash$(SO) $(DESTDIR)$(BINMODDIR)/srfi/69
> -	$(INSTALL) -m0755 lib/srfi/95/qsort$(SO) $(DESTDIR)$(BINMODDIR)/srfi/95
> -	$(INSTALL) -m0755 lib/srfi/98/env$(SO) $(DESTDIR)$(BINMODDIR)/srfi/98
>-+	$(INSTALL) -s -m0755 $(CHIBI_COMPILED_LIBS) $(DESTDIR)$(BINMODDIR)/chibi/
>-+	$(INSTALL) -s -m0755 $(CHIBI_IO_COMPILED_LIBS) $(DESTDIR)$(BINMODDIR)/chibi/io/
>-+	$(INSTALL) -s -m0755 $(CHIBI_OPT_COMPILED_LIBS) $(DESTDIR)$(BINMODDIR)/chibi/optimize/
>-+	$(INSTALL) -s -m0755 lib/scheme/time$(SO) $(DESTDIR)$(BINMODDIR)/scheme/
>-+	$(INSTALL) -s -m0755 lib/srfi/18/threads$(SO) $(DESTDIR)$(BINMODDIR)/srfi/18
>-+	$(INSTALL) -s -m0755 lib/srfi/27/rand$(SO) $(DESTDIR)$(BINMODDIR)/srfi/27
>-+	$(INSTALL) -s -m0755 lib/srfi/33/bit$(SO) $(DESTDIR)$(BINMODDIR)/srfi/33
>-+	$(INSTALL) -s -m0755 lib/srfi/39/param$(SO) $(DESTDIR)$(BINMODDIR)/srfi/39
>-+	$(INSTALL) -s -m0755 lib/srfi/69/hash$(SO) $(DESTDIR)$(BINMODDIR)/srfi/69
>-+	$(INSTALL) -s -m0755 lib/srfi/95/qsort$(SO) $(DESTDIR)$(BINMODDIR)/srfi/95
>-+	$(INSTALL) -s -m0755 lib/srfi/98/env$(SO) $(DESTDIR)$(BINMODDIR)/srfi/98
>++	$(INSTALL_BIN) -m0755 $(CHIBI_COMPILED_LIBS) $(DESTDIR)$(BINMODDIR)/chibi/
>++	$(INSTALL_BIN) -m0755 $(CHIBI_CRYPTO_COMPILED_LIBS) $(DESTDIR)$(BINMODDIR)/chibi/crypto/
>++	$(INSTALL_BIN) -m0755 $(CHIBI_IO_COMPILED_LIBS) $(DESTDIR)$(BINMODDIR)/chibi/io/
>++	$(INSTALL_BIN) -m0755 $(CHIBI_OPT_COMPILED_LIBS) $(DESTDIR)$(BINMODDIR)/chibi/optimize/
>++	$(INSTALL_BIN) -m0755 lib/scheme/time$(SO) $(DESTDIR)$(BINMODDIR)/scheme/
>++	$(INSTALL_BIN) -m0755 lib/srfi/18/threads$(SO) $(DESTDIR)$(BINMODDIR)/srfi/18
>++	$(INSTALL_BIN) -m0755 lib/srfi/27/rand$(SO) $(DESTDIR)$(BINMODDIR)/srfi/27
>++	$(INSTALL_BIN) -m0755 lib/srfi/33/bit$(SO) $(DESTDIR)$(BINMODDIR)/srfi/33
>++	$(INSTALL_BIN) -m0755 lib/srfi/39/param$(SO) $(DESTDIR)$(BINMODDIR)/srfi/39
>++	$(INSTALL_BIN) -m0755 lib/srfi/69/hash$(SO) $(DESTDIR)$(BINMODDIR)/srfi/69
>++	$(INSTALL_BIN) -m0755 lib/srfi/95/qsort$(SO) $(DESTDIR)$(BINMODDIR)/srfi/95
>++	$(INSTALL_BIN) -m0755 lib/srfi/98/env$(SO) $(DESTDIR)$(BINMODDIR)/srfi/98
>  	$(MKDIR) $(DESTDIR)$(INCDIR)
>  	$(INSTALL) -m0644 $(INCLUDES) $(DESTDIR)$(INCDIR)/
>  	$(MKDIR) $(DESTDIR)$(LIBDIR)
>  	$(MKDIR) $(DESTDIR)$(SOLIBDIR)
> -	$(INSTALL) -m0755 libchibi-scheme$(SO_VERSIONED_SUFFIX) $(DESTDIR)$(SOLIBDIR)/
>-+	$(INSTALL) -s -m0755 libchibi-scheme$(SO_VERSIONED_SUFFIX) $(DESTDIR)$(SOLIBDIR)/
>++	$(INSTALL_BIN) -m0755 libchibi-scheme$(SO_VERSIONED_SUFFIX) $(DESTDIR)$(SOLIBDIR)/
>  	$(LN) -s -f libchibi-scheme$(SO_VERSIONED_SUFFIX) $(DESTDIR)$(SOLIBDIR)/libchibi-scheme$(SO_MAJOR_VERSIONED_SUFFIX)
>  	$(LN) -s -f libchibi-scheme$(SO_VERSIONED_SUFFIX) $(DESTDIR)$(SOLIBDIR)/libchibi-scheme$(SO)
>  	-$(INSTALL) -m0644 libchibi-scheme.a $(DESTDIR)$(SOLIBDIR)/
>@@ -70,8 +72,21 @@
>  	$(MKDIR) $(DESTDIR)$(MANDIR)
>  	$(INSTALL) -m0644 doc/chibi-scheme.1 $(DESTDIR)$(MANDIR)/
>  	$(INSTALL) -m0644 doc/chibi-ffi.1 $(DESTDIR)$(MANDIR)/
>- 	$(INSTALL) -m0644 doc/chibi-doc.1 $(DESTDIR)$(MANDIR)/
>--	-if type ldconfig >/dev/null 2>/dev/null; then ldconfig; fi
>+@@ -332,7 +332,7 @@ uninstall:
>+ 	-$(RM) $(DESTDIR)$(SOLIBDIR)/libchibi-scheme$(SO_VERSIONED_SUFFIX)
>+ 	-$(RM) $(DESTDIR)$(SOLIBDIR)/libchibi-scheme$(SO_MAJOR_VERSIONED_SUFFIX)
>+ 	-$(RM) $(DESTDIR)$(LIBDIR)/libchibi-scheme$(SO).a
>+-	-$(RM) $(DESTDIR)$(SOLIBDIR)/pkgconfig/chibi-scheme.pc
>++	-$(RM) $(DESTDIR)$(PKGCONFDIR)/chibi-scheme.pc
>+ 	-$(CD) $(DESTDIR)$(INCDIR) && $(RM) $(INCLUDES)
>+ 	-$(RM) $(DESTDIR)$(MODDIR)/srfi/99/records/*.{sld,scm}
>+ 	-$(RM) $(DESTDIR)$(MODDIR)/.*.meta
>+@@ -371,7 +371,7 @@ uninstall:
>+ 	-$(RMDIR) $(DESTDIR)$(MODDIR)/srfi $(DESTDIR)$(BINMODDIR)/srfi
>+ 	-$(RMDIR) $(DESTDIR)$(MODDIR) $(DESTDIR)$(BINMODDIR)
>+ 	-$(RM) $(DESTDIR)$(MANDIR)/chibi-scheme.1 $(DESTDIR)$(MANDIR)/chibi-ffi.1 $(DESTDIR)$(MANDIR)/chibi-doc.1
>+-	-$(RM) $(DESTDIR)$(SOLIBDIR)/pkgconfig/chibi-scheme.pc
>++	-$(RM) $(DESTDIR)$(PKGCONFDIR)/chibi-scheme.pc
>  
>- uninstall:
>- 	-$(RM) $(DESTDIR)$(BINDIR)/chibi-scheme$(EXE)
>+ dist: dist-clean
>+ 	$(RM) chibi-scheme-$(VERSION).tgz
>Index: files/patch-Makefile.libs
>===================================================================
>--- files/patch-Makefile.libs	(revision 405371)
>+++ files/patch-Makefile.libs	(working copy)
>@@ -1,12 +1,18 @@
>---- Makefile.libs.orig	2014-11-24 02:25:56 UTC
>+--- Makefile.libs.orig	2015-05-10 13:47:12 UTC
> +++ Makefile.libs
>-@@ -31,7 +31,8 @@ SOLIBDIR  ?= $(PREFIX)/lib
>+@@ -16,6 +16,7 @@ LS        ?= ls
>+ CP        ?= cp
>+ LN        ?= ln
>+ INSTALL   ?= install
>++INSTALL_BIN	?=	$(INSTALL)
>+ MKDIR     ?= $(INSTALL) -d
>+ RMDIR     ?= rmdir
>+ TAR       ?= tar
>+@@ -31,6 +32,7 @@ SOLIBDIR  ?= $(PREFIX)/lib
>  INCDIR    ?= $(PREFIX)/include/chibi
>  MODDIR    ?= $(PREFIX)/share/chibi
>  BINMODDIR ?= $(PREFIX)/lib/chibi
>--MANDIR    ?= $(PREFIX)/share/man/man1
> +PKGCONFDIR ?= $(PREFIX)/lib/pkgconfig
>-+MANDIR    ?= $(PREFIX)/man/man1
>+ MANDIR    ?= $(PREFIX)/share/man/man1
>  
>  DESTDIR   ?=
>- 
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 405371)
>+++ pkg-plist	(working copy)
>@@ -15,6 +15,7 @@
> lib/chibi/chibi/ast.scm
> lib/chibi/chibi/ast.sld
> lib/chibi/chibi/ast.so
>+lib/chibi/chibi/base64-test.sld
> lib/chibi/chibi/base64.scm
> lib/chibi/chibi/base64.sld
> lib/chibi/chibi/binary-record.scm
>@@ -35,21 +36,32 @@
> lib/chibi/chibi/char-set/full.sld
> lib/chibi/chibi/config.scm
> lib/chibi/chibi/config.sld
>+lib/chibi/chibi/crypto/crypto.so
>+lib/chibi/chibi/crypto/md5-test.sld
> lib/chibi/chibi/crypto/md5.scm
> lib/chibi/chibi/crypto/md5.sld
>+lib/chibi/chibi/crypto/rsa-test.sld
> lib/chibi/chibi/crypto/rsa.scm
> lib/chibi/chibi/crypto/rsa.sld
>+lib/chibi/chibi/crypto/sha2-native.scm
>+lib/chibi/chibi/crypto/sha2-test.sld
> lib/chibi/chibi/crypto/sha2.scm
> lib/chibi/chibi/crypto/sha2.sld
> lib/chibi/chibi/disasm.sld
> lib/chibi/chibi/disasm.so
>+lib/chibi/chibi/doc-test.sld
> lib/chibi/chibi/doc.scm
> lib/chibi/chibi/doc.sld
>+lib/chibi/chibi/emscripten.scm
>+lib/chibi/chibi/emscripten.sld
>+lib/chibi/chibi/emscripten.so
> lib/chibi/chibi/equiv.scm
> lib/chibi/chibi/equiv.sld
>+lib/chibi/chibi/filesystem-test.sld
> lib/chibi/chibi/filesystem.scm
> lib/chibi/chibi/filesystem.sld
> lib/chibi/chibi/filesystem.so
>+lib/chibi/chibi/generic-test.sld
> lib/chibi/chibi/generic.scm
> lib/chibi/chibi/generic.sld
> lib/chibi/chibi/heap-stats.sld
>@@ -56,9 +68,11 @@
> lib/chibi/chibi/heap-stats.so
> lib/chibi/chibi/highlight.scm
> lib/chibi/chibi/highlight.sld
>+lib/chibi/chibi/io-test.sld
> lib/chibi/chibi/io.sld
> lib/chibi/chibi/io/io.scm
> lib/chibi/chibi/io/io.so
>+lib/chibi/chibi/iset-test.sld
> lib/chibi/chibi/iset.sld
> lib/chibi/chibi/iset/base.scm
> lib/chibi/chibi/iset/base.sld
>@@ -70,14 +84,19 @@
> lib/chibi/chibi/iset/optimize.sld
> lib/chibi/chibi/log.scm
> lib/chibi/chibi/log.sld
>+lib/chibi/chibi/loop-test.sld
> lib/chibi/chibi/loop.sld
> lib/chibi/chibi/loop/loop.scm
>+lib/chibi/chibi/match-test.sld
> lib/chibi/chibi/match.sld
> lib/chibi/chibi/match/match.scm
>+lib/chibi/chibi/math/prime-test.sld
> lib/chibi/chibi/math/prime.scm
> lib/chibi/chibi/math/prime.sld
>+lib/chibi/chibi/memoize-test.sld
> lib/chibi/chibi/memoize.scm
> lib/chibi/chibi/memoize.sld
>+lib/chibi/chibi/mime-test.sld
> lib/chibi/chibi/mime.scm
> lib/chibi/chibi/mime.sld
> lib/chibi/chibi/modules.scm
>@@ -107,25 +126,33 @@
> lib/chibi/chibi/optimize/rest.so
> lib/chibi/chibi/optional.scm
> lib/chibi/chibi/optional.sld
>+lib/chibi/chibi/parse-test.sld
> lib/chibi/chibi/parse.sld
> lib/chibi/chibi/parse/common.scm
> lib/chibi/chibi/parse/common.sld
> lib/chibi/chibi/parse/parse.scm
>+lib/chibi/chibi/pathname-test.sld
> lib/chibi/chibi/pathname.scm
> lib/chibi/chibi/pathname.sld
>+lib/chibi/chibi/process-test.sld
> lib/chibi/chibi/process.scm
> lib/chibi/chibi/process.sld
> lib/chibi/chibi/process.so
> lib/chibi/chibi/quoted-printable.scm
> lib/chibi/chibi/quoted-printable.sld
>+lib/chibi/chibi/regexp-test.sld
> lib/chibi/chibi/regexp.scm
> lib/chibi/chibi/regexp.sld
>+lib/chibi/chibi/regexp/pcre.scm
>+lib/chibi/chibi/regexp/pcre.sld
> lib/chibi/chibi/reload.scm
> lib/chibi/chibi/reload.sld
> lib/chibi/chibi/repl.scm
> lib/chibi/chibi/repl.sld
>+lib/chibi/chibi/scribble-test.sld
> lib/chibi/chibi/scribble.scm
> lib/chibi/chibi/scribble.sld
>+lib/chibi/chibi/show-test.sld
> lib/chibi/chibi/show.sld
> lib/chibi/chibi/show/base.scm
> lib/chibi/chibi/show/base.sld
>@@ -135,6 +162,8 @@
> lib/chibi/chibi/show/write.scm
> lib/chibi/chibi/snow/commands.scm
> lib/chibi/chibi/snow/commands.sld
>+lib/chibi/chibi/snow/fort.scm
>+lib/chibi/chibi/snow/fort.sld
> lib/chibi/chibi/snow/interface.scm
> lib/chibi/chibi/snow/interface.sld
> lib/chibi/chibi/snow/package.scm
>@@ -141,6 +170,7 @@
> lib/chibi/chibi/snow/package.sld
> lib/chibi/chibi/snow/utils.scm
> lib/chibi/chibi/snow/utils.sld
>+lib/chibi/chibi/string-test.sld
> lib/chibi/chibi/string.scm
> lib/chibi/chibi/string.sld
> lib/chibi/chibi/stty.scm
>@@ -148,10 +178,15 @@
> lib/chibi/chibi/stty.so
> lib/chibi/chibi/sxml.scm
> lib/chibi/chibi/sxml.sld
>+lib/chibi/chibi/system-test.sld
> lib/chibi/chibi/system.sld
> lib/chibi/chibi/system.so
>+lib/chibi/chibi/tar-test.sld
> lib/chibi/chibi/tar.scm
> lib/chibi/chibi/tar.sld
>+lib/chibi/chibi/temp-file.scm
>+lib/chibi/chibi/temp-file.sld
>+lib/chibi/chibi/term/ansi-test.sld
> lib/chibi/chibi/term/ansi.scm
> lib/chibi/chibi/term/ansi.sld
> lib/chibi/chibi/term/edit-line.scm
>@@ -164,8 +199,10 @@
> lib/chibi/chibi/trace.sld
> lib/chibi/chibi/type-inference.scm
> lib/chibi/chibi/type-inference.sld
>+lib/chibi/chibi/uri-test.sld
> lib/chibi/chibi/uri.scm
> lib/chibi/chibi/uri.sld
>+lib/chibi/chibi/weak-test.sld
> lib/chibi/chibi/weak.sld
> lib/chibi/chibi/weak.so
> lib/chibi/chibi/zlib.scm
>@@ -258,10 +295,11 @@
> lib/chibi/srfi/99/records/procedural.sld
> lib/chibi/srfi/99/records/syntactic.scm
> lib/chibi/srfi/99/records/syntactic.sld
>+lib/chibi/srfi/99/test.sld
> lib/libchibi-scheme.a
> lib/libchibi-scheme.so
> lib/libchibi-scheme.so.0
>-lib/libchibi-scheme.so.0.7.2
>+lib/libchibi-scheme.so.0.7.3
> libdata/pkgconfig/chibi-scheme.pc
> man/man1/chibi-doc.1.gz
> man/man1/chibi-ffi.1.gz

Flags:

tobik: maintainer-approval+

Actions: View | Diff

Attachments on bug 205982: 165184 | 165185