Source Mage code commit list

[Ismael Luceno <scm AT sourcemage.org>]

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

 archive-libs/ucl/HISTORY                         |    3 
 archive-libs/ucl/PRE_BUILD                       |    3 
 shell-term-fm/fm/BUILD                           |    2 
 shell-term-fm/fm/HISTORY                         |    5 +
 shell-term-fm/fm/INSTALL                         |    1 
 shell-term-fm/fm/PRE_BUILD                       |    3 
 shell-term-fm/fm/patches/0001-Fix-Makefile.patch |   87 
+++++++++++++++++++++++
 7 files changed, 102 insertions(+), 2 deletions(-)

New commits:
commit 27ffb4188b35269387c8953fc0f4370cb7b1a3c9
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    ucl: Fix build against musl

commit 0b7d29e1744e43ffbeddf30dbd09dd2da5eb4768
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    fm: Fix minor build issues
    
    Provide an install target, and respect standard build flag variables.

diff --git a/archive-libs/ucl/HISTORY b/archive-libs/ucl/HISTORY
index 4cff291..885a074 100644
--- a/archive-libs/ucl/HISTORY
+++ b/archive-libs/ucl/HISTORY
@@ -1,3 +1,6 @@
+2022-08-07 Ismael Luceno <ismael AT sourcemage.org>
+       * PRE_BUILD: Fixed build against musl
+
 2022-07-15  Florian Franzmann  <bwlf AT bandrate.org>
   * BUILD: fix compile error
 
diff --git a/archive-libs/ucl/PRE_BUILD b/archive-libs/ucl/PRE_BUILD
new file mode 100755
index 0000000..79a4e9e
--- /dev/null
+++ b/archive-libs/ucl/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+sedit 's!maybe_os in$!& linux-musl*|\\!' acconfig/config.sub
diff --git a/shell-term-fm/fm/BUILD b/shell-term-fm/fm/BUILD
index 55b37d5..6dfecc1 100755
--- a/shell-term-fm/fm/BUILD
+++ b/shell-term-fm/fm/BUILD
@@ -1 +1 @@
-  make
+default_build_make
diff --git a/shell-term-fm/fm/HISTORY b/shell-term-fm/fm/HISTORY
index 97261bb..48c2247 100644
--- a/shell-term-fm/fm/HISTORY
+++ b/shell-term-fm/fm/HISTORY
@@ -1,3 +1,8 @@
+2022-08-07 Ismael Luceno <ismael AT sourcemage.org>
+       * PRE_BUILD, patches/0001-Fix-Makefile.patch: Fixed Makefile
+       * INSTALL: removed, no longer needed
+       * BUILD: changed to use default_build_make
+
 2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
        * DETAILS: [automated] Removed UPDATED.
 
