diff options
author | Carlo Landmeter <clandmeter@gmail.com> | 2010-09-26 19:07:17 +0000 |
---|---|---|
committer | Carlo Landmeter <clandmeter@gmail.com> | 2010-09-26 19:07:17 +0000 |
commit | e59f25e6a0d9d18f07ee5b249c535edfbfdb832e (patch) | |
tree | 4cb9e12987d0e520378e1533a8e73a87354eda34 /main/pcre | |
parent | d0077a675b28a5adbdacb983da0faabadc0057bc (diff) | |
parent | d9e47f0a9da3e21f1fbda6eef5e978e6fb5d3116 (diff) | |
download | aports-e59f25e6a0d9d18f07ee5b249c535edfbfdb832e.tar.bz2 aports-e59f25e6a0d9d18f07ee5b249c535edfbfdb832e.tar.xz |
Merge remote branch 'ncopa/master'
Conflicts:
main/nagios/APKBUILD
main/nagios/nagios.pre-install
Diffstat (limited to 'main/pcre')
-rw-r--r-- | main/pcre/APKBUILD | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/main/pcre/APKBUILD b/main/pcre/APKBUILD index 3aaf190ea..160311093 100644 --- a/main/pcre/APKBUILD +++ b/main/pcre/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=pcre pkgver=8.10 -pkgrel=2 +pkgrel=3 pkgdesc="Perl-compatible regular expression library" url="http://pcre.sourceforge.net" license="BSD" @@ -24,11 +24,6 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install || return 1 - # REF http://repos.archlinux.org/wsvn/packages/pcre/trunk/PKGBUILD - # grep uses pcre, so we need the libs in /lib - install -dm755 "$pkgdir"/lib - mv "$pkgdir"/usr/lib/libpcre.so.* "$pkgdir"/lib/ - ln -sf ../../lib/libpcre.so.0 "$pkgdir"/usr/lib/libpcre.so } libpcrecpp() { |