5 files changed, 24 insertions, 62 deletions
diff --git a/multimedia/pitivi/README b/multimedia/pitivi/README
index c5de647108..0f63a2475d 100644
--- a/multimedia/pitivi/README
+++ b/multimedia/pitivi/README
@@ -1 +1,3 @@
 PiTiVi is a free, intuitive, and feature-rich movie editor.
+
+This is a repackaging of the PiTiVi bundles.
diff --git a/multimedia/pitivi/doinst.sh b/multimedia/pitivi/doinst.sh
deleted file mode 100644
index 031ae07d05..0000000000
--- a/multimedia/pitivi/doinst.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
-
-if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
-  if [ -x /usr/bin/gtk-update-icon-cache ]; then
-    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
-  fi
-fi
-
-if [ -x /usr/bin/update-mime-database ]; then
-  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
-fi
diff --git a/multimedia/pitivi/pitivi.SlackBuild b/multimedia/pitivi/pitivi.SlackBuild
index 9820f6eb74..92bdb302bd 100644
--- a/multimedia/pitivi/pitivi.SlackBuild
+++ b/multimedia/pitivi/pitivi.SlackBuild
@@ -25,7 +25,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pitivi
-VERSION=${VERSION:-0.15.2}
+VERSION=${VERSION:-0.94_beta}
+SRCVERSION=${SRCVERSION:-0.94}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -45,60 +46,39 @@ OUTPUT=${OUTPUT:-/tmp}
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
+  SRCARCH=x86
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
+  SRCARCH=x86
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+  SRCARCH=x86_64
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
+  SRCARCH=x86
 fi
 
 set -eu
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+mkdir -p $TMP/$PRGNAM-$VERSION/
+mkdir -p $PKG/opt/$PRGNAM/
+mkdir -p $PKG/usr/bin/
+cd $TMP/$PRGNAM-$VERSION/
+tar xpvf $CWD/${PRGNAM}-${SRCVERSION}-beta-${SRCARCH}.tar
 
-CFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --infodir=/usr/info \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --localedir=/usr/share/locale \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
+cp -av ${PRGNAM}-${SRCVERSION}-${SRCARCH} $PKG/opt/$PRGNAM/
+ln -sf ../../opt/${PRGNAM}/${PRGNAM}-${SRCVERSION}-${SRCARCH} $PKG/usr/bin/${PRGNAM}
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README RELEASE \
-  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/multimedia/pitivi/pitivi.info b/multimedia/pitivi/pitivi.info
index 469072b6a2..6178380600 100644
--- a/multimedia/pitivi/pitivi.info
+++ b/multimedia/pitivi/pitivi.info
@@ -1,10 +1,10 @@
 PRGNAM="pitivi"
-VERSION="0.15.2"
+VERSION="0.94-beta"
 HOMEPAGE="http://www.pitivi.org/"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/pitivi/0.15/pitivi-0.15.2.tar.xz"
-MD5SUM="e0e379fca759025140ac1316819b2173"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="gnonlin gst-python pygoocanvas zope.interface"
+DOWNLOAD="http://pitivi.ecchi.ca/bundles/releases/pitivi-0.94-beta-x86.tar"
+MD5SUM="b34617ed526a05ed6e15cb4654980ca8"
+DOWNLOAD_x86_64="http://pitivi.ecchi.ca/bundles/releases/pitivi-0.94-beta-x86_64.tar"
+MD5SUM_x86_64="bcd034b842cd1f590e0fd3c44f34a72e"
+REQUIRES=""
 MAINTAINER="Ryan P.C. McQuen"
 EMAIL="ryan.q@linux.com"
diff --git a/multimedia/pitivi/slack-desc b/multimedia/pitivi/slack-desc
index fabb91ad31..87ca3f767d 100644
--- a/multimedia/pitivi/slack-desc
+++ b/multimedia/pitivi/slack-desc
@@ -1,19 +1,12 @@
-# HOW TO EDIT THIS FILE:
-# 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 make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
       |-----handy-ruler------------------------------------------------------|
-pitivi: pitivi (a free and open source video editor for Linux)
 pitivi:
-pitivi: PiTiVi is a free, intuitive, and featureful movie editor.
+pitivi: pitivi (a free and open source video editor for Linux)
 pitivi:
-pitivi: Homepage: http://www.pitivi.org/
 pitivi:
+pitivi: PiTiVi is a free, intuitive, and featureful movie editor.
 pitivi:
 pitivi:
 pitivi:
 pitivi:
+pitivi: http://www.pitivi.org/
 pitivi: