4 files changed, 33 insertions, 26 deletions
diff --git a/development/gc/README b/development/gc/README
index 4d1c6872e296..c7e216cad471 100644
--- a/development/gc/README
+++ b/development/gc/README
@@ -9,4 +9,3 @@ The collector is also used by a number of programming language
 implementations that either use C as intermediate code, want to 
 facilitate easier interoperation with C libraries, or just prefer 
 the simple collector interface.
-
diff --git a/development/gc/gc.SlackBuild b/development/gc/gc.SlackBuild
index c699e0b4df73..843ad159ef5a 100644
--- a/development/gc/gc.SlackBuild
+++ b/development/gc/gc.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for gc
 
-# Copyright 2006  Robby Workman  (http://rlworkman.net)
+# Copyright 2006-2007  Robby Workman  (http://rlworkman.net)
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,16 +22,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified by the SlackBuilds.org project
-
-set -e
-
 PRGNAM=gc
-VERSION=6.8
+VERSION=${VERSION:-7.0}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-CWD=`pwd`
+
+CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -42,12 +39,14 @@ elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf ${PRGNAM}${VERSION}
-tar -xzvf $CWD/${PRGNAM}${VERSION}.tar.gz
-cd ${PRGNAM}${VERSION}
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
@@ -55,6 +54,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --mandir=/usr/man \
   --enable-static=no
 
 make
@@ -64,11 +64,11 @@ mkdir -p $PKG/usr/man/man1
 mv $PKG/usr/share/gc/gc.man $PKG/usr/man/man1/gc.1
 gzip -9 $PKG/usr/man/man1/gc.1
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-mv $PKG/usr/share/gc/* $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+mkdir -p $PKG/usr/doc
+mv $PKG/usr/share/gc $PKG/usr/doc/$PRGNAM-$VERSION
+cp $CWD/$PRGNAM.SlackBuild $PKG/usr/doc/$PRGNAM-$VERSION
 find $PKG/usr/doc -type f -exec chmod 644 {} \;
-rm -rf $PKG/usr/share
+( cd $PKG/usr/share ; ln -s /usr/doc/$PRGNAM-$VERSION gc )
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/development/gc/gc.info b/development/gc/gc.info
index c763fe3f19d3..f5c05d8682a6 100644
--- a/development/gc/gc.info
+++ b/development/gc/gc.info
@@ -1,8 +1,8 @@
 PRGNAM="gc"
-VERSION="6.8"
+VERSION="7.0"
 HOMEPAGE="http://www.hpl.hp.com/personal/Hans_Boehm/gc/"
-DOWNLOAD="http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.8.tar.gz"
-MD5SUM="418d38bd9c66398386a372ec0435250e"
+DOWNLOAD="http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-7.0.tar.gz"
+MD5SUM="3645ccf5f32ebb27d99b27b0d29e9c38"
 MAINTAINER="Robby Workman"
 EMAIL="rw@rlworkman.net"
-APPROVED="alien"
+APPROVED="David Somero"
diff --git a/development/gc/slack-desc b/development/gc/slack-desc
index 4f1e68c3d50c..ba2f527ff0db 100644
--- a/development/gc/slack-desc
+++ b/development/gc/slack-desc
@@ -1,11 +1,19 @@
-gc: Boehm-Demers-Weiser garbage collector
+# 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 ':'.
+
+  |-----handy-ruler------------------------------------------------------|
+gc: gc (Boehm-Demers-Weiser garbage collector)
 gc: 
-gc: The Boehm-Demers-Weiser conservative garbage collector can be used as a 
-gc: garbage collecting replacement for C malloc or C++ new. It allows you to 
-gc: allocate memory basically as you normally would, without explicitly 
-gc: deallocating memory that is no longer useful. The collector automatically 
-gc: recycles memory when it determines that it can no longer be otherwise 
-gc: accessed.
+gc: The Boehm-Demers-Weiser conservative garbage collector can be used
+gc: as a garbage collecting replacement for C malloc or C++ new. It
+gc: allows you to allocate memory basically as you normally would,
+gc: without explicitly deallocating memory that is no longer useful. The
+gc: collector automatically recycles memory when it determines that it
+gc: can no longer be otherwise accessed.
 gc: 
 gc: Homepage: http://www.hpl.hp.com/personal/Hans_Boehm/gc/
 gc: