diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-12-28 07:29:00 -0600 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-12-28 07:29:00 -0600 |
| commit | d00b149bc5c53bc3215e94c57a6ea5257ec37647 (patch) | |
| tree | 98e3a8c25f26cb27ff4394e6f8598324af615f59 | |
| parent | 52bf3b0d577c4c42fa1d3839ed1b3a9ac95145ca (diff) | |
| download | packages-d00b149bc5c53bc3215e94c57a6ea5257ec37647.tar.gz packages-d00b149bc5c53bc3215e94c57a6ea5257ec37647.tar.bz2 packages-d00b149bc5c53bc3215e94c57a6ea5257ec37647.tar.xz packages-d00b149bc5c53bc3215e94c57a6ea5257ec37647.zip | |
user/[libraries]: modernise and fix syntax
| -rw-r--r-- | user/libnih/APKBUILD | 8 | ||||
| -rw-r--r-- | user/libxinerama/APKBUILD | 5 | ||||
| -rw-r--r-- | user/mozjs/APKBUILD | 1 | ||||
| -rw-r--r-- | user/polkit/APKBUILD | 8 |
4 files changed, 5 insertions, 17 deletions
diff --git a/user/libnih/APKBUILD b/user/libnih/APKBUILD index 9636f2a1a..3808dc3a7 100644 --- a/user/libnih/APKBUILD +++ b/user/libnih/APKBUILD @@ -10,8 +10,8 @@ options="!checkroot" license="GPL-2.0-only" depends="" depends_dev="dbus-dev expat-dev" -makedepends="$depends_dev" checkdepends="dbus linux-headers" +makedepends="$depends_dev" subpackages="$pkgname-dev $pkgname-doc" source="https://launchpad.net/libnih/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz musl-fix-signals.patch @@ -21,13 +21,11 @@ source="https://launchpad.net/libnih/${pkgver%.*}/${pkgver}/+download/${pkgname} " prepare() { - cd "$builddir" - update_config_sub default_prepare + update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -39,12 +37,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libxinerama/APKBUILD b/user/libxinerama/APKBUILD index 6e0b849ba..e2a072fe1 100644 --- a/user/libxinerama/APKBUILD +++ b/user/libxinerama/APKBUILD @@ -6,14 +6,13 @@ pkgdesc="X11 Xinerama extension library" url="https://www.X.Org/" arch="all" license="MIT AND X11" -subpackages="$pkgname-dev $pkgname-doc" depends="" makedepends="libx11-dev libxext-dev util-macros xorgproto-dev" +subpackages="$pkgname-dev $pkgname-doc" source="https://www.X.Org/releases/individual/lib/libXinerama-$pkgver.tar.bz2" builddir="$srcdir"/libXinerama-$pkgver build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -22,12 +21,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/mozjs/APKBUILD b/user/mozjs/APKBUILD index 78d4ea352..86c7c5c0c 100644 --- a/user/mozjs/APKBUILD +++ b/user/mozjs/APKBUILD @@ -42,7 +42,6 @@ unpack() { } prepare() { - cd "$builddir" default_prepare cd "$builddir"/js/src export PATH="$srcdir/python/bin:$PATH" diff --git a/user/polkit/APKBUILD b/user/polkit/APKBUILD index 54ecc7f98..26d66a893 100644 --- a/user/polkit/APKBUILD +++ b/user/polkit/APKBUILD @@ -10,11 +10,11 @@ options="!check suid" # Requires running ConsoleKit and PolKit for JS backend license="LGPL-2.0+" depends="" makedepends="glib-dev gobject-introspection-dev gtk-doc intltool linux-pam-dev - mozjs-dev" -subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" + mozjs-dev autoconf automake libtool" pkgusers="polkitd" pkggroups="polkitd" install="$pkgname.pre-install $pkgname.pre-upgrade" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://www.freedesktop.org/software/polkit/releases/polkit-$pkgver.tar.gz 0001-make-netgroup-support-optional.patch fix-consolekit-db-stat.patch @@ -26,13 +26,11 @@ source="https://www.freedesktop.org/software/polkit/releases/polkit-$pkgver.tar. # - CVE-2018-19788 prepare() { - cd "$builddir" default_prepare autoreconf -vif } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -56,12 +54,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } |