aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2020-03-16 02:26:02 -0300
committerLeo <thinkabit.ukim@gmail.com>2020-03-23 12:07:30 -0300
commit41ab224df12b8487004a1522b4f671680c082954 (patch)
tree9ebbc4ea5d1cfb82757ca1fd862b67e444a712a2
parent1f40937c55d742c7ae05db34c966c3dd2d6595e7 (diff)
downloadaports-41ab224df12b8487004a1522b4f671680c082954.tar.gz
aports-41ab224df12b8487004a1522b4f671680c082954.tar.bz2
aports-41ab224df12b8487004a1522b4f671680c082954.tar.xz
community/*: move lots of stuff from main and modernize
-rw-r--r--community/aria2/APKBUILD (renamed from main/aria2/APKBUILD)3
-rw-r--r--community/aria2/aria2-daemon.pre-install (renamed from main/aria2/aria2-daemon.pre-install)0
-rw-r--r--community/aria2/aria2.conf (renamed from main/aria2/aria2.conf)0
-rw-r--r--community/aria2/aria2.confd (renamed from main/aria2/aria2.confd)0
-rw-r--r--community/aria2/aria2.initd (renamed from main/aria2/aria2.initd)0
-rw-r--r--community/aria2/aria2.logrotate (renamed from main/aria2/aria2.logrotate)0
-rw-r--r--community/cabextract/APKBUILD (renamed from main/cabextract/APKBUILD)16
-rw-r--r--community/cadaver/APKBUILD (renamed from main/cadaver/APKBUILD)26
-rw-r--r--community/cadaver/disable-nls.patch (renamed from main/cadaver/disable-nls.patch)0
-rw-r--r--community/cadaver/neon.patch (renamed from main/cadaver/neon.patch)0
-rw-r--r--community/cpufreqd/APKBUILD (renamed from main/cpufreqd/APKBUILD)0
-rw-r--r--community/cpufreqd/cpufreqd.initd (renamed from main/cpufreqd/cpufreqd.initd)0
-rw-r--r--community/cpulimit/APKBUILD (renamed from main/cpulimit/APKBUILD)3
-rw-r--r--community/cpulimit/no-sysctl.patch (renamed from main/cpulimit/no-sysctl.patch)0
-rw-r--r--community/darkstat/APKBUILD (renamed from main/darkstat/APKBUILD)18
-rw-r--r--community/eggdbus/APKBUILD (renamed from main/eggdbus/APKBUILD)10
-rw-r--r--community/farstream/APKBUILD (renamed from main/farstream/APKBUILD)3
-rw-r--r--community/json-glib/APKBUILD (renamed from main/json-glib/APKBUILD)0
-rw-r--r--community/libatasmart/APKBUILD (renamed from main/libatasmart/APKBUILD)10
-rw-r--r--community/libbytesize/APKBUILD (renamed from main/libbytesize/APKBUILD)0
-rw-r--r--community/libcrystalhd/APKBUILD (renamed from main/libcrystalhd/APKBUILD)0
-rw-r--r--community/libcrystalhd/gcc-opts-fix.patch (renamed from main/libcrystalhd/gcc-opts-fix.patch)0
-rw-r--r--community/libebml/APKBUILD (renamed from main/libebml/APKBUILD)0
-rw-r--r--community/libfprint/APKBUILD (renamed from main/libfprint/APKBUILD)2
-rw-r--r--community/libfprint/fix-stderr.patch (renamed from main/libfprint/fix-stderr.patch)0
-rw-r--r--community/libgee/APKBUILD (renamed from main/libgee/APKBUILD)0
-rw-r--r--community/libgss/APKBUILD (renamed from main/libgss/APKBUILD)27
-rw-r--r--community/libgssglue/APKBUILD (renamed from main/libgssglue/APKBUILD)8
-rw-r--r--community/libgssglue/gssapi_mech.conf (renamed from main/libgssglue/gssapi_mech.conf)0
-rw-r--r--community/libmatroska/APKBUILD (renamed from main/libmatroska/APKBUILD)6
-rw-r--r--community/libmicrohttpd/APKBUILD (renamed from main/libmicrohttpd/APKBUILD)3
-rw-r--r--community/libmicrohttpd/disable-test_options.patch (renamed from main/libmicrohttpd/disable-test_options.patch)0
-rw-r--r--community/libmowgli/APKBUILD (renamed from main/libmowgli/APKBUILD)0
-rw-r--r--community/libmowgli/cacheline.patch (renamed from main/libmowgli/cacheline.patch)0
-rw-r--r--community/libmp3splt/APKBUILD (renamed from main/libmp3splt/APKBUILD)22
-rw-r--r--community/libmspack/APKBUILD (renamed from main/libmspack/APKBUILD)3
-rw-r--r--community/libmtp/APKBUILD (renamed from main/libmtp/APKBUILD)0
-rw-r--r--community/libnjb/APKBUILD (renamed from main/libnjb/APKBUILD)24
-rw-r--r--community/libnotify/APKBUILD (renamed from main/libnotify/APKBUILD)0
-rw-r--r--community/libsexy/APKBUILD (renamed from main/libsexy/APKBUILD)0
-rw-r--r--community/libssh/APKBUILD (renamed from main/libssh/APKBUILD)0
-rw-r--r--community/libunique/APKBUILD (renamed from main/libunique/APKBUILD)8
-rw-r--r--community/libunique/g_const_return.patch (renamed from main/libunique/g_const_return.patch)0
-rw-r--r--community/libunique3/APKBUILD (renamed from main/libunique3/APKBUILD)5
-rw-r--r--community/libvncserver/APKBUILD (renamed from main/libvncserver/APKBUILD)3
-rw-r--r--community/libvncserver/CVE-2019-15681.patch (renamed from main/libvncserver/CVE-2019-15681.patch)0
-rw-r--r--community/loudmouth/APKBUILD (renamed from main/loudmouth/APKBUILD)6
-rw-r--r--community/makekit/APKBUILD (renamed from main/makekit/APKBUILD)12
-rw-r--r--community/mp3splt/APKBUILD (renamed from main/mp3splt/APKBUILD)24
-rw-r--r--community/multisort/APKBUILD (renamed from main/multisort/APKBUILD)4
-rw-r--r--community/multisort/multisort-syslog-support.patch (renamed from main/multisort/multisort-syslog-support.patch)0
-rw-r--r--community/myrepos/APKBUILD (renamed from main/myrepos/APKBUILD)29
-rw-r--r--community/ndctl/APKBUILD (renamed from main/ndctl/APKBUILD)2
-rw-r--r--community/openpgm/APKBUILD (renamed from main/openpgm/APKBUILD)0
-rw-r--r--community/openpgm/libpgm-fix-pkgconfig.patch (renamed from main/openpgm/libpgm-fix-pkgconfig.patch)0
-rw-r--r--community/openpgm/openpgm-fix-includes.patch (renamed from main/openpgm/openpgm-fix-includes.patch)0
-rw-r--r--community/openpgm/python3.patch (renamed from main/openpgm/python3.patch)0
-rw-r--r--community/sdl_image/APKBUILD (renamed from main/sdl_image/APKBUILD)7
-rw-r--r--community/sdl_image/CVE-2019-13616.patch (renamed from main/sdl_image/CVE-2019-13616.patch)0
-rw-r--r--community/sdl_mixer/APKBUILD (renamed from main/sdl_mixer/APKBUILD)22
-rw-r--r--community/sessreg/APKBUILD (renamed from main/sessreg/APKBUILD)4
-rw-r--r--community/sessreg/missing_path_wtmpx.patch (renamed from main/sessreg/missing_path_wtmpx.patch)0
-rw-r--r--community/sparsehash/APKBUILD (renamed from main/sparsehash/APKBUILD)27
-rw-r--r--community/sysstat/APKBUILD (renamed from main/sysstat/APKBUILD)0
-rw-r--r--community/the_silver_searcher/APKBUILD (renamed from main/the_silver_searcher/APKBUILD)4
-rw-r--r--community/tinyxml/APKBUILD (renamed from main/tinyxml/APKBUILD)31
-rw-r--r--community/tinyxml/tinyxml-2.6.1-entity.patch (renamed from main/tinyxml/tinyxml-2.6.1-entity.patch)0
-rw-r--r--community/tinyxml/tinyxml-2.6.2-defineSTL.patch (renamed from main/tinyxml/tinyxml-2.6.2-defineSTL.patch)0
-rw-r--r--community/tsocks/APKBUILD (renamed from main/tsocks/APKBUILD)24
-rw-r--r--community/tsocks/configure.patch (renamed from main/tsocks/configure.patch)0
-rw-r--r--community/vsftpd/APKBUILD (renamed from main/vsftpd/APKBUILD)8
-rw-r--r--community/vsftpd/CVE-2015-1419.patch (renamed from main/vsftpd/CVE-2015-1419.patch)0
-rw-r--r--community/vsftpd/findlibs.patch (renamed from main/vsftpd/findlibs.patch)0
-rw-r--r--community/vsftpd/strip.patch (renamed from main/vsftpd/strip.patch)0
-rw-r--r--community/vsftpd/vsftpd-clearenv.patch (renamed from main/vsftpd/vsftpd-clearenv.patch)0
-rw-r--r--community/vsftpd/vsftpd-enable-ssl.patch (renamed from main/vsftpd/vsftpd-enable-ssl.patch)0
-rw-r--r--community/vsftpd/vsftpd.confd (renamed from main/vsftpd/vsftpd.confd)0
-rw-r--r--community/vsftpd/vsftpd.initd (renamed from main/vsftpd/vsftpd.initd)0
-rwxr-xr-xcommunity/vsftpd/vsftpd.pre-install (renamed from main/vsftpd/vsftpd.pre-install)0
-rw-r--r--community/vsftpd/wtmpx_file.patch (renamed from main/vsftpd/wtmpx_file.patch)0
-rw-r--r--community/xmlstarlet/APKBUILD (renamed from main/xmlstarlet/APKBUILD)14
-rw-r--r--main/command-not-found/APKBUILD6
-rw-r--r--main/libotr/APKBUILD20
-rw-r--r--main/libotr3/APKBUILD61
-rw-r--r--testing/json-c0.12/APKBUILD (renamed from main/json-c0.12/APKBUILD)8
85 files changed, 123 insertions, 390 deletions
diff --git a/main/aria2/APKBUILD b/community/aria2/APKBUILD
index 54f714bf33..7a90f8a868 100644
--- a/main/aria2/APKBUILD
+++ b/community/aria2/APKBUILD
@@ -24,7 +24,6 @@ source="https://github.com/aria2/aria2/releases/download/release-$pkgver/aria2-$
"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -39,12 +38,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/main/aria2/aria2-daemon.pre-install b/community/aria2/aria2-daemon.pre-install
index c2cb5d2664..c2cb5d2664 100644
--- a/main/aria2/aria2-daemon.pre-install
+++ b/community/aria2/aria2-daemon.pre-install
diff --git a/main/aria2/aria2.conf b/community/aria2/aria2.conf
index abca1ea739..abca1ea739 100644
--- a/main/aria2/aria2.conf
+++ b/community/aria2/aria2.conf
diff --git a/main/aria2/aria2.confd b/community/aria2/aria2.confd
index d0381c75e7..d0381c75e7 100644
--- a/main/aria2/aria2.confd
+++ b/community/aria2/aria2.confd
diff --git a/main/aria2/aria2.initd b/community/aria2/aria2.initd
index c8e2edcc2f..c8e2edcc2f 100644
--- a/main/aria2/aria2.initd
+++ b/community/aria2/aria2.initd
diff --git a/main/aria2/aria2.logrotate b/community/aria2/aria2.logrotate
index e73ffc0444..e73ffc0444 100644
--- a/main/aria2/aria2.logrotate
+++ b/community/aria2/aria2.logrotate
diff --git a/main/cabextract/APKBUILD b/community/cabextract/APKBUILD
index 9ee0e853cd..363ffe75b0 100644
--- a/main/cabextract/APKBUILD
+++ b/community/cabextract/APKBUILD
@@ -3,21 +3,19 @@ pkgname=cabextract
pkgver=1.9.1
pkgrel=0
pkgdesc="Tool for extracting Microsoft cabinet files"
+options="!check" # TODO: tests
url="https://www.cabextract.org.uk/"
arch="all"
license="GPL-2.0-or-later"
-subpackages="$pkgname-doc"
makedepends="libmspack-dev"
-source="https://www.cabextract.org.uk/$pkgname-$pkgver.tar.gz"
-
-builddir="$srcdir/$pkgname-$pkgver"
+subpackages="$pkgname-doc"
+source="https://www.cabextract.org.uk/cabextract-$pkgver.tar.gz"
# secfixes:
# 1.8-r0:
-# - CVE-2018-18584
+# - CVE-2018-18584
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -29,13 +27,7 @@ build() {
make
}
-check() {
- cd "$builddir"
- ./cabextract --version > /dev/null
-}
-
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/main/cadaver/APKBUILD b/community/cadaver/APKBUILD
index 423ce46fce..decefb196a 100644
--- a/main/cadaver/APKBUILD
+++ b/community/cadaver/APKBUILD
@@ -4,47 +4,35 @@ pkgname=cadaver
pkgver=0.23.3
pkgrel=4
pkgdesc="Cadaver is a command line webDAV client for Linux"
+options="!check"
url="http://webdav.org/cadaver/"
arch="all"
-license="GPL"
-depends=""
-depends_dev=""
+license="GPL-2.0-or-later"
makedepends="libproxy-dev neon-dev expat-dev"
-install=""
subpackages="$pkgname-doc"
source="https://dev.alpinelinux.org/archive/cadaver/cadaver-$pkgver.tar.gz
neon.patch
- disable-nls.patch"
-
-builddir=${srcdir}/${pkgname}-${pkgver}
+ disable-nls.patch
+ "
prepare() {
- cd "$builddir"
update_config_sub
default_prepare
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
- --prefix=/usr \
- --with-ssl \
+ --prefix=/usr \
+ --with-ssl \
--with-expat \
--with-neon \
--disable-nls
- make
-}
-
-check() {
- msg "Running testsuites..."
- "$builddir"/cadaver --help > /dev/null || ret=$?
- [ $ret = 255 ]
+ make
}
package() {
- cd "$builddir"
make prefix=$pkgdir/usr install
}
diff --git a/main/cadaver/disable-nls.patch b/community/cadaver/disable-nls.patch
index 41e723973c..41e723973c 100644
--- a/main/cadaver/disable-nls.patch
+++ b/community/cadaver/disable-nls.patch
diff --git a/main/cadaver/neon.patch b/community/cadaver/neon.patch
index 10a581a574..10a581a574 100644
--- a/main/cadaver/neon.patch
+++ b/community/cadaver/neon.patch
diff --git a/main/cpufreqd/APKBUILD b/community/cpufreqd/APKBUILD
index 7a1204b4c8..7a1204b4c8 100644
--- a/main/cpufreqd/APKBUILD
+++ b/community/cpufreqd/APKBUILD
diff --git a/main/cpufreqd/cpufreqd.initd b/community/cpufreqd/cpufreqd.initd
index 39b8b73ea4..39b8b73ea4 100644
--- a/main/cpufreqd/cpufreqd.initd
+++ b/community/cpufreqd/cpufreqd.initd
diff --git a/main/cpulimit/APKBUILD b/community/cpulimit/APKBUILD
index 3e6787ea48..b9d0344f68 100644
--- a/main/cpulimit/APKBUILD
+++ b/community/cpulimit/APKBUILD
@@ -11,17 +11,14 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/opsengine/cpulimit/archive/v
"
build() {
- cd "$builddir"
make -C src
}
check() {
- cd "$builddir"
make -C tests
}
package() {
- cd "$builddir"
install -Dm755 src/cpulimit "$pkgdir"/usr/bin/cpulimit
}
diff --git a/main/cpulimit/no-sysctl.patch b/community/cpulimit/no-sysctl.patch
index bd6a04468d..bd6a04468d 100644
--- a/main/cpulimit/no-sysctl.patch
+++ b/community/cpulimit/no-sysctl.patch
diff --git a/main/darkstat/APKBUILD b/community/darkstat/APKBUILD
index 0ec2d171bf..daa5ae32ad 100644
--- a/main/darkstat/APKBUILD
+++ b/community/darkstat/APKBUILD
@@ -6,30 +6,20 @@ pkgrel=1
pkgdesc="Captures network traffic, calculates statistics about usage, and serves reports over HTTP"
url="https://unix4lyfe.org/darkstat/"
arch="all"
-license="BSD"
+license="GPL-2.0-only"
makedepends="zlib-dev libpcap-dev"
subpackages="$pkgname-doc"
-source="https://unix4lyfe.org/$pkgname/$pkgname-$pkgver.tar.bz2"
-
-builddir="$srcdir/$pkgname-$pkgver"
+source="https://unix4lyfe.org/darkstat/darkstat-$pkgver.tar.bz2"
build() {
- cd "$builddir"
- ./configure \
+ ./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr
- make
- }
-
-
-check() {
- cd "$builddir"
- ./darkstat --help > /dev/null
+ make
}
package() {
- cd "$builddir"
make DESTDIR=$pkgdir install
}
diff --git a/main/eggdbus/APKBUILD b/community/eggdbus/APKBUILD
index eb88badcf8..0cc53c9dc0 100644
--- a/main/eggdbus/APKBUILD
+++ b/community/eggdbus/APKBUILD
@@ -6,21 +6,17 @@ pkgrel=5
pkgdesc="Experimental D-Bus bindings for GObject"
url="https://cgit.freedesktop.org/~david/eggdbus"
arch="all"
-license="GPL"
+license="LGPL-2.1-or-later"
makedepends="glib-dev dbus-glib-dev"
subpackages="$pkgname-dev $pkgname-doc"
-source="https://hal.freedesktop.org/releases/$pkgname-$pkgver.tar.gz"
-
-builddir="$srcdir"/$pkgname-$pkgver
+source="https://hal.freedesktop.org/releases/eggdbus-$pkgver.tar.gz"
prepare() {
default_prepare
- cd "$builddir"
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -33,12 +29,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/main/farstream/APKBUILD b/community/farstream/APKBUILD
index 7e0d8c81e1..6fccb65eb1 100644
--- a/main/farstream/APKBUILD
+++ b/community/farstream/APKBUILD
@@ -12,9 +12,7 @@ makedepends="$depends_dev gobject-introspection-dev gstreamer-dev"
subpackages="$pkgname-dev $pkgname-doc"
source="https://freedesktop.org/software/farstream/releases/farstream/farstream-$pkgver.tar.gz"
-
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -24,7 +22,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/main/json-glib/APKBUILD b/community/json-glib/APKBUILD
index 7e16c8bafe..7e16c8bafe 100644
--- a/main/json-glib/APKBUILD
+++ b/community/json-glib/APKBUILD
diff --git a/main/libatasmart/APKBUILD b/community/libatasmart/APKBUILD
index 31b04328c2..824d47c4ef 100644
--- a/main/libatasmart/APKBUILD
+++ b/community/libatasmart/APKBUILD
@@ -7,22 +7,18 @@ pkgdesc="ATA S.M.A.R.T. Reading and Parsing Library"
url="http://0pointer.de/blog/projects/being-smart.html"
arch="all"
options="!check" # No test suite.
-license="LGPL-2.1+"
-depends=
+license="LGPL-2.1-or-later"
depends_dev="eudev-dev"
makedepends="$depends_dev linux-headers"
-install=
subpackages="$pkgname-dev $pkgname-doc"
-source="http://0pointer.de/public/$pkgname-$pkgver.tar.xz"
+source="http://0pointer.de/public/libatasmart-$pkgver.tar.xz"
prepare() {
- cd "$builddir"
update_config_sub
default_prepare
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -32,12 +28,10 @@ build() {
--infodir=/usr/share/info \
--disable-static \
--localstatedir=/var
-
make
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/main/libbytesize/APKBUILD b/community/libbytesize/APKBUILD
index 56c9a3d79c..56c9a3d79c 100644
--- a/main/libbytesize/APKBUILD
+++ b/community/libbytesize/APKBUILD
diff --git a/main/libcrystalhd/APKBUILD b/community/libcrystalhd/APKBUILD
index eadf0f116d..eadf0f116d 100644
--- a/main/libcrystalhd/APKBUILD
+++ b/community/libcrystalhd/APKBUILD
diff --git a/main/libcrystalhd/gcc-opts-fix.patch b/community/libcrystalhd/gcc-opts-fix.patch
index 8c27216cdc..8c27216cdc 100644
--- a/main/libcrystalhd/gcc-opts-fix.patch
+++ b/community/libcrystalhd/gcc-opts-fix.patch
diff --git a/main/libebml/APKBUILD b/community/libebml/APKBUILD
index 41aacc2734..41aacc2734 100644
--- a/main/libebml/APKBUILD
+++ b/community/libebml/APKBUILD
diff --git a/main/libfprint/APKBUILD b/community/libfprint/APKBUILD
index efe0a90b62..30762c73a4 100644
--- a/main/libfprint/APKBUILD
+++ b/community/libfprint/APKBUILD
@@ -21,7 +21,6 @@ source="https://gitlab.freedesktop.org/libfprint/libfprint/uploads/aff93e9921d1c
"
build() {
- cd "$builddir"
meson \
--prefix /usr \
--buildtype=plain \
@@ -32,7 +31,6 @@ build() {
}
package() {
- cd "$builddir"
DESTDIR="$pkgdir" ninja -C output install
}
diff --git a/main/libfprint/fix-stderr.patch b/community/libfprint/fix-stderr.patch
index cde438231e..cde438231e 100644
--- a/main/libfprint/fix-stderr.patch
+++ b/community/libfprint/fix-stderr.patch
diff --git a/main/libgee/APKBUILD b/community/libgee/APKBUILD
index 7296ea2668..7296ea2668 100644
--- a/main/libgee/APKBUILD
+++ b/community/libgee/APKBUILD
diff --git a/main/libgss/APKBUILD b/community/libgss/APKBUILD
index c89d839683..a17e8b8fb3 100644
--- a/main/libgss/APKBUILD
+++ b/community/libgss/APKBUILD
@@ -7,31 +7,34 @@ pkgdesc="An implementation of the Generic Security Service Application Program I
url="https://www.gnu.org/software/gss/"
arch="all"
license="GPL-3.0-or-later"
-depends=""
depends_dev="pkgconfig"
makedepends="$depends_dev"
-install=""
subpackages="$pkgname-dev $pkgname-doc"
source="ftp://alpha.gnu.org/gnu/gss/gss-$pkgver.tar.gz"
-_builddir="$srcdir"/gss-$pkgver
+builddir="$srcdir"/gss-$pkgver
+
+prepare() {
+ default_prepare
+ update_config_guess
+}
build() {
- cd "$_builddir"
- update_config_guess || return 1
- ./configure --prefix=/usr \
+ ./configure \
+ --prefix=/usr \
--sysconfdir=/etc \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
--localstatedir=/var \
- --disable-nls \
- || return 1
- make || return 1
- make tests || return 1
+ --disable-nls
+ make
+}
+
+check() {
+ make tests
}
package() {
- cd "$_builddir"
- make DESTDIR="$pkgdir" install || return 1
+ make DESTDIR="$pkgdir" install
}
sha512sums="5dd76b763b787dfa90d378420272236a6ebc29d5d123460bea9951e8e57c1725e4b3164447e9c0f01e7cf031fd177daee45f3ccdc7bbe8f73f118898966280e7 gss-0.1.5.tar.gz"
diff --git a/main/libgssglue/APKBUILD b/community/libgssglue/APKBUILD
index 2fec04f309..c5ae9a9afd 100644
--- a/main/libgssglue/APKBUILD
+++ b/community/libgssglue/APKBUILD
@@ -5,22 +5,19 @@ pkgrel=1
pkgdesc="exports a gssapi interface which calls other random gssapi libraries"
url="http://www.citi.umich.edu/projects/nfsv4/linux/"
arch="all"
-license="BSD"
+license="BSD-3-Clause"
# heimdal-{dev,libs} is needed for gssapi_mech.conf
depends="heimdal-dev heimdal-libs"
subpackages="$pkgname-dev $pkgname-doc"
-source="http://www.citi.umich.edu/projects/nfsv4/linux/$pkgname/$pkgname-$pkgver.tar.gz
+source="http://www.citi.umich.edu/projects/nfsv4/linux/libgssglue/libgssglue-$pkgver.tar.gz
gssapi_mech.conf"
-builddir="$srcdir"/$pkgname-$pkgver
prepare() {
default_prepare
- cd "$builddir"
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -32,7 +29,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir/" install
install -Dm644 "$srcdir"/gssapi_mech.conf \
diff --git a/main/libgssglue/gssapi_mech.conf b/community/libgssglue/gssapi_mech.conf
index f71aca08ee..f71aca08ee 100644
--- a/main/libgssglue/gssapi_mech.conf
+++ b/community/libgssglue/gssapi_mech.conf
diff --git a/main/libmatroska/APKBUILD b/community/libmatroska/APKBUILD
index d61ae698eb..e8a0f46d9a 100644
--- a/main/libmatroska/APKBUILD
+++ b/community/libmatroska/APKBUILD
@@ -10,10 +10,9 @@ options="!check" # Tests don't build; 'make check' target disabled by upstream
license="LGPL-2.1-or-later"
makedepends="cmake libebml-dev>=1.3.9"
subpackages="$pkgname-dev"
-source="https://dl.matroska.org/downloads/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://dl.matroska.org/downloads/libmatroska/libmatroska-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -24,12 +23,11 @@ build() {
-DCMAKE_BUILD_TYPE=None \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ $CMAKE_CROSSOPTS
make
}
package() {
- cd "$builddir"
make install DESTDIR="$pkgdir"
}
diff --git a/main/libmicrohttpd/APKBUILD b/community/libmicrohttpd/APKBUILD
index 236a6d2666..0e944a29b7 100644
--- a/main/libmicrohttpd/APKBUILD
+++ b/community/libmicrohttpd/APKBUILD
@@ -15,7 +15,6 @@ source="https://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-$pkgver.tar.gz
disable-test_options.patch"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -31,12 +30,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
install -Dm644 "$builddir"/src/include/platform.h \
"$pkgdir"/usr/include/platform.h
diff --git a/main/libmicrohttpd/disable-test_options.patch b/community/libmicrohttpd/disable-test_options.patch
index da4718396b..da4718396b 100644
--- a/main/libmicrohttpd/disable-test_options.patch
+++ b/community/libmicrohttpd/disable-test_options.patch
diff --git a/main/libmowgli/APKBUILD b/community/libmowgli/APKBUILD
index 33a593c40e..33a593c40e 100644
--- a/main/libmowgli/APKBUILD
+++ b/community/libmowgli/APKBUILD
diff --git a/main/libmowgli/cacheline.patch b/community/libmowgli/cacheline.patch
index 0a5c3374ee..0a5c3374ee 100644
--- a/main/libmowgli/cacheline.patch
+++ b/community/libmowgli/cacheline.patch
diff --git a/main/libmp3splt/APKBUILD b/community/libmp3splt/APKBUILD
index e264ff1521..5332362ffa 100644
--- a/main/libmp3splt/APKBUILD
+++ b/community/libmp3splt/APKBUILD
@@ -7,39 +7,23 @@ pkgdesc="Library to split mp3 and ogg files without decoding"
url="http://mp3splt.sourceforge.net/"
arch="all"
license="GPL-2.0"
-depends=""
depends_dev="pcre-dev libogg-dev libmad-dev libvorbis-dev libid3tag-dev libtool"
makedepends="$depends_dev"
-install=""
subpackages="$pkgname-dev"
source="https://prdownloads.sourceforge.net/mp3splt/libmp3splt-$pkgver.tar.gz"
-_builddir="$srcdir"/libmp3splt-$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"
./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
--enable-ogg \
- --enable-mp3 \
- || return 1
- make || return 1
+ --enable-mp3
+ make
}
package() {
- cd "$_builddir"
- make DESTDIR="$pkgdir" install || return 1
+ make DESTDIR="$pkgdir" install
}
sha512sums="e5c98e8b173bc86302ccee4ca5eb0c8a8d93f225357eb7b14dea8d0700ed62ed6316506c182f6b295130f7924ff0b38e865d5e49fa9cd7882c648360d68872ed libmp3splt-0.9.2.tar.gz"
diff --git a/main/libmspack/APKBUILD b/community/libmspack/APKBUILD
index 521ce6726d..beb71a8782 100644
--- a/main/libmspack/APKBUILD
+++ b/community/libmspack/APKBUILD
@@ -33,7 +33,6 @@ prepare() {
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -48,12 +47,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/main/libmtp/APKBUILD b/community/libmtp/APKBUILD
index 8e62530837..8e62530837 100644
--- a/main/libmtp/APKBUILD
+++ b/community/libmtp/APKBUILD
diff --git a/main/libnjb/APKBUILD b/community/libnjb/APKBUILD
index cffcc16267..1562c20574 100644
--- a/main/libnjb/APKBUILD
+++ b/community/libnjb/APKBUILD
@@ -6,28 +6,18 @@ pkgrel=4
pkgdesc="A software library for talking to the Creative Nomad Jukeboxes and Dell DJs"
url="http://libnjb.sourceforge.net/"
arch="all"
-license="BSD"
-depends=""
+license="BSD-3-Clause"
depends_dev="libusb-compat-dev"
makedepends="$depends_dev eudev-dev zlib-dev ncurses-dev"
-install=""
subpackages="$pkgname-dev $pkgname-examples"
source="http://download.sourceforge.net/libnjb/libnjb-$pkgver.tar.gz"
-_builddir="$srcdir"/libnjb-$pkgver
prepare() {
- local i
- cd "$_builddir"
- update_config_sub || return 1
- for i in $source; do
- case $i in
- *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
- esac
- done
+ default_prepare
+ update_config_sub
}
build() {
- cd "$_builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -35,14 +25,12 @@ build() {
--sysconfdir=/etc \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
- --localstatedir=/var \
- || return 1
- make || return 1
+ --localstatedir=/var
+ make
}
package() {
- cd "$_builddir"
- make DESTDIR="$pkgdir" install || return 1
+ make DESTDIR="$pkgdir" install
}
examples() {
diff --git a/main/libnotify/APKBUILD b/community/libnotify/APKBUILD
index a40214e932..a40214e932 100644
--- a/main/libnotify/APKBUILD
+++ b/community/libnotify/APKBUILD
diff --git a/main/libsexy/APKBUILD b/community/libsexy/APKBUILD
index 7dfad94e5b..7dfad94e5b 100644
--- a/main/libsexy/APKBUILD
+++ b/community/libsexy/APKBUILD
diff --git a/main/libssh/APKBUILD b/community/libssh/APKBUILD
index bca16969b5..bca16969b5 100644
--- a/main/libssh/APKBUILD
+++ b/community/libssh/APKBUILD
diff --git a/main/libunique/APKBUILD b/community/libunique/APKBUILD
index 1d03ad0e1c..4b57e6cac1 100644
--- a/main/libunique/APKBUILD
+++ b/community/libunique/APKBUILD
@@ -5,14 +5,12 @@ pkgrel=6
pkgdesc="Library for writing single instance applications"
url="http://live.gnome.org/LibUnique"
arch="all"
-license="LGPL"
-depends=""
+license="LGPL-2.1-or-later"
makedepends="gtk+-dev dbus-glib-dev"
subpackages="$pkgname-dev $pkgname-doc"
-source="https://download.gnome.org/sources/$pkgname/1.1/$pkgname-$pkgver.tar.bz2
+source="https://download.gnome.org/sources/libunique/1.1/libunique-$pkgver.tar.bz2
g_const_return.patch"
-builddir="$srcdir"/$pkgname-$pkgver
prepare() {
update_config_sub
@@ -20,7 +18,6 @@ prepare() {
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -34,7 +31,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/main/libunique/g_const_return.patch b/community/libunique/g_const_return.patch
index 89db14a5ab..89db14a5ab 100644
--- a/main/libunique/g_const_return.patch
+++ b/community/libunique/g_const_return.patch
diff --git a/main/libunique3/APKBUILD b/community/libunique3/APKBUILD
index ea71a5caf2..161ec3f6df 100644
--- a/main/libunique3/APKBUILD
+++ b/community/libunique3/APKBUILD
@@ -5,8 +5,7 @@ pkgrel=0
pkgdesc="Library for writing single instance applications"
url="http://live.gnome.org/LibUnique"
arch="all"
-license="LGPL"
-depends=""
+license="LGPL-2.1-or-later"
makedepends="gtk+3.0-dev"
subpackages="$pkgname-dev $pkgname-doc"
source="https://download.gnome.org/sources/libunique/${pkgver%.*}/libunique-$pkgver.tar.xz"
@@ -19,7 +18,6 @@ prepare() {
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -32,7 +30,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/main/libvncserver/APKBUILD b/community/libvncserver/APKBUILD
index ee0e7582b0..c7af68c5ac 100644
--- a/main/libvncserver/APKBUILD
+++ b/community/libvncserver/APKBUILD
@@ -41,7 +41,6 @@ source="https://github.com/LibVNC/libvncserver/archive/LibVNCServer-$pkgver.tar.
builddir="$srcdir"/libvncserver-LibVNCServer-$pkgver
build() {
- cd "$builddir"
mkdir build
cd build
cmake \
@@ -66,12 +65,10 @@ build() {
}
check() {
- cd "$builddir"
make -C build test
}
package() {
- cd "$builddir"
make -C build install DESTDIR="$pkgdir"
}
diff --git a/main/libvncserver/CVE-2019-15681.patch b/community/libvncserver/CVE-2019-15681.patch
index e328d87920..e328d87920 100644
--- a/main/libvncserver/CVE-2019-15681.patch
+++ b/community/libvncserver/CVE-2019-15681.patch
diff --git a/main/loudmouth/APKBUILD b/community/loudmouth/APKBUILD
index bc23afdd52..aa47277a89 100644
--- a/main/loudmouth/APKBUILD
+++ b/community/loudmouth/APKBUILD
@@ -10,8 +10,7 @@ license="LGPL-2.0-or-later"
depends_dev="pkgconfig gnutls-dev libidn-dev libasyncns-dev check-dev autoconf"
makedepends="$depends_dev glib-dev"
subpackages="$pkgname-dev $pkgname-doc"
-source="https://mcabber.com/files/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-builddir="$srcdir"/$pkgname-$pkgver
+source="https://mcabber.com/files/loudmouth/loudmouth-$pkgver.tar.bz2"
prepare() {
default_prepare
@@ -19,7 +18,6 @@ prepare() {
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -32,12 +30,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/main/makekit/APKBUILD b/community/makekit/APKBUILD
index 87610d1708..5c44a043fe 100644
--- a/main/makekit/APKBUILD
+++ b/community/makekit/APKBUILD
@@ -6,21 +6,14 @@ pkgrel=0
pkgdesc="modular build system for POSIX environments"
url="http://mkbuild.sourceforge.net/"
arch="x86 x86_64"
-license="BSD"
+license="BSD-3-Clause"
makedepends="coreutils"
options="!check"
source="makekit-$pkgver.tar.gz::https://github.com/bkoropoff/makekit/archive/release-$pkgver.tar.gz"
builddir="$srcdir"/makekit-release-$pkgver/build
-prepare() {
- mkdir -p "$builddir"
- cd "$builddir"
- default_prepare
-}
-
build() {
- cd "$builddir"
- ../configure \
+ ./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
@@ -32,7 +25,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/main/mp3splt/APKBUILD b/community/mp3splt/APKBUILD
index 800725e419..addacb83d2 100644
--- a/main/mp3splt/APKBUILD
+++ b/community/mp3splt/APKBUILD
@@ -7,39 +7,27 @@ pkgdesc="A command-line, AlbumWrap and mp3wrap file exctractor"
url="http://mp3splt.sourceforge.net/"
arch="all"
license="GPL-2.0-or-later"
-depends=""
makedepends="libmp3splt-dev"
-install=""
subpackages="$pkgname-doc"
-source="https://prdownloads.sourceforge.net/mp3splt/$pkgname-$pkgver.tar.gz"
+source="https://prdownloads.sourceforge.net/mp3splt/mp3splt-$pkgver.tar.gz"
-_builddir="$srcdir"/$pkgname-$pkgver
prepare() {
- local i
- cd "$_builddir"
- update_config_sub || return 1
- for i in $source; do
- case $i in
- *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
- esac
- done
+ default_prepare
+ update_config_sub
}
build() {
- cd "$_builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
--with-mp3splt-includes=/usr/include/libmp3splt \
- --enable-oggsplt_symlink \
- || return 1
- make || return 1
+ --enable-oggsplt_symlink
+ make
}
package() {
- cd "$_builddir"
- make DESTDIR="$pkgdir" install || return 1
+ make DESTDIR="$pkgdir" install
}
sha512sums="c1cbdc905d4f19e8e20afeadf02a2967049d86e69613312c8855e03afc5b190a569ac63f970171384853961cbe6bf248fae47e5116c4fe9deb7a0787f299918b mp3splt-2.6.2.tar.gz"
diff --git a/main/multisort/APKBUILD b/community/multisort/APKBUILD
index 16a860d79b..b074d551ed 100644
--- a/main/multisort/APKBUILD
+++ b/community/multisort/APKBUILD
@@ -7,16 +7,14 @@ pkgdesc="Tool to merge multiple logfiles"
url="https://www.xach.com/multisort/"
arch="all"
license="GPL-2.0-or-later"
-source="http://www.xach.com/$pkgname/$pkgname-$pkgver.tar.gz
+source="http://www.xach.com/multisort/multisort-$pkgver.tar.gz
multisort-syslog-support.patch"
build() {
- cd "$builddir"
make
}
package() {
- cd "$builddir"
install -d "$pkgdir/usr/bin/"
install -s "$builddir/multisort" "$pkgdir/usr/bin/"
}
diff --git a/main/multisort/multisort-syslog-support.patch b/community/multisort/multisort-syslog-support.patch
index 4e934127c4..4e934127c4 100644
--- a/main/multisort/multisort-syslog-support.patch
+++ b/community/multisort/multisort-syslog-support.patch
diff --git a/main/myrepos/APKBUILD b/community/myrepos/APKBUILD
index 0034b1b429..655671c443 100644
--- a/main/myrepos/APKBUILD
+++ b/community/myrepos/APKBUILD
@@ -8,44 +8,37 @@ url="https://git.joeyh.name/git/myrepos.git"
arch="noarch"
license="GPL-2.0-or-later"
depends="perl git"
-depends_dev=""
-makedepends=""
replaces="mr"
-install=""
subpackages="$pkgname-doc"
-source="https://git.joeyh.name/index.cgi/myrepos.git/snapshot/myrepos-${pkgver}.tar.gz"
-builddir="$srcdir"/$pkgname-$pkgver
+source="https://git.joeyh.name/index.cgi/myrepos.git/snapshot/myrepos-$pkgver.tar.gz"
build() {
- cd "$builddir"
make
}
+check() {
+ make test
+}
+
package() {
- cd "$builddir"
- install -Dm755 mr "$pkgdir"/usr/bin/mr || return 1
+ install -Dm755 mr "$pkgdir"/usr/bin/mr
cd "$builddir"/lib
for file in git-fake-bare git-svn unison; do
install -Dpm 0644 $file \
- "$pkgdir"/usr/share/$pkgname/$file
+ "$pkgdir"/usr/share/$pkgname/$file
done
}
-check() {
- cd "$builddir"
- make test
-}
-
doc() {
- cd "$builddir"
- mkdir -p "$subpkgdir"/usr/share/man
- mv "$builddir"/*.1 "$subpkgdir"/usr/share/man/
+ cd "$builddir"
+ mkdir -p "$subpkgdir"/usr/share/man
+ mv "$builddir"/*.1 "$subpkgdir"/usr/share/man/
# Sample configuration files
for file in mrconfig mrconfig.complex; do
install -Dpm 0644 $file \
"$subpkgdir"/usr/share/doc/$pkgname/$file
done
- default_doc
+ default_doc
}
sha512sums="cf39208ecf1fc4008cf29c1585d33e9b17dc08350d2bc816a4ce0b4e12eaceffcf7bfbbf2036a70ac2aa979070da601e422ccbedd824f33354b20cfe3a988fef myrepos-1.20180726.tar.gz"
diff --git a/main/ndctl/APKBUILD b/community/ndctl/APKBUILD
index 009aeca9bb..34f91abad6 100644
--- a/main/ndctl/APKBUILD
+++ b/community/ndctl/APKBUILD
@@ -22,7 +22,6 @@ prepare() {
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -35,7 +34,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/main/openpgm/APKBUILD b/community/openpgm/APKBUILD
index e75f66485f..e75f66485f 100644
--- a/main/openpgm/APKBUILD
+++ b/community/openpgm/APKBUILD
diff --git a/main/openpgm/libpgm-fix-pkgconfig.patch b/community/openpgm/libpgm-fix-pkgconfig.patch
index 64272f44e1..64272f44e1 100644
--- a/main/openpgm/libpgm-fix-pkgconfig.patch
+++ b/community/openpgm/libpgm-fix-pkgconfig.patch
diff --git a/main/openpgm/openpgm-fix-includes.patch b/community/openpgm/openpgm-fix-includes.patch
index 6f1e5901fc..6f1e5901fc 100644
--- a/main/openpgm/openpgm-fix-includes.patch
+++ b/community/openpgm/openpgm-fix-includes.patch
diff --git a/main/openpgm/python3.patch b/community/openpgm/python3.patch
index f1ae79772c..f1ae79772c 100644
--- a/main/openpgm/python3.patch
+++ b/community/openpgm/python3.patch
diff --git a/main/sdl_image/APKBUILD b/community/sdl_image/APKBUILD
index dbb3d172f5..7963cc8e0e 100644
--- a/main/sdl_image/APKBUILD
+++ b/community/sdl_image/APKBUILD
@@ -8,11 +8,9 @@ url="http://www.libsdl.org/projects/SDL_image/"
arch="all"
options="!check" # No test suite.
license="Zlib"
-depends=""
makedepends="sdl-dev libpng-dev libjpeg-turbo-dev libwebp-dev tiff-dev zlib-dev"
-install=""
subpackages="$pkgname-dev"
-source="https://www.libsdl.org/projects/SDL_image/release/SDL_image-${pkgver}.tar.gz
+source="https://www.libsdl.org/projects/SDL_image/release/SDL_image-$pkgver.tar.gz
CVE-2019-13616.patch
"
@@ -22,13 +20,11 @@ source="https://www.libsdl.org/projects/SDL_image/release/SDL_image-${pkgver}.ta
builddir="$srcdir"/SDL_image-$pkgver
prepare() {
- cd "$builddir"
update_config_sub
default_prepare
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -40,7 +36,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/main/sdl_image/CVE-2019-13616.patch b/community/sdl_image/CVE-2019-13616.patch
index f2ed7c6aa0..f2ed7c6aa0 100644
--- a/main/sdl_image/CVE-2019-13616.patch
+++ b/community/sdl_image/CVE-2019-13616.patch
diff --git a/main/sdl_mixer/APKBUILD b/community/sdl_mixer/APKBUILD
index 4ee7b0208d..2935d5e12a 100644
--- a/main/sdl_mixer/APKBUILD
+++ b/community/sdl_mixer/APKBUILD
@@ -6,18 +6,15 @@ pkgrel=1
pkgdesc="A simple multi-channel audio mixer"
url="http://www.libsdl.org/projects/SDL_mixer/"
arch="all"
-license="GPL"
-depends=
+license="BSD-3-Clause"
makedepends="sdl-dev libvorbis-dev libmikmod-dev flac-dev linux-headers"
-install=
subpackages="$pkgname-dev"
-source="https://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${pkgver}.tar.gz"
-
-_builddir="$srcdir"/SDL_mixer-$pkgver
+source="https://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-$pkgver.tar.gz"
+builddir="$srcdir"/SDL_mixer-$pkgver
prepare() {
- cd "$_builddir"
- update_config_sub || return 1
+ default_prepare
+ update_config_sub
sed -e "/CONFIG_FILE_ETC/s/\/etc\/timidity.cfg/\/etc\/timidity++\/timidity.cfg/" \
-e "/DEFAULT_PATH/s/\/etc\/timidity/\/etc\/timidity++/" \
-e "/DEFAULT_PATH2/s/\/usr\/local\/lib\/timidity/\/usr\/lib\/timidity/" \
@@ -25,7 +22,6 @@ prepare() {
}
build() {
- cd "$_builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -33,14 +29,12 @@ build() {
--sysconfdir=/etc \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
- --enable-music-mod \
- || return 1
- make || return 1
+ --enable-music-mod
+ make
}
package() {
- cd "$_builddir"
- make DESTDIR="$pkgdir" install || return 1
+ make DESTDIR="$pkgdir" install
}
sha512sums="230f6c5a73f4bea364f8aa3d75f76694305571dea45f357def742b2b50849b2d896af71e08689981207edc99a9836088bee2d0bd98d92c7f4ca52b12b3d8cf96 SDL_mixer-1.2.12.tar.gz"
diff --git a/main/sessreg/APKBUILD b/community/sessreg/APKBUILD
index cfc79d8eaa..5c1c89ac0a 100644
--- a/main/sessreg/APKBUILD
+++ b/community/sessreg/APKBUILD
@@ -9,11 +9,10 @@ arch="all"
license="ICU"
subpackages="$pkgname-doc"
makedepends="bsd-compat-headers linux-headers xorgproto"
-source="https://www.x.org/releases/individual/app/$pkgname-$pkgver.tar.bz2
+source="https://www.x.org/releases/individual/app/sessreg-$pkgver.tar.bz2
missing_path_wtmpx.patch"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -23,7 +22,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
sha512sums="7e3c2bdcadb7133aace463b58d8c6108d315ec95d2a42509073eeddc7f02644092a4b3168bd3b426c041736a016291092e0bf8368acd620dbeff96d53d12f98c sessreg-1.1.2.tar.bz2
diff --git a/main/sessreg/missing_path_wtmpx.patch b/community/sessreg/missing_path_wtmpx.patch
index 0514de59b7..0514de59b7 100644
--- a/main/sessreg/missing_path_wtmpx.patch
+++ b/community/sessreg/missing_path_wtmpx.patch
diff --git a/main/sparsehash/APKBUILD b/community/sparsehash/APKBUILD
index 9203adbf03..6b4886a7d9 100644
--- a/main/sparsehash/APKBUILD
+++ b/community/sparsehash/APKBUILD
@@ -6,27 +6,12 @@ pkgrel=0
pkgdesc="Library that contains several hash-map implementations"
url="https://github.com/sparsehash/sparsehash"
arch="all"
-license="BSD"
-depends=""
-depends_dev=""
-makedepends="$depends_dev"
-install=""
+license="BSD-3-Clause"
subpackages="$pkgname-doc"
source="https://github.com/sparsehash/sparsehash/archive/sparsehash-$pkgver.tar.gz"
-
-_builddir="$srcdir"/sparsehash-sparsehash-$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
-}
+builddir="$srcdir"/sparsehash-sparsehash-$pkgver
build() {
- cd "$_builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -34,14 +19,12 @@ build() {
--sysconfdir=/etc \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
- --localstatedir=/var \
- || return 1
- make || return 1
+ --localstatedir=/var
+ make
}
package() {
- cd "$_builddir"
- make DESTDIR="$pkgdir" install || return 1
+ make DESTDIR="$pkgdir" install
}
sha512sums="bb00d0acb8eba65f7da8015ea4f6bebf8bba36ed6777881960ee215f22b7be17b069c59838d210551ce67a34baccfc7b2fed603677ec53c0c32714d8e76f5d6c sparsehash-2.0.3.tar.gz"
diff --git a/main/sysstat/APKBUILD b/community/sysstat/APKBUILD
index 50b0ef961b..50b0ef961b 100644
--- a/main/sysstat/APKBUILD
+++ b/community/sysstat/APKBUILD
diff --git a/main/the_silver_searcher/APKBUILD b/community/the_silver_searcher/APKBUILD
index ba7aeb3903..48439b494b 100644
--- a/main/the_silver_searcher/APKBUILD
+++ b/community/the_silver_searcher/APKBUILD
@@ -12,10 +12,9 @@ makedepends="pcre-dev xz-dev zlib-dev"
subpackages="$pkgname-doc
$pkgname-zsh-completion:zshcomp:noarch
$pkgname-bash-completion:bashcomp:noarch"
-source="https://geoff.greer.fm/ag/releases/$pkgname-$pkgver.tar.gz"
+source="https://geoff.greer.fm/ag/releases/the_silver_searcher-$pkgver.tar.gz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -27,7 +26,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/main/tinyxml/APKBUILD b/community/tinyxml/APKBUILD
index 64715e776e..5d641ab511 100644
--- a/main/tinyxml/APKBUILD
+++ b/community/tinyxml/APKBUILD
@@ -2,44 +2,33 @@
# Maintainer:
pkgname=tinyxml
pkgver=2.6.2
-_realver=2_6_2
+_realver=${pkgver//./_}
pkgrel=1
pkgdesc="A simple, small, C++ XML parser"
url="http://www.grinninglizard.com/tinyxml/"
arch="all"
-license="zlib"
-depends=""
-depends_dev=""
-makedepends="$depends_dev"
-install=""
+license="Zlib"
subpackages="$pkgname-dev"
-source="https://downloads.sourceforge.net/$pkgname/${pkgname}_$_realver.tar.gz
+source="https://downloads.sourceforge.net/tinyxml/tinyxml_$_realver.tar.gz
tinyxml-2.6.2-defineSTL.patch
tinyxml-2.6.1-entity.patch"
-_builddir=$srcdir/$pkgname
+builddir=$srcdir/$pkgname
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
- sed -i -e '/^TINYXML_USE_STL/ s|=.*|=YES|' \
- -e "s|^RELEASE_CFLAGS.*|& ${CXXFLAGS} -fPIC|" Makefile
+ default_prepare
+ sed -i Makefile \
+ -e '/^TINYXML_USE_STL/ s|=.*|=YES|' \
+ -e "s|^RELEASE_CFLAGS.*|& $CXXFLAGS -fPIC|"
}
build() {
- cd "$_builddir"
- make || return 1
- g++ -fPIC ${CXXFLAGS} -shared -o libtinyxml.so.0.$pkgver \
+ make
+ g++ -fPIC $CXXFLAGS -shared -o libtinyxml.so.0.$pkgver \
-Wl,-soname,libtinyxml.so.0 $(ls *.o | grep -v xmltest)
}
package() {
- cd "$_builddir"
install -d -m 0755 "$pkgdir"/usr/lib \
"$pkgdir"/usr/include
install -m 0755 libtinyxml.so.0.2.6.2 \
diff --git a/main/tinyxml/tinyxml-2.6.1-entity.patch b/community/tinyxml/tinyxml-2.6.1-entity.patch
index 2ccbd701ac..2ccbd701ac 100644
--- a/main/tinyxml/tinyxml-2.6.1-entity.patch
+++ b/community/tinyxml/tinyxml-2.6.1-entity.patch
diff --git a/main/tinyxml/tinyxml-2.6.2-defineSTL.patch b/community/tinyxml/tinyxml-2.6.2-defineSTL.patch
index 7bcde59ff9..7bcde59ff9 100644
--- a/main/tinyxml/tinyxml-2.6.2-defineSTL.patch
+++ b/community/tinyxml/tinyxml-2.6.2-defineSTL.patch
diff --git a/main/tsocks/APKBUILD b/community/tsocks/APKBUILD
index eebf5284f1..1765423a71 100644
--- a/main/tsocks/APKBUILD
+++ b/community/tsocks/APKBUILD
@@ -4,35 +4,29 @@
pkgname=tsocks
pkgver=1.8_beta5
pkgrel=0
-pkgdesc="A transparent SOCKS proxying library"
+pkgdesc="Transparent SOCKS proxying library"
+options="!check"
url="http://tsocks.sourceforge.net/"
arch="x86_64 ppc64le aarch64"
-license="GPL-2.0"
-depends=""
-depends_dev=""
-makedepends=""
-install=""
+license="GPL-2.0-or-later"
subpackages="$pkgname-doc"
-source="https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver/_beta/beta}.tar.gz
+source="https://downloads.sourceforge.net/tsocks/tsocks-${pkgver/_beta/beta}.tar.gz
configure.patch"
-builddir="${srcdir}/${pkgname}-${pkgver%_*}"
+builddir="$srcdir/$pkgname-${pkgver%_*}"
build() {
- cd "$builddir"
- ./configure \
+ ./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
--sysconfdir=/etc \
--mandir=/usr/share/man \
- --libdir=/usr/lib \
- || return 1
- make || return 1
+ --libdir=/usr/lib
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="${pkgdir}" install || return 1
+ make DESTDIR="$pkgdir" install
}
sha512sums="b41636ea6b77abf0d1e3cda7bbca4e7ee96f3cdb1843f3a2c530650931e5567f67921de67b28ba9bab0f51df39770a3f7fb458cf7ac78aad7aa861923df2c4a9 tsocks-1.8beta5.tar.gz
diff --git a/main/tsocks/configure.patch b/community/tsocks/configure.patch
index e33485ea7c..e33485ea7c 100644
--- a/main/tsocks/configure.patch
+++ b/community/tsocks/configure.patch
diff --git a/main/vsftpd/APKBUILD b/community/vsftpd/APKBUILD
index 3fa2ff3a9b..7ae0b80c9c 100644
--- a/main/vsftpd/APKBUILD
+++ b/community/vsftpd/APKBUILD
@@ -6,12 +6,11 @@ pkgrel=6
pkgdesc="Very secure ftpd"
url="http://vsftpd.beasts.org"
arch="all"
-license="GPL-2.0"
-depends=""
+license="GPL-2.0-only"
makedepends="openssl-dev libcap-dev linux-pam-dev linux-headers"
subpackages="$pkgname-doc"
install="$pkgname.pre-install"
-source="https://security.appspot.com/downloads/vsftpd-${pkgver}.tar.gz
+source="https://security.appspot.com/downloads/vsftpd-$pkgver.tar.gz
vsftpd.initd
vsftpd.confd
vsftpd-enable-ssl.patch
@@ -22,15 +21,12 @@ source="https://security.appspot.com/downloads/vsftpd-${pkgver}.tar.gz
strip.patch
"
-builddir="$srcdir/$pkgname-$pkgver"
build() {
- cd $builddir
make CFLAGS="$CFLAGS -D_GNU_SOURCE"
}
package() {
- cd $builddir
install -m755 -D vsftpd "$pkgdir"/usr/sbin/vsftpd
install -m644 -D vsftpd.8 "$pkgdir"/usr/share/man/man8/vsftpd.8
install -m644 -D vsftpd.conf.5 "$pkgdir"/usr/share/man/man5/vsftpd.conf.5
diff --git a/main/vsftpd/CVE-2015-1419.patch b/community/vsftpd/CVE-2015-1419.patch
index b0662b4580..b0662b4580 100644
--- a/main/vsftpd/CVE-2015-1419.patch
+++ b/community/vsftpd/CVE-2015-1419.patch
diff --git a/main/vsftpd/findlibs.patch b/community/vsftpd/findlibs.patch
index 4806470d3a..4806470d3a 100644
--- a/main/vsftpd/findlibs.patch
+++ b/community/vsftpd/findlibs.patch
diff --git a/main/vsftpd/strip.patch b/community/vsftpd/strip.patch
index 3983173c22..3983173c22 100644
--- a/main/vsftpd/strip.patch
+++ b/community/vsftpd/strip.patch
diff --git a/main/vsftpd/vsftpd-clearenv.patch b/community/vsftpd/vsftpd-clearenv.patch
index 748cc9481b..748cc9481b 100644
--- a/main/vsftpd/vsftpd-clearenv.patch
+++ b/community/vsftpd/vsftpd-clearenv.patch
diff --git a/main/vsftpd/vsftpd-enable-ssl.patch b/community/vsftpd/vsftpd-enable-ssl.patch
index 93469e6fdc..93469e6fdc 100644
--- a/main/vsftpd/vsftpd-enable-ssl.patch
+++ b/community/vsftpd/vsftpd-enable-ssl.patch
diff --git a/main/vsftpd/vsftpd.confd b/community/vsftpd/vsftpd.confd
index f14602696d..f14602696d 100644
--- a/main/vsftpd/vsftpd.confd
+++ b/community/vsftpd/vsftpd.confd
diff --git a/main/vsftpd/vsftpd.initd b/community/vsftpd/vsftpd.initd
index b040d6305c..b040d6305c 100644
--- a/main/vsftpd/vsftpd.initd
+++ b/community/vsftpd/vsftpd.initd
diff --git a/main/vsftpd/vsftpd.pre-install b/community/vsftpd/vsftpd.pre-install
index c6e45f1b71..c6e45f1b71 100755
--- a/main/vsftpd/vsftpd.pre-install
+++ b/community/vsftpd/vsftpd.pre-install
diff --git a/main/vsftpd/wtmpx_file.patch b/community/vsftpd/wtmpx_file.patch
index 6ca8416933..6ca8416933 100644
--- a/main/vsftpd/wtmpx_file.patch
+++ b/community/vsftpd/wtmpx_file.patch
diff --git a/main/xmlstarlet/APKBUILD b/community/xmlstarlet/APKBUILD
index fd88b13543..e3fed88252 100644
--- a/main/xmlstarlet/APKBUILD
+++ b/community/xmlstarlet/APKBUILD
@@ -7,28 +7,22 @@ pkgdesc="A set of tools to transform, query, validate, and edit XML documents"
url="http://xmlstar.sourceforge.net"
arch="all"
license="MIT"
-depends=""
makedepends="ghostscript libxml2-dev libxslt-dev"
-install=""
subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://sourceforge.net/projects/xmlstar/files/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz/download"
-
-builddir="$srcdir"/$pkgname-$pkgver
+source="$pkgname-$pkgver.tar.gz::https://sourceforge.net/projects/xmlstar/files/xmlstarlet/$pkgver/xmlstarlet-$pkgver.tar.gz/download"
build() {
- cd "$builddir"
LIBXSLT_PREFIX=/usr \
LIBXML_PREFIX=/usr \
./configure \
--prefix=/usr \
--enable-build-docs
- make || return 1
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="${pkgdir}" install
- ln -s xml ${pkgdir}/usr/bin/xmlstarlet
+ make DESTDIR="$pkgdir" install
+ ln -s xml $pkgdir/usr/bin/xmlstarlet
install -Dm0644 Copyright $pkgdir/usr/share/licenses/$pkgname/COPYING
}
diff --git a/main/command-not-found/APKBUILD b/main/command-not-found/APKBUILD
index 3102a9633d..137947fdc5 100644
--- a/main/command-not-found/APKBUILD
+++ b/main/command-not-found/APKBUILD
@@ -6,16 +6,10 @@ pkgdesc="friendly command not found handling"
url="https://github.com/kaniini/command-not-found"
arch="noarch"
license="MIT"
-depends=""
-makedepends=""
-install=""
-subpackages="" # eventually $pkgname-zsh and others
source="command-not-found-$pkgver.tar.gz::https://github.com/kaniini/command-not-found/archive/v$pkgver/command-not-found-$pkgver.tar.gz"
-builddir="$srcdir/command-not-found-$pkgver"
options="!check" # no testsuite
package() {
- cd "$builddir"
install -d -D -m755 "$pkgdir"/usr/libexec "$pkgdir"/etc/profile.d/
install -m755 command-not-found.sh "$pkgdir"/usr/libexec/command-not-found
install -m755 profiles/command-not-found.ash "$pkgdir"/etc/profile.d/command-not-found.sh
diff --git a/main/libotr/APKBUILD b/main/libotr/APKBUILD
index 3c9b927d18..75930207f2 100644
--- a/main/libotr/APKBUILD
+++ b/main/libotr/APKBUILD
@@ -4,38 +4,36 @@ pkgname=libotr
pkgver=4.1.1
pkgrel=1
pkgdesc="Off The Record Messaging, an encryption library for secure IM conversations"
+options="!check"
url="http://otr.cypherpunks.ca/"
arch="all"
license="LGPL-2.0-or-later"
-depends=
depends_dev="libgcrypt-dev"
makedepends="$depends_dev"
-install=""
subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
source="https://www.cypherpunks.ca/otr/libotr-$pkgver.tar.gz"
-builddir="$srcdir/libotr-$pkgver"
+prepare() {
+ default_prepare
+ update_config_sub
+}
build() {
- cd "$builddir"
- update_config_sub || return 1
./configure \
--build=$CBUILD \
--host=$CHOST \
- --prefix=/usr \
- || return 1
- make || return 1
+ --prefix=/usr
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install || return 1
+ make DESTDIR="$pkgdir" install
}
tools() {
pkgdesc="$pkgname tools"
mkdir -p "$subpkgdir"/usr/
- mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ || return 1
+ mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
}
sha512sums="c957206235b9f627542f23a645c822ea1b318d83fa655f41ed8d9a3c0dddf30b88f0ca82060026af155e48ecb13969dc9270831f20304669794151f666ae5cb0 libotr-4.1.1.tar.gz"
diff --git a/main/libotr3/APKBUILD b/main/libotr3/APKBUILD
deleted file mode 100644
index c1fbf50a8d..0000000000
--- a/main/libotr3/APKBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-pkgname=libotr3
-pkgver=3.2.1
-pkgrel=4
-pkgdesc="Off The Record Messaging, an encryption library for secure IM conversations"
-url="http://otr.cypherpunks.ca/"
-arch="all"
-license="LGPL-2.0-or-later"
-depends=
-depends_dev="libgcrypt-dev"
-makedepends="$depends_dev"
-install=""
-replaces="libotr"
-subpackages="$pkgname-dev $pkgname-doc:doc $pkgname-tools:tools"
-source="https://www.cypherpunks.ca/otr/libotr-$pkgver.tar.gz"
-
-_builddir="$srcdir/libotr-$pkgver"
-prepare() {
- local i
- cd "$_builddir"
- update_config_sub || return 1
- for i in $source; do
- case $i in
- *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
- esac
- done
-}
-
-build() {
- cd "$_builddir"
- ./configure \
- --build=$CBUILD \
- --host=$CHOST \
- --prefix=/usr \
- || return 1
- make || return 1
-}
-
-package() {
- cd "$_builddir"
- make DESTDIR="$pkgdir" install || return 1
-}
-
-tools() {
- license="GPL"
- depends="$pkgname"
- cd "$_builddir"
- mkdir -p "$subpkgdir"/usr/
- mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
-}
-
-doc() {
- default_doc
- depends="$pkgname"
- cd "$_builddir"
- install -Dm0644 Protocol-v2.html "$subpkgdir"/usr/share/doc/$pkgname/Protocol-v2.html
- install -Dm0644 README "$subpkgdir"/usr/share/doc/$pkgname/README
-}
-
-sha512sums="7dfac85cb7dd1a95481330ecf3bfe54477a9de7e20370919386e8aa9553e374a2d3587d7b4bb654d1a30bd1c47e41c577f7b78f4007c5cb97f2f6a2c63078899 libotr-3.2.1.tar.gz"
diff --git a/main/json-c0.12/APKBUILD b/testing/json-c0.12/APKBUILD
index 2cf2388cfd..ced8d7bace 100644
--- a/main/json-c0.12/APKBUILD
+++ b/testing/json-c0.12/APKBUILD
@@ -9,19 +9,17 @@ license="MIT"
makedepends=" autoconf automake libtool"
subpackages="$pkgname-dev"
replaces="json-c"
-source="https://s3.amazonaws.com/json-c_releases/releases/json-c-${pkgver}.tar.gz
+source="https://s3.amazonaws.com/json-c_releases/releases/json-c-$pkgver.tar.gz
"
builddir="$srcdir"/json-c-$pkgver
prepare() {
- cd "$builddir"
default_prepare
autoreconf -f -v -i
}
build() {
- cd "$builddir"
- export CFLAGS="${CFLAGS} -Wno-error=unused-but-set-variable -Wno-error=implicit-fallthrough"
+ export CFLAGS="$CFLAGS -Wno-error=unused-but-set-variable -Wno-error=implicit-fallthrough"
./configure --prefix=/usr \
--build=$CBUILD \
--host=$CHOST \
@@ -37,12 +35,10 @@ build() {
}
check() {
- cd "$builddir"
make USE_VALGRIND=0 check
}
package() {
- cd "$builddir"
make -j1 DESTDIR="$pkgdir" install
}