diff options
| author | Francesco Colista <francesco.colista@gmail.com> | 2011-07-22 12:06:55 +0000 |
|---|---|---|
| committer | Francesco Colista <francesco.colista@gmail.com> | 2011-07-22 12:06:55 +0000 |
| commit | 4aa06eb4aefb802b1bdeb764a9578ef42bdd318c (patch) | |
| tree | c2e0d7b109248c134bd336357aa43c227a0a1eea | |
| parent | 8c7faa01df19eb9a6e83843d0bd958a3d2dab5ea (diff) | |
| parent | 2a9fa395a6583f8be0af389b90f82f95c53d45b6 (diff) | |
| download | aports-4aa06eb4aefb802b1bdeb764a9578ef42bdd318c.tar.bz2 aports-4aa06eb4aefb802b1bdeb764a9578ef42bdd318c.tar.xz | |
Merge git://dev.alpinelinux.org/aports
| -rw-r--r-- | main/acf-core/APKBUILD | 4 | ||||
| -rw-r--r-- | main/cacti/APKBUILD | 2 | ||||
| -rw-r--r-- | main/collectd/APKBUILD | 5 | ||||
| -rw-r--r-- | main/freeswitch/APKBUILD | 2 | ||||
| -rw-r--r-- | main/squark/APKBUILD | 2 | ||||
| -rw-r--r-- | main/zabbix/APKBUILD | 2 | ||||
| -rw-r--r-- | testing/rsyslog/APKBUILD | 5 |
7 files changed, 12 insertions, 10 deletions
diff --git a/main/acf-core/APKBUILD b/main/acf-core/APKBUILD index 2e914de215..df61b15e6e 100644 --- a/main/acf-core/APKBUILD +++ b/main/acf-core/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Ted Trask <ttrask01@yahoo.com> # Maintainer: Ted Trask <ttrask01@yahoo.com> pkgname=acf-core -pkgver=0.13.2 +pkgver=0.13.3 pkgrel=0 pkgdesc="A web-based system administration interface framework" url="http://git.alpinelinux.org/cgit/acf-core" @@ -15,4 +15,4 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums="120b344ff922d0cd933b2cc9d0b2c656 acf-core-0.13.2.tar.bz2" +md5sums="924fa592ccefc32dfd8900f14341d2c0 acf-core-0.13.3.tar.bz2" diff --git a/main/cacti/APKBUILD b/main/cacti/APKBUILD index 33fc7e72c3..b1fbcae3ad 100644 --- a/main/cacti/APKBUILD +++ b/main/cacti/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Jeff Bilyk <jbilyk@gmail.com> pkgname=cacti pkgver=0.8.7g -pkgrel=1 +pkgrel=2 pkgdesc="Network monitoring tool based on RRDtool" url="http://www.cacti.net" arch="noarch" diff --git a/main/collectd/APKBUILD b/main/collectd/APKBUILD index 6d0a512584..438f0e8c0d 100644 --- a/main/collectd/APKBUILD +++ b/main/collectd/APKBUILD @@ -1,8 +1,8 @@ # Contributor: -# Maintainer: +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=collectd pkgver=5.0.0 -pkgrel=2 +pkgrel=3 pkgdesc="The system statistics collection daemon" url="http://collectd.org" arch="all" @@ -34,6 +34,7 @@ prepare() { src/Makefile.in || return 1 sed -i -e 's/_LIBADD =/_LIBADD = -lm/' \ src/libcollectdclient/Makefile.in || return 1 + sed -i -e '/CFLAGS/s/-Werror//' configure src/Makefile.in || return 1 } build() { diff --git a/main/freeswitch/APKBUILD b/main/freeswitch/APKBUILD index 6958119263..7fba691170 100644 --- a/main/freeswitch/APKBUILD +++ b/main/freeswitch/APKBUILD @@ -4,7 +4,7 @@ pkgname=freeswitch pkgver=1.0.7_p20110602 _ver=${pkgver%_p*} _snapshot=${pkgver#*_p} -pkgrel=3 +pkgrel=4 pkgdesc="A communications platform written in C from the ground up" url="http://www.freeswitch.org" arch="all" diff --git a/main/squark/APKBUILD b/main/squark/APKBUILD index 56452833a1..1f6d1598e2 100644 --- a/main/squark/APKBUILD +++ b/main/squark/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Timo Teras <timo.teras@iki.fi> pkgname=squark pkgver=0.2 -pkgrel=0 +pkgrel=1 pkgdesc="Squark - Squid User Authentication and Rating Kit" subpackages= depends="haserl lua" diff --git a/main/zabbix/APKBUILD b/main/zabbix/APKBUILD index a4d8b63b87..69f7fb39e0 100644 --- a/main/zabbix/APKBUILD +++ b/main/zabbix/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <natanael.copa@gmail.com> pkgname=zabbix pkgver=1.8.5 -pkgrel=0 +pkgrel=1 pkgdesc="Enterprise-class open source distributed monitoring" url="www.zabbix.com" arch="all" diff --git a/testing/rsyslog/APKBUILD b/testing/rsyslog/APKBUILD index 9b8f91a286..fdf9c7b073 100644 --- a/testing/rsyslog/APKBUILD +++ b/testing/rsyslog/APKBUILD @@ -2,13 +2,13 @@ # Maintainer: cbanta@gmail.com pkgname=rsyslog pkgver=5.8.0 -pkgrel=0 +pkgrel=1 pkgdesc="Enhanced multi-threaded syslogd with database support and more." url="http://www.rsyslog.com/" arch="all" license="GPLv3 LGPL-3" makedepends="zlib-dev gnutls-dev mysql-dev postgresql-dev net-snmp-dev libnet-dev" -subpackages="$pkgname-dev $pkgname-doc $pkgname-mysql $pkgname-pgsql $pkgname-tls $pkgname-snmp" +subpackages="$pkgname-doc $pkgname-mysql $pkgname-pgsql $pkgname-tls $pkgname-snmp" source="http://www.rsyslog.com/files/download/$pkgname/$pkgname-$pkgver.tar.gz $pkgname.initd $pkgname.confd @@ -47,6 +47,7 @@ build() { package() { cd "$_builddir" make DESTDIR="$pkgdir" install + rm -f "$pkgdir"/usr/lib/rsyslog/*.la || return 1 install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname |