Major rewrite

1 files changed, 17 insertions, 11 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 0fee5fcdcb11..b6f1aeb6df18 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,10 @@
-# Maintainer: Sergio Correia <sergio@correia.cc>
+# Maintainer: Doug Newgard <scimmia at archlinux dot info>
+# Contributor: Sergio Correia <sergio@correia.cc>
 # Contributor: Nicolas Vivet <nizzox@gmail.com>
 
-pkgname=libphutil-git
 _pkgname=libphutil
-pkgver=conduit.5.464.g54dbec7
+pkgname=$_pkgname-git
+pkgver=5.r793.g20d4310
 pkgrel=1
 pkgdesc='Library system which organizes PHP classes and functions into modules'
 arch=('any')
@@ -11,19 +12,24 @@ url="http://phabricator.com"
 license=('Apache')
 depends=('php')
 makedepends=('git')
-provides=('libphutil')
-source=('git://github.com/facebook/libphutil.git')
+provides=("$_pkgname=$pkgver")
+conflicts=("$_pkgname")
+source=("git://github.com/facebook/$_pkgname.git")
 sha256sums=('SKIP')
 
 pkgver() {
-  cd "${_pkgname}"
-  git describe --always | sed 's|-|.|g' # Use the tag of the last commit
+  cd $_pkgname
+  git describe --tags --always | sed 's/^conduit-//;s/-/.r/;s/-/./'
+}
+
+prepare() {
+# Don't override user option, doesn't work right anyway
+  sed -i "s|^\s*'error_log'|//&|" $_pkgname/scripts/__init_script__.php
 }
 
 package() {
-  mkdir -p "${pkgdir}"/usr/share/php/"${_pkgname}"
+  install -d "$pkgdir/usr/share/php/$_pkgname" "$pkgdir/etc/php/conf.d/"
   # do not copy hidden directories
-  cp -a "${srcdir}"/"${_pkgname}"/* "${pkgdir}"/usr/share/php/"${_pkgname}"/
+  cp -a "$srcdir/$_pkgname/"* "$pkgdir/usr/share/php/$_pkgname/"
+  echo 'open_basedir = "${open_basedir}:/usr/share/php/"' > "$pkgdir/etc/php/conf.d/libphutil.conf"
 }
-
-# vim:set ts=2 sw=2 et: