diff options
| author | Michael Mason <ms13sp@gmail.com> | 2009-04-06 17:21:12 +0000 |
|---|---|---|
| committer | Michael Mason <ms13sp@gmail.com> | 2009-04-06 17:21:12 +0000 |
| commit | 9dab2bd07701d806debcbbd363f45419890adefb (patch) | |
| tree | 3bdcca1913ba496edb50f52ba77d329078f8f5da | |
| parent | 2a3f9e295fadce325c22974688f293ebc8cafb55 (diff) | |
| parent | d437587cbbab753a400f07c1f44106f79d279cf3 (diff) | |
| download | aports-9dab2bd07701d806debcbbd363f45419890adefb.tar.bz2 aports-9dab2bd07701d806debcbbd363f45419890adefb.tar.xz | |
Merge branch 'master' of git://dev.alpinelinux.org/aports
| -rw-r--r-- | extra/diffutils/APKBUILD | 11 | ||||
| -rw-r--r-- | extra/diffutils/diffutils.post-deinstall | 2 | ||||
| -rw-r--r-- | extra/mysql/APKBUILD | 29 | ||||
| -rw-r--r-- | x11/xorg-server/APKBUILD | 1 |
4 files changed, 31 insertions, 12 deletions
diff --git a/extra/diffutils/APKBUILD b/extra/diffutils/APKBUILD index 89be666f..5a917713 100644 --- a/extra/diffutils/APKBUILD +++ b/extra/diffutils/APKBUILD @@ -1,16 +1,16 @@ # Maintainer: Leonardo Arena <rnalrd@gmail.com> pkgname=diffutils pkgver=2.8.1 -pkgrel=0 +pkgrel=1 pkgdesc="Show differences among files" subpackages="$pkgname-doc" -arch="" url="http://www.gnu.org/software/diffutils/" license="GPL2" depends="uclibc" makedepends="" -install= -source="http://ftp.gnu.org/pub/gnu/diffutils/diffutils-2.8.1.tar.gz" +install="$pkgname.post-deinstall" +source="http://ftp.gnu.org/pub/gnu/diffutils/diffutils-2.8.1.tar.gz +$install" build() { cd "$srcdir/$pkgname-$pkgver" @@ -22,4 +22,5 @@ build() { make check || return 1 make install DESTDIR=$pkgdir } -md5sums="71f9c5ae19b60608f6c7f162da86a428 diffutils-2.8.1.tar.gz" +md5sums="71f9c5ae19b60608f6c7f162da86a428 diffutils-2.8.1.tar.gz +e8da9a22c2389fe5e2846b8c0de45767 diffutils.post-deinstall" diff --git a/extra/diffutils/diffutils.post-deinstall b/extra/diffutils/diffutils.post-deinstall new file mode 100644 index 00000000..c59247ad --- /dev/null +++ b/extra/diffutils/diffutils.post-deinstall @@ -0,0 +1,2 @@ +#!/bin/sh +busybox --install -s diff --git a/extra/mysql/APKBUILD b/extra/mysql/APKBUILD index b828e9c1..f230eebd 100644 --- a/extra/mysql/APKBUILD +++ b/extra/mysql/APKBUILD @@ -1,16 +1,16 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> pkgname=mysql -pkgver=5.0.75 -pkgrel=4 +pkgver=5.0.77 +pkgrel=0 pkgdesc="A fast SQL database server" url="http://www.mysql.com/" license='GPL' -depends="readline openssl uclibc++" -makedepends="libtool uclibc++-dev readline-dev openssl-dev" +depends="readline openssl uclibc++ zlib" +makedepends="libtool uclibc++-dev readline-dev openssl-dev ncurses-dev zlib-dev" source="http://sunsite.informatik.rwth-aachen.de/mysql/Downloads/MySQL-5.0/${pkgname}-${pkgver}.tar.gz $pkgname.initd $pkgname.mycnf" -subpackages="$pkgname-doc $pkgname-dev $pkgname-test libmysqlclient" +subpackages="$pkgname-doc $pkgname-dev $pkgname-test libmysqlclient $pkgname-client" build() { cd "$srcdir/$pkgname-$pkgver" @@ -38,7 +38,7 @@ build() { } libmysqlclient() { - depends="uclibc" + depends="uclibc openssl zlib" mkdir -p "$subpkgdir"/usr/lib/mysql mv "$pkgdir"/usr/lib/mysql/libmysqlclient.so* "$subpkgdir"/usr/lib/mysql } @@ -48,6 +48,21 @@ test() { mv "$pkgdir"/usr/mysql-test "$subpkgdir"/usr/ } -md5sums="a234f0a60a7f8c290d9875cba3a2c5a2 mysql-5.0.75.tar.gz +client() { + depends="libmysqlclient ncurses zlib" + install="" + local bins="myisam_ftdump mysql mysqlaccess mysqladmin mysqlbug mysqlcheck + mysql_client_test mysqldump mysqldumpslow mysql_explain_log mysql_find_rows + mysql_fix_extensions mysqlimport mysqlshow mysql_tableinfo mysqltestmanagerc + mysqltestmanager-pwgen mysql_waitpid" + + mkdir -p $subpkgdir/usr/bin/ + + for i in $bins; do + mv $pkgdir/usr/bin/${i} $subpkgdir/usr/bin/ + done +} + +md5sums="6c30a20c9059daf053a301e927eb1667 mysql-5.0.77.tar.gz 3ce9827b22d8fbbb29d83a91cbe98ffc mysql.initd 15a7e3ddd6a40bf5a1eb3a8c69d9c34c mysql.mycnf" diff --git a/x11/xorg-server/APKBUILD b/x11/xorg-server/APKBUILD index 369434ff..4512eee1 100644 --- a/x11/xorg-server/APKBUILD +++ b/x11/xorg-server/APKBUILD @@ -17,6 +17,7 @@ depends=" openssl pixman uclibc + libgcc " makedepends=" libpciaccess-dev |