diff options
| -rw-r--r-- | dev/libs/boost/boost-1.33.1-doinst.diff (renamed from dev/libs/boost/boost-1.33.1.diff) | 0 | ||||
| -rwxr-xr-x | dev/libs/boost/boost.SlackBuild | 41 | ||||
| -rwxr-xr-x | dev/libs/boost/boost.build | 33 |
3 files changed, 35 insertions, 39 deletions
diff --git a/dev/libs/boost/boost-1.33.1.diff b/dev/libs/boost/boost-1.33.1-doinst.diff index fea423c7..fea423c7 100644 --- a/dev/libs/boost/boost-1.33.1.diff +++ b/dev/libs/boost/boost-1.33.1-doinst.diff diff --git a/dev/libs/boost/boost.SlackBuild b/dev/libs/boost/boost.SlackBuild index 2f632b42..034fcb34 100755 --- a/dev/libs/boost/boost.SlackBuild +++ b/dev/libs/boost/boost.SlackBuild @@ -41,7 +41,7 @@ fi # default settings PACKAGE="boost" ARCH=${ARCH:=i486} -VERSION=${VERSION:=1.34.0} +VERSION=${VERSION:=1.34.1} BUILD=${BUILD:=1rd} SRC_DIR=${SRC:=$CWD} TMP=${TMP:=/tmp} @@ -59,40 +59,15 @@ else fi # doinst fix -rm -rf $TMP/package-$PACKAGE -mkdir $TMP/package-$PACKAGE -cd $TMP/package-$PACKAGE -explodepkg $TMP/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz - -if [ -f "$CWD/$PACKAGE-$VERSION.diff" ]; then - patch -p0 < $CWD/$PACKAGE-$VERSION.diff +if [ -f "$CWD/$PACKAGE-$VERSION-doinst.diff" ]; then + rm -rf $TMP/package-$PACKAGE + mkdir $TMP/package-$PACKAGE + cd $TMP/package-$PACKAGE + explodepkg $TMP/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz + patch -p0 < $CWD/$PACKAGE-$VERSION-doinst.diff + makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz fi -cat << EOF > install/slack-desc -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler-----------------------------------------------------| -boost: boost -boost: -boost: Boost provides free peer-reviewed portable C++ source libraries. -boost: -boost: We emphasize libraries that work well with the C++ Standard Library. -boost: Boost libraries are intended to be widely useful, and usable across -boost: a broad spectrum of applications. -boost: -boost: -boost: http://www.boost.org/ -boost: -EOF - - -makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz - if [ "$CLEANUP" == "yes" ]; then rm -rf $TMP/$PACKAGE fi diff --git a/dev/libs/boost/boost.build b/dev/libs/boost/boost.build index e2d10e44..1b6cb9f6 100755 --- a/dev/libs/boost/boost.build +++ b/dev/libs/boost/boost.build @@ -29,7 +29,7 @@ fi # default settings PACKAGE="boost" ARCH=${ARCH:=i486} -VERSION=${VERSION:=1.34.0} +VERSION=${VERSION:=1.34.1} BUILD=${BUILD:=1rd} SRC_DIR=${SRC:=$CWD} TMP=${TMP:=/tmp} @@ -41,8 +41,7 @@ ERROR_MD5=34; ERROR_CONF=35; ERROR_HELP=36 ERROR_TAR=37; ERROR_MKPKG=38; ERROR_GPG=39 ERROR_PATCH=40 -# Warning: hardcoded version!! -VERSION2=1_34_0 +VERSION_UNDERLINE="`echo $VERSION | sed -e 's/\./_/g'`" if [ "$ARCH" == "x86_64" ]; then export LDFLAGS="-L/lib64 -L/usr/lib64" @@ -53,7 +52,7 @@ fi RTOOL="wget" PACKAGE_EXT="gz" -SRC="${PACKAGE}_${VERSION2}.tar.$PACKAGE_EXT" +SRC="${PACKAGE}_${VERSION_UNDERLINE}.tar.$PACKAGE_EXT" URL="http://ufpr.dl.sourceforge.net/sourceforge/boost/$SRC" SRC_DIR="$SRC_DIR/$PACKAGE" @@ -75,7 +74,7 @@ mkdir -p $TMP cd $TMP tar xvf$tarflag $SRC_DIR/$SRC -cd ${PACKAGE}_${VERSION2} +cd ${PACKAGE}_${VERSION_UNDERLINE} if [ -f "$CWD/$PACKAGE-$VERSION.diff" ]; then patch -p0 < $CWD/$PACKAGE-$VERSION.diff @@ -87,7 +86,6 @@ make install CWD="`pwd`" - # docs mkdir -p /usr/doc/$PACKAGE-$VERSION @@ -95,6 +93,29 @@ for file in LICENSE_1_0.txt README; do cp $CWD/$file* /usr/doc/$PACKAGE-$VERSION/ done +mkdir /install +cat << EOF > /install/slack-desc +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler-----------------------------------------------------| +boost: boost +boost: +boost: Boost provides free peer-reviewed portable C++ source libraries. +boost: +boost: We emphasize libraries that work well with the C++ Standard Library. +boost: Boost libraries are intended to be widely useful, and usable across +boost: a broad spectrum of applications. +boost: +boost: +boost: http://www.boost.org/ +boost: +EOF + if [ "$CLEANUP" == "yes" ]; then rm -rf $TMP fi |