summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system/gettext-tiny/APKBUILD9
-rw-r--r--system/gettys-openrc/APKBUILD3
-rw-r--r--system/git/APKBUILD23
-rw-r--r--system/gmp/APKBUILD6
-rw-r--r--system/grep/APKBUILD5
-rw-r--r--system/gzip/APKBUILD2
6 files changed, 21 insertions, 27 deletions
diff --git a/system/gettext-tiny/APKBUILD b/system/gettext-tiny/APKBUILD
index 6edd0b4b3..a2e541df5 100644
--- a/system/gettext-tiny/APKBUILD
+++ b/system/gettext-tiny/APKBUILD
@@ -2,15 +2,14 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=gettext-tiny
pkgver=0.3.0_pre1
-pkgrel=6
+pkgrel=7
pkgdesc="An internationalisation and localisation system"
url="https://github.com/sabotage-linux/gettext-tiny"
arch="all"
options="!check" # No test suite.
license="MIT"
-depends="!gettext"
-depends_dev="!gettext-dev"
-install=""
+depends=""
+makedepends=""
subpackages="$pkgname-dev"
source="https://distfiles.adelielinux.org/source/$pkgname-$pkgver.tar.xz
omg-i-cant-believe-im-doing-ua-crap.patch
@@ -23,12 +22,10 @@ source="https://distfiles.adelielinux.org/source/$pkgname-$pkgver.tar.xz
"
build() {
- cd "$builddir"
make LIBINTL=MUSL prefix=/usr
}
package() {
- cd "$builddir"
make LIBINTL=MUSL DESTDIR="$pkgdir" prefix=/usr install
}
diff --git a/system/gettys-openrc/APKBUILD b/system/gettys-openrc/APKBUILD
index 7ce5b8e09..4fab39d06 100644
--- a/system/gettys-openrc/APKBUILD
+++ b/system/gettys-openrc/APKBUILD
@@ -4,11 +4,12 @@ pkgname=gettys-openrc
pkgver=0.0.2.1
pkgrel=0
pkgdesc="Dynamic getty services"
-url="https://adelielinux.org/"
+url="https://www.adelielinux.org/"
arch="noarch"
options="!check" # No test suite.
license="NCSA"
depends="execline s6"
+makedepends=""
source="gettys.confd gettys.initd"
package() {
diff --git a/system/git/APKBUILD b/system/git/APKBUILD
index 505ae0a0d..35b792322 100644
--- a/system/git/APKBUILD
+++ b/system/git/APKBUILD
@@ -3,19 +3,14 @@
pkgname=git
pkgver=2.24.0
pkgrel=0
-pkgdesc="A distributed version control system"
+pkgdesc="Distributed version control system"
url="https://www.git-scm.com/"
arch="all"
license="GPL-2.0+"
depends="perl-error"
-replaces="git-perl perl-git"
-
-# secfixes:
-# 2.19.2:
-# - CVE-2018-19486
-# 2.14.1:
-# - CVE-2017-1000117
-
+checkdepends="python3"
+makedepends="zlib-dev openssl-dev curl-dev expat-dev perl-dev
+ pcre2-dev asciidoctor xmlto perl-error docbook-xsl-ns"
# note that order matters
subpackages="$pkgname-doc
$pkgname-bash-completion:completion:noarch
@@ -28,9 +23,7 @@ subpackages="$pkgname-doc
$pkgname-subtree::noarch
$pkgname-subtree-doc:subtree_doc:noarch
"
-makedepends="zlib-dev openssl-dev curl-dev expat-dev perl-dev
- pcre2-dev asciidoctor xmlto perl-error docbook-xsl-ns"
-checkdepends="python3"
+replaces="git-perl perl-git"
source="https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar.xz
dont-test-other-encodings.patch
git-daemon.initd
@@ -38,6 +31,12 @@ source="https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar.xz
"
_gitcoredir=/usr/libexec/git-core
+# secfixes:
+# 2.19.2:
+# - CVE-2018-19486
+# 2.14.1:
+# - CVE-2017-1000117
+
prepare() {
default_prepare
cat >> config.mak <<-EOF
diff --git a/system/gmp/APKBUILD b/system/gmp/APKBUILD
index 69f4b2c9c..ab8f1b70b 100644
--- a/system/gmp/APKBUILD
+++ b/system/gmp/APKBUILD
@@ -6,21 +6,19 @@ pkgdesc="A free library for arbitrary precision arithmetic"
url="https://gmplib.org/"
arch="all"
license="LGPL-3.0+ OR GPL-2.0+"
+depends=""
makedepends="m4 texinfo libtool"
-depends=
subpackages="$pkgname-doc $pkgname-dev libgmpxx"
source="https://gmplib.org/download/gmp/gmp-$pkgver.tar.xz
"
prepare() {
- cd "$builddir"
default_prepare
# force update to libtool with fixed cross-build support
libtoolize -f
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -35,12 +33,10 @@ build() {
}
package() {
- cd "$builddir"
make -j1 DESTDIR="${pkgdir}" install
}
check() {
- cd "$builddir"
[ "$CBUILD" = "$CHOST" ] && make check
}
diff --git a/system/grep/APKBUILD b/system/grep/APKBUILD
index 962d7d1e1..e8225712c 100644
--- a/system/grep/APKBUILD
+++ b/system/grep/APKBUILD
@@ -4,12 +4,13 @@
pkgname=grep
pkgver=3.3
pkgrel=0
-pkgdesc="Searches input files for lines containing a match to a specified pattern"
+pkgdesc="Pattern matching utilities"
url="https://www.gnu.org/software/grep/grep.html"
arch="all"
license="GPL-3.0+"
-makedepends="pcre-dev autoconf automake"
+depends=""
checkdepends="coreutils bash diffutils"
+makedepends="pcre-dev autoconf automake"
subpackages="$pkgname-doc $pkgname-lang"
source="https://mirrors.kernel.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz
gnulib-tests-dont-require-gpg-passphrase.patch
diff --git a/system/gzip/APKBUILD b/system/gzip/APKBUILD
index 698fc2c74..8528c74e6 100644
--- a/system/gzip/APKBUILD
+++ b/system/gzip/APKBUILD
@@ -4,7 +4,7 @@
pkgname=gzip
pkgver=1.10
pkgrel=0
-pkgdesc="A popular data compression program"
+pkgdesc="The GNU data compression program"
subpackages="$pkgname-doc"
url="https://www.gnu.org/software/gzip/"
arch="all"