main/php: ship config that loads the extension by defaultv1.9.0_rc2

also removed enchant. depends on x11.

1 files changed, 6 insertions, 5 deletions

diff --git a/main/php/APKBUILD b/main/php/APKBUILD
index 05f709a187..6d9724953f 100644
--- a/main/php/APKBUILD
+++ b/main/php/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=php
 pkgver=5.3.0
 _suhosinver=${pkgver}-0.9.8-BETA-1
-pkgrel=1
+pkgrel=2
 pkgdesc="The PHP language runtime engine"
 url="http://www.php.net/"
 license="PHP-3"
@@ -12,7 +12,7 @@ install="$pkgname.post-upgrade"
 makedepends="pcre-dev libxml2-dev libiconv-dev openssl-dev zlib-dev bzip2-dev
         curl-dev libpng-dev jpeg-dev freetype-dev libmcrypt-dev mysql-dev
         sqlite-dev libtool libltdl postgresql-dev db-dev unixodbc-dev icu-dev
-        enchant-dev gd-dev gmp-dev gettext-dev imap-dev aspell-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
@@ -21,7 +21,6 @@ subpackages="$pkgname-dev $pkgname-doc
         $pkgname-calendar
         $pkgname-curl
         $pkgname-dba
-        $pkgname-enchant
         $pkgname-exif
         $pkgname-ftp
         $pkgname-gd
@@ -103,7 +102,6 @@ build() {
                 --with-bz2=shared \
                 --with-curl=shared \
                 --with-db4=shared \
-                --with-enchant=shared,/usr \
                 --with-freetype-dir=shared,/usr \
                 --with-gd=shared,/usr \
                 --with-gettext=shared \
@@ -140,6 +138,7 @@ build() {
                 --without-db3 \
                 --without-qdbm \
                 "
+#               --with-enchant=shared,/usr \
 #               --with-tidy=shared \
         ./configure --build=${CHOST:-i486-alpine-linux-uclibc} \
                 --prefix=/usr \
@@ -171,6 +170,8 @@ _mv_mod() {
         local d=usr/lib/php/20090626
         mkdir -p "$subpkgdir/$d"
         mv "$pkgdir/$d/${1}.so" "$subpkgdir/$d/" || return 1
+        install -d "$subpkgdir"/etc/php/conf.d
+        echo "extension=${1}.so" > "$subpkgdir"/etc/php/conf.d/${1}.ini
         return 0
 }
 
@@ -179,7 +180,7 @@ bz2()		{ _mv_mod bz2; }
 calendar()      { _mv_mod calendar; }
 curl()          { _mv_mod curl; }
 dba()           { _mv_mod dba; }
-enchant()       { _mv_mod enchant; }
+#enchant()      { _mv_mod enchant; }
 exif()          { _mv_mod exif; }
 ftp()           { _mv_mod ftp; }
 gd()            { _mv_mod gd; }