Fix pacman-mirrors

* checksums of old patches are updated since they include the cgit version
* the backports had various context conflicts, so adjust the patch
* switch to ftpmirror, ftp.gnu is not usable right now

Note that paxlib/names.c from paxutils is vendored as lib/paxnames.c in tar.

.ci/ci-build.sh

@@ -9,10 +9,7 @@ set -eo pipefail
 DIR="$( cd "$( dirname "$0" )" && pwd )"
 
 # Configure
-source "$DIR/ci-library.sh"
 mkdir artifacts
-git_config user.email 'ci@msys2.org'
-git_config user.name  'MSYS2 Continuous Integration'
 git remote add upstream 'https://github.com/MSYS2/MSYS2-packages'
 git fetch --quiet upstream
 # reduce time required to install packages by disabling pacman's disk space checking
@@ -20,95 +17,125 @@ sed -i 's/^CheckSpace/#CheckSpace/g' /etc/pacman.conf
 
 pacman --noconfirm -Fy
 
+# Enable colors
+normal=$(tput sgr0)
+red=$(tput setaf 1)
+green=$(tput setaf 2)
+cyan=$(tput setaf 6)
+
+# Basic status function
+_status() {
+    local type="${1}"
+    local status="${package:+${package}: }${2}"
+    local items=("${@:3}")
+    case "${type}" in
+        failure) local -n nameref_color='red';   title='[MSYS2 CI] FAILURE:' ;;
+        success) local -n nameref_color='green'; title='[MSYS2 CI] SUCCESS:' ;;
+        message) local -n nameref_color='cyan';  title='[MSYS2 CI]'
+    esac
+    printf "\n${nameref_color}${title}${normal} ${status}\n\n"
+    printf "${items:+\t%s\n}" "${items:+${items[@]}}"
+}
+
+# Run command with status
+execute(){
+    local status="${1}"
+    local command="${2}"
+    local arguments=("${@:3}")
+    cd "${package:-.}"
+    message "${status}"
+    if [[ "${command}" != *:* ]]
+        then ${command} ${arguments[@]}
+        else ${command%%:*} | ${command#*:} ${arguments[@]}
+    fi || failure "${status} failed"
+    cd - > /dev/null
+}
+
+# Get changed packages in correct build order
+list_packages() {
+    # readarray doesn't work with a plain pipe
+    readarray -t packages < <("$DIR/ci-get-build-order.py")
+}
+
+install_packages() {
+    pacman --noprogressbar --upgrade --noconfirm *.pkg.tar.*
+}
+
+# Status functions
+failure() { local status="${1}"; local items=("${@:2}"); _status failure "${status}." "${items[@]}"; exit 1; }
+success() { local status="${1}"; local items=("${@:2}"); _status success "${status}." "${items[@]}"; exit 0; }
+message() { local status="${1}"; local items=("${@:2}"); _status message "${status}"  "${items[@]}"; }
+
 # Detect
-list_commits  || failure 'Could not detect added commits'
 list_packages || failure 'Could not detect changed files'
-message 'Processing changes' "${commits[@]}"
+message 'Processing changes'
 test -z "${packages}" && success 'No changes in package recipes'
 
 # Build
 message 'Building packages' "${packages[@]}"
-execute 'Approving recipe quality' check_recipe_quality
 
 message 'Adding an empty local repository'
 repo-add $PWD/artifacts/ci.db.tar.gz
 sed -i '1s|^|[ci]\nServer = file://'"$PWD"'/artifacts/\nSigLevel = Never\n|' /etc/pacman.conf
 pacman -Sy
 
+# Remove git and python
+pacman -R --recursive --unneeded --noconfirm --noprogressbar git python
+
+# Enable linting
+export MAKEPKG_LINT_PKGBUILD=1
+
 message 'Building packages'
 for package in "${packages[@]}"; do
     echo "::group::[build] ${package}"
+    execute 'Clear cache' pacman -Scc --noconfirm
     execute 'Fetch keys' "$DIR/fetch-validpgpkeys.sh"
-    # Ensure the toolchain is installed before building the package
-    execute 'Installing the toolchain' pacman -S --needed --noconfirm --noprogressbar base-devel msys2-devel
     execute 'Building binary' makepkg --noconfirm --noprogressbar --nocheck --syncdeps --rmdeps --cleanbuild
-    execute 'Building source' makepkg --noconfirm --noprogressbar --allsource
+    repo-add $PWD/artifacts/ci.db.tar.gz $PWD/$package/*.pkg.tar.*
+    pacman -Sy
+    cp $PWD/$package/*.pkg.tar.* $PWD/artifacts
     echo "::endgroup::"
 
-    if [ -f $package/.ci-sequential ]; then
-        cd "$package"
-        for pkg in *.pkg.tar.*; do
-            pkgname="$(echo "$pkg" | rev | cut -d- -f4- | rev)"
-            echo "::group::[install] ${pkgname}"
-            grep -qFx "${package}" "$(dirname "$0")/ci-dont-install-list.txt" || pacman --noprogressbar --upgrade --noconfirm $pkg
-            echo "::endgroup::"
-
-            echo "::group::[diff] ${pkgname}"
-            message "Package info diff for ${pkgname}"
-            diff -Nur <(pacman -Si "${pkgname}") <(pacman -Qip "${pkg}") || true
-
-            message "File listing diff for ${pkgname}"
-            diff -Nur <(pacman -Fl "$pkgname" | sed -e 's|^[^ ]* |/|' | sort) <(pacman -Ql "$pkgname" | sed -e 's|^[^/]*||' | sort) || true
-            echo "::endgroup::"
-
-            echo "::group::[uninstall] ${pkgname}"
-            message "Uninstalling $pkgname"
-            repo-add $PWD/../artifacts/ci.db.tar.gz $PWD/$pkg
-            pacman -Sy
-            pacman -R --recursive --unneeded --noconfirm --noprogressbar "$pkgname"
-            echo "::endgroup::"
-        done
-        cd - > /dev/null
-    else
-        echo "::group::[install] ${package}"
-        grep -qFx "${package}" "$(dirname "$0")/ci-dont-install-list.txt" || execute 'Installing' install_packages
+    cd "$package"
+    for pkg in *.pkg.tar.*; do
+        pkgname="$(echo "$pkg" | rev | cut -d- -f4- | rev)"
+        echo "::group::[install] ${pkgname}"
+        grep -qFx "${package}" "$DIR/ci-dont-install-list.txt" || pacman --noprogressbar --upgrade --noconfirm $pkg
         echo "::endgroup::"
 
-        echo "::group::[diff] ${package}"
-        cd "$package"
-        for pkg in *.pkg.tar.*; do
-            pkgname="$(echo "$pkg" | rev | cut -d- -f4- | rev)"
-            message "Package info diff for ${pkgname}"
-            diff -Nur <(pacman -Si "${pkgname}") <(pacman -Qip "${pkg}") || true
-
-            message "File listing diff for ${pkgname}"
-            diff -Nur <(pacman -Fl "$pkgname" | sed -e 's|^[^ ]* |/|' | sort) <(pacman -Ql "$pkgname" | sed -e 's|^[^/]*||' | sort) || true
-        done
-        cd - > /dev/null
+        echo "::group::[meta-diff] ${pkgname}"
+        message "Package info diff for ${pkgname}"
+        diff -Nur <(pacman -Si ${MSYSTEM,,}/"${pkgname}") <(pacman -Qip "${pkg}") || true
         echo "::endgroup::"
 
-        echo "::group::[dll check] ${package}"
-        execute 'Checking dll depencencies' list_dll_deps ./pkg
-        execute 'Checking dll bases' list_dll_bases ./pkg
+        echo "::group::[file-diff] ${pkgname}"
+        message "File listing diff for ${pkgname}"
+        diff -Nur <(pacman -Fl ${MSYSTEM,,}/"$pkgname" | sed -e 's|^[^ ]* |/|' | sort) <(pacman -Ql "$pkgname" | sed -e 's|^[^/]*||' | sort) || true
         echo "::endgroup::"
 
-        echo "::group::[uninstall] ${package}"
-        repo-add $PWD/artifacts/ci.db.tar.gz "${package}"/*.pkg.tar.*
-        pacman -Sy
-        message "Uninstalling $package"
-        cd "$package"
-        export installed_packages=()
-        for pkg in *.pkg.tar.*; do
-            installed_packages+=("$(echo "$pkg" | rev | cut -d- -f4- | rev)")
-        done
-        pacman -R --recursive --unneeded --noconfirm --noprogressbar "${installed_packages[@]}"
-        unset installed_packages
-        cd - > /dev/null
+        echo "::group::[dll check] ${pkgname}"
+        declare -a binaries=($(pacman -Qlq $pkgname | grep -E ${MINGW_PREFIX}/.+\.\(dll\|exe\|pyd\)$))
+        if [ "${#binaries[@]}" -ne 0 ]; then
+            message "Runtime dependencies for ${pkgname}"
+            for binary in ${binaries[@]}; do
+                echo "${binary}:"
+                ldd ${binary} | GREP_COLOR="1;35" grep --color=always "msys-.*\|" \
+                    || echo "        None"
+            done
+            message "DLL bases for ${pkgname}"
+            rebase -i "${binaries[@]}" | GREP_COLOR="1;35" grep --color=always "msys-.*\|" \
+                || echo "        None"
+        fi
         echo "::endgroup::"
-    fi
 
-    mv "${package}"/*.pkg.tar.* artifacts
-    mv "${package}"/*.src.tar.* artifacts
+        echo "::group::[uninstall] ${pkgname}"
+        message "Uninstalling $pkgname"
+        grep -qFx "${package}" "$DIR/ci-dont-install-list.txt" || pacman -R --recursive --unneeded --noconfirm --noprogressbar "$pkgname"
+        echo "::endgroup::"
+    done
+    cd - > /dev/null
+
+    rm -f "${package}"/*.pkg.tar.*
     unset package
 done
 success 'All packages built successfully'

.ci/ci-dont-install-list.txt

@@ -1,2 +1,6 @@
 msys2-runtime
+msys2-runtime-3.3
+msys2-runtime-3.4
+msys2-runtime-3.5
+msys2-runtime-3.6
 bash

.ci/ci-generate-srcinfo.py

@@ -1,236 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2017 Christoph Reiter
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
-
-import sys
-import argparse
-import os
-import json
-import shutil
-from collections import OrderedDict
-import hashlib
-import time
-import shlex
-import subprocess
-from concurrent.futures import ThreadPoolExecutor
-
-from typing import List, Iterator, Tuple, Dict, Optional, Union, Collection
-
-
-CacheEntry = Dict[str, Union[str, Collection[str]]]
-CacheTuple = Tuple[str, CacheEntry]
-Cache = Dict[str, CacheEntry]
-
-
-def normalize_repo(repo: str) -> str:
-    if repo.endswith(".git"):
-        repo = repo.rsplit(".", 1)[0]
-    return repo
-
-
-def normalize_path(path: str) -> str:
-    return path.replace("\\", "/")
-
-
-def check_output_retry(*args, **kwargs):
-    # XXX: git sometimes crashes when called concurrently,
-    # so we retry a few times..
-    run = 0
-    max_ = 5
-    while True:
-        try:
-            return subprocess.check_output(*args, **kwargs)
-        except subprocess.CalledProcessError as e:
-            if run <= max_ and e.returncode == 127:
-                time.sleep(0.1 * run)
-                run += 1
-                continue
-            else:
-                raise
-
-
-def get_cache_key(pkgbuild_path: str) -> str:
-    pkgbuild_path = os.path.abspath(pkgbuild_path)
-    git_cwd = os.path.dirname(pkgbuild_path)
-    git_path = os.path.relpath(pkgbuild_path, git_cwd)
-    h = hashlib.new("SHA1")
-
-    with open(pkgbuild_path, "rb") as f:
-        h.update(f.read())
-
-    fileinfo = check_output_retry(
-        ["git", "ls-files", "-s", "--full-name", git_path],
-        cwd=git_cwd).decode("utf-8").strip()
-    h.update(normalize_path(fileinfo).encode("utf-8"))
-
-    repo = check_output_retry(
-        ["git", "ls-remote", "--get-url", "origin"],
-        cwd=git_cwd).decode("utf-8").strip()
-    repo = normalize_repo(repo)
-    h.update(repo.encode("utf-8"))
-
-    return h.hexdigest()
-
-
-def get_mingw_arch_list(pkgbuild_path: str) -> List[str]:
-    bash = shutil.which("bash")
-    assert bash is not None
-    sub_commands = [
-        shlex.join(['source', pkgbuild_path]),
-        'echo -n "${mingw_arch[@]}"'
-    ]
-    out = subprocess.check_output([bash, '-c', ';'.join(sub_commands)], universal_newlines=True)
-    arch_list = out.strip().split()
-    if not arch_list:
-        arch_list = ["mingw32", "mingw64", "ucrt64", "clang64"]
-    assert arch_list
-    return arch_list
-
-
-def get_srcinfo_for_pkgbuild(args: Tuple[str, str]) -> Optional[CacheTuple]:
-    pkgbuild_path, mode = args
-    pkgbuild_path = os.path.abspath(pkgbuild_path)
-    git_cwd = os.path.dirname(pkgbuild_path)
-    git_path = os.path.relpath(pkgbuild_path, git_cwd)
-    key = get_cache_key(pkgbuild_path)
-
-    bash = shutil.which("bash")
-    if bash is None:
-        print("ERROR: bash not found")
-        return None
-
-    print("Parsing %r" % pkgbuild_path)
-    try:
-        srcinfos = {}
-
-        if mode == "mingw":
-            for name in get_mingw_arch_list(pkgbuild_path):
-                env = os.environ.copy()
-                env["MINGW_ARCH"] = name
-                srcinfos[name] = subprocess.check_output(
-                    [bash, "/usr/bin/makepkg-mingw",
-                    "--printsrcinfo", "-p", git_path],
-                    cwd=git_cwd,
-                    env=env).decode("utf-8")
-        else:
-            srcinfos["msys"] = subprocess.check_output(
-                [bash, "/usr/bin/makepkg",
-                "--printsrcinfo", "-p", git_path],
-                cwd=git_cwd).decode("utf-8")
-
-        repo = check_output_retry(
-            ["git", "ls-remote", "--get-url", "origin"],
-            cwd=git_cwd).decode("utf-8").strip()
-        repo = normalize_repo(repo)
-
-        relpath = check_output_retry(
-            ["git", "ls-files", "--full-name", git_path],
-            cwd=git_cwd).decode("utf-8").strip()
-        relpath = normalize_path(os.path.dirname(relpath))
-
-        date = check_output_retry(
-            ["git", "log", "-1", "--format=%aI", git_path],
-            cwd=git_cwd).decode("utf-8").strip()
-
-        meta = {"repo": repo, "path": relpath, "date": date, "srcinfo": srcinfos}
-    except subprocess.CalledProcessError as e:
-        print("ERROR: %s %s" % (pkgbuild_path, e.output.splitlines()))
-        return None
-
-    return (key, meta)
-
-
-def iter_pkgbuild_paths(repo_path: str) -> Iterator[str]:
-    repo_path = os.path.abspath(repo_path)
-    print("Searching for PKGBUILD files in %s" % repo_path)
-    for base, dirs, files in os.walk(repo_path):
-        for f in files:
-            if f == "PKGBUILD":
-                # in case we find a PKGBUILD, don't go deeper
-                del dirs[:]
-                path = os.path.join(base, f)
-                yield path
-
-
-def get_srcinfo_from_cache(args: Tuple[str, Cache]) -> Tuple[str, Optional[CacheTuple]]:
-    pkgbuild_path, cache = args
-    key = get_cache_key(pkgbuild_path)
-    if key in cache:
-        return (pkgbuild_path, (key, cache[key]))
-    else:
-        return (pkgbuild_path, None)
-
-
-def iter_srcinfo(repo_path: str, mode: str, cache: Cache) -> Iterator[Optional[CacheTuple]]:
-    with ThreadPoolExecutor() as executor:
-        to_parse: List[Tuple[str, str]] = []
-        pool_iter = executor.map(
-            get_srcinfo_from_cache, ((p, cache) for p in iter_pkgbuild_paths(repo_path)))
-        for pkgbuild_path, srcinfo in pool_iter:
-            if srcinfo is not None:
-                yield srcinfo
-            else:
-                to_parse.append((pkgbuild_path, mode))
-
-        print("Parsing PKGBUILD files...")
-        for srcinfo in executor.map(get_srcinfo_for_pkgbuild, to_parse):
-            yield srcinfo
-
-
-def main(argv: List[str]) -> Optional[Union[int, str]]:
-    parser = argparse.ArgumentParser(description="Create SRCINFOs for all packages in a repo", allow_abbrev=False)
-    parser.add_argument('mode', choices=['msys', 'mingw'], help="The type of the repo")
-    parser.add_argument("repo_path", help="The path to GIT repo")
-    parser.add_argument("json_cache", help="The path to the json file used to fetch/store the results")
-    parser.add_argument("--time-limit", action="store",
-        type=int, dest="time_limit", default=0,
-        help='time after which it will stop and save, 0 means no limit')
-    args = parser.parse_args(argv[1:])
-
-    t = time.monotonic()
-
-    srcinfo_path = os.path.abspath(args.json_cache)
-    cache: Cache = {}
-    try:
-        with open(srcinfo_path, "rb") as h:
-            cache = json.loads(h.read())
-    except FileNotFoundError:
-        pass
-
-    srcinfos = []
-    for entry in iter_srcinfo(args.repo_path, args.mode, cache):
-        if entry is None:
-            continue
-        srcinfos.append(entry)
-        # So we stop before CI times out
-        if args.time_limit and time.monotonic() - t > args.time_limit:
-            print("time limit reached, stopping")
-            break
-
-    srcinfos_dict = OrderedDict(sorted(srcinfos))
-    with open(srcinfo_path, "wb") as h:
-        h.write(json.dumps(srcinfos_dict, indent=2).encode("utf-8"))
-
-    return None
-
-
-if __name__ == "__main__":
-    sys.exit(main(sys.argv))

.ci/ci-library.sh

@@ -1,119 +0,0 @@
-#!/bin/bash
-
-# Continuous Integration Library for MSYS2
-# Author: Renato Silva <br.renatosilva@gmail.com>
-# Author: Qian Hong <fracting@gmail.com>
-
-# Enable colors
-normal=$(tput sgr0)
-red=$(tput setaf 1)
-green=$(tput setaf 2)
-cyan=$(tput setaf 6)
-
-# Basic status function
-_status() {
-    local type="${1}"
-    local status="${package:+${package}: }${2}"
-    local items=("${@:3}")
-    case "${type}" in
-        failure) local -n nameref_color='red';   title='[MSYS2 CI] FAILURE:' ;;
-        success) local -n nameref_color='green'; title='[MSYS2 CI] SUCCESS:' ;;
-        message) local -n nameref_color='cyan';  title='[MSYS2 CI]'
-    esac
-    printf "\n${nameref_color}${title}${normal} ${status}\n\n"
-    printf "${items:+\t%s\n}" "${items:+${items[@]}}"
-}
-
-# Convert lines to array
-_as_list() {
-    local -n nameref_list="${1}"
-    local filter="${2}"
-    local strip="${3}"
-    local lines="${4}"
-    local result=1
-    nameref_list=()
-    while IFS= read -r line; do
-        test -z "${line}" && continue
-        result=0
-        [[ "${line}" = ${filter} ]] && nameref_list+=("${line/${strip}/}")
-    done <<< "${lines}"
-    return "${result}"
-}
-
-# Changes since master or from head
-_list_changes() {
-    local list_name="${1}"
-    local filter="${2}"
-    local strip="${3}"
-    local git_options=("${@:4}")
-    _as_list "${list_name}" "${filter}" "${strip}" "$(git log "${git_options[@]}" upstream/master.. | sort -u)" ||
-    _as_list "${list_name}" "${filter}" "${strip}" "$(git log "${git_options[@]}" HEAD^.. | sort -u)"
-}
-
-# Git configuration
-git_config() {
-    local name="${1}"
-    local value="${2}"
-    test -n "$(git config ${name})" && return 0
-    git config --global "${name}" "${value}" && return 0
-    failure 'Could not configure Git for makepkg'
-}
-
-# Run command with status
-execute(){
-    local status="${1}"
-    local command="${2}"
-    local arguments=("${@:3}")
-    cd "${package:-.}"
-    message "${status}"
-    if [[ "${command}" != *:* ]]
-        then ${command} ${arguments[@]}
-        else ${command%%:*} | ${command#*:} ${arguments[@]}
-    fi || failure "${status} failed"
-    cd - > /dev/null
-}
-
-# Added commits
-list_commits()  {
-    _list_changes commits '*' '#*::' --pretty=format:'%ai::[%h] %s'
-}
-
-# Get changed packages in correct build order
-list_packages() {
-    # readarray doesn't work with a plain pipe
-    readarray -t packages < <("$DIR/ci-get-build-order.py")
-}
-
-install_packages() {
-    pacman --noprogressbar --upgrade --noconfirm *.pkg.tar.*
-}
-
-# Recipe quality
-check_recipe_quality() {
-    # TODO: remove this option when not anymore needed
-    if test -n "${DISABLE_QUALITY_CHECK}"; then
-        echo 'This feature is disabled.'
-        return 0
-    fi
-    saneman --format='\t%l:%c %p:%c %m' --verbose --no-terminal "${packages[@]}"
-}
-
-# List DLL dependencies
-list_dll_deps(){
-    local target="${1}"
-    echo "$(tput setaf 2)MSYS2 DLL dependencies:$(tput sgr0)"
-    find "$target" -regex ".*\.\(exe\|dll\)" -print0 | xargs -0 -r ldd | GREP_COLOR="1;35" grep --color=always "msys-.*\|" \
-    || echo "        None"
-}
-
-list_dll_bases(){
-    local target="${1}"
-    echo "$(tput setaf 2)MSYS2 DLL bases:$(tput sgr0)"
-    find "$target" -regex ".*\.\(exe\|dll\)" -print | rebase -iT - | GREP_COLOR="1;35" grep --color=always "msys-.*\|" \
-    || echo "        None"
-}
-
-# Status functions
-failure() { local status="${1}"; local items=("${@:2}"); _status failure "${status}." "${items[@]}"; exit 1; }
-success() { local status="${1}"; local items=("${@:2}"); _status success "${status}." "${items[@]}"; exit 0; }
-message() { local status="${1}"; local items=("${@:2}"); _status message "${status}"  "${items[@]}"; }

.devcontainer/devcontainer.json

@@ -0,0 +1,18 @@
+{
+    "image": "ghcr.io/msys2/msys2-docker-devcontainer",
+    "customizations": {
+        "vscode": {
+            "settings": {
+                "terminal.integrated.defaultProfile.linux": "MSYS2-MSYS",
+                "terminal.integrated.profiles.linux": {
+                    "MSYS2-MSYS": {
+                        "path": "msys2",
+                        "env": {
+                            "MSYSTEM": "MSYS"
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,22 +0,0 @@
----
-name: Issue
-about: Create a report to help us improve
----
-
-## Describe the issue
-
-A clear and concise description of what the issue is.
-
-## Steps to Reproduce the Problem
-
-1. Run '...'
-2. Do something '....'
-3. Describe what happens?
-4. What did you expect to happen instead?
-
-## Additional Context: Operating System, Screenshots
-
-If applicable, add screenshots to help explain your problem.
-
-- OS: [e.g. Windows 10 Pro version 1909 64bit]
-- '...'

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,49 @@
+name: Bug Report
+description: Submit a bug report.
+labels: [bug]
+body:
+  - type: textarea
+    attributes:
+      label: Description / Steps to reproduce the issue
+      description: A clear and concise description of what the bug is, and why you consider it to be a bug, and steps for how to reproduce it
+      placeholder: |
+        A description with steps to reproduce the issue.
+        1. Step 1
+        2. Step 2
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Expected behavior
+      description: A description of what you expected to happen.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Actual behavior
+      description: A description of what is actually happening.
+    validations:
+      required: true
+
+  - type: checkboxes
+    attributes:
+      label: Verification
+      description: Please verify that you've followed these steps.
+      options:
+        - label: I have verified that my MSYS2 is up-to-date before submitting the report (see https://www.msys2.org/docs/updating/)
+          required: true
+
+  - type: input
+    attributes:
+      label: Windows Version
+      description: Please run `uname` to get the build of Windows you are on.
+      placeholder: "MSYS_NT-10.0-22621"
+    validations:
+      required: true
+
+  - type: input
+    attributes:
+      label: Are you willing to submit a PR?
+      description: We accept contributions!

.github/workflows/generate-srcinfo.yml

@@ -9,50 +9,115 @@ on:
   workflow_dispatch:
 
 jobs:
-  update-srcinfo:
-    runs-on: windows-latest
+  update-srcinfo-win:
+    runs-on: windows-2022
     if: ${{ github.repository == 'msys2/MSYS2-packages' || github.event_name == 'workflow_dispatch' }}
-    defaults:
-      run:
-        shell: msys2 {0}
+
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          filter: tree:0
+
+      - uses: actions/setup-python@v5
+        id: setup-python
+        with:
+          python-version: '3.11'
+          cache: 'pip'
+          cache-dependency-path: .github/workflows/generate-srcinfo.yml
+
+      - name: Install dependencies
+        run: |
+          pipx install --python '${{ steps.setup-python.outputs.python-path }}' 'msys2-devtools[srcinfo-cache] @ git+https://github.com/msys2/msys2-devtools'
 
       - uses: msys2/setup-msys2@v2
+        id: msys2
         with:
           msystem: MSYS
-          install: python git binutils
           update: true
 
-      - run: |
-          # XXX: linting PKGBUILDs takes a loooong time, this skips it
-          sed -i s/^lint_pkgbuild/#lint_pkgbuild/g /usr/bin/makepkg
-          curl --fail -L --retry 5 -o srcinfo.json "https://github.com/$GITHUB_REPOSITORY/releases/download/srcinfo-cache/srcinfo.json"
-          python .ci/ci-generate-srcinfo.py --time-limit 19800 msys . srcinfo.json
+      - name: Download srcinfo.json.gz and set up the environment
+        shell: msys2 {0}
+        run: |
+          # makepkg requires strip in PATH even if it wont be used
+          touch /usr/bin/strip.exe
+          curl --fail -L --retry 5 -o srcinfo.json.gz "https://github.com/$GITHUB_REPOSITORY/releases/download/srcinfo-cache/srcinfo.json.gz"
 
-      - uses: actions/upload-artifact@v2
+      - name: Parse PKGBUILDs and update srcinfo.json.gz
+        run: |
+          msys2-srcinfo-cache --time-limit 19800 msys '${{ steps.msys2.outputs.msys2-location }}' . srcinfo.json.gz
+
+      - uses: actions/upload-artifact@v4
         with:
-          name: result
-          path: srcinfo.json
+          name: result-win
+          path: |
+            srcinfo.json.gz
+
+  update-srcinfo-linux:
+    needs: update-srcinfo-win
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          name: result-win
+
+      - uses: actions/setup-python@v5
+        id: setup-python
+        with:
+          python-version: '3.11'
+
+      - name: Install dependencies
+        run: |
+          pipx install --python '${{ steps.setup-python.outputs.python-path }}' 'msys2-devtools[pypi-cache,sbom] @ git+https://github.com/msys2/msys2-devtools'
+
+      - name: Update the PyPI cache
+        run: |
+          curl --fail -L --retry 5 -o pypi.json.gz "https://github.com/$GITHUB_REPOSITORY/releases/download/srcinfo-cache/pypi.json.gz" || true
+          msys2-pypi-cache srcinfo.json.gz pypi.json.gz
+
+      - name: Install grype
+        run: |
+          curl --retry 5 -sSfL https://raw.githubusercontent.com/anchore/grype/main/install.sh | sh -s --
+          ./bin/grype db list --output json > grype-db.json
+
+      - name: Cache grype DB
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/grype
+          key: grype-db-${{ runner.os }}-${{ hashFiles('grype-db.json') }}
+          restore-keys: |
+            grype-db-${{ runner.os }}-
+
+      - name: Update vulnerability database
+        run: |
+          msys2-sbom create srcinfo.json.gz sbom.cdx.json
+          ./bin/grype sbom:sbom.cdx.json -o cyclonedx-json=sbom.vuln.cdx.json -o json=sbom.grype.json
+          msys2-sbom fixup sbom.vuln.cdx.json --grype-json sbom.grype.json --srcinfo-cache srcinfo.json.gz
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: result-linux
+          path: |
+            pypi.json.gz
+            sbom.cdx.json
+            sbom.vuln.cdx.json
 
   upload-srcinfo:
-    needs: update-srcinfo
+    needs: [update-srcinfo-win, update-srcinfo-linux]
     runs-on: ubuntu-latest
     permissions:
       contents: write
     steps:
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v4
         with:
-          name: result
+          pattern: result-*
+          merge-multiple: true
 
-      - uses: eine/tip@master
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          tag: srcinfo-cache
-          rm: true
-          files: srcinfo.json
+      - name: Upload srcinfo.json.gz
+        run: |
+          gh release upload srcinfo-cache srcinfo.json.gz pypi.json.gz sbom.cdx.json sbom.vuln.cdx.json --clobber --repo "$GITHUB_REPOSITORY"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - run: |
           curl -X POST 'https://packages.msys2.org/api/trigger_update'

.github/workflows/main.yml

@@ -11,29 +11,54 @@ on:
 jobs:
   build:
     if: ${{ github.event_name != 'push' || github.ref != 'refs/heads/master'}}
-    runs-on: windows-latest
-
+    strategy:
+      fail-fast: false
+      matrix:
+        include: [
+          { msystem: MSYS, runner: windows-2022 },
+        ]
+    name: ${{ matrix.msystem }}
+    runs-on: ${{ matrix.runner }}
     steps:
-      - uses: actions/checkout@v2
+      - name: Gather Facts
+        id: facts
+        run : |
+          Get-PSDrive -PSProvider FileSystem | Format-Table -AutoSize -Wrap
+          Get-CIMInstance -Class Win32_Processor | Select-Object -Property Name
+          Get-CIMInstance Win32_PhysicalMemory | Measure-Object -Property Capacity -Sum | Format-Table @{n="TotalPhysicalMemory";e={$_.Sum}}
+          $BUILD_DRIVE = Split-Path $env:GITHUB_WORKSPACE -Qualifier
+          echo "drive=$BUILD_DRIVE" >> $env:GITHUB_OUTPUT
+
+      - name: Configure Pagefile
+        if: ${{ matrix.msystem != 'CLANGARM64' }}
+        # https://github.com/al-cheb/configure-pagefile-action/issues/16
+        continue-on-error: true
+        uses: al-cheb/configure-pagefile-action@v1.4
+        with:
+          minimum-size: 4GB
+          maximum-size: 16GB
+          # Needs to be C:, see https://github.com/al-cheb/configure-pagefile-action/issues/18
+          disk-root: "C:"
+
+      - uses: actions/checkout@v4
         with:
           path: temp
           fetch-depth: 0
-
-      # to match the autobuild environment
-      - uses: actions/setup-python@v2
-        with:
-          python-version: '3.8'
+          filter: blob:none
+          persist-credentials: false
 
       - uses: msys2/setup-msys2@v2
         with:
-          msystem: MSYS
-          install: VCS base-devel msys2-devel pactoys-git
+          msystem: ${{ matrix.msystem }}
+          install: git python base-devel
           update: true
+          location: '${{ steps.facts.outputs.drive }}\M'
 
       - name: Add staging repo
         shell: msys2 {0}
         run: |
-          sed -i '1s|^|[staging]\nServer = https://repo.msys2.org/staging/\nSigLevel = Never\n|' /etc/pacman.conf
+          cp /etc/pacman.conf /etc/pacman.conf.bak
+          grep -qFx '[staging]' /etc/pacman.conf || sed -i '/^# \[staging\]/,/^$/ s|^# ||g' /etc/pacman.conf
 
       - name: Update using staging
         run: |
@@ -42,22 +67,46 @@ jobs:
 
       - name: Move Checkout
         run: |
-          Copy-Item -Path ".\temp" -Destination "C:\_" -Recurse
+          $path = "${{ steps.facts.outputs.drive }}\_"
+          If (Test-Path "$path") { rm -r -fo "$path" }
+          Move-Item -Path ".\temp" -Destination "$path"
 
       - name: CI-Build
         shell: msys2 {0}
+        id: build
         run: |
-          cd /C/_
+          cd "$(cygpath '${{ steps.facts.outputs.drive }}/_')"
           ./.ci/ci-build.sh
 
       - name: "Upload binaries"
-        uses: actions/upload-artifact@v2
+        if: ${{ !cancelled() }}
+        uses: actions/upload-artifact@v4
         with:
-          name: msys2-packages
-          path: C:/_/artifacts/*.pkg.tar.*
+          name: ${{ matrix.msystem }}-packages
+          path: ${{ steps.facts.outputs.drive }}/_/artifacts/*.pkg.tar.*
+          if-no-files-found: ignore
 
-      - name: "Upload sources"
-        uses: actions/upload-artifact@v2
+  package-grokker:
+    runs-on: ubuntu-latest
+    needs: build
+    name: package-grokker-${{ matrix.msystem }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - msystem: MSYS
+            repo: msys
+
+    steps:
+      - uses: actions/download-artifact@v4
+        id: artifacts
+        continue-on-error: true
         with:
-          name: sources
-          path: C:/_/artifacts/*.src.tar.*
+          name: ${{ matrix.msystem }}-packages
+          path: artifacts
+      - name: Grok packages
+        uses: jeremyd2019/package-grokker/grok-artifacts@main
+        if: steps.artifacts.outcome == 'success'
+        with:
+          repo: ${{ matrix.repo }}
+          path: artifacts

README.md

@@ -3,7 +3,13 @@
   -->
   <a title="Join the chat at https://gitter.im/msys2/msys2" href="https://gitter.im/msys2/msys2"><img src="https://img.shields.io/badge/chat-on%20gitter-4db797.svg?longCache=true&style=flat-square&logo=gitter&logoColor=e8ecef"></a><!--
   -->
-  <a title="GitHub Actions" href="https://github.com/msys2/MSYS2-packages/actions?query=workflow%3Amain"><img alt="'main' workflow Status" src="https://img.shields.io/github/workflow/status/msys2/MSYS2-packages/main?longCache=true&style=flat-square&label=build&logo=github"></a><!--
+  <a title="GitHub Actions" href="https://github.com/msys2/MSYS2-packages/actions?query=workflow%3Amain"><img alt="'main' workflow Status" src="https://img.shields.io/github/actions/workflow/status/msys2/MSYS2-packages/main.yml?branch=master&longCache=true&style=flat-square&label=build&logo=github"></a><!--
+  -->
+  <a title="Follow msys2org on Twitter" href="https://twitter.com/msys2org"><img src="https://img.shields.io/twitter/follow/msys2org?color=31A4F1&logo=twitter&logoColor=white&style=flat-square"></a><!--
+  -->
+  <a title="Follow msys2org on Mastodon" href="https://fosstodon.org/@msys2org"><img src="https://img.shields.io/mastodon/follow/109365079526574177?color=000197&domain=https%3A%2F%2Ffosstodon.org%2F&logo=mastodon&logoColor=white&style=flat-square"></a><!--
+  -->
+  <a title="Join the community on Discord" href="https://discord.com/invite/jPQdRdDcT9"><img src="https://img.shields.io/discord/792780131906617355?color=5865F2&label=Discord&logo=discord&logoColor=white&style=flat-square"></a><!--
   -->
 </p>
 
@@ -12,10 +18,10 @@
 Package scripts for MSYS2.
 
 To build these, run msys2_shell.cmd then from the bash prompt. Packages from
-the msys2-devel and base-devel groups are implicit build time dependencies.
-Make sure both are installed before attempting to build any package:
+the base-devel package is an implicit build time dependency.
+Make sure it is installed before attempting to build any package:
 
-    pacman -S --needed base-devel msys2-devel
+    pacman -S --needed base-devel
     cd ${package-name}
     makepkg
 

ack/PKGBUILD

@@ -1,39 +1,46 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 # Contributor: Ray Donnelly <mingw.android@gmail.com>
 
-_realname=ack
-pkgname=perl-${_realname}
-pkgver=3.5.0
+pkgname=ack
+pkgver=3.7.0
 pkgrel=1
 pkgdesc="A Perl-based grep replacement, aimed at programmers with large trees of heterogeneous source code"
 arch=('any')
 url="https://beyondgrep.com/"
+msys2_references=(
+  "cpe: cpe:/a:beyondgrep:ack"
+  "purl: pkg:cpan/PETDANCE/ack"
+)
 license=('GPL' 'PerlArtistic')
 depends=('perl-File-Next')
 groups=('perl-modules')
 options=(!emptydirs)
-source=("https://www.cpan.org/authors/id/P/PE/PETDANCE/${_realname}-v${pkgver}.tar.gz"
+source=("https://www.cpan.org/authors/id/P/PE/PETDANCE/${pkgname}-v${pkgver}.tar.gz"
         '0002-ack-2.12-match-makefiles-with-more-generality.patch')
-sha256sums=('66053e884e803387a02ddee0d68abf2a10239fab654364dab33287309a725521'
+sha256sums=('ea7caa14f757de083310ed2cba298661ddcca5dee06ec8f18043ea625a79df20'
             '3f2bec65a174465babb5fef6c179ae25b7d85bee2263683396b574c3d3d33cab')
+conflicts=("perl-ack")
+provides=("perl-ack=${pkgver}")
+replaces=("perl-ack")
+
 prepare() {
-  cd "${srcdir}/${_realname}-v${pkgver}"
+  cd "${srcdir}/${pkgname}-v${pkgver}"
   patch -p1 -i ${srcdir}/0002-ack-2.12-match-makefiles-with-more-generality.patch
 }
 
 build() {
-  cd "${srcdir}/${_realname}-v${pkgver}"
+  cd "${srcdir}/${pkgname}-v${pkgver}"
   PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
   make
 }
 
 check() {
-  cd "${srcdir}/${_realname}-v${pkgver}"
+  cd "${srcdir}/${pkgname}-v${pkgver}"
   # some standalone tests are failing
   make test || true
 }
 
 package() {
-  cd "${srcdir}/${_realname}-v${pkgver}"
+  cd "${srcdir}/${pkgname}-v${pkgver}"
   make install DESTDIR="${pkgdir}"
 }

ansible-core/0001-ctypes-cdll-loadlibrary-msys2.patch

@@ -0,0 +1,13 @@
+diff --git a/lib/ansible/utils/display.py b/lib/ansible/utils/display.py
+index 7d98ad47e9..6e6294cfca 100644
+--- a/lib/ansible/utils/display.py
++++ b/lib/ansible/utils/display.py
+@@ -68,7 +68,7 @@ if t.TYPE_CHECKING:
+     # avoid circular import at runtime
+     from ansible.executor.task_queue_manager import FinalQueue
+
+-_LIBC = ctypes.cdll.LoadLibrary(ctypes.util.find_library('c'))
++_LIBC = ctypes.cdll.LoadLibrary('msys-2.0.dll')
+ # Set argtypes, to avoid segfault if the wrong type is provided,
+ # restype is assumed to be c_int
+ _LIBC.wcwidth.argtypes = (ctypes.c_wchar,)

ansible-core/PKGBUILD

@@ -0,0 +1,57 @@
+# Maintainer: Alexandre Ferreira <contact@alexjorgef.com>
+
+pkgname=ansible-core
+pkgver=2.19.3
+pkgrel=1
+pkgdesc='Radically simple IT automation platform'
+arch=('any')
+url='https://pypi.org/project/ansible-core'
+msys2_references=(
+  "cpe: cpe:/a:ansible:ansible"
+  "cpe: cpe:/a:redhat:ansible"
+  "cpe: cpe:/a:redhat:ansible_engine"
+  "purl: pkg:pypi/ansible-core"
+)
+license=('spdx:GPL-3.0-or-later')
+depends=('python' 'python-yaml' 'python-jinja' 'python-packaging')
+provides=('python-ansible' 'ansible-base')
+optdepends=(
+	'sshpass: for ssh connections with password'
+)
+makedepends=('tar' 'python-build' 'python-installer' 'python-setuptools')
+replaces=('ansible-base')
+backup=('etc/ansible/ansible.cfg')
+source=("https://pypi.python.org/packages/source/a/ansible-core/ansible_core-${pkgver}.tar.gz"
+        "0001-ctypes-cdll-loadlibrary-msys2.patch")
+sha512sums=('9d81bedcdddee19a4a76fe4bf01369241b62213c8e7af88c5eb8d55b9cfa776704651538144776012d947b267901d0221e38405f3c20c65e30f99c3c50b3b5f3'
+            '9932c3dfcbfc05527b26f150ba54f2f927ed47a2ff0370108d2355fb80b07440669d7d92690fb3baaf8164852eb0ef366943a561e684cfd7ddfb8b727e2b0dce')
+noextract=("${pkgname/-/_}-${pkgver}.tar.gz")
+
+apply_patch_with_msg() {
+  for _fname in "$@"
+  do
+    msg2 "Applying ${_fname}"
+    patch -Nbp1 -i "${srcdir}"/${_fname}
+  done
+}
+
+prepare() {
+  tar zxf "${srcdir}/${pkgname/-/_}-${pkgver}.tar.gz" || tar zxf "${srcdir}/${pkgname/-/_}-${pkgver}.tar.gz"
+
+  cd "${srcdir}/${pkgname/-/_}-${pkgver}"
+
+  # Patches
+  apply_patch_with_msg \
+    0001-ctypes-cdll-loadlibrary-msys2.patch
+}
+
+build() {
+  cd "${srcdir}/${pkgname/-/_}-${pkgver}"
+  python -m build --wheel --skip-dependency-check --no-isolation
+}
+
+package() {
+  cd ${pkgname/-/_}-${pkgver}
+  python -m installer --destdir="${pkgdir}" dist/*.whl
+  install -Dm644 COPYING "${pkgdir}"/usr/share/doc/${pkgname}/COPYING
+}

ansible/PKGBUILD

@@ -1,42 +1,47 @@
-# Maintainer: Alexandre Ferreira < alex.jorge.m [at] gmail.com >
+# Maintainer: Alexandre Ferreira <contact@alexjorgef.com>
 
 pkgname=ansible
-pkgver=2.9.21
+# Note: When packaging a new version of ansible, bump version of ansible-core in
+# depends, if required.
+pkgver=12.1.0
 pkgrel=1
-pkgdesc='Radically simple IT automation platform'
-arch=('i686' 'x86_64')
-url='https://www.ansible.com'
-license=('GPL3')
-depends=('python' 'python-yaml' 'python-jinja')
-provides=('python-ansible')
-optdepends=('sshpass: for ssh connections with password')
-makedepends=('tar' 'python-setuptools')
-backup=('etc/ansible/ansible.cfg')
-source=("https://releases.ansible.com/ansible/ansible-${pkgver}.tar.gz")
-sha512sums=('572f04736bea590770db9b58e7fca8cf3b53b858a0cd2e16667e9d1935d173fa2a0a116d04e0ed976095fbd6b8cd878d21d3e5c4749046b39d121b9ac8b5c441')
-noextract=("${pkgname}-${pkgver}.tar.gz")
-
-prepare() {
-  [[ -d ${pkgname}-${pkgver} ]] && rm -rf ${pkgname}-${pkgver}
-  # Workaround an issue with symbolic links in the tarball.
-  tar zxf "${srcdir}/${pkgname}-${pkgver}.tar.gz" || true
-  MSYS=winsymlinks:lnk tar zxf "${srcdir}/${pkgname}-${pkgver}.tar.gz"
-}
+pkgdesc='Official assortment of Ansible collections'
+arch=('any')
+url='https://pypi.org/project/ansible/'
+msys2_references=(
+  "cpe: cpe:/a:ansible:ansible"
+  "cpe: cpe:/a:redhat:ansible"
+  "cpe: cpe:/a:redhat:ansible_engine"
+  "purl: pkg:pypi/ansible"
+)
+license=('spdx:GPL-3.0-or-later')
+depends=(
+  'python'
+  # Bump the version of ansible-core at least whenever a new major version of
+  # ansible is packaged / released. Check the ansible release notes to get the
+  # corresponding version of ansible-core. It usually has a statement like
+  # "Ansible x.y.z depends on ansible-core a.b.c" in it.
+  'ansible-core>=2.19.3'
+)
+makedepends=(
+  'python-setuptools'
+  'python-build'
+  'python-installer'
+  'python-setuptools'
+)
+source=("https://pypi.python.org/packages/source/a/ansible/ansible-${pkgver}.tar.gz")
+sha512sums=('68eccd1a11058fc5d3ee67e70afb36a1b3b45b63d7942c0771e3b326afb97c5a9d31d01a5a6615f3bb7d7b81c6a1fce3afcb463035c5ff65dd50d84accbbf2f4')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  /usr/bin/python setup.py build
+  cd ansible-${pkgver}
+
+  python -m build --wheel --skip-dependency-check --no-isolation
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
-  /usr/bin/python setup.py install -O1 --root="${pkgdir}"
-  install -Dm644 COPYING "${pkgdir}"/usr/share/doc/ansible/COPYING
+  cd ansible-${pkgver}
 
-  install -d "${pkgdir}"/usr/share/ansible/doc
-  cp -dpr --no-preserve=ownership ./examples "${pkgdir}"/usr/share/ansible/doc/
-  install -Dm644 examples/ansible.cfg "${pkgdir}"/etc/ansible/ansible.cfg
+  python -m installer --destdir="${pkgdir}" dist/*.whl
 
-  install -d "${pkgdir}"/usr/share/man/man1
-  cp -dpr --no-preserve=ownership docs/man/man1/*.1 "${pkgdir}"/usr/share/man/man1
+  install -Dm644 COPYING "${pkgdir}"/usr/share/doc/${pkgname}/COPYING
 }

apr-util/PKGBUILD

@@ -1,33 +1,36 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 pkgname=('apr-util' 'apr-util-devel')
-pkgver=1.6.1
-pkgrel=1
+pkgver=1.6.3
+pkgrel=2
 pkgdesc="The Apache Portable Runtime"
 arch=('i686' 'x86_64')
 url="https://apr.apache.org/"
-makedepends=('apr-devel' 'libexpat-devel' 'libsqlite-devel')
+msys2_references=(
+  "cpe: cpe:/a:apache:apr-util"
+)
+makedepends=('apr-devel' 'libexpat-devel' 'libsqlite-devel' 'autotools' 'gcc' 'libxcrypt-devel')
 options=('!libtool')
-license=('APACHE')
+license=('spdx:Apache-2.0')
 source=("https://archive.apache.org/dist/apr/apr-util-${pkgver}.tar.bz2"
-        apr-util-1.5.3-msys2.patch
         plugins.patch)
-sha256sums=('d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b'
-            '55e5f524a5323476f5e224ed9d748a5417a64d5b21b89b2267a22ea4e32b9269'
-            'd79c9202ce6ddc9a67a671ec5bcf495672330a4fa7e29446fa54db793f3f09fe')
+sha256sums=('a41076e3710746326c3945042994ad9a4fcac0ce0277dd8fea076fec3c9772b5'
+            '3280d6ed8e577b626e60d495856d16f6944c3144c495fe9ed8cad6b39332824c')
 
 prepare() {
   cd "${srcdir}/apr-util-${pkgver}"
 
   patch -p1 -i ${srcdir}/plugins.patch
-  patch -p1 -i ${srcdir}/apr-util-1.5.3-msys2.patch
 
   autoreconf -fi
 }
 
 build() {
   cd "${srcdir}/apr-util-${pkgver}"
-  ./configure --build=${CHOST} \
+
+  export MSYSTEM=CYGWIN
+  ./configure \
+    --build=${CHOST} \
     --prefix=/usr \
     --with-apr=/usr \
     --with-expat=/usr \
@@ -46,7 +49,7 @@ check() {
 }
 
 package_apr-util() {
-  depends=('apr' 'expat' 'libsqlite')
+  depends=('apr' 'expat' 'libsqlite' 'libxcrypt')
   groups=('libraries')
 
   mkdir -p ${pkgdir}/usr/bin

apr-util/apr-util-1.5.3-msys2.patch

@@ -1,12 +0,0 @@
-diff -Naur apr-util-1.5.2-orig/build/config.guess apr-util-1.5.2/build/config.guess
---- apr-util-1.5.2-orig/build/config.guess	2011-05-20 20:22:23.000000000 +0000
-@@ -870,6 +870,9 @@
-     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- 	echo x86_64-unknown-cygwin
- 	exit ;;
-+    amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
-+	echo x86_64-unknown-msys
-+	exit ;;
-     prep*:SunOS:5.*:*)
- 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- 	exit ;;

apr-util/plugins.patch

@@ -16,8 +16,8 @@ index 963fead..c9827de 100644
  INSTALL_DATA = @INSTALL_DATA@
  
  APU_MODULES = @APU_MODULES@
--LINK_MODULE = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(APRUTIL_LDFLAGS) -release $(APRUTIL_MAJOR_VERSION) -module -rpath $(APU_DSO_LIBDIR)
-+LINK_MODULE = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(APRUTIL_LDFLAGS) -release $(APRUTIL_MAJOR_VERSION) -module -no-undefined -rpath $(APU_DSO_LIBDIR) @abs_builddir@/lib@APRUTIL_LIBNAME@.la $(APRUTIL_LIBS)
+-LINK_MODULE = $(LIBTOOL) $(LTFLAGS) --mode=link --tag=CC $(CC) $(LT_LDFLAGS) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(APRUTIL_LDFLAGS) -release $(APRUTIL_MAJOR_VERSION) -module -rpath $(APU_DSO_LIBDIR)
++LINK_MODULE = $(LIBTOOL) $(LTFLAGS) --mode=link --tag=CC $(CC) $(LT_LDFLAGS) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(APRUTIL_LDFLAGS) -release $(APRUTIL_MAJOR_VERSION) -module -no-undefined -rpath $(APU_DSO_LIBDIR) @abs_builddir@/lib@APRUTIL_LIBNAME@.la $(APRUTIL_LIBS)
  APU_DSO_LIBDIR = @APU_DSO_LIBDIR@
  
  LT_VERSION = @APU_LTVERSION@

apr/PKGBUILD

@@ -1,52 +1,35 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 pkgname=('apr' 'apr-devel')
-pkgver=1.7.0
+pkgver=1.7.6
 pkgrel=1
 pkgdesc="The Apache Portable Runtime"
 arch=('i686' 'x86_64')
 url="https://apr.apache.org/"
-makedepends=('libcrypt-devel' 'libuuid-devel')
+msys2_references=(
+  "cpe: cpe:/a:apache:portable_runtime"
+)
+makedepends=('libxcrypt-devel' 'libuuid-devel' 'autotools' 'gcc')
 options=('!libtool')
-license=('APACHE')
-source=(https://archive.apache.org/dist/apr/apr-${pkgver}.tar.bz2
-      'apr-1.5.0-msys2.patch'
-      'binary-copy.patch'
-      'no-undefined.patch'
-      'tests-disable_testproc.patch'
-      'tests-fix_paths.patch'
-      'tests.patch'
-      'fix-debian-layout.patch')
-sha256sums=('e2e148f0b2e99b8e5c6caa09f6d4fb4dd3e83f744aa72a952f94f5a14436f7ea'
-            'aea722fe5f21cd7b60aae4aad41d6a9259ffad1fabcb2187ea0ba2f3e6769c48'
-            'c2b3002e5afea7c8e48a46d64ec81aa07041e6948c89497a02c22ba1fc8a94d2'
-            'b31b1dea25f292e911affd46f2487f275043d6d43926f9f4f491b74efa99021c'
-            '3dcedbdfbd2af1945f6a621f51b28353995ddaf3cd61543090dbdbf9981c8163'
-            '4c90def2d0fed5abcff1752c3ba8cba5bc6a1a628904df9c7f7d6a72207f7f53'
-            '490d7dfeb754aed8dd14d42ed199bdc10e3a2120f2e7fcbf31bcdb3629dc1ccf'
-            'edcb695fc87ced48cdeeb747d9b47e8cdd28ad7fcf29fa597c608fcac39621b9')
+license=('spdx:Apache-2.0')
+source=(https://archive.apache.org/dist/apr/apr-${pkgver}.tar.bz2)
+sha256sums=('49030d92d2575da735791b496dc322f3ce5cff9494779ba8cc28c7f46c5deb32')
 
 prepare() {
   cd "${srcdir}/apr-${pkgver}"
 
-  patch -p1 -i ${srcdir}/binary-copy.patch
-  patch -p1 -i ${srcdir}/no-undefined.patch
-  patch -p1 -i ${srcdir}/tests-disable_testproc.patch
-  patch -p1 -i ${srcdir}/tests.patch
-  patch -p1 -i ${srcdir}/tests-fix_paths.patch
-  patch -p1 -i ${srcdir}/apr-1.5.0-msys2.patch
-  patch -p1 -i ${srcdir}/fix-debian-layout.patch
-
   autoreconf -fi
 }
 
 build() {
   cd "${srcdir}/apr-${pkgver}"
-  ./configure --build=${CHOST} \
+
+  export MSYSTEM=CYGWIN
+  ./configure \
+      --build=${CHOST} \
       --prefix=/usr \
       --libexecdir=/usr/lib/apr/modules \
       --datadir=/usr/share/apr \
-      --enable-layout=Debian \
       ac_cv_header_windows_h=no \
       ac_cv_header_winsock2_h=no
 
@@ -60,18 +43,17 @@ check() {
 }
 
 package_apr() {
-  depends=('libcrypt' 'libuuid')
+  depends=('libxcrypt' 'libuuid')
   groups=('libraries')
 
   mkdir -p ${pkgdir}/usr/{bin,share}
   cp -f ${srcdir}/dest/usr/bin/*.dll ${pkgdir}/usr/bin/
-  #cp -rf ${srcdir}/dest/usr/share/doc ${pkgdir}/usr/share/
 }
 
 package_apr-devel() {
   pkgdesc="Libapr headers and libraries"
   groups=('development')
-  depends=("apr=${pkgver}" "libcrypt-devel" "libuuid-devel")
+  depends=("apr=${pkgver}" "libxcrypt-devel" "libuuid-devel")
   options=('staticlibs')
 
   mkdir -p ${pkgdir}/usr/{bin,share}

apr/apr-1.5.0-msys2.patch

@@ -1,56 +0,0 @@
-diff -Naur apr-1.4.8-orig/build/config.guess apr-1.4.8/build/config.guess
---- apr-1.4.8-orig/build/config.guess	2013-04-27 12:51:45.000000000 +0400
-+++ apr-1.4.8/build/config.guess	2013-06-25 12:43:36.319336000 +0400
-@@ -876,6 +876,9 @@
-     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- 	echo x86_64-unknown-cygwin
- 	exit ;;
-+    amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
-+	echo x86_64-unknown-msys
-+	exit ;;
-     prep*:SunOS:5.*:*)
- 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- 	exit ;;
-diff -Naur apr-1.4.8-orig/configure.in apr-1.4.8/configure.in
---- apr-1.4.8-orig/configure.in	2013-06-25 12:43:55.459961000 +0400
-+++ apr-1.4.8/configure.in	2013-06-25 12:43:36.788086000 +0400
-@@ -298,7 +298,7 @@
-     *-solaris2*)
-         apr_platform_runtime_link_flag="-R"
-         ;;
--    *-mingw* | *-cygwin*)
-+    *-mingw* | *-cygwin* | *-msys*)
-         LT_LDFLAGS="$LT_LDFLAGS -no-undefined"
-         ;;
-     *)
-@@ -445,7 +445,7 @@
-     dnl APR_DECLARE et al.
-     dnl If building dynamic APR, the APR build needs APR_DECLARE_EXPORT
-     dnl and the app build should have neither define.
--    *-mingw* | *-cygwin*)
-+    *-mingw* | *-cygwin* | *-msys*)
-         if test "$enable_shared" = "yes"; then
-             APR_ADDTO(INTERNAL_CPPFLAGS, -DAPR_DECLARE_EXPORT)
-         else
-@@ -573,7 +573,7 @@
-        proc_mutex_is_global=1
-        OBJECTS_PLATFORM='$(OBJECTS_win32)'
-        ;;
--   *cygwin*)
-+   *cygwin* | *msys*)
-        OSDIR="unix"
-        enable_threads="no"
-        eolstr="\\n"
-diff -Naur apr-1.4.8-orig/test/testdso.c apr-1.4.8/test/testdso.c
---- apr-1.4.8-orig/test/testdso.c	2013-06-25 12:44:11.100586000 +0400
-+++ apr-1.4.8/test/testdso.c	2013-06-25 12:43:36.803711000 +0400
-@@ -38,6 +38,9 @@
- #elif defined(CYGWIN)
- # define MOD_NAME ".libs/mod_test.dll"
- # define LIB_NAME ".libs/cygmod_test.dll"
-+#elif defined(MSYS)
-+# define MOD_NAME ".libs/mod_test.dll"
-+# define LIB_NAME ".libs/msys-mod_test.dll"
- #elif defined(DARWIN)
- # define MOD_NAME ".libs/mod_test.so" 
- # define LIB_NAME ".libs/libmod_test.dylib" 

apr/tests-disable_testproc.patch

@@ -1,23 +0,0 @@
-
-
-From: David Rothenberger <d.rothenberger@entomo.com>
-
-
----
- test/abts_tests.h |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/test/abts_tests.h b/test/abts_tests.h
-index 13d8b4e..65a4cbb 100644
---- a/test/abts_tests.h
-+++ b/test/abts_tests.h
-@@ -51,7 +51,9 @@ const struct testlist {
-     {testpipe},
-     {testpoll},
-     {testpool},
-+#if ! defined CYGWIN || ! defined MSYS
-     {testproc},
-+#endif
-     {testprocmutex},
-     {testrand},
-     {testsleep},

apr/tests-fix_paths.patch

@@ -1,31 +0,0 @@
-
-
-From: David Rothenberger <d.rothenberger@entomo.com>
-
-
----
- test/testutil.h |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/test/testutil.h b/test/testutil.h
-index ee68dfb..d33c2ff 100644
---- a/test/testutil.h
-+++ b/test/testutil.h
-@@ -25,7 +25,7 @@
-  * and part of apr, itself
-  */
- 
--#ifdef WIN32
-+#if defined WIN32 && ! defined CYGWIN && ! defined MSYS
- #ifdef BINPATH
- #define TESTBINPATH APR_STRINGIFY(BINPATH) "/"
- #else
-@@ -35,7 +35,7 @@
- #define TESTBINPATH "./"
- #endif
- 
--#ifdef WIN32
-+#if defined WIN32 && ! defined CYGWIN && ! defined MSYS
- #define EXTENSION ".exe"
- #elif NETWARE
- #define EXTENSION ".nlm"

apr/tests.patch

@@ -1,51 +0,0 @@
-
-
-From: David Rothenberger <d.rothenberger@entomo.com>
-
-
----
- test/testdso.c   |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/test/testdso.c b/test/testdso.c
-index 0d9f27b..ec81c16 100644
---- a/test/testdso.c
-+++ b/test/testdso.c
-@@ -35,6 +35,9 @@
- # define MOD_NAME "mod_test.so"
- #elif defined(WIN32)
- # define MOD_NAME TESTBINPATH "mod_test.dll"
-+#elif defined(CYGWIN)
-+# define MOD_NAME ".libs/mod_test.dll"
-+# define LIB_NAME ".libs/cygmod_test.dll"
- #elif defined(DARWIN)
- # define MOD_NAME ".libs/mod_test.so" 
- # define LIB_NAME ".libs/libmod_test.dylib" 
---- a/test/testdir.c	2014-01-21 12:24:46.000000000 +0100
-+++ b/test/testdir.c	2018-10-07 14:36:36.542175800 +0200
-@@ -95,6 +95,7 @@
-     return NULL;
- }
- 
-+#if APR_HAS_THREADS
- static void test_mkdir_recurs_parallel(abts_case *tc, void *data)
- {
-     struct thread_data td1, td2, td3, td4;
-@@ -126,6 +127,7 @@
-     ABTS_INT_EQUAL(tc, APR_SUCCESS, s3);
-     ABTS_INT_EQUAL(tc, APR_SUCCESS, s4);
- }
-+#endif
- 
- static void test_remove(abts_case *tc, void *data)
- {
-@@ -379,7 +381,9 @@
- 
-     abts_run_test(suite, test_mkdir, NULL);
-     abts_run_test(suite, test_mkdir_recurs, NULL);
-+#if APR_HAS_THREADS
-     abts_run_test(suite, test_mkdir_recurs_parallel, NULL);
-+#endif
-     abts_run_test(suite, test_remove, NULL);
-     abts_run_test(suite, test_removeall_fail, NULL);
-     abts_run_test(suite, test_removeall, NULL);

asciidoc/0001-W32-confdir.msys2.patch

@@ -1,15 +0,0 @@
---- asciidoc-8.6.7/asciidoc.py.orig	2012-03-14 03:07:34 +0400
-+++ asciidoc-8.6.7/asciidoc.py	2012-03-27 18:16:41 +0400
-@@ -4556,6 +4556,12 @@
-         APP_FILE = os.path.realpath(cmd)
-         global APP_DIR
-         APP_DIR = os.path.dirname(APP_FILE)
-+        global CONF_DIR
-+        if not os.path.isdir (CONF_DIR) and os.name == 'nt':
-+          app_dir_real = os.path.realpath (APP_DIR)
-+          app_prefix, app_last_dir = os.path.split (app_dir_real)
-+          if len (app_prefix) > 0 and app_last_dir == 'bin':
-+            CONF_DIR = os.path.join (app_prefix, 'etc', 'asciidoc')
-         global USER_DIR
-         USER_DIR = userdir()
-         if USER_DIR is not None:

asciidoc/PKGBUILD

@@ -1,14 +1,23 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 pkgname=asciidoc
-pkgver=9.1.0
+pkgver=10.2.1
 pkgrel=2
 pkgdesc='Text document format for short documents, articles, books and UNIX man pages.'
 arch=('any')
 url='https://asciidoc.org/'
+msys2_repository_url="https://github.com/asciidoc-py/asciidoc-py"
+msys2_references=(
+  "purl: pkg:pypi/asciidoc"
+)
 license=('GPL')
 depends=('python' 'libxslt' 'docbook-xsl')
-groups=('base-devel')
+makedepends=(
+  'gcc'
+  "python-setuptools"
+  "python-build"
+  "python-installer"
+)
 # optdepends=('lilypond: music-filter'
             # 'imagemagick: music-filter (used in conjunction with lilypond)'
             # 'source-highlight: source-highlight-filter'
@@ -16,35 +25,19 @@ groups=('base-devel')
             # 'fop: alternative pdf generation'
             # 'lynx: text generation'
             # 'w3m: text generation (alternative to lynx)')
-source=("https://github.com/asciidoc/asciidoc-py3/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz"
-        0001-W32-confdir.msys2.patch)
-sha256sums=('fd499fcf51317b1aaf27336fb5e919c44c1f867f1ae6681ee197365d3065238b'
-            '71f44b513f627b133afead38576fcb8a5460d0514174a4ce219c6ea761d8b40c')
-
-prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i ${srcdir}/0001-W32-confdir.msys2.patch
-}
+source=("https://github.com/asciidoc-py/asciidoc-py/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz")
+sha256sums=('aa7be8ae894f6cc1e67784d76ffa6c6b9e9f96efdc695db43c6bd63820e5072b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  autoreconf -fi
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc
-
-  make
+  python -m build --wheel --skip-dependency-check --no-isolation
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  make install DESTDIR=${pkgdir}
+  python -m installer --destdir="${pkgdir}" dist/*.whl
 
-  local _pyver=$(/usr/bin/python -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))")
-
-  install -Dm644 asciidocapi.py \
-    ${pkgdir}/usr/lib/python${_pyver}/site-packages/asciidocapi.py
+  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/asciidoc/LICENSE"
 }

aspell-de/PKGBUILD

@@ -0,0 +1,32 @@
+_lang=de
+_realname=aspell-${_lang}
+pkgname=${_realname}
+_pkgver=20161207-7-0
+pkgver=${_pkgver//-/.}
+pkgrel=1
+_pkgname=aspell6-${_lang}-${_pkgver}
+pkgdesc='German dictionary for aspell'
+arch=('i686' 'x86_64')
+url="http://aspell.net/"
+license=('GPL-2+')
+depends=('aspell')
+makedepends=('autotools')
+source=("https://ftp.gnu.org/gnu/aspell/dict/${_lang}/${_pkgname}.tar.bz2")
+sha256sums=('c2125d1fafb1d4effbe6c88d4e9127db59da9ed92639c7cbaeae1b7337655571')
+
+prepare() {
+  cd "${srcdir}/${_pkgname}"
+}
+
+build() {
+  cd "${srcdir}/${_pkgname}"
+  ./configure
+  make
+}
+
+package() {
+  cd "${srcdir}/${_pkgname}"
+  make install DESTDIR="${pkgdir}"
+
+  install -vDm444 -t "${pkgdir}/usr/share/licenses/${pkgname}" COPYRIGHT
+}

aspell-en/PKGBUILD

@@ -10,7 +10,7 @@ arch=('i686' 'x86_64')
 url="http://aspell.net/"
 license=('custom')
 groups=()
-makedepends=('aspell-devel')
+makedepends=('aspell-devel' 'autotools' 'gcc')
 depends=('aspell>=0.60')
 provides=('aspell-en')
 options=()

aspell/PKGBUILD

@@ -1,21 +1,24 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 pkgname=("aspell" "aspell-devel")
-pkgver=0.60.8
+pkgver=0.60.8.1
 pkgrel=1
 pkgdesc="A Free and Open Source spell checker (libraries)"
 arch=('i686' 'x86_64')
 url="http://aspell.net/"
+msys2_repository_url="https://github.com/GNUAspell/aspell"
+msys2_references=(
+  "cpe: cpe:/a:gnu:aspell"
+)
 license=('LGPL')
 groups=('libraries')
-makedepends=('gcc' 'gettext-devel' 'libiconv-devel' 'ncurses-devel')
+makedepends=('gcc' 'gettext-devel' 'libiconv-devel' 'ncurses-devel' 'autotools')
 options=()
-source=("https://ftp.gnu.org/gnu/aspell/${pkgname}-${pkgver}.tar.gz"{,.sig}
+source=("https://ftp.gnu.org/gnu/aspell/${pkgname}-${pkgver}.tar.gz"
         "aspell-noundefined.patch"
         "aspell-so2dll.patch"
         "aspell-fileno.patch")
-sha256sums=('f9b77e515334a751b2e60daab5db23499e26c9209f5e7b7443b05235ad0226f2'
-            'SKIP'
+sha256sums=('d6da12b34d42d457fa604e435ad484a74b2effcd120ff40acd6bb3fb2887d21b'
             '35c0a786f580302052bab7569007735436dad9ceb551910205651bc2ad6bcb85'
             '9b9e4300d35a92f029c098da7001235d1dd6aeb03a854591afd84606b5cd257b'
             '8054609ba63038c7f488782a1f80ed31ba1fe18ded842707702ad08793903c7b')
@@ -31,7 +34,7 @@ prepare() {
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure \
+  ./configure -C \
     --prefix=/usr \
     --sysconfdir=/etc \
     --build=${CHOST} \
@@ -42,8 +45,8 @@ build() {
 }
 
 check() {
-  cd "${srcdir}/${pkgname}-${_pkgver}"
-  make -k check
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make check
 }
 
 package_aspell() {

atool/PKGBUILD

@@ -6,12 +6,13 @@
 
 pkgname=atool
 pkgver=0.39.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A script for managing file archives of various types"
 arch=('any')
 url="https://www.nongnu.org/atool/"
 license=('GPL3')
 depends=('file' 'perl')
+makedepends=('autotools')
 optdepends=('bzip2: for using atool with bzip2 compressed archives'
             'cpio: for using atool with cpio archives'
             'gzip: for using atool with gzip compressed archives'

autoconf-archive/PKGBUILD

@@ -1,18 +1,19 @@
 # Maintainer: Andrea Zagli <andrea.zagli.free@gmail.com>
 
 pkgname=autoconf-archive
-pkgver=2019.01.06
+pkgver=2023.02.20
 pkgrel=1
 pkgdesc="Autoconf Macro Archive"
 arch=('any')
-license=('GPL3')
+license=('spdx:GPL-3.0-or-later')
 url="https://www.gnu.org/software/autoconf-archive"
 conflicts=(gnome-common)
 replaces=(gnome-common)
 provides=(gnome-common)
+makedepends=('autotools')
 source=(https://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz
         msysize-autoconf-archive-2019.01.06.patch)
-sha256sums=('17195c833098da79de5778ee90948f4c5d90ed1a0cf8391b4ab348e2ec511e3f'
+sha256sums=('71d4048479ae28f1f5794619c3d72df9c01df49b1c628ef85fde37596dc31a33'
             'd2afa48081316320faea33683eecf3eb146617a8cab85ae8590b4f7882c1a529')
 
 # Helper macros to help make tasks easier #

autoconf/PKGBUILD

@@ -1,57 +0,0 @@
-# Maintainer: Alexey Pavlov <alexpux@gmail.com>
-# Contributor: Ray Donnelly <mingw.android@gmail.com>
-
-pkgname=autoconf
-pkgver=2.71
-pkgrel=1
-pkgdesc="A GNU tool for automatically configuring source code"
-arch=('any')
-license=('GPL2' 'GPL3' 'custom')
-url="https://www.gnu.org/software/autoconf"
-groups=('base-devel')
-depends=('awk' 'm4' 'diffutils' 'bash' 'perl' 'sed')
-# for test-suite
-makedepends=('gcc-fortran')
-install=autoconf.install
-source=(https://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz
-        0001-autoconf-2.70-MSYS2-specifics-AC_CYGWIN.patch
-        0002-autoconf-2.70-MSYS2-Autotest-Unify-EOLs-By-Default.patch
-        0003-autoconf-2.70-MSYS2-specifics-config.guess.patch)
-sha256sums=('f14c83cfebcc9427f2c3cea7258bd90df972d92eb26752da4ddad81c87a0faa4'
-            '3a5337e2269407405ee4c7feb12dbe2ae711610c3144c07cd085272676005db6'
-            'c4e4952cc63a2ddaf7bf539f6e59353c4fadbf04cd48c3cfa789f8b175d0bd27'
-            'a7671bef559a5f3edbd811a7cf9b557f216f1d3e9502dc046fd3a0ea665da7da')
-
-prepare() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  patch -p1 -i ${srcdir}/0001-autoconf-2.70-MSYS2-specifics-AC_CYGWIN.patch
-  patch -p1 -i ${srcdir}/0002-autoconf-2.70-MSYS2-Autotest-Unify-EOLs-By-Default.patch
-  patch -p1 -i ${srcdir}/0003-autoconf-2.70-MSYS2-specifics-config.guess.patch
-
-  # NB: Do not run auto(re)conf and friends to avoid any self-dependency of the package.
-}
-
-build() {
-  mkdir -p build-${pkgname}-${pkgver}
-  cd build-${pkgname}-${pkgver}
-  ../${pkgname}-${pkgver}/configure --prefix=/usr
-  make
-}
-
-check() {
-  cd build-${pkgname}-${pkgver}
-  # CAUTION: The tests run very very long, even on a server.
-  make check TESTSUITEFLAGS='-j16'
-}
-
-package() {
-  make -C build-${pkgname}-${pkgver} DESTDIR=${pkgdir} install
-
-  # license exception
-  install -Dm644 ${pkgname}-${pkgver}/COPYING.EXCEPTION \
-    $pkgdir/usr/share/licenses/autoconf/COPYING.EXCEPTION
-
-  # conflict with bintuils
-  rm -f ${pkgdir}/usr/share/info/standards.info
-}

autoconf/autoconf.install

@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=autoconf.info
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}

autoconf2.13/PKGBUILD

@@ -2,35 +2,54 @@
 
 pkgname=autoconf2.13
 pkgver=2.13
-pkgrel=3
+pkgrel=6
 pkgdesc="A GNU tool for automatically configuring source code"
 arch=('any')
 license=('GPL2' 'GPL3' 'custom')
 url="https://www.gnu.org/software/autoconf"
-groups=('base-devel')
 depends=('awk' 'm4' 'diffutils' 'bash' 'perl')
-# for test-suite
-install=autoconf.install
+makedepends=('make')
 source=(https://ftp.gnu.org/pub/gnu/autoconf/autoconf-${pkgver}.tar.gz
         0001-autoconf-2.13-version-specific-share-directory.patch
         autoconf2.1-texinfo.patch
-        autoconf-2.13-msys2.patch)
+        autoconf-2.13-msys2.patch
+        autoconf-2.13-Clang-16-fixes-for-various-tests.patch
+        autoconf-2.13-K-R-decls-clang.patch
+        autoconf-2.13-msys2.patch
+        autoconf-2.13-perl-5.26.patch
+        autoconf-2.13-test-fixes.patch)
 sha256sums=('f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e'
             '85257fad008fff943942e676fcc45df76d38429d5807fa59eb3eb1812dcd3a77'
             'bb987bcd817988830d77c7acf377d14ca89629fb1e5dcea4cf193a7b0d44d62f'
-            '4d57e9ab72c5084233fce61bc0d9edb177971de5dd2ec376300dd224b029f87e')
+            '4d57e9ab72c5084233fce61bc0d9edb177971de5dd2ec376300dd224b029f87e'
+            '52aa69dbd82470c3b8d23e35477d40798a16814201c3c206f3cc058d7234d1b6'
+            '54406429dfe85950717e13a0a501f778f340d2395a82f830b740408c5284102c'
+            '4d57e9ab72c5084233fce61bc0d9edb177971de5dd2ec376300dd224b029f87e'
+            '770d85b03a90787950225bdf52e9e14ab66bd5d85dacb422e947fb8f644e55a6'
+            '43929d95e6050642385530df91084d4c073cec5cca727918d5ff84bc1e3059f5')
 
 prepare() {
   cd ${srcdir}/autoconf-${pkgver}
 
+  # MSYS2
   patch -p2 -i ${srcdir}/autoconf2.1-texinfo.patch
   patch -p1 -i ${srcdir}/autoconf-2.13-msys2.patch
   patch -p1 -i ${srcdir}/0001-autoconf-2.13-version-specific-share-directory.patch
+
+  # from gentoo: https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-devel/autoconf/files
+  patch -p1 -i ${srcdir}/autoconf-2.13-test-fixes.patch
+  patch -p1 -i ${srcdir}/autoconf-2.13-perl-5.26.patch
+  patch -p1 -i ${srcdir}/autoconf-2.13-K-R-decls-clang.patch
+  patch -p1 -i ${srcdir}/autoconf-2.13-Clang-16-fixes-for-various-tests.patch
 }
 
 build() {
   cd ${srcdir}/autoconf-${pkgver}
-  ./configure --prefix=/usr --program-suffix=-2.13
+
+  ./configure \
+    --prefix=/usr \
+    --program-suffix=-2.13
+
   make
 }
 

autoconf2.13/autoconf-2.13-Clang-16-fixes-for-various-tests.patch

@@ -0,0 +1,331 @@
+From cb92e8110d1f274b28d5c156a93c525d2b748644 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 9 Nov 2022 08:27:53 +0000
+Subject: [PATCH] Clang 16 fixes for various tests
+
+Fixes -Wimplicit-int and -Wimplicit-function-declaration
+issues in various built-in tests.
+
+Noticed when building XEmacs 21.4 (thanks to matsl for reporting).
+
+Bug: https://bugs.gentoo.org/874366
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/acgeneral.m4
++++ b/acgeneral.m4
+@@ -1988,7 +1988,8 @@ changequote([, ])dnl
+ AC_MSG_CHECKING(size of $1)
+ AC_CACHE_VAL(AC_CV_NAME,
+ [AC_TRY_RUN([#include <stdio.h>
+-main(void)
++#include <stdlib.h>
++int main(void)
+ {
+   FILE *f=fopen("conftestval", "w");
+   if (!f) exit(1);
+--- a/acspecific.m4
++++ b/acspecific.m4
+@@ -371,7 +371,7 @@ changequote(, )dnl
+ 		       sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`"
+ changequote([, ])dnl
+ AC_CACHE_VAL(ac_cv_prog_cc_${ac_cc}_c_o,
+-[echo 'foo(void){}' > conftest.c
++[echo 'int foo(void){}' > conftest.c
+ # Make sure it works both with $CC and with simple cc.
+ # We do the test twice because some compilers refuse to overwrite an
+ # existing .o file with -o, though they will create one.
+@@ -706,6 +706,7 @@ fi
+ if test $ac_cv_header_stdc = yes; then
+   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+ AC_TRY_RUN([#include <ctype.h>
++#include <stdlib.h>
+ #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+ #define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+ #define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+@@ -819,6 +820,7 @@ esac
+ 
+ AC_CACHE_CHECK(whether closedir returns void, ac_cv_func_closedir_void,
+ [AC_TRY_RUN([#include <sys/types.h>
++#include <stdlib.h>
+ #include <$ac_header_dirent>
+ int closedir(...); int main(void) { exit(closedir(opendir(".")) != 0); }],
+   ac_cv_func_closedir_void=no, ac_cv_func_closedir_void=yes, ac_cv_func_closedir_void=yes)])
+@@ -907,6 +909,8 @@ AC_CACHE_CHECK(type of array argument to getgroups, ac_cv_type_getgroups,
+ changequote(<<, >>)dnl
+ <<
+ /* Thanks to Mike Rendell for this test.  */
++#include <stdlib.h>
++#include <unistd.h>
+ #include <sys/types.h>
+ #define NGID 256
+ #undef MAX
+@@ -988,6 +992,7 @@ AC_DEFUN(AC_FUNC_CLOSEDIR_VOID,
+ [AC_REQUIRE([AC_HEADER_DIRENT])dnl
+ AC_CACHE_CHECK(whether closedir returns void, ac_cv_func_closedir_void,
+ [AC_TRY_RUN([#include <sys/types.h>
++#include <stdlib.h>
+ #include <$ac_header_dirent>
+ int closedir(...); int main(void) { exit(closedir(opendir(".")) != 0); }],
+   ac_cv_func_closedir_void=no, ac_cv_func_closedir_void=yes, ac_cv_func_closedir_void=yes)])
+@@ -1001,7 +1006,9 @@ AC_DEFUN(AC_FUNC_FNMATCH,
+ # Some versions of Solaris or SCO have a broken fnmatch function.
+ # So we run a test program.  If we are cross-compiling, take no chance.
+ # Thanks to John Oleynick and Franc,ois Pinard for this test.
+-[AC_TRY_RUN([int main(void) { exit (fnmatch ("a*", "abc", 0) != 0); }],
++[AC_TRY_RUN([#include <stdlib.h>
++#include <fnmatch.h>
++int main(void) { exit (fnmatch ("a*", "abc", 0) != 0); }],
+ ac_cv_func_fnmatch_works=yes, ac_cv_func_fnmatch_works=no,
+ ac_cv_func_fnmatch_works=no)])
+ if test $ac_cv_func_fnmatch_works = yes; then
+@@ -1038,6 +1045,7 @@ AC_CACHE_CHECK(for working mmap, ac_cv_func_mmap_fixed_mapped,
+ #include <sys/types.h>
+ #include <fcntl.h>
+ #include <sys/mman.h>
++#include <stdlib.h>
+ 
+ /* This mess was copied from the GNU getpagesize.h.  */
+ #ifndef HAVE_GETPAGESIZE
+@@ -1165,49 +1173,17 @@ AC_DEFUN(AC_FUNC_GETPGRP,
+  *
+  * Snarfed from Chet Ramey's bash pgrp.c test program
+  */
+-#include <stdio.h>
+-#include <sys/types.h>
+-
+-int     pid;
+-int     pg1, pg2, pg3, pg4;
+-int     ng, np, s, child;
++#include <stdlib.h>
+ 
+ int main(void)
+ {
+-        pid = getpid();
+-        pg1 = getpgrp(0);
+-        pg2 = getpgrp();
+-        pg3 = getpgrp(pid);
+-        pg4 = getpgrp(1);
+-
+-        /*
+-         * If all of these values are the same, it's pretty sure that
+-         * we're on a system that ignores getpgrp's first argument.
+-         */
+-        if (pg2 == pg4 && pg1 == pg3 && pg2 == pg3)
+-                exit(0);
+-
+-        child = fork();
+-        if (child < 0)
+-                exit(1);
+-        else if (child == 0) {
+-                np = getpid();
+-                /*
+-                 * If this is Sys V, this will not work; pgrp will be
+-                 * set to np because setpgrp just changes a pgrp to be
+-                 * the same as the pid.
+-                 */
+-                setpgrp(np, pg1);
+-                ng = getpgrp(0);        /* Same result for Sys V and BSD */
+-                if (ng == pg1) {
+-                        exit(1);
+-                } else {
+-                        exit(0);
+-                }
+-        } else {
+-                wait(&s);
+-                exit(s>>8);
+-        }
++    /* XXX: Gentoo: This function used to check for
++    BSD vs POSIX getpgrp but the test fails to compile
++    on modern POSIX systems when not relying on implicit
++    function declarations. It has no value anyway on such
++    systems and it's been removed in newer autoconf.
++    */
++    exit(0);
+ }
+ ], ac_cv_func_getpgrp_void=yes, ac_cv_func_getpgrp_void=no,
+    AC_MSG_ERROR(cannot check getpgrp if cross compiling))
+@@ -1220,9 +1196,7 @@ fi
+ AC_DEFUN(AC_FUNC_SETPGRP,
+ [AC_CACHE_CHECK(whether setpgrp takes no argument, ac_cv_func_setpgrp_void,
+ AC_TRY_RUN([
+-#ifdef HAVE_UNISTD_H
+-#include <unistd.h>
+-#endif
++#include <stdlib.h>
+ 
+ /*
+  * If this system has a BSD-style setpgrp, which takes arguments, exit
+@@ -1230,10 +1204,13 @@ AC_TRY_RUN([
+  */
+ int main(void)
+ {
+-    if (setpgrp(1,1) == -1)
+-	exit(0);
+-    else
+-	exit(1);
++    /* XXX: Gentoo: This function used to check for
++       BSD vs POSIX gsetpgrp but the test fails to compile
++       on modern POSIX systems when not relying on implicit
++       function declarations. It has no value anyway on such
++       systems and it's been removed in newer autoconf.
++    */
++    exit(1);
+ }
+ ], ac_cv_func_setpgrp_void=no, ac_cv_func_setpgrp_void=yes,
+    AC_MSG_ERROR(cannot check setpgrp if cross compiling))
+@@ -1255,9 +1232,11 @@ AC_DEFUN(AC_FUNC_VFORK,
+ AC_CHECK_HEADER(vfork.h, AC_DEFINE(HAVE_VFORK_H))
+ AC_CACHE_CHECK(for working vfork, ac_cv_func_vfork_works,
+ [AC_TRY_RUN([/* Thanks to Paul Eggert for this test.  */
++#include <stdlib.h>
+ #include <stdio.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <sys/wait.h>
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+@@ -1270,11 +1249,11 @@ AC_CACHE_CHECK(for working vfork, ac_cv_func_vfork_works,
+    but some compilers (e.g. gcc -O) don't grok <vfork.h>.
+    Test for this by using a static variable whose address
+    is put into a register that is clobbered by the vfork.  */
+-static
++static void
+ #ifdef __cplusplus
+ sparc_address_test (int arg)
+ #else
+-sparc_address_test (arg) int arg;
++sparc_address_test (int arg)
+ #endif
+ {
+   static pid_t child;
+@@ -1359,6 +1338,8 @@ AC_DEFUN(AC_FUNC_WAIT3,
+ #include <sys/time.h>
+ #include <sys/resource.h>
+ #include <stdio.h>
++#include <stdlib.h>
++#include <unistd.h>
+ /* HP-UX has wait3 but does not fill in rusage at all.  */
+ int main(void) {
+   struct rusage r;
+@@ -1452,7 +1433,8 @@ done
+ fi
+ 
+ AC_CACHE_CHECK(stack direction for C alloca, ac_cv_c_stack_direction,
+-[AC_TRY_RUN([find_stack_direction ()
++[AC_TRY_RUN([#include <stdlib.h>
++int find_stack_direction ()
+ {
+   static char *addr = 0;
+   auto char dummy;
+@@ -1582,6 +1564,8 @@ AC_DEFUN(AC_FUNC_UTIME_NULL,
+ # Sequent interprets utime(file, 0) to mean use start of epoch.  Wrong.
+ AC_TRY_RUN([#include <sys/types.h>
+ #include <sys/stat.h>
++#include <stdlib.h>
++#include <utime.h>
+ int main(void) {
+ struct stat s, t;
+ exit(!(stat ("conftestdata", &s) == 0 && utime("conftestdata", (long *)0) == 0
+@@ -1598,6 +1582,7 @@ fi
+ AC_DEFUN(AC_FUNC_STRCOLL,
+ [AC_CACHE_CHECK(for working strcoll, ac_cv_func_strcoll_works,
+ [AC_TRY_RUN([#include <string.h>
++#include <stdlib.h>
+ int main (void)
+ {
+   exit (strcoll ("abc", "def") >= 0 ||
+@@ -1614,6 +1599,7 @@ AC_DEFUN(AC_FUNC_SETVBUF_REVERSED,
+ [AC_CACHE_CHECK(whether setvbuf arguments are reversed,
+   ac_cv_func_setvbuf_reversed,
+ [AC_TRY_RUN([#include <stdio.h>
++#include <stdlib.h>
+ /* If setvbuf has the reversed format, exit 0. */
+ int main (void) {
+   /* This call has the arguments reversed.
+@@ -1646,7 +1632,8 @@ LIBS="-lintl $LIBS"])])])
+ 
+ AC_DEFUN(AC_FUNC_MEMCMP,
+ [AC_CACHE_CHECK(for 8-bit clean memcmp, ac_cv_func_memcmp_clean,
+-[AC_TRY_RUN([
++[AC_TRY_RUN([#include <stdlib.h>
++#include <string.h>
+ int main(void)
+ {
+   char c0 = 0x40, c1 = 0x80, c2 = 0x81;
+@@ -1805,6 +1792,7 @@ AC_TRY_RUN(
+ #if !defined(__STDC__) || __STDC__ != 1
+ #define volatile
+ #endif
++#include <stdlib.h>
+ int main(void) {
+   volatile char c = 255; exit(c < 0);
+ }], ac_cv_c_char_unsigned=yes, ac_cv_c_char_unsigned=no)
+@@ -1819,7 +1807,8 @@ AC_DEFUN(AC_C_LONG_DOUBLE,
+ [if test "$GCC" = yes; then
+   ac_cv_c_long_double=yes
+ else
+-AC_TRY_RUN([int main(void) {
++AC_TRY_RUN([#include <stdlib.h>
++int main(void) {
+ /* The Stardent Vistra knows sizeof(long double), but does not support it.  */
+ long double foo = 0.0;
+ /* On Ultrix 4.3 cc, long double is 4 and double is 8.  */
+@@ -1834,7 +1823,8 @@ fi
+ AC_DEFUN(AC_INT_16_BITS,
+ [AC_OBSOLETE([$0], [; instead use AC_CHECK_SIZEOF(int)])dnl
+ AC_MSG_CHECKING(whether int is 16 bits)
+-AC_TRY_RUN([int main(void) { exit(sizeof(int) != 2); }],
++AC_TRY_RUN([#include <stdlib.h>
++int main(void) { exit(sizeof(int) != 2); }],
+  [AC_MSG_RESULT(yes)
+  AC_DEFINE(INT_16_BITS)], AC_MSG_RESULT(no))
+ ])
+@@ -1842,7 +1832,8 @@ AC_TRY_RUN([int main(void) { exit(sizeof(int) != 2); }],
+ AC_DEFUN(AC_LONG_64_BITS,
+ [AC_OBSOLETE([$0], [; instead use AC_CHECK_SIZEOF(long)])dnl
+ AC_MSG_CHECKING(whether long int is 64 bits)
+-AC_TRY_RUN([int main(void) { exit(sizeof(long int) != 8); }],
++AC_TRY_RUN([#include <stdlib.h>
++int main(void) { exit(sizeof(long int) != 8); }],
+  [AC_MSG_RESULT(yes)
+  AC_DEFINE(LONG_64_BITS)], AC_MSG_RESULT(no))
+ ])
+@@ -1862,7 +1853,8 @@ AC_TRY_COMPILE([#include <sys/types.h>
+  not big endian
+ #endif], ac_cv_c_bigendian=yes, ac_cv_c_bigendian=no)])
+ if test $ac_cv_c_bigendian = unknown; then
+-AC_TRY_RUN([int main (void) {
++AC_TRY_RUN([#include <stdlib.h>
++int main (void) {
+   /* Are we little or big endian?  From Harbison&Steele.  */
+   union
+   {
+@@ -1885,7 +1877,7 @@ AC_DEFUN(AC_C_INLINE,
+ [AC_CACHE_CHECK([for inline], ac_cv_c_inline,
+ [ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+-  AC_TRY_COMPILE(, [} $ac_kw foo(void) {], [ac_cv_c_inline=$ac_kw; break])
++  AC_TRY_COMPILE(, [} $ac_kw int foo(void) {], [ac_cv_c_inline=$ac_kw; break])
+ done
+ ])
+ case "$ac_cv_c_inline" in
+@@ -2275,7 +2267,10 @@ AC_DEFUN(AC_SYS_RESTARTABLE_SYSCALLS,
+    i.e. the pid of the child, which means that wait was restarted
+    after getting the signal.  */
+ #include <sys/types.h>
++#include <sys/wait.h>
+ #include <signal.h>
++#include <stdlib.h>
++#include <unistd.h>
+ ucatch (isig) { }
+ int main (void) {
+   int i = fork (), status;
+@@ -2444,7 +2439,7 @@ if test "$ac_x_libraries" = NO; then
+   # Don't add to $LIBS permanently.
+   ac_save_LIBS="$LIBS"
+   LIBS="-l$x_direct_test_library $LIBS"
+-AC_TRY_LINK(, [${x_direct_test_function}()],
++AC_TRY_LINK([#include <X11/Intrinsic.h>], [${x_direct_test_function}(0)],
+ [LIBS="$ac_save_LIBS"
+ # We can link X programs with no special library path.
+ ac_x_libraries=],

autoconf2.13/autoconf-2.13-K-R-decls-clang.patch

@@ -0,0 +1,346 @@
+https://bugs.gentoo.org/870412
+https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=8b5e2016c7ed2d67f31b03a3d2e361858ff5299b
+
+Backport the K&R decls fix to 2.13 to avoid configure tests
+failing (often "silently", i.e. doesn't fail the build of
+the package overall, just leads to wrong results) with
+newer compilers like the upcoming Clang 16.
+
+From d8ad1096be4352c588b9bc1e16b6758f4f32b96a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
+Date: Mon, 19 Sep 2022 01:38:29 +0200
+Subject: [PATCH] ac{general,specific}: declare void param lists, where apt
+
+--- a/acgeneral.m4
++++ b/acgeneral.m4
+@@ -1542,7 +1542,7 @@ extern "C"
+ ])dnl
+ [/* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+-char $1();
++char $1(void);
+ ]),
+ [$1()],
+ [$2],
+@@ -1597,7 +1597,7 @@ extern "C"
+ ])dnl
+ [/* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+-char $2();
++char $2(void);
+ ])),
+ 	    [$2()],
+ 	    eval "ac_cv_lib_$ac_lib_var=yes",
+@@ -1733,7 +1733,7 @@ dnl [#]line __oline__ "[$]0"
+ [#]line __oline__ "configure"
+ #include "confdefs.h"
+ [$1]
+-int main() {
++int main(void) {
+ [$2]
+ ; return 0; }
+ ])EOF
+@@ -1777,7 +1777,7 @@ dnl [#]line __oline__ "[$]0"
+ [#]line __oline__ "configure"
+ #include "confdefs.h"
+ [$1]
+-int main() {
++int main(void) {
+ [$2]
+ ; return 0; }
+ ])EOF
+@@ -1934,7 +1934,7 @@ extern "C"
+ ])dnl
+ [/* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+-char $1();
++char $1(void);
+ ], [
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+@@ -1988,7 +1988,7 @@ changequote([, ])dnl
+ AC_MSG_CHECKING(size of $1)
+ AC_CACHE_VAL(AC_CV_NAME,
+ [AC_TRY_RUN([#include <stdio.h>
+-main()
++main(void)
+ {
+   FILE *f=fopen("conftestval", "w");
+   if (!f) exit(1);
+--- a/acspecific.m4
++++ b/acspecific.m4
+@@ -202,7 +202,7 @@ AC_DEFUN(AC_PROG_CC_WORKS,
+ [AC_MSG_CHECKING([whether the C compiler ($CC $CFLAGS $LDFLAGS) works])
+ AC_LANG_SAVE
+ AC_LANG_C
+-AC_TRY_COMPILER([main(){return(0);}], ac_cv_prog_cc_works, ac_cv_prog_cc_cross)
++AC_TRY_COMPILER([int main(void){return(0);}], ac_cv_prog_cc_works, ac_cv_prog_cc_cross)
+ AC_LANG_RESTORE
+ AC_MSG_RESULT($ac_cv_prog_cc_works)
+ if test $ac_cv_prog_cc_works = no; then
+@@ -217,7 +217,7 @@ AC_DEFUN(AC_PROG_CXX_WORKS,
+ [AC_MSG_CHECKING([whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works])
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+-AC_TRY_COMPILER([int main(){return(0);}], ac_cv_prog_cxx_works, ac_cv_prog_cxx_cross)
++AC_TRY_COMPILER([int main(void){return(0);}], ac_cv_prog_cxx_works, ac_cv_prog_cxx_cross)
+ AC_LANG_RESTORE
+ AC_MSG_RESULT($ac_cv_prog_cxx_works)
+ if test $ac_cv_prog_cxx_works = no; then
+@@ -300,7 +300,7 @@ fi])])
+ 
+ AC_DEFUN(AC_PROG_CC_G,
+ [AC_CACHE_CHECK(whether ${CC-cc} accepts -g, ac_cv_prog_cc_g,
+-[echo 'void f(){}' > conftest.c
++[echo 'void f(void){}' > conftest.c
+ if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
+   ac_cv_prog_cc_g=yes
+ else
+@@ -311,7 +311,7 @@ rm -f conftest*
+ 
+ AC_DEFUN(AC_PROG_CXX_G,
+ [AC_CACHE_CHECK(whether ${CXX-g++} accepts -g, ac_cv_prog_cxx_g,
+-[echo 'void f(){}' > conftest.cc
++[echo 'void f(void){}' > conftest.cc
+ if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
+   ac_cv_prog_cxx_g=yes
+ else
+@@ -371,7 +371,7 @@ changequote(, )dnl
+ 		       sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`"
+ changequote([, ])dnl
+ AC_CACHE_VAL(ac_cv_prog_cc_${ac_cc}_c_o,
+-[echo 'foo(){}' > conftest.c
++[echo 'foo(void){}' > conftest.c
+ # Make sure it works both with $CC and with simple cc.
+ # We do the test twice because some compilers refuse to overwrite an
+ # existing .o file with -o, though they will create one.
+@@ -709,7 +709,7 @@ AC_TRY_RUN([#include <ctype.h>
+ #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+ #define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+ #define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+-int main () { int i; for (i = 0; i < 256; i++)
++int main (void) { int i; for (i = 0; i < 256; i++)
+ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
+ exit (0); }
+ ], , ac_cv_header_stdc=no, :)
+@@ -820,7 +820,7 @@ esac
+ AC_CACHE_CHECK(whether closedir returns void, ac_cv_func_closedir_void,
+ [AC_TRY_RUN([#include <sys/types.h>
+ #include <$ac_header_dirent>
+-int closedir(); main() { exit(closedir(opendir(".")) != 0); }],
++int closedir(...); int main(void) { exit(closedir(opendir(".")) != 0); }],
+   ac_cv_func_closedir_void=no, ac_cv_func_closedir_void=yes, ac_cv_func_closedir_void=yes)])
+ if test $ac_cv_func_closedir_void = yes; then
+   AC_DEFINE(VOID_CLOSEDIR)
+@@ -911,7 +911,7 @@ changequote(<<, >>)dnl
+ #define NGID 256
+ #undef MAX
+ #define MAX(x, y) ((x) > (y) ? (x) : (y))
+-main()
++int main(void)
+ {
+   gid_t gidset[NGID];
+   int i, n;
+@@ -973,7 +973,7 @@ AC_DEFUN(AC_TYPE_SIGNAL,
+ #ifdef __cplusplus
+ extern "C" void (*signal (int, void (*)(int)))(int);
+ #else
+-void (*signal ()) ();
++void (*signal (void)) (void);
+ #endif
+ ],
+ [int i;], ac_cv_type_signal=void, ac_cv_type_signal=int)])
+@@ -989,7 +989,7 @@ AC_DEFUN(AC_FUNC_CLOSEDIR_VOID,
+ AC_CACHE_CHECK(whether closedir returns void, ac_cv_func_closedir_void,
+ [AC_TRY_RUN([#include <sys/types.h>
+ #include <$ac_header_dirent>
+-int closedir(); main() { exit(closedir(opendir(".")) != 0); }],
++int closedir(...); int main(void) { exit(closedir(opendir(".")) != 0); }],
+   ac_cv_func_closedir_void=no, ac_cv_func_closedir_void=yes, ac_cv_func_closedir_void=yes)])
+ if test $ac_cv_func_closedir_void = yes; then
+   AC_DEFINE(CLOSEDIR_VOID)
+@@ -1001,7 +1001,7 @@ AC_DEFUN(AC_FUNC_FNMATCH,
+ # Some versions of Solaris or SCO have a broken fnmatch function.
+ # So we run a test program.  If we are cross-compiling, take no chance.
+ # Thanks to John Oleynick and Franc,ois Pinard for this test.
+-[AC_TRY_RUN([main() { exit (fnmatch ("a*", "abc", 0) != 0); }],
++[AC_TRY_RUN([int main(void) { exit (fnmatch ("a*", "abc", 0) != 0); }],
+ ac_cv_func_fnmatch_works=yes, ac_cv_func_fnmatch_works=no,
+ ac_cv_func_fnmatch_works=no)])
+ if test $ac_cv_func_fnmatch_works = yes; then
+@@ -1083,11 +1083,11 @@ AC_CACHE_CHECK(for working mmap, ac_cv_func_mmap_fixed_mapped,
+ #ifdef __cplusplus
+ extern "C" { void *malloc(unsigned); }
+ #else
+-char *malloc();
++char *malloc(...);
+ #endif
+ 
+ int
+-main()
++main(void)
+ {
+ 	char *data, *data2, *data3;
+ 	int i, pagesize;
+@@ -1172,7 +1172,7 @@ int     pid;
+ int     pg1, pg2, pg3, pg4;
+ int     ng, np, s, child;
+ 
+-main()
++int main(void)
+ {
+         pid = getpid();
+         pg1 = getpgrp(0);
+@@ -1228,7 +1228,7 @@ AC_TRY_RUN([
+  * If this system has a BSD-style setpgrp, which takes arguments, exit
+  * successfully.
+  */
+-main()
++int main(void)
+ {
+     if (setpgrp(1,1) == -1)
+ 	exit(0);
+@@ -1291,7 +1291,7 @@ sparc_address_test (arg) int arg;
+     }
+   }
+ }
+-main() {
++int main(void) {
+   pid_t parent = getpid ();
+   pid_t child;
+ 
+@@ -1360,7 +1360,7 @@ AC_DEFUN(AC_FUNC_WAIT3,
+ #include <sys/resource.h>
+ #include <stdio.h>
+ /* HP-UX has wait3 but does not fill in rusage at all.  */
+-main() {
++int main(void) {
+   struct rusage r;
+   int i;
+   /* Use a field that we can force nonzero --
+@@ -1416,7 +1416,7 @@ AC_CACHE_CHECK([for alloca], ac_cv_func_alloca_works,
+  #pragma alloca
+ #   else
+ #    ifndef alloca /* predefined by HP cc +Olibcalls */
+-char *alloca ();
++char *alloca (...);
+ #    endif
+ #   endif
+ #  endif
+@@ -1464,7 +1464,7 @@ AC_CACHE_CHECK(stack direction for C alloca, ac_cv_c_stack_direction,
+   else
+     return (&dummy > addr) ? 1 : -1;
+ }
+-main ()
++int main (void)
+ {
+   exit (find_stack_direction() < 0);
+ }], ac_cv_c_stack_direction=1, ac_cv_c_stack_direction=-1,
+@@ -1582,7 +1582,7 @@ AC_DEFUN(AC_FUNC_UTIME_NULL,
+ # Sequent interprets utime(file, 0) to mean use start of epoch.  Wrong.
+ AC_TRY_RUN([#include <sys/types.h>
+ #include <sys/stat.h>
+-main() {
++int main(void) {
+ struct stat s, t;
+ exit(!(stat ("conftestdata", &s) == 0 && utime("conftestdata", (long *)0) == 0
+ && stat("conftestdata", &t) == 0 && t.st_mtime >= s.st_mtime
+@@ -1598,7 +1598,7 @@ fi
+ AC_DEFUN(AC_FUNC_STRCOLL,
+ [AC_CACHE_CHECK(for working strcoll, ac_cv_func_strcoll_works,
+ [AC_TRY_RUN([#include <string.h>
+-main ()
++int main (void)
+ {
+   exit (strcoll ("abc", "def") >= 0 ||
+ 	strcoll ("ABC", "DEF") >= 0 ||
+@@ -1615,7 +1615,7 @@ AC_DEFUN(AC_FUNC_SETVBUF_REVERSED,
+   ac_cv_func_setvbuf_reversed,
+ [AC_TRY_RUN([#include <stdio.h>
+ /* If setvbuf has the reversed format, exit 0. */
+-main () {
++int main (void) {
+   /* This call has the arguments reversed.
+      A reversed system may check and see that the address of main
+      is not _IOLBF, _IONBF, or _IOFBF, and return nonzero.  */
+@@ -1647,7 +1647,7 @@ LIBS="-lintl $LIBS"])])])
+ AC_DEFUN(AC_FUNC_MEMCMP,
+ [AC_CACHE_CHECK(for 8-bit clean memcmp, ac_cv_func_memcmp_clean,
+ [AC_TRY_RUN([
+-main()
++int main(void)
+ {
+   char c0 = 0x40, c1 = 0x80, c2 = 0x81;
+   exit(memcmp(&c0, &c2, 1) < 0 && memcmp(&c1, &c2, 1) < 0 ? 0 : 1);
+@@ -1805,7 +1805,7 @@ AC_TRY_RUN(
+ #if !defined(__STDC__) || __STDC__ != 1
+ #define volatile
+ #endif
+-main() {
++int main(void) {
+   volatile char c = 255; exit(c < 0);
+ }], ac_cv_c_char_unsigned=yes, ac_cv_c_char_unsigned=no)
+ fi])
+@@ -1819,7 +1819,7 @@ AC_DEFUN(AC_C_LONG_DOUBLE,
+ [if test "$GCC" = yes; then
+   ac_cv_c_long_double=yes
+ else
+-AC_TRY_RUN([int main() {
++AC_TRY_RUN([int main(void) {
+ /* The Stardent Vistra knows sizeof(long double), but does not support it.  */
+ long double foo = 0.0;
+ /* On Ultrix 4.3 cc, long double is 4 and double is 8.  */
+@@ -1834,7 +1834,7 @@ fi
+ AC_DEFUN(AC_INT_16_BITS,
+ [AC_OBSOLETE([$0], [; instead use AC_CHECK_SIZEOF(int)])dnl
+ AC_MSG_CHECKING(whether int is 16 bits)
+-AC_TRY_RUN([main() { exit(sizeof(int) != 2); }],
++AC_TRY_RUN([int main(void) { exit(sizeof(int) != 2); }],
+  [AC_MSG_RESULT(yes)
+  AC_DEFINE(INT_16_BITS)], AC_MSG_RESULT(no))
+ ])
+@@ -1842,7 +1842,7 @@ AC_TRY_RUN([main() { exit(sizeof(int) != 2); }],
+ AC_DEFUN(AC_LONG_64_BITS,
+ [AC_OBSOLETE([$0], [; instead use AC_CHECK_SIZEOF(long)])dnl
+ AC_MSG_CHECKING(whether long int is 64 bits)
+-AC_TRY_RUN([main() { exit(sizeof(long int) != 8); }],
++AC_TRY_RUN([int main(void) { exit(sizeof(long int) != 8); }],
+  [AC_MSG_RESULT(yes)
+  AC_DEFINE(LONG_64_BITS)], AC_MSG_RESULT(no))
+ ])
+@@ -1862,7 +1862,7 @@ AC_TRY_COMPILE([#include <sys/types.h>
+  not big endian
+ #endif], ac_cv_c_bigendian=yes, ac_cv_c_bigendian=no)])
+ if test $ac_cv_c_bigendian = unknown; then
+-AC_TRY_RUN([main () {
++AC_TRY_RUN([int main (void) {
+   /* Are we little or big endian?  From Harbison&Steele.  */
+   union
+   {
+@@ -1885,7 +1885,7 @@ AC_DEFUN(AC_C_INLINE,
+ [AC_CACHE_CHECK([for inline], ac_cv_c_inline,
+ [ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+-  AC_TRY_COMPILE(, [} $ac_kw foo() {], [ac_cv_c_inline=$ac_kw; break])
++  AC_TRY_COMPILE(, [} $ac_kw foo(void) {], [ac_cv_c_inline=$ac_kw; break])
+ done
+ ])
+ case "$ac_cv_c_inline" in
+@@ -2277,7 +2277,7 @@ AC_DEFUN(AC_SYS_RESTARTABLE_SYSCALLS,
+ #include <sys/types.h>
+ #include <signal.h>
+ ucatch (isig) { }
+-main () {
++int main (void) {
+   int i = fork (), status;
+   if (i == 0) { sleep (3); kill (getppid (), SIGINT); sleep (3); exit (0); }
+   signal (SIGINT, ucatch);
+@@ -2654,7 +2654,7 @@ AC_CACHE_VAL(ac_cv_exeext,
+   ac_cv_exeext=.exe
+ else
+   rm -f conftest*
+-  echo 'int main () { return 0; }' > conftest.$ac_ext
++  echo 'int main (void) { return 0; }' > conftest.$ac_ext
+   ac_cv_exeext=
+   if AC_TRY_EVAL(ac_link); then
+     for file in conftest.*; do

autoconf2.13/autoconf-2.13-perl-5.26.patch

@@ -0,0 +1,12 @@
+diff -ruN autoconf-2.13.orig/autoscan.pl autoconf-2.13/autoscan.pl
+--- autoconf-2.13.orig/autoscan.pl	1999-01-05 14:28:42.000000000 +0100
++++ autoconf-2.13/autoscan.pl	2018-12-22 19:55:10.986732296 +0100
+@@ -232,7 +232,7 @@
+ 	# Strip out comments and variable references.
+ 	s/#.*//;
+ 	s/\$\([^\)]*\)//g;
+-	s/\${[^\}]*}//g;
++	s/\$\{[^\}]*}//g;
+ 	s/@[^@]*@//g;
+ 
+ 	# Variable assignments.

autoconf2.13/autoconf-2.13-test-fixes.patch

@@ -0,0 +1,18 @@
+newer gcc versions don't provide g77, so if it doesn't exist,
+don't bother trying to test it (and failing)
+
+http://bugs.gentoo.org/146592
+
+--- autoconf-2.13/testsuite/autoconf.s/syntax.exp
++++ autoconf-2.13/testsuite/autoconf.s/syntax.exp
+@@ -5,6 +5,10 @@
+ set macros [exec sed -n $script $srcdir/../acspecific.m4]
+ 
+ foreach mac $macros {
++    if { [string match "*F77*" "$mac"] && [catch {exec which g77} ignore_output] } then {
++        send_user "XFAIL: $mac\n"
++        continue
++    }
+     send_user "$mac\n"
+     autoconf_test $mac $mac
+ }

autoconf2.13/autoconf.install

@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=autoconf2.13.info
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}

autoconf2.69/0001-fix-texinfo.patch

@@ -0,0 +1,68 @@
+--- a/doc/autoconf.texi
++++ b/doc/autoconf.texi
+@@ -15,7 +15,7 @@
+ @c The ARG is an optional argument.  To be used for macro arguments in
+ @c their documentation (@defmac).
+ @macro ovar{varname}
+-@r{[}@var{\varname\}@r{]}@c
++@r{[}@var{\varname\}@r{]}
+ @end macro
+ 
+ @c @dvar(ARG, DEFAULT)
+@@ -23,7 +23,7 @@
+ @c The ARG is an optional argument, defaulting to DEFAULT.  To be used
+ @c for macro arguments in their documentation (@defmac).
+ @macro dvar{varname, default}
+-@r{[}@var{\varname\} = @samp{\default\}@r{]}@c
++@r{[}@var{\varname\} = @samp{\default\}@r{]}
+ @end macro
+ 
+ @c Handling the indexes with Texinfo yields several different problems.
+@@ -8013,10 +8013,10 @@ variables, respectively.  The computed linker flags are cached in
+ @code{ac_cv_f77_libs} or @code{ac_cv_fc_libs}, respectively.
+ @end defmac
+ 
+-@defmac AC_F77_DUMMY_MAIN (@ovar{action-if-found}, @dvar{action-if-not-found, @
+-  AC_MSG_FAILURE})
+-@defmacx AC_FC_DUMMY_MAIN (@ovar{action-if-found}, @dvar{action-if-not-found, @
+-  AC_MSG_FAILURE})
++@defmac AC_F77_DUMMY_MAIN (@ovar{action-if-found}, @
++  @dvar{action-if-not-found, AC_MSG_FAILURE})
++@defmacx AC_FC_DUMMY_MAIN (@ovar{action-if-found}, @
++  @dvar{action-if-not-found, AC_MSG_FAILURE})
+ @acindex{F77_DUMMY_MAIN}
+ @cvindex F77_DUMMY_MAIN
+ @acindex{FC_DUMMY_MAIN}
+@@ -8267,8 +8267,8 @@ results in @code{ac_cv_fc_srcext_@var{ext}} and
+ @code{ac_cv_fc_pp_srcext_@var{ext}} variables, respectively.
+ @end defmac
+ 
+-@defmac AC_FC_PP_DEFINE (@ovar{action-if-success}, @dvar{action-if-failure, @
+-  AC_MSG_FAILURE})
++@defmac AC_FC_PP_DEFINE (@ovar{action-if-success}, @
++  @dvar{action-if-failure, AC_MSG_FAILURE})
+ @acindex{FC_PP_DEFINE}
+ @caindex fc_pp_define
+ 
+@@ -8286,8 +8286,8 @@ The result of this test is cached in the @code{ac_cv_fc_pp_define}
+ variable.
+ @end defmac
+ 
+-@defmac AC_FC_FREEFORM (@ovar{action-if-success}, @dvar{action-if-failure, @
+-  AC_MSG_FAILURE})
++@defmac AC_FC_FREEFORM (@ovar{action-if-success}, @
++  @dvar{action-if-failure, AC_MSG_FAILURE})
+ @acindex{FC_FREEFORM}
+ @caindex fc_freeform
+ 
+@@ -8313,8 +8313,8 @@ The result of this test, or @samp{none} or @samp{unknown}, is cached in
+ the @code{ac_cv_fc_freeform} variable.
+ @end defmac
+ 
+-@defmac AC_FC_FIXEDFORM (@ovar{action-if-success}, @dvar{action-if-failure, @
+-  AC_MSG_FAILURE})
++@defmac AC_FC_FIXEDFORM (@ovar{action-if-success}, @
++  @dvar{action-if-failure, AC_MSG_FAILURE})
+ @acindex{FC_FIXEDFORM}
+ @caindex fc_fixedform
+ 

autoconf2.69/0002-msys2.patch

@@ -0,0 +1,49 @@
+diff -Naur autoconf-2.69/build-aux/config.guess autoconf-2.69m/build-aux/config.guess
+--- autoconf-2.69/build-aux/config.guess	2012-04-25 02:15:10.000000000 +0000
++++ autoconf-2.69m/build-aux/config.guess	2013-02-23 20:44:30.000000000 +0000
+@@ -844,6 +844,9 @@
+     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+ 	echo x86_64-unknown-cygwin
+ 	exit ;;
++    amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
++	echo x86_64-unknown-msys
++	exit ;;
+     p*:CYGWIN*:*)
+ 	echo powerpcle-unknown-cygwin
+ 	exit ;;
+diff -Naur autoconf-2.69/lib/autoconf/fortran.m4 autoconf-2.69m/lib/autoconf/fortran.m4
+--- autoconf-2.69/lib/autoconf/fortran.m4	2012-03-07 17:35:25.000000000 +0000
++++ autoconf-2.69m/lib/autoconf/fortran.m4	2013-02-23 20:46:35.000000000 +0000
+@@ -666,7 +666,7 @@
+ 	  ;;
+ 	-lkernel32)
+ 	  case $host_os in
+-	  *cygwin*) ;;
++	  *cygwin* | *msys*) ;;
+ 	  *) ac_cv_[]_AC_LANG_ABBREV[]_libs="$ac_cv_[]_AC_LANG_ABBREV[]_libs $ac_arg"
+ 	    ;;
+ 	  esac
+diff -Naur autoconf-2.69/lib/autoconf/specific.m4 autoconf-2.69m/lib/autoconf/specific.m4
+--- autoconf-2.69/lib/autoconf/specific.m4	2012-01-21 13:46:39.000000000 +0000
++++ autoconf-2.69m/lib/autoconf/specific.m4	2013-02-23 20:47:16.000000000 +0000
+@@ -321,7 +321,7 @@
+ AU_DEFUN([AC_CYGWIN],
+ [AC_CANONICAL_HOST
+ case $host_os in
+-  *cygwin* ) CYGWIN=yes;;
++  *cygwin* | *msys*) CYGWIN=yes;;
+ 	 * ) CYGWIN=no;;
+ esac
+ ], [$0 is obsolete: use AC_CANONICAL_HOST and check if $host_os
+diff -Naur autoconf-2.69/tests/local.at autoconf-2.69m/tests/local.at
+--- autoconf-2.69/tests/local.at	2012-04-24 20:44:15.000000000 +0000
++++ autoconf-2.69m/tests/local.at	2013-02-23 20:48:14.000000000 +0000
+@@ -313,7 +313,7 @@
+       [OPENMP_CFLAGS],
+       [LIBS|LIB@&t@OBJS|LTLIBOBJS|LDFLAGS],
+       [INSTALL(_(DATA|PROGRAM|SCRIPT))?],
+-      [CYGWIN|ISC|MINGW32|MINIX|EMXOS2|XENIX|EXEEXT|OBJEXT],
++      [CYGWIN|ISC|MSYS|MINGW32|MINIX|EMXOS2|XENIX|EXEEXT|OBJEXT],
+       [X_(CFLAGS|(EXTRA_|PRE_)?LIBS)|x_(includes|libraries)|(have|no)_x],
+       [(host|build|target)(_(alias|cpu|vendor|os))?],
+       [cross_compiling|U],

autoconf2.69/0003-autotest-remove-cr-from-prog-stdout-stderr.patch

@@ -0,0 +1,32 @@
+diff -urN autoconf-2.69.orig/lib/autotest/general.m4 autoconf-2.69/lib/autotest/general.m4
+--- autoconf-2.69.orig/lib/autotest/general.m4	2014-08-05 00:03:28.681954400 +0100
++++ autoconf-2.69/lib/autotest/general.m4	2014-08-05 00:21:04.944082600 +0100
+@@ -2149,6 +2149,19 @@
+ m4_define([AT_DIFF_STDOUT()],
+ 	  [at_fn_diff_devnull "$at_stdout" || at_failed=:])
+ 
++# Adapted from:
++# https://lists.gnu.org/archive/html/libtool-commit/2009-01/msg00012.html
++# Removed the host_os check (this is either harmful or it isn't let's not
++# hedge our bets - when cross-compiling build_os could be mingw* and that
++# would failed the host_os test anyway) and also the optional RESULT-FILE
++# AT_UNIFY_NL(FILE)
++# -----------------------------------
++# Ensure (text) FILE has predictable line endings.
++# Convert in-place.
++m4_define([AT_UNIFY_NL],
++[tr -d '\015' < $1 > $1.t
++mv -f $1.t $1])
++
+ # _AT_CHECK(COMMANDS, [STATUS = 0], STDOUT, STDERR,
+ #           [RUN-IF-FAIL], [RUN-IF-PASS])
+ # -------------------------------------------------
+@@ -2192,6 +2205,8 @@
+ ) >>"$at_stdout" 2>>"$at_stderr" AS_MESSAGE_LOG_FD>&-
+ at_status=$? at_failed=false
+ $at_check_filter
++AT_UNIFY_NL([$at_stderr])
++AT_UNIFY_NL([$at_stdout])
+ m4_ifdef([AT_DIFF_STDERR($4)], [m4_indir([AT_DIFF_STDERR($4)])],
+   [echo >>"$at_stderr"; AS_ECHO([["$4"]]) | \
+   $at_diff - "$at_stderr" || at_failed=:])

autoconf2.69/0004-docs.patch

@@ -0,0 +1,10 @@
+--- autoconf-2.69/doc/autoconf.texi.orig	2021-12-27 16:45:07.043999800 +0100
++++ autoconf-2.69/doc/autoconf.texi	2021-12-27 16:46:29.222069800 +0100
+@@ -6,7 +6,6 @@
+ @settitle Autoconf
+ @setchapternewpage odd
+ @ifnothtml
+-@setcontentsaftertitlepage
+ @end ifnothtml
+ @finalout
+ 

autoconf2.69/0005-package.patch

@@ -0,0 +1,11 @@
+--- autoconf-2.69/configure.orig	2021-12-27 17:08:45.948999800 +0100
++++ autoconf-2.69/configure	2021-12-27 17:08:51.894818700 +0100
+@@ -2214,7 +2214,7 @@
+ 
+ 
+ # Define the identity of the package.
+- PACKAGE='autoconf'
++ PACKAGE='autoconf-2.69'
+  VERSION='2.69'
+ 
+ 

autoconf2.69/PKGBUILD

@@ -0,0 +1,80 @@
+# Maintainer: Alexey Pavlov <alexpux@gmail.com>
+# Contributor: Ray Donnelly <mingw.android@gmail.com>
+
+_realname=autoconf
+pkgname=${_realname}2.69
+pkgver=2.69
+pkgrel=4
+pkgdesc="A GNU tool for automatically configuring source code"
+arch=('any')
+license=('spdx:GPL-2.0-or-later' 'spdx:GPL-3.0-or-later' 'spdx:Autoconf-exception-3.0')
+url="https://www.gnu.org/software/autoconf"
+depends=('awk' 'm4' 'diffutils' 'bash' 'perl')
+makedepends=('make')
+source=(https://ftp.gnu.org/pub/gnu/${_realname}/${_realname}-${pkgver}.tar.xz
+        0001-fix-texinfo.patch
+        0002-msys2.patch
+        0003-autotest-remove-cr-from-prog-stdout-stderr.patch
+        0004-docs.patch
+        0005-package.patch
+        autoconf-2.69-K-R-decls-clang.patch
+        autoconf-2.69-fix-libtool-test.patch
+        autoconf-2.69-make-tests-bash5-compatible.patch
+        autoconf-2.69-perl-5.26-2.patch
+        autoconf-2.69-perl-5.26.patch)
+sha256sums=('64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684'
+            'ad42ff57d1ff3dd6ba06fe94f913a369f9210963856e8c955efed9a164609a64'
+            '9f31df02eb41df57a05ceea1d1442424d1cca63cd9304c953732fa6c65279a5a'
+            '74e2135a3f34f5692a77de85c21cb2f0fd8a1dcf396f7fbba7deb0c59faa54eb'
+            'bc973e76f3ea3941818099cb5a22081c8a9703338b3194fce3534a07ac32c078'
+            'a9bd30264a812672bf7fa7b67135871ccac4c84b30113b82ea7c2f5987e0d951'
+            '1253d17e557310f538b0a37fff8c36061a99c43158ed97a68cdf109cd58686b6'
+            '7793209b33013dc0f81208718c68440c5aae80e7a1c4b8d336e382525af791a7'
+            '176d4bf66920f66115aba6c44a71a7197b3d65038aac51ba51f61e241bc3e398'
+            'a49dd5bac3b62daa0ff688ab4d508d71dbd2f4f8d7e2a02321926346161bf3ee'
+            '35c449281546376449766f92d49fc121ca50e330e60fefcfc9be2af3253082c2')
+
+prepare() {
+  cd ${srcdir}/${_realname}-${pkgver}
+
+  # MSYS2
+  patch -p1 -i ${srcdir}/0001-fix-texinfo.patch
+  patch -p1 -i ${srcdir}/0002-msys2.patch
+  patch -p1 -i ${srcdir}/0003-autotest-remove-cr-from-prog-stdout-stderr.patch
+  patch -p1 -i ${srcdir}/0004-docs.patch
+  patch -p1 -i ${srcdir}/0005-package.patch
+
+  # from gentoo: https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-devel/autoconf/files
+  patch -p1 -i ${srcdir}/autoconf-2.69-perl-5.26.patch
+  patch -p1 -i ${srcdir}/autoconf-2.69-fix-libtool-test.patch
+  patch -p1 -i ${srcdir}/autoconf-2.69-perl-5.26-2.patch
+  patch -p1 -i ${srcdir}/autoconf-2.69-make-tests-bash5-compatible.patch
+  patch -p1 -i ${srcdir}/autoconf-2.69-K-R-decls-clang.patch
+}
+
+build() {
+  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
+
+  ../${_realname}-${pkgver}/configure \
+    --prefix=/usr \
+    --program-suffix=-2.69
+
+  make
+}
+
+check() {
+  cd ${srcdir}/build-${MSYSTEM}
+  make check
+}
+
+package() {
+  cd ${srcdir}/build-${MSYSTEM}
+  make DESTDIR=${pkgdir} install
+
+  # license exception
+  install -Dm644 ${srcdir}/${_realname}-${pkgver}/COPYING.EXCEPTION \
+    $pkgdir/usr/share/licenses/autoconf${pkgver}/COPYING.EXCEPTION
+
+  # conflicts with autoconf
+  rm -rf ${pkgdir}/usr/share/{emacs,info}
+}

autoconf2.69/autoconf-2.69-K-R-decls-clang.patch

@@ -0,0 +1,394 @@
+https://bugs.gentoo.org/870412
+https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=8b5e2016c7ed2d67f31b03a3d2e361858ff5299b
+(and contains a backport of https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=bf5a75953b6d504f0405b1ca33b039b8dd39eef4)
+
+Backport the K&R decls fix to 2.69 to avoid configure tests
+failing (often "silently", i.e. doesn't fail the build of
+the package overall, just leads to wrong results) with
+newer compilers like the upcoming Clang 16.
+
+From e6f401b94b58bb9bb58cd668a996e27663d3e6c7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
+Date: Mon, 19 Sep 2022 12:11:24 +0200
+Subject: [PATCH] backport K&R decl fixes
+
+--- a/lib/autoconf/c.m4
++++ b/lib/autoconf/c.m4
+@@ -97,7 +97,7 @@ m4_define([AC_LANG_PROGRAM(C)],
+ m4_ifdef([_AC_LANG_PROGRAM_C_F77_HOOKS], [_AC_LANG_PROGRAM_C_F77_HOOKS])[]dnl
+ m4_ifdef([_AC_LANG_PROGRAM_C_FC_HOOKS], [_AC_LANG_PROGRAM_C_FC_HOOKS])[]dnl
+ int
+-main ()
++main (void)
+ {
+ dnl Do *not* indent the following line: there may be CPP directives.
+ dnl Don't move the `;' right after for the same reason.
+@@ -130,7 +130,7 @@ m4_if([$2], [main], ,
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char $2 ();])], [return $2 ();])])
++char $2 (void);])], [return $2 ();])])
+ 
+ 
+ # AC_LANG_FUNC_LINK_TRY(C)(FUNCTION)
+@@ -154,7 +154,7 @@ m4_define([AC_LANG_FUNC_LINK_TRY(C)],
+ #define $1 innocuous_$1
+ 
+ /* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $1 (); below.
++    which can conflict with char $1 (void); below.
+     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+     <limits.h> exists even on freestanding compilers.  */
+ 
+@@ -172,7 +172,7 @@ m4_define([AC_LANG_FUNC_LINK_TRY(C)],
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char $1 ();
++char $1 (void);
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+@@ -201,8 +201,8 @@ return test_array @<:@0@:>@;
+ # But we include them only after the EXPRESSION has been evaluated.
+ m4_define([AC_LANG_INT_SAVE(C)],
+ [AC_LANG_PROGRAM([$1
+-static long int longval () { return $2; }
+-static unsigned long int ulongval () { return $2; }
++static long int longval (void) { return $2; }
++static unsigned long int ulongval (void) { return $2; }
+ @%:@include <stdio.h>
+ @%:@include <stdlib.h>],
+ [
+@@ -1625,8 +1625,8 @@ for ac_kw in inline __inline__ __inline; do
+   AC_COMPILE_IFELSE([AC_LANG_SOURCE(
+ [#ifndef __cplusplus
+ typedef int foo_t;
+-static $ac_kw foo_t static_foo () {return 0; }
+-$ac_kw foo_t foo () {return 0; }
++static $ac_kw foo_t static_foo (void) {return 0; }
++$ac_kw foo_t foo (void) {return 0; }
+ #endif
+ ])],
+ 		    [ac_cv_c_inline=$ac_kw])
+@@ -1949,7 +1949,7 @@ m4_define([_AC_LANG_OPENMP(C)],
+  choke me
+ #endif
+ #include <omp.h>
+-int main () { return omp_get_num_threads (); }
++int main (void) { return omp_get_num_threads (); }
+ ])
+ 
+ # _AC_LANG_OPENMP(C++)
+--- a/lib/autoconf/functions.m4
++++ b/lib/autoconf/functions.m4
+@@ -463,9 +463,6 @@ AC_CACHE_CHECK([whether closedir returns void],
+ 	       [ac_cv_func_closedir_void],
+ [AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT
+ #include <$ac_header_dirent>
+-#ifndef __cplusplus
+-int closedir ();
+-#endif
+ ],
+ 				[[return closedir (opendir (".")) != 0;]])],
+ 	       [ac_cv_func_closedir_void=no],
+@@ -893,7 +890,7 @@ AC_CACHE_CHECK([for GNU libc compatible malloc], ac_cv_func_malloc_0_nonnull,
+ [[#if defined STDC_HEADERS || defined HAVE_STDLIB_H
+ # include <stdlib.h>
+ #else
+-char *malloc ();
++char *malloc (long);
+ #endif
+ ]],
+ 		 [return ! malloc (0);])],
+@@ -1029,7 +1026,7 @@ static const char *tz_strings[] = {
+ /* Return 0 if mktime fails to convert a date in the spring-forward gap.
+    Based on a problem report from Andreas Jaeger.  */
+ static int
+-spring_forward_gap ()
++spring_forward_gap (void)
+ {
+   /* glibc (up to about 1998-10-07) failed this test. */
+   struct tm tm;
+@@ -1066,7 +1063,7 @@ mktime_test (time_t now)
+ }
+ 
+ static int
+-irix_6_4_bug ()
++irix_6_4_bug (void)
+ {
+   /* Based on code from Ariel Faigon.  */
+   struct tm tm;
+@@ -1108,7 +1105,7 @@ bigtime_test (int j)
+ }
+ 
+ static int
+-year_2050_test ()
++year_2050_test (void)
+ {
+   /* The correct answer for 2050-02-01 00:00:00 in Pacific time,
+      ignoring leap seconds.  */
+@@ -1138,7 +1135,7 @@ year_2050_test ()
+ }
+ 
+ int
+-main ()
++main (void)
+ {
+   time_t t, delta;
+   int i, j;
+@@ -1232,7 +1229,7 @@ AC_CACHE_CHECK([for working mmap], [ac_cv_func_mmap_fixed_mapped],
+ #include <sys/mman.h>
+ 
+ #if !defined STDC_HEADERS && !defined HAVE_STDLIB_H
+-char *malloc ();
++char *malloc (void *, long);
+ #endif
+ 
+ /* This mess was copied from the GNU getpagesize.h.  */
+@@ -1268,7 +1265,7 @@ char *malloc ();
+ #endif /* no HAVE_GETPAGESIZE */
+ 
+ int
+-main ()
++main (void)
+ {
+   char *data, *data2, *data3;
+   const char *cdata2;
+@@ -1398,7 +1395,7 @@ AC_CACHE_CHECK([for GNU libc compatible realloc], ac_cv_func_realloc_0_nonnull,
+ [[#if defined STDC_HEADERS || defined HAVE_STDLIB_H
+ # include <stdlib.h>
+ #else
+-char *realloc ();
++char *realloc (void *, long);
+ #endif
+ ]],
+ 		 [return ! realloc (0, 0);])],
+@@ -1547,11 +1544,8 @@ AC_DEFUN([AC_FUNC_STRTOD],
+ AC_CACHE_CHECK(for working strtod, ac_cv_func_strtod,
+ [AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ ]AC_INCLUDES_DEFAULT[
+-#ifndef strtod
+-double strtod ();
+-#endif
+ int
+-main()
++main(void)
+ {
+   {
+     /* Some versions of Linux strtod mis-parse strings with leading '+'.  */
+@@ -1645,8 +1639,7 @@ AC_CACHE_CHECK([whether strerror_r returns char *],
+       # former has a strerror_r that returns char*, while the latter
+       # has a strerror_r that returns `int'.
+       # This test should segfault on the DEC system.
+-      AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT
+-	extern char *strerror_r ();],
++      AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT],
+ 	[[char buf[100];
+ 	  char x = *strerror_r (0, buf, sizeof buf);
+ 	  return ! isalpha (x);]])],
+@@ -1879,7 +1872,7 @@ sparc_address_test (arg) int arg;
+ }
+ 
+ int
+-main ()
++main (void)
+ {
+   pid_t parent = getpid ();
+   pid_t child;
+@@ -1985,7 +1978,7 @@ AC_CACHE_CHECK([for wait3 that fills in rusage],
+ #include <sys/wait.h>
+ /* HP-UX has wait3 but does not fill in rusage at all.  */
+ int
+-main ()
++main (void)
+ {
+   struct rusage r;
+   int i;
+--- a/lib/autoconf/headers.m4
++++ b/lib/autoconf/headers.m4
+@@ -712,7 +712,7 @@ if test $ac_cv_header_stdc = yes; then
+ 
+ #define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+ int
+-main ()
++main (void)
+ {
+   int i;
+   for (i = 0; i < 256; i++)
+--- a/lib/autoconf/specific.m4
++++ b/lib/autoconf/specific.m4
+@@ -257,7 +257,7 @@ void ucatch (dummy) int dummy; { }
+ #endif
+ 
+ int
+-main ()
++main (void)
+ {
+   int i = fork (), status;
+ 
+--- a/lib/autoconf/types.m4
++++ b/lib/autoconf/types.m4
+@@ -267,7 +267,7 @@ AC_CACHE_CHECK(type of array argument to getgroups, ac_cv_type_getgroups,
+ #define MAX(x, y) ((x) > (y) ? (x) : (y))
+ 
+ int
+-main ()
++main (void)
+ {
+   gid_t gidset[NGID];
+   int i, n;
+--- a/tests/c.at
++++ b/tests/c.at
+@@ -354,7 +354,7 @@ AT_DATA([foo.c],
+ #endif
+ #include <stdio.h>
+ 
+-int main ()
++int main (void)
+ {
+ #ifdef _OPENMP
+ #pragma omp parallel
+@@ -404,7 +404,7 @@ foo.@OBJEXT@: foo.cpp
+ ]])
+ 
+ AT_DATA([foo.cpp],
+-[[int main ()
++[[int main (void)
+ {
+   return 0;
+ }
+--- a/tests/compile.at
++++ b/tests/compile.at
+@@ -124,7 +124,7 @@ AC_PROG_CC
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#ifndef PACKAGE_NAME
+ choke me
+ #endif
+-int main ()
++int main (void)
+ {
+   return 0;
+ }
+@@ -150,7 +150,7 @@ AC_LANG([C++])
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#ifndef PACKAGE_NAME
+ choke me
+ #endif
+-int main ()
++int main (void)
+ {
+   return 0;
+ }
+@@ -249,7 +249,7 @@ AT_CHECK([sed -n 's/ *$//; /#define PACKAGE/,$p' stdout], [],
+ 
+ const char hw[] = "Hello, World\n";
+ int
+-main ()
++main (void)
+ {
+ fputs (hw, stdout);
+   ;
+@@ -269,7 +269,7 @@ AT_KEYWORDS([AC_LANG_DEFINES_PROVIDED])
+ 
+ AT_DATA([configure.ac],
+ [[AC_INIT
+-AC_COMPILE_IFELSE([int main () { return 0; }], [],
++AC_COMPILE_IFELSE([int main (void) { return 0; }], [],
+   [AC_MSG_ERROR([compiling trivial program failed])])
+ ]])
+ 
+@@ -280,7 +280,7 @@ AT_CHECK_CONFIGURE([-q])
+ 
+ AT_DATA([configure.ac],
+ [[AC_INIT
+-AC_COMPILE_IFELSE([AC_LANG_DEFINES_PROVIDED()int main () { return 0; }], [],
++AC_COMPILE_IFELSE([AC_LANG_DEFINES_PROVIDED()int main (void) { return 0; }], [],
+   [AC_MSG_ERROR([compiling trivial program failed])])
+ ]])
+ 
+@@ -324,7 +324,7 @@ test $estatus != 2 &&
+   AC_MSG_ERROR([did not get as 2 exit status: $estatus])])
+ 
+ # The old stinky one.
+-AC_TRY_RUN([int main () { return 3; }],
++AC_TRY_RUN([int main (void) { return 3; }],
+ 	   [AC_MSG_ERROR([saw `return 3' as a success])],
+ 	   [estatus=$?
+ test $estatus != 3 &&
+--- a/tests/fortran.at
++++ b/tests/fortran.at
+@@ -223,7 +223,7 @@ void FOOBAR_F77 (double *x, double *y);
+ #  ifdef __cplusplus
+      extern "C"
+ #  endif
+-   int F77_DUMMY_MAIN () { return 1; }
++   int F77_DUMMY_MAIN (void) { return 1; }
+ #endif
+ 
+ int main(int argc, char *argv[])
+@@ -301,7 +301,7 @@ void FOOBAR_FC(double *x, double *y);
+ #  ifdef __cplusplus
+      extern "C"
+ #  endif
+-   int FC_DUMMY_MAIN () { return 1; }
++   int FC_DUMMY_MAIN (void) { return 1; }
+ #endif
+ 
+ int main (int argc, char *argv[])
+@@ -533,7 +533,7 @@ void @foobar@ (int *x);
+ #  ifdef __cplusplus
+      extern "C"
+ #  endif
+-   int F77_DUMMY_MAIN () { return 1; }
++   int F77_DUMMY_MAIN (void) { return 1; }
+ #endif
+ 
+ int main(int argc, char *argv[])
+@@ -607,7 +607,7 @@ void @foobar@ (int *x);
+ #  ifdef __cplusplus
+      extern "C"
+ #  endif
+-   int FC_DUMMY_MAIN () { return 1; }
++   int FC_DUMMY_MAIN (void) { return 1; }
+ #endif
+ 
+ int main(int argc, char *argv[])
+--- a/tests/semantics.at
++++ b/tests/semantics.at
+@@ -107,7 +107,7 @@ AT_CHECK_MACRO([AC_CHECK_DECLS],
+ 		 [[int yes = 1;
+ 		   enum { myenum };
+ 		   struct { int x[20]; } mystruct;
+-		   extern int myfunc();
++		   extern int myfunc (void);
+ 		   #define mymacro1(arg) arg
+ 		   #define mymacro2]])
+   # The difference in space-before-open-paren is intentional.
+--- a/lib/autoconf/c.m4
++++ b/lib/autoconf/c.m4
+@@ -1106,9 +1106,7 @@ struct stat;
+ /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+ struct buf { int x; };
+ FILE * (*rcsopen) (struct buf *, struct stat *, int);
+-static char *e (p, i)
+-     char **p;
+-     int i;
++static char *e (char **p, int i)
+ {
+   return p[i];
+ }
+--- a/lib/autoconf/specific.m4
++++ b/lib/autoconf/specific.m4
+@@ -251,10 +251,9 @@ AC_INCLUDES_DEFAULT
+ /* Some platforms explicitly require an extern "C" signal handler
+    when using C++. */
+ #ifdef __cplusplus
+-extern "C" void ucatch (int dummy) { }
+-#else
+-void ucatch (dummy) int dummy; { }
++extern "C"
+ #endif
++void ucatch (int dummy) { }
+ 
+ int
+ main (void)

autoconf2.69/autoconf-2.69-fix-libtool-test.patch

@@ -0,0 +1,31 @@
+From 247b02e5a5bb79ca6666e91de02ae2d3cb0cd325 Mon Sep 17 00:00:00 2001
+From: "Gary V. Vaughan" <gary@gnu.org>
+Date: Mon, 3 Nov 2014 07:25:03 +0100
+Subject: tests: avoid spurious test failure with libtool 2.4.3
+
+Based on a report by Bruce Dubbs.
+
+* tests/foreign.at (Libtool): Be tolerant of 'quote' replacing the
+older `quote'.
+
+Signed-off-by: Eric Blake <eblake@redhat.com>
+---
+ tests/foreign.at | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/foreign.at b/tests/foreign.at
+index a9dc33c..d4702cd 100644
+--- a/tests/foreign.at
++++ b/tests/foreign.at
+@@ -57,7 +57,7 @@ AT_CHECK([./config.guess || exit 77], [], [ignore], [ignore])
+ # Make sure at-path contains something valid, and let the test suite
+ # display it when verbose.  And fail, skipping would too easily hide
+ # problems.
+-AT_CHECK([sed -n ["s,^.*\`\\(/[^']*\\)'.*,\\1,p"] stdout], [0], [stdout])
++AT_CHECK([sed -n ["s,^[^']*[\`']\\(/[^']*\\)'.*,\\1,p"] stdout], [0], [stdout])
+ AT_CHECK([test -f "`sed -n 1p stdout`"])
+ 
+ # Older libtoolize installed everything but install-sh...
+-- 
+cgit v1.0-41-gc330
+

autoconf2.69/autoconf-2.69-make-tests-bash5-compatible.patch

@@ -0,0 +1,63 @@
+From 5b9db67786a428164abafe626ab11a2754aad528 Mon Sep 17 00:00:00 2001
+From: Ondrej Dubaj <odubaj@redhat.com>
+Date: Wed, 28 Aug 2019 07:39:50 +0200
+Subject: Port tests to Bash 5
+
+* tests/local.at (AT_CHECK_ENV, AT_CONFIG_CMP):
+Add BASH_ARGC, BASH_ARGV to list of variables to be ignored when
+comparing variable space dumps.
+(AT_CONFIG_CMP): Also ignore LINENO.
+* tests/m4sh.at: Also unset LINENO in 'reference' and 'test/test-1'.
+---
+ tests/local.at | 5 ++++-
+ tests/m4sh.at  | 4 ++--
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/tests/local.at b/tests/local.at
+index a22958c0..852be285 100644
+--- a/tests/local.at
++++ b/tests/local.at
+@@ -325,7 +325,7 @@ if test -f state-env.before && test -f state-env.after; then
+       [AWK|LEX|LEXLIB|LEX_OUTPUT_ROOT|LN_S|M4|MKDIR_P|RANLIB|SET_MAKE|YACC],
+       [GREP|[EF]GREP|SED],
+       [[_@]|.[*#?$].],
+-      [argv|ARGC|LINENO|OLDPWD|PIPESTATUS|RANDOM|SECONDS]))=' \
++      [argv|ARGC|LINENO|BASH_ARGC|BASH_ARGV|OLDPWD|PIPESTATUS|RANDOM|SECONDS]))=' \
+      $act_file ||
+        test $? -eq 1 || echo failed >&2
+     ) 2>stderr-$act_file |
+@@ -382,6 +382,9 @@ do
+ 	/'\'\\\$\''=/ d
+ 	/^argv=/ d
+ 	/^ARGC=/ d
++	/^BASH_ARGC=/ d
++	/^BASH_ARGV=/ d
++	/^LINENO=/ d
+ 	' $act_file >at_config_vars-$act_file
+ done
+ AT_CMP([at_config_vars-$1], [at_config_vars-$2])[]dnl
+diff --git a/tests/m4sh.at b/tests/m4sh.at
+index e9d70b02..cbdfcb62 100644
+--- a/tests/m4sh.at
++++ b/tests/m4sh.at
+@@ -254,7 +254,7 @@ AT_CHECK([autom4te -l m4sh $1.as -o $1])
+ # `_oline_', once processed and ran, produces our reference.
+ # We check that we find ourselves by looking at a string which is
+ # available only in the original script: `_oline_'.
+-AT_DATA_LINENO([reference], [false], [__OLINE__], [_oline__])
++AT_DATA_LINENO([reference], [true], [__OLINE__], [_oline__])
+ AT_CHECK([./reference], 0, [stdout])
+ 
+ # The reference:
+@@ -264,7 +264,7 @@ mv stdout expout
+ # Be sure to be out of the PATH.
+ AT_CHECK([mkdir test || exit 77])
+ 
+-AT_DATA_LINENO([test/test-1], [false], [__LINENO__], [LINENO])
++AT_DATA_LINENO([test/test-1], [true], [__LINENO__], [LINENO])
+ AT_CHECK([./test/test-1],                          0, [expout])
+ AT_CHECK([(PATH=test$PATH_SEPARATOR$PATH; export PATH; exec test-1)],
+ 						   0, [expout])
+-- 
+cgit v1.2.1
+

autoconf2.69/autoconf-2.69-perl-5.26-2.patch

@@ -0,0 +1,30 @@
+https://bugs.gentoo.org/625576
+
+--- autoconf-2.69/bin/autoheader.in
++++ autoconf-2.69/bin/autoheader.in
+@@ -173,6 +173,12 @@
+ # Source what the traces are trying to tell us.
+ verb "$me: running $autoconf to trace from $ARGV[0]";
+ my $quoted_tmp = shell_quote ($tmp);
++my $perl_tmp;
++if ( $tmp =~ /^\// ) {
++  $perl_tmp=$tmp;
++} else {
++  $perl_tmp="./".$tmp;
++}
+ xsystem ("$autoconf"
+ 	 # If you change this list, update the
+ 	 # `Autoheader-preselections' section of autom4te.in.
+@@ -182,9 +188,9 @@
+ 	 . " " . shell_quote ($ARGV[0]) . " >$quoted_tmp/traces.pl");
+ 
+ local (%verbatim, %symbol);
+-debug "$me: \`do'ing $tmp/traces.pl:\n" . `sed 's/^/| /' $quoted_tmp/traces.pl`;
+-do "$tmp/traces.pl";
+-warn "couldn't parse $tmp/traces.pl: $@" if $@;
++debug "$me: \`do'ing $perl_tmp/traces.pl:\n" . `sed 's/^/| /' $quoted_tmp/traces.pl`;
++do "$perl_tmp/traces.pl";
++warn "couldn't parse $perl_tmp/traces.pl: $@" if $@;
+ unless ($config_h)
+   {
+     error "error: AC_CONFIG_HEADERS not found in $ARGV[0]";

autoconf2.69/autoconf-2.69-perl-5.26.patch

@@ -0,0 +1,28 @@
+From e5654a5591884b92633c7785f325626711e7f7aa Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Tue, 29 Jan 2013 13:46:48 -0800
+Subject: [PATCH] autoscan: port to perl 5.17
+
+* bin/autoscan.in (scan_sh_file): Escape '{'.  This avoids a
+feature that is deprecated in Perl 5.17.  Reported by Ray Lauff in
+<http://lists.gnu.org/archive/html/bug-autoconf/2013-01/msg00059.html>.
+---
+ bin/autoscan.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bin/autoscan.in b/bin/autoscan.in
+index 993a750..db1df79 100644
+--- a/bin/autoscan.in
++++ b/bin/autoscan.in
+@@ -358,7 +358,7 @@ sub scan_sh_file ($)
+     {
+       # Strip out comments and variable references.
+       s/#.*//;
+-      s/\${[^\}]*}//g;
++      s/\$\{[^\}]*}//g;
+       s/@[^@]*@//g;
+ 
+       # Tokens in the code.
+-- 
+1.9.1
+

autoconf2.71/0004-LLVM-Flang.patch

@@ -0,0 +1,60 @@
+Treat LLVM Flang as GNU-compatible compiler for GNU targets.
+
+--- autoconf-2.71/lib/autoconf/fortran.m4.orig	2021-01-28 21:46:48.000000000 +0100
++++ autoconf-2.71/lib/autoconf/fortran.m4	2024-10-30 13:24:17.360461800 +0100
+@@ -286,6 +286,46 @@
+ 	 [m4_fatal([unknown Fortran dialect])])])
+ 
+ 
++# _AC_FC_COMPILER_GNU
++# ---------------------
++# Check whether the compiler for the current language is GNU.
++#
++# This is similar to _AC_LANG_COMPILER_GNU.  But also considers LLVM Flang
++# a GNU-compatible compiler.  Pay attention to the fact that the position
++# of 'choke me' on the seventh column is intentional: otherwise
++# some Fortran compilers (e.g., SGI) might consider it's a
++# continuation line, and warn instead of reporting an error.
++m4_define([_AC_FC_COMPILER_GNU],
++[AC_CACHE_CHECK([whether the compiler supports GNU _AC_LANG],
++		[ac_cv_[]_AC_LANG_ABBREV[]_compiler_gnu],
++		[_AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[#ifndef __GNUC__
++       choke me
++#endif
++]])],
++		  [ac_compiler_gnu=yes],
++		  [_AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[#ifndef __flang__
++       choke me
++#endif
++]])],
++		    [case `$[]_AC_FC[] $[]_AC_LANG_PREFIX[]FLAGS --print-target-triple < /dev/null 2>&1` in
++		      *mingw*|*-gnu)
++		        ac_compiler_gnu=yes
++		        ;;
++		      *-msvc)
++		        ac_compiler_gnu=no
++		        ;;
++		      *)
++		        ## assume Flang is GNU-compatible by default
++		        ac_compiler_gnu=yes
++		        ;;
++		    esac],
++		    [ac_compiler_gnu=no])])
++ac_cv_[]_AC_LANG_ABBREV[]_compiler_gnu=$ac_compiler_gnu
++])
++ac_compiler_gnu=$ac_cv_[]_AC_LANG_ABBREV[]_compiler_gnu
++])# _AC_FC_COMPILER_GNU
++
++
+ # _AC_PROG_FC([DIALECT], [COMPILERS...])
+ # --------------------------------------
+ # DIALECT is a Fortran dialect, given by Fortran [YY]YY or simply [YY]YY,
+@@ -346,7 +386,7 @@
+ # input file.  (Note that this only needs to work for GNU compilers.)
+ ac_save_ext=$ac_ext
+ ac_ext=F
+-_AC_LANG_COMPILER_GNU
++_AC_FC_COMPILER_GNU
+ ac_ext=$ac_save_ext
+ _AC_PROG_FC_G
+ ])# _AC_PROG_FC

autoconf2.71/0005-package.patch

@@ -0,0 +1,11 @@
+--- autoconf-2.71/configure.orig	2021-12-27 17:08:45.948999800 +0100
++++ autoconf-2.71/configure	2021-12-27 17:08:51.894818700 +0100
+@@ -2214,7 +2214,7 @@
+ 
+ 
+ # Define the identity of the package.
+- PACKAGE='autoconf'
++ PACKAGE='autoconf-2.71'
+  VERSION='2.71'
+ 
+ 

autoconf2.71/PKGBUILD

@@ -0,0 +1,94 @@
+# Maintainer: Alexey Pavlov <alexpux@gmail.com>
+# Contributor: Ray Donnelly <mingw.android@gmail.com>
+
+_realname=autoconf
+pkgname=${_realname}2.71
+pkgver=2.71
+pkgrel=4
+pkgdesc="A GNU tool for automatically configuring source code"
+arch=('any')
+license=('spdx:GPL-2.0-or-later' 'spdx:GPL-3.0-or-later' 'spdx:Autoconf-exception-3.0')
+url="https://www.gnu.org/software/autoconf"
+depends=('awk' 'm4' 'diffutils' 'bash' 'perl' 'sed')
+makedepends=('make')
+source=(https://ftp.gnu.org/pub/gnu/${_realname}/${_realname}-${pkgver}.tar.xz
+        0001-autoconf-2.70-MSYS2-specifics-AC_CYGWIN.patch
+        0002-autoconf-2.70-MSYS2-Autotest-Unify-EOLs-By-Default.patch
+        0003-autoconf-2.70-MSYS2-specifics-config.guess.patch
+        0004-LLVM-Flang.patch
+        0005-package.patch
+        autoconf-2.71-AC_C_BIGENDIAN-lto.patch
+        autoconf-2.71-AC_LANG_CALL_C_cxx.patch
+        autoconf-2.71-K-R-decls-clang-deux.patch
+        autoconf-2.71-K-R-decls-clang.patch
+        autoconf-2.71-make-4.4.patch)
+sha256sums=('f14c83cfebcc9427f2c3cea7258bd90df972d92eb26752da4ddad81c87a0faa4'
+            '3a5337e2269407405ee4c7feb12dbe2ae711610c3144c07cd085272676005db6'
+            'c4e4952cc63a2ddaf7bf539f6e59353c4fadbf04cd48c3cfa789f8b175d0bd27'
+            'a7671bef559a5f3edbd811a7cf9b557f216f1d3e9502dc046fd3a0ea665da7da'
+            'b055f013c85720dabe21947d2dbb67d0a282383d44b39d1a78ba05949834e649'
+            '01894e38f901629373ff8ca6c55571b14450eacc625e717cd0da0ca65860f5e5'
+            '1499271fa3004079bc2ce9db2697a7f4bd29666b2dfd7e1c39ad8fa397a4c08e'
+            'befc2e2ae932e2247eee7fdd17d17e6b3065a741a47e0154670a009907d0860b'
+            'c0e2215f983763587521c3925e6ebb73c6e2e8cd9ac1e5d649720252a26cca78'
+            '65f2b02e96db437fc8fa974ba4b9db76eb9d053ceebcaf309c19f87eae3f8158'
+            '402350041cbfb092321a5998f6abec6b0c59d3d03ae63735120e96a5a4a09d47')
+
+apply_patch_with_msg() {
+  for _patch in "$@"
+  do
+    msg2 "Applying $_patch"
+    patch -Np1 -i "${srcdir}/$_patch"
+  done
+}
+
+prepare() {
+  cd ${srcdir}/${_realname}-${pkgver}
+
+  # MSYS2
+  apply_patch_with_msg \
+    0001-autoconf-2.70-MSYS2-specifics-AC_CYGWIN.patch \
+    0002-autoconf-2.70-MSYS2-Autotest-Unify-EOLs-By-Default.patch \
+    0003-autoconf-2.70-MSYS2-specifics-config.guess.patch \
+    0004-LLVM-Flang.patch \
+    0005-package.patch
+
+  # from gentoo: https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-devel/autoconf/files
+  apply_patch_with_msg \
+    autoconf-2.71-AC_LANG_CALL_C_cxx.patch \
+    autoconf-2.71-AC_C_BIGENDIAN-lto.patch \
+    autoconf-2.71-K-R-decls-clang.patch \
+    autoconf-2.71-make-4.4.patch \
+    autoconf-2.71-K-R-decls-clang-deux.patch
+}
+
+build() {
+  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
+
+  ../${_realname}-${pkgver}/configure \
+    --prefix=/usr \
+    --program-suffix=-2.71
+
+  make
+}
+
+check() {
+  cd build-${MSYSTEM}
+  # CAUTION: The tests run very very long, even on a server.
+  make check TESTSUITEFLAGS='-j16'
+}
+
+package() {
+  make -C build-${MSYSTEM} DESTDIR=${pkgdir} install
+
+  # license exception
+  install -Dm644 ${_realname}-${pkgver}/COPYING.EXCEPTION \
+    $pkgdir/usr/share/licenses/autoconf${pkgver}/COPYING.EXCEPTION
+
+  find ${pkgdir}/usr/share
+
+  # conflict with bintuils
+  rm -f ${pkgdir}/usr/share/info/standards.info
+  # conflicts with autoconf
+  rm -rf ${pkgdir}/usr/share/{emacs,info}
+}

autoconf2.71/autoconf-2.71-AC_C_BIGENDIAN-lto.patch

@@ -0,0 +1,50 @@
+https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=234fc6c86613ed3f366dd1d88996e4d5d85ee222
+
+From 234fc6c86613ed3f366dd1d88996e4d5d85ee222 Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Wed, 27 Jul 2022 08:53:35 -0700
+Subject: Port AC_C_BIGENDIAN to cross gcc -std=c11 -flto
+
+* lib/autoconf/c.m4 (AC_C_BIGENDIAN): Improve the
+inherently-unportable grep trick well enough to survive gcc
+-std=c11 -flto when cross-compiling (sr#110687).
+--- a/lib/autoconf/c.m4
++++ b/lib/autoconf/c.m4
+@@ -1838,8 +1838,8 @@ AC_DEFUN([AC_C_BIGENDIAN],
+ 	[ac_cv_c_bigendian=no],
+ 	[ac_cv_c_bigendian=yes],
+ 	[# Try to guess by grepping values from an object file.
+-	 AC_COMPILE_IFELSE(
+-	   [AC_LANG_PROGRAM(
++	 AC_LINK_IFELSE(
++	   [AC_LANG_SOURCE(
+ 	      [[unsigned short int ascii_mm[] =
+ 		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+ 		unsigned short int ascii_ii[] =
+@@ -1854,13 +1854,20 @@ AC_DEFUN([AC_C_BIGENDIAN],
+ 		int use_ebcdic (int i) {
+ 		  return ebcdic_mm[i] + ebcdic_ii[i];
+ 		}
+-		extern int foo;
+-	      ]],
+-	      [[return use_ascii (foo) == use_ebcdic (foo);]])],
+-	   [if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
++		int
++		main (int argc, char **argv)
++		{
++		  /* Intimidate the compiler so that it does not
++		     optimize the arrays away.  */
++		  char *p = argv[0];
++		  ascii_mm[1] = *p++; ebcdic_mm[1] = *p++;
++		  ascii_ii[1] = *p++; ebcdic_ii[1] = *p++;
++		  return use_ascii (argc) == use_ebcdic (*p);
++		}]])],
++	   [if grep BIGenDianSyS conftest$ac_exeext >/dev/null; then
+ 	      ac_cv_c_bigendian=yes
+ 	    fi
+-	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
++	    if grep LiTTleEnDian conftest$ac_exeext >/dev/null ; then
+ 	      if test "$ac_cv_c_bigendian" = unknown; then
+ 		ac_cv_c_bigendian=no
+ 	      else
+cgit v1.1

autoconf2.71/autoconf-2.71-AC_LANG_CALL_C_cxx.patch

@@ -0,0 +1,35 @@
+https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=b27bc3e230bb12fdd9a813e38e82bc4c3e22b4cc
+
+Note: we drop the comma from the comment because some packages
+have bad quoting, and while that will need to be sorted when/if
+autoconf 2.72 is released, we've got our hands full with the
+Clang situation right now (bug #871753).
+
+From b27bc3e230bb12fdd9a813e38e82bc4c3e22b4cc Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Tue, 31 Aug 2021 16:30:46 -0700
+Subject: Port AC_LANG_CALL(C) to C++
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* lib/autoconf/c.m4 (AC_LANG_CALL(C)): Add an extern "C" if C++.
+Problem reported by Vincent Lefèvre (sr #110532).
+--- a/lib/autoconf/c.m4
++++ b/lib/autoconf/c.m4
+@@ -126,7 +126,13 @@ m4_define([AC_LANG_CALL(C)],
+ m4_if([$2], [main], ,
+ [/* Override any GCC internal prototype to avoid an error.
+    Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
++   builtin and then its argument prototype would still apply.
++   The 'extern "C"' is for builds by C++ compilers;
++   although this is not generally supported in C code supporting it here
++   has little cost and some practical benefit (sr 110532).  */
++#ifdef __cplusplus
++extern "C"
++#endif
+ char $2 ();])], [return $2 ();])])
+ 
+ 
+cgit v1.1

autoconf2.71/autoconf-2.71-K-R-decls-clang-deux.patch

@@ -0,0 +1,94 @@
+https://bugs.gentoo.org/870412
+https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=bf5a75953b6d504f0405b1ca33b039b8dd39eef4
+
+Backport the K&R decls fix to 2.71 to avoid configure tests
+failing (often "silently", i.e. doesn't fail the build of
+the package overall, just leads to wrong results) with
+newer compilers like the upcoming Clang 16.
+
+From bf5a75953b6d504f0405b1ca33b039b8dd39eef4 Mon Sep 17 00:00:00 2001
+From: Zack Weinberg <zackw@panix.com>
+Date: Thu, 10 Nov 2022 12:05:30 -0500
+Subject: More fixes for compilers that reject K&R function definitions.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This fixes all of the remaining failures exposed by running the
+testsuite with GCC 12 and
+CC='cc -Wimplicit-function-declaration -Wold-style-definition
+       -Wimplicit-int -Werror'
+.
+
+* lib/autoconf/c.m4 (_AC_C_C89_TEST_GLOBALS): Don’t use K&R function
+  definitions.
+* lib/autoconf/specific.m4 (AC_SYS_RESTARTABLE_SYSCALLS): Likewise.
+  (AC_FUNC_MKTIME): Declare functions taking no arguments as ‘fn (void)’
+  not ‘fn ()’.
+* lib/autoconf/c.m4 (_AC_C_C99_TEST_GLOBALS): Declare free().
+--- a/lib/autoconf/c.m4
++++ b/lib/autoconf/c.m4
+@@ -1153,9 +1153,7 @@ struct stat;
+ /* Most of the following tests are stolen from RCS 5.7 src/conf.sh.  */
+ struct buf { int x; };
+ struct buf * (*rcsopen) (struct buf *, struct stat *, int);
+-static char *e (p, i)
+-     char **p;
+-     int i;
++static char *e (char **p, int i)
+ {
+   return p[i];
+ }
+@@ -1212,6 +1210,7 @@ extern int puts (const char *);
+ extern int printf (const char *, ...);
+ extern int dprintf (int, const char *, ...);
+ extern void *malloc (size_t);
++extern void free (void *);
+ 
+ // Check varargs macros.  These examples are taken from C99 6.10.3.5.
+ // dprintf is used instead of fprintf to avoid needing to declare
+--- a/lib/autoconf/functions.m4
++++ b/lib/autoconf/functions.m4
+@@ -1091,7 +1091,7 @@ static const char *tz_strings[] = {
+ /* Return 0 if mktime fails to convert a date in the spring-forward gap.
+    Based on a problem report from Andreas Jaeger.  */
+ static int
+-spring_forward_gap ()
++spring_forward_gap (void)
+ {
+   /* glibc (up to about 1998-10-07) failed this test. */
+   struct tm tm;
+@@ -1128,7 +1128,7 @@ mktime_test (time_t now)
+ }
+ 
+ static int
+-irix_6_4_bug ()
++irix_6_4_bug (void)
+ {
+   /* Based on code from Ariel Faigon.  */
+   struct tm tm;
+@@ -1170,7 +1170,7 @@ bigtime_test (int j)
+ }
+ 
+ static int
+-year_2050_test ()
++year_2050_test (void)
+ {
+   /* The correct answer for 2050-02-01 00:00:00 in Pacific time,
+      ignoring leap seconds.  */
+--- a/lib/autoconf/specific.m4
++++ b/lib/autoconf/specific.m4
+@@ -361,10 +361,9 @@ AC_INCLUDES_DEFAULT
+ /* Some platforms explicitly require an extern "C" signal handler
+    when using C++. */
+ #ifdef __cplusplus
+-extern "C" void ucatch (int dummy) { }
+-#else
+-void ucatch (dummy) int dummy; { }
++extern "C"
+ #endif
++void ucatch (int dummy) { }
+ 
+ int
+ main (void)
+cgit v1.1

autoconf2.71/autoconf-2.71-K-R-decls-clang.patch

@@ -0,0 +1,114 @@
+https://bugs.gentoo.org/870412
+https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=8b5e2016c7ed2d67f31b03a3d2e361858ff5299b
+
+Backport the K&R decls fix to 2.71 to avoid configure tests
+failing (often "silently", i.e. doesn't fail the build of
+the package overall, just leads to wrong results) with
+newer compilers like the upcoming Clang 16.
+
+From 8b5e2016c7ed2d67f31b03a3d2e361858ff5299b Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Thu, 1 Sep 2022 16:19:50 -0500
+Subject: Port to compilers that moan about K&R func decls
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* lib/autoconf/c.m4 (AC_LANG_CALL, AC_LANG_FUNC_LINK_TRY):
+Use '(void)' rather than '()' in function prototypes, as the latter
+provokes fatal errors in some compilers nowadays.
+* lib/autoconf/functions.m4 (AC_FUNC_STRTOD):
+* tests/fortran.at (AC_F77_DUMMY_MAIN usage):
+* tests/semantics.at (AC_CHECK_DECLS):
+Don’t use () in a function decl.
+--- a/lib/autoconf/c.m4
++++ b/lib/autoconf/c.m4
+@@ -133,7 +133,7 @@ m4_if([$2], [main], ,
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char $2 ();])], [return $2 ();])])
++char $2 (void);])], [return $2 ();])])
+ 
+ 
+ # AC_LANG_FUNC_LINK_TRY(C)(FUNCTION)
+@@ -157,7 +157,7 @@ m4_define([AC_LANG_FUNC_LINK_TRY(C)],
+ #define $1 innocuous_$1
+ 
+ /* System header to define __stub macros and hopefully few prototypes,
+-   which can conflict with char $1 (); below.  */
++   which can conflict with char $1 (void); below.  */
+ 
+ #include <limits.h>
+ #undef $1
+@@ -168,7 +168,7 @@ m4_define([AC_LANG_FUNC_LINK_TRY(C)],
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char $1 ();
++char $1 (void);
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+--- a/lib/autoconf/functions.m4
++++ b/lib/autoconf/functions.m4
+@@ -1613,9 +1613,6 @@ AC_DEFUN([AC_FUNC_STRTOD],
+ AC_CACHE_CHECK(for working strtod, ac_cv_func_strtod,
+ [AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ ]AC_INCLUDES_DEFAULT[
+-#ifndef strtod
+-double strtod ();
+-#endif
+ int
+ main (void)
+ {
+--- a/tests/fortran.at
++++ b/tests/fortran.at
+@@ -233,7 +233,7 @@ void FOOBAR_F77 (double *x, double *y);
+ #  ifdef __cplusplus
+      extern "C"
+ #  endif
+-   int F77_DUMMY_MAIN () { return 1; }
++   int F77_DUMMY_MAIN (void) { return 1; }
+ #endif
+ 
+ int main(int argc, char *argv[])
+@@ -315,7 +315,7 @@ void FOOBAR_FC(double *x, double *y);
+ #  ifdef __cplusplus
+      extern "C"
+ #  endif
+-   int FC_DUMMY_MAIN () { return 1; }
++   int FC_DUMMY_MAIN (void) { return 1; }
+ #endif
+ 
+ int main (int argc, char *argv[])
+@@ -561,7 +561,7 @@ void @foobar@ (int *x);
+ #  ifdef __cplusplus
+      extern "C"
+ #  endif
+-   int F77_DUMMY_MAIN () { return 1; }
++   int F77_DUMMY_MAIN (void) { return 1; }
+ #endif
+ 
+ int main(int argc, char *argv[])
+@@ -637,7 +637,7 @@ void @foobar@ (int *x);
+ #  ifdef __cplusplus
+      extern "C"
+ #  endif
+-   int FC_DUMMY_MAIN () { return 1; }
++   int FC_DUMMY_MAIN (void) { return 1; }
+ #endif
+ 
+ int main(int argc, char *argv[])
+--- a/tests/semantics.at
++++ b/tests/semantics.at
+@@ -207,7 +207,7 @@ AT_CHECK_MACRO([AC_CHECK_DECLS],
+ 		 [[extern int yes;
+ 		   enum { myenum };
+ 		   extern struct mystruct_s { int x[20]; } mystruct;
+-		   extern int myfunc();
++		   extern int myfunc (int);
+ 		   #define mymacro1(arg) arg
+ 		   #define mymacro2]])
+   # Ensure we can detect missing declarations of functions whose
+cgit v1.1

autoconf2.71/autoconf-2.71-make-4.4.patch

@@ -0,0 +1,25 @@
+https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=31f673434ee402258b45e958c88acc8725d82b1a
+https://savannah.gnu.org/bugs/?63040
+https://bugs.gentoo.org/869257
+
+From 31f673434ee402258b45e958c88acc8725d82b1a Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Fri, 9 Sep 2022 16:54:11 -0500
+Subject: Port to GNU make 4.4
+
+* cfg.mk (PATH): Assign eagerly, and simplify shell use, avoiding
+use of the shell entirely if PWD is set, as it should be.
+Problem reported by Sergei Trofimovich in:
+https://lists.gnu.org/r/autoconf-patches/2022-09/msg00007.html
+--- a/cfg.mk
++++ b/cfg.mk
+@@ -18,7 +18,7 @@
+ # This file is '-include'd into GNUmakefile.
+ 
+ # Build with our own versions of these tools, when possible.
+-export PATH = $(shell echo "`pwd`/tests:$$PATH")
++export PATH := $(or $(PWD),$(shell pwd))/tests:$(PATH)
+ 
+ # Remove the autoreconf-provided INSTALL, so that we regenerate it.
+ _autoreconf = autoreconf -i -v && rm -f INSTALL
+cgit v1.1

autoconf2.72/0001-autoconf-2.70-MSYS2-specifics-AC_CYGWIN.patch

@@ -0,0 +1,30 @@
+From 81a57fbd4c10db5f35a1ad233abd27a71f4009cf Mon Sep 17 00:00:00 2001
+From: Jannick <thirdedition@gmx.net>
+Date: Wed, 9 Dec 2020 00:36:38 +0100
+Subject: [PATCH 1/3] autoconf-2.70-msys-specifics-AC_CYGWIN
+
+---
+ lib/autoconf/specific.m4 | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4
+index 275938c..3ffb417 100644
+--- a/lib/autoconf/specific.m4
++++ b/lib/autoconf/specific.m4
+@@ -319,11 +319,11 @@ AU_DEFUN([AC_GNU_SOURCE], [AC_USE_SYSTEM_EXTENSIONS])
+ AU_DEFUN([AC_CYGWIN],
+ [AC_CANONICAL_HOST
+ case $host_os in
+-  *cygwin* ) CYGWIN=yes;;
++  *cygwin* | *msys* ) CYGWIN=yes;;
+ 	 * ) CYGWIN=no;;
+ esac
+ ], [$0 is obsolete: use AC_CANONICAL_HOST and check if $host_os
+-matches *cygwin*])# AC_CYGWIN
++matches *cygwin* or *msys*])# AC_CYGWIN
+ 
+ 
+ # AC_EMXOS2
+-- 
+2.29.2.windows.2
+

autoconf2.72/0002-autoconf-2.70-MSYS2-Autotest-Unify-EOLs-By-Default.patch

@@ -0,0 +1,89 @@
+From f4c17d4c349fab3a74c261c342494af7f077bf1b Mon Sep 17 00:00:00 2001
+From: Jannick <thirdedition@gmx.net>
+Date: Wed, 9 Dec 2020 00:43:24 +0100
+Subject: [PATCH 2/3] autoconf-2.70-MSYS2-Autotest-Unify-EOLs-By-Default
+
+This commit tackles the end-of-line (EOL) issue on Windows when running
+an AUTOTEST testsuite which might compare files and/or program outputs.
+
+This commit sets the default behaviour of any AUTOTEST testsuite generated
+with AUTOCONF 2.70: When running an AUTOTEST test suite and comparing files
+or program outputs, EOL differences (like LF vs CRLF) are ignored **BY
+DEFAULT**, iff the program DIFF allows the flag '--strip-trailing-cr'.
+
+In order to switch off this feature and run the testsuite mocking
+differences between different EOL patterns, run the testsuite with the
+environment variable 'MSYS2_AUTOTEST_NO_UNIFY_EOL' set to '1', e.g.:
+
+       tests/testsuite -C tests MSYS2_AUTOTEST_NO_UNIFY_EOL=1
+
+* lib/autotest/general.m4:
+  - add the diff flag '--strip-trailing-cr' when possible and not
+    prohibited every time the testsuite is run.
+* tests/autotest.at:
+  - add a test checking the interplay of 'MSYS2_AUTOTEST_NO_UNIFY_EOL'
+    and the difference between files with CRLF and LF.
+---
+ lib/autotest/general.m4 | 23 +++++++++++++++++++++++
+ tests/autotest.at       | 14 ++++++++++++++
+ 2 files changed, 37 insertions(+)
+
+diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
+index 0c0e3c5..12fb14a 100644
+--- a/lib/autotest/general.m4
++++ b/lib/autotest/general.m4
+@@ -1018,6 +1018,29 @@ else
+   at_diff=diff
+ fi
+ 
++### ------------------------------------------------- ###
++###  MSYS2 patch for Windows specificity (EOL issue)  ###
++### ------------------------------------------------- ###
++# By default try to treat any end of line identfier 'LF' and 'CRLF' the same
++# in testsuites when comparing files or output of programs.
++# This feature can be switched off if the testsuite script is run with the
++# environment variable 'MSYS2_AUTOTEST_NO_UNIFY_EOL' set to a non-empty string
++# other than '0', e.g. simply by setting 'MSYS2_AUTOTEST_NO_UNIFY_EOL=1'.
++# Sample calls:
++# - tests/testsuite -C tests                                ... Differences in EOLs are ignored
++#                                                                 for file comparisons.
++# - tests/testsuite -C tests MSYS2_AUTOTEST_NO_UNIFY_EOL=1  ... EOLs do matter for file comparisons.
++case "x$MSYS2_AUTOTEST_NO_UNIFY_EOL" in
++  x|x0)
++    # Use the diff flag '--strip-trailing-cr' when possible.
++    if at_ret=`$at_diff --strip-trailing-cr "$at_devnull" "$at_devnull" 2>&1` && test -z "$at_ret"
++    then
++      at_diff="$at_diff --strip-trailing-cr"
++    fi
++    at_ret='';;
++esac
++
++
+ # Get the last needed group.
+ for at_group in : $at_groups; do :; done
+ 
+diff --git a/tests/autotest.at b/tests/autotest.at
+index b5a9c40..3637fc5 100644
+--- a/tests/autotest.at
++++ b/tests/autotest.at
+@@ -2142,3 +2142,17 @@ else
+ fi
+ 
+ AT_CLEANUP
++
++## -------------------------------------------- ##
++## MSYS patched feature: unify EOLs on Windows  ##
++## -------------------------------------------- ##
++
++AT_SETUP([MSYS2: Unfiy EOLs])
++AT_KEYWORDS([msys2 windows unify.eol])
++printf "a\n" > a.LF
++printf "a\r\n" > a.CRLF
++AS_ECHO(["MSYS2_AUTOTEST_NO_UNIFY_EOL='$MSYS2_AUTOTEST_NO_UNIFY_EOL'"])
++AS_CASE(["x$MSYS2_AUTOTEST_NO_UNIFY_EOL"],
++  [x|x0],[at_ret_diff=0],[at_ret_diff=1])
++AT_CHECK([$at_diff a.LF a.CRLF],[$at_ret_diff],[stdout],[stderr])
++AT_CLEANUP
+-- 
+2.29.2.windows.2
+

autoconf2.72/0003-autoconf-2.70-MSYS2-specifics-config.guess.patch

@@ -0,0 +1,12 @@
+--- autoconf-2.72/build-aux/config.guess.orig	2023-12-23 09:15:46.672145000 +0100
++++ autoconf-2.72/build-aux/config.guess	2023-12-23 09:16:58.657560200 +0100
+@@ -954,6 +954,9 @@
+     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+ 	GUESS=x86_64-pc-cygwin
+ 	;;
++    amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
++	GUESS=x86_64-unknown-msys
++	;;
+     prep*:SunOS:5.*:*)
+ 	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
+ 	GUESS=powerpcle-unknown-solaris2$SUN_REL

autoconf2.72/0004-LLVM-Flang.patch

@@ -0,0 +1,60 @@
+Treat LLVM Flang as GNU-compatible compiler for GNU targets.
+
+--- autoconf-2.71/lib/autoconf/fortran.m4.orig	2021-01-28 21:46:48.000000000 +0100
++++ autoconf-2.71/lib/autoconf/fortran.m4	2024-10-30 13:24:17.360461800 +0100
+@@ -286,6 +286,46 @@
+ 	 [m4_fatal([unknown Fortran dialect])])])
+ 
+ 
++# _AC_FC_COMPILER_GNU
++# ---------------------
++# Check whether the compiler for the current language is GNU.
++#
++# This is similar to _AC_LANG_COMPILER_GNU.  But also considers LLVM Flang
++# a GNU-compatible compiler.  Pay attention to the fact that the position
++# of 'choke me' on the seventh column is intentional: otherwise
++# some Fortran compilers (e.g., SGI) might consider it's a
++# continuation line, and warn instead of reporting an error.
++m4_define([_AC_FC_COMPILER_GNU],
++[AC_CACHE_CHECK([whether the compiler supports GNU _AC_LANG],
++		[ac_cv_[]_AC_LANG_ABBREV[]_compiler_gnu],
++		[_AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[#ifndef __GNUC__
++       choke me
++#endif
++]])],
++		  [ac_compiler_gnu=yes],
++		  [_AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[#ifndef __flang__
++       choke me
++#endif
++]])],
++		    [case `$[]_AC_FC[] $[]_AC_LANG_PREFIX[]FLAGS --print-target-triple < /dev/null 2>&1` in
++		      *mingw*|*-gnu)
++		        ac_compiler_gnu=yes
++		        ;;
++		      *-msvc)
++		        ac_compiler_gnu=no
++		        ;;
++		      *)
++		        ## assume Flang is GNU-compatible by default
++		        ac_compiler_gnu=yes
++		        ;;
++		    esac],
++		    [ac_compiler_gnu=no])])
++ac_cv_[]_AC_LANG_ABBREV[]_compiler_gnu=$ac_compiler_gnu
++])
++ac_compiler_gnu=$ac_cv_[]_AC_LANG_ABBREV[]_compiler_gnu
++])# _AC_FC_COMPILER_GNU
++
++
+ # _AC_PROG_FC([DIALECT], [COMPILERS...])
+ # --------------------------------------
+ # DIALECT is a Fortran dialect, given by Fortran [YY]YY or simply [YY]YY,
+@@ -346,7 +386,7 @@
+ # input file.  (Note that this only needs to work for GNU compilers.)
+ ac_save_ext=$ac_ext
+ ac_ext=F
+-_AC_LANG_COMPILER_GNU
++_AC_FC_COMPILER_GNU
+ ac_ext=$ac_save_ext
+ _AC_PROG_FC_G
+ ])# _AC_PROG_FC

autoconf2.72/0005-package.patch

@@ -0,0 +1,11 @@
+--- autoconf-2.72/configure.orig	2021-12-27 17:08:45.948999800 +0100
++++ autoconf-2.72/configure	2021-12-27 17:08:51.894818700 +0100
+@@ -2214,7 +2214,7 @@
+ 
+ 
+ # Define the identity of the package.
+- PACKAGE='autoconf'
++ PACKAGE='autoconf-2.72'
+  VERSION='2.72'
+ 
+ 

autoconf2.72/0006-fortran-mingw-libs.patch

@@ -0,0 +1,14 @@
+Do not strip mingw libraries from list of Fortran standard linker flags.
+
+diff -urN autoconf-2.72/lib/autoconf/fortran.m4.orig autoconf-2.72/lib/autoconf/fortran.m4
+--- autoconf-2.72/lib/autoconf/fortran.m4.orig	2024-10-30 13:31:24.456674400 +0100
++++ autoconf-2.72/lib/autoconf/fortran.m4	2024-12-11 16:08:46.415095400 +0100
+@@ -705,7 +705,7 @@
+ 	-lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -little \
+ 	  |-LANG:=* | -LIST:* | -LNO:* | -link)
+ 	  ;;
+-	-lkernel32 | -lmingw* | -lmoldname)
++	-lkernel32)
+ 	  # Ignore this library only on Windows-like systems.
+ 	  case $host_os in
+ 	  cygwin* | msys* | mingw* | windows*) ;;

autoconf2.72/PKGBUILD

@@ -0,0 +1,79 @@
+# Maintainer: Christoph Reiter <reiter.christoph@gmail.com>
+
+_realname=autoconf
+pkgname=${_realname}2.72
+pkgver=2.72
+pkgrel=3
+pkgdesc="A GNU tool for automatically configuring source code"
+arch=('any')
+license=('spdx:GPL-2.0-or-later' 'spdx:GPL-3.0-or-later' 'spdx:Autoconf-exception-3.0')
+url="https://www.gnu.org/software/autoconf"
+depends=('awk' 'm4' 'diffutils' 'bash' 'perl' 'sed')
+makedepends=('make')
+source=(https://ftp.gnu.org/pub/gnu/${_realname}/${_realname}-${pkgver}.tar.xz
+        0001-autoconf-2.70-MSYS2-specifics-AC_CYGWIN.patch
+        0002-autoconf-2.70-MSYS2-Autotest-Unify-EOLs-By-Default.patch
+        0003-autoconf-2.70-MSYS2-specifics-config.guess.patch
+        0004-LLVM-Flang.patch
+        0005-package.patch
+        0006-fortran-mingw-libs.patch)
+sha256sums=('ba885c1319578d6c94d46e9b0dceb4014caafe2490e437a0dbca3f270a223f5a'
+            '3a5337e2269407405ee4c7feb12dbe2ae711610c3144c07cd085272676005db6'
+            'c4e4952cc63a2ddaf7bf539f6e59353c4fadbf04cd48c3cfa789f8b175d0bd27'
+            'e3819dac51673591148e56872ad09d6c46527e7e48bc69fe9d49475fac2af179'
+            'b055f013c85720dabe21947d2dbb67d0a282383d44b39d1a78ba05949834e649'
+            '5743a28cf0af0c10ec049c6d8df6801c675c9656ff623fbda5c2a29b3b15e8f4'
+            'bad3cffb9a4ebbef350227439b4e4bd1654b4cc9e2faf898971703779f4c113e')
+msys2_references=(
+  'archlinux: autoconf'
+)
+
+apply_patch_with_msg() {
+  for _patch in "$@"
+  do
+    msg2 "Applying $_patch"
+    patch -Np1 -i "${srcdir}/$_patch"
+  done
+}
+
+prepare() {
+  cd ${srcdir}/${_realname}-${pkgver}
+
+  # MSYS2
+  apply_patch_with_msg \
+    0001-autoconf-2.70-MSYS2-specifics-AC_CYGWIN.patch \
+    0002-autoconf-2.70-MSYS2-Autotest-Unify-EOLs-By-Default.patch \
+    0003-autoconf-2.70-MSYS2-specifics-config.guess.patch \
+    0004-LLVM-Flang.patch \
+    0005-package.patch \
+    0006-fortran-mingw-libs.patch
+}
+
+build() {
+  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
+
+  ../${_realname}-${pkgver}/configure \
+    --prefix=/usr \
+    --program-suffix=-2.72
+
+  make
+}
+
+check() {
+  cd build-${MSYSTEM}
+  # CAUTION: The tests run very very long, even on a server.
+  make check TESTSUITEFLAGS='-j16'
+}
+
+package() {
+  make -C build-${MSYSTEM} DESTDIR=${pkgdir} install
+
+  # license exception
+  install -Dm644 ${_realname}-${pkgver}/COPYING.EXCEPTION \
+    $pkgdir/usr/share/licenses/autoconf${pkgver}/COPYING.EXCEPTION
+
+  # Note: Remove these files once a newer autoconf is added, and add
+  # a versioned conflict to the old version of this package to make
+  # upgrades work.
+  # rm -rf ${pkgdir}/usr/share/info
+}

autogen/PKGBUILD

@@ -2,31 +2,32 @@
 
 pkgname=autogen
 pkgver=5.18.16
-pkgrel=1
+pkgrel=6
 pkgdesc="A tool designed to simplify the creation and maintenance of programs that contain large amounts of repetitious text"
 arch=('i686' 'x86_64')
 url="https://autogen.sourceforge.io/"
-groups=('base-devel')
 license=('GPL3')
-makedepends=('gcc' 'gmp-devel' 'libcrypt-devel' 'libffi-devel' 'libgc-devel' 'libguile-devel' 'libxml2-devel')
-depends=('gcc-libs' 'gmp' 'libcrypt' 'libffi' 'libgc' 'libguile' 'libxml2')
-install=autogen.install
+makedepends=('gcc' 'gmp-devel' 'libxcrypt-devel' 'libffi-devel' 'libgc-devel' 'libguile-devel' 'libxml2-devel' 'make' 'autoconf' 'automake-wrapper' 'libtool' 'gperf')
+depends=('gcc-libs' 'gmp' 'libxcrypt' 'libffi' 'libgc' 'libguile' 'libxml2')
 source=("https://ftp.gnu.org/gnu/${pkgname}/rel${pkgver}/${pkgname}-${pkgver}.tar.xz"{,.sig}
+        autogen-guile-3.0.patch
         autogen-5.18.1-msys2.patch)
 sha256sums=('f8a13466b48faa3ba99fe17a069e71c9ab006d9b1cfabe699f8c60a47d5bb49a'
             'SKIP'
+            'f57152bb9b192ddd2ae31741b2b0bf43f8bea58211fcbf15fb3b7f4084e5aaa3'
             'ff3df8d191a6269a2f64b6ec19d24bb5d169d316104f97f14a094633aaa77386')
 validpgpkeys=('3EEE51D1355B8EC40D9F3122495143D05D0712D1')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i ${srcdir}/autogen-guile-3.0.patch
   patch -p1 -i ${srcdir}/autogen-5.18.1-msys2.patch
   autoreconf -fiv
 }
 
 build() {
   LDFLAGS+=' -Wl,--export-all-symbols'
-  CFLAGS+=" -Wno-implicit-fallthrough -Wno-format-overflow -Wno-format-truncation"
+  CFLAGS+=" -Wno-implicit-fallthrough -Wno-format-overflow -Wno-format-truncation -Wno-char-subscripts"
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure \
     --build=${CHOST} \

autogen/autogen-5.18.12-allow-guile-2.2.patch

@@ -1,36 +0,0 @@
-diff --git a/agen5/guile-iface.h b/agen5/guile-iface.h
-index 0aeabb0..6ce3520 100644
---- a/agen5/guile-iface.h
-+++ b/agen5/guile-iface.h
-@@ -9,7 +9,7 @@
- # error AutoGen does not work with this version of Guile
-   choke me.
- 
--#elif GUILE_VERSION < 201000
-+#else
- # define AG_SCM_IS_PROC(_p)           scm_is_true( scm_procedure_p(_p))
- # define AG_SCM_LIST_P(_l)            scm_is_true( scm_list_p(_l))
- # define AG_SCM_PAIR_P(_p)            scm_is_true( scm_pair_p(_p))
-@@ -24,9 +24,6 @@
- # define AG_SCM_TO_ULONG(_v)          ((unsigned long)scm_to_ulong(_v))
- # define AG_SCM_VEC_P(_v)             scm_is_vector(_v)
- 
--#else
--# error unknown GUILE_VERSION
--  choke me.
- #endif
- 
- #endif /* MUTATING_GUILE_IFACE_H_GUARD */
-diff --git a/configure b/configure
-index befe20b..c4254eb 100755
---- a/configure
-+++ b/configure
-@@ -14191,7 +14191,7 @@ $as_echo "no" >&6; }
- 		PKG_CONFIG=""
- 	fi
- fi
--  _guile_versions_to_search="2.0 1.8"
-+  _guile_versions_to_search="2.2 2.0 1.8"
-   if test -n "$GUILE_EFFECTIVE_VERSION"; then
-     _guile_tmp=""
-     for v in $_guile_versions_to_search; do

autogen/autogen-5.18.12-fix-guile-iface.patch

@@ -1,23 +0,0 @@
-diff --git a/agen5/guile-iface.h b/agen5/guile-iface.h
-index 0aeabb0..6ce3520 100644
---- a/agen5/guile-iface.h
-+++ b/agen5/guile-iface.h
-@@ -9,7 +9,7 @@
- # error AutoGen does not work with this version of Guile
-   choke me.
- 
--#elif GUILE_VERSION < 201000
-+#else
- # define AG_SCM_IS_PROC(_p)           scm_is_true( scm_procedure_p(_p))
- # define AG_SCM_LIST_P(_l)            scm_is_true( scm_list_p(_l))
- # define AG_SCM_PAIR_P(_p)            scm_is_true( scm_pair_p(_p))
-@@ -24,9 +24,6 @@
- # define AG_SCM_TO_ULONG(_v)          ((unsigned long)scm_to_ulong(_v))
- # define AG_SCM_VEC_P(_v)             scm_is_vector(_v)
- 
--#else
--# error unknown GUILE_VERSION
--  choke me.
- #endif
- 
- #endif /* MUTATING_GUILE_IFACE_H_GUARD */

autogen/autogen-5.18.12-fix-guile-version-check.patch

@@ -1,38 +0,0 @@
---- autogen-5.18.12/config/guile-orig.m4	2017-11-21 15:23:45.047606700 -0500
-+++ autogen-5.18.12/config/guile.m4	2017-11-21 15:24:20.414686700 -0500
-@@ -47,7 +47,7 @@
- # for an available version of Guile.
- #
- # By default, this macro will search for the latest stable version of
--# Guile (e.g. 2.0), falling back to the previous stable version
-+# Guile (e.g. 2.2), falling back to the previous stable version
- # (e.g. 1.8) if it is available.  If no guile-@var{VERSION}.pc file is
- # found, an error is signalled.  The found version is stored in
- # @var{GUILE_EFFECTIVE_VERSION}.
-@@ -61,7 +61,7 @@
- #
- AC_DEFUN([GUILE_PKG],
-  [PKG_PROG_PKG_CONFIG
--  _guile_versions_to_search="m4_default([$1], [2.0 1.8])"
-+  _guile_versions_to_search="m4_default([$1], [2.2 1.8])"
-   if test -n "$GUILE_EFFECTIVE_VERSION"; then
-     _guile_tmp=""
-     for v in $_guile_versions_to_search; do
-@@ -184,7 +184,7 @@
- # If @code{guile} is not found, signal an error.
- #
- # By default, this macro will search for the latest stable version of
--# Guile (e.g. 2.0). x.y or x.y.z versions can be specified. If an older
-+# Guile (e.g. 2.2). x.y or x.y.z versions can be specified. If an older
- # version is found, the macro will signal an error.
- #
- # The effective version of the found @code{guile} is set to
-@@ -201,7 +201,7 @@
-  [AC_PATH_PROG(GUILE,guile)
-   _guile_required_version="m4_default([$1], [$GUILE_EFFECTIVE_VERSION])"
-   if test -z "$_guile_required_version"; then
--    _guile_required_version=2.0
-+    _guile_required_version=2.2
-   fi
-   if test "$GUILE" = "" ; then
-       AC_MSG_ERROR([guile required but not found])

autogen/autogen-guile-3.0.patch

@@ -0,0 +1,48 @@
+Index: autogen-5.18.16/agen5/guile-iface.h
+===================================================================
+--- autogen-5.18.16.orig/agen5/guile-iface.h
++++ autogen-5.18.16/agen5/guile-iface.h
+@@ -9,16 +9,13 @@
+ # error AutoGen does not work with this version of Guile
+   choke me.
+ 
+-#elif GUILE_VERSION < 203000
++#else
+ # define AG_SCM_IS_PROC(_p)           scm_is_true( scm_procedure_p(_p))
+ # define AG_SCM_LIST_P(_l)            scm_is_true( scm_list_p(_l))
+ # define AG_SCM_PAIR_P(_p)            scm_is_true( scm_pair_p(_p))
+ # define AG_SCM_TO_LONG(_v)           scm_to_long(_v)
+ # define AG_SCM_TO_ULONG(_v)          ((unsigned long)scm_to_ulong(_v))
+ 
+-#else
+-# error unknown GUILE_VERSION
+-  choke me.
+ #endif
+ 
+ #endif /* MUTATING_GUILE_IFACE_H_GUARD */
+Index: autogen-5.18.16/configure
+===================================================================
+--- autogen-5.18.16.orig/configure
++++ autogen-5.18.16/configure
+@@ -14798,7 +14798,7 @@ $as_echo "no" >&6; }
+ 		PKG_CONFIG=""
+ 	fi
+ fi
+-  _guile_versions_to_search="2.2 2.0 1.8"
++  _guile_versions_to_search="3.0 2.2 2.0 1.8"
+   if test -n "$GUILE_EFFECTIVE_VERSION"; then
+     _guile_tmp=""
+     for v in $_guile_versions_to_search; do
+Index: autogen-5.18.16/config/guile.m4
+===================================================================
+--- autogen-5.18.16.orig/config/guile.m4
++++ autogen-5.18.16/config/guile.m4
+@@ -61,7 +61,7 @@
+ #
+ AC_DEFUN([GUILE_PKG],
+  [PKG_PROG_PKG_CONFIG
+-  _guile_versions_to_search="m4_default([$1], [2.2 2.0 1.8])"
++  _guile_versions_to_search="m4_default([$1], [3.0 2.2 2.0 1.8])"
+   if test -n "$GUILE_EFFECTIVE_VERSION"; then
+     _guile_tmp=""
+     for v in $_guile_versions_to_search; do

autogen/autogen.install

@@ -1,18 +0,0 @@
-infodir=/usr/share/info
-filelist="autogen.info autogen.info-1 autogen.info-2"
-
-post_install() {
-  for file in ${filelist}; do
-    install-info $infodir/${file}.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  for file in ${filelist}; do
-    install-info --delete $infodir/${file}.gz $infodir/dir 2> /dev/null
-  done
-}

automake-wrapper/PKGBUILD

@@ -1,37 +0,0 @@
-# Maintainer: Alexey Pavlov <alexpux@gmail.com>
-
-pkgname=automake-wrapper
-pkgver=11
-pkgrel=1
-pkgdesc="Wrapper scripts for automake and aclocal"
-arch=('any')
-license=('GPL')
-url="https://www.gentoo.org/"
-groups=('base-devel')
-depends=('bash' 'gawk'
-         #'automake1.4'
-         #'automake1.5'
-         'automake1.6'
-         'automake1.7'
-         'automake1.7'
-         'automake1.8'
-         'automake1.9'
-         'automake1.10'
-         'automake1.11'
-         'automake1.12'
-         'automake1.13'
-         'automake1.14'
-         'automake1.15'
-         'automake1.16')
-#install=automake.install
-source=("am-wrapper-${pkgver}.sh")
-sha256sums=('455dd326ec1ab04f5cbbdfd9bc0df5ad86152c0b2442faca98da0813827e0cbc')
-provides=("automake")
-conflicts=("automake")
-
-package() {
-  mkdir -p ${pkgdir}/usr/bin
-
-  cp "${srcdir}"/am-wrapper-${pkgver}.sh ${pkgdir}/usr/bin/automake
-  cp "${srcdir}"/am-wrapper-${pkgver}.sh ${pkgdir}/usr/bin/aclocal
-}

automake-wrapper/am-wrapper-11.sh

@@ -1,186 +0,0 @@
-#!/bin/sh
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Executes the correct automake version.
-#
-# If WANT_AUTOMAKE is set (can be a whitespace delimited list of versions):
-#  - attempt to find an installed version using those
-#  - if magic keyword 'latest' is found, pick the latest version that exists
-#  - if nothing found, warn, and proceed as if WANT_AUTOMAKE was not set (below)
-# If WANT_AUTOMAKE is not set:
-#  - Try to detect the version of automake used to generate things (look at
-#    Makefile.in and aclocal.m4 and any other useful file)
-#  - If detected version is not found, warn and proceed as if blank slate
-#  - Try to locate the latest version of automake that exists and run it
-
-(set -o posix) 2>/dev/null && set -o posix
-
-_stderr() { printf 'am-wrapper: %s: %b\n' "${argv0}" "$*" 1>&2; }
-warn() { _stderr "warning: $*"; }
-err() { _stderr "error: $*"; exit 1; }
-unset IFS
-which() {
-	local p
-	IFS=: # we don't use IFS anywhere, so don't bother saving/restoring
-	for p in ${PATH} ; do
-		p="${p}/$1"
-		[ -e "${p}" ] && echo "${p}" && return 0
-	done
-	unset IFS
-	return 1
-}
-
-#
-# Sanitize argv[0] since it isn't always a full path #385201
-#
-argv0=${0##*/}
-case $0 in
-	${argv0})
-		# find it in PATH
-		if ! full_argv0=$(which "${argv0}") ; then
-			err "could not locate ${argv0}; file a bug"
-		fi
-		;;
-	*)
-		# re-use full/relative paths
-		full_argv0=$0
-		;;
-esac
-
-if ! seq 0 0 2>/dev/null 1>&2 ; then #338518
-	seq() {
-		local f l i
-		case $# in
-			1) f=1 i=1 l=$1;;
-			2) f=$1 i=1 l=$2;;
-			3) f=$1 i=$2 l=$3;;
-		esac
-		while :; do
-			[ $l -lt $f -a $i -gt 0 ] && break
-			[ $f -lt $l -a $i -lt 0 ] && break
-			echo $f
-			: $(( f += i ))
-		done
-		return 0
-	}
-fi
-
-#
-# Set up bindings between actual version and WANT_AUTOMAKE;
-# Start with last known versions to speed up lookup process.
-#
-LAST_KNOWN_AUTOMAKE_VER="16"
-vers=$(printf '1.%s ' `seq ${LAST_KNOWN_AUTOMAKE_VER} -1 4`)
-
-#
-# Helper to scan for a usable program based on version.
-#
-binary=
-all_vers=
-find_binary() {
-	local v
-	all_vers="${all_vers} $*" # For error messages.
-	for v ; do
-		if [ -x "${full_argv0}-${v}" ] ; then
-			binary="${full_argv0}-${v}"
-			binary_ver=${v}
-			return 0
-		fi
-	done
-	return 1
-}
-
-#
-# Try and find a usable automake version.  First check the WANT_AUTOMAKE
-# setting (whitespace delimited list), then fallback to the latest.
-#
-find_latest() {
-	if ! find_binary ${vers} ; then
-		# Brute force it.
-		find_binary $(printf '1.%s ' `seq 99 -1 ${LAST_KNOWN_AUTOMAKE_VER}`)
-	fi
-}
-for wx in ${WANT_AUTOMAKE:-latest} ; do
-	if [ "${wx}" = "latest" ] ; then
-		find_latest && break
-	else
-		find_binary ${wx} && break
-	fi
-done
-
-if [ -z "${binary}" ] && [ -n "${WANT_AUTOMAKE}" ] ; then
-	warn "could not locate installed version for WANT_AUTOMAKE='${WANT_AUTOMAKE}'; ignoring"
-	unset WANT_AUTOMAKE
-	find_latest
-fi
-
-if [ -z "${binary}" ] ; then
-	err "Unable to locate any usuable version of automake.\n" \
-	    "\tI tried these versions:${all_vers}\n" \
-	    "\tWith a base name of '${full_argv0}'."
-fi
-
-#
-# autodetect helpers
-#
-do_awk() {
-	local file=$1 ; shift
-	local v=$(awk -v regex="$*" '{
-		if (ret = match($0, regex)) {
-			s = substr($0, ret, RLENGTH)
-			ret = match(s, "[0-9]\\.[0-9]+")
-			print substr(s, ret, RLENGTH)
-			exit
-		}
-		}' "${file}")
-	case " ${auto_vers} " in
-	*" ${v} "*) ;;
-	*) auto_vers="${auto_vers:+${auto_vers} }${v}" ;;
-	esac
-}
-
-#
-# autodetect routine
-#
-if [ -z "${WANT_AUTOMAKE}" ] ; then
-	auto_vers=
-	if [ -r "Makefile.in" ] ; then
-		do_awk Makefile.in '^# Makefile.in generated (automatically )?by automake [0-9]\\.[0-9]+'
-	fi
-	if [ -r "aclocal.m4" ] ; then
-		do_awk aclocal.m4 'generated automatically by aclocal [0-9]\\.[0-9]+'
-		do_awk aclocal.m4 '[[:space:]]*\\[?AM_AUTOMAKE_VERSION\\(\\[?[0-9]\\.[0-9]+[^)]*\\]?\\)'
-	fi
-	# We don't need to set $binary here as it has already been setup for us
-	# earlier to the latest available version.
-	if [ -n "${auto_vers}" ] ; then
-		if ! find_binary ${auto_vers} ; then
-			warn "auto-detected versions not found (${auto_vers}); falling back to latest available"
-		fi
-	fi
-fi
-
-if [ -n "${WANT_AMWRAPPER_DEBUG}" ] ; then
-	if [ -n "${WANT_AUTOMAKE}" ] ; then
-		warn "DEBUG: WANT_AUTOMAKE is set to ${WANT_AUTOMAKE}"
-	fi
-	warn "DEBUG: will execute <${binary}>"
-fi
-
-#
-# for further consistency
-#
-export WANT_AUTOMAKE="${binary_ver}"
-
-#
-# Now try to run the binary
-#
-if [ ! -x "${binary}" ] ; then
-	# this shouldn't happen
-	err "${binary} is missing or not executable.\n" \
-	    "\tPlease try installing the correct version of automake."
-fi
-
-exec "${binary}" "$@"
-# The shell will error out if `exec` failed.

automake1.10/PKGBUILD

@@ -1,74 +0,0 @@
-# Maintainer: Alexey Pavlov <alexpux@gmail.com>
-
-pkgname=automake1.10
-pkgver=1.10.3
-pkgrel=4
-pkgdesc="A GNU tool for automatically creating Makefiles"
-arch=('any')
-license=('GPL')
-url="https://www.gnu.org/software/automake"
-groups=('base-devel')
-depends=('perl' 'bash')
-makedepends=('autoconf')
-checkdepends=('dejagnu')
-install=automake.install
-source=(https://ftp.gnu.org/gnu/automake/automake-${pkgver}.tar.bz2
-        automake-1.10-msys2.patch
-        automake1.10-documentation.patch
-        automake-1.10-makeinfo-fix.patch
-        automake-1.10-perl-escape-curly-bracket.patch)
-sha256sums=('e98ab43bb839c31696a4202e5b6ff388b391659ef2387cf9365019fad17e1adc'
-            'f5e091d83ed5e9451148ce6629f7f8bf92d17890d132aacb7eba1ca6662547fb'
-            '9cafa4e6a652331a56780ea5941413eaae96a9b8c8c9abbf9f68bd01ea07aaf1'
-            '1378dc7c1ffd88730aabed052b1843cfd3fb55040c10a988171a5a37a1efa612'
-            'dc3566c450efe446799800b88185101f625ef4091d7f39bcb05325eaf4604f5c')
-
-prepare() {
-  cd ${srcdir}/automake-${pkgver}
-
-  patch -p2 -i ${srcdir}/automake1.10-documentation.patch
-  patch -p1 -i ${srcdir}/automake-1.10-makeinfo-fix.patch
-  patch -p1 -i ${srcdir}/automake-1.10-msys2.patch
-  patch -p1 -i ${srcdir}/automake-1.10-perl-escape-curly-bracket.patch
-}
-
-build() {
-  cd ${srcdir}/automake-${pkgver}
-  ./configure --prefix=/usr
-  make
-
-  (cd doc && makeinfo -I ${srcdir}/automake-${pkgver}/doc -o automake1.10.info automake.texi)
-}
-
-check() {
-  cd ${srcdir}/automake-${pkgver}
-
-  # expect 2 failures due to perl-5.18 incompatibility
-  make -k check || true
-}
-
-package() {
-  cd ${srcdir}/automake-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  # install the 1.11 versioned info files
-  for f in `find ${pkgdir}/usr/share/info -name "*.info*"` ; do
-    rm -f ${f}
-  done
-  for f in `find ${srcdir}/automake-${pkgver} -name "*.info*"` ; do
-    bf=`basename $f`
-    cp $f ${pkgdir}/usr/share/info/
-  done
-
-  # remove the unversioned executables
-  rm -f ${pkgdir}/usr/bin/automake ${pkgdir}/usr/bin/aclocal
-
-  # remove the unversioned man pages
-  rm -f ${pkgdir}/usr/share/man/man1/automake.1
-  rm -f ${pkgdir}/usr/share/man/man1/aclocal.1
-
-  # remove the unversioned info files
-  rm -f ${pkgdir}/usr/share/info/automake.info*
-
-  rm -rf ${pkgdir}/usr/share/doc
-}

automake1.10/automake-1.10-makeinfo-fix.patch

@@ -1,36 +0,0 @@
---- automake-1.10.3/doc/automake.texi.orig	2009-12-08 22:36:30.000000000 +0300
-+++ automake-1.10.3/doc/automake.texi	2013-12-18 09:37:58.142800000 +0400
-@@ -11635,11 +11635,11 @@
- Options: these items on which Automake works have been rewritten as
- separate Perl modules, and documented.
- 
--@itemx 2004-01-11 Automake 1.8.1
--@itemx 2004-01-12 Automake 1.8.2
--@itemx 2004-03-07 Automake 1.8.3
--@itemx 2004-04-25 Automake 1.8.4
--@itemx 2004-05-16 Automake 1.8.5
-+@item 2004-01-11 Automake 1.8.1
-+@item 2004-01-12 Automake 1.8.2
-+@item 2004-03-07 Automake 1.8.3
-+@item 2004-04-25 Automake 1.8.4
-+@item 2004-05-16 Automake 1.8.5
- 
- @item 2004-07-28 Automake 1.9
- 
-@@ -11652,13 +11652,13 @@
- 
- Aside from this it contains mainly minor changes and bug-fixes.
- 
--@itemx 2004-08-11 Automake 1.9.1
--@itemx 2004-09-19 Automake 1.9.2
-+@item 2004-08-11 Automake 1.9.1
-+@item 2004-09-19 Automake 1.9.2
- 
- Automake has ten years.  This chapter of the manual was initially
- written for this occasion.
- 
--@itemx 2007-10-29 Automake repository moves to @code{savannah.gnu.org} and uses
-+@item 2007-10-29 Automake repository moves to @code{savannah.gnu.org} and uses
- git as primary repository.
- 
- @end table

automake1.10/automake-1.10-msys2.patch

@@ -1,33 +0,0 @@
---- automake-1.10.3/lib/config.guess.orig	2009-12-08 22:36:30.000000000 +0300
-+++ automake-1.10.3/lib/config.guess	2013-12-18 09:32:40.711600000 +0400
-@@ -800,6 +800,9 @@
-     i*:CYGWIN*:*)
- 	echo ${UNAME_MACHINE}-pc-cygwin
- 	exit ;;
-+    i*:MSYS*:*)
-+	echo ${UNAME_MACHINE}-pc-msys
-+	exit ;;
-     *:MINGW*:*)
- 	echo ${UNAME_MACHINE}-pc-mingw32
- 	exit ;;
-@@ -840,6 +843,9 @@
-     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- 	echo x86_64-unknown-cygwin
- 	exit ;;
-+    amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
-+	echo x86_64-unknown-msys
-+	exit ;;
-     p*:CYGWIN*:*)
- 	echo powerpcle-unknown-cygwin
- 	exit ;;
---- automake-1.10.3/lib/config.sub.orig	2009-12-08 22:36:30.000000000 +0300
-+++ automake-1.10.3/lib/config.sub	2013-12-18 09:31:52.226800000 +0400
-@@ -1293,7 +1293,7 @@
- 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- 	      | -chorusos* | -chorusrdb* | -cegcc* \
--	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
- 	      | -uxpv* | -beos* | -mpeix* | -udk* \
- 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \

automake1.10/automake-1.10-perl-escape-curly-bracket.patch

@@ -1,21 +0,0 @@
-From: Pavel Raiskup <praiskup@redhat.com>
-Date: Tue, 7 Jul 2015 10:54:24 +0200
-Subject: [PATCH 2/2] bin/automake: escape '{' in regexp pattern
-
-Resolves: rhbz#1239379
-Upstream report:
-http://debbugs.gnu.org/cgi/bugreport.cgi?bug=21001
-
-diff --git a/automake.in b/automake.in
-index eedc8bc..a679d16 100644
---- a/automake.in
-+++ b/automake.in
-@@ -4030,7 +4030,7 @@ sub substitute_ac_subst_variables_worker
- sub substitute_ac_subst_variables ($)
- {
-   my ($text) = @_;
--  $text =~ s/\${([^ \t=:+{}]+)}/&substitute_ac_subst_variables_worker ($1)/ge;
-+  $text =~ s/\$\{([^ \t=:+{}]+)}/&substitute_ac_subst_variables_worker ($1)/ge;
-   return $text;
- }
- 

automake1.10/automake.install

@@ -1,22 +0,0 @@
-infodir=usr/share/info
-filelist="automake1.10.info automake1.10.info-1 automake1.10.info-2"
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-# vim:set ts=2 sw=2 et:

automake1.10/automake1.10-documentation.patch

@@ -1,29 +0,0 @@
---- origsrc/automake-1.10.3/doc/automake.texi	2009-12-08 14:36:30.000000000 -0500
-+++ src/automake-1.10.3/doc/automake.texi	2009-12-24 09:43:17.696000000 -0500
-@@ -1,7 +1,7 @@
- \input texinfo   @c -*-texinfo-*-
- @c %**start of header
--@setfilename automake.info
--@settitle automake
-+@setfilename automake1.10.info
-+@settitle automake1.10
- @setchapternewpage off
- @c %**end of header
- 
-@@ -32,13 +32,13 @@ section entitled ``@acronym{GNU} Free Do
- @c (Autoconf has a similar setup.)
- @dircategory Software development
- @direntry
--* Automake: (automake).         Making GNU standards-compliant Makefiles.
-+* Automake-1.10: (automake1.10).        Making GNU standards-compliant Makefiles.
- @end direntry
- 
- @dircategory Individual utilities
- @direntry
--* aclocal: (automake)Invoking aclocal.          Generating aclocal.m4.
--* automake: (automake)Invoking Automake.        Generating Makefile.in.
-+* aclocal-1.10: (automake1.10)Invoking aclocal.        Generating aclocal.m4.
-+* automake-1.10: (automake1.10)Invoking Automake.      Generating Makefile.in.
- @end direntry
- 
- @titlepage

automake1.11/PKGBUILD

@@ -2,16 +2,17 @@
 
 pkgname=automake1.11
 pkgver=1.11.6
-pkgrel=4
+pkgrel=6
 pkgdesc="A GNU tool for automatically creating Makefiles"
 arch=('any')
 license=('GPL')
 url="https://www.gnu.org/software/automake"
-groups=('base-devel')
+msys2_references=(
+  "cpe: cpe:/a:gnu:automake"
+)
 depends=('perl' 'bash')
-makedepends=('autoconf')
+makedepends=('autoconf' 'make')
 checkdepends=('dejagnu')
-install=automake.install
 source=(https://ftp.gnu.org/gnu/automake/automake-${pkgver}.tar.xz
         automake-1.11-msys2.patch
         automake1.11-documentation.patch

automake1.11/automake.install

@@ -1,22 +0,0 @@
-infodir=usr/share/info
-filelist="automake1.11.info automake1.11.info-1 automake1.11.info-2"
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-# vim:set ts=2 sw=2 et:

automake1.12/PKGBUILD

@@ -2,16 +2,17 @@
 
 pkgname=automake1.12
 pkgver=1.12.6
-pkgrel=4
+pkgrel=6
 pkgdesc="A GNU tool for automatically creating Makefiles"
 arch=('any')
 license=('GPL')
 url="https://www.gnu.org/software/automake"
-groups=('base-devel')
+msys2_references=(
+  "cpe: cpe:/a:gnu:automake"
+)
 depends=('perl' 'bash')
-makedepends=('autoconf')
+makedepends=('autoconf' 'make')
 checkdepends=('dejagnu')
-install=automake.install
 source=(https://ftp.gnu.org/gnu/automake/automake-${pkgver}.tar.xz
         automake-1.14-msys2.patch
         automake1.12-documentation.patch

automake1.12/automake.install

@@ -1,22 +0,0 @@
-infodir=usr/share/info
-filelist="automake1.12.info automake1.12.info-1 automake1.12.info-2 automake-history1.12.info"
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-# vim:set ts=2 sw=2 et:

automake1.13/PKGBUILD

@@ -2,16 +2,17 @@
 
 pkgname=automake1.13
 pkgver=1.13.4
-pkgrel=5
+pkgrel=7
 pkgdesc="A GNU tool for automatically creating Makefiles"
 arch=('any')
 license=('GPL')
 url="https://www.gnu.org/software/automake"
-groups=('base-devel')
+msys2_references=(
+  "cpe: cpe:/a:gnu:automake"
+)
 depends=('perl' 'bash')
-makedepends=('autoconf')
+makedepends=('autoconf' 'make')
 checkdepends=('dejagnu')
-install=automake.install
 source=(https://ftp.gnu.org/gnu/automake/automake-${pkgver}.tar.xz
         automake-1.14-msys2.patch
         automake1.13-documentation.patch

automake1.13/automake.install

@@ -1,22 +0,0 @@
-infodir=usr/share/info
-filelist="automake1.13.info automake1.13.info-1 automake1.13.info-2 automake-history1.13.info"
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-# vim:set ts=2 sw=2 et:

automake1.14/PKGBUILD

@@ -2,16 +2,17 @@
 
 pkgname=automake1.14
 pkgver=1.14.1
-pkgrel=4
+pkgrel=6
 pkgdesc="A GNU tool for automatically creating Makefiles"
 arch=('any')
 license=('GPL')
 url="https://www.gnu.org/software/automake"
-groups=('base-devel')
+msys2_references=(
+  "cpe: cpe:/a:gnu:automake"
+)
 depends=('perl' 'bash')
-makedepends=('autoconf')
+makedepends=('autoconf' 'make')
 checkdepends=('dejagnu')
-install=automake.install
 source=(https://ftp.gnu.org/gnu/automake/automake-${pkgver}.tar.xz
         automake1.14-documentation.patch
         automake-1.14-msys2.patch

automake1.14/automake.install

@@ -1,22 +0,0 @@
-infodir=usr/share/info
-filelist="automake1.14.info automake1.14.info-1 automake1.14.info-2 automake-history1.14.info"
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-# vim:set ts=2 sw=2 et:

automake1.15/PKGBUILD

@@ -2,16 +2,17 @@
 
 pkgname=automake1.15
 pkgver=1.15.1
-pkgrel=2
+pkgrel=4
 pkgdesc="A GNU tool for automatically creating Makefiles"
 arch=('any')
 license=('GPL')
 url="https://www.gnu.org/software/automake"
-groups=('base-devel')
+msys2_references=(
+  "cpe: cpe:/a:gnu:automake"
+)
 depends=('perl' 'bash')
-makedepends=('autoconf')
+makedepends=('autoconf' 'make')
 checkdepends=('dejagnu')
-install=automake.install
 source=(https://ftp.gnu.org/gnu/automake/automake-${pkgver}.tar.xz
         automake1.15-documentation.patch
         automake-1.15.1-msys2.patch

automake1.15/automake.install

@@ -1,22 +0,0 @@
-infodir=usr/share/info
-filelist="automake1.15.info automake1.15.info-1 automake1.15.info-2 automake-history1.15.info"
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-# vim:set ts=2 sw=2 et:

automake1.16/PKGBUILD

@@ -1,21 +1,22 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 pkgname=automake1.16
-pkgver=1.16.3
+pkgver=1.16.5
 pkgrel=1
 pkgdesc="A GNU tool for automatically creating Makefiles"
 arch=('any')
 license=('GPL')
 url="https://www.gnu.org/software/automake"
-groups=('base-devel')
+msys2_references=(
+  "cpe: cpe:/a:gnu:automake"
+)
 depends=('perl' 'bash')
-makedepends=('autoconf')
+makedepends=('autoconf' 'make')
 checkdepends=('dejagnu')
-install=automake.install
 source=(https://ftp.gnu.org/gnu/automake/automake-${pkgver}.tar.xz{,.sig}
         automake-1.16.1-documentation.patch
         automake-1.16.1-msys2.patch)
-sha256sums=('ff2bf7656c4d1c6fdda3b8bebb21f09153a736bcba169aaf65eab25fa113bf3a'
+sha256sums=('f01d58cd6d9d77fbdca9eb4bbd5ead1988228fdb73d6f7a201f5f8d6b118b469'
             'SKIP'
             '18129ade01c1b1be3cb60e20349db0c08e7ea7fae7e72b937b1317c5f36dda41'
             'fe7bf1235399d2b1ff0e6a74eef96693449bf06e71a1a18c2a995fd41abbe6ce')

automake1.16/automake.install

@@ -1,22 +0,0 @@
-infodir=usr/share/info
-filelist="automake1.16.info automake1.16.info-1 automake1.16.info-2 automake-history1.16.info"
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-# vim:set ts=2 sw=2 et:

automake1.17/PKGBUILD

@@ -0,0 +1,91 @@
+# Maintainer: Yang Kun <ikspress@outlook.com>
+
+_basever=1.17
+pkgname=automake${_basever}
+pkgver=1.17
+pkgrel=1
+pkgdesc="A GNU tool for automatically creating Makefiles"
+arch=('any')
+license=('spdx:GPL-2.0-or-later')
+url="https://www.gnu.org/software/automake"
+msys2_references=(
+  "cpe: cpe:/a:gnu:automake"
+)
+depends=('bash' 'perl')
+makedepends=('autoconf' 'make' 'texinfo')
+checkdepends=('bison' 'cscope' 'dejagnu' 'emacs' 'expect' 'flex' 'gcc' 'gettext'
+              'help2man' 'libtool' 'lzip' 'sharutils' 'texinfo-tex' 'zip')
+source=(https://ftp.gnu.org/gnu/automake/automake-${pkgver}.tar.xz{,.sig}
+        automake-1.17-documentation.patch
+        automake-1.17-msys2.patch)
+sha256sums=('8920c1fc411e13b90bf704ef9db6f29d540e76d232cb3b2c9f4dc4cc599bd990'
+            'SKIP'
+            '64874ff1f61a832b784a0cbd75f48d7e6b1fe5f7e9f5acb75134ad7c57c5d824'
+            'a6b3a7099fb23ddc3d1402b16df32cf8f21bb63ca6b9314ff7caff5869b6ed50')
+validpgpkeys=('E1622F96D2BB4E58018EEF9860F906016E407573'   # Stefano Lattarini
+              'F2A38D7EEB2B66405761070D0ADEE10094604D37'   # Mathieu Lirzin
+              '155D3FC500C834486D1EEA677FD9FCCB000BEEEE')  # Jim Meyering
+replace=('automake')
+
+# Helper macros to help make tasks easier #
+apply_patch_with_msg() {
+  for _fname in "$@"; do
+    msg2 "Applying ${_fname}"
+    patch -Nbp1 -i "${srcdir}"/${_fname}
+  done
+}
+
+del_file_exists() {
+  for _fname in "$@"; do
+    if [ -f $_fname ] || [ -d $_fname ]; then
+      rm -rf $_fname
+    fi
+  done
+}
+# =========================================== #
+
+prepare() {
+  cd ${srcdir}/automake-${pkgver}
+
+  apply_patch_with_msg \
+    automake-1.17-documentation.patch \
+    automake-1.17-msys2.patch
+}
+
+build() {
+  cd ${srcdir}/automake-${pkgver}
+  ./configure --prefix=/usr
+  make
+  # build versioned info files
+  cd doc
+  makeinfo automake.texi automake-history.texi
+}
+
+check() {
+  cd ${srcdir}/automake-${pkgver}
+
+  make -k check || warning "Tests failed"
+}
+
+package() {
+  cd ${srcdir}/automake-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  mv ${pkgdir}/usr/share/aclocal/README ${pkgdir}/usr/share/aclocal/README.am17
+
+  # remove the unversioned info files
+  rm -f ${pkgdir}/usr/share/info/automake{,-history}.info*
+
+  # remove the unversioned executables
+  rm -f ${pkgdir}/usr/bin/automake ${pkgdir}/usr/bin/aclocal
+
+  # remove the unversioned man pages
+  rm -f ${pkgdir}/usr/share/man/man1/automake.1 \
+    ${pkgdir}/usr/share/man/man1/aclocal.1
+
+  # remove amhello
+  rm -rf ${pkgdir}/usr/share/doc
+
+  # install the versioned info files
+  install -Dm644 ${srcdir}/automake-${pkgver}/doc/*${_basever}.info* -t ${pkgdir}/usr/share/info/
+}

automake1.17/automake-1.17-documentation.patch

@@ -0,0 +1,45 @@
+diff --git automake-1.17-orig/doc/automake-history.texi automake-1.17/doc/automake-history.texi
+index 6e8db83..8b9e212 100644
+--- automake-1.17-orig/doc/automake-history.texi
++++ automake-1.17/doc/automake-history.texi
+@@ -1,7 +1,7 @@
+ \input texinfo   @c -*-texinfo-*-
+ @c %**start of header
+-@setfilename automake-history.info
+-@settitle automake-history
++@setfilename automake-history1.17.info
++@settitle automake-history1.17
+ @setchapternewpage on
+ @c %**end of header
+ 
+diff --git automake-1.17-orig/doc/automake.texi automake-1.17/doc/automake.texi
+index 49ebfb2..fa7c03b 100644
+--- automake-1.17-orig/doc/automake.texi
++++ automake-1.17/doc/automake.texi
+@@ -1,7 +1,7 @@
+ \input texinfo   @c -*-texinfo-*-
+ @c %**start of header
+-@setfilename automake.info
+-@settitle automake
++@setfilename automake1.17.info
++@settitle automake1.17
+ @documentencoding UTF-8
+ @documentlanguage en
+ @setchapternewpage off
+@@ -40,13 +40,13 @@ section entitled ``GNU Free Documentation License.''
+ 
+ @dircategory Software development
+ @direntry
+-* Automake: (automake).         Making GNU standards-compliant Makefiles.
++* Automake1.17: (automake).         Making GNU standards-compliant Makefiles.
+ @end direntry
+ 
+ @dircategory Individual utilities
+ @direntry
+-* aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
+-* automake-invocation: (automake)automake Invocation. Generating Makefile.in.
++* aclocal-1.17-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
++* automake-1.17-invocation: (automake)automake Invocation. Generating Makefile.in.
+ @end direntry
+ 
+ @titlepage

automake1.17/automake-1.17-msys2.patch

@@ -0,0 +1,18 @@
+diff --git automake-1.17-orig/t/compile5.sh automake-1.17/t/compile5.sh
+index 67c46cc..ddf9683 100644
+--- automake-1.17-orig/t/compile5.sh
++++ automake-1.17/t/compile5.sh
+@@ -47,11 +47,11 @@ case '@host_os@' in
+     ;;
+ esac
+ case @build_os@ in
+-  mingw* | cygwin*)
++  mingw* | cygwin* | msys*)
+     ;;
+   *)
+     winepath -w / \
+-      || skip_ "not on MinGW or Cygwin, and winepath not available"
++      || skip_ "not on MinGW, Cygwin or MSYS, and winepath not available"
+     ;;
+ esac
+ END

automake1.18/PKGBUILD

@@ -0,0 +1,90 @@
+# Maintainer: Yang Kun <ikspress@outlook.com>
+
+_basever=1.18
+pkgname=automake${_basever}
+pkgver=${_basever}.1
+pkgrel=1
+pkgdesc="A GNU tool for automatically creating Makefiles"
+arch=('any')
+license=('spdx:GPL-2.0-or-later')
+url="https://www.gnu.org/software/automake"
+msys2_repository_url="https://cgit.git.savannah.gnu.org/cgit/automake.git"
+msys2_references=(
+  "cpe: cpe:/a:gnu:automake"
+)
+depends=('bash' 'perl')
+makedepends=('autoconf' 'make' 'texinfo')
+checkdepends=('bison' 'cscope' 'dejagnu' 'emacs' 'expect' 'flex' 'gcc' 'gettext'
+              'help2man' 'libtool' 'lzip' 'sharutils' 'texinfo-tex' 'zip')
+source=(https://ftp.gnu.org/gnu/automake/automake-${pkgver}.tar.xz{,.sig}
+        automake-1.18-documentation.patch
+        automake-1.17-msys2.patch)
+sha256sums=('168aa363278351b89af56684448f525a5bce5079d0b6842bd910fdd3f1646887'
+            'SKIP'
+            '3b066deda7ecb755a4cab8263f7fe7d5f44cf7790b45b5dcb48e5232f800856c'
+            'a6b3a7099fb23ddc3d1402b16df32cf8f21bb63ca6b9314ff7caff5869b6ed50')
+validpgpkeys=('17D3311B14BC0F248267BF020716748A30D155AD') # Karl Berry
+replace=('automake')
+
+# Helper macros to help make tasks easier #
+apply_patch_with_msg() {
+  for _fname in "$@"; do
+    msg2 "Applying ${_fname}"
+    patch -Nbp1 -i "${srcdir}/${_fname}"
+  done
+}
+
+del_file_exists() {
+  for _fname in "$@"; do
+    if [ -f $_fname ] || [ -d $_fname ]; then
+      rm -rf $_fname
+    fi
+  done
+}
+# =========================================== #
+
+prepare() {
+  cd "${srcdir}/automake-${pkgver}"
+
+  apply_patch_with_msg \
+    automake-1.18-documentation.patch \
+    automake-1.17-msys2.patch
+}
+
+build() {
+  cd "${srcdir}/automake-${pkgver}"
+  ./configure --prefix=/usr
+  make
+  # build versioned info files
+  cd doc
+  makeinfo automake.texi automake-history.texi
+}
+
+check() {
+  cd "${srcdir}/automake-${pkgver}"
+
+  make -k check || warning "Tests failed"
+}
+
+package() {
+  cd ${srcdir}/automake-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  mv "${pkgdir}/usr/share/aclocal/README" "${pkgdir}/usr/share/aclocal/README.am${_basever#*.}"
+
+  # remove the unversioned info files
+  rm -f "${pkgdir}"/usr/share/info/automake{,-history}.info*
+
+  # remove the unversioned executables
+  rm -f "${pkgdir}/usr/bin/automake" "${pkgdir}/usr/bin/aclocal"
+
+  # remove the unversioned man pages
+  rm -f "${pkgdir}/usr/share/man/man1/automake.1" \
+    "${pkgdir}/usr/share/man/man1/aclocal.1"
+
+  # remove amhello
+  rm -rf "${pkgdir}/usr/share/doc"
+
+  # install the versioned info files
+  install -Dm644 "${srcdir}"/automake-${pkgver}/doc/*${_basever}.info* -t "${pkgdir}/usr/share/info/"
+}

automake1.18/automake-1.17-msys2.patch

@@ -0,0 +1,18 @@
+diff --git automake-1.17-orig/t/compile5.sh automake-1.17/t/compile5.sh
+index 67c46cc..ddf9683 100644
+--- automake-1.17-orig/t/compile5.sh
++++ automake-1.17/t/compile5.sh
+@@ -47,11 +47,11 @@ case '@host_os@' in
+     ;;
+ esac
+ case @build_os@ in
+-  mingw* | cygwin*)
++  mingw* | cygwin* | msys*)
+     ;;
+   *)
+     winepath -w / \
+-      || skip_ "not on MinGW or Cygwin, and winepath not available"
++      || skip_ "not on MinGW, Cygwin or MSYS, and winepath not available"
+     ;;
+ esac
+ END

automake1.18/automake-1.18-documentation.patch

@@ -0,0 +1,45 @@
+diff --git automake-1.18-orig/doc/automake-history.texi automake-1.18/doc/automake-history.texi
+index 355e0d5..a01b052 100644
+--- automake-1.18-orig/doc/automake-history.texi
++++ automake-1.18/doc/automake-history.texi
+@@ -1,7 +1,7 @@
+ \input texinfo   @c -*-texinfo-*-
+ @c %**start of header
+-@setfilename automake-history.info
+-@settitle automake-history
++@setfilename automake-history1.18.info
++@settitle automake-history1.18
+ @setchapternewpage on
+ @c %**end of header
+ 
+diff --git automake-1.18-orig/doc/automake.texi automake-1.18/doc/automake.texi
+index 2f7d4a3..77ea767 100644
+--- automake-1.18-orig/doc/automake.texi
++++ automake-1.18/doc/automake.texi
+@@ -1,7 +1,7 @@
+ \input texinfo   @c -*-texinfo-*-
+ @c %**start of header
+-@setfilename automake.info
+-@settitle automake
++@setfilename automake1.18.info
++@settitle automake1.18
+ @documentencoding UTF-8
+ @documentlanguage en
+ @setchapternewpage off
+@@ -40,13 +40,13 @@ section entitled ``GNU Free Documentation License.''
+ 
+ @dircategory Software development
+ @direntry
+-* Automake: (automake).         Making GNU standards-compliant Makefiles.
++* Automake1.18: (automake).         Making GNU standards-compliant Makefiles.
+ @end direntry
+ 
+ @dircategory Individual utilities
+ @direntry
+-* aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
+-* automake-invocation: (automake)automake Invocation. Generating Makefile.in.
++* aclocal-1.18-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
++* automake-1.18-invocation: (automake)automake Invocation. Generating Makefile.in.
+ @end direntry
+ 
+ @titlepage