3 files changed, 23 insertions, 28 deletions
diff --git a/development/gnome-inform7/README b/development/gnome-inform7/README
index f82abb2709..08c4f72de8 100644
--- a/development/gnome-inform7/README
+++ b/development/gnome-inform7/README
@@ -1,6 +1,9 @@
 Inform is a design system for interactive fiction based on natural language.
 It is a radical reinvention of the way interactive fiction is designed, guided
-by contemporary work in semantics and by the practical experience of some of 
-the world's best known writers of SF.
+by contemporary work in semantics and by the practical experience of some of
+the world's best known writers of IF.
 
 This includes both the "gnome-inform7" IDE and the "i7" command-line shell.
+
+For the dependencies, gst1-plugins-bad needs to be built with libmodplug
+support.
diff --git a/development/gnome-inform7/gnome-inform7.SlackBuild b/development/gnome-inform7/gnome-inform7.SlackBuild
index 48bb0cc8ae..ce12ab2544 100644
--- a/development/gnome-inform7/gnome-inform7.SlackBuild
+++ b/development/gnome-inform7/gnome-inform7.SlackBuild
@@ -5,7 +5,7 @@
 # Written by Dugan Chen (thedoogster@gmail.com)
 
 PRGNAM=gnome-inform7
-VERSION=${VERSION:-6G60}
+VERSION=${VERSION:-6L02}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -55,9 +55,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-mkdir -p $PKG/usr/doc
 sh install-inform7.sh -p $PKG/usr
-mv $PKG/usr/share/doc/inform7 $PKG/usr/doc/inform7-$VERSION
+mv $PKG/usr/share/doc $PKG/usr
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
@@ -65,7 +64,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 # Then install the GUI.
 
 rm -rf $PRGNAM-$VERSION
-tar xfv $CWD/I7_${VERSION}_GNOME_Source.tar.gz
+tar xfv $CWD/$PRGNAM-${VERSION}.tar.xz
 cp $PKG/usr/share/inform7/Compilers/ni $PRGNAM-$VERSION/src/ni/
 cd $PRGNAM-$VERSION
 chown -R root:root .
@@ -75,6 +74,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+sh autogen.sh
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -84,28 +84,20 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --datarootdir=/usr/share \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --docdir=/usr/doc/$PRGNAM-$VERSION/gnome-inform7 \
   --build=$ARCH-slackware-linux
-
-make \
-  docdir=/usr/doc/$PRGNAM-$VERSION \
-  inform6docdir=/usr/doc/$PRGNAM-$VERSION/inform6 \
-  frotzdocdir=/usr/doc/$PRGNAM-$VERSION/frotz \
-  glulxedocdir=/usr/doc/$PRGNAM-$VERSION/glulxe \
-  gitdocdir=/usr/doc/$PRGNAM-$VERSION/git
-
-make install \
-  docdir=/usr/doc/$PRGNAM-$VERSION \
-  inform6docdir=/usr/doc/$PRGNAM-$VERSION/inform6 \
-  frotzdocdir=/usr/doc/$PRGNAM-$VERSION/frotz \
-  glulxedocdir=/usr/doc/$PRGNAM-$VERSION/glulxe \
-  gitdocdir=/usr/doc/$PRGNAM-$VERSION/git \
-  DESTDIR=$PKG
+make
+make install DESTDIR=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+# Move the docs from usr/share/doc to usr/doc
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/usr/share/doc/* $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/usr/doc/inform7 $PKG/usr/doc/$PRGNAM-$VERSION
 rmdir $PKG/usr/share/doc
+
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/development/gnome-inform7/gnome-inform7.info b/development/gnome-inform7/gnome-inform7.info
index d2271c7fae..9bfb64983f 100644
--- a/development/gnome-inform7/gnome-inform7.info
+++ b/development/gnome-inform7/gnome-inform7.info
@@ -1,12 +1,12 @@
 PRGNAM="gnome-inform7"
-VERSION="6G60"
+VERSION="6L02"
 HOMEPAGE="http://inform7.com"
-DOWNLOAD="http://downloads.sourceforge.net/project/gnome-inform7/gnome-inform7/6G60/I7_6G60_GNOME_Source.tar.gz \
-          http://inform7.com/download/content/6G60/I7_6G60_Linux_all.tar.gz"
-MD5SUM="224c4f75cecb6e0be60f7beea6e786b5 \
-        375403e827fcb92bc1d7881c89b97168"
+DOWNLOAD="http://duganchen.ca/files/sbo_sources/gnome-inform7-6L02.tar.xz \
+          http://inform7.com/download/content/6L02/I7_6L02_Linux_all.tar.gz"
+MD5SUM="9e6320f1a7ac82c208c844c9ee6e3b70 \
+        4a69207cdee272b0de176a78b8163403"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="gtksourceview goocanvas webkitgtk"
+REQUIRES="gtksourceview goocanvas libmodplug webkitgtk gst1-plugins-good gst1-plugins-ugly gst1-plugins-bad"
 MAINTAINER="Dugan Chen"
 EMAIL="thedoogster@gmail.com"