diff --git a/emacs-lisp/fill-column-indicator/DETAILS
b/emacs-lisp/fill-column-indicator/DETAILS
index 5d96d3a..a5da396 100755
--- a/emacs-lisp/fill-column-indicator/DETAILS
+++ b/emacs-lisp/fill-column-indicator/DETAILS
@@ -1,12 +1,10 @@
-. "$GRIMOIRE/FUNCTIONS"
SPELL=fill-column-indicator
- VERSION=$(get_scm_version)
- SOURCE="${SPELL}-git.tar.bz2"
-
SOURCE_URL[0]=git://github.com/alpaker/Fill-Column-Indicator.git:${SPELL}-git
- FORCE_DOWNLOAD=on
- SOURCE_IGNORE=volatile
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-git"
- WEB_SITE="https://github.com/alpaker/Fill-Column-Indicator"
+ VERSION=1.90
+ SOURCE="$SPELL-$VERSION.tar.gz"
+ WEB_SITE="https://github.com/alpaker/fill-column-indicator"
+ SOURCE_URL[0]="$WEB_SITE/archive/$VERSION.tar.gz"
+
SOURCE_HASH=sha512:ab56a2193c847b9a2e95bccaf56f08f5c1f5192b785fb145e1946eba5299ab1d7d1373dcc3f7646496d648c57f6cf8efd98359a6435489c8927e5d768f2e7714
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
LICENSE[0]=GPL
ENTERED=20111108
SHORT="An Emacs minor mode that graphically indicates the fill
column"
diff --git a/emacs-lisp/fill-column-indicator/HISTORY
b/emacs-lisp/fill-column-indicator/HISTORY
index 20fb631..f945d80 100644
--- a/emacs-lisp/fill-column-indicator/HISTORY
+++ b/emacs-lisp/fill-column-indicator/HISTORY
@@ -1,3 +1,7 @@
+2019-09-17 Ismael Luceno <ismael AT sourcemage.org>
+ * PREPARE: removed, no longer needed
+ * DETAILS: Switched from scm to release 1.90
+
2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Use get_scm_version
diff --git a/emacs-lisp/fill-column-indicator/PREPARE
b/emacs-lisp/fill-column-indicator/PREPARE
deleted file mode 100755
index f8b7d7e..0000000
--- a/emacs-lisp/fill-column-indicator/PREPARE
+++ /dev/null
@@ -1,2 +0,0 @@
-. ${GRIMOIRE}/FUNCTIONS &&
-prepare_select_branch
diff --git a/emacs-lisp/yasnippet/DETAILS b/emacs-lisp/yasnippet/DETAILS
index ba60840..f5bb3ff 100755
--- a/emacs-lisp/yasnippet/DETAILS
+++ b/emacs-lisp/yasnippet/DETAILS
@@ -1,8 +1,8 @@
SPELL=yasnippet
- VERSION=0.11.0
+ VERSION=0.13.0
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=https://github.com/joaotavora/$SPELL/archive/$VERSION.tar.gz
-
SOURCE_HASH=sha512:56a9066afa3d7166aeb67fa37086ed1903d9ee46b01c3c7d910161b3c5b5aa31d013d7be7ff9ee29c44c834033376ac716a13dd26993667cfbd3cd81859f5dc6
+
SOURCE_HASH=sha512:73b111f72e98c4183764cef08ddfaa861dba49f171f96026b074bf62a7aa5e2d8529f616805ba386dd4157b675da953784d5bcd832d6015ce1b72e9c240988c5
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://joaotavora.github.io/yasnippet/"
LICENSE[0]=GPL
diff --git a/emacs-lisp/yasnippet/HISTORY b/emacs-lisp/yasnippet/HISTORY
index e3535ef..bf07f5b 100644
--- a/emacs-lisp/yasnippet/HISTORY
+++ b/emacs-lisp/yasnippet/HISTORY
@@ -1,3 +1,7 @@
+2019-09-17 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 0.13.0
+ * INSTALL: removed, no longer needed
+
2017-03-11 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 0.11.0
fixed WEB_SITE
diff --git a/emacs-lisp/yasnippet/INSTALL b/emacs-lisp/yasnippet/INSTALL
deleted file mode 100755
index 396c009..0000000
--- a/emacs-lisp/yasnippet/INSTALL
+++ /dev/null
@@ -1,2 +0,0 @@
-default_install &&
-emacs_lisp_install snippets
diff --git a/libs/gcompat/BUILD b/libs/gcompat/BUILD
new file mode 100755
index 0000000..8eb5214
--- /dev/null
+++ b/libs/gcompat/BUILD
@@ -0,0 +1 @@
+make $OPTS
diff --git a/libs/gcompat/CONFLICTS b/libs/gcompat/CONFLICTS
new file mode 100755
index 0000000..5894a8b
--- /dev/null
+++ b/libs/gcompat/CONFLICTS
@@ -0,0 +1 @@
+conflicts glibc n
diff --git a/libs/gcompat/DEPENDS b/libs/gcompat/DEPENDS
new file mode 100755
index 0000000..ea44bc0
--- /dev/null
+++ b/libs/gcompat/DEPENDS
@@ -0,0 +1,6 @@
+optional_depends musl-obstack \
+ WITH_OBSTACK={musl-obstack,no} \
+ 'for obstack ABI support' &&
+optional_depends libucontext \
+ WITH_LIBUCONTEXT=1 '' \
+ 'for ucontext ABI support'
diff --git a/libs/gcompat/DETAILS b/libs/gcompat/DETAILS
new file mode 100755
index 0000000..2d7da75
--- /dev/null
+++ b/libs/gcompat/DETAILS
@@ -0,0 +1,28 @@
+ SPELL=gcompat
+ VERSION=0.4.0
+ SOURCE="$SPELL-$VERSION.tar.gz"
+ WEB_SITE="https://code.foxkit.us/adelie/gcompat"
+
SOURCE_URL[0]="https://github.com/AdelieLinux/$SPELL/archive/$VERSION.tar.gz"
+
SOURCE_HASH=sha512:eece93dfacc93a97994e0f84d6332742686e992ca3c8480240294aa1652508e870f2f4534b431c8acaeebf8b0e0ae6d3eb59add0b0224a3527019677869ed4af
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ LICENSE[0]="NCSA"
+ ENTERED=20190917
+ KEYWORDS=""
+ SHORT="GNU C Library Compatibility Layer"
+cat << EOF
+This distribution contains the implementation of gcompat, a library which
+provides glibc-compatible APIs for use on musl libc systems.
+
+This library is designed to be used for binaries that are already compiled
+against glibc. It does not contain any headers, and cannot be used to build
+software that requires glibc. It is instead recommended that any software
that
+requires glibc APIs be modified to become more portable.
+
+This library can optionally be compiled with other libraries to make a
single,
+unfied solution. This can include fts, libucontext, obstack, and others.
+
+gcompat additionally provides a loader stub. This is a small library that has
+the same name as the glibc dynamic linker on glibc platforms; when a binary
is
+run that uses glibc as its dynamic linker, the stub will run, redirecting it
to
+use musl and automatically preloading the gcompat library.
+EOF
diff --git a/libs/gcompat/HISTORY b/libs/gcompat/HISTORY
new file mode 100644
index 0000000..8e896a5
--- /dev/null
+++ b/libs/gcompat/HISTORY
@@ -0,0 +1,2 @@
+2019-09-17 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, CONFLICTS, DEPENDS, DETAILS: spell created
diff --git a/libs/libucontext/BUILD b/libs/libucontext/BUILD
new file mode 100755
index 0000000..8f58e6d
--- /dev/null
+++ b/libs/libucontext/BUILD
@@ -0,0 +1 @@
+make
diff --git a/libs/libucontext/DETAILS b/libs/libucontext/DETAILS
new file mode 100755
index 0000000..6e410ae
--- /dev/null
+++ b/libs/libucontext/DETAILS
@@ -0,0 +1,26 @@
+ SPELL=libucontext
+ VERSION=0.9.0
+ SOURCE="$SPELL-$VERSION.tar.gz"
+ WEB_SITE="https://code.foxkit.us/adelie/libucontext"
+
SOURCE_URL[0]="https://github.com/AdelieLinux/$SPELL/archive/v$VERSION.tar.gz"
+
SOURCE_HASH=sha512:a51f0dead7fd2a07cd5df4bcc554922a3cf7e99f32d0df980b5fa5ec518d863ad0073639123cce03c52affe9bce240c24e54728b5537c199f4c1761c1ef7880b
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ LICENSE[0]="MIT"
+ ENTERED=20190917
+ KEYWORDS=""
+ SHORT="<ucontext.h> API"
+cat << EOF
+This distribution contains the implementation of libucontext, a library which
+provides the <ucontext.h> API from older POSIX revisions. Unlike other
+implementations, it faithfully follows the kernel process ABI when performing
+context swaps.
+
+When combined with gcompat, it provides a full implementation of the
+<ucontext.h> functions that are ABI compatible with glibc.
+
+The <ucontext.h> functions are deprecated in POSIX, and therefore are not
+implemented in the musl libc. However, these functions are still used in some
+legacy packages. They are also notably used by GCC's implementation of the Go
+programming language. Therefore, it is desireable for us to be able to
support
+the execution of software that utilises this deprecated API.
+EOF
diff --git a/libs/libucontext/HISTORY b/libs/libucontext/HISTORY
new file mode 100644
index 0000000..3c4e0cb
--- /dev/null
+++ b/libs/libucontext/HISTORY
@@ -0,0 +1,2 @@
+2019-09-17 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DETAILS: spell created
diff --git a/shell-term-fm/st/BUILD b/shell-term-fm/st/BUILD
index 8f58e6d..9c60275 100755
--- a/shell-term-fm/st/BUILD
+++ b/shell-term-fm/st/BUILD
@@ -1 +1 @@
-make
+make CC="${CC:-gcc} -std=c99"
diff --git a/shell-term-fm/st/DETAILS b/shell-term-fm/st/DETAILS
index 7209e27..5728a68 100755
--- a/shell-term-fm/st/DETAILS
+++ b/shell-term-fm/st/DETAILS
@@ -1,6 +1,6 @@
SPELL=st
- VERSION=0.8.1
-
SOURCE_HASH=sha512:787d35b0cc8b1435dad7809e9995bed3c7f781e012a4a43dd5ae3d670ebc0e4bc03a56ba3872ff8a3bdba316a41ba771c626adc8de0559296457a59170756c6b
+ VERSION=0.8.2
+
SOURCE_HASH=sha512:eaaf5f2fe050ee768d16a9c8c295ba13315775b3a8a3201e020237a3dd217bfb811832d58477249000596289a6cb3287fbb39d6327fc90986af1c363e4b5bf8d
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=https://dl.suckless.org/st/$SOURCE
diff --git a/shell-term-fm/st/HISTORY b/shell-term-fm/st/HISTORY
index cebcd9b..b3a6d35 100644
--- a/shell-term-fm/st/HISTORY
+++ b/shell-term-fm/st/HISTORY
@@ -1,3 +1,9 @@
+2019-09-17 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 0.8.2
+ * INSTALL, PRE_BUILD: Avoid editing config.mk
+ * PRE_BUILD: Improved patch handling
+ * BUILD: Fixed compiler selection
+
2018-04-17 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 0.8.1, http -> https
* PRE_BUILD: sedit -> sed, added compiler fix to that sed
diff --git a/shell-term-fm/st/INSTALL b/shell-term-fm/st/INSTALL
index eaec9ef..1f63c40 100755
--- a/shell-term-fm/st/INSTALL
+++ b/shell-term-fm/st/INSTALL
@@ -1,4 +1,4 @@
-default_install &&
+make install PREFIX="$INSTALL_ROOT/usr" &&
if [[ "${ST_CONFIG}" == "y" ]]; then
mkdir -p ${INSTALL_ROOT}/usr/share/doc/st &&
cp config.def.h ${INSTALL_ROOT}/usr/share/doc/st/
diff --git a/shell-term-fm/st/PRE_BUILD b/shell-term-fm/st/PRE_BUILD
index 13e39be..b9b7235 100755
--- a/shell-term-fm/st/PRE_BUILD
+++ b/shell-term-fm/st/PRE_BUILD
@@ -1,11 +1,10 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-sed -e "s:/local::" -e "/CC/c CC = gcc --std=c99" -i config.mk &&
for i in "$SPELL_DIRECTORY"/patches/*; do
- desc="$(sed -nr '/^Subject: /!d;s@[^ ]* *(\[[A-Za-z0-9 ]*\] *)*@@;p;q'
"$i")" &&
- if query "Apply ${i##*/} ($desc)?" n; then
- patch -sp1 -i "$i"
+ desc="$(sed -r '/^Subject: /!d;s@[^ ]* *(\[[^\]]*\] *)*@ (@;s@$@)@;q'
"$i")" &&
+ if query "Apply ${i##*/}$desc?" n; then
+ patch -sp1 -i "$i" || break
fi
done &&
[SM-Commit] GIT changes to master grimoire by Ismael Luceno (870aefa7dbbf22edab5e25c2a33473c5c90d63ca),
Ismael Luceno, 09/17/2019