diff options
44 files changed, 88 insertions, 187 deletions
diff --git a/user/freealut/APKBUILD b/user/freealut/APKBUILD index c249d9d21..035d254fe 100644 --- a/user/freealut/APKBUILD +++ b/user/freealut/APKBUILD @@ -6,20 +6,14 @@ pkgrel=0 pkgdesc="Free software implementation of OpenAL ALUT" url="https://github.com/vancegroup/freealut" arch="all" +options="!check" # No test suite. license="LGPL-2.0-only" depends="" -makedepends="openal-soft-dev" +makedepends="cmake openal-soft-dev" subpackages="$pkgname-dev" source="https://distfiles.adelielinux.org/source/freealut-$pkgver.tar.xz" -prepare() { - cd "$builddir" - default_prepare - mkdir build -} - build() { - cd "$builddir"/build if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -29,18 +23,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_C_FLAGS="$CFLAGS" \ ${CMAKE_CROSSOPTS} \ - .. - make + -Bbuild + make -C build } check() { - cd "$builddir"/build - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } sha512sums="218f52ddc5f26aa6744d4209bb2ec6963e423dccec642ba96f9b6d0c1ee0972b9b86cd2fc4c81e21ba2fce7b6ff5e5150d23083b76602d0704a7e65b52f2cc45 freealut-1.1.0_git20140626.tar.xz" diff --git a/user/sdl2_image/APKBUILD b/user/sdl2_image/APKBUILD index e29ebdf53..fb0af1ea6 100644 --- a/user/sdl2_image/APKBUILD +++ b/user/sdl2_image/APKBUILD @@ -1,13 +1,14 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: pkgname=sdl2_image +_pkgname=SDL2_image pkgver=2.0.5 pkgrel=0 -_pkgname=SDL2_image pkgdesc="Library to load images of various formats as SDL surfaces" url="https://www.libsdl.org/projects/SDL_image/" arch="all" license="zlib" +depends="" makedepends="sdl2-dev libjpeg-turbo-dev libpng-dev libwebp-dev tiff-dev zlib-dev" subpackages="$pkgname-dev" @@ -24,7 +25,6 @@ builddir="$srcdir/$_pkgname-$pkgver" # - CVE-2019-12221 build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -39,12 +39,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/sdl_net/APKBUILD b/user/sdl_net/APKBUILD index 6172ddc1e..16a01d234 100644 --- a/user/sdl_net/APKBUILD +++ b/user/sdl_net/APKBUILD @@ -15,13 +15,11 @@ source="https://www.libsdl.org/projects/$_pkgname/release/$_pkgname-$pkgver.tar. builddir="$srcdir"/$_pkgname-$pkgver prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -34,12 +32,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/sdl_ttf/APKBUILD b/user/sdl_ttf/APKBUILD index 96321243a..3e34063d8 100644 --- a/user/sdl_ttf/APKBUILD +++ b/user/sdl_ttf/APKBUILD @@ -15,13 +15,11 @@ source="https://www.libsdl.org/projects/$_pkgname/release/$_pkgname-$pkgver.tar. builddir="$srcdir"/$_pkgname-$pkgver prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -33,12 +31,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/sg3_utils/APKBUILD b/user/sg3_utils/APKBUILD index 7dc10d989..35e1a4fb3 100644 --- a/user/sg3_utils/APKBUILD +++ b/user/sg3_utils/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc" source="http://sg.danny.cz/sg/p/sg3_utils-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/smartmontools/APKBUILD b/user/smartmontools/APKBUILD index 9125db241..d8ce1221e 100644 --- a/user/smartmontools/APKBUILD +++ b/user/smartmontools/APKBUILD @@ -7,16 +7,15 @@ pkgdesc="Control and monitor S.M.A.R.T. enabled hard drives" url="https://www.smartmontools.org/" arch="all" license="GPL-2.0+" +depends="" makedepends="linux-headers" subpackages="$pkgname-doc $pkgname-openrc" -source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz +source="https://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz smartd.initd smartd.confd " build() { - cd "$builddir" - ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,14 +25,10 @@ build() { } check() { - cd "$builddir" - make check } package() { - cd "$builddir" - make DESTDIR="$pkgdir"/ install install -Dm755 "$srcdir"/smartd.initd "$pkgdir"/etc/init.d/smartd diff --git a/user/snappy/APKBUILD b/user/snappy/APKBUILD index 7f9b35e0d..3662d501e 100644 --- a/user/snappy/APKBUILD +++ b/user/snappy/APKBUILD @@ -8,12 +8,12 @@ url="https://google.github.io/snappy/" arch="all" [ "$CARCH" = "armhf" ] && options="!check" # does not pass testsuite on armhf license="BSD-3-Clause" +depends="" +makedepends="cmake" subpackages="$pkgname-dbg $pkgname-dev" -source="snappy-$pkgver.tar.gz::https://github.com/google/snappy/archive/$pkgver.tar.gz - " +source="snappy-$pkgver.tar.gz::https://github.com/google/snappy/archive/$pkgver.tar.gz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -24,17 +24,15 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/socat/APKBUILD b/user/socat/APKBUILD index 52bbd9f3a..e421c558e 100644 --- a/user/socat/APKBUILD +++ b/user/socat/APKBUILD @@ -12,10 +12,10 @@ depends="" makedepends="openssl-dev" subpackages="$pkgname-doc" source="http://www.dest-unreach.org/socat/download/socat-$pkgver.tar.gz - netdb-internal.patch" + netdb-internal.patch + " build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,7 +27,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/spice/APKBUILD b/user/spice/APKBUILD index 03b4f65f9..ef57a810c 100644 --- a/user/spice/APKBUILD +++ b/user/spice/APKBUILD @@ -20,7 +20,6 @@ source="https://www.spice-space.org/download/releases/spice-server/spice-$pkgver # - CVE-2018-10873 build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -33,12 +32,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/spleen/APKBUILD b/user/spleen/APKBUILD index 2f4eb4f6b..aa902f9bc 100644 --- a/user/spleen/APKBUILD +++ b/user/spleen/APKBUILD @@ -14,8 +14,7 @@ subpackages="" source="https://github.com/fcambus/spleen/releases/download/$pkgver/spleen-$pkgver.tar.gz" package() { - local _font - for _font in *.pcf; do + for _font in "$builddir"/*.pcf; do gzip -9 $_font install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/misc/ $_font.gz done diff --git a/user/sprunge/APKBUILD b/user/sprunge/APKBUILD index bc7a3e2df..85003c4b9 100644 --- a/user/sprunge/APKBUILD +++ b/user/sprunge/APKBUILD @@ -11,10 +11,8 @@ depends="curl" makedepends="" subpackages="tpaste dpaste ix" source="" -builddir="$srcdir" package() { - cd "$builddir" mkdir -p "$pkgdir"/usr/bin printf "#!/bin/sh\n\nexec curl -F 'sprunge=<-' http://sprunge.us" > \ "$pkgdir"/usr/bin/sprunge @@ -22,7 +20,6 @@ package() { } tpaste() { - cd "$builddir" url="http://tpaste.us" pkgdesc="Helper script to paste things to $url" mkdir -p "$subpkgdir"/usr/bin @@ -32,7 +29,6 @@ tpaste() { } dpaste() { - cd "$builddir" url="http://dpaste.com" pkgdesc="Helper script to paste things to $url" mkdir -p "$subpkgdir"/usr/bin @@ -42,7 +38,6 @@ dpaste() { } ix() { - cd "$builddir" url="http://ix.io" pkgdesc="Helper script to paste things to $url" mkdir -p "$subpkgdir"/usr/bin diff --git a/user/stow/APKBUILD b/user/stow/APKBUILD index 0fa11db7f..4f203e91f 100644 --- a/user/stow/APKBUILD +++ b/user/stow/APKBUILD @@ -8,8 +8,8 @@ url="https://www.gnu.org/software/stow/" arch="noarch" license="GPL-3.0+" depends="perl" -makedepends="perl-test-output" checkdepends="perl-io-stringy" +makedepends="perl-test-output" subpackages="$pkgname-doc" source="https://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz" diff --git a/user/sword/APKBUILD b/user/sword/APKBUILD index db3e5574f..ca43371fa 100644 --- a/user/sword/APKBUILD +++ b/user/sword/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-dev" source="http://crosswire.org/ftpmirror/pub/sword/source/v1.8/sword-$pkgver.tar.gz" build() { - cd "$builddir" CPPFLAGS="$CPPFLAGS -DU_USING_ICU_NAMESPACE" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install make DESTDIR="$pkgdir" install_config } diff --git a/user/tf/APKBUILD b/user/tf/APKBUILD index b1a09da15..fe0609d9c 100644 --- a/user/tf/APKBUILD +++ b/user/tf/APKBUILD @@ -7,7 +7,7 @@ pkgrel=0 pkgdesc="Powerful curses-based MUD client" url="http://tinyfugue.sourceforge.net/" arch="all" -options="!check" # no tests +options="!check" # No test suite. license="GPL-2.0+" depends="" makedepends="openssl-dev ncurses-dev pcre-dev" @@ -22,7 +22,6 @@ source="https://sourceforge.net/projects/tinyfugue/files/tinyfugue/5.0%20beta%20 builddir="$srcdir/tf-$_pkgver" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -34,7 +33,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/the_silver_searcher/APKBUILD b/user/the_silver_searcher/APKBUILD index c9f324a69..e906445e6 100644 --- a/user/the_silver_searcher/APKBUILD +++ b/user/the_silver_searcher/APKBUILD @@ -9,14 +9,13 @@ arch="all" options="!check" # Tests are not shipped in the release tarball... license="Apache-2.0" depends="" -makedepends="pcre-dev xz-dev zlib-dev" checkdepends="cram" +makedepends="pcre-dev xz-dev zlib-dev" subpackages="$pkgname-doc" source="https://geoff.greer.fm/ag/releases/the_silver_searcher-$pkgver.tar.gz" builddir="$srcdir/the_silver_searcher-$pkgver" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,12 +27,10 @@ build() { } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/tint2/APKBUILD b/user/tint2/APKBUILD index 5650d304f..ebc94463f 100644 --- a/user/tint2/APKBUILD +++ b/user/tint2/APKBUILD @@ -8,8 +8,8 @@ pkgrel=0 pkgdesc="Simple, unintrusive panel/taskbar" url="https://gitlab.com/o9000/tint2" arch="all" -license="GPL-2.0-only AND GPL-2.0+ AND MIT AND Custom:zlib-optional-acknowledgement" options="!check" # No test suite. +license="GPL-2.0-only AND GPL-2.0+ AND MIT AND Custom:zlib-optional-acknowledgement" depends="" makedepends="cmake imlib2-dev glib-dev pango-dev cairo-dev libxcomposite-dev libxdamage-dev libxinerama-dev libxrandr-dev @@ -19,11 +19,10 @@ source="$pkgname-$pkgver.tar.bz2::https://gitlab.com/o9000/$pkgname/repository/v prepare() { mv "$srcdir/$pkgname-v$pkgver"-* "$builddir" - mkdir "$builddir"/build + default_prepare } build() { - cd "$builddir"/build cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_SYSCONFDIR=/etc \ @@ -31,13 +30,12 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - .. - make + -Bbuild + make -C build } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } sha512sums="bd5cc461199d38028b81d84f30e896e658274e166e344f4bc98bc6e43c4e25790bc80a7d4aac48d4e9e8284137fd31e4019f0c1b956149222e67a66b42379f1d tint2-16.7.tar.bz2" diff --git a/user/tinyxml2/APKBUILD b/user/tinyxml2/APKBUILD index 1fb564d19..4b096d670 100644 --- a/user/tinyxml2/APKBUILD +++ b/user/tinyxml2/APKBUILD @@ -8,7 +8,7 @@ url=" " arch="all" license="Zlib" depends="" -makedepends="" +makedepends="cmake" subpackages="$pkgname-dev" source="tinyxml2-$pkgver.tar.gz::https://github.com/leethomason/tinyxml2/archive/$pkgver.tar.gz" @@ -23,7 +23,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } diff --git a/user/tlp/APKBUILD b/user/tlp/APKBUILD index 1b1398c9a..40613efd9 100644 --- a/user/tlp/APKBUILD +++ b/user/tlp/APKBUILD @@ -33,8 +33,7 @@ rdw() { pkgdesc="Linux Advanced Power Management - Radio Device Wizard" depends="tlp" - cd "$builddir" - make DESTDIR="$subpkgdir" TLP_WITH_SYSTEMD=0 install-rdw + make DESTDIR="$subpkgdir" TLP_WITH_SYSTEMD=0 -C "$builddir" install-rdw } bashcomp() { diff --git a/user/torcs/APKBUILD b/user/torcs/APKBUILD index ef7c3cb23..d8470bf18 100644 --- a/user/torcs/APKBUILD +++ b/user/torcs/APKBUILD @@ -11,7 +11,7 @@ license="GPL-2.0+" depends="" makedepends="freealut-dev freeglut-dev libogg-dev libpng-dev libsm-dev libvorbis-dev libxmu-dev libxrandr-dev libxrender-dev libxt-dev mesa-dev - openal-soft-dev plib-dev zlib-dev" + openal-soft-dev plib-dev zlib-dev autoconf automake" subpackages="$pkgname-data::noarch" source="https://sourceforge.net/projects/torcs/files/all-in-one/$pkgver/torcs-$pkgver.tar.bz2 torcs-1.3.6-as-needed.patch @@ -22,7 +22,6 @@ source="https://sourceforge.net/projects/torcs/files/all-in-one/$pkgver/torcs-$p " build() { - cd "$builddir" export CXXFLAGS="$CXXFLAGS -fpermissive" # GCC 8 autoreconf ./configure \ @@ -36,16 +35,14 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } data() { pkgdesc="Data files for TORCS" - cd "$builddir" mkdir -p "$subpkgdir"/usr/share/games chgrp games "$subpkgdir"/usr/share/games - make DESTDIR="$subpkgdir" datainstall + make DESTDIR="$subpkgdir" -C "$builddir" datainstall } sha512sums="14b88624803c746b2f356fa185aca5be56b7d7e5192fede11307474100328bfaa67eafa61e84987bbad04590ae5740127e015707723df6d2c3197bb867818101 torcs-1.3.7.tar.bz2 diff --git a/user/traceroute/APKBUILD b/user/traceroute/APKBUILD index 8eac94eb9..278a1d1c8 100644 --- a/user/traceroute/APKBUILD +++ b/user/traceroute/APKBUILD @@ -6,21 +6,18 @@ pkgrel=0 pkgdesc="Utility to trace the network route of packets" url="http://traceroute.sourceforge.net/" arch="all" +options="!check" # No test suite. license="GPL-2.0" depends="" makedepends="" -install="" -options="!check" subpackages="$pkgname-doc" -source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" +source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" build() { - cd "$builddir" make } package() { - cd "$builddir" make DESTDIR="$pkgdir" prefix="/usr" install ln -s traceroute "$pkgdir"/usr/bin/traceroute6 } diff --git a/user/transmission/APKBUILD b/user/transmission/APKBUILD index d7eb95544..9f2a97963 100644 --- a/user/transmission/APKBUILD +++ b/user/transmission/APKBUILD @@ -46,16 +46,14 @@ check() { # check for Qt - this historically has no tests msg "Checking for Transmission Qt" - cd qt - make check + make -C qt check } package() { make DESTDIR="$pkgdir" install # install for Qt - cd "$builddir"/qt - make INSTALL_ROOT="$pkgdir/usr" install + make INSTALL_ROOT="$pkgdir/usr" -C qt install } qt() { diff --git a/user/trojita/APKBUILD b/user/trojita/APKBUILD index 8f2088e88..c55e5453c 100644 --- a/user/trojita/APKBUILD +++ b/user/trojita/APKBUILD @@ -6,20 +6,18 @@ pkgrel=0 pkgdesc="Qt-based IMAP email client" url="http://trojita.flaska.net/" arch="all" -options="!check" license="(GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1 WITH Nokia-Qt-exception-1.1 OR GPL-3.0-only) AND BSD-3-Clause AND GPL-2.0-only AND GPL-2.0+ AND LGPL-2.0-only AND LGPL-2.0+ AND LGPL-2.1+" depends="" -depends_dev="" +# Font required: https://github.com/qtwebkit/qtwebkit/issues/933 +checkdepends="ttf-liberation" makedepends="cmake extra-cmake-modules zlib-dev qt5-qtbase-dev qt5-qtwebkit-dev qt5-qttools-dev qt5-qtsvg-dev ragel mimetic-dev gpgme-dev - qtkeychain-dev $depends_dev" -install="" + qtkeychain-dev" source="https://sourceforge.net/projects/trojita/files/src/trojita-$pkgver.tar.xz use-qgpgme.patch fix-gpg.patch" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -31,22 +29,15 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DWITH_GPGMEPP=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } -check() { - cd "$builddir" - make check -} - package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/ttf-freefont/APKBUILD b/user/ttf-freefont/APKBUILD index d4a67e4a0..e6251fcda 100644 --- a/user/ttf-freefont/APKBUILD +++ b/user/ttf-freefont/APKBUILD @@ -13,11 +13,10 @@ source="https://ftp.gnu.org/gnu/freefont/freefont-ttf-$pkgver.zip" builddir="$srcdir/freefont-$pkgver" package() { - cd "$builddir" install -d "$pkgdir/usr/share/fonts/$pkgname/" - install -m644 *.ttf "$pkgdir/usr/share/fonts/$pkgname/" + install -m644 "$builddir"/*.ttf "$pkgdir/usr/share/fonts/$pkgname/" # Licensing exception is discussed in README in pkgver==20120503 - install -Dm644 README "$pkgdir/usr/share/licenses/$pkgname/README" + install -Dm644 "$builddir"/README "$pkgdir/usr/share/licenses/$pkgname/README" } sha512sums="dcd6f525e8f97631c6f84ab4cc2a31af4614dcdb9a4d434bd890baf18e0c2934032f2915384fc27fbecf60d259d792e48f52d357b07e3ed2616d3c8c3544268e freefont-ttf-20120503.zip" diff --git a/user/ttf-hack/APKBUILD b/user/ttf-hack/APKBUILD index 433d1c1f4..d5fbf1b07 100644 --- a/user/ttf-hack/APKBUILD +++ b/user/ttf-hack/APKBUILD @@ -11,12 +11,10 @@ license="OFL-2.0" depends="" makedepends="" source="https://github.com/source-foundry/Hack/releases/download/v$pkgver/Hack-v$pkgver-ttf.zip" -builddir="$srcdir"/ttf package() { - cd "$builddir" for variant in Regular Bold BoldItalic Italic; do - install -m644 -D Hack-$variant.ttf \ + install -m644 -D "$srcdir"/ttf/Hack-$variant.ttf \ "$pkgdir"/usr/share/fonts/truetype/Hack-$variant.ttf done } diff --git a/user/ttf-sinhala-lklug/APKBUILD b/user/ttf-sinhala-lklug/APKBUILD index c487c96f4..dae2dfe1e 100644 --- a/user/ttf-sinhala-lklug/APKBUILD +++ b/user/ttf-sinhala-lklug/APKBUILD @@ -14,8 +14,8 @@ subpackages="" source="http://sinhala.sourceforge.net/files/ttf-sinhala-lklug-$pkgver.tar.gz" package() { - cd "$builddir" - install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ lklug.ttf + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ \ + "$builddir"/lklug.ttf } sha512sums="d1b1459981f1d80acd17aa09a2171e17ad246d98e00035c9592a6c93d89423ccb20f440c3eaccb21b9bb5fae2ac8eca5458715fe8a60e7294f75f9fffe3417aa ttf-sinhala-lklug-0.6.tar.gz" diff --git a/user/ttf-terminus/APKBUILD b/user/ttf-terminus/APKBUILD index 69167790b..fd1543413 100644 --- a/user/ttf-terminus/APKBUILD +++ b/user/ttf-terminus/APKBUILD @@ -6,7 +6,7 @@ pkgrel=0 pkgdesc="TrueType variant of Terminus Font" url="https://files.ax86.net/terminus-ttf/" arch="noarch" -options="!check" # No tests +options="!check" # No test suite. license="OFL-1.1" depends="fontconfig" makedepends="" @@ -14,7 +14,6 @@ source="https://files.ax86.net/terminus-ttf/files/$pkgver/terminus-ttf-$pkgver.z builddir="$srcdir/terminus-ttf-$pkgver" package() { - cd "$builddir" mkdir -p "$pkgdir"/usr/share/fonts/X11/TTF/${pkgname#*-} for i in *.ttf; do install -Dm644 "$i" "$pkgdir"/usr/share/fonts/X11/TTF/${pkgname#*-} diff --git a/user/uchardet/APKBUILD b/user/uchardet/APKBUILD index 05f10ff7b..153dfc63b 100644 --- a/user/uchardet/APKBUILD +++ b/user/uchardet/APKBUILD @@ -7,14 +7,12 @@ pkgdesc="Universal character encoding detection library" url="https://www.freedesktop.org/wiki/Software/uchardet/" arch="all" license="MPL-1.1 OR GPL-2.0+ OR LGPL-2.1+" +depends="" makedepends="cmake" subpackages="$pkgname-dev $pkgname-doc" source="https://www.freedesktop.org/software/uchardet/releases/uchardet-$pkgver.tar.xz" -sha512sums="eceeadae060bf277e298d709856609dde32921271140dc1fb0a33c7b6e1381033fc2960d616ebbd82c92815936864d2c0743b1b5ea1b7d4a200df87df80d6de5 uchardet-0.0.6.tar.xz" -builddir="$srcdir/uchardet-$pkgver" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -25,17 +23,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } +sha512sums="eceeadae060bf277e298d709856609dde32921271140dc1fb0a33c7b6e1381033fc2960d616ebbd82c92815936864d2c0743b1b5ea1b7d4a200df87df80d6de5 uchardet-0.0.6.tar.xz" diff --git a/user/ucpp/APKBUILD b/user/ucpp/APKBUILD index 9d45b1d0a..59f118c41 100644 --- a/user/ucpp/APKBUILD +++ b/user/ucpp/APKBUILD @@ -14,7 +14,6 @@ subpackages="$pkgname-doc" source="https://gitlab.com/scarabeusiv/ucpp/uploads/79f08e39c676f15ed8a59335f6c9b924/ucpp-1.3.5.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -23,7 +22,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/unittest-cpp/APKBUILD b/user/unittest-cpp/APKBUILD index 62a54662c..647b16973 100644 --- a/user/unittest-cpp/APKBUILD +++ b/user/unittest-cpp/APKBUILD @@ -8,12 +8,12 @@ url=" " arch="all" license="MIT" depends="" -makedepends="" +makedepends="bash" subpackages="$pkgname-dev" source="https://github.com/unittest-cpp/unittest-cpp/releases/download/v$pkgver/unittest-cpp-$pkgver.tar.gz" build() { - ./configure \ + bash ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ diff --git a/user/uptimed/APKBUILD b/user/uptimed/APKBUILD index 3ae155396..22e1b57c6 100644 --- a/user/uptimed/APKBUILD +++ b/user/uptimed/APKBUILD @@ -4,18 +4,19 @@ pkgname=uptimed pkgver=0.4.2 pkgrel=0 -pkgdesc='System uptime record daemon' +pkgdesc="System uptime record daemon" arch="all" -options="!check" # No tests +options="!check" # No test suite. url="https://github.com/rpodgorny/uptimed" license="GPL-2.0-only" -subpackages="$pkgname-doc $pkgname-openrc" +depends="" makedepends="autoconf automake libtool" +subpackages="$pkgname-doc $pkgname-openrc" source="$pkgname-$pkgver.tar.gz::https://github.com/rpodgorny/uptimed/archive/v$pkgver.tar.gz - uptimed.init" + uptimed.init + " build() { - cd "$builddir" autoreconf -vif ./configure \ --build=$CBUILD \ @@ -27,7 +28,6 @@ build() { } package() { - cd "$builddir" make install DESTDIR="$pkgdir" mv "$pkgdir"/etc/uptimed.conf-dist \ "$pkgdir"/etc/uptimed.conf diff --git a/user/urw-base35-fonts/APKBUILD b/user/urw-base35-fonts/APKBUILD index f15189502..3d1388740 100644 --- a/user/urw-base35-fonts/APKBUILD +++ b/user/urw-base35-fonts/APKBUILD @@ -10,11 +10,10 @@ options="!check" # No tests provided. license="AGPL-3.0-only WITH font-exception" depends="" makedepends="" +subpackages="" source="urw-base35-fonts-$pkgver.tar.gz::https://github.com/ArtifexSoftware/urw-base35-fonts/archive/$pkgver.tar.gz" package() { - local _fconf - mkdir -p "$pkgdir"/usr/share/fonts/ttf-urw-base35 cp -a "$builddir"/fonts/*.otf "$pkgdir"/usr/share/fonts/ttf-urw-base35/ diff --git a/user/usbredir/APKBUILD b/user/usbredir/APKBUILD index ef23e2697..51b5da16c 100644 --- a/user/usbredir/APKBUILD +++ b/user/usbredir/APKBUILD @@ -7,12 +7,12 @@ url="https://www.spice-space.org/usbredir.html" arch="all" options="!check" # No test suite. license="GPL-2.0-or-later AND LGPL-2.1-or-later" +depends="" makedepends="libusb-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-server" source="https://www.spice-space.org/download/usbredir/usbredir-$pkgver.tar.bz2 " build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,12 +26,10 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } check() { - cd "$builddir" make check } diff --git a/user/usbutils/APKBUILD b/user/usbutils/APKBUILD index 69a6b1618..71386fa2b 100644 --- a/user/usbutils/APKBUILD +++ b/user/usbutils/APKBUILD @@ -6,9 +6,9 @@ pkgdesc="USB utilities" url="http://linux-usb.sourceforge.net/" arch="all" license="GPL-2.0+ AND GPL-2.0-only" -subpackages="$pkgname-doc" depends="hwids-udev" -makedepends="autoconf automake eudev-dev libusb-dev" +makedepends="autoconf automake eudev-dev libtool libusb-dev" +subpackages="$pkgname-doc" source="https://mirrors.kernel.org/pub/linux/utils/usb/usbutils/$pkgname-$pkgver.tar.xz hwdata.patch " diff --git a/user/vamp-sdk/APKBUILD b/user/vamp-sdk/APKBUILD index 26c4f887b..bfeee2132 100644 --- a/user/vamp-sdk/APKBUILD +++ b/user/vamp-sdk/APKBUILD @@ -6,16 +6,15 @@ pkgrel=0 pkgdesc="SDK for developing Vamp audio analysis plugins" url="https://vamp-plugins.org/develop.html" arch="all" -options="!check" # no tests +options="!check" # No test suite. license="BSD-3-Clause AND MIT" +depends="" makedepends="libsndfile-dev" subpackages="$pkgname-dev" source="https://code.soundsoftware.ac.uk/attachments/download/2206/vamp-plugin-sdk-$pkgver.tar.gz" -sha512sums="91dd7cae72334718dcbdac06b1ffa3f3ba76e977b82b928ab634d9982aa15ca4e30978a7778215753c61e56831077d7634d24e65e468ab6a8a87a5957fb09bf3 vamp-plugin-sdk-2.7.1.tar.gz" builddir="$srcdir/vamp-plugin-sdk-$pkgver" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,7 +26,7 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } +sha512sums="91dd7cae72334718dcbdac06b1ffa3f3ba76e977b82b928ab634d9982aa15ca4e30978a7778215753c61e56831077d7634d24e65e468ab6a8a87a5957fb09bf3 vamp-plugin-sdk-2.7.1.tar.gz" diff --git a/user/wireless-tools/APKBUILD b/user/wireless-tools/APKBUILD index 8f327a3e9..e8c000ea5 100644 --- a/user/wireless-tools/APKBUILD +++ b/user/wireless-tools/APKBUILD @@ -17,16 +17,13 @@ depends="" makedepends="linux-headers" subpackages="$pkgname-dev $pkgname-doc" source="https://hewlettpackard.github.io/wireless-tools/wireless_tools.$_pkgver.tar.gz" - builddir="$srcdir/$_pkgname.$_pkgmaj" build() { - cd "$builddir" make } package() { - cd "$builddir" make INSTALL_DIR="$pkgdir"/usr/sbin \ INSTALL_LIB="$pkgdir"/usr/lib \ INSTALL_INC="$pkgdir"/usr/include \ diff --git a/user/x11vnc/APKBUILD b/user/x11vnc/APKBUILD index c68858df3..e699202f7 100644 --- a/user/x11vnc/APKBUILD +++ b/user/x11vnc/APKBUILD @@ -7,21 +7,20 @@ pkgdesc="VNC server for X11 sessions" url="http://www.karlrunge.com/x11vnc/" arch="all" license="GPL-2.0-only" +depends="" makedepends="cairo-dev libjpeg-turbo-dev libvncserver-dev libxcursor-dev - openssl-dev utmps-dev zlib-dev" + openssl-dev utmps-dev zlib-dev autoconf automake" subpackages="$pkgname-doc" source="$pkgname-$pkgver.tar.gz::https://github.com/LibVNC/x11vnc/archive/$pkgver.tar.gz utmps.patch " prepare() { - cd "$builddir" default_prepare ./autogen.sh } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -34,12 +33,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xautolock/APKBUILD b/user/xautolock/APKBUILD index 71fd17994..a614dfb54 100644 --- a/user/xautolock/APKBUILD +++ b/user/xautolock/APKBUILD @@ -1,29 +1,27 @@ -# Contributor: Johannes Matheis <jomat+alpinebuild@jmt.gr> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=xautolock pkgver=2.2 pkgrel=4 pkgdesc="An automatic X screen-locker/screen-saver" url="http://ibiblio.org/pub/Linux/X11/screensavers/" -arch="all" # this might not build on aarch64? removed from alpine commit -license="GPL-2.0" -options="!check" # This package has no testsuite +arch="all" +options="!check" # This package has no test suite. +license="GPL-2.0-only" depends="" makedepends="$depends_dev imake xorg-server-dev libxscrnsaver-dev xorg-cf-files" subpackages="$pkgname-doc" source="https://www.ibiblio.org/pub/linux/X11/screensavers/xautolock-$pkgver.tgz - processwait.patch" + processwait.patch + " build() { - cd "$builddir" - xmkmf - make + xmkmf + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install - make MANPATH=/usr/share/man DESTDIR="$pkgdir" install.man + make DESTDIR="$pkgdir" install + make MANPATH=/usr/share/man DESTDIR="$pkgdir" install.man } sha512sums="5f9dcc25cda706610e77a74235c4b421ca3a833d154b1a269057f0774579e1c6ec36fe0e5be5fadd6942ce8c1640a760f891397586b162e6024b524635153d04 xautolock-2.2.tgz diff --git a/user/xcape/APKBUILD b/user/xcape/APKBUILD index c560795e1..34ddcb85a 100644 --- a/user/xcape/APKBUILD +++ b/user/xcape/APKBUILD @@ -14,12 +14,10 @@ subpackages="$pkgname-doc" source="$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz" build() { - cd "$builddir" make } package() { - cd "$builddir" make DESTDIR="$pkgdir" MANDIR="/share/man/man1" install } diff --git a/user/xdotool/APKBUILD b/user/xdotool/APKBUILD index 3aae63783..af14cc595 100644 --- a/user/xdotool/APKBUILD +++ b/user/xdotool/APKBUILD @@ -11,23 +11,20 @@ options="!check" # Requires running X11 server license="BSD-3-Clause" depends="" depends_dev="libx11-dev libxtst-dev libxinerama-dev libxkbcommon-dev" -makedepends="$depends_dev perl" #checkdepends="xvfb ruby-minitest cmd:which lsof xdpyinfo xterm xwininfo" +makedepends="$depends_dev perl" subpackages="$pkgname-dev $pkgname-doc" source="https://github.com/jordansissel/xdotool/releases/download/v$pkgver/xdotool-$pkgver.tar.gz" build() { - cd "$builddir" make WITHOUT_RPATH_FIX=1 } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" PREFIX="/usr" INSTALLMAN="/usr/share/man" install } diff --git a/user/xorg-cf-files/APKBUILD b/user/xorg-cf-files/APKBUILD index 5a438d2bf..f3270a4db 100644 --- a/user/xorg-cf-files/APKBUILD +++ b/user/xorg-cf-files/APKBUILD @@ -1,20 +1,18 @@ -# Contributor: Johannes Matheis <jomat+alpinebuild@jmt.gr> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=xorg-cf-files pkgver=1.0.6 pkgrel=0 pkgdesc="Data files for the imake utility" -url="http://xorg.freedesktop.org/" +url="https://www.X.Org/" arch="noarch" +options="!check" # This package has no test suite. license="X11" -options="!check" # This package has no testsuite depends="" -makedepends="" +makedepends="util-macros" subpackages="$pkgname-doc" -source="http://xorg.freedesktop.org/releases/individual/util/${pkgname}-${pkgver}.tar.bz2" +source="https://www.X.Org/releases/individual/util/${pkgname}-${pkgver}.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,12 +25,9 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" + install -m755 -d "$pkgdir"/usr/share/licenses/$pkgname + install -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/ } -md5sums="28649f34fa23143f1945aa2750e1472a xorg-cf-files-1.0.6.tar.bz2" -sha256sums="4dcf5a9dbe3c6ecb9d2dd05e629b3d373eae9ba12d13942df87107fdc1b3934d xorg-cf-files-1.0.6.tar.bz2" sha512sums="1749a5fbcda2c15c300028abce79a3304cfb10f215bf98cf30558144eb64f9fa06a69203159f44405224ed567ac5bc0ff1222e3656367f69acc99f44871424fa xorg-cf-files-1.0.6.tar.bz2" diff --git a/user/xscreensaver/APKBUILD b/user/xscreensaver/APKBUILD index 4e8a19fc4..047d4eef8 100644 --- a/user/xscreensaver/APKBUILD +++ b/user/xscreensaver/APKBUILD @@ -6,7 +6,7 @@ pkgrel=0 pkgdesc="X Screensaver suite" url="https://www.jwz.org/xscreensaver/" arch="all" -options="!check suid" # no tests +options="!check suid" # No test suite. license="MIT" depends="" makedepends="bc gtk+2.0-dev intltool libglade-dev libice-dev libjpeg-turbo-dev @@ -16,7 +16,6 @@ subpackages="$pkgname-doc $pkgname-lang" source="https://www.jwz.org/xscreensaver/xscreensaver-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,7 +27,6 @@ build() { } package() { - cd "$builddir" make install_prefix="$pkgdir" install } diff --git a/user/yubico-c/APKBUILD b/user/yubico-c/APKBUILD index 50e88d1c6..5409c8b37 100644 --- a/user/yubico-c/APKBUILD +++ b/user/yubico-c/APKBUILD @@ -8,19 +8,19 @@ url="https://developers.yubico.com/yubico-c/" arch="all" license="BSD-2-Clause" depends="" -makedepends="asciidoctor" +makedepends="asciidoctor autoconf automake libtool" subpackages="$pkgname-dev $pkgname-doc" source="yubico-c-libyubikey-$pkgver.tar.gz::https://github.com/Yubico/yubico-c/archive/libyubikey-$pkgver.tar.gz - use-asciidoctor.patch" + use-asciidoctor.patch + " builddir="$srcdir/$pkgname-libyubikey-$pkgver" prepare() { - cd "$builddir" default_prepare autoreconf -vif } + build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -32,12 +32,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir/" install } diff --git a/user/yubikey-personalization/APKBUILD b/user/yubikey-personalization/APKBUILD index 74b2a3f2f..1db97be94 100644 --- a/user/yubikey-personalization/APKBUILD +++ b/user/yubikey-personalization/APKBUILD @@ -8,7 +8,8 @@ url="https://developers.yubico.com/yubikey-personalization/" arch="all" license="BSD-2-Clause AND Public-Domain" depends="" -makedepends="yubico-c-dev libusb-dev json-c-dev asciidoctor" +makedepends="yubico-c-dev libusb-dev json-c-dev asciidoctor + autoconf automake libtool" subpackages="$pkgname-dev $pkgname-doc" source="yubikey-personalization-$pkgver.tar.gz::https://github.com/Yubico/yubikey-personalization/archive/v$pkgver.tar.gz use-asciidoctor.patch diff --git a/user/zola/APKBUILD b/user/zola/APKBUILD index b3add1099..f61764a01 100644 --- a/user/zola/APKBUILD +++ b/user/zola/APKBUILD @@ -8,6 +8,7 @@ pkgdesc="A fast static site generator in a single binary with everything built i url="https://github.com/getzola/zola" arch="all" license="BSD-3-Clause AND MIT" +depends="" makedepends="cargo oniguruma-dev openssl-dev zlib-dev" subpackages=" $pkgname-doc |