From 21c4b84eb30afc752dd0ba5965c61dfc3bebac3d Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Sat, 11 Jan 2020 01:54:54 +0000 Subject: user/*: Modernise / fix syntax / metadata / deps --- user/mac-fdisk/APKBUILD | 7 ++-- user/mactel-boot/APKBUILD | 1 - user/mednafen/APKBUILD | 4 +-- user/mesa-demos/APKBUILD | 9 +++-- user/mimetic/APKBUILD | 4 --- user/minicom/APKBUILD | 8 ++--- user/mksh/APKBUILD | 8 ++--- user/monoid/APKBUILD | 3 +- user/mousepad/APKBUILD | 1 + user/mtr/APKBUILD | 6 ++-- user/musl-obstack/APKBUILD | 2 +- user/mythes/APKBUILD | 7 ++-- user/nasm/APKBUILD | 5 ++- user/ncftp/APKBUILD | 17 ++++------ user/ncompress/APKBUILD | 2 ++ user/netifrc/APKBUILD | 2 -- user/netqmail/APKBUILD | 6 ++-- user/newt/APKBUILD | 2 +- user/numactl/APKBUILD | 6 ++-- user/opengfx/APKBUILD | 3 -- user/openjdk8/APKBUILD | 28 ++++------------ user/openmsx/APKBUILD | 2 -- user/opensfx/APKBUILD | 7 ++-- user/oprofile/APKBUILD | 3 -- user/optipng/APKBUILD | 3 -- user/password-store/APKBUILD | 4 +-- user/pavucontrol/APKBUILD | 5 +-- user/pcmciautils/APKBUILD | 2 -- user/pcsc-lite/APKBUILD | 3 -- user/phonon-vlc/APKBUILD | 2 +- user/physfs/APKBUILD | 2 +- user/physlock/APKBUILD | 3 +- user/picocom/APKBUILD | 2 +- user/pidgin-otr/APKBUILD | 3 -- user/pidgin/APKBUILD | 4 +-- user/plib/APKBUILD | 5 +-- user/pm-quirks/APKBUILD | 7 ++-- user/pm-utils/APKBUILD | 2 -- user/ponysay/APKBUILD | 2 -- user/purple-plugin-pack/APKBUILD | 3 -- user/py3-configobj/APKBUILD | 5 +-- user/py3-incremental/APKBUILD | 3 -- user/py3-josepy/APKBUILD | 1 + user/py3-markdown/APKBUILD | 2 +- user/py3-pytest-expect/APKBUILD | 4 --- user/py3-requests-toolbelt/APKBUILD | 4 +-- user/py3-rfc3339/APKBUILD | 2 -- user/py3-u-msgpack-python/APKBUILD | 3 +- user/py3-webencodings/APKBUILD | 6 +--- user/py3-zope-component/APKBUILD | 4 +-- user/py3-zope-deferredimport/APKBUILD | 2 +- user/py3-zope-deprecation/APKBUILD | 4 +-- user/py3-zope-event/APKBUILD | 6 +--- user/py3-zope-interface/APKBUILD | 3 -- user/py3-zope-proxy/APKBUILD | 2 +- user/s6-dns/APKBUILD | 41 ++++++++++------------- user/s6-networking/APKBUILD | 63 ++++++++++++++++------------------- user/slang/APKBUILD | 7 ++-- user/tk/APKBUILD | 7 ++-- user/xclip/APKBUILD | 5 +-- 60 files changed, 127 insertions(+), 242 deletions(-) (limited to 'user') diff --git a/user/mac-fdisk/APKBUILD b/user/mac-fdisk/APKBUILD index 1120b249b..fa5b7d902 100644 --- a/user/mac-fdisk/APKBUILD +++ b/user/mac-fdisk/APKBUILD @@ -7,8 +7,8 @@ pkgrel=2 pkgdesc="68K and PowerPC fixed disk partitioning utility" url="https://adelielinux.org/" arch="all !aarch64" # Literally does not support this arch. -license="GPL-2.0" options="!check" # No test suite. +license="GPL-2.0" depends="" makedepends="linux-headers" subpackages="$pkgname-doc" @@ -23,16 +23,15 @@ source="https://distfiles.adelielinux.org/source/mac-fdisk_0.1.orig.tar.gz mac-fdisk-large-disk-support.patch mac-fdisk-largerthan2gb.patch mac-fdisk-non-glibc-support.patch - flush-stdout.patch" + flush-stdout.patch + " builddir="$srcdir/$pkgname-$_pkgver.orig" build() { - cd "$builddir" make CFLAGS="-D_GNU_SOURCE" } package() { - cd "$builddir" mkdir -p "$pkgdir"/sbin make DESTDIR="$pkgdir" install diff --git a/user/mactel-boot/APKBUILD b/user/mactel-boot/APKBUILD index 8909202af..e0e1bf16e 100644 --- a/user/mactel-boot/APKBUILD +++ b/user/mactel-boot/APKBUILD @@ -14,7 +14,6 @@ subpackages="$pkgname-doc" source="http://www.codon.org.uk/~mjg59/mactel-boot/mactel-boot-$pkgver.tar.bz2" build() { - cd "$builddir" make hfs-bless } diff --git a/user/mednafen/APKBUILD b/user/mednafen/APKBUILD index ae73a2f66..64559ad16 100644 --- a/user/mednafen/APKBUILD +++ b/user/mednafen/APKBUILD @@ -6,12 +6,12 @@ pkgrel=0 pkgdesc="Portable multi-system emulator" url="https://mednafen.github.io/" arch="all !s390x" -options="!check !dbg" # mednafen does not ship actual tests +options="!check !dbg" # mednafen does not ship actual tests subpackages="$pkgname-lang" license="GPL-2.0-only" depends="" makedepends="alsa-lib-dev flac-dev libogg-dev libsndfile-dev libvorbis-dev - lzo-dev sdl2-dev zlib-dev" + lzo-dev sdl2-dev zlib-dev autoconf automake" source="https://mednafen.github.io/releases/files/$pkgname-$pkgver.tar.xz ppc.patch ppc64.patch diff --git a/user/mesa-demos/APKBUILD b/user/mesa-demos/APKBUILD index d1c172828..7a79aa829 100644 --- a/user/mesa-demos/APKBUILD +++ b/user/mesa-demos/APKBUILD @@ -5,15 +5,15 @@ pkgname=mesa-demos pkgver=8.4.0 pkgrel=1 pkgdesc="Mesa demos and utils" -url="http://mesa3d.org" +url="https://mesa3d.org" arch="all" +options="!check" # No test suite. license="X11" -options="!check" # No testsuite +depends="" makedepends="mesa-dev glew-dev glu-dev freeglut-dev freetype-dev libtool" -source="ftp://ftp.freedesktop.org/pub/mesa/demos/$pkgname-$pkgver.tar.bz2" +source="https://mesa.freedesktop.org/archive/demos/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" export LDFLAGS="$LDFLAGS -Wl,-z,lazy" ./configure \ --build=$CBUILD \ @@ -23,7 +23,6 @@ build() { } package() { - cd "$builddir" make -j1 DESTDIR="$pkgdir" install # conflicts with X11 bitmap tool mv "$pkgdir"/usr/bin/bitmap "$pkgdir"/usr/bin/bitmap-demo diff --git a/user/mimetic/APKBUILD b/user/mimetic/APKBUILD index 058a8d91e..8913eecd8 100644 --- a/user/mimetic/APKBUILD +++ b/user/mimetic/APKBUILD @@ -16,13 +16,11 @@ source="http://www.codesink.org/download/mimetic-$pkgver.tar.gz " 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/minicom/APKBUILD b/user/minicom/APKBUILD index d597290e8..7ff093995 100644 --- a/user/minicom/APKBUILD +++ b/user/minicom/APKBUILD @@ -3,7 +3,7 @@ pkgname=minicom pkgver=2.7.1 pkgrel=0 -pkgdesc="menu driven communications program for terminals" +pkgdesc="Menu-driven communications program for terminals" url="https://fossies.org/linux/minicom/" arch="all" license="GPL-2.0+" @@ -11,10 +11,10 @@ depends="" makedepends="ncurses-dev gettext-tiny-dev linux-headers" subpackages="$pkgname-doc $pkgname-lang" source="https://fossies.org/linux/misc/$pkgname-$pkgver.tar.gz - fix-includes.patch" + fix-includes.patch + " build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,12 +26,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/mksh/APKBUILD b/user/mksh/APKBUILD index acbe85329..192101edb 100644 --- a/user/mksh/APKBUILD +++ b/user/mksh/APKBUILD @@ -8,12 +8,12 @@ url="http://mirbsd.de/mksh" arch="all" license="MirOS OR ISC" depends="" -makedepends="" checkdepends="ed perl" +makedepends="" subpackages="$pkgname-doc" install="mksh.post-install mksh.post-upgrade mksh.pre-deinstall" source="http://www.mirbsd.org/MirOS/dist/mir/${pkgname}/${pkgname}-R${pkgver}.tgz" -builddir=$srcdir/$pkgname +builddir="$srcdir"/$pkgname build() { # Build the main shell: @@ -27,10 +27,10 @@ build() { } check() { - echo "Running the test suite for mksh:" + msg "Running the test suite for mksh" ./test_mksh.sh - echo "Running the test suite for lksh:" + msg "Running the test suite for lksh:" ./test_lksh.sh } diff --git a/user/monoid/APKBUILD b/user/monoid/APKBUILD index 449d177e1..da210f0f7 100644 --- a/user/monoid/APKBUILD +++ b/user/monoid/APKBUILD @@ -15,8 +15,7 @@ source="https://raw.githubusercontent.com/larsenwork/monoid/2db2d289f4e61010dd3f builddir="$srcdir/" package() { - cd "$builddir" - install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ *.ttf + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ "$builddir"/*.ttf } sha512sums="2776bbc7febf17c10f87bbdd3e6e4fd7c24b93286009d1dcb0ca8058e1e1437c3179068ab608c3f69ae07c08950ececb4d0ad88e82ccba4a6bd2d8b63f71a9c8 Monoid-Small.zip" diff --git a/user/mousepad/APKBUILD b/user/mousepad/APKBUILD index 8e6461482..f7e87a35d 100644 --- a/user/mousepad/APKBUILD +++ b/user/mousepad/APKBUILD @@ -7,6 +7,7 @@ pkgdesc="Simple text editor for the XFCE desktop environment" url="https://xfce.org" arch="all" license="GPL-2.0+" +depends="" makedepends="dbus-glib-dev glib-dev gtk+3.0-dev gtksourceview-3.0-dev intltool xfconf-dev" subpackages="$pkgname-lang" diff --git a/user/mtr/APKBUILD b/user/mtr/APKBUILD index b2483b326..59fc8a203 100644 --- a/user/mtr/APKBUILD +++ b/user/mtr/APKBUILD @@ -41,15 +41,13 @@ build() { } package() { - cd "$builddir"/curses - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C curses install } gtk() { pkgdesc="Graphical traceroute tool" depends="" - cd "$builddir"/gtk - make DESTDIR="$subpkgdir" install + make DESTDIR="$subpkgdir" -C "$builddir"/gtk install install -D -m 644 "$srcdir"/mtr-gtk.desktop \ "$subpkgdir"/usr/share/applications/mtr-gtk.desktop install -D -m 644 "$builddir"/img/mtr_icon.xpm \ diff --git a/user/musl-obstack/APKBUILD b/user/musl-obstack/APKBUILD index 47ca39a43..c0eb566a7 100644 --- a/user/musl-obstack/APKBUILD +++ b/user/musl-obstack/APKBUILD @@ -8,7 +8,7 @@ url=" " arch="all" license="GPL-2.0+" depends="" -makedepends="" +makedepends="autoconf automake libtool" subpackages="$pkgname-dev" source="musl-obstack-$pkgver.tar.gz::https://github.com/pullmoll/musl-obstack/archive/v$pkgver.tar.gz" diff --git a/user/mythes/APKBUILD b/user/mythes/APKBUILD index 6346e7cb9..5f171b76a 100644 --- a/user/mythes/APKBUILD +++ b/user/mythes/APKBUILD @@ -8,13 +8,13 @@ url="http://hunspell.github.io/" arch="all" options="!check" # No test suite. license="Custom" -subpackages="$pkgname-dev" +depends="" depends_dev="perl hunspell-dev" makedepends="$depends_dev" -source="http://downloads.sourceforge.net/hunspell/$pkgname-$pkgver.tar.gz" +subpackages="$pkgname-dev" +source="https://downloads.sourceforge.net/hunspell/$pkgname-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -30,7 +30,6 @@ build() { } package() { - cd "$builddir" make -j1 DESTDIR="$pkgdir" install install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } diff --git a/user/nasm/APKBUILD b/user/nasm/APKBUILD index 81aa6a996..4e73db97e 100644 --- a/user/nasm/APKBUILD +++ b/user/nasm/APKBUILD @@ -6,12 +6,13 @@ pkgdesc="80x86 assembler designed for portability and modularity" url="https://www.nasm.us/" arch="all" license="BSD-2-Clause" +depends="" checkdepends="perl" +makedepends="" subpackages="$pkgname-doc" source="https://www.nasm.us/pub/nasm/releasebuilds/$pkgver/$pkgname-$pkgver.tar.bz2" build () { - cd "$builddir" export CFLAGS= export CXXFLAGS= ./configure \ @@ -22,12 +23,10 @@ build () { } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/ncftp/APKBUILD b/user/ncftp/APKBUILD index 1a9b5fce4..dd1a31d21 100644 --- a/user/ncftp/APKBUILD +++ b/user/ncftp/APKBUILD @@ -8,13 +8,12 @@ url="http://www.ncftp.com/" arch="all" options="!check" # No test suite. license="ClArtistic" +depends="" makedepends="ncurses-dev" -source="ftp://ftp.ncftp.com/ncftp/$pkgname-$pkgver-src.tar.gz" subpackages="$pkgname-doc $pkgname-bookmarks" +source="ftp://ftp.ncftp.com/ncftp/$pkgname-$pkgver-src.tar.gz" -build () { - cd "$builddir" - +build() { LIBS="-ltinfo" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -22,22 +21,18 @@ build () { --sysconfdir=/etc \ --mandir=/usr/share/man - cd "$builddir"/libncftp - make shared - cd "$builddir" + make -C libncftp shared make } package() { - cd "$builddir"/libncftp - make PREFIX="${pkgdir}"/usr soinstall - cd "$builddir" + make PREFIX="${pkgdir}"/usr -C libncftp soinstall make DESTDIR="$pkgdir" install install -D doc/LICENSE.txt \ "$pkgdir"/usr/share/licenses/"$pkgname"/LICENSE } -bookmarks () { +bookmarks() { mkdir -p "$subpkgdir"/usr/bin mv "$pkgdir"/usr/bin/ncftpbookmarks \ "$subpkgdir"/usr/bin/ diff --git a/user/ncompress/APKBUILD b/user/ncompress/APKBUILD index 0a34a72fe..2ed725ebf 100644 --- a/user/ncompress/APKBUILD +++ b/user/ncompress/APKBUILD @@ -8,6 +8,8 @@ url="https://github.com/vapier/ncompress" arch="all" options="!check" # No test suite. license="Public-Domain" +depends="" +makedepends="" subpackages="$pkgname-doc" source="https://downloads.sourceforge.net/ncompress/ncompress-$pkgver.tar.gz fix-9bit-compress.patch" diff --git a/user/netifrc/APKBUILD b/user/netifrc/APKBUILD index da1ef7d28..6749f98c7 100644 --- a/user/netifrc/APKBUILD +++ b/user/netifrc/APKBUILD @@ -14,12 +14,10 @@ subpackages="$pkgname-doc $pkgname-openrc" source="https://gitweb.gentoo.org/proj/$pkgname.git/snapshot/$pkgname-$pkgver.tar.gz" build() { - cd "$builddir" make UDEVDIR=/lib/udev LIBEXECDIR=/lib/$pkgname PF="$pkgname-$pkgver" } package() { - cd "$builddir" make UDEVDIR=/lib/udev LIBEXECDIR=/lib/$pkgname DESTDIR="$pkgdir" install for doc in README CREDITS TODO; do install -m 644 "$builddir"/$doc "$pkgdir"/usr/share/doc/$pkgname/ diff --git a/user/netqmail/APKBUILD b/user/netqmail/APKBUILD index 173f4da66..551895f83 100644 --- a/user/netqmail/APKBUILD +++ b/user/netqmail/APKBUILD @@ -7,13 +7,13 @@ pkgdesc="The qmail mail transfer agent (community version)" url="http://www.netqmail.org/" arch="all" license="Public-Domain" -provides=sendmail options="suid !check" # suid programs (qmail-queue); no test suite depends="execline s6 s6-networking" makedepends="utmps-dev" subpackages="$pkgname-doc $pkgname-openrc" -install="$pkgname.post-install $pkgname.pre-deinstall" provider_priority=1 +provides="sendmail" +install="$pkgname.post-install $pkgname.pre-deinstall" source="http://www.netqmail.org/$pkgname-$pkgver.tar.gz 0001-DESTDIR.patch 0002-qbiffutmpx-20170820.patch @@ -66,7 +66,6 @@ makeservicedir() } build() { - cd "$builddir" echo "$CC $CFLAGS" > conf-cc echo "$CC $LDFLAGS -s -static" > conf-ld echo "$CC $LDFLAGS" > conf-ldi # because fakeroot doesn't work with static programs @@ -79,7 +78,6 @@ build() { } package() { - cd "$builddir" mkdir -p -m 0755 "$pkgdir"/var/qmail/services "$pkgdir"/var/log/qmail "$pkgdir"/usr/bin "$pkgdir"/usr/sbin "$pkgdir"/usr/share/doc "$pkgdir"/etc/qmail/services "$pkgdir"/etc/conf.d "$pkgdir"/etc/init.d chown qmaill:qmaill "$pkgdir"/var/log/qmail chmod 2700 "$pkgdir"/var/log/qmail diff --git a/user/newt/APKBUILD b/user/newt/APKBUILD index 361caa50b..f8aab64a2 100644 --- a/user/newt/APKBUILD +++ b/user/newt/APKBUILD @@ -10,7 +10,7 @@ arch="all" options="!check" # No test suite. license="LGPL-2.0-only" depends="" -makedepends="popt-dev slang-dev" +makedepends="autoconf automake popt-dev slang-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://pagure.io/newt/archive/r$_pkgver/newt-r$_pkgver.tar.gz" builddir="$srcdir/newt-r$_pkgver" diff --git a/user/numactl/APKBUILD b/user/numactl/APKBUILD index f0ff082be..98aa4a16d 100644 --- a/user/numactl/APKBUILD +++ b/user/numactl/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Daniel Sabogal -# Maintainer: Dan Theisen +# Maintainer: Dan Theisen pkgname=numactl pkgver=2.0.13 pkgrel=0 @@ -8,10 +8,12 @@ url="https://github.com/numactl/numactl" # ARM lacks the __NR_migrate_pages syscall arch="all !armhf !armv7" license="GPL-2.0+ AND LGPL-2.1" +depends="" makedepends="autoconf automake libtool linux-headers" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools" source="$pkgname-$pkgver.tar.gz::https://github.com/numactl/$pkgname/archive/v$pkgver.tar.gz - musl.patch" + musl.patch + " prepare() { default_prepare diff --git a/user/opengfx/APKBUILD b/user/opengfx/APKBUILD index e3f0dbaaf..6393b9717 100644 --- a/user/opengfx/APKBUILD +++ b/user/opengfx/APKBUILD @@ -17,13 +17,10 @@ source="https://binaries.openttd.org/extra/opengfx/$pkgver/$pkgname-$pkgver-sour builddir="$srcdir/$pkgname-$pkgver-source" build() { - cd "$builddir" make GIMP="" _V="" bundle_tar } package() { - cd "$builddir" - local _file for _file in *.grf opengfx.obg; do install -D -m644 -g games $_file \ "$pkgdir"/usr/share/games/openttd/data/$_file diff --git a/user/openjdk8/APKBUILD b/user/openjdk8/APKBUILD index 4861c4f9b..4ad8f07a0 100644 --- a/user/openjdk8/APKBUILD +++ b/user/openjdk8/APKBUILD @@ -8,9 +8,9 @@ pkgrel=0 pkgdesc="Libre Java development kit for Java 8" url="https://icedtea.classpath.org/" arch="all" +options="sover-namecheck" license="GPL-2.0-only" depends="$pkgname-jre java-cacerts" -options="sover-namecheck" makedepends="bash findutils libarchive-tools zip file util-linux libxslt autoconf automake linux-headers sed xz coreutils openjdk7 ca-certificates libjpeg-turbo-dev cmd:which @@ -102,17 +102,15 @@ unpack() { } prepare() { - cd "$builddir" - - local ver_u="$(sed -En 's/^\s*JDK_UPDATE_VERSION\s*=\s*(\S+).*/\1/p' acinclude.m4)" - local ver_b="$(sed -En 's/^\s*BUILD_VERSION\s*=\s*b(\S+).*/\1/p' acinclude.m4)" + ver_u="$(sed -En 's/^\s*JDK_UPDATE_VERSION\s*=\s*(\S+).*/\1/p' acinclude.m4)" + ver_b="$(sed -En 's/^\s*BUILD_VERSION\s*=\s*b(\S+).*/\1/p' acinclude.m4)" [ "${pkgver#*.}" = "$ver_u.$ver_b" ] \ || die "Version mismatch, source is 8.$ver_u.$ver_b, but abuild defines $pkgver!" # Busybox sha256 does not support longopts. sed -e "s/--check/-c/g" -i Makefile.am - local patch; for patch in $source; do + for patch in $source; do case $patch in icedtea-*.patch) cp ../$patch patches @@ -136,7 +134,7 @@ build() { fi DISTRIBUTION_PATCHES="" - local patch; for patch in $source; do + for patch in $source; do case $patch in icedtea-*.patch) DISTRIBUTION_PATCHES="$DISTRIBUTION_PATCHES patches/$patch" @@ -146,7 +144,6 @@ build() { export DISTRIBUTION_PATCHES echo "icedtea patches: $DISTRIBUTION_PATCHES" - cd "$builddir" bash ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -183,8 +180,6 @@ check() { } package() { - cd "$builddir" - mkdir -p "$pkgdir"/$_java_home cp -a openjdk.build/images/j2sdk-image/* "$pkgdir"/$_java_home/ @@ -195,9 +190,6 @@ package() { # running `java -Xshare:dump`. rm -f "$pkgdir"/$_jrelib/server/classes.jsa - # pax mark again (due to fakeroot xattr handling bug) - ./pax-mark-vm "$pkgdir"/$_java_home true - # symlink to shared java cacerts store rm -f "$pkgdir"/$_java_home/jre/lib/security/cacerts ln -sf /etc/ssl/certs/java/cacerts \ @@ -208,7 +200,6 @@ jrelib() { pkgdesc="OpenJDK 8 Java Runtime (class libraries)" depends="" - local file dir for file in jre/lib/images \ jre/lib/*.jar \ jre/lib/security \ @@ -226,7 +217,6 @@ jrelib() { jre() { pkgdesc="OpenJDK 8 Java Runtime" - local file dir mkdir -p "$subpkgdir" for file in jre/bin/policytool \ @@ -242,9 +232,6 @@ jre() { mkdir -p "$subpkgdir"/$_java_home/$dir mv "$pkgdir"/$_java_home/$file "$subpkgdir"/$_java_home/$dir done - - # Pax mark again (due to fakeroot xattr handling bug). - "$builddir"/pax-mark-vm "$subpkgdir"/$_java_home true } jrebase() { @@ -257,16 +244,13 @@ jrebase() { mv "$pkgdir"/$_java_home/lib/$_jarch/jli \ "$subpkgdir"/$_java_home/lib/$_jarch/ - local file; for file in java orbd rmid servertool unpack200 keytool \ + for file in java orbd rmid servertool unpack200 keytool \ pack200 rmiregistry tnameserv; do mv "$pkgdir"/$_java_home/bin/$file "$subpkgdir"/$_java_home/bin/ done # Rest of the jre subdir (which were not taken by -jre subpkg). mv "$pkgdir"/$_java_home/jre "$subpkgdir"/$_java_home/ - - # Pax mark again (due to fakeroot xattr handling bug). - "$builddir"/pax-mark-vm "$subpkgdir"/$_java_home true } doc() { diff --git a/user/openmsx/APKBUILD b/user/openmsx/APKBUILD index e3afba25d..04782e944 100644 --- a/user/openmsx/APKBUILD +++ b/user/openmsx/APKBUILD @@ -18,13 +18,11 @@ source="https://binaries.openttd.org/extra/openmsx/0.3.1/openmsx-$pkgver-source. builddir="$srcdir/$pkgname-$pkgver-source" build() { - cd "$builddir" make _V="" bundle } package() { cd "$builddir"/$pkgname-$pkgver - local _file for _file in *.mid openmsx.obm; do install -D -m644 -g games $_file \ "$pkgdir"/usr/share/games/openttd/gm/$_file diff --git a/user/opensfx/APKBUILD b/user/opensfx/APKBUILD index 00093833d..130747b3b 100644 --- a/user/opensfx/APKBUILD +++ b/user/opensfx/APKBUILD @@ -14,20 +14,17 @@ source="https://binaries.openttd.org/extra/opensfx/0.2.3/opensfx-$pkgver-source. builddir="$srcdir/$pkgname-$pkgver-source" build() { - cd "$builddir" make } check() { - cd "$builddir" make check } package() { - cd "$builddir" - install -D -m644 -g games opensfx.cat \ + install -D -m644 -g games "$builddir"/opensfx.cat \ "$pkgdir"/usr/share/games/openttd/data/opensfx.cat - install -D -m644 -g games opensfx.obs \ + install -D -m644 -g games "$builddir"/opensfx.obs \ "$pkgdir"/usr/share/games/openttd/data/opensfx.obs } diff --git a/user/oprofile/APKBUILD b/user/oprofile/APKBUILD index 90641b0e3..07a844c14 100644 --- a/user/oprofile/APKBUILD +++ b/user/oprofile/APKBUILD @@ -16,7 +16,6 @@ source="https://prdownloads.sourceforge.net/oprofile/oprofile-$pkgver.tar.gz " build() { - cd "$builddir" CXXFLAGS="$CXXFLAGS" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,12 +27,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/optipng/APKBUILD b/user/optipng/APKBUILD index fcdef5b01..7ad5fbe5f 100644 --- a/user/optipng/APKBUILD +++ b/user/optipng/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://downloads.sourceforge.net/optipng/optipng-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ -prefix=/usr \ -mandir=/usr/share/man \ @@ -22,12 +21,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/password-store/APKBUILD b/user/password-store/APKBUILD index f8830a2ef..972bdb26a 100644 --- a/user/password-store/APKBUILD +++ b/user/password-store/APKBUILD @@ -10,8 +10,7 @@ arch="noarch" options="!check" # this is a shell script and has no tests license="GPL-2.0+" depends="bash gnupg libqrencode tree xclip" -depends_dev="" -makedepends="$depends_dev" +makedepends="" subpackages="$pkgname-doc $pkgname-contrib $pkgname-bash-completion:bashcomp @@ -20,7 +19,6 @@ subpackages="$pkgname-doc source="https://git.zx2c4.com/password-store/snapshot/$pkgname-$pkgver.tar.xz" package() { - cd "$builddir" make DESTDIR="$pkgdir" \ WITH_ALLCOMP=yes install } diff --git a/user/pavucontrol/APKBUILD b/user/pavucontrol/APKBUILD index 1c18d17de..5c98d4f57 100644 --- a/user/pavucontrol/APKBUILD +++ b/user/pavucontrol/APKBUILD @@ -10,10 +10,9 @@ license="GPL-2.0+" depends="" makedepends="gtkmm+3.0-dev intltool libcanberra-dev lynx pulseaudio-dev" subpackages="$pkgname-doc $pkgname-lang" -source="http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-$pkgver.tar.xz" +source="https://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-$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/pcmciautils/APKBUILD b/user/pcmciautils/APKBUILD index f94d49086..1189b7d04 100644 --- a/user/pcmciautils/APKBUILD +++ b/user/pcmciautils/APKBUILD @@ -16,12 +16,10 @@ source="https://mirrors.kernel.org/pub/linux/utils/kernel/pcmcia/$pkgname-$pkgve " build() { - cd "$builddir" make -j1 LEX=flex } package() { - cd "$builddir" make DESTDIR="$pkgdir"/ install ln -sf pccardctl "$pkgdir"/sbin/lspcmcia } diff --git a/user/pcsc-lite/APKBUILD b/user/pcsc-lite/APKBUILD index ff8a667a9..d4e0355a6 100644 --- a/user/pcsc-lite/APKBUILD +++ b/user/pcsc-lite/APKBUILD @@ -17,7 +17,6 @@ source="https://pcsclite.apdu.fr/files/pcsc-lite-$pkgver.tar.bz2 pcscd.initd" build() { - cd "$builddir" ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ @@ -36,12 +35,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install install -D -m755 "$srcdir"/pcscd.initd \ "$pkgdir"/etc/init.d/pcscd diff --git a/user/phonon-vlc/APKBUILD b/user/phonon-vlc/APKBUILD index adb9914ee..de6f49d36 100644 --- a/user/phonon-vlc/APKBUILD +++ b/user/phonon-vlc/APKBUILD @@ -28,7 +28,7 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DPHONON_BUILD_PHONON4QT5=True \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } diff --git a/user/physfs/APKBUILD b/user/physfs/APKBUILD index 86f57e0cc..187afeeef 100644 --- a/user/physfs/APKBUILD +++ b/user/physfs/APKBUILD @@ -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/physlock/APKBUILD b/user/physlock/APKBUILD index f9a5f9574..19858bde7 100644 --- a/user/physlock/APKBUILD +++ b/user/physlock/APKBUILD @@ -13,7 +13,8 @@ makedepends="linux-headers linux-pam-dev utmps-dev" subpackages="$pkgname-doc" source="$pkgname-$pkgver.tar.gz::https://github.com/muennich/physlock/archive/v$pkgver.tar.gz utmps.patch - makefile.patch" + makefile.patch + " build() { make diff --git a/user/picocom/APKBUILD b/user/picocom/APKBUILD index b74fb608e..289d7d353 100644 --- a/user/picocom/APKBUILD +++ b/user/picocom/APKBUILD @@ -6,7 +6,7 @@ pkgrel=0 pkgdesc="Minimal dumb-terminal emulation program" url="https://github.com/npat-efault/picocom" arch="all" -options="!check" # No test suite +options="!check" # No test suite. license="BSD-2-Clause AND GPL-2.0+" depends="" makedepends="" diff --git a/user/pidgin-otr/APKBUILD b/user/pidgin-otr/APKBUILD index a1369188d..6d713b2ee 100644 --- a/user/pidgin-otr/APKBUILD +++ b/user/pidgin-otr/APKBUILD @@ -13,7 +13,6 @@ subpackages="" source="https://otr.cypherpunks.ca/pidgin-otr-$pkgver.tar.gz" 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/pidgin/APKBUILD b/user/pidgin/APKBUILD index 5921247b8..905fe0558 100644 --- a/user/pidgin/APKBUILD +++ b/user/pidgin/APKBUILD @@ -7,9 +7,9 @@ url="http://pidgin.im/" arch="all" license="GPL-2.0-only" depends="gst-plugins-base" -makedepends="gtk+-dev perl-dev libsm-dev startup-notification-dev gtkspell-dev +makedepends="gtk+2.0-dev perl-dev libsm-dev startup-notification-dev libxml2-dev libidn-dev gnutls-dev dbus-dev dbus-glib-dev gstreamer-dev - cyrus-sasl-dev ncurses-dev nss-dev tcl-dev tk-dev intltool + cyrus-sasl-dev ncurses-dev nss-dev tcl-dev tk-dev intltool gtkspell-dev gst-plugins-base-dev farstream-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang finch libpurple" source="https://bitbucket.org/pidgin/main/downloads/$pkgname-$pkgver.tar.bz2" diff --git a/user/plib/APKBUILD b/user/plib/APKBUILD index 46a6ce3d6..f195034f9 100644 --- a/user/plib/APKBUILD +++ b/user/plib/APKBUILD @@ -9,7 +9,7 @@ arch="all" options="!dbg" # No shared libraries license="LGPL-2.0+" depends="" -makedepends="libxi-dev libxmu-dev libxt-dev mesa-dev" +makedepends="autoconf automake libtool libxi-dev libxmu-dev libxt-dev mesa-dev" subpackages="$pkgname-dev" source="http://plib.sourceforge.net/dist/plib-$pkgver.tar.gz fix-openflight.patch @@ -25,7 +25,6 @@ prepare() { } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -37,12 +36,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/pm-quirks/APKBUILD b/user/pm-quirks/APKBUILD index 9b90ead00..c74eb36fd 100644 --- a/user/pm-quirks/APKBUILD +++ b/user/pm-quirks/APKBUILD @@ -6,16 +6,15 @@ pkgrel=0 pkgdesc="Quirks data for pm-utils" url="https://pm-utils.freedesktop.org/wiki/" arch="noarch" -options="!check" # this is a bunch of data files for pm-utils, nothing to check -license="GPL-2.0-only" # same as pm-utils, hopefully +options="!check" # This is a bunch of data files for pm-utils, nothing to check +license="GPL-2.0-only" # same as pm-utils, hopefully depends="pm-utils" makedepends="" source="https://pm-utils.freedesktop.org/releases/$pkgname-$pkgver.tar.gz" package() { - cd "$srcdir" install -m755 -d ${pkgdir}/usr/lib/pm-utils/video-quirks - install -m644 video-quirks/*.quirkdb ${pkgdir}/usr/lib/pm-utils/video-quirks/ + install -m644 "$srcdir"/video-quirks/*.quirkdb ${pkgdir}/usr/lib/pm-utils/video-quirks/ } sha512sums="e20244fb72475945e08010d7ec19db2c017c1a04fa01d3d08c03d704d7f07f9c087bac6a5a44242cc8ed6cec5db47bc06a8862dd0f74088a565d37b6d7b95afc pm-quirks-20100619.tar.gz" diff --git a/user/pm-utils/APKBUILD b/user/pm-utils/APKBUILD index 6ff9fb41a..1ce9ff1d5 100644 --- a/user/pm-utils/APKBUILD +++ b/user/pm-utils/APKBUILD @@ -14,7 +14,6 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://pm-utils.freedesktop.org/releases/$pkgname-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,7 +25,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/ponysay/APKBUILD b/user/ponysay/APKBUILD index ffb32bf57..d0928a344 100644 --- a/user/ponysay/APKBUILD +++ b/user/ponysay/APKBUILD @@ -14,12 +14,10 @@ subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch source="ponysay-$pkgver.tar.gz::https://github.com/erkin/ponysay/archive/$pkgver.tar.gz" check() { - cd "$builddir" ./dependency-test.sh } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --destdir="$pkgdir" --with-man \ --freedom=sloppy --without-fish --with-custom-env-python=python3 } diff --git a/user/purple-plugin-pack/APKBUILD b/user/purple-plugin-pack/APKBUILD index 22b797908..1ae2b8691 100644 --- a/user/purple-plugin-pack/APKBUILD +++ b/user/purple-plugin-pack/APKBUILD @@ -20,7 +20,6 @@ prepare() { } 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/py3-configobj/APKBUILD b/user/py3-configobj/APKBUILD index 7268eaa42..4fa196a19 100644 --- a/user/py3-configobj/APKBUILD +++ b/user/py3-configobj/APKBUILD @@ -8,22 +8,19 @@ pkgrel=0 pkgdesc="Python library for reading and writing of configuration files (ini)" url="https://github.com/DiffSK/configobj" arch="noarch" -options="!check" # no tests +options="!check" # No test suite. license="BSD-3-Clause" depends="python3 py3-six" makedepends="python3-dev" subpackages="" source="$pkgname-$pkgver.tar.gz::https://github.com/DiffSK/configobj/archive/v$pkgver.tar.gz" - builddir="$srcdir"/$_pkgname-$pkgver build() { - cd "$builddir" python3 setup.py build } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } diff --git a/user/py3-incremental/APKBUILD b/user/py3-incremental/APKBUILD index ff3ed3cb7..8843380f5 100644 --- a/user/py3-incremental/APKBUILD +++ b/user/py3-incremental/APKBUILD @@ -14,17 +14,14 @@ source="https://files.pythonhosted.org/packages/8f/26/02c4016aa95f45479eea37c90c builddir="$srcdir/incremental-$pkgver" build() { - cd "$builddir" python3 setup.py build } check() { - cd "$builddir" python3 setup.py test } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } diff --git a/user/py3-josepy/APKBUILD b/user/py3-josepy/APKBUILD index baf70ee55..4cc48bb0b 100644 --- a/user/py3-josepy/APKBUILD +++ b/user/py3-josepy/APKBUILD @@ -24,4 +24,5 @@ package() { mkdir -p "$pkgdir" python3 setup.py install --prefix=/usr --root="$pkgdir" } + sha512sums="25a360b3893e1c1c524440b02e0af66c6dfefd756cebdad1c27ae8a82461200448a9c8fc835747e160cbcbb63261a4f79d7765eaae5e0b19feea5bf84d5e8896 josepy-1.2.0.tar.gz" diff --git a/user/py3-markdown/APKBUILD b/user/py3-markdown/APKBUILD index 40df4e38d..cf6a22b2a 100644 --- a/user/py3-markdown/APKBUILD +++ b/user/py3-markdown/APKBUILD @@ -9,7 +9,7 @@ pkgrel=0 pkgdesc="A Python implementation of Markdown" url="https://python-markdown.github.io/" arch="noarch" -options="!check" # needs flake8 +options="!check" # needs flake8 license="BSD-3-Clause" depends="python3" makedepends="python3-dev" diff --git a/user/py3-pytest-expect/APKBUILD b/user/py3-pytest-expect/APKBUILD index 0a3d5cb17..2b82dc863 100644 --- a/user/py3-pytest-expect/APKBUILD +++ b/user/py3-pytest-expect/APKBUILD @@ -16,20 +16,16 @@ source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/ builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" python3 setup.py build } check() { - cd "$builddir" # No tests available python3 setup.py test } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" - } sha512sums="41d2b296844e9dab9429f34eec37fe106a4e6c2039824c37067ed048dcc328b13e666b22d3482ccfc6153af4e44b5d895f3011ec45df55ffa07a98459e3caefd py3-pytest-expect-1.1.0.tar.gz" diff --git a/user/py3-requests-toolbelt/APKBUILD b/user/py3-requests-toolbelt/APKBUILD index 189ad887d..8ecddaa88 100644 --- a/user/py3-requests-toolbelt/APKBUILD +++ b/user/py3-requests-toolbelt/APKBUILD @@ -8,7 +8,7 @@ pkgrel=0 pkgdesc="Useful classes and functions to be used with python-requests" url="https://github.com/requests/toolbelt" arch="noarch" -options="!check" # needs betamax +options="!check" # Needs betamax license="Apache-2.0" depends="python3" makedepends="python3-dev" @@ -17,13 +17,11 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/requests/$_pkgname/archive/$ builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" python3 setup.py build } package() { mkdir -p "$pkgdir" - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } diff --git a/user/py3-rfc3339/APKBUILD b/user/py3-rfc3339/APKBUILD index 34332a1d8..5af94e017 100644 --- a/user/py3-rfc3339/APKBUILD +++ b/user/py3-rfc3339/APKBUILD @@ -20,13 +20,11 @@ source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$ builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" python3 setup.py build } package() { mkdir -p "$pkgdir" - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } diff --git a/user/py3-u-msgpack-python/APKBUILD b/user/py3-u-msgpack-python/APKBUILD index b4bb4187b..68ea543d2 100644 --- a/user/py3-u-msgpack-python/APKBUILD +++ b/user/py3-u-msgpack-python/APKBUILD @@ -11,8 +11,8 @@ url="https://pypi.python.org/pypi/u-msgpack-python" arch="noarch" license="MIT" depends="python3" -makedepends="python3-dev" checkdepends="py3-pytest" +makedepends="python3-dev" source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" @@ -26,7 +26,6 @@ check() { package() { python3 setup.py install --prefix=/usr --root="$pkgdir" - } sha512sums="cefba7ed86d2b7c37b0d92e3a4fb4ec62c89dffee0be078c783010638413e6ce1af7ab959b43dfedb6fd8cf2943185c18fc2201a4a9764c423e8242bcedf21a9 py3-u-msgpack-python-2.5.2.tar.gz" diff --git a/user/py3-webencodings/APKBUILD b/user/py3-webencodings/APKBUILD index 967596d83..728488106 100644 --- a/user/py3-webencodings/APKBUILD +++ b/user/py3-webencodings/APKBUILD @@ -12,25 +12,21 @@ arch="noarch" # Packaging error, see https://github.com/gsnedders/python-webencodings/blob/master/LICENSE license="BSD-3-Clause" depends="python3" -makedepends="python3-dev" checkdepends="py3-pytest" +makedepends="python3-dev" source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" python3 setup.py build } check() { - cd "$builddir" PYTHONPATH="build/lib:$PYTHONPATH" pytest webencodings/tests.py } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" - } sha512sums="b727b01bac6ec79bca517960d27b4c0668b295f25559471b9641c2c33dab55db6dac9c990952177964c6418382c22831b14d57df5e632d51d7abf97b61f24326 py3-webencodings-0.5.1.tar.gz" diff --git a/user/py3-zope-component/APKBUILD b/user/py3-zope-component/APKBUILD index 32feb82ad..1553b39ed 100644 --- a/user/py3-zope-component/APKBUILD +++ b/user/py3-zope-component/APKBUILD @@ -8,7 +8,7 @@ pkgrel=1 pkgdesc="Zope Component Architecture" url="https://pypi.python.org/pypi/zope.component" arch="noarch" -options="!check" # needs nose +options="!check" # needs nose license="ZPL-2.1" depends="python3 py3-zope-deferredimport py3-zope-deprecation py3-zope-event py3-zope-hookable py3-zope-interface py3-zope-proxy" makedepends="python3-dev" @@ -17,12 +17,10 @@ source="$_pkgname-$pkgver.tar.gz::https://github.com/zopefoundation/$_pkgname/ar builddir="$srcdir"/$_pkgname-$pkgver build() { - cd "$builddir" python3 setup.py build } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } diff --git a/user/py3-zope-deferredimport/APKBUILD b/user/py3-zope-deferredimport/APKBUILD index 4e68d859c..dff95a0ec 100644 --- a/user/py3-zope-deferredimport/APKBUILD +++ b/user/py3-zope-deferredimport/APKBUILD @@ -7,7 +7,7 @@ pkgrel=0 pkgdesc="Zope module that allows for lazy module importing" url="https://github.com/zopefoundation/zope.deferredimport" arch="noarch" -options="!check" # needs zope.testrunner +options="!check" # needs zope.testrunner license="ZPL-2.1" depends="python3" makedepends="python3-dev py3-zope-proxy" diff --git a/user/py3-zope-deprecation/APKBUILD b/user/py3-zope-deprecation/APKBUILD index 22e629f26..faf402240 100644 --- a/user/py3-zope-deprecation/APKBUILD +++ b/user/py3-zope-deprecation/APKBUILD @@ -7,7 +7,7 @@ pkgrel=0 pkgdesc="A function to mark deprecated parts of an API" url="https://github.com/zopefoundation/zope.deprecation" arch="noarch" -options="!check" # needs zope.testrunner +options="!check" # needs zope.testrunner license="ZPL-2.1" depends="python3" makedepends="python3-dev" @@ -16,12 +16,10 @@ source="$_pkgname-$pkgver.tar.gz::https://github.com/zopefoundation/$_pkgname/ar builddir="$srcdir"/$_pkgname-$pkgver build() { - cd "$builddir" python3 setup.py build } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } diff --git a/user/py3-zope-event/APKBUILD b/user/py3-zope-event/APKBUILD index 391da22f7..38ac46e39 100644 --- a/user/py3-zope-event/APKBUILD +++ b/user/py3-zope-event/APKBUILD @@ -8,26 +8,22 @@ pkgrel=0 pkgdesc="Event publishing / dispatch, used by Zope Component Architecture" url="https://github.com/zopefoundation/zope.event" arch="noarch" -options="!check" # needs nose +options="!check" # needs nose license="ZPL-2.1" depends="python3" makedepends="python3-dev" source="$_pkgname-$pkgver.tar.gz::https://github.com/zopefoundation/$_pkgname/archive/$pkgver.tar.gz" - builddir="$srcdir"/$_pkgname-$pkgver build() { - cd "$builddir" python3 setup.py build } check() { - cd "$builddir" python3 setup.py test } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } diff --git a/user/py3-zope-interface/APKBUILD b/user/py3-zope-interface/APKBUILD index b1025e17c..65130c841 100644 --- a/user/py3-zope-interface/APKBUILD +++ b/user/py3-zope-interface/APKBUILD @@ -18,17 +18,14 @@ source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$ builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" python3 setup.py build } check() { - cd "$builddir" python3 setup.py test } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } diff --git a/user/py3-zope-proxy/APKBUILD b/user/py3-zope-proxy/APKBUILD index 1b2a069df..2704aa053 100644 --- a/user/py3-zope-proxy/APKBUILD +++ b/user/py3-zope-proxy/APKBUILD @@ -7,7 +7,7 @@ pkgrel=0 pkgdesc="Zope module for class and function proxies" url="https://github.com/zopefoundation/zope.proxy" arch="all" -options="!check" # needs zope.testrunner, zope.security +options="!check" # needs zope.testrunner, zope.security license="ZPL-2.1" depends="python3 py3-zope-interface" makedepends="python3-dev" diff --git a/user/s6-dns/APKBUILD b/user/s6-dns/APKBUILD index c2d36c2df..4fbbfe04a 100644 --- a/user/s6-dns/APKBUILD +++ b/user/s6-dns/APKBUILD @@ -9,13 +9,12 @@ arch="all" options="!check" license="ISC" _skalibs_version=2.9 -depends= +depends="" makedepends="skalibs-dev>=$_skalibs_version skalibs-libs-dev>=$_skalibs_version" subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc" source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --enable-shared \ --enable-static \ @@ -28,42 +27,36 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } - libs() { - pkgdesc="$pkgdesc (shared libraries)" - depends="skalibs-libs>=$_skalibs_version" - mkdir -p "$subpkgdir/usr/lib" - mv "$pkgdir"/usr/lib/*.so.* "$subpkgdir/usr/lib/" + pkgdesc="$pkgdesc (shared libraries)" + depends="skalibs-libs>=$_skalibs_version" + mkdir -p "$subpkgdir/usr/lib" + mv "$pkgdir"/usr/lib/*.so.* "$subpkgdir/usr/lib/" } - dev() { - pkgdesc="$pkgdesc (development files)" - depends="skalibs-dev>=$_skalibs_version" - mkdir -p "$subpkgdir/usr/include" "$subpkgdir/usr/lib" - mv "$pkgdir/usr/include" "$subpkgdir/usr/" + pkgdesc="$pkgdesc (development files)" + depends="skalibs-dev>=$_skalibs_version" + install_if="dev $pkgname=$pkgver-r$pkgrel" + mkdir -p "$subpkgdir/usr/include" "$subpkgdir/usr/lib" + mv "$pkgdir/usr/include" "$subpkgdir/usr/" mv "$pkgdir"/usr/lib/*.a "$subpkgdir/usr/lib/" } - libsdev() { - pkgdesc="$pkgdesc (development files for dynamic linking)" - depends="$pkgname-dev" - mkdir -p "$subpkgdir/usr/lib" - mv "$pkgdir"/usr/lib/*.so "$subpkgdir/usr/lib/" + pkgdesc="$pkgdesc (development files for dynamic linking)" + depends="$pkgname-dev" + mkdir -p "$subpkgdir/usr/lib" + mv "$pkgdir"/usr/lib/*.so "$subpkgdir/usr/lib/" } - doc() { - pkgdesc="$pkgdesc (documentation)" - depends= - install_if="docs $pkgname=$pkgver-r$pkgrel" - mkdir -p "$subpkgdir/usr/share/doc" - cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" + default_doc + mkdir -p "$subpkgdir/usr/share/doc" + cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } sha512sums="e69ee16cb16139d344255adc4bb92bd73003464925bbd2df893e3b922add155308b547274a66e3f20a5d3c0310c8fadc877b656753299ff9a269b4e25c26f7a9 s6-dns-2.3.1.1.tar.gz" diff --git a/user/s6-networking/APKBUILD b/user/s6-networking/APKBUILD index 545b1e9f3..be124a5a8 100644 --- a/user/s6-networking/APKBUILD +++ b/user/s6-networking/APKBUILD @@ -15,56 +15,51 @@ subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc" source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz" build() { - cd "$builddir" - ./configure \ - --enable-shared \ - --enable-static \ - --disable-allstatic \ - --prefix=/usr \ + ./configure \ + --enable-shared \ + --enable-static \ + --disable-allstatic \ + --prefix=/usr \ --libdir=/usr/lib \ - --libexecdir="/usr/lib/$pkgname" \ - --with-dynlib=/lib \ - --enable-ssl=bearssl - make + --libexecdir="/usr/lib/$pkgname" \ + --with-dynlib=/lib \ + --enable-ssl=bearssl + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } - libs() { - pkgdesc="$pkgdesc (shared libraries)" - depends="skalibs-libs>=$_skalibs_version" - mkdir -p "$subpkgdir/usr/lib" - mv "$pkgdir"/usr/lib/*.so.* "$subpkgdir/usr/lib/" + pkgdesc="$pkgdesc (shared libraries)" + depends="skalibs-libs>=$_skalibs_version" + mkdir -p "$subpkgdir/usr/lib" + mv "$pkgdir"/usr/lib/*.so.* "$subpkgdir/usr/lib/" } - dev() { - pkgdesc="$pkgdesc (development files)" - depends="skalibs-dev>=$_skalibs_version" - mkdir -p "$subpkgdir/usr/include" "$subpkgdir/usr/lib" - mv "$pkgdir/usr/include" "$subpkgdir/usr/" - mv "$pkgdir"/usr/lib/*.a "$subpkgdir/usr/lib/" + pkgdesc="$pkgdesc (development files)" + depends="skalibs-dev>=$_skalibs_version" + install_if="dev $pkgname=$pkgver-r$pkgrel" + mkdir -p "$subpkgdir/usr/include" "$subpkgdir/usr/lib" + mv "$pkgdir/usr/include" "$subpkgdir/usr/" + mv "$pkgdir"/usr/lib/*.a "$subpkgdir/usr/lib/" } - libsdev() { - pkgdesc="$pkgdesc (development files for dynamic linking)" - depends="$pkgname-dev" - mkdir -p "$subpkgdir/usr/lib" - mv "$pkgdir"/usr/lib/*.so "$subpkgdir/usr/lib/" + pkgdesc="$pkgdesc (development files for dynamic linking)" + depends="$pkgname-dev" + mkdir -p "$subpkgdir/usr/lib" + mv "$pkgdir"/usr/lib/*.so "$subpkgdir/usr/lib/" } - doc() { - pkgdesc="$pkgdesc (documentation)" - depends= - install_if="docs $pkgname=$pkgver-r$pkgrel" - mkdir -p "$subpkgdir/usr/share/doc" - cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" + pkgdesc="$pkgdesc (documentation)" + depends="" + install_if="docs $pkgname=$pkgver-r$pkgrel" + mkdir -p "$subpkgdir/usr/share/doc" + cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } sha512sums="3bd7cdbf6f105bb83c5116e736f4288d378571467e7aa93f862eba80ce28255bda77140a2a1cf80af80480789dfb38682049f6769952fb8964b860bdf465551b s6-networking-2.3.1.1.tar.gz" diff --git a/user/slang/APKBUILD b/user/slang/APKBUILD index 12929ac2b..430996243 100644 --- a/user/slang/APKBUILD +++ b/user/slang/APKBUILD @@ -8,7 +8,7 @@ url="http://www.jedsoft.org/slang/" arch="all" license="GPL-2.0+ AND NTP" depends="" -makedepends="pcre-dev" +makedepends="pcre-dev zlib-dev" subpackages="$pkgname-dev $pkgname-doc" source="https://www.jedsoft.org/releases/slang/slang-$pkgver.tar.bz2" @@ -19,7 +19,10 @@ build() { --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ - --localstatedir=/var + --localstatedir=/var \ + --with-zlib=/ \ + --with-zinc=/usr/include \ + --with-pcre=/usr make -j1 } diff --git a/user/tk/APKBUILD b/user/tk/APKBUILD index 8295ec4fc..007ff7b69 100644 --- a/user/tk/APKBUILD +++ b/user/tk/APKBUILD @@ -7,17 +7,15 @@ url="http://tcl.sourceforge.net/" arch="all" options="!check" # Requires a running X11 server. license="TCL" -depends= +depends="" depends_dev="tcl-dev libx11-dev libxft-dev fontconfig-dev" makedepends="$depends_dev libpng-dev" subpackages="$pkgname-doc $pkgname-dev" -source="https://downloads.sourceforge.net/sourceforge/tcl/$pkgname$pkgver-src.tar.gz - " +source="https://downloads.sourceforge.net/sourceforge/tcl/$pkgname$pkgver-src.tar.gz" _major=8.6 builddir="$srcdir"/tk8.6.9/unix build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,7 +25,6 @@ build() { } package() { - cd "$builddir" export LD_LIBRARY_PATH="$builddir" make -j1 INSTALL_ROOT="${pkgdir}" install install-private-headers diff --git a/user/xclip/APKBUILD b/user/xclip/APKBUILD index 19125d29b..dcff75e1e 100644 --- a/user/xclip/APKBUILD +++ b/user/xclip/APKBUILD @@ -10,18 +10,16 @@ arch="all" options="!check" # TODO: this package has tests that require X license="GPL-2.0+" depends="" -makedepends="libx11-dev libxmu-dev" +makedepends="autoconf automake libx11-dev libxmu-dev" subpackages="$pkgname-doc" source="$pkgname-$pkgver.tar.gz::https://github.com/astrand/${pkgname}/archive/${pkgver}.tar.gz" prepare() { - cd "$builddir" default_prepare autoreconf -vif } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -33,7 +31,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install mkdir -p "$pkgdir"/usr/share/doc/$pkgname/ -- cgit v1.2.3-70-g09d2