Trying to update to 3.2.0

1 files changed, 245 insertions, 209 deletions

diff --git a/freenx/build/nx.SlackBuild b/freenx/build/nx.SlackBuild
index 850d462c..9e25bc99 100755
--- a/freenx/build/nx.SlackBuild
+++ b/freenx/build/nx.SlackBuild
@@ -1,14 +1,35 @@
 #!/bin/sh
 # $Id$
+# Copyright (c) 2008 Eric Hameleers <alien@slackware.com>
+# All rights reserved.
+#
+#   Permission to use, copy, modify, and distribute this software for
+#   any purpose with or without fee is hereby granted, provided that
+#   the above copyright notice and this permission notice appear in all
+#   copies.
+#
+#   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+#   WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+#   IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
+#   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+#   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+#   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+#   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+#   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+#   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+#   SUCH DAMAGE.
 # -----------------------------------------------------------------------------
 #
 # Slackware SlackBuild script 
 # ===========================
-# By:        Eric Hameleers <alien@slackware.com>
-# For:       nx
-# URL:       http://www.nomachine.com/
-# Needs:     
-# Changelog:
+# By:         Eric Hameleers <alien@slackware.com>
+# For:        nx
+# Descr:      a proxy system for X Window
+# URL:        http://www.nomachine.com/
+# Needs:      
+# Changelog:  
 # 1.5.0-1:   14/Aug/2005 by Eric Hameleers <alien@sox.homeip.net>
 #            * Initial build.
 # 1.5.0-2:   18/Aug/2005 by Eric Hameleers <alien@sox.homeip.net>
@@ -22,63 +43,131 @@
 #            * Updated nxdesktop. Also, freenx is patched so that it runs
 #              "nxesddsp" automatically for KDE sessions, so sound should work
 #              with the default client configuration for KDE.
+# 1.5.0-4:   03/Sep/2005 by Eric Hameleers <alien@slackware.com>
+#              This time, nxesddsp should really work :-/ Forgot to use the
+#              patches, *and* forgot to copy the patched libs.
+# 3.2.0-1:    16/Nov/2008 by Eric Hameleers <alien@slackware.com>
+#             * Update.
 # 
-# Run 'sh SlackBuild --cleanup' to build a Slackware package.
+# Run 'sh nx.SlackBuild --cleanup' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
 # Install using 'installpkg'. 
 #
 # -----------------------------------------------------------------------------
 
-# --- INIT ---
 # Set initial variables:
-CWD=`pwd`
-if [ "$TMP" = "" ]; then
-  TMP=/tmp
-fi
 
 PRGNAM=nx
-VERSION=1.5.0
+VERSION=${VERSION:-3.2.0}
 ARCH=${ARCH:-i486}
-BUILD=3
-
-if [ "$ARCH" = "i386" ]; then
-  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
-elif [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-elif [ "$ARCH" = "s390x" ]; then
-  SLKCFLAGS="-O2"
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-fi
+BUILD=${BUILD:-1}
+TAG=${TAG:-alien}
 
-PKG=$TMP/package-$PRGNAM
-
-if [ ! -d $TMP/tmp-$PRGNAM ]; then
-  mkdir -p $TMP/tmp-$PRGNAM # location to build the source
-fi
-if [ ! -d $PKG ]; then
-  mkdir -p $PKG # place for the package to be built
-fi
+DOCS="ABOUT* AUTHORS BUGS ChangeLog* COPYING CREDITS FAQ GPL* HACKING \
+      LICENSE MAINTAINERS NEWS README* TODO"
 
-SOURCE[0]=nxproxy-1.5.0-9.tar.gz
-SOURCE[1]=nxcomp-1.5.0-65.tar.gz
-SOURCE[2]=nxcompext-1.5.0-16.tar.gz
-SOURCE[3]=nx-X11-1.5.0-15.tar.gz
-SOURCE[4]=nxagent-1.5.0-90.tar.gz
-SOURCE[5]=nxviewer-1.5.0-14.tar.gz
-SOURCE[6]=nxdesktop-1.5.0-61.tar.gz
-SOURCE[7]=nxscripts-1.5.0-11.tar.gz
-SOURCE[8]=esound-0.2.35.tar.bz2
-SOURCE[9]=nxagent
-SOURCE[10]=docs.tar.bz2
-
-PATCH[0]=NX.diff
-PATCH[1]=ESPEAKER-fix.diff
-PATCH[2]=fix-artsd.diff
+# Where do we look for sources?
+SRCDIR=$(cd $(dirname $0); pwd)
 
+# Place to build (TMP) package (PKG) and output (OUTPUT) the program:
+TMP=${TMP:-/tmp/build}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+SOURCE[0]="$SRCDIR/nxproxy-${VERSION}-1.tar.gz"
+SRCURL[0]="http://64.34.161.181/download/${VERSION}/sources/nxproxy-${VERSION}-1.tar.gz"
+
+SOURCE[1]="$SRCDIR/nxcomp-${VERSION}-7.tar.gz"
+SRCURL[1]="http://64.34.161.181/download/${VERSION}/sources/nxcomp-${VERSION}-7.tar.gz"
+
+SOURCE[2]="$SRCDIR/nxcompext-${VERSION}-1.tar.gz"
+SRCURL[2]="http://64.34.161.181/download/${VERSION}/sources/nxcompext-${VERSION}-1.tar.gz"
+
+SOURCE[3]="$SRCDIR/nxssh-${VERSION}-1.tar.gz"
+SRCURL[3]="http://64.34.161.181/download/${VERSION}/sources/nxssh-${VERSION}-1.tar.gz"
+
+SOURCE[4]="$SRCDIR/nx-X11-${VERSION}-2.tar.gz"
+SRCURL[4]="http://64.34.161.181/download/${VERSION}/sources/nx-X11-${VERSION}-2.tar.gz"
+
+SOURCE[5]="$SRCDIR/nxwin-${VERSION}-4.tar.gz"
+SRCURL[5]="http://64.34.161.181/download/${VERSION}/sources/nxwin-${VERSION}-4.tar.gz"
+
+SOURCE[6]="$SRCDIR/nxauth-${VERSION}-1.tar.gz"
+SRCURL[6]="http://64.34.161.181/download/${VERSION}/sources/nxauth-${VERSION}-1.tar.gz"
+
+SOURCE[7]="$SRCDIR/nxagent-${VERSION}-10.tar.gz"
+SRCURL[7]="http://64.34.161.181/download/${VERSION}/sources/nxagent-${VERSION}-10.tar.gz"
+
+SOURCE[8]="$SRCDIR/nxesd-${VERSION}-1.tar.gz"
+SRCURL[8]="http://64.34.161.181/download/${VERSION}/sources/nxesd-${VERSION}-1.tar.gz"
+
+SOURCE[9]="$SRCDIR/nxcompshad-${VERSION}-3.tar.gz"
+SRCURL[9]="http://64.34.161.181/download/${VERSION}/sources/nxcompshad-${VERSION}-3.tar.gz"
+
+SOURCE[10]="$SRCDIR/nxscripts-${VERSION}-1.tar.gz"
+SRCURL[10]="http://64.34.161.181/download/${VERSION}/sources/nxscripts-${VERSION}-1.tar.gz"
+
+##
+## --- with a little luck, you won't have to edit below this point --- ##
+##
+
+# Exit the script on errors:
+set -e
+trap 'echo "$0 FAILED at line ${LINENO}" | tee $OUTPUT/error-${PRGNAM}.log' ERR
+# Catch unitialized variables:
+set -u
+P1=${1:-1}
+
+case "$ARCH" in
+  i486)      SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ;;
+  s390)      SLKCFLAGS="-O2"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ;;
+  powerpc)   SLKCFLAGS="-O2"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ;;
+  x86_64)    SLKCFLAGS="-O2 -fPIC"
+             SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64"
+             ;;
+  athlon-xp) SLKCFLAGS="-march=athlon-xp -O3 -pipe -fomit-frame-pointer"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ;;
+esac
+
+# Create working directories:
+mkdir -p $OUTPUT          # place for the package to be saved
+mkdir -p $TMP/tmp-$PRGNAM # location to build the source
+mkdir -p $PKG             # place for the package to be built
+rm -rf $PKG/*             # always erase old package's contents
+rm -rf $TMP/tmp-$PRGNAM/* # remove the remnants of previous build
+
+# Source file availability:
+for (( i = 0; i < ${#SOURCE[*]}; i++ )) ; do
+  if ! [ -f ${SOURCE[$i]} ]; then
+    if ! [ "x${SRCURL[$i]}" == "x" ]; then
+      # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT
+      [ -w "$SRCDIR" ] || SOURCE[$i]="$OUTPUT/$(basename ${SOURCE[$i]})"
+      echo "Source '$(basename ${SOURCE[$i]})' not available yet..."
+      echo "Will download file to $(dirname $SOURCE[$i])"
+      wget -nv -T 20 -O "${SOURCE[$i]}" "${SRCURL[$i]}" || true
+      if [ $? -ne 0 -o ! -s "${SOURCE[$i]}" ]; then
+        echo "Downloading '$(basename ${SOURCE[$i]})' failed.. aborting the build."
+        mv -f "${SOURCE[$i]}" "${SOURCE[$i]}".FAIL
+        exit 1
+      fi
+    else
+      echo "File '$(basename ${SOURCE[$i]})' not available.. aborting the build."
+      exit 1
+    fi
+  fi
+done
 
+if [ "$P1" == "--download" ]; then
+  echo "Download complete."
+  exit 0
+fi
 
 # --- PACKAGE BUILDING ---
 
@@ -86,199 +175,146 @@ echo "++"
 echo "|| $PRGNAM-$VERSION"
 echo "++"
 
-rm -rf $PKG/*
-
-cd $PKG
-
-# Explode the package framework:
-if [ -f $CWD/_$PRGNAM.tar.gz ]; then
-  explodepkg $CWD/_$PRGNAM.tar.gz
-fi
-
 cd $TMP/tmp-$PRGNAM
-
-
-# --- TARBALL EXTRACTION,PATCH,MODIFY ---
-
-echo "Extracting the program tarballs for $PRGNAM..."
-for (( i = 0; i < 9; i++ )) ; do
-  if ! [ -f ${CWD}/${SOURCE[$i]} ]; then
-    echo "Missing source file ${SOURCE[$i]} !"; exit 1
-  fi
-  if file ${CWD}/${SOURCE[$i]} | grep -q ": gzip "; then
-    tar -zxvf ${CWD}/${SOURCE[$i]}
-  else
-    tar -jxvf ${CWD}/${SOURCE[$i]}
-  fi
+echo "Extracting the source archive(s) for $PRGNAM..."
+for (( i = 0; i < ${#SOURCE[*]}; i++ )) ; do
+  tar -xvf ${SOURCE[$i]}
 done
-
-patch -p0 < $CWD/${PATCH[0]}
-
-
-chown -R root.root *
-find . -perm 777 -exec chmod 755 {} \;
-
-
-# --- BUILDING ---
+chown -R root:root *
+chmod -R u+w,go+r-w,a-s *
 
 echo Building ...
-
-ln -s rdesktop.1 nxdesktop/doc/nxdesktop.1
-
-cat <<-EOF >> nx-X11/config/cf/host.def
-	#ifdef  i386Architecture
-	#undef  DefaultGcc2i386Opt
-	#define DefaultGcc2i386Opt   $SLKCFLAGS -fno-strict-aliasing
-	#endif
-	#ifdef  MipsArchitecture
-	#undef  DefaultGcc2MipsOpt
-	#define DefaultGcc2MipsOpt   $SLKCFLAGS -fno-strict-aliasing
-	#endif
-	#ifdef s390xArchitecture
-	#undef OptimizedCDebugFlags
-	#define OptimizedCDebugFlags $SLKCFLAGS -fno-strict-aliasing
-	#endif
-	EOF
-
-
-export CFLAGS="$SLKCFLAGS"
+export LDFLAGS="$SLKLDFLAGS"
 export CXXFLAGS="$SLKCFLAGS"
-sed -i -e "s|CXXFLAGS=.-O.*|CXXFLAGS=$CXXFLAGS|" */configure
+export CFLAGS="$SLKCFLAGS"
+cat >> nx-X11/config/cf/host.def << EOF
+#ifdef  i386Architecture
+#undef  DefaultGcc2i386Opt
+#define DefaultGcc2i386Opt $SLKCFLAGS -fno-strict-aliasing
+#endif
+#ifdef  MipsArchitecture
+#undef  DefaultGcc2MipsOpt
+#define DefaultGcc2MipsOpt $SLKCFLAGS -fno-strict-aliasing
+#endif
+#ifdef s390xArchitecture
+#undef OptimizedCDebugFlags
+#define OptimizedCDebugFlags $SLKCFLAGS -fno-strict-aliasing
+#endif
+#ifdef  AMD64Architecture
+#undef  DefaultGcc2AMD64Opt
+#define DefaultGcc2AMD64Opt $SLKCFLAGS -fno-strict-aliasing
+#endif
+EOF
 
-CONFIGURE="./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc"
+sed -i -e "s|CXXFLAGS=.-O.*|CXXFLAGS=$CXXFLAGS|" */configure
 
-# build Compression Library and Proxy
-for i in nxcomp nxproxy; do
-  (cd $i; $CONFIGURE; make)
+# Build Compression Library and Proxy
+for i in nxcomp nxproxy nxcompshad; do
+  cd $i
+  ./configure --prefix=/usr \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --sysconfdir=/etc
+  make
+  cd -
 done
-# build X11 Support Libraries and Agents
-(cd nx-X11; make World)
-# build Extended Compression Library
-(cd nxcompext; $CONFIGURE; make)
-# build RFB Agent
-(cd nxviewer; xmkmf -a
-  cp -a /usr/X11R6/lib/libXp.so* ../nx-X11/exports/lib/
-  make 2> /dev/null
-)
-# build RDP Agent
-if [ "$ARCH" = "i386" -o "$ARCH" = "i486" -o "$ARCH" = "x86_64" ]; then
-  (cd nxdesktop
-    ./configure --prefix=/usr --sharedir=/usr/share/NX
-    make
-  )
-fi
-# Build nxesddsp
-(cd esound-0.2.35; $CONFIGURE --enable-arts; make)
+# Build X11 Support Libraries and Agents
+cd nx-X11
+make World
+cd -
+# Build Extended Compression Library
+cd nxcompext
+./configure --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --localstatedir=/var \
+  --sysconfdir=/etc
+make
+cd -
+# Build nxssh
+cd nxssh
+./configure --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --localstatedir=/var \
+  --sysconfdir=/etc \
+  --without-zlib-version-check
+make
+cd -
+# Build nxesd
+cd nxesd
+./configure --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --localstatedir=/var \
+  --sysconfdir=/etc
+make
+cd -
 
