summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2020-01-14 10:28:46 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2020-01-14 10:28:46 +0000
commitd6a8ba9c4f2c0dc8dfc3a5892b3e447fbf68da42 (patch)
tree20db48faad846c710e2a4c432d732e4773a2e389
parentd896c7fcd2ada3cae147f70470c05ef5a0360acb (diff)
downloadpackages-d6a8ba9c4f2c0dc8dfc3a5892b3e447fbf68da42.tar.gz
packages-d6a8ba9c4f2c0dc8dfc3a5892b3e447fbf68da42.tar.bz2
packages-d6a8ba9c4f2c0dc8dfc3a5892b3e447fbf68da42.tar.xz
packages-d6a8ba9c4f2c0dc8dfc3a5892b3e447fbf68da42.zip
user/*: Modernise / fix syntax
-rw-r--r--system/openssh/APKBUILD2
-rw-r--r--system/perl/APKBUILD4
-rw-r--r--user/ffmpeg/APKBUILD1
-rw-r--r--user/gcompris-qt/APKBUILD10
-rw-r--r--user/nextcloud-client/APKBUILD2
-rw-r--r--user/xapian-core/APKBUILD1
6 files changed, 5 insertions, 15 deletions
diff --git a/system/openssh/APKBUILD b/system/openssh/APKBUILD
index 38d947585..10eee5514 100644
--- a/system/openssh/APKBUILD
+++ b/system/openssh/APKBUILD
@@ -136,7 +136,7 @@ server() {
pkgdesc="OpenSSH server"
depends="openssh-client openssh-keygen"
replaces="openssh-server-common"
- cd "$builddir"
+
install -d "$subpkgdir"/usr/sbin
install -d "$subpkgdir"/etc/ssh
mv "$pkgdir"/usr/sbin/sshd "$subpkgdir"/usr/sbin/
diff --git a/system/perl/APKBUILD b/system/perl/APKBUILD
index 0fc25d609..f65edd034 100644
--- a/system/perl/APKBUILD
+++ b/system/perl/APKBUILD
@@ -37,7 +37,6 @@ _archlib=/usr/lib/perl5/core_perl
prepare() {
chmod +w "$builddir"/*.c
default_prepare
- cd "$builddir"
sed -e 's/less -R/less/g' \
-e 's/libswanted="\(.*\) nsl\(.*\)"/libswanted="\1\2"/g' \
-i ./Configure ||
@@ -50,7 +49,6 @@ prepare() {
}
build() {
- cd "$builddir"
BUILD_ZLIB=0
BUILD_BZIP2=0
BZIP2_LIB=/usr/lib
@@ -89,12 +87,10 @@ build() {
}
check() {
- cd "$builddir"
make test
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
if [ -n "$(find $pkgdir/usr/local -type f)" ]; then
error "files found under /usr/local"
diff --git a/user/ffmpeg/APKBUILD b/user/ffmpeg/APKBUILD
index 48b70752c..c3537f5fe 100644
--- a/user/ffmpeg/APKBUILD
+++ b/user/ffmpeg/APKBUILD
@@ -85,7 +85,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install install-man
install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart"
}
diff --git a/user/gcompris-qt/APKBUILD b/user/gcompris-qt/APKBUILD
index 9240e9af7..6b53bd372 100644
--- a/user/gcompris-qt/APKBUILD
+++ b/user/gcompris-qt/APKBUILD
@@ -17,9 +17,6 @@ subpackages="$pkgname-doc $pkgname-lang"
source="http://gcompris.net/download/qt/src/gcompris-qt-$pkgver.tar.xz"
build() {
- cd "$builddir"
- mkdir build
- cd build
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -31,13 +28,12 @@ build() {
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
${CMAKE_CROSSOPTS} \
- ..
- make
+ -Bbuild
+ make -C build
}
package() {
- cd "$builddir"/build
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C build install
}
sha512sums="bc4515acc5c58869997e44c0c3c38d2904f34a7a5efede1ee7aefcbd1ae5907fe00b29a3ecf8e5e46396031736d10df64523e280dfffe3bac2df7e34fe9a8eda gcompris-qt-0.91.tar.xz"
diff --git a/user/nextcloud-client/APKBUILD b/user/nextcloud-client/APKBUILD
index 84f90982f..19b8959ae 100644
--- a/user/nextcloud-client/APKBUILD
+++ b/user/nextcloud-client/APKBUILD
@@ -25,7 +25,7 @@ build() {
-DNO_SHIBBOLETH=1 \
-DWITH_CRASHREPORTER=bool:OFF \
-DUNIT_TESTING=bool:ON \
- -DNO_SHIBBOLETH=bool:ON
+ -DNO_SHIBBOLETH=bool:ON .
make
}
diff --git a/user/xapian-core/APKBUILD b/user/xapian-core/APKBUILD
index e8041d355..20005d338 100644
--- a/user/xapian-core/APKBUILD
+++ b/user/xapian-core/APKBUILD
@@ -42,7 +42,6 @@ package() {
libxapian() {
pkgdesc="Xapian search engine library"
- cd "$builddir"
install -d "$subpkgdir"/usr/lib
mv "$pkgdir"/usr/lib/$subpkgname* "$subpkgdir"/usr/lib
}