[arch-commits] Commit in gpsdrive/trunk (PKGBUILD gpsdrive-perltovendor.patch)

[Sergej Pupykin]

    Date: Monday, June 16, 2014 @ 12:34:38
  Author: spupykin
Revision: 113221

upgpkg: gpsdrive 2.11-21

upd

Added:
  gpsdrive/trunk/gpsdrive-perltovendor.patch
Modified:
  gpsdrive/trunk/PKGBUILD

-----------------------------+
 PKGBUILD                    |    9 ++++++---
 gpsdrive-perltovendor.patch |   28 ++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-06-16 10:32:01 UTC (rev 113220)
+++ PKGBUILD	2014-06-16 10:34:38 UTC (rev 113221)
@@ -6,7 +6,7 @@
 pkgname=gpsdrive
 pkgver=2.11
 _pkgver=20120928
-pkgrel=20
+pkgrel=21
 pkgdesc="A car (bike, ship, plane) navigation system"
 arch=("i686" "x86_64")
 url="http://www.gpsdrive.de/"
@@ -17,8 +17,10 @@
 makedepends=('cmake>=2.4.4' 'boost' 'cfitsio')
 install="gpsdrive.install"
 #source=("http://www.gpsdrive.de/packages/${pkgname}-${pkgver}.tar.gz")
-source=("http://arch.p5n.pp.ru/~sergej/dl/2012/${pkgname}-${_pkgver}.tar.gz")
-md5sums=('bc53792529788b81c291a32d628a4850')
+source=("http://arch.p5n.pp.ru/~sergej/dl/2012/${pkgname}-${_pkgver}.tar.gz"
+	"gpsdrive-perltovendor.patch")
+md5sums=('bc53792529788b81c291a32d628a4850'
+         'c28bc2dc51a76a39161bf540aebfab6c')
 
 prepare() {
   cd "$srcdir"
@@ -30,6 +32,7 @@
   sed -i 's|GdkGC \*kontext_map;|extern GdkGC *kontext_map;|' $srcdir/gpsdrive-${_pkgver}/src/gpsdrive.c
   sed -i '22,1i#include <mapnik/graphics.hpp>' $srcdir/gpsdrive-${_pkgver}/src/mapnik.cpp
   sed -i 's|datasource_cache::instance()->|datasource_cache::instance().|' $srcdir/gpsdrive-${_pkgver}/src/mapnik.cpp
+  (cd gpsdrive-${_pkgver} && patch -p1 <$srcdir/gpsdrive-perltovendor.patch)
 }
 
 build() {

Added: gpsdrive-perltovendor.patch
===================================================================
--- gpsdrive-perltovendor.patch	                        (rev 0)
+++ gpsdrive-perltovendor.patch	2014-06-16 10:34:38 UTC (rev 113221)
@@ -0,0 +1,28 @@
+diff -ru gpsdrive-2.11/scripts/osm/perl_lib/CMakeLists.txt gpsdrive-2.11-patched/scripts/osm/perl_lib/CMakeLists.txt
+--- gpsdrive-2.11/scripts/osm/perl_lib/CMakeLists.txt	2010-06-24 15:53:32.000000000 -0400
++++ gpsdrive-2.11-patched/scripts/osm/perl_lib/CMakeLists.txt	2014-06-11 18:50:59.000000000 -0400
+@@ -5,10 +5,10 @@
+   MACRO_OPTIONAL_FIND_PACKAGE(Perl)
+ 
+   if (PERL_FOUND)
+-    if (NOT PERL_SITELIB)       
++    if (NOT PERL_VENDORLIB)       
+         MACRO_OPTIONAL_FIND_PACKAGE(PerlLibs)
+-    endif (NOT PERL_SITELIB)        
+-    #MESSAGE("DEBUG: > PERL_SITELIB: ${PERL_SITELIB}")
++    endif (NOT PERL_VENDORLIB)        
++    #MESSAGE("DEBUG: > PERL_VENDORLIB: ${PERL_VENDORLIB}")
+ 
+     file(GLOB_RECURSE perl_modules ${CMAKE_CURRENT_SOURCE_DIR}/*.pm)
+ 
+@@ -16,8 +16,8 @@
+         foreach(perl_module ${perl_modules})
+           file(RELATIVE_PATH relative_module_path ${CMAKE_CURRENT_SOURCE_DIR} ${perl_module})
+           get_filename_component(relative_module_path ${relative_module_path} PATH)
+-          install(FILES ${perl_module} DESTINATION ${PERL_SITELIB}/${relative_module_path})
+-          #message("DEBUG: install ${perl_module} to ${PERL_SITELIB}/${relative_module_path}")
++          install(FILES ${perl_module} DESTINATION ${PERL_VENDORLIB}/${relative_module_path})
++          #message("DEBUG: install ${perl_module} to ${PERL_VENDORLIB}/${relative_module_path}")
+         endforeach(perl_module ${perl_modules})
+       endif (perl_modules)
+   endif (PERL_FOUND)