From 2771f79232c273bc2a57d23bf335dd81ccf6af28 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 5 Dec 2021 02:47:11 +0000 Subject: gentoo resync : 05.12.2021 --- dev-scheme/stklos/files/stklos-1.10-gentoo.patch | 40 ++++++++++++++ dev-scheme/stklos/files/stklos-1.70-gentoo.patch | 66 ++++++++++++++++++++++++ 2 files changed, 106 insertions(+) create mode 100644 dev-scheme/stklos/files/stklos-1.10-gentoo.patch create mode 100644 dev-scheme/stklos/files/stklos-1.70-gentoo.patch (limited to 'dev-scheme/stklos/files') diff --git a/dev-scheme/stklos/files/stklos-1.10-gentoo.patch b/dev-scheme/stklos/files/stklos-1.10-gentoo.patch new file mode 100644 index 000000000000..56f5440cf1dc --- /dev/null +++ b/dev-scheme/stklos/files/stklos-1.10-gentoo.patch @@ -0,0 +1,40 @@ +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -4,7 +4,6 @@ + # Creation date: 11-Apr-2000 10:30 (eg) + # Last file update: 23-Oct-2010 11:52 (eg) + +-mandir = $(prefix)/share/man + man_MANS = stklos.1 stklos-config.1 stklos-compile.1 stklos-genlex.1 \ + stklos-pkg.1 + EXTRA_DIST = $(man_MANS) +@@ -16,15 +16,13 @@ + schemedir = $(prefix)/share/@PACKAGE@/@VERSION@ + scheme_DATA = DOCDB + +-doclocation = $(prefix)/share/doc/@PACKAGE@-@VERSION@ +- +-docpdfdir = $(doclocation)/pdf ++docpdfdir = $(pdfdir) + docpdf_DATA = pdf/stklos-ref.pdf + +-dochtmldir = $(doclocation)/html ++dochtmldir = $(htmldir) + dochtml_DATA= $(wildcard html/stklos-ref*.html) $(wildcard html/*.css) + +-docimgdir = $(doclocation)/html/images ++docimgdir = $(htmldir)/images + docimg_DATA = $(wildcard html/images/*) + + +--- a/pkgman/Makefile.am ++++ b/pkgman/Makefile.am +@@ -4,7 +4,7 @@ + # Last file update: 4-Dec-2011 16:48 (eg) + + +-makefiledir= $(prefix)/etc/stklos ++makefiledir= $(prefix)/share/@PACKAGE@/@VERSION@/etc + makefile_DATA= etc/Makefile-scmpkg.tmpl + + bin_SCRIPTS = stklos-pkg diff --git a/dev-scheme/stklos/files/stklos-1.70-gentoo.patch b/dev-scheme/stklos/files/stklos-1.70-gentoo.patch new file mode 100644 index 000000000000..c9baba3bf268 --- /dev/null +++ b/dev-scheme/stklos/files/stklos-1.70-gentoo.patch @@ -0,0 +1,66 @@ +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -21,7 +21,6 @@ + # Creation date: 11-Apr-2000 10:30 (eg) + # Last file update: 1-Jun-2021 19:13 (eg) + +-mandir = $(prefix)/share/man + man_MANS = stklos.1 stklos-config.1 stklos-compile.1 stklos-genlex.1 \ + stklos-pkg.1 stklos-script.1 + EXTRA_DIST = $(man_MANS) +@@ -33,12 +32,10 @@ + schemedir = $(prefix)/share/@PACKAGE@/@VERSION@ + scheme_DATA = DOCDB + +-doclocation = $(prefix)/share/doc/@PACKAGE@-@VERSION@ +- +-docpdfdir = $(doclocation)/pdf ++docpdfdir = $(pdfdir) + docpdf_DATA = pdf/stklos-ref.pdf + +-dochtmldir = $(doclocation)/html ++dochtmldir = $(htmldir) + dochtml_DATA= html/index.html \ + html/stklos-ref.html \ + html/stklos-ref-1.html \ +@@ -59,7 +56,7 @@ + html/stklos-ref-16.html \ + html/doc-style.css + +-docimgdir = $(doclocation)/html/images ++docimgdir = $(htmldir)/images + docimg_DATA = html/images/hierarchy.jpg + + +--- a/lib/Lalr.d/Makefile.am ++++ b/lib/Lalr.d/Makefile.am +@@ -34,7 +34,7 @@ + all: lalr.ostk calc + + install-sources: install +- mkdir -p $(schemedir) ++ mkdir -p $(DESTDIR)/$(schemedir) + cp lalr.stk $(DESTDIR)/$(schemedir) + + uninstall-hook: +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -123,8 +123,6 @@ + + + install-exec-hook: +- @echo "STRIP command: $$STRIP" +- if test "X$$STRIP" != "Xno" ;then $(STRIP) $(DESTDIR)/$(bindir)/stklos; fi; + mv $(DESTDIR)/$(bindir)/stklos $(DESTDIR)/$(bindir)/stklos-@VERSION@ + ln -s stklos-@VERSION@ $(DESTDIR)/$(bindir)/stklos + +--- a/utils/shlib-options ++++ b/utils/shlib-options +@@ -173,6 +173,6 @@ + + echo "os=\"$os\"; version=\"$version\"; machine=\"$machine\"; OS=\"$OS\"; \ + OS_FLAVOUR=\"$OS_FLAVOUR\";SH_COMP_FLAGS=\"$SH_COMP_FLAGS\"; \ +-SH_LOAD_FLAGS=\"$SH_LOAD_FLAGS\"; \ ++SH_LOAD_FLAGS=\"$LDFLAGS $SH_LOAD_FLAGS\"; \ + SH_LOADER=\"$SH_LOADER\"; SH_SUFFIX=\"$SH_SUFFIX\"; \ + SH_LIB_SUFFIX=\"$SH_LIB_SUFFIX\"; SH_MAIN_LOAD_FLAGS=\"$SH_MAIN_LOAD_FLAGS\"" -- cgit v1.2.3