update, fix dependencies

2 files changed, 32 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 30e7e0622b9e..85a7822af8f8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by makepkg 4.2.1
-# Thu Jun 11 11:19:38 UTC 2015
 pkgbase = mapserver-git
 	pkgdesc = Platform for publishing spatial data and interactive mapping applications to the web
-	pkgver = 7.0.0.beta1.r28.g61592a7
+	pkgver = 7.6.0.r692.geef595475
 	pkgrel = 1
 	url = http://www.mapserver.org
 	arch = i686
@@ -11,7 +9,6 @@ pkgbase = mapserver-git
 	makedepends = cfitsio
 	depends = libpng
 	depends = freetype2
-	depends = gd
 	depends = zlib
 	depends = gdal
 	depends = proj
@@ -22,15 +19,15 @@ pkgbase = mapserver-git
 	depends = geos
 	depends = agg
 	depends = apache
+	depends = protobuf-c
 	depends = fcgi
-	depends = mod_fastcgi
-	depends = python2
-	depends = swig
+	depends = mod_fcgid
+	depends = python
 	depends = libsvg-cairo
-	provides = mapserver-git=7.0.0.beta1.r28.g61592a7
+	depends = fribidi
+	provides = mapserver=7.6.0.r692.geef595475
 	conflicts = mapserver
-	source = mapserver-git::git://github.com/mapserver/mapserver.git
+	source = mapserver-git::git+https://github.com/mapserver/mapserver.git
 	md5sums = SKIP
 
 pkgname = mapserver-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 5548043c5e57..90529c25b5cd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,20 @@
-# Maintainer: Samuel Mesa <samuelmesa@linuxmail.org>
+# Contributor: Samuel Mesa <samuelmesa@linuxmail.org>
 # Contributor: Marcos Piccinini <x@nofxx.com>
-# Contributor:  	Jonathan Hudson <jh+arch@daria.co.uk>
+# Contributor: Jonathan Hudson <jh+arch@daria.co.uk>
 pkgname=mapserver-git
-pkgver=7.0.0.beta1.r28.g61592a7
+pkgver=7.6.0.r692.geef595475
 pkgrel=1
 pkgdesc="Platform for publishing spatial data and interactive mapping applications to the web"
 arch=(i686 x86_64)
 license=('MIT')
 url="http://www.mapserver.org"
-depends=('libpng' 'freetype2' 'gd' 'zlib' 'gdal' 'proj' 'libjpeg-turbo' 'libxml2' 'libpqxx' 'pdflib-lite' 'geos' 'agg' 'apache' 'fcgi' 'mod_fastcgi' 'python2' 'swig' 'libsvg-cairo')
+depends=('libpng' 'freetype2' 'zlib' 'gdal' 'proj' 'libjpeg-turbo' 'libxml2' 'libpqxx' 'pdflib-lite' 'geos' 'agg' 'apache' 'protobuf-c'
+'fcgi' 'mod_fcgid' 'python' 'libsvg-cairo' 'fribidi' )
 makedepends=('cfitsio')
 options=()
-provides=("${pkgname}=${pkgver}")
+provides=("mapserver=${pkgver}")
 conflicts=('mapserver')
-source=("${pkgname}"::'git://github.com/mapserver/mapserver.git')
+source=("${pkgname}"::'git+https://github.com/mapserver/mapserver.git')
 md5sums=('SKIP')
 
 pkgver() {
@@ -30,14 +31,13 @@ build() {
   fi	
   rm -rf build && mkdir build
   cd build
-  
+    
   cmake .. \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-	-DPYTHON_EXECUTABLE=/usr/bin/python2 \
-	-DPYTHON_LIBRARIES=/usr/lib/python2.7 \
-	-DPYTHON_INCLUDE_PATH=/usr/include/python2.7 \
-	-DFRIBIDI_INCLUDE_DIR="/usr/include/glib-2.0;/usr/lib/glib-2.0/include;/usr/include/fribidi" \
-    -DWITH_CAIRO=ON \
+  -DCMAKE_INSTALL_PREFIX=/usr \
+  -DCMAKE_INSTALL_LIBDIR=lib \
+  -DFRIBIDI_INCLUDE_DIR="/usr/include/glib-2.0;/usr/lib/glib-2.0/include;/usr/include/fribidi" \
+  -DCMAKE_PREFIX_PATH=/opt/v8 \
+  -DWITH_CAIRO=ON \
 	-DWITH_CLIENT_WFS=ON \
 	-DWITH_CLIENT_WMS=ON \
 	-DWITH_CSHARP=OFF \
@@ -45,30 +45,27 @@ build() {
 	-DWITH_EXEMPI=OFF \
 	-DWITH_FCGI=ON \
 	-DWITH_FRIBIDI=ON \
-	-DWITH_GD=OFF \
-	-DWITH_GDAL=ON \
 	-DWITH_GENERIC_NINT=OFF \
 	-DWITH_GEOS=ON \
-	-DWITH_GIF=OFF \
+	-DWITH_GIF=ON \
 	-DWITH_ICONV=ON \
 	-DWITH_JAVA=OFF \
 	-DWITH_KML=ON \
+	-DWITH_V8=OFF \
 	-DWITH_LIBXML2=ON \
 	-DWITH_MSSQL2008=OFF \
 	-DWITH_MYSQL=OFF \
-	-DWITH_OGR=ON \
 	-DWITH_ORACLESPATIAL=OFF \
 	-DWITH_ORACLE_PLUGIN=OFF \
 	-DWITH_PERL=OFF \
 	-DWITH_PHP=OFF \
-	-DWITH_POINT_Z_M=OFF \
+	-DWITH_POINT_Z_M=ON \
 	-DWITH_POSTGIS=ON \
-	-DWITH_PROJ=ON \
+	-DWITH_GIF=ON \
 	-DWITH_PYTHON=ON \
+	-DPYTHON_EXECUTABLE=/usr/bin/python \
 	-DWITH_RSVG=OFF \
 	-DWITH_RUBY=OFF \
-	-DWITH_SDE=OFF \
-	-DWITH_SDE_PLUGIN=OFF \
 	-DWITH_SOS=ON \
 	-DWITH_SVGCAIRO=ON \
 	-DWITH_THREAD_SAFETY=ON \
@@ -78,22 +75,18 @@ build() {
 	-DWITH_XMLMAPFILE=OFF \
 	-DFREETYPE_INCLUDE_DIR=/usr/include/freetype2 \
     
-  make clean
+  make clean	
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}"
-  cd build
+  cd "${srcdir}/${pkgname}/build"
   
-  make || return 1
+  make
   make DESTDIR=${pkgdir} install
   
-  # Copy the headers a include for ZooWPS project
-  mkdir -p "$pkgdir"/usr/include/mapserver  
-  cp "${srcdir}/${pkgname}"/*.h "${pkgdir}"/usr/include/mapserver/
-
-  # Move stuff from lib64 to lib
-  mv "${pkgdir}"/usr/lib64/* "${pkgdir}"/usr/lib
-  rm -r "${pkgdir}"/usr/lib64
+  #Copy the headers a include for ZooWPS project
+  install -d "$pkgdir"/usr/include/mapserver  
+  install -Dm644 "${srcdir}/${pkgname}"/build/*.h "$pkgdir"/usr/include/mapserver/
+  install -Dm644 "${srcdir}/${pkgname}"/*.h "$pkgdir"/usr/include/mapserver/
 }