Source Mage code commit list

[Ismael Luceno <scm AT sourcemage.org>]

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

 shell-term-fm/unixtree/BUILD     |    8 +-------
 shell-term-fm/unixtree/DETAILS   |    1 +
 shell-term-fm/unixtree/HISTORY   |    3 +++
 shell-term-fm/unixtree/PRE_BUILD |    4 ++++
 4 files changed, 9 insertions(+), 7 deletions(-)

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

    unixtree: PATCHLEVEL++

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

    unixtree: Fix build flags passed to the compiler

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

    unixtree: Update makefile patching
    
    - LIBXVT and X11_LIBS aren't modified anymore at the makefiles
    - the patching should be done in PRE_BUILD
    - we can use xargs and a single sed instance instead of a loop

diff --git a/shell-term-fm/unixtree/BUILD b/shell-term-fm/unixtree/BUILD
index 0f12847..4de2090 100755
--- a/shell-term-fm/unixtree/BUILD
+++ b/shell-term-fm/unixtree/BUILD
@@ -1,9 +1,3 @@
-find -name makefile | while read M; do
-  # they should not redefine behavior of a standard variable
-  sedit 's|CFLAGS|COMPILE_FLAGS|g' $M &&
-  # don't redefine this variables inside makefiles
-  sedit 's/^\(LIBXVT\|X11_LIBS\).*=.*//g' $M
-done &&
 make_single           &&
 source build -r linux &&
 if ! echo $OPTS | grep -q 'with-x'; then
@@ -13,4 +7,4 @@ if ! echo $OPTS | grep -q 'with-x'; then
   export USE_X11=no &&
   export LIBXVT=libxvt-dummy
 fi &&
-make
+make OPTS="$CFLAGS"
diff --git a/shell-term-fm/unixtree/DETAILS b/shell-term-fm/unixtree/DETAILS
index a2159e9..b5286b1 100755
--- a/shell-term-fm/unixtree/DETAILS
+++ b/shell-term-fm/unixtree/DETAILS
@@ -1,6 +1,7 @@
            SPELL=unixtree
          PACKAGE=xt
          VERSION=3.0.2
+      PATCHLEVEL=1
           SOURCE=$PACKAGE-source-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$PACKAGE-$VERSION
    SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/$SPELL/$SOURCE
diff --git a/shell-term-fm/unixtree/HISTORY b/shell-term-fm/unixtree/HISTORY
index 3115428..267bdd2 100644
--- a/shell-term-fm/unixtree/HISTORY
+++ b/shell-term-fm/unixtree/HISTORY
@@ -1,6 +1,9 @@
 2020-06-22 Ismael Luceno <ismael AT sourcemage.org>
        * PRE_BUILD, patches/0001-Fix-build-on-non-glibc-systems.patch:
          Fixed build against musl libc
+       * BUILD, PRE_BUILD: Updated makefile patching
+       * BUILD: Fixed compiler flags
+       * DETAILS: PATCHLEVEL++
 
 2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
        * DETAILS: remove SOURCEFORGE_URL usage (automated)
diff --git a/shell-term-fm/unixtree/PRE_BUILD 
b/shell-term-fm/unixtree/PRE_BUILD
index c230ad1..ec234b3 100755
--- a/shell-term-fm/unixtree/PRE_BUILD
+++ b/shell-term-fm/unixtree/PRE_BUILD
@@ -1,3 +1,7 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
+find -name makefile -print0 | xargs -0 sed -i '
+  # do not redefine behavior of a standard variable
+  s|CFLAGS|COMPILE_FLAGS|g
+' &&
 apply_patch_dir patches