From 4602115591419728f377a8869f3e2c856aac5719 Mon Sep 17 00:00:00 2001 From: Jakub Jirutka Date: Sat, 14 Jan 2017 18:11:23 +0100 Subject: main/rsyslog: fix abuild code-style --- main/rsyslog/APKBUILD | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) (limited to 'main/rsyslog') diff --git a/main/rsyslog/APKBUILD b/main/rsyslog/APKBUILD index b757a6ddcb..96943e892f 100644 --- a/main/rsyslog/APKBUILD +++ b/main/rsyslog/APKBUILD @@ -22,22 +22,13 @@ source="http://www.rsyslog.com/files/download/$pkgname/$pkgname-$pkgver.tar.gz $pkgname.logrotate $pkgname.conf musl-fix.patch - queue.patch - " - -_builddir="$srcdir"/$pkgname-$pkgver -prepare() { - local i - cd "$_builddir" - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done -} + queue.patch + " +builddir="$srcdir/$pkgname-$pkgver" build() { - cd "$_builddir" + cd "$builddir" + ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -64,7 +55,8 @@ build() { } package() { - cd "$_builddir" + cd "$builddir" + make DESTDIR="$pkgdir" install || return 1 install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname @@ -75,6 +67,7 @@ package() { mysql() { pkgdesc="rsyslog mysql support" + mkdir -p "$subpkgdir"/usr/lib/rsyslog/ mv "$pkgdir"/usr/lib/rsyslog/ommysql.so \ "$subpkgdir"/usr/lib/rsyslog/ || return 1 @@ -82,6 +75,7 @@ mysql() { hiredis(){ pkgdesc="rsyslog hiredis support" + mkdir -p "$subpkgdir"/usr/lib/rsyslog/ mv "$pkgdir"/usr/lib/rsyslog/omhiredis.so \ "$subpkgdir"/usr/lib/rsyslog/ || return 1 @@ -89,6 +83,7 @@ hiredis(){ pgsql() { pkgdesc="rsyslog pgsql support" + mkdir -p "$subpkgdir"/usr/lib/rsyslog/ mv "$pkgdir"/usr/lib/rsyslog/ompgsql.so \ "$subpkgdir"/usr/lib/rsyslog/ || return 1 @@ -96,6 +91,7 @@ pgsql() { tls() { pkgdesc="rsyslog tls support" + mkdir -p "$subpkgdir"/usr/lib/rsyslog/ mv "$pkgdir"/usr/lib/rsyslog/lmnsd_gtls.so \ "$subpkgdir"/usr/lib/rsyslog/ || return 1 @@ -103,6 +99,7 @@ tls() { snmp() { pkgdesc="rsyslog snmp support" + mkdir -p "$subpkgdir"/usr/lib/rsyslog/ mv "$pkgdir"/usr/lib/rsyslog/omsnmp.so \ "$subpkgdir"/usr/lib/rsyslog/ || return 1 -- cgit v1.2.3