summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-05-11 11:31:49 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-05-11 11:31:49 +0000
commit79253a23e0faf36c0a95b9fd3af96176250cb1ae (patch)
tree40dcc806d47e01c4037bc330924ed14bc141a0f2
parent12bd73bd9081b4e5ac7e561d064f9ddf42395833 (diff)
parentc142813db6323befd942c1d19ae1d143ce043523 (diff)
downloadaports-79253a23e0faf36c0a95b9fd3af96176250cb1ae.tar.bz2
aports-79253a23e0faf36c0a95b9fd3af96176250cb1ae.tar.xz
Merge remote branch 'clandmeter/master'
-rw-r--r--main/php/APKBUILD18
1 files changed, 14 insertions, 4 deletions
diff --git a/main/php/APKBUILD b/main/php/APKBUILD
index c08067186..c2ab6e790 100644
--- a/main/php/APKBUILD
+++ b/main/php/APKBUILD
@@ -3,7 +3,7 @@
pkgname=php
pkgver=5.3.2
_suhosinver=${pkgver}-0.9.9.1
-pkgrel=3
+pkgrel=4
pkgdesc="The PHP language runtime engine"
url="http://www.php.net/"
license="PHP-3"
@@ -15,7 +15,7 @@ makedepends="pcre-dev libxml2-dev libiconv-dev openssl-dev zlib-dev bzip2-dev
gd-dev gmp-dev gettext-dev imap-dev aspell-dev
net-snmp-dev libxslt-dev cyrus-sasl-dev openldap-dev pkgconfig
libgcrypt-dev"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-cli
+subpackages="$pkgname-dev $pkgname-doc $pkgname-cli $pkgname-pear
$pkgname-bcmath
$pkgname-bz2
$pkgname-calendar
@@ -54,7 +54,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-cli
$pkgname-sysvmsg
$pkgname-sysvsem
$pkgname-sysvshm
- $pkgname-xml
$pkgname-xmlrpc
$pkgname-xsl
$pkgname-zip
@@ -96,7 +95,7 @@ build() {
--enable-sysvmsg=shared \
--enable-sysvsem=shared \
--enable-sysvshm=shared \
- --enable-xml=shared \
+ --enable-xml \
--enable-zip=shared \
--with-bz2=shared \
--with-curl=shared \
@@ -178,6 +177,17 @@ cli() {
mv "$pkgdir"/usr/bin/php "$subpkgdir"/usr/bin/
}
+pear() {
+ depends="php"
+ mkdir -p "$subpkgdir"/usr/bin
+ mkdir -p "$subpkgdir"/usr/share
+ mkdir -p "$subpkgdir"/etc/php
+ mv "$pkgdir"/usr/share/pear "$subpkgdir"/usr/share/
+ mv "$pkgdir"/usr/bin/pear* "$subpkgdir"/usr/bin/
+ mv "$pkgdir"/usr/bin/pecl "$subpkgdir"/usr/bin/
+ mv "$pkgdir"/etc/php/pear.conf "$subpkgdir"/etc/php/
+}
+
_mv_mod() {
pkgdesc="$1 php extension"
mkdir -p "$subpkgdir/$_extdir"