ekiga: updating ekiga (to 3.0.0) and its dependencies

git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@2124 370017ae-e619-0410-ac65-c121f96126d4

4 files changed, 261 insertions, 25 deletions

diff --git a/app/text/gnome-doc-utils/Manifest b/app/text/gnome-doc-utils/Manifest
new file mode 100644
index 00000000..a4f8f046
--- /dev/null
+++ b/app/text/gnome-doc-utils/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST gnome-doc-utils-0.12.0.tar.bz2 592073 MD5 5934c08d12407d8233416343cd73df24 RMD160 3ac9b6f04163ba2581b048282f64558f608ca44d SHA1 e20c74ad415b9ddfdf6c8d663e22bf27c0b939c4 SHA256 6bb8ec068558e380aff1e3f0aa130b52161ad68f8d495fce45c55783bbba9076 SHA512 0d687cfbae27a2bfa2eeb5e1af39e4dc0b7791ef46266f7b084e58be7b576308fcc59a97b41168946fd786bb2a68eb965692befb127dbaa0d53b9a0a6a58b8b3
+MKBUILD gnome-doc-utils.mkbuild 4170 MD5 1647da44912ee172c1f30dcb58dc9d25 RMD160 f5047a978bdcf2e5c1de75283367d3c77e77d99d SHA1 589c6c8c800e346ae3a5049c1b3b7ff1b8324474 SHA256 be828fbef3e1e7e1c9dd4af10b93e925b0a8f7ed195ad03774d6197a70219784 SHA512 3a74f3917ff082b70b3d66050fcde191e66d9fa564261e440d2649378e17bc9af1846533e3508cdd6634384ca4df59404ac3de44735d4570a1ae2d3bb1234635
+SLACKBUILD gnome-doc-utils.SlackBuild 7329 MD5 9fa533181d4cd6822ccf3fec4059ea67 RMD160 5c6c73ff308f5db7ad591531c38479675ccf4491 SHA1 d8b9d040ff90c7726a6305de483dbb2a45cf1725 SHA256 be1aad5b387ff10db1b80341e412206135e8d243f402c0e0521d60c47846da89 SHA512 7a608925e695b6c0f6c037d46c9bfe3df281f703c835407a977c255985169f3121efeb96898898e373228e73b71ac156add291e1bfe65006b0aaf3e11613ec4a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJyYPxAAoJEEHL93ESzgei5RYP/jNrmjVGiTKOluHMH3BYzs4R
+HhSJ+NyJp3ZEUBSf2V+CrAEs2DypS8Qbwz3R0BPCY0yMwju4WOqr+NTRBoc1Dw+E
+aEr3idGN19VEoQ49/kWOgs9IIV6e8YoSQX8HTlh5pmzsZEf2eDaoVXZyFocHZr79
+eojhLmwVtVZPjNx6+u26hdCcwqR/1ZzyXuPu+qT+9fBWAQLADbrMEg1nSESkBYjO
+fYp0kykRVm42Msq5/SXlRpHkUA01ndDGOn5AUmvp4J8DRaSPjgIZEDc36r6tuVku
+a62R1w/sIRIgEHKcn0n/5ey2GTCuWBb3ogffoRPAgn6V30e08R2mxNfG+pNPfzzb
+8geQ4Qs3BIezIhT0QHamU/saxyFQJ84VOCBDkimx1TGIgJk1MxOmVA9tfGwS1/bD
+Z873h47YSJS9NFBVICsGQANpJlqaNs5u+DtD/yqnbrHi/DpVELA0HW5zcAmFvqWu
+lxTqLzV9dcMmvwCczRV+0hTeftee1inBpD6H/Vsuy/z9OqDRCf8Iy2D1duFejcRe
+GgacCB4t3UjNwamTPeYKBXDKvDUqV9sbsaE4PFFqCohpuPdK93GdFGckMC1GPmPJ
+qM8llatarDskaOi0dvIiH418RmYECGyFqxV0jiiZY8dzcNOoN99r1fMxt9oLq3OF
+agCcOYkA1mAENN7XLRDe
+=7Cyv
+-----END PGP SIGNATURE-----
diff --git a/app/text/gnome-doc-utils/gnome-doc-utils.SlackBuild b/app/text/gnome-doc-utils/gnome-doc-utils.SlackBuild
index 24b1826a..d376e541 100644
--- a/app/text/gnome-doc-utils/gnome-doc-utils.SlackBuild
+++ b/app/text/gnome-doc-utils/gnome-doc-utils.SlackBuild
@@ -10,13 +10,14 @@
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
 #  Public License for more details.
 #
-#  You should have received a copy of the GNU General Public License along with
-#  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-#  Place - Suite 330, Boston, MA 02111-1307, USA
+#  You should have received a copy of the GNU General Public License along
+#  with this program; if not, write to the Free Software Foundation, Inc.,
+#  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for gnome-doc-utils, by Rudson R. Alves
 # requires:  
