From 893d8a7162789a5fdd2aaed410419e37922c676f Mon Sep 17 00:00:00 2001 From: Robert Delahunt Date: Thu, 13 May 2010 00:19:48 +0200 Subject: academic/bibletime: Updated for version 2.5 --- academic/bibletime/README | 8 ++-- academic/bibletime/bibletime.SlackBuild | 83 ++++++++++++++++----------------- academic/bibletime/bibletime.info | 14 +++--- academic/bibletime/doinst.sh | 4 +- academic/bibletime/slack-desc | 12 ++--- 5 files changed, 59 insertions(+), 62 deletions(-) diff --git a/academic/bibletime/README b/academic/bibletime/README index 35b025376e..e3a17cf603 100644 --- a/academic/bibletime/README +++ b/academic/bibletime/README @@ -1,5 +1,5 @@ -BibleTime is a Bible study application for Linux. It is based on the K Desktop -Environment and uses the Sword programming library to work with Bible texts, -commentaries, dictionaries and books provided by the Crosswire Bible Society. +BibleTime is a Bible study application for Linux. It is based on the K Desktop +Environment and uses the Sword programming library to work with Bible texts, +commentaries, dictionaries, and books provided by the Crosswire Bible Society. -Requires CLucene and sword available at SlackBuilds.org \ No newline at end of file +This requires sword. diff --git a/academic/bibletime/bibletime.SlackBuild b/academic/bibletime/bibletime.SlackBuild index fb57a662dc..550c777372 100644 --- a/academic/bibletime/bibletime.SlackBuild +++ b/academic/bibletime/bibletime.SlackBuild @@ -1,9 +1,8 @@ #!/bin/sh -# + # A slackbuild script to build the BibleTime Sword frontend -# + # Copyright (c) 2007, Timothy Pollard -# # All rights reserved. # # Redistribution and use in source and binary forms, with or without modification, @@ -15,49 +14,49 @@ # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -# FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY -# OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# Modified by SlackBuilds.org +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# Modified by Robert Delahunt [twinreverb[at]puresimplicity.net PRGNAM=bibletime -VERSION=1.6.5 +VERSION=2.5 ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} CWD=$(pwd) TMP=${TMP:-/tmp/SBo} -PKG=${PKG:-$TMP/package-$PRGNAM} +PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" -fi + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +fi + +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT -cd $TMP || exit 1 +cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1 -cd $PRGNAM-$VERSION || exit 1 +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION chown -R root:root . find . \ @@ -66,26 +65,22 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --build=$ARCH-slackware-linux \ -|| exit +cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_C_FLAGS="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKCFLAGS" +make +make install DESTDIR=$PKG -# Compile the source -make || exit -make install DESTDIR=$PKG || exit +# /usr/share/icons is for themed icons +mv $PKG/usr/share/icons $PKG/usr/share/pixmaps -# Strip some libraries and binaries find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp ChangeLog INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION -cp $CWD/$PRGNAM.SlackBuild $PKG/usr/doc/$PRGNAM-$VERSION +cp -a ChangeLog LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \; mkdir -p $PKG/install @@ -93,4 +88,4 @@ 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.tgz \ No newline at end of file +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/academic/bibletime/bibletime.info b/academic/bibletime/bibletime.info index d5fbb431cd..f9507e53b8 100644 --- a/academic/bibletime/bibletime.info +++ b/academic/bibletime/bibletime.info @@ -1,8 +1,10 @@ PRGNAM="bibletime" -VERSION="1.6.5" +VERSION="2.5" HOMEPAGE="http://www.bibletime.info/" -DOWNLOAD="http://download.sourceforge.net/sourceforge/bibletime/bibletime-1.6.5.tar.bz2" -MD5SUM="c6815d2076e454150c3b9fb88c1dd1e8" -MAINTAINER="Timothy Pollard" -EMAIL="sbo@timp.com.au" -APPROVED="David Somero" +DOWNLOAD="http://downloads.sourceforge.net/project/bibletime/BibleTime%202/BibleTime%202%20source%20code/bibletime-2.5.tar.gz" +MD5SUM="7ddf119ac501d6199cb003d0c9fa382d" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +MAINTAINER="Robert Delahunt" +EMAIL="twinreverb@puresimplicity.net" +APPROVED="dsomero" diff --git a/academic/bibletime/doinst.sh b/academic/bibletime/doinst.sh index b46adf0f45..4e8ba7071d 100644 --- a/academic/bibletime/doinst.sh +++ b/academic/bibletime/doinst.sh @@ -1,4 +1,4 @@ - if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1 + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 fi + diff --git a/academic/bibletime/slack-desc b/academic/bibletime/slack-desc index 4424eed188..29ec39843d 100644 --- a/academic/bibletime/slack-desc +++ b/academic/bibletime/slack-desc @@ -7,13 +7,13 @@ |-----handy-ruler------------------------------------------------------| bibletime: BibleTime (Bible study application for Linux) -bibletime: +bibletime: bibletime: BibleTime is based on the K Desktop Environment and uses the Sword bibletime: programming library to work with Bible texts, commentaries, bibletime: dictionaries and books provided by the Crosswire Bible Society. -bibletime: +bibletime: bibletime: http://www.bibletime.info/ -bibletime: -bibletime: -bibletime: -bibletime: +bibletime: +bibletime: +bibletime: +bibletime: -- cgit v1.2.3