Source Mage code commit list

[Ismael Luceno <scm AT sourcemage.org>]

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

 mail/fdm/DEPENDS                                           |    8 +++---
 mail/fdm/DETAILS                                           |    8 ++++--
 mail/fdm/HISTORY                                           |    5 +++
 mail/fdm/PRE_BUILD                                         |    7 +----
 mail/fdm/patches/0001-Fix-base64-function-prototypes.patch |   17 
-------------
 5 files changed, 17 insertions(+), 28 deletions(-)

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

    fdm 2.2

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

    fdm: Add Watch line

diff --git a/mail/fdm/DEPENDS b/mail/fdm/DEPENDS
index dbe1def..5cf0828 100755
--- a/mail/fdm/DEPENDS
+++ b/mail/fdm/DEPENDS
@@ -3,12 +3,12 @@ depends tdb &&
 case "$HOST" in
   (*-musl)
     # remove when/if musl implements REG_STARTEND
-    depends pcre --enable-pcre
+    depends pcre2 --enable-pcre2
     ;;
   (*)
-    optional_depends pcre \
-                    --enable-pcre \
-                    --disable-pcre \
+    optional_depends pcre2 \
+                    --enable-pcre2 \
+                    --disable-pcre2 \
                     'to enable PCREs in addition to POSIX regexps'
     ;;
 esac
diff --git a/mail/fdm/DETAILS b/mail/fdm/DETAILS
index affb2d1..bf01439 100755
--- a/mail/fdm/DETAILS
+++ b/mail/fdm/DETAILS
@@ -1,8 +1,12 @@
+# Watch: https://github.com/nicm/fdm/tags/ refs/tags/([0-9.]+)[.]tar
            SPELL=fdm
-         VERSION=2.0
+         VERSION=2.2
           SOURCE="$SPELL-$VERSION.tar.gz"
       
SOURCE_URL=("https://github.com/nicm/fdm/releases/download/$VERSION/$SOURCE";)
-     
SOURCE_HASH=sha512:14e923202d17083ceb3b91b3a442d7e512c37f3d29535f22d8c0c4e1d57c97acc5d5465d643ed0cf437b3945ef777a6e38da3117219c2d54dcec88ecab1e10d9
+     
SOURCE_HASH=sha512:13efa0f272c5f6146b90e094602e8a9b52016af79ae0b6cd80dc9f36b2ba37f64cadae7313bd8db90bcb007dd07206a3614987f11bb82c3535e04f0511c9fc6d
+         
SOURCE2=fdm-2.2-0001-Fix-bugs-in-PCRE2-code-don-t-walk-off-the-end-of-the-match.patch
+     
SOURCE2_URL=https://github.com/nicm/fdm/commit/f1ec1982725d60045c0d871f3e613f2880046c22.patch
+    
SOURCE2_HASH=sha512:408da5b9ee9936fb198cdeb5bf3ad8e350845e9d0b009830d933cde0d5f8175c573a526ade42459ee32ddf7b1354a254c284214891f61afa16e71296bf53b71d
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE="http://fdm.sourceforge.net/ "
       LICENSE[0]=BSD
diff --git a/mail/fdm/HISTORY b/mail/fdm/HISTORY
index 2545d9f..94eb41e 100644
--- a/mail/fdm/HISTORY
+++ b/mail/fdm/HISTORY
@@ -1,3 +1,8 @@
+2024-04-01 Ismael Luceno <ismael AT sourcemage.org>
+       * DEPENDS, DETAILS, PRE_BUILD: updated spell to 2.2
+       * patches/0001-Fix-base64-function-prototypes.patch: removed, no 
longer
+         needed
+
 2021-01-23 Ismael Luceno <ismael AT sourcemage.org>
        * DETAILS: Fixed SOURCE_URL[0]
          updated spell to 2.0
diff --git a/mail/fdm/PRE_BUILD b/mail/fdm/PRE_BUILD
index 55be45d..1960276 100755
--- a/mail/fdm/PRE_BUILD
+++ b/mail/fdm/PRE_BUILD
@@ -1,7 +1,4 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
-apply_patch_dir patches &&
-# remove cdefs.h; not needed nor available
-sedit '\!^#include <sys/cdefs\.h>!d' fdm.h &&
-# fix duplicated entry
-sedit '/^\t\$(am__obj/s/ \$(am__objects_1)$//' Makefile.in
+patch -fp1 -i "$SOURCE_CACHE/$SOURCE2" &&
+apply_patch_dir patches
diff --git a/mail/fdm/patches/0001-Fix-base64-function-prototypes.patch 
b/mail/fdm/patches/0001-Fix-base64-function-prototypes.patch
deleted file mode 100644
index 3c89a51..0000000
--- a/mail/fdm/patches/0001-Fix-base64-function-prototypes.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Fix base64 function prototypes.  These are used when not provided by the 
libc.
-
-diff --git a/fdm.h b/fdm.h
-index 481b7930e04f..dafc7818a711 100644
---- a/fdm.h
-+++ b/fdm.h
-@@ -724,8 +724,8 @@ size_t              strlcat(char *, const char *, 
size_t);
- 
- #ifndef HAVE_B64_NTOP
- /* base64.c */
--int b64_ntop(src, srclength, target, targsize);
--int b64_pton(src, target, targsize);
-+int b64_ntop(const u_char *, size_t, char *, size_t);
-+int b64_pton(const char *, u_char *, size_t);
- #endif
- 
- /* shm.c */