-#
 # Install all the needed stuff to the package dir
-#
 mkdir -p $PKG/usr/bin
-mkdir -p $PKG/usr/lib/NX/lib
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/NX/lib
 mkdir -p $PKG/usr/man/man1
 
-# install X11 Support Libraries and Agents
 cp -a nx-X11/lib/X11/libX11.so.* \
-  nx-X11/lib/Xext/libXext.so.* \
-  nx-X11/lib/Xrender/libXrender.so.* \
-  $PKG/usr/lib/NX/lib/
-cp -a nx-X11/programs/Xserver/nxagent $PKG/usr/lib/NX/
-chmod 755 $PKG/usr/lib/NX/nxagent 
-cp -a $CWD/${SOURCE[9]} $PKG/usr/bin/
-
-# install Compression Libraries and Proxy
-cp -a nxcomp/libXcomp.so.* $PKG/usr/lib/NX/lib/
-cp -a nxcompext/libXcompext.so.* $PKG/usr/lib/NX/lib/
-cp -a nxproxy/nxproxy $PKG/usr/lib/NX/
-chmod 755 $PKG/usr/lib/NX/nxproxy 
-ln -snf nxagent $PKG/usr/bin/nxproxy
+      nx-X11/lib/Xext/libXext.so.* \
+      nx-X11/lib/Xrender/libXrender.so.* \
+      $PKG/usr/lib${LIBDIRSUFFIX}/NX/lib
+install -m 755 nx-X11/programs/Xserver/nxagent \
+  $PKG/usr/lib${LIBDIRSUFFIX}/NX
+cat <<EOT > $PKG/usr/bin/nxagent
+#!/bin/sh
 
-# install RFB Agent
-( cd nxviewer
-  make install DESTDIR=$PKG
-  mv $PKG/usr/X11R6/bin/nxviewer $PKG/usr/lib/NX/
-  ln -snf nxagent $PKG/usr/bin/nxviewer
-  chmod 755 $PKG/usr/bin/nxviewer
-  mv $PKG/usr/X11R6/bin/nxpasswd $PKG/usr/bin/
-)
-
-rmdir $PKG/usr/X11R6/bin
-rmdir $PKG/usr/X11R6
-
-# install RDP Agent
-if [ "$ARCH" = "i386" -o "$ARCH" = "i486" -o "$ARCH" = "x86_64" ]; then
-  (cd nxdesktop
-    make install DESTDIR=$PKG
-    mv $PKG/usr/bin/nxdesktop $PKG/usr/lib/NX/
-    ln -snf nxagent $PKG/usr/bin/nxdesktop
-    chmod 755 $PKG/usr/bin/nxdesktop
-  )
-fi
+NXCOMMAND=\$(basename \$0)
 
