From 366d66307348411cf4bc230fa35e69e31961021c Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sun, 4 Oct 2020 17:17:31 +0000
Subject: make: update to 4.3

---
 abs/core/make/PKGBUILD        | 40 ++++++++++++++++------------------------
 abs/core/make/guile-2.2.patch | 15 ---------------
 2 files changed, 16 insertions(+), 39 deletions(-)
 delete mode 100644 abs/core/make/guile-2.2.patch

diff --git a/abs/core/make/PKGBUILD b/abs/core/make/PKGBUILD
index 4d6b494..642e25f 100644
--- a/abs/core/make/PKGBUILD
+++ b/abs/core/make/PKGBUILD
@@ -1,41 +1,33 @@
-# $Id$
-# Maintainer: Allan McRae <allan@archlinux.org>
+# Maintainer: Lukas Fleischer <lfleischer@archlinux.org>
+# Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=make
-pkgver=4.2.1
-pkgrel=2
+pkgver=4.3
+pkgrel=3
 pkgdesc="GNU make utility to maintain groups of programs"
 arch=('x86_64')
-url="http://www.gnu.org/software/make"
+url="https://www.gnu.org/software/make"
 license=('GPL3')
 groups=('base-devel')
 depends=('glibc' 'guile')
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
-        guile-2.2.patch)
-md5sums=('15b012617e7c44c0ed482721629577ac'
-         'SKIP'
-         '89bbbe3f806f208608e117665feb562b')
-validpgpkeys=('3D2554F0A15338AB9AF1BB9D96B047156338B6D4')   # Paul Smith
-
-prepare() {
-  cd ${pkgname}-${pkgver}
-  patch -p1 -i ${srcdir}/guile-2.2.patch
-  autoreconf -fi
-}
+source=("https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.lz"{,.sig})
+md5sums=('d5c40e7bd1e97a7404f5d3be982f479a'
+         'SKIP')
+validpgpkeys=('6D4EEB02AD834703510B117680CB727A20C79BB2')   # Paul Smith
 
 build() {
-  cd ${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make
+	cd "${pkgname}-${pkgver}"
+	./configure --prefix=/usr
+	make
 }
 
 check() {
-  cd ${pkgname}-${pkgver}
-  make -k check
+	cd "${pkgname}-${pkgver}"
+	make -k check
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+	cd "${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
 }
diff --git a/abs/core/make/guile-2.2.patch b/abs/core/make/guile-2.2.patch
deleted file mode 100644
index 8e4cbc0..0000000
--- a/abs/core/make/guile-2.2.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 64ec870..eb1139f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -168,8 +168,8 @@ AC_ARG_WITH([guile], [AS_HELP_STRING([--with-guile],
- # comes with it's own PC file so we have to specify them as individual
- # packages.  Ugh.
- AS_IF([test "x$with_guile" != xno],
--[ PKG_CHECK_MODULES([GUILE], [guile-2.0], [have_guile=yes],
--  [PKG_CHECK_MODULES([GUILE], [guile-1.8], [have_guile=yes],
-+[ PKG_CHECK_MODULES([GUILE], [guile-2.2], [have_guile=yes],
-+  [PKG_CHECK_MODULES([GUILE], [guile-2.0], [have_guile=yes],
-     [have_guile=no])])
- ])
- 
-- 
cgit v0.12