A couple fixes and some cleanup.

1 files changed, 22 insertions, 21 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 68b9383e5b2a..e5e659e73192 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,34 @@
-pkgname=liblas
-pkgver=1.8.0
-pkgrel=1
-pkgdesc="libLAS is a C/C++ library for reading and writing the very common LAS LiDAR format."
+# Maintainer: Maciej Sieczka <msieczka at sieczka dot org>
+# Contributor: Patryk Kowalczyk <patryk AT kowalczyk DOT WS>
+# Contributor: Michael <mbostwick89@gmail.com>
+
+pkgname='liblas'
+pkgver='1.8.0'
+pkgrel='2'
+pkgdesc='A C/C++ library for reading and writing the very common LAS LiDAR format.'
 arch=('i686' 'x86_64')
-url="http://www.liblas.org/"
+url='http://www.liblas.org/'
 license=('BSD')
-source=(http://download.osgeo.org/liblas/libLAS-$pkgver.tar.bz2)
-epends=('boost>=1.38.0' 'gdal>=1.7.0' 'libgeotiff>=1.3.0' 'laszip')
-md5sums=('599881281d45db4ce9adb2d75458391e' )
+source=("http://download.osgeo.org/liblas/libLAS-${pkgver}.tar.bz2")
+depends=('boost-libs>=1.38.0' 'gdal>=1.7.0' 'libgeotiff>=1.3.0' 'laszip')
+makedepends=('boost>=1.38.0' 'cmake')
+optdepends=('oci: Oracle Instant Client, see http://www.liblas.org/compilation.html')
+md5sums=('599881281d45db4ce9adb2d75458391e')
 
 build() {
-  cd "$srcdir/libLAS-$pkgver"
-  if [ -d makefiles ]; then
-    rm -rf makefiles
-  fi
-  mkdir makefiles
-  cd makefiles
-  cmake ../ -G "Unix Makefiles"  \
+  cd "${srcdir}/libLAS-${pkgver}"
+
+  cmake -DWITH_GEOTIFF:BOOL=TRUE \
   -DWITH_GDAL:BOOL=TRUE \
-  -DWITH_GEOTIFF:BOOL=TRUE \
   -DWITH_LASZIP:BOOL=TRUE \
   -DWITH_UTILITIES:BOOL=TRUE \
-  -DLASZIP_INCLUDE_DIR:PATH=/usr/include
+  -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+  -G "Unix Makefiles" .
+
   make
 }
 
 package() {
-  cd "$srcdir/libLAS-$pkgver/makefiles"
-  make DESTDIR="$pkgdir/" install
+  cd "${srcdir}/libLAS-${pkgver}"
+  make DESTDIR="$pkgdir" install
 }
-
-