diff --git a/office/calcurse/calcurse.SlackBuild b/office/calcurse/calcurse.SlackBuild index bc695e4d7d..dcfad7b137 100644 --- a/office/calcurse/calcurse.SlackBuild +++ b/office/calcurse/calcurse.SlackBuild @@ -25,16 +25,14 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=calcurse -VERSION=${VERSION:-2.8} +VERSION=${VERSION:-2.9.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -81,7 +79,8 @@ CXXFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ - --build=$ARCH-slackware-linux \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --build=$ARCH-slackware-linux make make install-strip DESTDIR=$PKG @@ -94,11 +93,13 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done ) +# Remove the manual.html since it's the same as the one in /usr/doc/$PRGNAM-$VERSION +rm -rf $PKG/usr/share/doc + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a ABOUT-NLS AUTHORS ChangeLog NEWS README TODO doc/* \ +cp -a AUTHORS COPYING INSTALL NEWS README TODO doc/* \ $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 0644 {} \; mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/office/calcurse/calcurse.info b/office/calcurse/calcurse.info index 0ac9291c67..722aa8fe29 100644 --- a/office/calcurse/calcurse.info +++ b/office/calcurse/calcurse.info @@ -1,10 +1,10 @@ PRGNAM="calcurse" -VERSION="2.8" -HOMEPAGE="http://culot.org/calcurse/" -DOWNLOAD="http://culot.org/cgi-bin/get.cgi?calcurse-2.8.tar.gz" -MD5SUM="124d40c0912b12021996220f02b759cc" +VERSION="2.9.0" +HOMEPAGE="http://calcurse.org/" +DOWNLOAD="http://calcurse.org/files/calcurse-2.9.0.tar.gz" +MD5SUM="3ff0229581060d43232a6fb56b0cd07a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Michiel van Wessem" EMAIL="michiel@slackbuilds.org" -APPROVED="Erik Hanson" +APPROVED="rworkman"