Upgraded to version 0.29.0; updated sha256sums accordingly; removed ${pkg_base}.install; disabled compile flag removal;

The old versions of PKGBUILD contained the following lines in prepare():

    # remove specific build flags so that the options from makepkg.conf are honored
    sed -i 's/-O2//g' configure
    sed -i 's/-D_FORTIFY_SOURCE=2//g' configure
    sed -i 's/-DNDEBUG//g' configure
    sed -i 's/-I\/usr\/local\/include//g' configure

IMHO sed-patching the configure script is a bad idea, especially if not needed.

  -O2  is superseeded by whatever is specified in makepkg.conf anyway
  -D_FORTIFY_SOURCE  is not harmfull, especially if tested by the upstream developers
  -DNDEBUG  is a reasonalbe choice for most users. Especially as many arch users
            do not specify it explicitly in their makepkg.conf
  -I/usr/local/include typically has no effect anyway, since it is empty
                       by default on arch linux.

So I consider it less harmfull to stay with the default ./configure provided by
the developers than patching it on the fly. If a user really wants to change the
build behaviour, she can do this trough makepkg more elegantly.

1 files changed, 9 insertions, 25 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 4bc084705cdc..c38e81b4e6cb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,12 @@
-# Maintainer: Florian Jacob <projects+arch AT florianjacob )DOT( de>
+# Maintainer: Holger Doebler <holger DOD doebler AD posteo DOD de>
+# Contributor: Florian Jacob <projects+arch AT florianjacob )DOT( de>
 # Contributor: mareex <marcus [dot] behrendt [dot] 86 [at] gmail [dot] com>
 
 pkgname=('sumo' 'sumo-doc')
 pkgbase=sumo
-pkgver=0.28.0
+pkgver=0.29.0
 pkgrel=1
-pkgdesc="SUMO is an open source, highly portable, microscopic and continuous road traffic simulation package designed to handle large road networks"
+pkgdesc="Free and open traffic simulation suite which allows modelling of intermodal traffic systems including road vehicles, public transport and pedestrians."
 arch=('i686' 'x86_64')
 url="http://sumo.dlr.de"
 license=('GPL')
@@ -14,14 +15,12 @@ makedepends=('make' 'gcc' 'help2man')
 source=("${pkgbase}-src-${pkgver}.tar.gz::http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-src-${pkgver}.tar.gz?download"
         "${pkgbase}-doc-${pkgver}.tar.gz::http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-doc-${pkgver}.tar.gz?download"
         "${pkgbase}.desktop"
-        "${pkgbase}.sh"
-        "${pkgbase}.install")
+        "${pkgbase}.sh")
 
-sha256sums=('4e3c31b5e052349c00a1f00f50fcba9c598a93a047a0d66f56f2260e9373f201'
-            '03a6578286b55e564244255afe7723153c0cc891a1cc66a220110d176df43f66'
+sha256sums=('50b627869f829343cc874879317d238615e68b91083f7c401aac198235a690d1'
+            '9be7669e26a15f9da78fa4386ad4e45b68f1664e2a87c92f1f0296ce1ceb2a93'
             '0500ba9cdf827cceae9a9bce66094bdb077300c94b0040bdd710afb92d0d4849'
-            '16db32dbba617f8a38f5d103ce3af7cc70ab4cbf5b50e30be5d7f13ee6ea2f4f'
-            'eeb0e9f85d72f06937462ceac90cc7f5bb55b56022472c476c137ee95b9fa56b')
+            '16db32dbba617f8a38f5d103ce3af7cc70ab4cbf5b50e30be5d7f13ee6ea2f4f')
 
 prepare() {
     cd ${srcdir}/${pkgbase}-${pkgver}
@@ -36,12 +35,6 @@ prepare() {
             sed -i "1i #!/bin/env python2" $f
         fi
     done
-
-    # remove specific build flags so that the options from makepkg.conf are honored
-    sed -i 's/-O2//g' configure
-    sed -i 's/-D_FORTIFY_SOURCE=2//g' configure
-    sed -i 's/-DNDEBUG//g' configure
-    sed -i 's/-I\/usr\/local\/include//g' configure
 }
 
 build() {
@@ -57,8 +50,6 @@ package_sumo() {
                 'python2: for executing various python scripts in $SUMO_HOME/tools'
                 'perl: for executing various perl scripts in $SUMO_HOME/tools')
 
-    install=${pkgbase}.install
-
     mkdir -p ${pkgdir}/etc/profile.d/
     mkdir -p ${pkgdir}/usr/bin
     mkdir -p ${pkgdir}/usr/lib/${pkgbase}/data
@@ -78,24 +69,17 @@ package_sumo() {
     install -m0755 ${srcdir}/${pkgbase}-${pkgver}/bin/jtrrouter ${pkgdir}/usr/bin/
     install -m0755 ${srcdir}/${pkgbase}-${pkgver}/bin/marouter ${pkgdir}/usr/bin/
     install -m0755 ${srcdir}/${pkgbase}-${pkgver}/bin/netconvert ${pkgdir}/usr/bin/
+    install -m0755 ${srcdir}/${pkgbase}-${pkgver}/bin/netedit ${pkgdir}/usr/bin/
     install -m0755 ${srcdir}/${pkgbase}-${pkgver}/bin/netgenerate ${pkgdir}/usr/bin/
     install -m0755 ${srcdir}/${pkgbase}-${pkgver}/bin/od2trips ${pkgdir}/usr/bin/
     install -m0755 ${srcdir}/${pkgbase}-${pkgver}/bin/polyconvert ${pkgdir}/usr/bin/
     install -m0755 ${srcdir}/${pkgbase}-${pkgver}/bin/${pkgbase} ${pkgdir}/usr/bin/
     install -m0755 ${srcdir}/${pkgbase}-${pkgver}/bin/${pkgbase}-gui ${pkgdir}/usr/bin/
     install -m0755 ${srcdir}/${pkgbase}-${pkgver}/bin/TraCITestClient ${pkgdir}/usr/bin/
-    install -m0755 ${srcdir}/${pkgbase}-${pkgver}/bin/netedit ${pkgdir}/usr/bin/
-
 
     SAVEIFS=$IFS
     IFS=$(echo -en "\n\b")
 
-    #ln -s /usr/bin ${pkgdir}/usr/lib/${pkgbase}/bin
-    ln -s /usr/share/doc/${pkgbase}/doxygen ${pkgdir}/usr/lib/${pkgbase}/doxygen
-    ln -s /usr/share/doc/${pkgbase}/examples ${pkgdir}/usr/lib/${pkgbase}/examples
-    ln -s /usr/share/doc/${pkgbase}/pydoc ${pkgdir}/usr/lib/${pkgbase}/pydoc
-    ln -s /usr/share/doc/${pkgbase}/tutorial ${pkgdir}/usr/lib/${pkgbase}/tutorial
-    ln -s /usr/share/doc/${pkgbase}/userdoc ${pkgdir}/usr/lib/${pkgbase}/userdoc
 ########### DATA
     cd ${srcdir}/${pkgbase}-${pkgver}/data
     for d in $(find . -type d)