diff options
| author | Carlo Landmeter <clandmeter@gmail.com> | 2010-09-17 12:01:23 +0000 |
|---|---|---|
| committer | Carlo Landmeter <clandmeter@gmail.com> | 2010-09-17 12:01:23 +0000 |
| commit | 9ee6c9e7c7836fbc5a5867326cc2cd3fc5e8ec49 (patch) | |
| tree | f3ee20352c06c035a7d6e8729b8a5914709c00a5 | |
| parent | 180c47fc74500d2a155bdac0a3fec552f58cc33d (diff) | |
| parent | 9168e06c97a7266afd00ff83b35a05031c705403 (diff) | |
| download | aports-9ee6c9e7c7836fbc5a5867326cc2cd3fc5e8ec49.tar.bz2 aports-9ee6c9e7c7836fbc5a5867326cc2cd3fc5e8ec49.tar.xz | |
Merge remote branch 'ncopa/master'
| -rw-r--r-- | main/pcre/APKBUILD | 12 | ||||
| -rw-r--r-- | main/sircbot/APKBUILD (renamed from testing/sircbot/APKBUILD) | 4 | ||||
| -rw-r--r-- | main/sircbot/sircbot.confd (renamed from testing/sircbot/sircbot.confd) | 0 | ||||
| -rw-r--r-- | main/sircbot/sircbot.initd (renamed from testing/sircbot/sircbot.initd) | 2 | ||||
| -rw-r--r-- | main/sircbot/sircbot.pre-install (renamed from testing/sircbot/sircbot.pre-install) | 0 | ||||
| -rw-r--r-- | main/webkit/APKBUILD | 6 | ||||
| -rw-r--r-- | main/wpa_supplicant/APKBUILD | 6 |
7 files changed, 18 insertions, 12 deletions
diff --git a/main/pcre/APKBUILD b/main/pcre/APKBUILD index 73cd146057..3aaf190ea3 100644 --- a/main/pcre/APKBUILD +++ b/main/pcre/APKBUILD @@ -1,14 +1,14 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=pcre pkgver=8.10 -pkgrel=1 +pkgrel=2 pkgdesc="Perl-compatible regular expression library" url="http://pcre.sourceforge.net" license="BSD" depends= -makedepends="" +makedepends= source="ftp://ftp.csx.cam.ac.uk/pub/software/programming/$pkgname/$pkgname-$pkgver.tar.bz2" -subpackages="$pkgname-dev $pkgname-doc" +subpackages="$pkgname-dev $pkgname-doc libpcrecpp" build() { cd "$srcdir/$pkgname-$pkgver" @@ -31,4 +31,10 @@ package() { ln -sf ../../lib/libpcre.so.0 "$pkgdir"/usr/lib/libpcre.so } +libpcrecpp() { + pkgdesc="C++ bindings for PCRE" + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/libpcrecpp.so* "$subpkgdir"/usr/lib/ +} + md5sums="780867a700e9d4e4b9cb47aa5453e4b2 pcre-8.10.tar.bz2" diff --git a/testing/sircbot/APKBUILD b/main/sircbot/APKBUILD index 4271ac22b2..ba6a19d59f 100644 --- a/testing/sircbot/APKBUILD +++ b/main/sircbot/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=sircbot pkgver=0.2 -pkgrel=0 +pkgrel=1 pkgdesc="Minimalistic IRC bot" url="http://git.alpinelinux.org/cgit/sircbot/" license="GPL-2" @@ -41,5 +41,5 @@ luamod() { } md5sums="a9d16db48c97ebfa30e1c84f37e70838 sircbot-0.2.tar.bz2 -16790493e7ce465fd776dcfadc002a7c sircbot.initd +494717b7824e271093511a48955e4a14 sircbot.initd 8443ac189030c7b8beb8e579dc16ebc7 sircbot.confd" diff --git a/testing/sircbot/sircbot.confd b/main/sircbot/sircbot.confd index 63f8590a72..63f8590a72 100644 --- a/testing/sircbot/sircbot.confd +++ b/main/sircbot/sircbot.confd diff --git a/testing/sircbot/sircbot.initd b/main/sircbot/sircbot.initd index 2e0a9c3302..045f7ee2aa 100644 --- a/testing/sircbot/sircbot.initd +++ b/main/sircbot/sircbot.initd @@ -10,7 +10,7 @@ depends() { after firewall } -checkonfig() { +checkconfig() { if [ -z "$sircbot_channels" ]; then eerror "Please specify sircbot_channels in /etc/conf.d/sircbot" return 1 diff --git a/testing/sircbot/sircbot.pre-install b/main/sircbot/sircbot.pre-install index 99c5a83027..99c5a83027 100644 --- a/testing/sircbot/sircbot.pre-install +++ b/main/sircbot/sircbot.pre-install diff --git a/main/webkit/APKBUILD b/main/webkit/APKBUILD index 4abf1a5e57..f8d4332542 100644 --- a/main/webkit/APKBUILD +++ b/main/webkit/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=webkit -pkgver=1.2.3 -pkgrel=1 +pkgver=1.2.4 +pkgrel=0 pkgdesc="portable web rendering engine WebKit for GTK+" url="http://webkitgtk.org/" license="LGPL BSD" @@ -42,4 +42,4 @@ gtklauncher() { "$subpkgdir"/usr/bin/GtkLauncher } -md5sums="0ab5c478a6f5b74a1ae96bf13a456662 webkit-1.2.3.tar.gz" +md5sums="dc3a92dd0e8c2e70263fbfdf809b51a5 webkit-1.2.4.tar.gz" diff --git a/main/wpa_supplicant/APKBUILD b/main/wpa_supplicant/APKBUILD index bbe82e4661..f49fbf51fb 100644 --- a/main/wpa_supplicant/APKBUILD +++ b/main/wpa_supplicant/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=wpa_supplicant -pkgver=0.7.2 -pkgrel=2 +pkgver=0.7.3 +pkgrel=0 pkgdesc="A utility providing key negotiation for WPA wireless networks" url="http://hostap.epitest.fi/wpa_supplicant" license="GPL" @@ -121,6 +121,6 @@ package() { install -Dm755 "$srcdir"/wpa_supplicant.confd \ "$pkgdir"/etc/conf.d/wpa_supplicant || return 1 } -md5sums="0e2cb7e4c35667351d8b7ec28c783e6a wpa_supplicant-0.7.2.tar.gz +md5sums="f516f191384a9a546e3f5145c08addda wpa_supplicant-0.7.3.tar.gz 55f853354f51ba947e4dd6ee2bb0d64a wpa_supplicant.initd bc117427f2c538439f3f1481a028ee06 wpa_supplicant.confd" |