diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-12-21 01:07:10 +0000 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-12-21 01:07:10 +0000 |
| commit | 70d3beb6d20bd159cacaa9ba99e8f06f2761d959 (patch) | |
| tree | c85c9aef04d4167e80837d5c11a3cb6098976edb | |
| parent | f41ef48c4f451513041fbfb678652eddb1eee469 (diff) | |
| download | packages-70d3beb6d20bd159cacaa9ba99e8f06f2761d959.tar.gz packages-70d3beb6d20bd159cacaa9ba99e8f06f2761d959.tar.bz2 packages-70d3beb6d20bd159cacaa9ba99e8f06f2761d959.tar.xz packages-70d3beb6d20bd159cacaa9ba99e8f06f2761d959.zip | |
system/n*: modernise, fix metadata
| -rw-r--r-- | system/net-tools/APKBUILD | 12 | ||||
| -rw-r--r-- | system/nspr/APKBUILD | 7 | ||||
| -rw-r--r-- | system/nss/APKBUILD | 3 |
3 files changed, 7 insertions, 15 deletions
diff --git a/system/net-tools/APKBUILD b/system/net-tools/APKBUILD index cb4f91add..cb33d5c48 100644 --- a/system/net-tools/APKBUILD +++ b/system/net-tools/APKBUILD @@ -7,21 +7,19 @@ pkgrel=3 pkgdesc="Linux networking base tools" url="https://sourceforge.net/projects/net-tools/" arch="all" +options="!check" # there is no testsuite for this package license="GPL-2.0+" depends="mii-tool" depends_dev="" makedepends="$depends_dev bash linux-headers" -options="!check" # there is no testsuite for this package -install="" subpackages="$pkgname-doc $pkgname-lang $pkgname-dbg mii-tool:mii_tool" source="https://downloads.sourceforge.net/project/$pkgname/$pkgname-$_ver.tar.bz2 git.patch musl-fixes.patch " - builddir="$srcdir"/$pkgname-$_ver + prepare() { - cd "$builddir" default_prepare cat > config.make <<EOF I18N=1 @@ -67,18 +65,16 @@ EOF } build() { - cd "$builddir" make } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } mii_tool() { - pkgdesc="media-independent interface (MII) tool" - depends= + pkgdesc="Media-Independent Interface (MII) tool" + depends="" mkdir -p "$subpkgdir"/sbin mv "$pkgdir"/sbin/mii-tool "$subpkgdir"/sbin/ } diff --git a/system/nspr/APKBUILD b/system/nspr/APKBUILD index 667e2d189..533d31b8c 100644 --- a/system/nspr/APKBUILD +++ b/system/nspr/APKBUILD @@ -23,9 +23,8 @@ prepare() { } build() { - local conf= case "$CARCH" in - *64* | s390x) conf="--enable-64bit";; + *64* | s390x) _conf="--enable-64bit";; esac cd "$builddir"/build # ./nspr/pr/include/md/_linux.h tests only __GLIBC__ version @@ -38,13 +37,11 @@ build() { --disable-debug \ --enable-optimize \ --enable-ipv6 \ - $conf + $_conf make CC="${CC:-gcc}" CXX="${CXX:-g++}" } package() { - local file= - cd "$builddir"/build make DESTDIR="$pkgdir" install diff --git a/system/nss/APKBUILD b/system/nss/APKBUILD index db12061d6..763b753e4 100644 --- a/system/nss/APKBUILD +++ b/system/nss/APKBUILD @@ -91,7 +91,7 @@ package() { -e "s,@MOD_PATCH_VERSION@,${NSS_VPATCH},g" \ > "$pkgdir"/usr/bin/nss-config chmod 755 "$pkgdir"/usr/bin/nss-config - local minor="${pkgver#*.}" + minor="${pkgver#*.}" minor=${minor%.*} for file in $(find dist/*.OBJ/lib -name "*.so"); do install -m755 $file \ @@ -120,7 +120,6 @@ static() { dev() { # we cannot use default_dev because we need the .so symlinks in main package - local i= j= pkgdesc="Development files for Network Security Services" depends="$pkgname $depends_dev" |