4 files changed, 23 insertions, 59 deletions
diff --git a/academic/geda-gaf/geda-gaf.SlackBuild b/academic/geda-gaf/geda-gaf.SlackBuild
index 91b71de886..fa4a2f07c3 100644
--- a/academic/geda-gaf/geda-gaf.SlackBuild
+++ b/academic/geda-gaf/geda-gaf.SlackBuild
@@ -3,10 +3,11 @@
 # Slackware build script for gEDA / gaf
 
 # Written by Stephen Van Berg stephen_van_berg@earlicker.com
+# Updated by Kyle Guinn <elyk03@gmail.com>
 
 PRGNAM=geda-gaf
-VERSION=${VERSION:-1.6.2}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-1.8.2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -22,6 +23,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+DOCS="ABOUT-NLS AUTHORS COPYING* ChangeLog HACKING INSTALL NEWS README"
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -45,15 +48,7 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -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 {} \;
-
-# Starting with glib 2.32 it is now mandatory to 
-# include glib.h instead of individual headers.
-patch -p1 -i $CWD/glib-single-include.patch
+chmod -R u+w,go-w,a+rX-st .
 
 LDFLAGS="$LDFLAGS -lm" \
 CFLAGS="$SLKCFLAGS" \
@@ -64,37 +59,21 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
+  --infodir=/usr/info \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux \
+  --disable-update-xdg-database
 
 make
-make install DESTDIR=$PKG
-
-# Don't clobber Slackware's mime info.
-rm -f $PKG/usr/share/applications/mimeinfo.cache
-rm -f $PKG/usr/share/mime/XMLnamespaces
-rm -f $PKG/usr/share/mime/version
-rm -f $PKG/usr/share/mime/aliases
-rm -f $PKG/usr/share/mime/generic-icons
-rm -f $PKG/usr/share/mime/globs
-rm -f $PKG/usr/share/mime/globs2
-rm -f $PKG/usr/share/mime/icons
-rm -f $PKG/usr/share/mime/magic
-rm -f $PKG/usr/share/mime/mime.cache
-rm -f $PKG/usr/share/mime/subclasses
-rm -f $PKG/usr/share/mime/treemagic
-rm -f $PKG/usr/share/mime/types
-
-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
+make install-strip DESTDIR=$PKG
 
 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
+
+rm -f $PKG/usr/info/dir
+gzip -9 $PKG/usr/info/*.info*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING ChangeLog INSTALL NEWS README \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/academic/geda-gaf/geda-gaf.info b/academic/geda-gaf/geda-gaf.info
index d21e60b04f..3664fa7fb5 100644
--- a/academic/geda-gaf/geda-gaf.info
+++ b/academic/geda-gaf/geda-gaf.info
@@ -1,8 +1,8 @@
 PRGNAM="geda-gaf"
-VERSION="1.6.2"
-HOMEPAGE="http://gpleda.org"
-DOWNLOAD="http://geda.seul.org/release/v1.6/1.6.2/geda-gaf-1.6.2.tar.gz"
-MD5SUM="35ae86aebc174ec1fc03863fde4c843c"
+VERSION="1.8.2"
+HOMEPAGE="http://www.geda-project.org/"
+DOWNLOAD="http://ftp.geda-project.org/geda-gaf/stable/v1.8/1.8.2/geda-gaf-1.8.2.tar.gz"
+MD5SUM="fa8a807615decf47027e22a217dd0ded"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/academic/geda-gaf/glib-single-include.patch b/academic/geda-gaf/glib-single-include.patch
deleted file mode 100644
index f2f05e2323..0000000000
--- a/academic/geda-gaf/glib-single-include.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: geda-gaf-1.6.2/libgeda/src/s_path.c
-===================================================================
---- geda-gaf-1.6.2.orig/libgeda/src/s_path.c
-+++ geda-gaf-1.6.2/libgeda/src/s_path.c
-@@ -37,9 +37,7 @@
- #include <stdlib.h>
- #include <string.h>
- 
--#include <glib/gmem.h>
--#include <glib/gmessages.h>
--#include <glib/gtypes.h>
-+#include <glib.h>
- 
- #include "libgeda_priv.h"
- 
diff --git a/academic/geda-gaf/slack-desc b/academic/geda-gaf/slack-desc
index 4ad267e7b3..8bfbc0dc67 100644
--- a/academic/geda-gaf/slack-desc
+++ b/academic/geda-gaf/slack-desc
@@ -1,9 +1,9 @@
 # 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 ':'.
+# 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------------------------------------------------------|
 geda-gaf: gEDA (gnu EDA base package)