aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrhatto <rhatto@370017ae-e619-0410-ac65-c121f96126d4>2009-05-01 18:39:03 +0000
committerrhatto <rhatto@370017ae-e619-0410-ac65-c121f96126d4>2009-05-01 18:39:03 +0000
commit66c9336ba7824adaa53422f7029e39f7ad1aae47 (patch)
tree61f2a0fbc12c640fff60eec310d3bf2bd810ff9c
parent9c9f4ee6a4b3a5c5f4a382bf818e51bd4604f97b (diff)
downloadslackbuilds-66c9336ba7824adaa53422f7029e39f7ad1aae47.tar.gz
slackbuilds-66c9336ba7824adaa53422f7029e39f7ad1aae47.tar.bz2
qjackctl: updating to 0.3.4; duplicity: updating to 0.5.16
git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@2181 370017ae-e619-0410-ac65-c121f96126d4
-rw-r--r--app/backup/duplicity/Manifest27
-rwxr-xr-xapp/backup/duplicity/duplicity.SlackBuild26
-rw-r--r--media/sound/qjackctl/Manifest24
-rwxr-xr-xmedia/sound/qjackctl/qjackctl.SlackBuild99
-rw-r--r--media/sound/qjackctl/slack-required1
5 files changed, 149 insertions, 28 deletions
diff --git a/app/backup/duplicity/Manifest b/app/backup/duplicity/Manifest
index 1d1160d8..29fe6f5f 100644
--- a/app/backup/duplicity/Manifest
+++ b/app/backup/duplicity/Manifest
@@ -1,4 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
DIST duplicity-0.5.03.tar.gz 146490 MD5 80273525ae47e8075078a855cf4a134e SHA1 7c78ec834fb742c1499680db4024e625f13fd21a SHA256 d6e3929dc515b72916bfe7cadb25cbe7b383b9f699353bed65c16029ea1cda81 SHA512 41258134b0b5fb4bf19f849a3f0dc0e66da38d21769934564b0019e0aa68fe253c2f173232eede6e79b9d90d8abfe8329d67cfccaaec5860669caee6ec001424 RMD160 4841488694a1d9c1229fbf298e9a46c5a2e96007
-MKBUILD duplicity.mkbuild 3257 MD5 4e0deb66fd464a3a296bf976c89252a9 SHA1 dca986a21c156d724d37d097e17334ea88427b08 SHA256 4d1f8e4c06dfd738f3f0be22e90e044496dc0c436f88ea685bbcfcb8cae3da00 SHA512 84208f007672182ffa0eb9e70b7f43fd4e99ca348c5e45b25a5ff1e47cb0223226ed325bab7818c6e3084ec7808917e7553484eccf3c80136de74243549fa798 RMD160 d75bf0877b5b40338ab770e5298f7164e462b989
-SLACK-REQUIRED slack-required 107 MD5 f35f4cde74f4c8647d2c8aac01927ade SHA1 ff30133a4e23609f8b3faddf26c6fa90487e769b SHA256 127536baf911bc2e6d86dc801231a14cc9dc769bd9f08ef9909c44f2a95a1513 SHA512 0327c883e77e93aa9360c2aa2b06a568947f8e3c495a0c8e526a5718ea3718f7b4f61c37b1ee2906bf98f05df965114e9f71b746b33ec696ec93c74aef421334 RMD160 6679ef54a25ef75d592edb3da6953b10def79a06
-SLACKBUILD duplicity.SlackBuild 6690 MD5 256ca8c11294a61da528acaede99f298 SHA1 f4cf9fcaac4be2d1c88ada555105903b4369b9dc SHA256 1131d000275f591bb4e482ba14b1363235d80447a4e405e7c9dfd6f3c981942a SHA512 00ad4446a2888d0e7a992b93cc6bc8e52fadb1416ae6f3bd19fa534bb2e38bca8ece8a46334b5f00c98fd05f80b6476bf2da46ed24c159951191832298f7ec46 RMD160 be78a1341eb32367b1bf56cf2adb8007ea007d58
+DIST duplicity-0.5.16.tar.gz 209858 MD5 83e92b106a42c09e86447b1019f0a105 RMD160 674b2bae7a0afe0574cfea731c1c7860d59802b2 SHA1 89fd75899e477523e8037f652a5c3a50d5e64db8 SHA256 abccd962681d1a932f84131eae9fbab73c063ebef5eebf745b490cba0d4df931 SHA512 f4510cb4b9e2dc7f67ea8b7ced6a8b90296815b60acd021749e8d9d4eaa525254536d9920bd26f52960fea8513603c09448a6d8a35a3deefa563dacb2c94edc4
+MKBUILD duplicity.mkbuild 3257 MD5 9afbe4280d914f789afe7fa866bf32c1 RMD160 086960c512ef586e806ccab5f941d191098d5c1d SHA1 f68824e62dedc937563aa6d92c28490bf41c5b55 SHA256 d3aaa5fe115496ce462482a089f3e67e702d2fe761f813789ea1fe14ab827dbc SHA512 5e62b74972247977be9bc547abf52ad933ee1846348b43e533ac3d7c9ea1fa5187167890c9a7a5961b30d0a251e2fade25dc7cd25979c5d0ca210b7c89f65a0d
+SLACK-REQUIRED slack-required 107 MD5 f35f4cde74f4c8647d2c8aac01927ade RMD160 6679ef54a25ef75d592edb3da6953b10def79a06 SHA1 ff30133a4e23609f8b3faddf26c6fa90487e769b SHA256 127536baf911bc2e6d86dc801231a14cc9dc769bd9f08ef9909c44f2a95a1513 SHA512 0327c883e77e93aa9360c2aa2b06a568947f8e3c495a0c8e526a5718ea3718f7b4f61c37b1ee2906bf98f05df965114e9f71b746b33ec696ec93c74aef421334
+SLACKBUILD duplicity.SlackBuild 7065 MD5 7f9a789488d40a56d1826ae5400d3820 RMD160 31c8d89d42700c465b18af77bc42ae6b6085a029 SHA1 3b04a50ee31d1834e1aa66e31653b047b3351dad SHA256 1046e92281ef8fe5513aae6b533f5daed15083ef0d856ed0129e89e868a95e14 SHA512 dec498fd16c042dce9b5647dad67481feadb46204d97091bc49f76e02457ac64619198bd4af3de4917e2b1e966ba4af3a3a46830e8e5d1c624834add74610201
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ+zWkAAoJEEHL93ESzgeiW/AQAKdUi9DCPZayAsLcU5J+OsJV
+pS2CskRWhvPddhmmCnUJe7XrouipcYf8NUi1B99wRYty4zaiGBkQ97Of2R3O2sJ6
+tcMKrutwVmCQ6mH0S3AdHBKyp8bAGkLM6dcVLGJ5UUK75A0L8RjZLNbXGKe6wUR4
+xZtA2+sB/tF8ZizIlX0uazHuyD40Qhl9fTag97Nino5l7y4x/40qVUeymAgs81Wo
+ceQpZsk5os3u7XJElf2m3uIBQMobwF657nzP8yTvTXYCcTu7+LYEsC5nxDsZV+hx
+4AsX2BAflK3GY7mirKYtGwpdAL8+ohqeZLxO2RVC9wb7fQ587pH/gmzHqVoibaD+
+kXyg9kQyg/lRc2lXgs/uaV+TQSHYjPTxIK5p0N7MhPWmaONE5IRUrBE0UEVHS6Nl
+DOmA1h3RSpl7AzkAglwoQDSu3OUZqLNxVn5jV1/McvKch3UetrUdnt+d98+SC7vn
+fNWCqlN8OleTYqVugq5G3hEvgI4WUUmWu/7yxc0nJZrRmH2ETfWoEUj6Tbz9cCq3
+4zdt51lNEZJAbxq41ejKZgWxJJi/Dc9IvGYoBTL/pSGF/0m8aXPPABWs7kC/xZ0K
+E4nnTTrQ/36hfU+dnYkiZ4ljdGuy8boK47P5dbnrMysluEjkr1dpTyl/XYEThaE9
++fmvAj9KxDA/ldyRBTdU
+=tZ6c
+-----END PGP SIGNATURE-----
diff --git a/app/backup/duplicity/duplicity.SlackBuild b/app/backup/duplicity/duplicity.SlackBuild
index c50d8ba8..23d88b53 100755
--- a/app/backup/duplicity/duplicity.SlackBuild
+++ b/app/backup/duplicity/duplicity.SlackBuild
@@ -15,8 +15,9 @@
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
#
# slackbuild for duplicity, by Silvio Rhatto
-# requires: librsync py-gnupg pexpect
-# tested: duplicity-0.5.03
+# requires:
+# tested: duplicity-0.5.16
+# model: generic.mkSlackBuild $Rev: 805 $
#
# Look for slackbuildrc
@@ -31,13 +32,14 @@ CWD="$(pwd)"
SRC_NAME="duplicity"
PKG_NAME="duplicity"
ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=0.5.03}
+SRC_VERSION=${VERSION:=0.5.16}
PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
BUILD=${BUILD:=1rha}
SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
TMP=${TMP:=/tmp}
PKG=${PKG:=$TMP/package-$PKG_NAME}
REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="app/backup/duplicity"}
PREFIX=${PREFIX:=/usr}
PKG_WORK="$TMP/$SRC_NAME"
CONF_OPTIONS=${CONF_OPTIONS:=""}
@@ -47,9 +49,9 @@ NUMJOBS=${NUMJOBS:=""}
LIBDIR="$PREFIX/lib"
if [ "$ARCH" = "i386" ]; then
- SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+ SLKCFLAGS="-O2 -march=i386 -mtune=i686"
elif [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
+ SLKCFLAGS="-O2 -march=i486 -mtune=i686"
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686"
elif [ "$ARCH" = "s390" ]; then
@@ -88,6 +90,15 @@ fi
# Check Manifest file
if [ -e "$CWD/Manifest" ]; then
+ # Manifest signature checking
+ if grep -q -- "-----BEGIN PGP SIGNED MESSAGE-----" $CWD/Manifest; then
+ echo "Checking Manifest signature..."
+ gpg --verify $CWD/Manifest
+ if [ "$?" != "0" ]; then
+ exit $ERROR_MANIFEST
+ fi
+ fi
+
MANIFEST_LINES="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | wc -l`"
for ((MANIFEST_COUNT=1; MANIFEST_COUNT <= $MANIFEST_LINES; MANIFEST_COUNT++)); do
@@ -120,7 +131,7 @@ if [ -e "$CWD/Manifest" ]; then
fi
# Check source code integrity
- for ALGO in md5 sha1 sha256 sha512 rmd160; do
+ for ALGO in md5 rmd160 sha1 sha256 sha512; do
if [ $ALGO = "rmd160" ]; then
ALGO_SRC="`openssl rmd160 $MANIFEST_FILE | awk '{ print $2 }'`"
else
@@ -191,7 +202,8 @@ fi
# Build the package
cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
# Delete source and build directories if requested
if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
diff --git a/media/sound/qjackctl/Manifest b/media/sound/qjackctl/Manifest
new file mode 100644
index 00000000..86ab531e
--- /dev/null
+++ b/media/sound/qjackctl/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST qjackctl-0.3.4.tar.gz 343617 MD5 65736e83650468256ba22aa5d35fd0cb RMD160 1ab208e0c0f4e68c58b048a32d05ca3d47dfaca8 SHA1 33aa986c81b0cc6891c9c6cef6366470394d3eb6 SHA256 7b5fc1d359e30d0f739836af92d9b3336a99e9ccb029d0c0f75ba250ed8ddfde SHA512 a31e32ba1286fe6d4136ca3fb5c03b48aa9905fe507d8a29ee52110ebd8ccb585040b8c1af4816b896fdcb12e54df6ac0413a0ac9688f1857f32283d218e98fe
+MKBUILD qjackctl.mkbuild 2802 MD5 3cbde14e61616bc0996fbc36b683c7f5 RMD160 a652bd83247dc653fde7dd87b8d90f7064cfc60e SHA1 e5205f5ed656fed33df40427954d658ea0dce773 SHA256 494a3471c9b3291ac5e194286b5045e3abd19afb27ea9695dd4f3f7d927d7066 SHA512 e9e60fdaac8783ffca03485474396fd53d6474dd48bc8c5f0042c6c26ae7c3dcc4685da578384d3a8bf664d34cb0b1b249a97018def591b8e219b4cbc9513e19
+SLACK-REQUIRED slack-required 85 MD5 a110aa3d2b0a9a10a93f769a85a591d1 RMD160 4450f52a01e8cbfeab7c4813d9f0ecf3b9a798b1 SHA1 57d729ffaf862c111c90b1531ca7187cc74ecbdf SHA256 34e4953fdb6826ab78f9b8d451337abfdcaff91b3c83c7d78f775c152864ffe0 SHA512 eae7e57f3161956efd5a66560172d348823cc178e49c990c87ed3402af1d43cfc7aa89196968231bf943de7667a74d4890d943bd200f3bf308316c5b171c70b1
+SLACKBUILD qjackctl.SlackBuild 8125 MD5 b96ba5583b3e40c8dadadbf17048c463 RMD160 4416663d441f94e0e04b422504b5c27e5b1adb72 SHA1 9277bd73251adf5e573d007a58a48407082a607b SHA256 2203f247bdfa0f21298793d6ce1e41bb8a76e238d409474ea24e217fe569b0af SHA512 8b345e3dfdd3a0991afe0eaa8e7ce2919a8aab4fecf8fe1dd394f5e846058ada45d8f4db66d3fd46e7678f6ca1ce9db98664411fccc2a800ec089cd65ca27824
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ+y44AAoJEEHL93ESzgeifAIP+gI7m/T9M45lbwOP/UKDqcgl
+w+jF3Axm721MUYUv9IMYWiQH8QGQXHKhyKZTThP/OY633ldJk3RLevVB+e0sxOmT
+JuyuaBwUtf8VfPa8GvA4BRN427GU7bjpdwZ9ED9KPo6n0mbCXr9BNMqXUyNjPTYi
+WuaeB1nkctIYvJP4tXbibOVLPgNHAzRqm8j6us4hfbjyA0Ssar5OXg+o8QGOv7ZM
+PIma4Ec4PLhKR4zfiH7uCoUYfcLFzRgGwLXxZGU6Kh2BqleWRJUeB06OuSVu2ZeB
+gOYsrWDZwj/HTvOI0yBi7GgrEK73seW2bamFeruCf+ubGsJVlu9VAp7Sg+NNGXd3
+EDx/0ke9x/B1imxa4EidhlWhrbY3d5FaWtPTXJM87lsWpD2a0OGm2ykstvf/HplX
+B5rvIZzb/q7FX0G/3+vsDxUyWKmVNKyT4zmQEa5wLandgx2nD0DBmCfgclBEaN+E
+hA/G8giq9mQTS9NVzsE2nJI+ECmmLC8Dx70ykkZlvuVdRQ6y9uNFPDYWmaKBrU/r
+0N0FV/Uwy7CDJ/iCu19lNNPmgc/RDCMhoMA8zUERS2WakxR3L4FrILgpm2q5ydfj
+JCDEzHb59quLfDrm/uqlEqVyctNmv8x2DSqhhdr55HT/96idUDZMGJmC+sAbAZsF
+VsauOXYzXllXWNHcgnhx
+=foi1
+-----END PGP SIGNATURE-----
diff --git a/media/sound/qjackctl/qjackctl.SlackBuild b/media/sound/qjackctl/qjackctl.SlackBuild
index 24afb497..d923dc60 100755
--- a/media/sound/qjackctl/qjackctl.SlackBuild
+++ b/media/sound/qjackctl/qjackctl.SlackBuild
@@ -15,8 +15,9 @@
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
#
# slackbuild for qjackctl, by Silvio Rhatto
-# requires: jack
-# tested: qjackctl-0.2.23
+# requires:
+# tested: qjackctl-0.3.4
+# model: generic.mkSlackBuild $Rev: 805 $
#
# Look for slackbuildrc
@@ -31,13 +32,14 @@ CWD="$(pwd)"
SRC_NAME="qjackctl"
PKG_NAME="qjackctl"
ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=0.2.23}
+SRC_VERSION=${VERSION:=0.3.4}
PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
BUILD=${BUILD:=1rha}
SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
TMP=${TMP:=/tmp}
PKG=${PKG:=$TMP/package-$PKG_NAME}
REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="media/sound/qjackctl"}
PREFIX=${PREFIX:=/usr}
PKG_WORK="$TMP/$SRC_NAME"
CONF_OPTIONS=${CONF_OPTIONS:="--sysconfdir=/etc"}
@@ -47,9 +49,9 @@ NUMJOBS=${NUMJOBS:=""}
LIBDIR="$PREFIX/lib"
if [ "$ARCH" = "i386" ]; then
- SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+ SLKCFLAGS="-O2 -march=i386 -mtune=i686"
elif [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
+ SLKCFLAGS="-O2 -march=i486 -mtune=i686"
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686"
elif [ "$ARCH" = "s390" ]; then
@@ -65,6 +67,7 @@ ERROR_WGET=31; ERROR_MAKE=32; ERROR_INSTALL=33
ERROR_MD5=34; ERROR_CONF=35; ERROR_HELP=36
ERROR_TAR=37; ERROR_MKPKG=38; ERROR_GPG=39
ERROR_PATCH=40; ERROR_VCS=41; ERROR_MKDIR=42
+ERROR_MANIFEST=43;
# Clean up any leftovers of previous builds
rm -rf "$PKG_WORK" 2> /dev/null
@@ -84,6 +87,72 @@ if [ ! -s "$SRC_DIR/$SRC" ] || ! gunzip -t "$SRC_DIR/$SRC" 2> /dev/null; then
wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
fi
+# Check Manifest file
+if [ -e "$CWD/Manifest" ]; then
+
+ # Manifest signature checking
+ if grep -q -- "-----BEGIN PGP SIGNED MESSAGE-----" $CWD/Manifest; then
+ echo "Checking Manifest signature..."
+ gpg --verify $CWD/Manifest
+ if [ "$?" != "0" ]; then
+ exit $ERROR_MANIFEST
+ fi
+ fi
+
+ MANIFEST_LINES="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | wc -l`"
+
+ for ((MANIFEST_COUNT=1; MANIFEST_COUNT <= $MANIFEST_LINES; MANIFEST_COUNT++)); do
+
+ MANIFEST_LINE="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | head -n $MANIFEST_COUNT | tail -n 1`"
+ MANIFEST_FILE="`echo $MANIFEST_LINE | awk '{ print $2 }'`"
+ MANIFEST_FILE_TYPE="`echo $MANIFEST_LINE | awk '{ print $1 }'`"
+
+ if [ -e "$SRC_DIR/$MANIFEST_FILE" ]; then
+ MANIFEST_FILE="$SRC_DIR/$MANIFEST_FILE"
+ else
+ MANIFEST_FILE="`find $CWD -name $MANIFEST_FILE`"
+ fi
+
+ if [ ! -e "$MANIFEST_FILE" ] || [ -d "$MANIFEST_FILE" ]; then
+ continue
+ fi
+
+ echo "Checking Manifest for $MANIFEST_FILE_TYPE $MANIFEST_FILE integrity..."
+
+ SIZE_SRC="`wc -c $MANIFEST_FILE | awk '{ print $1 }'`"
+ SIZE_MANIFEST="`echo $MANIFEST_LINE | awk '{ print $3 }'`"
+
+ # Check source code size
+ if [ "$SIZE_SRC" != "$SIZE_MANIFEST" ]; then
+ echo "SIZE Manifest: $SIZE_MANIFEST; SIZE $SRC: $SIZE_SRC"
+ exit $ERROR_MANIFEST
+ else
+ echo "Size match."
+ fi
+
+ # Check source code integrity
+ for ALGO in md5 rmd160 sha1 sha256 sha512; do
+ if [ $ALGO = "rmd160" ]; then
+ ALGO_SRC="`openssl rmd160 $MANIFEST_FILE | awk '{ print $2 }'`"
+ else
+ ALGO_SRC="`"$ALGO"sum $MANIFEST_FILE | awk '{ print $1 }'`"
+ fi
+ ALGO="`echo $ALGO | tr '[:lower:]' '[:upper:]'`"
+ ALGO_MANIFEST=$(echo $MANIFEST_LINE | sed "s/.* $ALGO //" | awk '{ print $1 }')
+ if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then
+ echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC"
+ exit $ERROR_MANIFEST
+ else
+ echo "$ALGO match."
+ fi
+ done
+
+ done
+
+else
+ exit $ERROR_MANIFEST
+fi
+
# Untar
cd "$PKG_WORK"
tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
@@ -91,10 +160,11 @@ PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`"
cd "$PKG_SRC"
# Patch source
-patches="
+patches=" [[PATCH URLS]]
$PKG_NAME.diff $PKG_NAME-$PKG_VERSION.diff
$PKG_NAME-$PKG_VERSION-$ARCH.diff $PKG_NAME-$ARCH.diff"
for patch in $patches; do
+ patch="`basename $patch`"
if [ -f "$CWD/$patch" ]; then
patch -Np1 < "$CWD/$patch" || exit $ERROR_PATCH
elif [ -f "$CWD/patches/$patch" ]; then
@@ -103,15 +173,7 @@ for patch in $patches; do
gzip -dc "$CWD/$patch.gz" | patch -Np1 || exit $ERROR_PATCH
elif [ -f "$CWD/patches/$patch.gz" ]; then
gzip -dc "$CWD/patches/$patch.gz" | patch -Np1 || exit $ERROR_PATCH
- fi
-done
-
-if echo [[PATCH URLS]] | grep -q -v "PATCH URLS"; then
- for patch_url in [[PATCH URLS]]; do
- patch="`basename $patch_url`"
- if [ ! -s "$SRC_DIR/$patch" ]; then
- wget "$patch_url" -O "$SRC_DIR/$patch" || exit $ERROR_WGET
- fi
+ elif [ -f "$SRC_DIR/$patch" ]; then
if [ "`basename $patch .gz`" != "$patch" ]; then
gzip -dc $SRC_DIR/$patch | patch -Np1 || exit $ERROR_PATCH
elif [ "`basename $patch .bz2`" != "$patch" ]; then
@@ -119,8 +181,8 @@ if echo [[PATCH URLS]] | grep -q -v "PATCH URLS"; then
else
patch -Np1 < "$SRC_DIR/$patch" || exit $ERROR_PATCH
fi
- done
-fi
+ fi
+done
# Configure
CFLAGS="$SLKCFLAGS" \
@@ -183,7 +245,8 @@ fi
# Build the package
cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
# Delete source and build directories if requested
if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
diff --git a/media/sound/qjackctl/slack-required b/media/sound/qjackctl/slack-required
index 405e3b6d..ce3f9107 100644
--- a/media/sound/qjackctl/slack-required
+++ b/media/sound/qjackctl/slack-required
@@ -2,3 +2,4 @@
#
# dependency [condition] [version]]
jack
+qt4