diff options
| author | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2008-04-21 16:26:03 +0000 |
|---|---|---|
| committer | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2008-04-21 16:26:03 +0000 |
| commit | bd606234eaf9faae65b67d078c760727e4d45c79 (patch) | |
| tree | bd56a3c95ce491a0b220244133ac7c1f951f6e75 /trunk/mkbuild | |
| parent | 290951d1b9479fd44dafc3bad0440a7b8fa7f19d (diff) | |
| download | simplepkg-bd606234eaf9faae65b67d078c760727e4d45c79.tar.gz simplepkg-bd606234eaf9faae65b67d078c760727e4d45c79.tar.bz2 | |
see CHANGELOG for details
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@494 04377dda-e619-0410-9926-eae83683ac58
Diffstat (limited to 'trunk/mkbuild')
| -rw-r--r-- | trunk/mkbuild/generic.mkSlackBuild | 20 | ||||
| -rw-r--r-- | trunk/mkbuild/model.mkbuild | 1 |
2 files changed, 19 insertions, 2 deletions
diff --git a/trunk/mkbuild/generic.mkSlackBuild b/trunk/mkbuild/generic.mkSlackBuild index 20b1622..6675bd6 100644 --- a/trunk/mkbuild/generic.mkSlackBuild +++ b/trunk/mkbuild/generic.mkSlackBuild @@ -150,9 +150,9 @@ if echo [[SIGNING URL]] | grep -q -v "SIGNING URL"; then wget "[[SIGNING URL]]" -O "$SRC_DIR/$SIGNATURE" || exit $ERROR_WGET fi else - if [ -f "$SRC_DIR/$SRC.sig" ]; then + if [ -s "$SRC_DIR/$SRC.sig" ]; then SIGNATURE="$SRC.sig" - elif [ -f "$SRC_DIR/$SRC.asc" ]; then + elif [ -s "$SRC_DIR/$SRC.asc" ]; then SIGNATURE="$SRC.asc" else echo Trying to get signature file from $URL.sig... @@ -197,6 +197,22 @@ for patch in $patches; do patch -Np[[NUMBER OF PREFIX SLASHES TO STRIP]] < "$CWD/patches/$patch" || 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 + if [ "`basename $patch .gz`" != "$patch" ]; then + gzip -dc $SRC_DIR/$patch | patch -Np[[NUMBER OF PREFIX SLASHES TO STRIP]] || exit $ERROR_PATCH + elif [ "`basename $patch .bz2`" != "$patch" ]; then + bzip2 -dc $SRC_DIR/$patch | patch -Np[[NUMBER OF PREFIX SLASHES TO STRIP]] || exit $ERROR_PATCH + else + patch -Np[[NUMBER OF PREFIX SLASHES TO STRIP]] < "$SRC_DIR/$patch" || exit $ERROR_PATCH + fi + done +fi </patch_source> <configure> off diff --git a/trunk/mkbuild/model.mkbuild b/trunk/mkbuild/model.mkbuild index 73d8c7d..504c38d 100644 --- a/trunk/mkbuild/model.mkbuild +++ b/trunk/mkbuild/model.mkbuild @@ -100,6 +100,7 @@ #[[SIGNING KEY]]="" #[[SIGNING KEY URL]]="" #[[CONFIG FILES]]="" +#[[PATCH URLS]]="" [[PATCH FILES]]="" [[NUMBER OF PREFIX SLASHES TO STRIP]]="1" |