From ca274f16c2f8befb15159fa42455e10019d330c2 Mon Sep 17 00:00:00 2001 From: luis Date: Sun, 2 Dec 2007 01:12:17 +0000 Subject: Syncing with generic.SlackBuild v0.9.1 git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@1483 370017ae-e619-0410-ac65-c121f96126d4 --- dev/libs/libgpg-error/libgpg-error.SlackBuild | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'dev/libs/libgpg-error/libgpg-error.SlackBuild') diff --git a/dev/libs/libgpg-error/libgpg-error.SlackBuild b/dev/libs/libgpg-error/libgpg-error.SlackBuild index 50cb58b4..90f77d3c 100755 --- a/dev/libs/libgpg-error/libgpg-error.SlackBuild +++ b/dev/libs/libgpg-error/libgpg-error.SlackBuild @@ -33,7 +33,7 @@ CWD="$(pwd)" SRC_NAME="libgpg-error" PKG_NAME="libgpg-error" ARCH=${ARCH:=i486} -SRC_VERSION=${VERSION:=1.4} +SRC_VERSION=${VERSION:=1.6} PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')" BUILD=${BUILD:=1ls} SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME @@ -41,7 +41,7 @@ TMP=${TMP:=/tmp} PKG=${PKG:=$TMP/package-$PKG_NAME} REPOS=${REPOS:=$TMP} PREFIX=${PREFIX:=/usr} -PKG_SRC="$TMP/$SRC_NAME-$SRC_VERSION" +PKG_WORK="$TMP/$SRC_NAME" CONF_OPTIONS=${CONF_OPTIONS:=--infodir=$PREFIX/info --enable-shared=yes --enable-static=no} NUMJOBS=${NUMJOBS:=-j3} @@ -68,13 +68,14 @@ ERROR_TAR=37; ERROR_MKPKG=38; ERROR_GPG=39 ERROR_PATCH=40; ERROR_VCS=41; ERROR_MKDIR=42 # Clean up any leftovers of previous builds -rm -rf "$PKG_SRC" 2> /dev/null +rm -rf "$PKG_WORK" 2> /dev/null rm -rf "$PKG" 2> /dev/null # Create directories if necessary mkdir -p "$SRC_DIR" || exit $ERROR_MKDIR mkdir -p "$PKG" || exit $ERROR_MKDIR mkdir -p "$REPOS" || exit $ERROR_MKDIR +mkdir -p "$PKG_WORK" || exit $ERROR_MKDIR # Dowload source if necessary SRC="$SRC_NAME-$SRC_VERSION.tar.bz2" @@ -109,8 +110,9 @@ fi gpg --verify "$SRC_DIR/$SRC.sig" "$SRC_DIR/$SRC" || exit $ERROR_GPG # Untar -cd "$TMP" +cd "$PKG_WORK" tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR +PKG_SRC=`ls -l | awk '/^d/ { print $8 }'` cd "$PKG_SRC" # Fix source files' ownership and permission -- cgit v1.2.3