m4, flex: replace with obsd implementations

diff --git a/extra/flex/build b/extra/flex/build
index 2a1bda0af3e742f93e5f77fa5170cf841eb73553..22732edecf8bc396459f21414fdff9ab2fcc541d 100755 (executable)
--- a/extra/flex/build
+++ b/extra/flex/build
@@ -1,11 +1,15 @@
-#!/bin/sh -e
+#!/usr/bin/sh -e
 
-./configure \
-    --prefix=/usr \
-    ac_cv_func_malloc_0_nonnull=yes \
-    ac_cv_func_realloc_0_nonnull=yes
+for i in libopenbsd libz yacc mv lex; do
+    make PREFIX=/usr -C "$i"
+done
 
-make
-make DESTDIR="$1" install
+cd lex
+install -Dm644 FlexLexer.h "$1/usr/include/FlexLexer.h"
+install -Dm755 lex         "$1/usr/bin/flex"
+install -Dm644 flex.1      "$1/usr/share/man/man1/flex.1"
+
+ln -s /usr/bin/flex            "$1/usr/bin/lex"
+ln -s /usr/bin/flex            "$1/usr/bin/flex++"
+ln -s /usr/share/man/man1/flex "$1/usr/share/man/man1/lex"
 
-ln -s flex "$1/usr/bin/lex"

diff --git a/extra/flex/checksums b/extra/flex/checksums
index 5f05df519838939eb3fe5d1af65601e7204c63ce..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/extra/flex/checksums
+++ b/extra/flex/checksums
@@ -1 +0,0 @@
-e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995  flex-2.6.4.tar.gz

diff --git a/extra/flex/depends b/extra/flex/depends
deleted file mode 100644 (file)
index e8fb4a1..0000000
--- a/extra/flex/depends
+++ /dev/null
@@ -1 +0,0 @@
-m4 make

diff --git a/extra/flex/sources b/extra/flex/sources
index c10fca7284f7ef4d5932fa3d8aa1280ec49a2551..9475b43162f96118b8867877cdb577965f23b589 100644 (file)
--- a/extra/flex/sources
+++ b/extra/flex/sources
@@ -1 +1 @@
-https://github.com/westes/flex/releases/download/v2.6.4/flex-2.6.4.tar.gz
+git+https://github.com/ibara/baseutils
\ No newline at end of file

diff --git a/extra/flex/version b/extra/flex/version
index c689264b999643f5310f65d66ee12a93dde0097c..a383ea1a01de3491869bf41c5737ff747d4ede4c 100644 (file)
--- a/extra/flex/version
+++ b/extra/flex/version
@@ -1 +1 @@
-2.6.4 1
+git 1

diff --git a/extra/m4/build b/extra/m4/build
index 206a476a2e4c7e1f7d6b765c99a678a3cd025d37..c88088c167f90ba3d1ef2bdfa349d394422aca5b 100755 (executable)
--- a/extra/m4/build
+++ b/extra/m4/build
@@ -1,9 +1,11 @@
-#!/bin/sh -e
+#!/usr/bin/sh -e
 
-export CFLAGS="$CFLAGS -static"
+for i in libopenbsd libz yacc mv m4; do
+    make PREFIX=/usr -C "$i"
+done
 
-./configure \
-    --prefix=/usr
+mkdir -p "$1/usr/share/man" "$1/usr/bin"
 
-make
-make DESTDIR="$1" install
+cd m4
+install -Dm755 m4   "$1/usr/bin/m4"
+install -Dm644 m4.1 "$1/usr/share/man/man1/m4.1"

diff --git a/extra/m4/checksums b/extra/m4/checksums
index e413a199b8c5f6f9189a3378c581fecf0fd14983..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/extra/m4/checksums
+++ b/extra/m4/checksums
@@ -1 +0,0 @@
-63aede5c6d33b6d9b13511cd0be2cac046f2e70fd0a07aa9573a04a82783af96

diff --git a/extra/m4/sources b/extra/m4/sources
index bde2eff2f9a77adcb66514ff18ef070a7663cf8c..9475b43162f96118b8867877cdb577965f23b589 100644 (file)
--- a/extra/m4/sources
+++ b/extra/m4/sources
@@ -1 +1 @@
-https://ftp.gnu.org/gnu/m4/m4-1.4.19.tar.xz
+git+https://github.com/ibara/baseutils
\ No newline at end of file

diff --git a/extra/m4/version b/extra/m4/version
index b97669c6eb3dbf2fc75e20082f008c0dba8f0163..a383ea1a01de3491869bf41c5737ff747d4ede4c 100644 (file)
--- a/extra/m4/version
+++ b/extra/m4/version
@@ -1 +1 @@
-1.4.19 1
+git 1