diff options
Diffstat (limited to 'academic')
| -rw-r--r-- | academic/qhull/Make-config.sh.patch | 46 | ||||
| -rw-r--r-- | academic/qhull/qhull.SlackBuild | 20 | ||||
| -rw-r--r-- | academic/qhull/qhull.info | 8 |
3 files changed, 64 insertions, 10 deletions
diff --git a/academic/qhull/Make-config.sh.patch b/academic/qhull/Make-config.sh.patch new file mode 100644 index 0000000000..1b4ffab6da --- /dev/null +++ b/academic/qhull/Make-config.sh.patch @@ -0,0 +1,46 @@ +--- Make-config.sh 2010-03-22 21:51:33.000000000 +0100 ++++ Make-config.sh.new 2010-03-22 21:52:40.000000000 +0100 +@@ -114,7 +114,7 @@ + ### Man pages (trick to get around .man extension) + + %.1: %.man +- cp $< $@ ++ cp $< $@ + CLEANFILES = *.1 + man_MANS = rbox.1 qhull.1 + +@@ -195,7 +195,10 @@ + geom.c \ + poly.c \ + qset.c \ +- mem.c ++ mem.c \ ++ usermem.c \ ++ userprintf.c \ ++ rboxlib.c + + # how: + libqhull_la_LDFLAGS = -version-info 4:0:0 -lm +@@ -233,7 +236,8 @@ + merge.h \ + libqhull.h \ + qset.h \ +- user.h ++ user.h \ ++ random.h + + + ### Example programs +@@ -246,10 +250,9 @@ + examples_DATA = \ + user_eg.c \ + user_eg2.c \ +- qhull_interface.cpp \ +- Makefile.txt \ ++ Makefile \ + Make-config.sh \ +- MBorland ++ Mborland + + doc_DATA = Changes.txt \ + index.htm \ diff --git a/academic/qhull/qhull.SlackBuild b/academic/qhull/qhull.SlackBuild index d6e67a9d54..39d79e0b9a 100644 --- a/academic/qhull/qhull.SlackBuild +++ b/academic/qhull/qhull.SlackBuild @@ -3,13 +3,13 @@ # Slackware build script for qhull # Written by Chris Abela <chris.abela@maltats.com> -# April 2009 +# 2010.03.19 PRGNAM=qhull -VERSION=${VERSION:-2003.1} +VERSION=${VERSION:-2010.1} ARCH=${ARCH:-i486} -BUILD=${BUILD:-2} -TAG=${TAG:-_SBo} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} CWD=$(pwd) TMP=${TMP:-/tmp/SBo} @@ -33,7 +33,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION-src.tgz cd $PRGNAM-$VERSION chown -R root:root . find . \ @@ -42,11 +42,19 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +cd src +# Amongst other things, this caters for the octave SlackBuild +patch -Np0 -i $CWD/Make-config.sh.patch Make-config.sh +./Make-config.sh +cd - + CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ + --datarootdir=/usr \ + --docdir=/usr \ --disable-static \ --build=$ARCH-slackware-linux diff --git a/academic/qhull/qhull.info b/academic/qhull/qhull.info index 139031aeaf..231dbc2e05 100644 --- a/academic/qhull/qhull.info +++ b/academic/qhull/qhull.info @@ -1,10 +1,10 @@ PRGNAM="qhull" -VERSION="2003.1" +VERSION="2010.1" HOMEPAGE="http://www.qhull.org/" -DOWNLOAD="http://www.qhull.org/download/qhull-2003.1.tar.gz" +DOWNLOAD="http://www.qhull.org/download/qhull-2010.1-src.tgz" +MD5SUM="e64138470acdeb18f752a0bc2a11ceb4" DOWNLOAD_x86_64="" -MD5SUM="48228e26422bff85ef1f45df5b6e3314" MD5SUM_x86_64="" MAINTAINER="Chris Abela" EMAIL="chris.abela@maltats.com" -APPROVED="rworkman" +APPROVED="Erik Hanson" |