1 files changed, 7 insertions, 32 deletions
diff --git a/academic/pgrouting/pgrouting.SlackBuild b/academic/pgrouting/pgrouting.SlackBuild
index ef3557a5b7..88a3b373e3 100644
--- a/academic/pgrouting/pgrouting.SlackBuild
+++ b/academic/pgrouting/pgrouting.SlackBuild
@@ -25,7 +25,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pgrouting
-VERSION=${VERSION:-1.05}
+VERSION=${VERSION:-2.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -62,40 +62,16 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 rm -rf $TMP/$PRGNAM-$VERSION
 cd $TMP
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/v$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \; -o \
+ -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-  -exec chmod 644 {} \;
+ -exec chmod 644 {} \;
 
-# set build flags
-patch -p1 < $CWD/pgrouting-1.05-flags.patch
-
-# remove broken and unnecessary weightmap declarations
-patch -p1 < $CWD/pgrouting-1.05-weightmap.patch
-
-# fix LANGUAGE 'C' for Postgres 9.2
-patch -p1 < $CWD/pgrouting-1.05-sql.patch
-
-# Some fixes collected by Fedora packagers
-# Correct FSF address
-find . \( -name *.cpp -o -name *.c -o -name *.h -o -name *.sql \) -print | xargs -i \
-  sed -i 's/59 Temple Place\(, \| - \)Suite 330/51 Franklin Street, Fifth Floor/;s/02111-1307/02110-1301/' {}
-
-# Fix boost property_map files path
-sed -i "s|boost/vector_property_map.hpp|boost/property_map/vector_property_map.hpp|" \
-  core/src/shooting_star_boost_wrapper.cpp
-
-sed -i "s|boost/property_map.hpp|boost/property_map/property_map.hpp|" \
-  core/src/shooting_star_relax.hpp \
-  core/src/edge_visitors.hpp
-
-# fix to avoid deprecated "boost/graph/detail/is_same.hpp" file
-sed -i "s|boost/graph/detail/is_same.hpp|boost/type_traits/is_same.hpp|" \
-  core/src/edge_visitors.hpp
+WITH_DOC=${WITH_DOC:-NO}
 
 mkdir -p build
 cd build
@@ -103,7 +79,7 @@ cd build
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
+    -DWITH_DOC=$WITH_DOC \
     .. 
 
   make VERBOSE=1 
@@ -114,8 +90,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a authors.txt COPYING README.routing RELEASE_NOTES $PKG/usr/doc/$PRGNAM-$VERSION
-cp $CWD/create_template.sh $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir $PKG/install