From 6c1ee00c1f3d5ae26f518ba8f0b7718b5118dd1f Mon Sep 17 00:00:00 2001
From: rhatto <rhatto@370017ae-e619-0410-ac65-c121f96126d4>
Date: Sat, 3 May 2008 17:58:56 +0000
Subject: boost: underline version workaround

git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@1868 370017ae-e619-0410-ac65-c121f96126d4
---
 dev/libs/boost/boost.SlackBuild | 2 +-
 dev/libs/boost/boost.build      | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'dev')

diff --git a/dev/libs/boost/boost.SlackBuild b/dev/libs/boost/boost.SlackBuild
index 8d6adb5e..67355636 100755
--- a/dev/libs/boost/boost.SlackBuild
+++ b/dev/libs/boost/boost.SlackBuild
@@ -42,7 +42,7 @@ fi
 PACKAGE="boost"
 ARCH=${ARCH:=i486}
 VERSION=${VERSION:=1.35.0}
-BUILD=${BUILD:=1rd}
+BUILD=${BUILD:=2rd}
 SRC_DIR=${SRC:=$CWD}
 TMP=${TMP:=/tmp}
 REPOS=${REPOS:=$TMP}
diff --git a/dev/libs/boost/boost.build b/dev/libs/boost/boost.build
index b23c77b4..6f999ef9 100755
--- a/dev/libs/boost/boost.build
+++ b/dev/libs/boost/boost.build
@@ -30,7 +30,7 @@ fi
 PACKAGE="boost"
 ARCH=${ARCH:=i486}
 VERSION=${VERSION:=1.35.0}
-BUILD=${BUILD:=1rd}
+BUILD=${BUILD:=2rd}
 SRC_DIR=${SRC:=$CWD}
 TMP=${TMP:=/tmp}
 REPOS=${REPOS:=$TMP}
@@ -41,7 +41,8 @@ ERROR_MD5=34;       ERROR_CONF=35;      ERROR_HELP=36
 ERROR_TAR=37;       ERROR_MKPKG=38;     ERROR_GPG=39
 ERROR_PATCH=40
 
-VERSION_UNDERLINE="`echo $VERSION | sed -e 's/\./_/g'`"
+# Version with underline and without minor version if minor version is 0 (workaround)
+VERSION_UNDERLINE="`echo $VERSION | sed -e 's/\./_/g' -e 's/\([0-9]\+\)_\([0-9]\+\)_0/\1_\2/'`"
 
 if [ "$ARCH" == "x86_64" ]; then
   export LDFLAGS="-L/lib64 -L/usr/lib64"
-- 
cgit v1.2.3