diff options
| -rw-r--r-- | office/devtodo/c++includes.patch | 12 | ||||
| -rw-r--r-- | office/devtodo/devtodo.SlackBuild | 32 | ||||
| -rw-r--r-- | office/devtodo/devtodo.info | 2 |
3 files changed, 37 insertions, 9 deletions
diff --git a/office/devtodo/c++includes.patch b/office/devtodo/c++includes.patch new file mode 100644 index 0000000000..3985b745e7 --- /dev/null +++ b/office/devtodo/c++includes.patch @@ -0,0 +1,12 @@ +diff -Naur devtodo-0.1.20.orig/src/todoterm.cc devtodo-0.1.20/src/todoterm.cc +--- devtodo-0.1.20.orig/src/todoterm.cc 2007-06-28 13:04:36.000000000 +0000 ++++ devtodo-0.1.20/src/todoterm.cc 2009-07-03 00:44:15.000000000 +0000 +@@ -2,6 +2,8 @@ + #include "todoterm.h" + + #ifdef USETERMCAP ++#include <cstdio> ++#include <cstdlib> + #include <iostream> + #include <string> + #include <stdexcept> diff --git a/office/devtodo/devtodo.SlackBuild b/office/devtodo/devtodo.SlackBuild index 02631e2d1b..d7d8f0ee46 100644 --- a/office/devtodo/devtodo.SlackBuild +++ b/office/devtodo/devtodo.SlackBuild @@ -25,21 +25,25 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=devtodo -VERSION=0.1.20 +VERSION=${VERSION:-0.1.20} ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} + CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -DOCFILES="AUTHORS COPYING ChangeLog INSTALL NEWS README QuickStart contrib" - -if [ "$ARCH" = "i486" ]; then +if [ "$ARCH"- = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" fi set -e @@ -50,13 +54,21 @@ cd $TMP rm -rf $TMP/$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 . + +find . \ + \( -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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +# Patch so it compiles on x86_64, and fix for missing C++ includes. +patch -p1 < $CWD/c++includes.patch CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ --localstatedir=/var \ --sysconfdir=/etc \ --mandir=/usr/man \ @@ -71,11 +83,13 @@ make install-strip DESTDIR=$PKG ) mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/{contrib,profile.d} -cp -a $DOCFILES $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README QuickStart contrib \ + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild cat doc/scripts.sh > $PKG/usr/doc/$PRGNAM-$VERSION/profile.d/$PRGNAM.sh cat doc/scripts.tcsh > $PKG/usr/doc/$PRGNAM-$VERSION/profile.d/$PRGNAM.csh -find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \; + +#find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \; # Let's not clobber the config file mv $PKG/etc/todorc $PKG/etc/todorc.new @@ -85,4 +99,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 +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/office/devtodo/devtodo.info b/office/devtodo/devtodo.info index 73da4f2c29..3b51b9e4f0 100644 --- a/office/devtodo/devtodo.info +++ b/office/devtodo/devtodo.info @@ -2,7 +2,9 @@ PRGNAM="devtodo" VERSION="0.1.20" HOMEPAGE="http://swapoff.org/DevTodo" DOWNLOAD="http://swapoff.org/files/devtodo/devtodo-0.1.20.tar.gz" +DOWNLOAD_x86_64="" MD5SUM="4a6241437cb56f237f850bcd2233c3c4" +MD5SUM_x86_64="" MAINTAINER="Michiel van Wessem" EMAIL="michiel@slackbuilds.org" APPROVED="rworkman" |