diff options
author | William Pitcock <nenolod@dereferenced.org> | 2012-09-26 00:14:22 -0500 |
---|---|---|
committer | William Pitcock <nenolod@dereferenced.org> | 2012-09-26 00:14:34 -0500 |
commit | 5bcbfc3c6506772da405c833a726894ce0848705 (patch) | |
tree | 03be34e7f254ce6571dcdb6032228c72505c4710 | |
parent | 702d15014a5015d97d3511cd5dda3e57b583ee96 (diff) | |
parent | 7b71fa2d6a54ab9dac00b3dcaea65e6163724312 (diff) | |
download | aports-5bcbfc3c6506772da405c833a726894ce0848705.tar.bz2 aports-5bcbfc3c6506772da405c833a726894ce0848705.tar.xz |
Merge git://github.com/Barthalion/aports
-rw-r--r-- | main/ffmpeg/APKBUILD | 4 | ||||
-rw-r--r-- | main/nginx/APKBUILD | 4 | ||||
-rw-r--r-- | main/xdelta3/APKBUILD | 21 |
3 files changed, 13 insertions, 16 deletions
diff --git a/main/ffmpeg/APKBUILD b/main/ffmpeg/APKBUILD index 057769337f..32e438fdc5 100644 --- a/main/ffmpeg/APKBUILD +++ b/main/ffmpeg/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ffmpeg -pkgver=0.11.1 +pkgver=0.11.2 pkgrel=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" url="http://ffmpeg.org/" @@ -67,5 +67,5 @@ libs() { mv "$pkgdir"/usr/lib "$subpkgdir"/usr } -md5sums="ff8cb914f657e164dd60ea1008b555a8 ffmpeg-0.11.1.tar.bz2 +md5sums="93c1908022567b321df74db7214da6ac ffmpeg-0.11.2.tar.bz2 2cdc11a99bf97c63c7cca27b073cb47c configure-dlvsym.patch" diff --git a/main/nginx/APKBUILD b/main/nginx/APKBUILD index e7395c0a95..40ab710cc3 100644 --- a/main/nginx/APKBUILD +++ b/main/nginx/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> pkgname=nginx -pkgver=1.2.3 +pkgver=1.2.4 pkgrel=0 pkgdesc="lightweight HTTP and reverse proxy server" url="http://www.nginx.org" @@ -54,7 +54,7 @@ package() { install -m644 -D LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } -md5sums="0a986e60826d9e3b453dbefc36bf8f6c nginx-1.2.3.tar.gz +md5sums="a7c9a515f632c8cbb07ab67392208088 nginx-1.2.4.tar.gz 4faf8dff6ff1490edae1688baf1b2abb nginx.initd 8823274a834332d3db4f62bf7dd1fb7d nginx.logrotate 801a87f7f9d27f8ad85b41a78b4c4461 ipv6.patch" diff --git a/main/xdelta3/APKBUILD b/main/xdelta3/APKBUILD index 0b1b21e4ab..c23da981c4 100644 --- a/main/xdelta3/APKBUILD +++ b/main/xdelta3/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xdelta3 -pkgver=3.0.0 +pkgver=3.0.4 pkgrel=0 pkgdesc="A diff utility which works with binary files" url="http://xdelta.org/" @@ -8,20 +8,17 @@ arch="all" license="GPL" depends= makedepends= -source="http://xdelta.googlecode.com/files/${pkgname%3}$pkgver.tar.gz - " - -prepare() { - cd $srcdir/xdelta$pkgver -} +source="http://xdelta.googlecode.com/files/$pkgname-$pkgver.tar.gz" build() { - cd $srcdir/xdelta$pkgver - make CFLAGS="$CFLAGS" xdelta3 || return 1 + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr + make } package() { - cd $srcdir/xdelta$pkgver - install -D xdelta3 "$pkgdir"/usr/bin/xdelta3 + cd $srcdir/$pkgname-$pkgver + make DESTDIR="${pkgdir}" install } -md5sums="5fe038be3a266d2a7913e10d1cec6d88 xdelta3.0.0.tar.gz" + +md5sums="c04f7fd9da45741a0095438cfe527b89 xdelta3-3.0.4.tar.gz" |