From bd606234eaf9faae65b67d078c760727e4d45c79 Mon Sep 17 00:00:00 2001
From: rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>
Date: Mon, 21 Apr 2008 16:26:03 +0000
Subject: see CHANGELOG for details

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@494 04377dda-e619-0410-9926-eae83683ac58
---
 trunk/doc/CHANGELOG                |  7 +++++++
 trunk/mkbuild/generic.mkSlackBuild | 20 ++++++++++++++++++--
 trunk/mkbuild/model.mkbuild        |  1 +
 trunk/simplepkg.SlackBuild         |  2 +-
 4 files changed, 27 insertions(+), 3 deletions(-)

(limited to 'trunk')

diff --git a/trunk/doc/CHANGELOG b/trunk/doc/CHANGELOG
index 13d2581..41917dd 100644
--- a/trunk/doc/CHANGELOG
+++ b/trunk/doc/CHANGELOG
@@ -1,6 +1,13 @@
 simplepkg changelog
 ===================
 
+0.6pre22
+========
+
+    - generic.mkSlackBuild:
+      - enhanced patch_source section with [[PATCH URLS]] support
+      - minor changes
+
 0.6pre21
 ========
 
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"
 
diff --git a/trunk/simplepkg.SlackBuild b/trunk/simplepkg.SlackBuild
index 61827c9..f389075 100755
--- a/trunk/simplepkg.SlackBuild
+++ b/trunk/simplepkg.SlackBuild
@@ -18,7 +18,7 @@
 PACKAGE="simplepkg"
 PACK_DIR="package-$PACKAGE"
 BUILD=${BUILD:=1rha}
-VERSION="0.6pre21"
+VERSION="0.6pre22"
 ARCH="noarch"
 LIBEXEC="/usr/libexec/$PACKAGE"
 BINDIR="/usr/bin"
-- 
cgit v1.2.3