-# Install nxesd sound wrapper
-(cd esound-0.2.35
-  cp -a esd $PKG/usr/lib/NX/nxesd
-  cp -a esddsp $PKG/usr/lib/NX/nxesddsp
-  ln -snf nxagent $PKG/usr/bin/nxesddsp
-  chmod 755 $PKG/usr/bin/nxesddsp
-)
+export LD_LIBRARY_PATH=/usr/lib${LIBDIRSUFFIX}/NX/lib:\$LD_LIBRARY_PATH
+exec /usr/lib${LIBDIRSUFFIX}/NX/\$NXCOMMAND \${1+"\$@"}
 
-# --- DOCUMENTATION ---
+EOT
+chmod 755 $PKG/usr/bin/nxagent
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a nxcomp/libXcomp.so.* $PKG/usr/lib${LIBDIRSUFFIX}/NX/lib
+cp -a nxcompext/libXcompext.so.* $PKG/usr/lib${LIBDIRSUFFIX}/NX/lib
+cp -a nxcompshad/libXcompshad.so.* $PKG/usr/lib${LIBDIRSUFFIX}/NX/lib
+install -m 755 nxproxy/nxproxy $PKG/usr/lib${LIBDIRSUFFIX}/NX
+ln -snf nxagent $PKG/usr/bin/nxproxy
+
+cp -a nxssh/nxssh $PKG/usr/lib${LIBDIRSUFFIX}/NX
+ln -snf nxagent $PKG/usr/bin/nxssh
+chmod 755 $PKG/usr/bin/nxssh
 
-# install scripts
-cp -a nxscripts $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a nxesd/nxesd $PKG/usr/lib${LIBDIRSUFFIX}/NX
+ln -snf nxagent $PKG/usr/bin/nxesd
+chmod 755 $PKG/usr/bin/nxesd
 
-# documentation and license
-tar -jxvf $CWD/${SOURCE[10]} -C $PKG/usr/doc/$PRGNAM-$VERSION
+# Add documentation:
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -r nxscripts $PKG/usr/doc/$PRGNAM-$VERSION 
 cp nxcomp/LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
 cp nxcomp/README $PKG/usr/doc/$PRGNAM-$VERSION/README.nxcomp
 cp nxdesktop/README $PKG/usr/doc/$PRGNAM-$VERSION/README.nxdesktop
 cp -a nxdesktop/doc $PKG/usr/doc/$PRGNAM-$VERSION/nxdesktop
+cp -a $SRCDIR/$(basename $0) $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION
+find $PKG/usr/doc -type f -exec chmod 644 {} \;
 
-chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/*
-
-# Compress the man page(s)
-gzip -9f $PKG/usr/man/*/* 
-
-# Strip binaries
-( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
-
-
-# --- OWNERSHIP, RIGHTS ---
-
-chmod -R o-w $PKG
-chown root:bin $PKG/usr/bin/* $PKG/usr/sbin/* $PKG/bin/* $PKG/sbin/* \
-               $PKG/usr/X11R6/bin/* $PKG/opt/kde/bin/* 2>/dev/null
-
-
-# --- PACKAGE DESCRIPTION ---
+# Strip binaries:
+cd $PKG
+find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+cd -
 
+# Add a package description:
 mkdir -p $PKG/install
-cat $CWD/${PRGNAM}.slack-desc > $PKG/install/slack-desc
-if [ -f $CWD/doinst.sh ]; then
-  cat $CWD/doinst.sh > $PKG/install/doinst.sh
-fi
-
-
-# --- BUILDING ---
+cat $SRCDIR/slack-desc.${PRGNAM} > $PKG/install/slack-desc
 
 # Build the package:
 cd $PKG
-makepkg --linkadd y --chown n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz \
-  2>&1 | tee $CWD/makepkg-${PRGNAM}.log
-(cd $TMP && md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz.md5)
-cat $CWD/${PRGNAM}.slack-desc | grep "^${PRGNAM}" > $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txt
-
-
-# --- CLEANUP ---
+makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
+cd $OUTPUT
+md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz.md5
+cd -
+cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt
 
 # Clean up the extra stuff:
-if [ "$1" = "--cleanup" ]; then
+if [ "$P1" = "--cleanup" ]; then
   rm -rf $TMP/tmp-$PRGNAM
   rm -rf $PKG
 fi