system/[various]: fix maintainer, tweak configs

7 files changed, 17 insertions, 36 deletions

diff --git a/system/binutils/APKBUILD b/system/binutils/APKBUILD
index 95d3ca91c..1b9705ac5 100644
--- a/system/binutils/APKBUILD
+++ b/system/binutils/APKBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=binutils
 pkgver=2.30
 pkgrel=1
diff --git a/system/check/APKBUILD b/system/check/APKBUILD
index 09af1b010..1f1b6186c 100644
--- a/system/check/APKBUILD
+++ b/system/check/APKBUILD
@@ -1,31 +1,26 @@
 # Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
-# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=check
 pkgver=0.12.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A unit test framework for C"
 url="https://libcheck.github.io/check/"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.1+"
 makedepends="pkgconfig"
 checkdepends="diffutils"
 subpackages="$pkgname-doc $pkgname-dev"
 source="https://github.com/libcheck/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.gz"
 
-builddir="$srcdir"/$pkgname-$pkgver
-
 build() {
 	cd "$builddir"
-	# NOTE: disabled forking due to hardened
-	# https://github.com/libcheck/check/issues/138
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--localstatedir=/var \
-		--disable-fork
+		--localstatedir=/var
 	make
 }
 
diff --git a/system/clang/APKBUILD b/system/clang/APKBUILD
index d23bb3675..a0899df80 100644
--- a/system/clang/APKBUILD
+++ b/system/clang/APKBUILD
@@ -1,5 +1,5 @@
 # Contributor Travis Tilley <ttilley@gmail.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=clang
 # Note: Update together with llvm.
 pkgver=4.0.0
diff --git a/system/cloog/APKBUILD b/system/cloog/APKBUILD
index d39df3ba4..13cf097ee 100644
--- a/system/cloog/APKBUILD
+++ b/system/cloog/APKBUILD
@@ -1,12 +1,12 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Adelie Platform Group <adelie-devel@lists.adelielinux.org>
 pkgname=cloog
 pkgver=0.18.4
 pkgrel=1
 pkgdesc="The Chunky Loop Generator"
 url="http://www.cloog.org/"
 arch="all"
-license="GPL-2.0-or-later"
+license="GPL-2.0+"
 depends=""
 depends_dev="gmp-dev isl-dev"
 makedepends_host="$depends_dev"
@@ -15,19 +15,8 @@ install=""
 subpackages="$pkgname-dev"
 source="http://www.bastoul.net/cloog/pages/download/$pkgname-$pkgver.tar.gz"
 
-_builddir="$srcdir"/$pkgname-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -37,16 +26,13 @@ build() {
 		--infodir=/usr/share/info \
 		--localstatedir=/var \
 		--with-sysroot=${CBUILDROOT} \
-		--with-isl=system \
-		|| return 1
-	make || return 1
+		--with-isl=system
+	make
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" INSTALL="install -D" install || return 1
+	cd "$builddir"
+	make DESTDIR="$pkgdir" INSTALL="install -D" install
 }
 
-md5sums="e531f725244856c92c9bba009ff44faf  cloog-0.18.4.tar.gz"
-sha256sums="325adf3710ce2229b7eeb9e84d3b539556d093ae860027185e7af8a8b00a750e  cloog-0.18.4.tar.gz"
 sha512sums="d35d67b08ffe13c1a010b65bfe4dd02b0ae013d5b489e330dc950bd3514defca8f734bd37781856dcedf0491ff6122c34eecb4b0fe32a22d7e6bdadea98c8c23  cloog-0.18.4.tar.gz"
diff --git a/system/easy-kernel/APKBUILD b/system/easy-kernel/APKBUILD
index 4fcecd4b1..167c7db77 100644
--- a/system/easy-kernel/APKBUILD
+++ b/system/easy-kernel/APKBUILD
@@ -1,5 +1,5 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
-# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: Adelie Platform Group <adelie-devel@lists.adelielinux.org>
 _pkgname=easy-kernel
 pkgver=4.14.48
 pkgrel=8
diff --git a/system/llvm4/APKBUILD b/system/llvm4/APKBUILD
index 236fb1fc5..0841affab 100644
--- a/system/llvm4/APKBUILD
+++ b/system/llvm4/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Travis Tilley <ttilley@gmail.com>
 # Contributor: Mitch Tishmack <mitch.tishmack@gmail.com>
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
-# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
 _pkgname=llvm
 pkgver=4.0.0
 _majorver=${pkgver%%.*}
diff --git a/system/make/APKBUILD b/system/make/APKBUILD
index 6843986ca..3e69eb882 100644
--- a/system/make/APKBUILD
+++ b/system/make/APKBUILD
@@ -1,11 +1,11 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=make
 pkgver=4.2.1
 pkgrel=1
 pkgdesc="GNU make utility to maintain groups of programs"
 url="https://www.gnu.org/software/make"
 arch="all"
-license="GPL-3.0-or-later"
+license="GPL-3.0+"
 depends=""
 subpackages="$pkgname-doc"
 source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.bz2