-# tested: gnome-doc-utils-0.12.0, 0.12.2
+# tested: gnome-doc-utils-0.12.0
+# model: generic.mkSlackBuild $Rev: 796 $
 #
 
 # Look for slackbuildrc
@@ -31,13 +32,14 @@ CWD="$(pwd)"
 SRC_NAME="gnome-doc-utils"
 PKG_NAME="gnome-doc-utils"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=0.12.2}
+SRC_VERSION=${VERSION:=0.12.0}
 PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
 BUILD=${BUILD:=1rra}
 SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="app/text/gnome-doc-utils"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:=""}
@@ -47,16 +49,17 @@ NUMJOBS=${NUMJOBS:="-j7"}
 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
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="-O2 -fPIC"
   LIBDIR="$PREFIX/lib64"
+  LDFLAGS="-L/lib64 -L/usr/lib64"
 fi
 
 # Set error codes (used by createpkg)
@@ -64,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
@@ -83,10 +87,76 @@ if [ ! -s "$SRC_DIR/$SRC" ] || ! bunzip2 -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
-PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $8 }'`"
+PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`"
 cd "$PKG_SRC"
 
 # Configure
@@ -122,9 +192,9 @@ done
 mkdir -p "$PKG/install" || exit $ERROR_MKDIR
 cat << EODESC > "$PKG/install/slack-desc"
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# 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
+# 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 ':'.
 
@@ -144,9 +214,10 @@ EODESC
 
 # 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" ]; then
+if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
   rm -rf "$PKG_WORK" "$PKG"
 fi
diff --git a/app/text/scrollkeeper/Manifest b/app/text/scrollkeeper/Manifest
new file mode 100644
index 00000000..c655773e
--- /dev/null
+++ b/app/text/scrollkeeper/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST scrollkeeper-0.3.14.tar.bz2 546059 MD5 b175e582a6cec3e50a9de73a5bb7455a RMD160 6c39aa9c045f0685497fc7e46e484ad87fc66737 SHA1 395e50fa1e2570e97cca62374a6392e9494d5ddb SHA256 ece1987169d136aa148dc02f1e4784cbe5d1a21cf6725039547f1417e4ebc122 SHA512 0d88b344856aefa20f8fac845fd14f7cca719324d67a35f35ea47283b952a8430fa8c88501e2118b586fa0331134dc7746043ca84763509f51f8bb0897f68bab
+MKBUILD scrollkeeper.mkbuild 4726 MD5 c97296ebeb430aa31076324b101696cb RMD160 3216dfe23897ad8b1bddb7edac148b21f78379ff SHA1 d2179df734432b2b819d1d443888bd0c61702a1e SHA256 17f2769c529d3bd92a8b617aff55ec8f384ae07bb7e832eeff7c74c8339e1daf SHA512 36b1447772c7c3a8262c9e2dcfad314a78f759ba6af945f24a9319b5bd03bb68d5490c821686b1014cb014c96562daf220778b92ad58244c8a5491fd7e27d432
+SLACKBUILD scrollkeeper.SlackBuild 8604 MD5 070dd0eab0f62feadd8619619fd8bc65 RMD160 7914aa8e31ca86060a2181df0009272a110f2b14 SHA1 88002bcc5a5b838238937f7520d87d39b50263f5 SHA256 fa68ae09e227626d29feae7aeffc6a5e966f7ead07d7236b750f74089fe01757 SHA512 dc5b94f3f64f1faaf8b532dc9b6dc262962b072bb4b24752e89ae588fbcef22a30502f92a15929216d44e60d8af18fc2023f1bba1f9a694e2d610b190ca46505
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJyYOpAAoJEEHL93ESzgeiDjgQAIyBiGMvp2kxWAkqJrYIlPVV
+70cDncqWkxho3bsQwmP/71s4dvkFhAB2yhjeShAU38k3zihBnOko3+GWglIfSZlc
+2++7ePH9x9Gh6g6KU3Fd0H7OSNqhjpNglniEkHDL+plRCq+NxQROT+6LensQYr/W
+zzSn3rcTzDgrJ0RGrlafbHFUXXJJZySY6LH/BaKKQ2w7Hv8JO9AQfWMih0yU+bKF
+LNLuXtNv8i3qGWuzYkwH2uPS8wgHgvdXk9MjxEDccqLxBILchzhjmbPwOwyVrjKL
+XGbjKT7y/+rG9O8GIBVVxk2tVxj4Pfpy7zO9n9wvG3hfHZxgxrAgcRRawJYTudLS
+khhRlRhzHKq6Mmw6sywko62k4oEDLV9AcMQ2mG79VOvdukxexjKks7pYQvMMFJ1t
+N2nL+I1JIgEcIDGtFJc+BVhd5nf7EGEPmP5GZsVDcVPWzJ70J/k0vH+JHMoBVSQm
+8NL2PgOpJhYua69J0ga3s3fmrcvAx7nQZobjpGnsdRN+jtFhxuB1+e0JfwOa3pKu
+PYfdKmdHd3SfmCbqAghz9y/Yz7XT5AihGQCGc2R+ERyhRyV0n/aAk1UEb9el0uBY
+jiMKsYfPTbih5fz6stMzkAFJWN/pllmBWIRvHvecWJQlLcjnqq6DL+PZrH+/28jO
+pFAlSChq3i2Ld51a10dj
+=7ixj
+-----END PGP SIGNATURE-----
diff --git a/app/text/scrollkeeper/scrollkeeper.SlackBuild b/app/text/scrollkeeper/scrollkeeper.SlackBuild
index 6b19aead..3eca6818 100644
--- a/app/text/scrollkeeper/scrollkeeper.SlackBuild
+++ b/app/text/scrollkeeper/scrollkeeper.SlackBuild
@@ -10,13 +10,14 @@
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
 #  Public License for more details.
 #
-#  You should have received a copy of the GNU General Public License along with
-#  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-#  Place - Suite 330, Boston, MA 02111-1307, USA
+#  You should have received a copy of the GNU General Public License along
+#  with this program; if not, write to the Free Software Foundation, Inc.,
+#  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for scrollkeeper, by Rudson R. Alves
 # requires:  
 # tested: scrollkeeper-0.3.14
+# model: generic.mkSlackBuild $Rev: 796 $
 #
 
 # Look for slackbuildrc
@@ -33,11 +34,12 @@ PKG_NAME="scrollkeeper"
 ARCH=${ARCH:=i486}
 SRC_VERSION=${VERSION:=0.3.14}
 PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
-BUILD=${BUILD:=1rra}
+BUILD=${BUILD:=2rra}
 SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="app/text/scrollkeeper"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:="--localstatedir=/var --sysconfdir=/etc --program-prefix= --program-suffix= --disable-static"}
@@ -47,16 +49,17 @@ NUMJOBS=${NUMJOBS:="-j4"}
 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
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="-O2 -fPIC"
   LIBDIR="$PREFIX/lib64"
+  LDFLAGS="-L/lib64 -L/usr/lib64"
 fi
 
 # Set error codes (used by createpkg)
@@ -64,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
@@ -83,10 +87,76 @@ if [ ! -s "$SRC_DIR/$SRC" ] || ! bunzip2 -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
-PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $8 }'`"
+PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`"
 cd "$PKG_SRC"
 
 # Configure
@@ -122,9 +192,9 @@ done
 mkdir -p "$PKG/install" || exit $ERROR_MKDIR
 cat << EODESC > "$PKG/install/slack-desc"
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# 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
+# 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 ':'.
 
@@ -142,11 +212,60 @@ scrollkeeper:
 scrollkeeper:
 EODESC
 
+# Move config files to .new to avoid overwriting any system config
+for config_file in etc/scrollkeeper.conf; do
+  mv $PKG/$config_file $PKG/$config_file.new
+done
+
+# Add a post-installation script (doinst.sh)
+mkdir -p "$PKG/install" || exit $ERROR_MKDIR
+cat << EOSCRIPT > "$PKG/install/doinst.sh"
+config() {
+  NEW="\$1"
+  OLD="\$(dirname \$NEW)/\$(basename \$NEW .new)"
+  OLD="\$(dirname \$NEW)/\$(basename \$OLD .sample)"
+  OLD="\$(dirname \$NEW)/\$(basename \$OLD .dist)"
+
+  # If there's no config file by that name, mv it over:
+  if [ ! -r \$OLD ]; then
+    mv \$NEW \$OLD
+  elif [ "\$(cat \$OLD | md5sum)" = "\$(cat \$NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm \$NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+mkgroup() {
+  GROUP="\$1"
+  if ! grep -qe "^\$GROUP:" etc/group; then
+    echo Creating group \$GROUP...
+    chroot . /usr/sbin/groupadd \$GROUP
+  fi
+}
+
+mkuser() {
+  USER="\$1"
+  if [ ! -z "\$2" ]; then
+    GROUP="\$2"
+  else
+    GROUP="\$USER"
+  fi
+  if ! grep -qe "^\$USER:" etc/passwd; then
+    echo Creating user \$USER...
+    chroot . /usr/sbin/useradd \$USER -g \$GROUP
+  fi
+}
+
+config etc/scrollkeeper.conf.new
+EOSCRIPT
+
 # 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" ]; then
+if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
   rm -rf "$PKG_WORK" "$PKG"
 fi