diff --git a/shell-term-fm/fm/INSTALL b/shell-term-fm/fm/INSTALL
deleted file mode 100755
index 71007fc..0000000
--- a/shell-term-fm/fm/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-  mv fm /usr/bin
diff --git a/shell-term-fm/fm/PRE_BUILD b/shell-term-fm/fm/PRE_BUILD
new file mode 100755
index 0000000..c230ad1
--- /dev/null
+++ b/shell-term-fm/fm/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches
diff --git a/shell-term-fm/fm/patches/0001-Fix-Makefile.patch 
b/shell-term-fm/fm/patches/0001-Fix-Makefile.patch
new file mode 100644
index 0000000..db6799b
--- /dev/null
+++ b/shell-term-fm/fm/patches/0001-Fix-Makefile.patch
@@ -0,0 +1,87 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT iodev.co.uk>
+Subject: Fix Makefile
+Date: Sun,  7 Aug 2022 21:06:15 +0200
+
+* Remove rules covered by default rules
+* Respect and use CFLAGS and LIBS
+* Add install target
+
+Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
+---
+ Makefile |   43 ++++++++++---------------------------------
+ 1 file changed, 10 insertions(+), 33 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 75c377bfdd4c..5bff930cce3f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -2,58 +2,35 @@ exe = fm
+ objects = aboutwindow.o aboutwindow_signals.o accelkey.o ctreecolumn.o 
filetype.o fileutils.o fm.o fmdialog.o fmwindow.o fmwindow_signals.o layout.o 
preferences.o preferenceswindow.o preferenceswindow_signals.o rowstyle.o
+ glibconfig = glib-config
+ gtkconfig = gtk-config
+-lib-flags = `$(glibconfig) --libs` `$(gtkconfig) --libs`
+-include-flags = `$(glibconfig) --cflags` `$(gtkconfig) --cflags`
++CFLAGS += $(shell ${glibconfig} --cflags) $(shell ${gtkconfig} --cflags)
++LIBS += $(shell ${glibconfig} --libs) $(shell ${gtkconfig} --libs)
+ 
+ fm: $(objects)
+-      gcc -o $(exe) $(objects) $(lib-flags)
+-      strip fm
++      ${CC} ${CFLAGS} ${LDFLAGS} -o ${exe} ${objects} ${LIBS}
+ 
+ aboutwindow.o : aboutwindow.c aboutwindow.h aboutwindow_signals.h
+-      gcc -Wall -O2 -c aboutwindow.c $(include-flags)
+-
+ aboutwindow_signals.o : aboutwindow_signals.c aboutwindow.h 
aboutwindow_signals.h
+-      gcc -Wall -O2 -c aboutwindow_signals.c $(include-flags)
+-
+ accelkey.o : accelkey.c accelkey.h fmwindow.h preferences.h
+-      gcc -Wall -O2 -c accelkey.c $(include-flags)
+-
+ ctreecolumn.o : ctreecolumn.c ctreecolumn.h preferences.h
+-      gcc -Wall -O2 -c ctreecolumn.c $(include-flags)
+-
+ filetype.o : filetype.c filetype.h fileutils.h fmwindow.h rowstyle.h
+-      gcc -Wall -O2 -c filetype.c $(include-flags)
+-
+ fileutils.o : fileutils.c fileutils.h fmwindow.h
+-      gcc -Wall -O2 -c fileutils.c $(include-flags)
+-
+ fm.o : fm.c fmwindow.h layout.h preferences.h
+-      gcc -Wall -O2 -c fm.c $(include-flags)
+-
+ fmdialog.o : fmdialog.c fmdialog.h
+-      gcc -Wall -O2 -c fmdialog.c $(include-flags)
+-
+ fmwindow.o : fmwindow.c accelkey.h ctreecolumn.h filetype.h fileutils.h 
fmwindow.h fmwindow_signals.h preferences.h rowstyle.h
+-      gcc -Wall -O2 -c fmwindow.c $(include-flags)
+-
+ fmwindow_signals.o : fmwindow_signals.c aboutwindow.h accelkey.h 
ctreecolumn.h filetype.h fileutils.h fmwindow.h fmwindow_signals.h  
preferences.h rowstyle.h
+-      gcc -Wall -O2 -c fmwindow_signals.c $(include-flags)
+-
+ layout.o : layout.c fmwindow.h layout.h
+-      gcc -Wall -O2 -c layout.c $(include-flags)
+-
+ preferences.o : preferences.c accelkey.h ctreecolumn.h filetype.h 
preferences.h rowstyle.h
+-      gcc -Wall -O2 -c preferences.c $(include-flags)
+-
+ preferenceswindow.o : preferenceswindow.c accelkey.h filetype.h fmdialog.h 
fmwindow.h layout.h preferences.h preferenceswindow.h rowstyle.h
+-      gcc -Wall -O2 -c preferenceswindow.c $(include-flags)
+-
+ preferenceswindow_signals.o : preferenceswindow_signals.c 
preferenceswindow_signals.h
+-      gcc -Wall -O2 -c preferenceswindow_signals.c $(include-flags)
+-
+ rowstyle.o : rowstyle.c filetype.h fmwindow.h fmwindow_signals.h rowstyle.h
+-      gcc -Wall -O2 -c rowstyle.c $(include-flags)
+ 
+ .PHONY : clean
+ clean:
+       rm -fv $(exe) $(objects)
++
++DESTDIR =
++prefix = /usr
++bindir = ${prefix}/bin
++.PHONY: install
++install:
++      install -m555 -s ${exe} ${DESTDIR}${bindir}