From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- dev-scheme/slib/files/50slib | 1 + dev-scheme/slib/files/slib-3.2.2-fix-texinfo.awk | 123 +++++++++++++++++++++ .../slib/files/slib-3.2.5-fix-makefile-guile.patch | 23 ++++ dev-scheme/slib/files/slib-3.2.5-fix-paths.patch | 42 +++++++ 4 files changed, 189 insertions(+) create mode 100644 dev-scheme/slib/files/50slib create mode 100644 dev-scheme/slib/files/slib-3.2.2-fix-texinfo.awk create mode 100644 dev-scheme/slib/files/slib-3.2.5-fix-makefile-guile.patch create mode 100644 dev-scheme/slib/files/slib-3.2.5-fix-paths.patch (limited to 'dev-scheme/slib/files') diff --git a/dev-scheme/slib/files/50slib b/dev-scheme/slib/files/50slib new file mode 100644 index 000000000000..072862ed0b83 --- /dev/null +++ b/dev-scheme/slib/files/50slib @@ -0,0 +1 @@ +SCHEME_LIBRARY_PATH="/usr/share/slib/" diff --git a/dev-scheme/slib/files/slib-3.2.2-fix-texinfo.awk b/dev-scheme/slib/files/slib-3.2.2-fix-texinfo.awk new file mode 100644 index 000000000000..6bc3ce8e177b --- /dev/null +++ b/dev-scheme/slib/files/slib-3.2.2-fix-texinfo.awk @@ -0,0 +1,123 @@ +# Fixes Texinfo input to compile with Texinfo 5 or later +# +# Written by Sebastian Pipping +# Licensed under CC0 1.0 Universal Public Domain Dedication +# https://creativecommons.org/publicdomain/zero/1.0/ +# +# Version 0_p20150813_p0418 + +BEGIN { + inside_deffn = 0 + inside_defmac = 0 + inside_defop = 0 + inside_deftp = 0 + inside_defun = 0 +} + +/^@deffn / { + if (inside_deffn) { + print "@end deffn" + } + inside_deffn = 1 +} + +/^@deffnx / { + if (inside_deffn) { + print "@end deffn" + } + sub(/^@deffnx/, "@deffn") + inside_deffn = 1 +} + +/^@defmac / { + if (inside_defmac) { + print "@end defmac" + } + inside_defmac = 1 +} + +/^@defmacx / { + if (inside_defmac) { + print "@end defmac" + } + sub(/^@defmacx/, "@defmac") + inside_defmac = 1 +} + +/^@defop / { + if (inside_defop) { + print "@end defop" + } + inside_defop = 1 +} + +/^@defopx / { + if (inside_defop) { + print "@end defop" + } + sub(/^@defopx/, "@defop") + inside_defop = 1 +} + +/^@deftp / { + if (inside_deftp) { + print "@end deftp" + } + inside_deftp = 1 +} + +/^@deftpx / { + if (inside_deftp) { + print "@end deftp" + } + sub(/^@deftpx/, "@deftp") + inside_deftp = 1 +} + +/^@defun / { + if (inside_defun) { + print "@end defun" + } + inside_defun = 1 +} + +/^@defunx / { + if (inside_defun) { + print "@end defun" + } + sub(/^@defunx/, "@defun") + inside_defun = 1 +} + +/^@end deffn/ { + inside_deffn = 0 +} + +/^@end defmac/ { + inside_defmac = 0 +} + +/^@end defop/ { + inside_defop = 0 +} + +/^@end deftp/ { + inside_deftp = 0 +} + +/^@end defun/ { + inside_defun = 0 +} + +/^@subsubsection/ { + if (inside_deffn) { + print "@end deffn" + print $0 + print "@deffn {Dummy} Dummy" + next + } +} + +{ + print +} diff --git a/dev-scheme/slib/files/slib-3.2.5-fix-makefile-guile.patch b/dev-scheme/slib/files/slib-3.2.5-fix-makefile-guile.patch new file mode 100644 index 000000000000..4617b4e780cb --- /dev/null +++ b/dev-scheme/slib/files/slib-3.2.5-fix-makefile-guile.patch @@ -0,0 +1,23 @@ +--- slib-3b5/~Makefile 2016-10-10 23:54:01.461733550 +0200 ++++ slib-3b5/Makefile 2016-10-10 23:59:33.806035867 +0200 +@@ -13,9 +13,9 @@ SHELL = /bin/sh + INSTALL = install + INSTALL_PROGRAM = ${INSTALL} + INSTALL_DATA = ${INSTALL} -m 644 +-INSTALL_INFO = ginstall-info ++INSTALL_INFO = install-info + +-SCHEME = scm ++SCHEME = guile + CHPAT = $(HOME)/bin/chpat + MAKEDEV = $(MAKE) -f $(HOME)/makefile.dev + TEXI2HTML = /usr/local/bin/texi2html -split -verbose +@@ -183,7 +183,7 @@ slib.html: slib.texi + $(MAKEINFO) --html --no-split --no-warn --force $< + + slib-$(VERSION).info: slib.texi version.txi $(txifiles) $(texifiles) +- $(MAKEINFO) $< --no-warn --no-split -o slib-$(VERSION).info ++ $(MAKEINFO) $< --no-warn --no-split --force -o slib-$(VERSION).info + slib.info: slib-$(VERSION).info + if [ -f $(prevdocsdir)slib.info ];\ + then infobar $(prevdocsdir)slib.info slib-$(VERSION).info \ diff --git a/dev-scheme/slib/files/slib-3.2.5-fix-paths.patch b/dev-scheme/slib/files/slib-3.2.5-fix-paths.patch new file mode 100644 index 000000000000..9a373c14d733 --- /dev/null +++ b/dev-scheme/slib/files/slib-3.2.5-fix-paths.patch @@ -0,0 +1,42 @@ +--- slib-3b5/~RScheme.init 2016-10-10 23:05:39.117046443 +0200 ++++ slib-3b5/RScheme.init 2016-10-10 23:06:47.242857550 +0200 +@@ -52,7 +52,7 @@ + ;; Use this path if your scheme does not support GETENV + ;; or if SCHEME_LIBRARY_PATH is not set. + (case (software-type) +- ((unix) "/usr/lib/slib/") ++ ((unix) "/usr/share/slib/") + ((vms) "lib$scheme:") + ((ms-dos) "C:\\SLIB\\") + (else ""))))) +--- slib-3b5/~gambit.init 2016-10-10 23:05:20.939634454 +0200 ++++ slib-3b5/gambit.init 2016-10-10 23:07:46.571968697 +0200 +@@ -38,7 +38,7 @@ + (let ((impl-path + (or (getenv "GAMBIT_IMPLEMENTATION_PATH") + (case (software-type) +- ((unix) "/usr/local/share/gambc/") ++ ((unix) "/usr/share/gambc/") + ((vms) "scheme$src:") + ((ms-dos) "C:\\scheme\\") + ((windows) "c:/scheme/") +@@ -65,7 +65,7 @@ + ;; Use this path if your scheme does not support GETENV + ;; or if SCHEME_LIBRARY_PATH is not set. + (case (software-type) +- ((unix) "/usr/local/lib/slib/") ++ ((unix) "/usr/share/slib/") + ((macos) (string-append (implementation-vicinity) "slib:")) + ((amiga) "dh0:scm/Library/") + ((vms) "lib$scheme:") +--- slib-3b5/~guile-2.init 2016-10-10 23:05:46.531807087 +0200 ++++ slib-3b5/guile-2.init 2016-10-10 23:08:00.154538349 +0200 +@@ -199,7 +199,7 @@ + (define implementation-vicinity + (cond ((getenv "GUILE_IMPLEMENTATION_PATH") + => (lambda (path) (lambda () path))) +- (else %site-dir))) ++ (else %library-dir))) + + ;;; (library-vicinity) should be defined to be the pathname of the + ;;; directory where files of Scheme library functions reside. -- cgit v1.2.3