[arch-commits] Commit in shapelib/trunk (LICENSE PKGBUILD)

[Balló György]

    Date: Friday, February 17, 2017 @ 21:09:35
  Author: bgyorgy
Revision: 212971

upgpkg: shapelib 1.4.0-1

Update to version 1.4.0

Modified:
  shapelib/trunk/PKGBUILD
Deleted:
  shapelib/trunk/LICENSE

----------+
 LICENSE  |   21 ---------------------
 PKGBUILD |   34 ++++++++++------------------------
 2 files changed, 10 insertions(+), 45 deletions(-)

Deleted: LICENSE
===================================================================
--- LICENSE	2017-02-17 18:17:47 UTC (rev 212970)
+++ LICENSE	2017-02-17 21:09:35 UTC (rev 212971)
@@ -1,21 +0,0 @@
-Copyright
-The source for the Shapefile C Library is (c) 1998 Frank Warmerdam, and released under the following conditions. The intent is that anyone can do anything with the code, but that I do not assume any liability, nor express any warranty for this code.
-
-As of Shapelib 1.2.6 the core portions of the library are made available under two possible licenses. The licensee can choose to use the code under either the Library GNU Public License (LGPL) described in LICENSE.LGPL or under the following MIT style license. Any files in the Shapelib distribution without explicit copyright license terms (such as this documentation, the Makefile and so forth) should be considered to have the following licensing terms. Some auxilary portions of Shapelib, notably some of the components in the contrib directory come under slightly different license restrictions. Check the source files that you are actually using for conditions.
-
-Default License Terms
-Copyright (c) 1999, Frank Warmerdam
-
-This software is available under the following "MIT Style" license, or at the option of the licensee under the LGPL (see LICENSE.LGPL). This option is discussed in more detail in shapelib.html.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Shapelib Modifications
-I am pleased to receive bug fixes, and improvements for Shapelib. Unless the submissions indicate otherwise I will assume that changes submitted to me remain under the the above "dual license" terms. If changes are made to the library with the intention that those changes should be protected by the LGPL then I should be informed upon submission. Note that I will not generally incorporate changes into the core of Shapelib that are protected under the LGPL as this would effectively limit the whole file and distribution to LGPL terms.
-
-Opting for LGPL
-For licensee's opting to use Shapelib under LGPL as opposed to the MIT Style license above, and wishing to redistribute the software based on Shapelib, I would ask that all "dual license" modules be updated to indicate that only the LGPL (and not the MIT Style license) applies. This action represents opting for the LGPL, and thereafter LGPL terms apply to any redistribution and modification of the affected modules.

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-02-17 18:17:47 UTC (rev 212970)
+++ PKGBUILD	2017-02-17 21:09:35 UTC (rev 212971)
@@ -4,37 +4,23 @@
 # Contributor: Bob Finch <w9ya at arrl.net>
 
 pkgname=shapelib
-pkgver=1.3.0
-pkgrel=5
-pkgdesc='simple C API for reading and writing ESRI Shapefiles'
+pkgver=1.4.0
+pkgrel=1
+pkgdesc='Simple C API for reading and writing ESRI Shapefiles'
 arch=('i686' 'x86_64')
 url='http://shapelib.maptools.org/'
-license=('LGPL' 'MIT')
-options=('staticlibs')
-source=(http://download.osgeo.org/$pkgname/$pkgname-$pkgver.tar.gz
-        LICENSE)
-sha256sums=('23d474016158ab5077db2f599527631706ba5c0dc7c4178a6a1d685bb014f68f'
-            '67e45b04045e27a9d6f64f92b295831b8739b32668ce497d3fa02999e349a789')
+license=('LGPL')
+depends=('gcc-libs' 'proj')
+source=(http://download.osgeo.org/$pkgname/$pkgname-$pkgver.tar.gz)
+sha256sums=('3eddd5f2690f2cf18d8d9798267537a2102a289020b9818f9a31eb626f91a7a1')
 
 build() {
   cd $pkgname-$pkgver
-  
-  sed -i -e s:'-fPIC':"${CFLAGS} -fPIC": Makefile
-  make lib
+  ./configure --prefix=/usr
+  make
 }
 
 package() {
   cd $pkgname-$pkgver
-
-  install -dm755 "${pkgdir}"/usr/{lib,include}
-
-  # Fix the broken makefile
-  sed -i -e s:/usr/local:${pkgdir}/usr: Makefile
-  sed -i -e s:/usr/bin/install:/bin/install: Makefile
-  make lib_install
-  
-  # Fix world readable bit not set
-  chmod 644 "${pkgdir}"/usr/include/shapefil.h
-
-  install -D -m644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
+  make DESTDIR="$pkgdir" install
 }